reinit the tree, so we can have metadata

1910 files changed, 71102 insertions, 0 deletions

diff --git a/media-sound/SmarTagger/Manifest b/media-sound/SmarTagger/Manifest
new file mode 100644
index 000000000000..1d87f3fd6eee
--- /dev/null
+++ b/media-sound/SmarTagger/Manifest
@@ -0,0 +1,6 @@
+AUX SmarTagger-0.1-gentoo.patch 343 SHA256 a18a0307b61f9358ef9dbf20a5fc95e81ec7984e56d36f9015373f90417c7a8d SHA512 0ff0e4bfbb0d834d767ad0c2c5ab45d65994bcea4bb31f601a23f2aa6659749a813e29c8fab0d3ccabf76a3bc38beb38018dbe4598a6ec88bbb3eb57bdbc5c87 WHIRLPOOL c2cd8efbd587ce07fc15223dc9758e6afdd926ac8fd82f1ae060fde00356e74aa4a45652dcea2b1f44e5fdb1624f6abf5218758fd3782b7b00c6c74538edd710
+DIST SmarTagger-0.1.tar.gz 3980 SHA256 f7fde56c5495068c2451189b7374f025f5d8969c7cb5d6d459912bf2c2fcc016 SHA512 d2278e3cfe32c37200e6b58c0827b40b9e3163bbe7fd7e5f929acb9c7d5e43ea9de24999b52c43cb7906c7f381606028219e40c8e02613b22b67970d47e3b22e WHIRLPOOL 5c40acc8cc54ef60fe5517fa38a07cf2708318dc7f281d4195dee8389bf121cc12d0e59e0143f21fc9e11a1ab929a302422f05d6032846dfceae96ce60fecaec
+EBUILD SmarTagger-0.1-r2.ebuild 579 SHA256 ef71992a4d3d8f6608e787c9cf051176420d034035e09f58d4afbcd56fc42c11 SHA512 022717c845dc37b09854af3cffc57ad4dfdcebfb7a459517b9f4e3ae7658dfee2a00afe2ffe7287d65cdf921337a001851529fc175b85f07dfaacdc9c6a07102 WHIRLPOOL 3d28d9397413f799b3ff96fec7d5adad4a4e840b80f61d12a6dfa2bbe7c0873c3d7a135a1dfce844c5de9b653e69097aeac76a42e31d87bb8ea50d14cdee3d86
+MISC ChangeLog 2479 SHA256 11bddff9b3799e374ad240aeabbb49f0513eab141205ddb552d191a7164dd016 SHA512 da068d236e794334f09c27e644c24657be07b3616ebc9e3e1ced64fcb214279d288c7617e33016cbd981f101effeaed2b9cca104d09ab1bdfefe1b7c720462a6 WHIRLPOOL d88e0edaa07a4201009cff8f5f34faf219917f6dc96c22419db090a2e064bba4708855867bc3a597baacd7c4d965ab1fdfd30d2756eb552415096345973ec7de
+MISC ChangeLog-2015 1607 SHA256 a9a54e73be8d8d71815e7b9a05c0600c020b702677640171897b4f220f9a0a1f SHA512 fa9dc3af671a6f85a9e4dedc10643a5f171c2287169cf1d9e08a99a0de548a8879ab68402478fe986d18e7a25bae5a9d008a1f1f1ba4389fca4fe36b6b120d5a WHIRLPOOL 1fb0bfd8eb59f56356702593655dcb6f394f6e55b68e67a73f5457a8f14ea998cad3f2c3f7602978846db390bd6eb0c70815eb03397244d319d0b732090690c5
+MISC metadata.xml 331 SHA256 3c0f8ffa73e91f365e0b9ebf18f4b2e12b6f95ac9240b2a78cd3d9e7afad1d7c SHA512 648c7d787b2dc0c815ab4dec626498985516d76792628f99d83e939fd1c408da68f13e2abf4bbd9b9d18adab91d9b12639a0f649b0e4b8222003fdf3b24bd9f8 WHIRLPOOL 84240f6676c6fe77027774c144b5c0e8c6c190f393d8037364ee1a208e230cda0ff4cbcc5994caeea1806baa6157dc633c557f1617e30fd2f5218c49cea75126
diff --git a/media-sound/SmarTagger/SmarTagger-0.1-r2.ebuild b/media-sound/SmarTagger/SmarTagger-0.1-r2.ebuild
new file mode 100644
index 000000000000..b8f2b6651fd5
--- /dev/null
+++ b/media-sound/SmarTagger/SmarTagger-0.1-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Perl script for renaming and tagging mp3s"
+HOMEPAGE="http://freshmeat.net/projects/smartagger/"
+SRC_URI="http://freshmeat.net/redir/smartagger/9680/url_tgz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/MP3-Info"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_install() {
+	dobin ${PN}
+	dosym ${PN} /usr/bin/smartagger
+	dodoc changelog README TODO
+	newdoc album.id3 example.id3
+}
diff --git a/media-sound/SmarTagger/files/SmarTagger-0.1-gentoo.patch b/media-sound/SmarTagger/files/SmarTagger-0.1-gentoo.patch
new file mode 100644
index 000000000000..f7d94626430b
--- /dev/null
+++ b/media-sound/SmarTagger/files/SmarTagger-0.1-gentoo.patch
@@ -0,0 +1,12 @@
+diff -ur SmarTagger-0.1.orig/SmarTagger SmarTagger-0.1/SmarTagger
+--- SmarTagger-0.1.orig/SmarTagger	1999-11-23 10:10:54.000000000 +0200
++++ SmarTagger-0.1/SmarTagger	2007-07-28 18:29:38.000000000 +0300
+@@ -38,7 +38,7 @@
+ 	 $comilla = "";
+ }
+ 
+-use MPEG::MP3Info;
++use MP3::Info;
+ $product_name = "SmarTagger";
+ $version = "0.1";
+ %tags = ();
diff --git a/media-sound/SmarTagger/metadata.xml b/media-sound/SmarTagger/metadata.xml
new file mode 100644
index 000000000000..ac4687340df1
--- /dev/null
+++ b/media-sound/SmarTagger/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="freshmeat">smartagger</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/a2jmidid/Manifest b/media-sound/a2jmidid/Manifest
new file mode 100644
index 000000000000..cb2f72e55ed5
--- /dev/null
+++ b/media-sound/a2jmidid/Manifest
@@ -0,0 +1,6 @@
+AUX a2jmidid-link.patch 981 SHA256 75116fa26ecb62d63bc06dff2919a17041463484a3011819a2f3845b4174bdf2 SHA512 63e9d127ce6aab4e075cdfdf33835dfd3d96fead9c0383231ffa0aa731d339e487857e6fd8e085c2a4e520de6a739adae42be930d062b8b05a6e739ad5625175 WHIRLPOOL c6ba28a927378f0679203552a3ceae8ee42511643fb1b95f15e337456ce26a574ecf5d09303699f4eafe187b14bcd2b15842ee3fb97447deeb8d4c1ae4e1fc5c
+DIST a2jmidid-8.tar.bz2 162764 SHA256 2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f SHA512 6182a295462ae587461ca395d85c956523bfecd113d031d0ae8a9f304fc3d41f6a5097b3a1a9fc06bd0eef7fe08a4b3c116a3361ff9e63468c3e40b736215592 WHIRLPOOL 04408b6eb3460a522da6009e142fa113fd95c20efbce6c1fcca30a2966478950fc3d5c061694bb533fd5f3261f2d26f22b507bff5fb73050f2fb57a23c6c8936
+EBUILD a2jmidid-8-r2.ebuild 957 SHA256 7d0da805022ee327a135d255a14250d5fe3811c30e6f10a428e83f7c843f2e0b SHA512 5646ec4ca9e03531fc76b0335184e6e1880cb9c3838d85d5765c3534cd788dfaa567c09df764a03c9e4917979d32da4e940c5cc47186663d9b04b0c6a61ea51d WHIRLPOOL 238ba6a1283e46123f8ef898ce08386fd4192263f52c5bd4e71ab56e55eea228ab0f73e4a91bda96911848864b06e62676401e00154f7be99d8737d36bfce621
+MISC ChangeLog 2898 SHA256 76fe913356c0c85f91fc5e3872d8777d1aec97bc69c95dfeff229c4a25d8fa61 SHA512 4cf2f679dc0cb95158c931cde7ae3c6c85016a352dc5678b1209f0d73fff09e85b6f363ed923618551f692ac6285c6ff8a4301ffd28e42e06b63369441b4bf3b WHIRLPOOL df24763b8163d27b9fbe715a000ba17e23c5e61e5737b3c318f0f60eee6e8bd8f644361c293e9deff9c73852f744c46cd04dd2e8e0c8035e3f2a153cb3b3813e
+MISC ChangeLog-2015 2250 SHA256 69370ef578d860fa75b5492fd0698a5e3bfe57a5d0df9a2df05a93caeb56101a SHA512 b6e43d87b80f13ed16c1ed6d2a4605af325dd86ae812e3477b008ca8eb317c4f100660b1a80c19db6b379fa68b87a3e44c79ed9180431e696699299db49511bf WHIRLPOOL 06d9a539f8e82b3608c2697a4564e2ccebc7c5e3adb7505e6715503a1185af319110d1ff179634352ba948bd3183400a3e99707ab3339350d0f1a10aa17437fa
+MISC metadata.xml 589 SHA256 41566430d21d02d50a84ff7b537f65b1b78d150a6862696defa64e6971180cd4 SHA512 9894400859372b7131b0f50b3e02fdd2210eaeb7be4dc5d95f13244456ce42f1c0e55a6c3b099cceff7905c50668c23a8df5aafbb7f9cf37a8975db2ff5a8050 WHIRLPOOL 128e076b3719c63dc1d9e3e94a0d86e7a1eb2fc965f61e5796d2349d4dd423a970dd38d94868891cc257c3254f58665e0ca6a66ddbf262d9f13be5394164d13c
diff --git a/media-sound/a2jmidid/a2jmidid-8-r2.ebuild b/media-sound/a2jmidid/a2jmidid-8-r2.ebuild
new file mode 100644
index 000000000000..2175fa4b6917
--- /dev/null
+++ b/media-sound/a2jmidid/a2jmidid-8-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+NO_WAF_LIBDIR=1
+
+inherit python-single-r1 toolchain-funcs waf-utils eutils
+
+DESCRIPTION="Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"
+HOMEPAGE="http://home.gna.org/a2jmidid/"
+SRC_URI="http://download.gna.org/a2jmidid/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="dbus"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="media-libs/alsa-lib
+	virtual/jack
+	dbus? ( sys-apps/dbus )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS README NEWS internals.txt)
+
+src_prepare() {
+	# Bug 518382
+	epatch "${FILESDIR}"/${PN}-link.patch
+}
+
+src_configure() {
+	if use dbus ; then
+		waf-utils_src_configure
+	else
+		waf-utils_src_configure --disable-dbus
+	fi
+}
+
+src_install() {
+	waf-utils_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/a2jmidid/files/a2jmidid-link.patch b/media-sound/a2jmidid/files/a2jmidid-link.patch
new file mode 100644
index 000000000000..8b41f6ec1a41
--- /dev/null
+++ b/media-sound/a2jmidid/files/a2jmidid-link.patch
@@ -0,0 +1,33 @@
+From 7f82da7eb2f540a94db23331be98d42a58ddc269 Mon Sep 17 00:00:00 2001
+From: Nedko Arnaudov <nedko@arnaudov.name>
+Date: Tue, 10 Jul 2012 07:25:12 +0300
+Subject: [PATCH] properly fix pthread linking. Patch by Orcan. sr#2934
+
+---
+ wscript | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/wscript b/wscript
+index 36710e2..66a532a 100644
+--- a/wscript
++++ b/wscript
+@@ -66,7 +66,8 @@ def configure(conf):
+     else:
+         conf.env['DBUS_ENABLED'] = False
+ 
+     conf.env['LIB_DL'] = ['dl']
++    conf.env['LIB_PTHREAD'] = ['pthread']
+ 
+     #conf.check_header('expat.h', mandatory=True)
+     #conf.env['LIB_EXPAT'] = ['expat']
+@@ -152,7 +153,7 @@ def build(bld):
+ 
+     prog.includes = '.' # make waf dependency tracking work
+     prog.target = 'a2jmidid'
+-    prog.uselib = 'ALSA JACK DL'
++    prog.uselib = 'ALSA JACK DL PTHREAD'
+     if bld.env()['DBUS_ENABLED']:
+         prog.uselib += " DBUS-1"
+     prog = bld.create_obj('cc', 'program')
+-- 
+2.3.3.GIT
diff --git a/media-sound/a2jmidid/metadata.xml b/media-sound/a2jmidid/metadata.xml
new file mode 100644
index 000000000000..66863dd5fc81
--- /dev/null
+++ b/media-sound/a2jmidid/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>l33tmmx@gmail.com</email>
+		<name>Jouni Rinne</name>
+	</maintainer>
+<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/aacgain/Manifest b/media-sound/aacgain/Manifest
new file mode 100644
index 000000000000..28e9dbd0294b
--- /dev/null
+++ b/media-sound/aacgain/Manifest
@@ -0,0 +1,10 @@
+AUX aacgain-1.9-patch-dotdot.patch 620 SHA256 e60b96f9aea9c9b042d23effe4b074c08412632f07b41085eb516a8a832d0751 SHA512 aaf0f22c584b0bf82f0982862ff72e9a8bd21c2057669bf6c374fa8f2272477c83cb7fdf77624482b46dc59932b4a161d36220c09d7ca7fa5a5a8a5f252e5537 WHIRLPOOL ffa63139fd5ea4d6f86a3258964da0df8efcd5814f34d15a67e6fc8a91b2bc82fc7c1993fea69386aa58960ca6a6524343aff54eb15e01f90daa1bb5249c8b50
+DIST aacgain-1.9.tar.xz 52824 SHA256 42c97a956b69828e312345c09ee477ce411a40d25bdbb67b184c61afd3be3c91 SHA512 937c1c66feb13dfa869b8868415168c06b20e552577328957230a09b11f5e44ac53643da8e6fe91e476b54fe24c265a589c4a25dbde400f2fd43eebc5916f523 WHIRLPOOL bb006c6476d9f0c73b4e545684d99c8b4f32d9c05125cd48a109d88e59f788055a455a1baa6956ef0dead314dcbbed27e78cecf3526c86d371ddfac5fe91d966
+DIST faad2-2.7.tar.gz 1137407 SHA256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161 WHIRLPOOL 6e30d466e47de0e06751718005573a632c5aa0cd209445c56c25d859f917265452676ce897ac5ad1cd308d411911aaf232bfc50904469f9434b2cc95b6ae928f
+DIST mp3gain-1_5_2-src.zip 129435 SHA256 dbadc7a41a8a3b87d3a21a1989701cfe72d2090c3ead02b0b396a19a8acf6fca SHA512 1a7ac51bf0108c1f6fbd610c513bf7fd2c64d340a2ba23dc9fa5c3b896b279474f31f2d60318f409576e39f7643dd585d3e159e2a4db4553f7c9cc3761b7f388 WHIRLPOOL 4a0584c52090100e9f9fe2c53ac6614965976f1ada9134212734966199a6c116ce2e304ed54ec240c489c293928daf664f109d003d29c5c79c1e3b4a6ee08403
+DIST mp4v2-1.9.1.tar.bz2 432943 SHA256 5c381caeab2326fc48cfda0fe202bdb8ba0ae624d9c97ad7680a2b07e2c2e3b4 SHA512 28b6f96c1d44a1601980113767c38f5b5b058e1a1fae25c18632163e948c18fc884af9d146bb68e771303ab3c5c8ef9437f4fffa7d770d29157f2d455ee4b1c8 WHIRLPOOL 7ba33598287002d4227bcc4bfc1e8fe71241b95ed7151704b78a250d0f5f7d5c77cabf0195502d368571f5668f775fdecc09700bea12859c827d0d29aa654f5e
+EBUILD aacgain-1.9-r1.ebuild 2020 SHA256 7409449bb23b9e2519f3a3459f3a90dff45480a9b6ca08b3d6f34cc170dbe25d SHA512 e5ec85e4cbb9568acd6a1be7c88bc71516247932df4d80013f1ffcf90ab98ff9bdafbd0e884dea3a6b618ecabfe35ab8f2ed408352984feea190f1a5eb828167 WHIRLPOOL b03eeb51a3d6c75a7cc67f964dd927b130f21315c9818651c3bd789ce39db03f5f2db7514218cb043d20a09893e4afd8ac114a36738efb668d613e97a7c96273
+EBUILD aacgain-1.9.ebuild 1989 SHA256 325ef9aad003445c01d4a05d32b27553674881b813c011a50087c457669a86ab SHA512 cb9ac85128c4ca21d3176bf775d8838e988dbcb0024414dab81abb088ca96ed02e042d403ec09ee9d3b8a91c36df8bf030ce5ee8835691ca243d163b72c069ca WHIRLPOOL 455ff3e09ce0c056ec1bd4b5cb5ea3081123cedd5f61779ba5690e988377dee5e827776a3fc991a1cc24789a2f66909a5e89919404e8c824e662e1eb11459b75
+MISC ChangeLog 3537 SHA256 9179e9bf19c018411cd7c83360c4013613f3c0a9b3014b2dab23a6e6657f0a11 SHA512 7ed8f70b60449f8711e14078a79967855d646c8bfa6661f69331c4e4b522fd03d3614f0d5d51b2ba3c0d042a118c2180ea85dea72283c5dfc778c2fcd1c0b514 WHIRLPOOL 480154f1229fa901148858ad0a44c92ab77c9473dce641e94d8637fd45f5def6941b2b7ec054b1030947c12fd26d0fcf625ee22c274ce3387ecb857fc118ebba
+MISC ChangeLog-2015 1956 SHA256 bc0356713329fba004943fde447609dc9b3c0592f42c651d5a94df1c6d87552c SHA512 1bc57511cca6f6011d06c24e4342886dac31bfb2d6386c87b4b644a8b49824523c42ba7098a50a0a02f3e8ae2abfea9662d35ba36c1dc70b27ded7b3ffd12b27 WHIRLPOOL 4397a650b24ee2e74fa623d6d67eea3dfbb514abae34ec588706cf784676d6d678fb48e4c8e9c3a93d4b437592e5d9224a699b402d2f141ce521fdd051ca564a
+MISC metadata.xml 922 SHA256 4c7093dadb5def8cd9194d70ced581f50034d9e70eb0849e20135a85ce2f81b5 SHA512 66e05b9c17bf6c66bdcd0c26dec1f15e04c21b7d815df058739d969b6067026b15249bdd3d5813847030b5038fc5b15097479d2aafa60fa2fdf5fc3c2a21ece7 WHIRLPOOL 7adf54b856c9d0c5b8adad44b8221a2048c70e68910b6495b52b81775f467b3f7f0e24142aeed63586e480475b7397560cc5bae1f9999f9d7d833de43d015c24
diff --git a/media-sound/aacgain/aacgain-1.9-r1.ebuild b/media-sound/aacgain/aacgain-1.9-r1.ebuild
new file mode 100644
index 000000000000..d278711d59b5
--- /dev/null
+++ b/media-sound/aacgain/aacgain-1.9-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools
+
+FAAD2_PV="2.7"
+MP4V2_PV="1.9.1"
+MP3GAIN_PV="1.5.2"
+
+DESCRIPTION="AACGain normalizes the volume of music files using the Replay Gain algorithm"
+HOMEPAGE="http://aacgain.altosdesign.com/"
+SRC_URI="http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
+	https://mp4v2.googlecode.com/files/mp4v2-${MP4V2_PV}.tar.bz2
+	mirror://sourceforge/mp3gain/mp3gain-${MP3GAIN_PV//./_}-src.zip
+	mirror://sourceforge/faac/faad2-${FAAD2_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+DOCS="${PN}/README"
+
+src_unpack() {
+	mkdir -p "${S}"
+	for X in ${A}; do
+		case "${X}" in
+			mp3gain*)
+				mkdir -p "${S}/${X%%-*}"
+				cd "${S}/${X%%-*}"
+				unpack "${X}"
+				;;
+			*)
+				cd "${S}"
+				unpack "${X}"
+				[ -d "${X%%-*}" ] || mv -f "${X%%-*}"-* "${X%%-*}"
+				;;
+		esac
+	done
+}
+
+PATCHES=(
+	${PN}/mp4v2.patch
+	"${FILESDIR}"/${P}-patch-dotdot.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's:iquote :I:' faad2/libfaad/Makefile.am || die
+	sed -i -e 's:../\(mp4v2/\):\1:g' ${PN}/mp4v2.patch || die
+	sed -i -e 's:\(libmp4v2\|libfaad/libfaad\)\.la:README:g' \
+		-e 's:^\(autoreconf\|pushd\|popd\):# \1:g' aacgain/linux/prepare.sh || die
+
+	cd "${S}/${PN}/linux"
+	sh prepare.sh || die "prepare failed!"
+
+	cd "${S}"
+	eautoreconf
+
+	cd "${S}/faad2"
+	eautoreconf
+
+	cd "${S}/mp4v2"
+	elibtoolize
+}
+
+src_configure() {
+	local myconf="--disable-dependency-tracking"
+	local myconf2="${myconf} --disable-shared --enable-static"
+
+	cd "${S}/faad2"
+	econf ${myconf2} --without-xmms --without-mpeg4ip
+
+	cd "${S}/mp4v2"
+	econf ${myconf2} --disable-gch
+
+	cd "${S}"
+	econf ${myconf}
+}
+
+src_compile() {
+	cd "${S}/faad2/libfaad"
+	emake
+
+	cd "${S}/mp4v2"
+	emake
+
+	cd "${S}"
+	emake
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "BACK UP YOUR MUSIC FILES BEFORE USING AACGAIN!"
+	ewarn "THIS IS EXPERIMENTAL SOFTWARE. THERE HAVE BEEN"
+	ewarn "BUGS IN PAST RELEASES THAT CORRUPTED MUSIC FILES."
+	ewarn
+}
diff --git a/media-sound/aacgain/aacgain-1.9.ebuild b/media-sound/aacgain/aacgain-1.9.ebuild
new file mode 100644
index 000000000000..d48172721789
--- /dev/null
+++ b/media-sound/aacgain/aacgain-1.9.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils autotools
+
+FAAD2_PV="2.7"
+MP4V2_PV="1.9.1"
+MP3GAIN_PV="1.5.2"
+
+DESCRIPTION="AACGain normalizes the volume of music files using the Replay Gain algorithm"
+HOMEPAGE="http://aacgain.altosdesign.com/"
+SRC_URI="http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
+	https://mp4v2.googlecode.com/files/mp4v2-${MP4V2_PV}.tar.bz2
+	mirror://sourceforge/mp3gain/mp3gain-${MP3GAIN_PV//./_}-src.zip
+	mirror://sourceforge/faac/faad2-${FAAD2_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+DOCS="${PN}/README"
+
+src_unpack() {
+	mkdir -p "${S}"
+	for X in ${A}; do
+		case "${X}" in
+			mp3gain*)
+				mkdir -p "${S}/${X%%-*}"
+				cd "${S}/${X%%-*}"
+				unpack "${X}"
+				;;
+			*)
+				cd "${S}"
+				unpack "${X}"
+				[ -d "${X%%-*}" ] || mv -f "${X%%-*}"-* "${X%%-*}"
+				;;
+		esac
+	done
+}
+
+src_prepare() {
+	sed -i -e 's:iquote :I:' faad2/libfaad/Makefile.am
+	sed -i -e 's:../\(mp4v2/\):\1:g' ${PN}/mp4v2.patch
+	sed -i -e 's:\(libmp4v2\|libfaad/libfaad\)\.la:README:g' \
+		-e 's:^\(autoreconf\|pushd\|popd\):# \1:g' aacgain/linux/prepare.sh
+
+	epatch ${PN}/mp4v2.patch
+	epatch "${FILESDIR}"/${P}-patch-dotdot.patch
+
+	cd "${S}/${PN}/linux"
+	sh prepare.sh || die "prepare failed!"
+
+	cd "${S}"
+	eautoreconf
+
+	cd "${S}/faad2"
+	eautoreconf
+
+	cd "${S}/mp4v2"
+	elibtoolize
+}
+
+src_configure() {
+	local myconf="--disable-dependency-tracking"
+	local myconf2="${myconf} --disable-shared --enable-static"
+
+	cd "${S}/faad2"
+	econf ${myconf2} --without-xmms --without-mpeg4ip
+
+	cd "${S}/mp4v2"
+	econf ${myconf2} --disable-gch
+
+	cd "${S}"
+	econf ${myconf}
+}
+
+src_compile() {
+	cd "${S}/faad2/libfaad"
+	emake
+
+	cd "${S}/mp4v2"
+	emake
+
+	cd "${S}"
+	emake
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "BACK UP YOUR MUSIC FILES BEFORE USING AACGAIN!"
+	ewarn "THIS IS EXPERIMENTAL SOFTWARE. THERE HAVE BEEN"
+	ewarn "BUGS IN PAST RELEASES THAT CORRUPTED MUSIC FILES."
+	ewarn
+}
diff --git a/media-sound/aacgain/files/aacgain-1.9-patch-dotdot.patch b/media-sound/aacgain/files/aacgain-1.9-patch-dotdot.patch
new file mode 100644
index 000000000000..5beda664d83e
--- /dev/null
+++ b/media-sound/aacgain/files/aacgain-1.9-patch-dotdot.patch
@@ -0,0 +1,16 @@
+diff -ru aacgain-1.9-orig/aacgain/linux/prepare.sh aacgain-1.9/aacgain/linux/prepare.sh
+--- aacgain-1.9-orig/aacgain/linux/prepare.sh	2013-02-19 07:00:54.313006065 +0100
++++ aacgain-1.9/aacgain/linux/prepare.sh	2013-02-19 07:01:42.849006331 +0100
+@@ -51,7 +51,11 @@
+ #remove obsolete config.h; a correct one will be created by automake's configure
+ rm -f ../../mp3gain/mpglibDBL/config.h
+ #correct header include paths
+-patch -p0 -N <mp3gain.patch
++sed -i 's:../../::' mp3gain.patch
++old="$(pwd)"
++cd ../..
++patch -p0 -N <"${old}/mp3gain.patch"
++cd "$old"
+ 
+ echo Creating the configure script
+ cp -p configure.ac ../..
diff --git a/media-sound/aacgain/metadata.xml b/media-sound/aacgain/metadata.xml
new file mode 100644
index 000000000000..d724065eb22a
--- /dev/null
+++ b/media-sound/aacgain/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">AACGain is a modification to Glen Sawyer's excellent mp3gain program.
+		It supports AAC (mp4/m4a/QuickTime) audio files in addtion to mp3 files.
+		If you are not familiar with mp3gain, stop reading this, and go to
+		http://mp3gain.sourceforge.net.	AACGain normalizes the volume of digital
+		music files using the ReplayGain algorithm. It works by modifying the
+		global_gain fields in the mp4 samples. Free-form metadata tags are added
+		to the file to save undo information, making the normalization process
+		reversable. AACGain uses the same command-line user interface as mp3gain.</longdescription>
+	<upstream>
+		<remote-id type="google-code">mp4v2</remote-id>
+		<remote-id type="sourceforge">faac</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/aacplusenc/Manifest b/media-sound/aacplusenc/Manifest
new file mode 100644
index 000000000000..0caf281ce56d
--- /dev/null
+++ b/media-sound/aacplusenc/Manifest
@@ -0,0 +1,7 @@
+AUX aacplusenc-0.17.5-asneeded.patch 547 SHA256 55d5d7d4d76763b5e87c1eeab3694ffdaa78df0dffe7ab050ca76ad38fae2d43 SHA512 c12af07b88c012ad9d0f2c162a3b9fef74ebea3985253831b369db20a637c317ce3592b0f2a521ba8923332d3a019cc04586241bb1a03cbc9e551fc2ac395633 WHIRLPOOL 16dbd9ae857cd405316b1d13cac401475585e5c07e96178c648117e9a361fe4d5b339686f986fb210df888bf5c5fe4ad17662d7454f13650726b242846657c35
+AUX aacplusenc-0.17.5-libm.patch 468 SHA256 3e0cd0dcc4c007aa3ead32d4739c4537e354818361bdaa0b8198de20ae28835a SHA512 b0e0093c6dbee03b7e9ec1100713d8329b558010b473fb1e036196f9acedd738a41e7247ee671042f319df05823e80b4e99b33e052b092eadab154259dffc4db WHIRLPOOL dfbcade318cb74994786fbb6884a4bced8290c7aed947ff9fc5df34a4016785f7c8552c92bc72f248e450fdcb00b7af714c02bd3df5155cd1c3dab6f28b3f478
+DIST aacplusenc_0.17.5.tar.gz 547953 SHA256 318df58a86ac0647d6bfbcd8766fe301ad2ed08ffb4ef4e016e088f4dceb1669 SHA512 75dadadfcddc551217ad71f021d6f4a190271428dc32603ec64429024ad7747884f5080f0cbb43a79895db527e9802cf3693b0dbf90f8b4b7023ea7e9bb43873 WHIRLPOOL fd9ed148d65ed3cfaeecea23b659be9f67bac16ad5527ecf6eeb50f59620cdb5903b7947c10016134cbcbeee2aa7912d19596eb8a4ae1a6e46a035eb22973649
+EBUILD aacplusenc-0.17.5.ebuild 1081 SHA256 809412d8eb21f8569aa346fc38973e7c348c7e95b41bd88ea91a95f851324147 SHA512 4e11282d3df995e476ac29f78d60710e429b9197c458e9ca9f0ab9fafae506eb84319ebf1c36afc9b53f8332b905fa93a68f6d5b0f852dd2c479212260b2eb81 WHIRLPOOL 7b2f792c6dc458a59b001ee49f9f6139c78300b6f690a0ff463d5b209c69f7c5a984bfa838c1a2ce14629f58b81d2655fd39e07737e6d4404438c00c0a6a61b5
+MISC ChangeLog 3137 SHA256 a19053a8d5d87990875f4b6022a2c0de25caaeb56eaf29dc671f5c92b67bfcd6 SHA512 6d6028b30b17fa46c2b60879c2700df509d70b2770b005c9abb7b13fec304068bb9f97e1bcd317a299824024a2942ba18b90ebe74509b11e6438dc789c42ca29 WHIRLPOOL aa4191b7e511a6f0dd4ed2eaaca416ee8a9ffafc6f78f7b90b9dfd185808a1434062ddbf9070eb5c1062b6eba364d5ae188f49cfcb8509c9ecd7b3922cf2ebed
+MISC ChangeLog-2015 1061 SHA256 38fe3e9b822a385d7894ded5664cc4615d185c0176bc66ec6634dd27084ebc88 SHA512 9fc9f86e9677214472432a68223d0da8ca4ee4354cd20215bdae9e167ff612cc3a6399216be633f84cf79ca00921992dfb6bab6e270fab2a69d14b3ac99f6a41 WHIRLPOOL 2297f839cd042d0bbd6976843bec1fbff877bd53125dae4fea74b96b34ab267df0503647c474f98fa7b0847a93b681e0d52940bf50a8c1295f6ac284fca6d613
+MISC metadata.xml 332 SHA256 bb62ec03f78a5f5ebac64da2309046f84bea1169b704054682c3ff41b1a30a87 SHA512 7a53a8170246254eb1415336165c578504c45e8e26469870b87271fccc4db0c0a887e24830dfcae05898cac688c67bc30cbcaa0f4bae5febf79eb1aace5c20a4 WHIRLPOOL 3b480a951cc70185492e3250c38b00d52dfab65613d775636f09ab91bb8424e53487977f1331e4a40505a121a8ddb01c1b6f6cedf996ad6e9a2293faa0b9f321
diff --git a/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild b/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
new file mode 100644
index 000000000000..122f74131ecb
--- /dev/null
+++ b/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="High-Efficiency AAC (AAC+) Encoder"
+HOMEPAGE="http://teknoraver.net/software/mp4tools/"
+SRC_URI="https://launchpad.net/~teknoraver/+archive/ubuntu/ppa/+files/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sci-libs/fftw:3.0"
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+# 3GPP patenting issues
+RESTRICT="mirror test"
+
+PATCHES=(
+	"${FILESDIR}/${P}-asneeded.patch"
+	"${FILESDIR}/${P}-libm.patch"
+)
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	default
+	sed \
+		-e 's:LDFLAGS:LIBRARIES:g' \
+		-e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \
+		-e 's:ar r:$(AR) r:g' \
+		-e 's:strip:true:' \
+		-e 's:-O3 -ftree-vectorize::' \
+		-i configure Makefile lib*/Makefile || die "sed failed"
+}
+
+src_configure() {
+	tc-export AR CC
+	./configure || die "./configure failed"
+}
+
+src_compile() {
+	emake EXTRACFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake INSTDIR="${D}/usr" install
+	doman ${PN}.1
+	dodoc debian/changelog
+}
diff --git a/media-sound/aacplusenc/files/aacplusenc-0.17.5-asneeded.patch b/media-sound/aacplusenc/files/aacplusenc-0.17.5-asneeded.patch
new file mode 100644
index 000000000000..53b7d7c62f88
--- /dev/null
+++ b/media-sound/aacplusenc/files/aacplusenc-0.17.5-asneeded.patch
@@ -0,0 +1,20 @@
+--- aacplusenc/configure.orig
++++ aacplusenc/configure
+@@ -8,7 +8,7 @@
+ 
+ echo -n 'Checking for libfftw3f...'
+ 
+-gcc -o test-fft -Wall -x c -lfftw3f -I/usr/local/include -L/usr/local/lib - <<'EOF'
++${CC} ${LDFLAGS} ${CFLAGS} -o test-fft -Wall -x c -lfftw3f -I/usr/local/include -L/usr/local/lib - <<'EOF'
+ #include <fftw3.h>
+ 
+ #define N 128
+@@ -38,7 +38,7 @@
+ 
+ echo -n 'Detecting endianness...'
+ 
+-gcc -o test-endian -Wall -x c - <<'EOF'
++${CC} ${LDFLAGS} ${CFLAGS} -o test-endian -Wall -x c - <<'EOF'
+ #include <stdint.h>
+ #include <stdio.h>
+ 
diff --git a/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch b/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch
new file mode 100644
index 000000000000..37a3f904fea3
--- /dev/null
+++ b/media-sound/aacplusenc/files/aacplusenc-0.17.5-libm.patch
@@ -0,0 +1,13 @@
+--- aacplusenc/Makefile.orig
++++ aacplusenc/Makefile
+@@ -5,9 +5,8 @@
+ LIBS=libaacenc/libaacenc.a libbitbuf/libbitbuf.a libfr/libfr.a libsbrenc/libsbrenc.a libresamp/libresamp.a
+ TARGET=aacplusenc
+ 
+-LDFLAGS=-lm
+ LDFLAGS+=-L$(TOPDIR)/libaacenc -L$(TOPDIR)/libbitbuf -L$(TOPDIR)/libfr -L$(TOPDIR)/libsbrenc -L$(TOPDIR)/libresamp
+-LDFLAGS+=-laacenc -lbitbuf -lfr -lsbrenc -lresamp
++LDFLAGS+=-laacenc -lbitbuf -lfr -lsbrenc -lresamp -lm
+ 
+ ifdef FFTW3
+ 	LDFLAGS+=-lfftw3f
diff --git a/media-sound/aacplusenc/metadata.xml b/media-sound/aacplusenc/metadata.xml
new file mode 100644
index 000000000000..9c160a7a0b31
--- /dev/null
+++ b/media-sound/aacplusenc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">~teknoraver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
new file mode 100644
index 000000000000..25d43f6daeef
--- /dev/null
+++ b/media-sound/abcde/Manifest
@@ -0,0 +1,8 @@
+AUX abcde-2.5.4-eyeD3-0.7-api.patch 622 SHA256 93a18f5587a851eeee4ff616b60095f52e270386bd4271f3b93b74d0185f3269 SHA512 6d9ac83d900f7c3b020903ed90568c5d0c5758664d899b8f778ca69a8ef0eb21d4d60795aa682fd031a0a27b95c2f0b1a7e635ef40e59f9c5f1f05d21f4bacdc WHIRLPOOL 4890c7b87ace7350e381093249df2b85219f60d6458eda537d255356614111ff2a87eb65fb09797d80a6002a466a2458743ab0f12d2a1b34434a0958328c5601
+DIST abcde-2.5.4.tar.gz 104229 SHA256 85b679b970e728a986487adcbff7c51eb0e72f9fa10c4450521f8e029fa6e591 SHA512 be3c8f697873b65888a37ea6209e161a6fc7bbe26c6e139b211b1fbcb233d3e250b21f6fad2114962ca4dcce79240e2cec51f69ce47549c737071a6122694791 WHIRLPOOL ae5ea868c7d66f8bd367f0a9724546721524b84ae0478fb9bd2ae64b1c1b358a24bfd8d0303ce3012c2bcce40d3b97a1cbcedcb13f8d4dea2ae6cd988d6c0921
+DIST abcde-2.8.1.tar.gz 149238 SHA256 e49c71d7ddcd312dcc819c3be203abd3d09d286500ee777cde434c7881962b39 SHA512 18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36 WHIRLPOOL ba86b0c635c6ecd3196ca1991d938b3d48c96cca9fd71a1bb4294add05f27605075407a5a784bc188276046d4a8cc5ff12b29e01956565186d64b14ff32d7633
+EBUILD abcde-2.5.4-r1.ebuild 1556 SHA256 9602af5de518e9d06867229a277f83d56a14e7102a93f2519f25823ebf49b985 SHA512 cfae3e23754c1b6a8170d8f4046a4c436ae7247f19e9af3c4397229bc5677f55d935bed731ece8f316edf91f7887e6bf39194d4f094f3810ad9306c7a189e030 WHIRLPOOL 3df31aa1475a004388db5215f7afd1a83ad95420a8236623c6d93bdf8ac5747f91e28395c7d0ed59e9036129d5a5e485b8bbe63eb9854165f7247a9e087d4e78
+EBUILD abcde-2.8.1.ebuild 1783 SHA256 4de82fa2b6d3378c925752ea2b95be8f7a88e6ec764603bb1d36a6e614d650ef SHA512 7339823db4743cc7ec7ee99648625f45ebc87cc6cb0070c30b13beec24b2a66b8646de6d994386b48d523fc6322151550980730ba6c3f002b85834cda03cc885 WHIRLPOOL 48118e9725bdbe2542f6b2083703dd38144227b7f07a9cac3e5a70e593d6096f118982ec3e60ffa9cec461b8d14c9a01787233058681ea2851f51c1a1db987f0
+MISC ChangeLog 3854 SHA256 d2354cbe41afb6340d6b017330bcf7caf0148d477242f9ab05541c021ba33d9d SHA512 b17f029b1f8a687df6ad288d4c1af8325992e876f8c0fe4fbb2639ca43d9ab72c9831705a85af249e2fce66bbd9fc46bb61a0a455ae2a7f5da38ee3700b0eb99 WHIRLPOOL 46e606e249c0e3da98e827c9447e0f0d39d2b212dc46058386a670f8dcd866151bc2183d9e29ad7016f3436ab2a72202389498de312ccd2f93ea739e412c2834
+MISC ChangeLog-2015 11229 SHA256 0605c9ace3658a0e20b5d34a78ba5bbd73e4a92a3161e739289e815ee09966f4 SHA512 d8655e095a2dc2d4d069865355c14475cbada587e5c90d8078c30c3632af492c699d66cadbc677fb0ebfd246996f1832fd9e11ed97fbf1c51e9eaa52809b81b4 WHIRLPOOL aaaa6fa8c3aa802703e6e422e3fab0aff3a5fa203754da08c84c6617f66f9d2938429b6475aa05c98f3b13a71c4b7f84db030d464c8d57995929744f5d2813b2
+MISC metadata.xml 651 SHA256 c4563d5333f8ef7576a9f7efe228644819ad472759951ab8a10d72275a5d449c SHA512 9174fb9c065d85ff2cb5312bca39bf33d5798f06caafe2a6d8e5fc239b253df8956a30b920fb0392e6a979328c975718f8393655a7cdaf975a72747de1c67ef5 WHIRLPOOL 0a3aff9b6d804ab6b2295aab3226e051d88aab89ec9e054d9b3b9e74f8b2bd6e4ee422acf3ccdcfc82cb5e7bcaee21796c50b1fdde2d35243d471a863879be32
diff --git a/media-sound/abcde/abcde-2.5.4-r1.ebuild b/media-sound/abcde/abcde-2.5.4-r1.ebuild
new file mode 100644
index 000000000000..1a0fc6bf0134
--- /dev/null
+++ b/media-sound/abcde/abcde-2.5.4-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A command line CD encoder"
+HOMEPAGE="https://code.google.com/p/abcde/"
+SRC_URI="https://abcde.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+# Enable MP3 related flags by default
+IUSE="aac cdparanoia cdr flac +id3tag +lame musicbrainz normalize replaygain speex vorbis"
+
+# See `grep :: abcde-musicbrainz-tool` output for USE musicbrainz dependencies
+RDEPEND="media-sound/cd-discid
+	net-misc/wget
+	virtual/eject
+	aac? (
+		media-libs/faac
+		|| ( media-video/atomicparsley media-video/atomicparsley-wez )
+		)
+	cdparanoia? (
+		|| ( dev-libs/libcdio-paranoia media-sound/cdparanoia )
+		)
+	cdr? ( virtual/cdrtools )
+	flac? ( media-libs/flac )
+	id3tag? (
+		dev-python/eyeD3:0.7
+		>=media-sound/id3-0.12
+		media-sound/id3v2
+		)
+	lame? ( media-sound/lame )
+	musicbrainz? (
+		dev-perl/MusicBrainz-DiscID
+		dev-perl/WebService-MusicBrainz
+		virtual/perl-Digest-SHA
+		virtual/perl-Getopt-Long
+		)
+	normalize? ( >=media-sound/normalize-0.7.4 )
+	replaygain? (
+		vorbis? ( media-sound/vorbisgain )
+		lame? ( media-sound/mp3gain )
+		)
+	speex? ( media-libs/speex )
+	vorbis? ( media-sound/vorbis-tools )"
+
+src_prepare() {
+	sed -i -e 's:etc/abcde.co:etc/abcde/abcde.co:g' abcde || die
+
+	epatch "${FILESDIR}"/${P}-eyeD3-0.7-api.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" etcdir="${D}"etc/abcde install
+
+	dodoc changelog FAQ README TODO USEPIPES
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/media-sound/abcde/abcde-2.8.1.ebuild b/media-sound/abcde/abcde-2.8.1.ebuild
new file mode 100644
index 000000000000..b027b72810a5
--- /dev/null
+++ b/media-sound/abcde/abcde-2.8.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A command line CD encoder"
+HOMEPAGE="https://abcde.einval.com/"
+SRC_URI="https://abcde.einval.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# Enable MP3 related flags by default
+IUSE="aac cdparanoia cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack"
+
+# See `grep :: abcde-musicbrainz-tool` output for USE musicbrainz dependencies
+RDEPEND="media-sound/cd-discid
+	net-misc/wget
+	virtual/eject
+	aac? (
+		|| ( media-libs/faac media-sound/neroaac )
+		|| ( media-video/atomicparsley media-video/atomicparsley-wez )
+		)
+	cdparanoia? (
+		|| ( dev-libs/libcdio-paranoia media-sound/cdparanoia )
+		)
+	cdr? ( virtual/cdrtools )
+	flac? ( media-libs/flac )
+	id3tag? (
+		dev-python/eyeD3:0.7
+		>=media-sound/id3-0.12
+		media-sound/id3v2
+		)
+	lame? ( media-sound/lame )
+	mac? (
+		media-sound/apetag
+		media-sound/mac
+		)
+	musepack? ( media-sound/musepack-tools )
+	musicbrainz? (
+		dev-perl/MusicBrainz-DiscID
+		dev-perl/WebService-MusicBrainz
+		virtual/perl-Digest-SHA
+		virtual/perl-Getopt-Long
+		)
+	normalize? ( >=media-sound/normalize-0.7.4 )
+	opus? ( media-sound/opus-tools )
+	replaygain? (
+		vorbis? ( media-sound/vorbisgain )
+		lame? ( media-sound/mp3gain )
+		)
+	speex? ( media-libs/speex )
+	vorbis? ( media-sound/vorbis-tools )
+	wavpack? ( media-sound/wavpack )
+"
+
+src_prepare() {
+	default
+	sed -i 's:etc/abcde.co:etc/abcde/abcde.co:g' abcde || die
+	sed -i -e '/^prefix/s/=/?=/' -e '/^sysconfdir/s/=/?=/' Makefile || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="/usr" sysconfdir="/etc/abcde" install
+
+	dodoc changelog FAQ README
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/media-sound/abcde/files/abcde-2.5.4-eyeD3-0.7-api.patch b/media-sound/abcde/files/abcde-2.5.4-eyeD3-0.7-api.patch
new file mode 100644
index 000000000000..15f234877996
--- /dev/null
+++ b/media-sound/abcde/files/abcde-2.5.4-eyeD3-0.7-api.patch
@@ -0,0 +1,22 @@
+Update to eyeD3 >= 0.7.0 API
+
+--- abcde
++++ abcde
+@@ -829,7 +829,7 @@
+						-a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
+						-G "$GENREID" -n "${TRACKNUM:-$1}" \
+						${TRACKNUM:+-N "$TRACKS"} \
+-						${ENCODING:+--set-encoding="$ENCODING"} \
++						${ENCODING:+--encoding "$ENCODING"} \
+						${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
+						"$ABCDETEMPDIR/track$1.$OUTPUT"
+					;;
+@@ -3879,7 +3879,7 @@
+	TAGGER="$EYED3"
+	TAGGEROPTS="$ID3V2OPTS"
+	ID3SYNTAX=eyed3
+-	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
++	TAGGEROPTS="--encoding utf16 $ID3V2OPTS"
+ fi
+
+ # NOGAP is specific to lame. Other encoders fail ...
diff --git a/media-sound/abcde/metadata.xml b/media-sound/abcde/metadata.xml
new file mode 100644
index 000000000000..41b01c0f1635
--- /dev/null
+++ b/media-sound/abcde/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="id3tag">Support ID3, ID3v2 tagging of audio files</flag>
+		<flag name="mac">Enable support for Monkey's Audio files</flag>
+		<flag name="normalize">Add support for normalizing audio file volume levels</flag>
+		<flag name="opus">Support opus encoding using opusenc</flag>
+		<flag name="replaygain">Support for Replay Gain metadata, for relative volume adjustment</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
new file mode 100644
index 000000000000..aaa1f52dfac1
--- /dev/null
+++ b/media-sound/abcm2ps/Manifest
@@ -0,0 +1,14 @@
+DIST abcm2ps-8.12.9.tar.gz 238669 SHA256 72b8f40964234edf2043bdc83527c37989bbb5fb3b4c108c2ef3cd1883399af4 SHA512 77aa36fccfe508dcd132619c1a372d2b5a22957a58795610aec4eed0e4f5c9dc268298dcd86691a26b8e0b126d38c4c61ba4766a5a39adbd8279985a74229cd5 WHIRLPOOL 63ee2d76a9fd80e56b419e22db9d9a9d132343049293d927ec179b3b5665ddc564b63c08f454b568b62f4e7200da7152a2cf2cd2e7a93e99b75d3fd8a178a601
+DIST abcm2ps-8.13.10.tar.gz 249235 SHA256 96a8133b587b8b8b92d485f52848134eb587379ff308b708a8e0bb64224bd90a SHA512 21e5c985c9b4ac0ba49973661f74bd6244a386030622919b6c8d5a220e5064b933929ddda0d025ad02638413d0b34c2687bb5370a858604c6a5e9a6b084369a4 WHIRLPOOL b8806d01afa991b523a27ed445c968c9ad40bdf03964e937052277b08371f0e0adfe73d6252ba5fb5e4dd2e8fbe7bee6161b36979c4c08913d7fe677b9d50bc8
+DIST abcm2ps-8.13.11.tar.gz 249332 SHA256 17afce68bb3709ccab9d89d81bdb9b7896224426094ce35913856bce09da62d4 SHA512 857102194fbc00a0ad21f36776a6fc3cdf0256a20f9a344440eff5e9e060e78dd32178948b53a33517964e75ba9e2954e96e857daf076ca296fa123388879056 WHIRLPOOL a20f24dc4473b761a82ee94ecdf3b97b5e41cf11a3b00af8caa02e566646379db9b2a16823aafce77b33bca87f1170cc3e53d985e56181699a901c911477bf85
+DIST abcm2ps-8.13.12.tar.gz 249460 SHA256 e77ec701148ad406e540bf3975a22e8dd184f71f7aac1d5cee2e305eaa8eefdb SHA512 3d708f02e358bde56b3f5407cd9f7d5a3645c6d0158f600ca7f2aef2a6c6ad03733d310e75375a65c8352a5a688c3b7841b74c014e857992d6eb128b81069f6b WHIRLPOOL c1202fac5355505e413a0097a13b786df68cfe069a1317d3126e997a075ef2087616667174b073d75cf6c27cb481b03c1bf78aa81eca7a7dcec0010048b65d64
+DIST abcm2ps-8.13.9.tar.gz 248893 SHA256 372bc6d5bb5ba087b71abeb6240c806f940a59e9664f46e5f4f1faec52e815a7 SHA512 7ce6efe605c073674ec7f30d26a34848e22a5c9f97058431243ee17598e35ebc991b760bc99847294f860f6b936e3ae2f504d2de842a487f226e32c47fac438e WHIRLPOOL 19a1219c5024b913e2bc5d6599c592e70cb110e751e39ce7cdf84bcc61a95afea0419dad08c6f4e29b63c14e12f24a6bd77203750c42f7503f00daf943b2d471
+DIST transpose_abc.pl 21045 SHA256 bd6960872bfbc9f71f183f36d533ea33b8cf62a6027b447f0b0b8adfa25a2848 SHA512 dc2623608a7b59d7e0c4d25160e69f696f170e9938dc3e035edbaf6f0163b4c6139892ec8734ea2aaba997507dcf32208562e898690600dc3c199046d4d151f3 WHIRLPOOL 81e327bbd76b40826adab06f7756c79c60289b21432b792c848db3ba1354528fa4f1a074cba890b6087cfac6e712427c6cbb2c9e6679c8ced22c362f6ec005f3
+EBUILD abcm2ps-8.12.9.ebuild 926 SHA256 63230bab9a025027f78de6bf87e34fd2a30c9a2891a0d80adcdc085c0a8b77d5 SHA512 322377f6f6e14a0e77685c9ab0af1d68676d8e846bc7ee9d134655a43ce5e10385ef08050952242a8fe155ae9a0e11be88a2a7c87885c2a36006bf4615fd95f1 WHIRLPOOL bd31711a3ab99dd1447a5208234b83decc2fcba08fba2995198ad1e0441a670e0c53eec30226d0863c5f824dc3e6e605135e91a8349c92cdbae5988aec154417
+EBUILD abcm2ps-8.13.10.ebuild 928 SHA256 974a893563bac397c859976bc20d5232296b736b71e1db48f3741b4bff53aabe SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c WHIRLPOOL 231499dc843a8991f94667b75567ad9c6893a1be2c900b474f1df2a17da1838250b59dafaf6193414599cedb479801d3eb5778a4add03b2615aea0be86207269
+EBUILD abcm2ps-8.13.11.ebuild 928 SHA256 974a893563bac397c859976bc20d5232296b736b71e1db48f3741b4bff53aabe SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c WHIRLPOOL 231499dc843a8991f94667b75567ad9c6893a1be2c900b474f1df2a17da1838250b59dafaf6193414599cedb479801d3eb5778a4add03b2615aea0be86207269
+EBUILD abcm2ps-8.13.12.ebuild 928 SHA256 974a893563bac397c859976bc20d5232296b736b71e1db48f3741b4bff53aabe SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c WHIRLPOOL 231499dc843a8991f94667b75567ad9c6893a1be2c900b474f1df2a17da1838250b59dafaf6193414599cedb479801d3eb5778a4add03b2615aea0be86207269
+EBUILD abcm2ps-8.13.9.ebuild 928 SHA256 974a893563bac397c859976bc20d5232296b736b71e1db48f3741b4bff53aabe SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c WHIRLPOOL 231499dc843a8991f94667b75567ad9c6893a1be2c900b474f1df2a17da1838250b59dafaf6193414599cedb479801d3eb5778a4add03b2615aea0be86207269
+MISC ChangeLog 4160 SHA256 71e58626d131a05abddf3fcc49a2c6371eed0b49c8495d6b21d0467847290d70 SHA512 fd140a303072081bd37d90f891a8193fea39bbf9169c2f8d951379b032de5213bf87632f015a569a2e25406a97b1227f8b2b2aac6b7b2da4097e9f29f16f58a1 WHIRLPOOL 2287231962fdfec09c72eed961daf3c374478f683cbe481a303c7d17028a4b9e153c4faa6cdc49ec6a249c71e72f03b0ec8e45afa32286218090b337c0f2e8d0
+MISC ChangeLog-2015 13409 SHA256 2b7f32fd6ee644516113d38768cc93fd4281c7343cac492bbc261a1277a2f33e SHA512 9092f3c6994e567e814960ec8062836d10909d8dd6e819991e2cd0510a42d8f5b093ed3e37a21210d22d4d9484f4780a5596471aa6df5cd91883d0abf284f2d4 WHIRLPOOL bff8cbc6fbcc86fd5256c470e7338d6031494da2f20a0d593e08a1632847df11b9f8b08ee3fe47cdb2b1e0dfb5afeb6fc8aba78c1de13f7484bec90987941b57
+MISC metadata.xml 360 SHA256 9aed43a52872c6198eba7a70cb3060b69da0a4e07cdeda066f567770d91f456a SHA512 7612e5473e6185cac8f54baf6e1bc1bb75e9e6b252d2cd59ed8865c190e0fee1924cbe6e6fc79c03fedfbcf5f9228d45244483b7ec2ccd7a8bd4997c4b6893c9 WHIRLPOOL a8821135e24e8e1b3758c5735bbfebbd11e8d17831a7e6553dad460c5a2297d866234791cd69589c70074068ac7a58265e55d20bd76ec085cc0e71f813f37a21
diff --git a/media-sound/abcm2ps/abcm2ps-8.12.9.ebuild b/media-sound/abcm2ps/abcm2ps-8.12.9.ebuild
new file mode 100644
index 000000000000..3b031f5eec3b
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-8.12.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A program to convert abc files to Postscript files"
+HOMEPAGE="http://moinejf.free.fr/"
+SRC_URI="http://moinejf.free.fr/${P}.tar.gz
+	http://moinejf.free.fr/transpose_abc.pl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="examples pango"
+
+RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--enable-a4 \
+		--enable-deco-is-roll \
+		$(use_enable pango)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin abcm2ps
+
+	insinto /usr/share/${PN}
+	doins *.fmt
+
+	dodoc Changes README *.txt
+
+	if use examples ; then
+		docinto examples
+		dodoc *.{abc,eps}
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	docinto contrib
+	dodoc "${DISTDIR}"/transpose_abc.pl
+}
diff --git a/media-sound/abcm2ps/abcm2ps-8.13.10.ebuild b/media-sound/abcm2ps/abcm2ps-8.13.10.ebuild
new file mode 100644
index 000000000000..2d4a35b58897
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-8.13.10.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A program to convert abc files to Postscript files"
+HOMEPAGE="http://moinejf.free.fr/"
+SRC_URI="http://moinejf.free.fr/${P}.tar.gz
+	http://moinejf.free.fr/transpose_abc.pl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples pango"
+
+RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--enable-a4 \
+		--enable-deco-is-roll \
+		$(use_enable pango)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin abcm2ps
+
+	insinto /usr/share/${PN}
+	doins *.fmt
+
+	dodoc Changes README *.txt
+
+	if use examples ; then
+		docinto examples
+		dodoc *.{abc,eps}
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	docinto contrib
+	dodoc "${DISTDIR}"/transpose_abc.pl
+}
diff --git a/media-sound/abcm2ps/abcm2ps-8.13.11.ebuild b/media-sound/abcm2ps/abcm2ps-8.13.11.ebuild
new file mode 100644
index 000000000000..2d4a35b58897
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-8.13.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A program to convert abc files to Postscript files"
+HOMEPAGE="http://moinejf.free.fr/"
+SRC_URI="http://moinejf.free.fr/${P}.tar.gz
+	http://moinejf.free.fr/transpose_abc.pl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples pango"
+
+RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--enable-a4 \
+		--enable-deco-is-roll \
+		$(use_enable pango)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin abcm2ps
+
+	insinto /usr/share/${PN}
+	doins *.fmt
+
+	dodoc Changes README *.txt
+
+	if use examples ; then
+		docinto examples
+		dodoc *.{abc,eps}
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	docinto contrib
+	dodoc "${DISTDIR}"/transpose_abc.pl
+}
diff --git a/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild b/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild
new file mode 100644
index 000000000000..2d4a35b58897
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A program to convert abc files to Postscript files"
+HOMEPAGE="http://moinejf.free.fr/"
+SRC_URI="http://moinejf.free.fr/${P}.tar.gz
+	http://moinejf.free.fr/transpose_abc.pl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples pango"
+
+RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--enable-a4 \
+		--enable-deco-is-roll \
+		$(use_enable pango)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin abcm2ps
+
+	insinto /usr/share/${PN}
+	doins *.fmt
+
+	dodoc Changes README *.txt
+
+	if use examples ; then
+		docinto examples
+		dodoc *.{abc,eps}
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	docinto contrib
+	dodoc "${DISTDIR}"/transpose_abc.pl
+}
diff --git a/media-sound/abcm2ps/abcm2ps-8.13.9.ebuild b/media-sound/abcm2ps/abcm2ps-8.13.9.ebuild
new file mode 100644
index 000000000000..2d4a35b58897
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-8.13.9.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A program to convert abc files to Postscript files"
+HOMEPAGE="http://moinejf.free.fr/"
+SRC_URI="http://moinejf.free.fr/${P}.tar.gz
+	http://moinejf.free.fr/transpose_abc.pl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples pango"
+
+RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--enable-a4 \
+		--enable-deco-is-roll \
+		$(use_enable pango)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin abcm2ps
+
+	insinto /usr/share/${PN}
+	doins *.fmt
+
+	dodoc Changes README *.txt
+
+	if use examples ; then
+		docinto examples
+		dodoc *.{abc,eps}
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	docinto contrib
+	dodoc "${DISTDIR}"/transpose_abc.pl
+}
diff --git a/media-sound/abcm2ps/metadata.xml b/media-sound/abcm2ps/metadata.xml
new file mode 100644
index 000000000000..a52c2abde1c3
--- /dev/null
+++ b/media-sound/abcm2ps/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="pango">Use the pango library to render fonts with non-latin characters</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
new file mode 100644
index 000000000000..5bf8ce3ced6f
--- /dev/null
+++ b/media-sound/abcmidi/Manifest
@@ -0,0 +1,8 @@
+AUX abcmidi-2016.05.05-docs.patch 614 SHA256 acd4b11d1023ce3cb9c2fa950c0b943bf9f1eb6fed5c5233c2de322917f03c43 SHA512 c06436cab7dbc4eb4bf8595e561402428bd1d45be653fa652841c3378e4b78f246ae5c862addf7bffbcb21d994f11151d464837f20915e91eef31d4f66618213 WHIRLPOOL a56e86fa197a6b9bbed3d674ad2da633fdc927ba7e63c22bb07d0addee008b3793ed856bc6bce135fd88335a193522b9e8d58580b4d801ff6d453359a789579d
+DIST abcMIDI-2017.09.12.zip 554105 SHA256 31091e62e21b57fefa111a5e239aff46a3e52adf5ceeec1182b4824761271401 SHA512 1c384785434d9289ae3591bd3a9658aec0b196c75808368bfabc2ff40cdf829c0a37dbeee6cb7c95ac3021666f4493cf9b0e01065f716ce43b377d3f0231c577 WHIRLPOOL 20bac295a5bc9a80607bbae105984cfa4e4a057364daa7541fc3ee5c1276c64f158999dab6d41f48143d0a4bec1ee04ac9df2975be6528865464b609e9627463
+DIST abcMIDI-2017.09.19.zip 554235 SHA256 08205e137a75aeab7613b6ddcbdbac593f3f6a89e4600606d6608a213e23be66 SHA512 de5205b8d05a99218af710d7d58e474aef23fbf41a2192d7be1b2430484f03dfec6632a56d078b23eb755e8faf909e2d2c90d94809c652754bf1e1616209156b WHIRLPOOL 71b20cc7fb471069def6fd05cc0702a37a96439c8ff5a9bb23e29c78cc2854ade83111bcf868ada0263a254d7344172c3c0eb47ea158cc584c3660e8380cb587
+EBUILD abcmidi-2017.09.12.ebuild 794 SHA256 b04f9fde0cea696204c97be5fc052fdffdc522c5f23de893add98675457d782c SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001 WHIRLPOOL 39a850861e57b7431152ad2a599b285b5f2c896d22eef298f03da60d8010ae426dd4401db7a067c15372d76de1c48d1f5d2a07268740096f755eeefc30279e48
+EBUILD abcmidi-2017.09.19.ebuild 794 SHA256 b04f9fde0cea696204c97be5fc052fdffdc522c5f23de893add98675457d782c SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001 WHIRLPOOL 39a850861e57b7431152ad2a599b285b5f2c896d22eef298f03da60d8010ae426dd4401db7a067c15372d76de1c48d1f5d2a07268740096f755eeefc30279e48
+MISC ChangeLog 4168 SHA256 dfde158a68a63628e011667f3f0ee948824dcb379fcb1a2a238360730678c6d5 SHA512 9d623a04dcfa9fcbfbbcdacd44a675ea2faeaeed04cb42f27ea2f1f6f7643f62f57adac819fe9a14a01abaab8a285dba9290d636eb04e13b80e7737efc045845 WHIRLPOOL 1bd98e8e359eef989d5023a8ec8277864b5cdb99dd90e0c429b0f6e46c2ecfcb2c56be284013b7d5a34caf7a8a855244b4bb3fc5074366be7a18b6240a301f25
+MISC ChangeLog-2015 8942 SHA256 eaebb0e8329e2be37d2750a40b5c6a32911c969934ae77dfde9ccc9f4053e91c SHA512 b3cf908c40b8b93d64ef4f0c4d787a3261e90a744f3cb5a7dc237829cc141bb2e2727c6ecce1111a94ed0e323ec49895fa6f17ca621c548475488ad4fbb03d1b WHIRLPOOL 9819d47080919e62c107480691acad5124dda6c63177164899e5aa2cae853e8d84d03d7de0f9a2fcb4cf6e5d98e2235edee9f4e08679209625c07ce403db1c2a
+MISC metadata.xml 326 SHA256 a2ccc6f3b97c41d5636859e54cb6731fcc2717c551ecb22b440116b17f5b0ddd SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a WHIRLPOOL 40eacbc7470fc238963f173dc58df5d55aaf97381bc9f8a6b3ba28adb173b2bd26324b5980ebd4e95191de81cd2deb8192052c467eccd218f289ccb39a9a8acb
diff --git a/media-sound/abcmidi/abcmidi-2017.09.12.ebuild b/media-sound/abcmidi/abcmidi-2017.09.12.ebuild
new file mode 100644
index 000000000000..adf33138050d
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2017.09.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="http://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="http://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
+	default
+
+	rm configure makefile || die
+	sed -i "s:-O2::" configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/abcmidi/abcmidi-2017.09.19.ebuild b/media-sound/abcmidi/abcmidi-2017.09.19.ebuild
new file mode 100644
index 000000000000..adf33138050d
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2017.09.19.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="http://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="http://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
+	default
+
+	rm configure makefile || die
+	sed -i "s:-O2::" configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/abcmidi/files/abcmidi-2016.05.05-docs.patch b/media-sound/abcmidi/files/abcmidi-2016.05.05-docs.patch
new file mode 100644
index 000000000000..bc36b260bd34
--- /dev/null
+++ b/media-sound/abcmidi/files/abcmidi-2016.05.05-docs.patch
@@ -0,0 +1,18 @@
+Install docs via Gentoo mechanisms instead of the build system.
+
+--- abcmidi/Makefile.in
++++ abcmidi/Makefile.in
+@@ -143,13 +143,6 @@
+ 	$(INSTALL) -d $(DESTDIR)$(bindir)

+ 	$(INSTALL) -m 755 ${binaries} $(DESTDIR)$(bindir)

+ 

+-	# install documentation

+-	$(INSTALL) -d $(DESTDIR)${docdir}

+-	$(INSTALL)  -m 644 doc/*.txt $(DESTDIR)$(docdir)

+-	$(INSTALL)  -m 644 doc/AUTHORS $(DESTDIR)$(docdir)

+-	$(INSTALL)  -m 644 doc/CHANGES $(DESTDIR)$(docdir)

+-	$(INSTALL)  -m 644 VERSION $(DESTDIR)$(docdir)

+-

+ 	# install manpages

+ 	$(INSTALL)  -d $(DESTDIR)${mandir}

+ 	$(INSTALL)  -m 644 doc/*.1 $(DESTDIR)$(mandir)

diff --git a/media-sound/abcmidi/metadata.xml b/media-sound/abcmidi/metadata.xml
new file mode 100644
index 000000000000..b96cfba7bec1
--- /dev/null
+++ b/media-sound/abcmidi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">abc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/adplay/Manifest b/media-sound/adplay/Manifest
new file mode 100644
index 000000000000..22f8970ca007
--- /dev/null
+++ b/media-sound/adplay/Manifest
@@ -0,0 +1,6 @@
+AUX adplay-1.7-fix-c++14.patch 615 SHA256 4c52c03b32c9ca8f94bb568d3f88f09d42884e661881a9865b5f4daf8d14f913 SHA512 aa18046f09493ae98ea2bfa6b2f3b39a4ccc8e24c5dbf584a90765b8962dbc6b037100844d0ad63b57e1ff60e78b45cc02dc10c9ca374d661d6caa87abfcd5ec WHIRLPOOL dd5efd1764cce68a8553201c8ca32a7ae9e471578bab9708c3ec3dea0b0f160566f866f12e59a540fa932335afdca99018200aeac7564d81d9d1ca9d9ff2fbdf
+DIST adplay-1.7.tar.bz2 264340 SHA256 2c62cf763de301a05d446655380465743c5b81fb027d9791996e5eac5bf6fdc6 SHA512 854a9bee1057d3a42308d9149e74a8abae0b6bdfda5e1466086df9d6aeed4bbc92a045bca02917fc699b43195572b39c6316ddf56ee3441add1a01d6cbbdfcbe WHIRLPOOL 2b8c657803ea102fd8b5461325bf022f4ea29ea6ed9ab6e1a05668423d1ec23e8f70b0e3b3462d56bfbfb73f4a439a25ec1e35ec15a1973280d13f6b12384ed7
+EBUILD adplay-1.7.ebuild 749 SHA256 6bf6a23561ab2c1395877cd0cc9d3b988df872bfafb42b027d044e72dcdc36dd SHA512 b54d9e6672fbe0cd86fe86fc33bda8159e016c9a8d06198b4a0dd0a42dd2651ebfe13421e16de3d655c89ae2d319cd0309c2faddec12bb3102a2ad832a2a4a56 WHIRLPOOL 8c59810aa08051622039527fa83283ca19f786bd8e8634697ac0395c70f9010978ea972618f6590d99971ebcf4e2b4355f0ca7d2a4914ed7c3894a60456e1ecb
+MISC ChangeLog 2616 SHA256 c2a52540da17999a5959e5aa756636cd385f8371b00839f7299d9ee170f2f246 SHA512 240ac5d4a087f281a5832e40c3bf97a68569242ee793add53d6cf43f5db7f07f09433805f96d8ffe7efc5f3de9a7273d2e6b33b3314d47b3734d247553c2b884 WHIRLPOOL b0a6a482bfd445c5dd43d8d176cc5d9c0b711fd6f6c2a00445c6b962e53eed4a14b01f87b1c08695f719db62b460bebac57bee5d4d9fd46a3971eb7e58ecf5e1
+MISC ChangeLog-2015 3382 SHA256 0b842d4ebdf557d23eb17c16cb9c65f596d6834e047adc3e9ed4ae9c8a664cd1 SHA512 2e8e145ab8555293a34e04345ed3cfc2a0edc91b3f5ccea10239348acf9a9f816eab18a85addf13610f433ba33a878b30d114a6f24afa5963d1e014bc57cf8a3 WHIRLPOOL af8dc00c9e5262e34bde53206ddf9129dd490b893eb96df98868c7a647385d9046ccbe3d50d8d2417846de65b22436a3a4687eb4a8fec47b9dd837b0c5da5eaa
+MISC metadata.xml 329 SHA256 cfc5475682e64822374960c3dcd2ca07acc5ff73a68026c58a417b24d3da9d28 SHA512 a865c199afa30a18b4b810b4bdd981dfd77fd5843740a43dffc59c10b2e151c66a8e39d73bea04024f544e83f24400ae10aedc9ae3e93db9a67694adf886a073 WHIRLPOOL 0ed02ed1a2ac6ee25d834fa08b00e48ed6630c43c2a01ec1e06f3d507a697812c4f4cacb4363c40b40270c1bc0ae1dcc78be32e93e929792763bf8516e04050f
diff --git a/media-sound/adplay/adplay-1.7.ebuild b/media-sound/adplay/adplay-1.7.ebuild
new file mode 100644
index 000000000000..f74ad97918ce
--- /dev/null
+++ b/media-sound/adplay/adplay-1.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A console player for AdLib music"
+HOMEPAGE="http://adplug.sourceforge.net"
+SRC_URI="mirror://sourceforge/adplug/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="alsa ao oss sdl"
+
+RDEPEND=">=media-libs/adplug-2.2.1
+	dev-cpp/libbinio
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	sdl? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/${PN}-1.7-fix-c++14.patch" )
+
+src_configure() {
+	econf \
+		--disable-output-esound \
+		$(use_enable alsa output-alsa) \
+		$(use_enable ao output-ao) \
+		$(use_enable oss output-oss) \
+		$(use_enable sdl output-sdl)
+}
diff --git a/media-sound/adplay/files/adplay-1.7-fix-c++14.patch b/media-sound/adplay/files/adplay-1.7-fix-c++14.patch
new file mode 100644
index 000000000000..aedbbc0ab1c5
--- /dev/null
+++ b/media-sound/adplay/files/adplay-1.7-fix-c++14.patch
@@ -0,0 +1,22 @@
+From 48dcaa87ff91369eb41998abd72e226fe138b528 Mon Sep 17 00:00:00 2001
+From: Adam Nielsen <malvineous@shikadi.net>
+Date: Sun, 22 May 2016 08:49:47 +1000
+Subject: [PATCH] Cast -1 to unsigned int to prevent compiler error
+
+---
+ src/adplay.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/adplay.cc b/src/adplay.cc
+index d73ec25..da00730 100644
+--- a/src/adplay.cc
++++ b/src/adplay.cc
+@@ -90,7 +90,7 @@ static struct {
+   1, 16, 0,  // Else default to mono (until stereo w/ single OPL is fixed)
+ #endif
+   MSG_NOTE,
+-  -1,
++  (unsigned int)-1,
+   NULL,
+   NULL,
+   true, false, false, false,
diff --git a/media-sound/adplay/metadata.xml b/media-sound/adplay/metadata.xml
new file mode 100644
index 000000000000..3be2784242d4
--- /dev/null
+++ b/media-sound/adplay/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">adplug</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/aeolus/Manifest b/media-sound/aeolus/Manifest
new file mode 100644
index 000000000000..4880e2208c94
--- /dev/null
+++ b/media-sound/aeolus/Manifest
@@ -0,0 +1,7 @@
+DIST aeolus-0.9.0.tar.bz2 69017 SHA256 f7bd08d228b15a1d76a21709b47899eea16ebda2585a4348fa4615a1fe8a7336 SHA512 b73ddcb3338dc2c30d11976c1cb7239fab455faf6b1cfc87582a1e48e8bdb90f163b467e93ed5e1c524900ecf59802f4012f83b2181cccad52186c99cfa2baf9 WHIRLPOOL d9293b1a94747e0b59776e9b860ca07abd489f600ebd841e7ec27437215879ca95fe8fb2dc5a6b340b03874aed96b310ba1dca49badcb4b6a2b9c47a5ffa8a15
+DIST aeolus-0.9.5.tar.bz2 69139 SHA256 db12392661af9b96dab57ded16aae276bbffc13f8d1eef1b6c02fb466144d771 SHA512 e80e7a861934b287afefe0186bd78c2d51662c29d3b7292469244c52b4949698c512dff72bebe1f76cf98e17e3f9183d3ce7a7da4856bf936dab091d3b9f4b0b WHIRLPOOL ca084dc16db1c90a939313047114212aa8666d5a56e2e65b8f301667754699485d1856bfa8fdd687b2b893397953e9371e9d0fae15f3a6ae7ecf5ce29f4b55f2
+EBUILD aeolus-0.9.0.ebuild 1410 SHA256 cdfac4c7acb047a8a6a48fafaff60cf03ef429d1bf8cdd253db5d95886058c33 SHA512 6eb5f61f563eb6d181cabc391a4ebd160d502d8d1df0801049d91756951f44d5fb0ed3b2e4985135ad1a72b7243cdc6610b80636c52d1b729c0eacd7febdf004 WHIRLPOOL 71d3bb3a545399b77dc0c4c01ec2c39cd1a4d539e132c5e61ac450dc20cf8d4dc19b3c6a2c4c58e698077c2a8779d9435374ee4c8d1dbca85df58dd7a62ebda1
+EBUILD aeolus-0.9.5.ebuild 1412 SHA256 709f4d2f1e965f698ef1a2e7f1f6fd1dcf09293aa78bf4de4b04fd8e2d200cab SHA512 b33617235dcc738bde0b0d6e438527d196d95bc02d260649db3b6c18d9fe2ceadc9fc64884699e1c4036847fe5f07fcb1f9cd33ebf6cd6f4f6f357989791ff26 WHIRLPOOL d79e0f7bd71c533fcc9f2b2c7a508c5cde5402196dac9523fcc2ade0eac6809c4ddc9031022d481b6b6ad44e3b16e462fb7e7a03c05f0e45db5a61d08bd59a3e
+MISC ChangeLog 3032 SHA256 ccd2dfca76abd0d71a5fb5628d55fc73dc6153c3a50cb5fa5547cf05821dc70f SHA512 e731e11b72341f11ee82cfe184bd72d7d70cba62ca3471bfe354d4c03e151db57510881b41bdc563b33f74cae0b4a5d02e8d17df91fecf57ebad898e62bc4ff4 WHIRLPOOL f7c30941f559713c55d74667c5bf6e2efa2573097f482b367c9e58c08815859823a8d86c750ae65eaada35611446f5cf414a7e5fc5c1a2b7b5af480c643afa15
+MISC ChangeLog-2015 1532 SHA256 2a7f3a02829e5aace78bb247ea3b69f0b89d41bc998ea7542914dd314f3a5d3c SHA512 ba580443b3203b5f21ec7ad44f1ee4a0673ec952115b3810dd7b5b818c143064e2471cd94560ebfddd2c33183eb29ab7b374e2ffcdfc8a4273d05c69a9b33bf4 WHIRLPOOL 96e7ef5745ca2f19a7961ff0b91083c0d588db2976568153b28695e20baf646cf44a86cb4981d9f3ecd08affb62d9649e8d67bd690fb0d5c89034b9c7085824a
+MISC metadata.xml 826 SHA256 d421bf561bebe0843bd18aaf65757e56f2babad5fe06693b2f93c249ccd541a9 SHA512 2b7e3f8ca98741ea01169a8c901b75509be285edbefec13eec449cb59fb0548158aed46054aac2a9095098e123a6cced745bc74b07b105ad9909a66de4a05368 WHIRLPOOL 445fe75a046eb0739225ba11b1cb57bf908e9d8c6678572fe56d75afce7ef15fdf0f5c1adfbbc87593db3cb692075b0e09a2ef5d5293660cf83fec7758fc4328
diff --git a/media-sound/aeolus/aeolus-0.9.0.ebuild b/media-sound/aeolus/aeolus-0.9.0.ebuild
new file mode 100644
index 000000000000..151f8c188ec4
--- /dev/null
+++ b/media-sound/aeolus/aeolus-0.9.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit versionator toolchain-funcs multilib flag-o-matic
+
+MY_P=${PN}-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A synthesised pipe organ emulator"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	media-libs/zita-alsa-pcmi
+	>=media-libs/libclthreads-2.4.0
+	>=media-libs/libclxclient-3.6.1
+	x11-libs/libXft
+	x11-libs/libX11
+	>=media-sound/jack-audio-connection-kit-0.109.2
+	media-libs/alsa-lib
+	sys-libs/readline:0"
+
+RDEPEND="${DEPEND}
+	media-libs/stops"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)/source
+
+src_compile() {
+	tc-export CXX
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags xft)
+	sed -i -e "s/-O3//" Makefile || die "Failed to remove forced CFLAGS"
+	sed -i -e "s:ldconfig:true:" Makefile || die "Failed to remove ldconfig call"
+	sed -i -e "s/g++/$(tc-getCXX)/" Makefile || die "Failed to set correct compiler"
+	sed -i -e "s/-lXft/`$(tc-getPKG_CONFIG) --libs xft`/" Makefile || die
+	emake PREFIX="/usr" LIBDIR=$(get_libdir)
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" install
+	dodoc ../README ../AUTHORS
+	echo "-S /usr/share/stops" > "${T}/aeolus.conf"
+	insinto /etc
+	doins "${T}/aeolus.conf"
+}
diff --git a/media-sound/aeolus/aeolus-0.9.5.ebuild b/media-sound/aeolus/aeolus-0.9.5.ebuild
new file mode 100644
index 000000000000..c1f72a3e0143
--- /dev/null
+++ b/media-sound/aeolus/aeolus-0.9.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit versionator toolchain-funcs multilib flag-o-matic
+
+MY_P=${PN}-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A synthesised pipe organ emulator"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	media-libs/zita-alsa-pcmi
+	>=media-libs/libclthreads-2.4.0
+	>=media-libs/libclxclient-3.9.0
+	x11-libs/libXft
+	x11-libs/libX11
+	>=media-sound/jack-audio-connection-kit-0.109.2
+	media-libs/alsa-lib
+	sys-libs/readline:0"
+
+RDEPEND="${DEPEND}
+	media-libs/stops"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)/source
+
+src_compile() {
+	tc-export CXX
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags xft)
+	sed -i -e "s/-O3//" Makefile || die "Failed to remove forced CFLAGS"
+	sed -i -e "s:ldconfig:true:" Makefile || die "Failed to remove ldconfig call"
+	sed -i -e "s/g++/$(tc-getCXX)/" Makefile || die "Failed to set correct compiler"
+	sed -i -e "s/-lXft/`$(tc-getPKG_CONFIG) --libs xft`/" Makefile || die
+	emake PREFIX="/usr" LIBDIR=$(get_libdir)
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" install
+	dodoc ../README ../AUTHORS
+	echo "-S /usr/share/stops" > "${T}/aeolus.conf"
+	insinto /etc
+	doins "${T}/aeolus.conf"
+}
diff --git a/media-sound/aeolus/metadata.xml b/media-sound/aeolus/metadata.xml
new file mode 100644
index 000000000000..40ae2e1863c3
--- /dev/null
+++ b/media-sound/aeolus/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+<longdescription lang="en">
+	Aeolus is a synthesised (i.e. not sampled) pipe organ emulator that should
+	be good enough to make an organist enjoy playing it. It is a software
+	synthesiser optimised for this job, with possibly hundreds of controls for
+	each stop, that enable the user to "voice" his instrument.
+
+	Main features of the default instrument: three manuals and one pedal, five
+	different temperaments, variable tuning, MIDI control of course, stereo,
+	surround or Ambisonics output, flexible audio controls including a large
+	church reverb.
+</longdescription>
+</pkgmetadata>
diff --git a/media-sound/alac_decoder/Manifest b/media-sound/alac_decoder/Manifest
new file mode 100644
index 000000000000..8180f16489c3
--- /dev/null
+++ b/media-sound/alac_decoder/Manifest
@@ -0,0 +1,6 @@
+AUX alac_decoder-0.2.0-fix-build-system.patch 437 SHA256 a29f6662d86edfd89a44ecd778f39b79e45bbbb4ebdf93314cbcb2997e520625 SHA512 dc595a8894e98646f437f825f8980dd8aeea15b7a08b5cd38de2fc24b9c8d06815776f9f1d308f66a768e4ba9e6ed66a72fde7bf4d87e368f071dcdf29a89b77 WHIRLPOOL f0bb13384d9fef6db5a2e8f94fbb99ef93fa0aba12c2d0691067b46ef75e82484f34e64ad1cfd2a439978db92074379bf15ad3c404ff704a9a75d445e560caa9
+DIST alac_decoder-0.2.0.tgz 19019 SHA256 7f8f978a5619e6dfa03dc140994fd7255008d788af848ba6acf9cfbaa3e4122f SHA512 4b37d4fe37681bfccaa4a27fbaf11eb2a1fba5f14e77d219a6d9814ff44d1168534d05eb19443dd2fd11e6fcdf4da3a22e3f3c79314cb7a6767c152351b13e29 WHIRLPOOL 442657fce0c717eba89ca025fa1d1593cf935b30d0824ca3d6900d3f82c31b09b171d31e3c7b584befb592df2db9ff02b000991fa359bd737f81523eefbf59a9
+EBUILD alac_decoder-0.2.0-r1.ebuild 568 SHA256 f867642a13eb7ba0e137d3952ead70491f97acadf641344b47702a875141f368 SHA512 2dafdf84f8eb7976acb6c5711ddd6c5378ab5d4c2809210a52214334d9b99708e3bb0c370f2f6a3bb99d054626ec4a6bbf711cdccce54a8cb7e74d652ef581a7 WHIRLPOOL 962c949f4399f11802ff336ca7cf6217b8ed4cb0d659f47ce3e883272cdf10d7786bb31c597489755d1fdbb0e65edbae6fc5642c1f85524a3aa9634299e3bb04
+MISC ChangeLog 2602 SHA256 7d8a55ae30d134ce665667a0aa4227ad7edab9d120a758cdbb86f522ae75ddc6 SHA512 bf58dbc811681ad5ce9c509218345cf15aaacec9f5ef5e94ede22fca143ae1054f7bda77a8d36cf8c0e026304db1ac6d19eeddd7528e9a7dd3886d7b6cc7e8d4 WHIRLPOOL 923c214a75fe3c4248802ced3955c7924e972f0d5aa291f7b480288f3276effa84e5ea7fb4c3f7def083be14d522c58aac59b95d97ceb54c05ed5bbc6f612d95
+MISC ChangeLog-2015 1188 SHA256 b14ec74491a06f6206b497a7bada36e7c25c0a10cf8acd3d7b046e919cb747cc SHA512 976078a8e696263d9e4264f037fef4bcb2a00d2c644d77897fb498bf9d63628bd0af04d9e8f00f9b2cd36bf65bf07169f111291bb878893d4fec36caaca26b04 WHIRLPOOL 9d15ca496359a6c370abee55bcd8b42c07ea1f45f50efba6b9c19ad644f63954f9b59dd1a7c1bf3f6629ac4531e36d921d01f5d91864d01ff7a40e4fe1d20180
+MISC metadata.xml 508 SHA256 db2416c317e8a816dd4fb49501aabe95b9df69e1bc3d5d28fb01b277e0ab2d5c SHA512 49dabc680261265a0c524580696c79f4d418d5a359f26b1f3156e2899a33058682f4d4a69f61e360ab7b445eb687392f8357ba9d9d21b52e1813d2577ada4d1e WHIRLPOOL db85e49fbf5a844ec0dd97c090ad8218a0826487beb005bf6056cfb0f2e063e5efe2ceb20f016df2e15751ebc7bad6600ffab63e8ec7a091876c869d475575af
diff --git a/media-sound/alac_decoder/alac_decoder-0.2.0-r1.ebuild b/media-sound/alac_decoder/alac_decoder-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..cb01260fa6f3
--- /dev/null
+++ b/media-sound/alac_decoder/alac_decoder-0.2.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Basic decoder for Apple Lossless Audio Codec files (ALAC)"
+HOMEPAGE="http://craz.net/programs/itunes/alac.html"
+SRC_URI="http://craz.net/programs/itunes/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-solaris"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+PATCHES=( "${FILESDIR}"/${PN}-0.2.0-fix-build-system.patch )
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin alac
+	einstalldocs
+}
diff --git a/media-sound/alac_decoder/files/alac_decoder-0.2.0-fix-build-system.patch b/media-sound/alac_decoder/files/alac_decoder-0.2.0-fix-build-system.patch
new file mode 100644
index 000000000000..eac113e1d3d9
--- /dev/null
+++ b/media-sound/alac_decoder/files/alac_decoder-0.2.0-fix-build-system.patch
@@ -0,0 +1,24 @@
+Make build system respect user flags
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,4 @@
+-CC=gcc
+ RM=rm -f
+-CFLAGS=-ggdb -O3 -W -Wall
+ 
+ C_SOURCES=alac.c \
+           demux.c \
+@@ -11,10 +9,10 @@
+ OBJECTS=$(C_SOURCES:.c=.o)
+ 
+ alac: $(OBJECTS)
+-	$(CC) -o alac $(OBJECTS)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o alac $(OBJECTS)
+ 
+ %.o: %.c
+-	$(CC) -c $(CFLAGS) $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ clean:
+ 	rm -f $(OBJECTS) *.*~ alac
diff --git a/media-sound/alac_decoder/metadata.xml b/media-sound/alac_decoder/metadata.xml
new file mode 100644
index 000000000000..4695e790fa97
--- /dev/null
+++ b/media-sound/alac_decoder/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		Basic decoder for Apple Lossless Audio Codec files (ALAC). ALAC is a
+		proprietary lossless audio compression scheme. Apple never released any
+		documents on the format. ALAC uses an adaptive FIR prediction algorithm
+		and stores the error values using a modified rice or golumb algorithm.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
new file mode 100644
index 000000000000..8d0d3b17954e
--- /dev/null
+++ b/media-sound/alsa-tools/Manifest
@@ -0,0 +1,8 @@
+AUX envy24control-config-dir.patch 593 SHA256 6cc8c284109839102a12a11de0e834865aa860460d3e387d71a9ae013ba8e1f9 SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef WHIRLPOOL abcc73750027f595b70fa9471334d5bc3b0f326e7847d6fd12ef0ad1107435af8f3236ad5e9b4ab89a9091cd97e1c87258f635137959d3136c3e7780e12394eb
+DIST alsa-tools-1.1.0.tar.bz2 1715113 SHA256 7d34558c590a50294b36576d257316a1ac5cd951eb8cd7d330e09f8cc757ab51 SHA512 caabbc9a8b494de6bba0dea6440b335b35e5c7dab4942ac36f127a75c2212ff98e7e38566444666edcf40c6c95e6d9797c421014fb5c5c292bb398780e6c9f87 WHIRLPOOL daf731da17c172275b484da37962d85569d70066392bb65f6b462a5f9f17784d204deec203d2466cbc08cb691689b7fc8cd664b370b39e233f1e8afb43c9d0ff
+DIST alsa-tools-1.1.3.tar.bz2 1715759 SHA256 d88f1dcd6872121383eded5fa24e328e68c54e527db4547e1435d5eabc2b6709 SHA512 b7c6c7639ea30fd8385c817fcd9dee4e5ed7c5766801d11a61d94f3211db4f99ecc0f00173573b69724ad9a06138605c353f4a40c8631eb4325b9718788bea50 WHIRLPOOL a07cc691b30df7da209abc2028b747ac8ebc7cf34a0c54b57ba70c35d546e64cf5f12a7b4c83637834c53c035c9d4710764869b9dc2a92648c733913b5fc9293
+EBUILD alsa-tools-1.1.0.ebuild 3494 SHA256 6091351f741b60e0fe5a8a5952ddfac9b21fd41aefae625281287e46a6eb6617 SHA512 de303225bc4025bf28a1adb7b0994b2c10e81ecd8281e272ee6a4d66c1c226fabbd22df3fa27b739dec539c19228ea635378e18ebf49fec857c06afa9d215884 WHIRLPOOL d0f6d731740e2be15f9920d14ae4e8ca4cdaab94329c500eed22d9feb19ce7f91694afb4d00082fa1aa3dbd2e81c4e4367cf9dba114bb155c3f82ed47ba57bf2
+EBUILD alsa-tools-1.1.3.ebuild 3500 SHA256 feed936ede8dbbca117afcd12109a53d3ec3d059d515050e2672b905737734c5 SHA512 a34983b53de21d18ffa577507cf4ef91f63d71e3e7167cc8206abf93a2eed4f6401ee06e2fec227a27c23d253b6edc5c9354b6536985757afe5438bc5cff4631 WHIRLPOOL d9414f0beb3c9ffa4cbc573afdd79d9cc7816e9cbe870404b8bd4703d644b8adf9bc2c7b8a74ca617611bb60fc46a0bad10c5e001ef3d8a83108101f95ce2cf7
+MISC ChangeLog 4018 SHA256 b86a2c312dcb43898bbdc6a5cbbbffd8fe7ed520e5e66f486b6f4922c5097e9b SHA512 84e3b65796be1a33e8d1bd1490d6221382ecc5a72aaa8ab8ee5af30f1700d9ffebcda66a4cd51b461188ef1d8df812b9a1d1b02c4bc932a2a0b45823a2fbeab0 WHIRLPOOL 876e91a80f58b160db101ebf05ebc08ffebaaa0b460af986cd535bc2f531013f22bd08055fe70fd02ffb00a34e805bde6f6af53d973e244811662bcb6edae834
+MISC ChangeLog-2015 34078 SHA256 06dbf00670f9540ed6710bd75f6a8a79701a359e63f3f238e61e0ee0cd7d4866 SHA512 0c2ae8181ac8252a0e4deeeca8f6331b0b08f9d2b350ca97eba273d23daf8a1808d2477a9c278a12942ae4d8ecb21699b8ecf157005e05cc1b9dbe4d3ebf6d85 WHIRLPOOL 3e94047d1ea69d67da7d54d89642a2b8e36b10e16df28374c6f47476118078702687ad920af583e5790499c55bc45dc8023802a7b7b335125e3c0248534f5bd2
+MISC metadata.xml 225 SHA256 f9a411a533af14459b87a800c3204d62a7d2cddb89431873023ebba08557ae84 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f WHIRLPOOL c24b1787a4dc3936e1e0121e7fe2ef253cd9f33cba04260b79138655b70c543082b00f6fa27dc0ddc14042fc228640f9d524fef06147c55571d66dfc9c576170
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
new file mode 100644
index 000000000000..3133ebb17a04
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.1.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="amd64 ~mips ppc ppc64 sparc x86"
+
+IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
+alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
+alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
+alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
+
+COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
+	>=dev-python/pyalsa-1.0.26
+	fltk? ( >=x11-libs/fltk-1.3.0:1 )
+	gtk? (
+		>=dev-python/pygtk-2
+		x11-libs/gtk+:2
+		x11-libs/gtk+:3
+		)" #468294
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( media-fonts/font-misc-misc )" #456114
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	ALSA_TOOLS="seq/sbiload us428control hwmixvolume hda-verb"
+
+	if use gtk; then
+		ALSA_TOOLS="${ALSA_TOOLS} hdajackretask"
+		use alsa_cards_ice1712 && \
+			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
+		use alsa_cards_rme32 && use alsa_cards_rme96 && \
+			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
+	fi
+
+	if use alsa_cards_hdsp || use alsa_cards_hdspm; then
+		ALSA_TOOLS="${ALSA_TOOLS} hdsploader"
+		use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
+	fi
+
+	use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader"
+	use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader"
+	use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader"
+	use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr"
+	use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl"
+
+	{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \
+		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
+
+	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
+		ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1"
+	fi
+
+	use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/envy24control-config-dir.patch
+
+	epatch_user
+
+	# This block only deals with the tools that still use GTK and the
+	# AM_PATH_GTK macro.
+	for dir in echomixer envy24control rmedigicontrol; do
+		has "${dir}" "${ALSA_TOOLS}" || continue
+		pushd "${dir}" &> /dev/null
+		eautoreconf
+		popd &> /dev/null
+	done
+
+	# This block deals with the tools that are being patched
+	for dir in hdspconf; do
+		has "${dir}" "${ALSA_TOOLS}" || continue
+		pushd "${dir}" &> /dev/null
+		eautoreconf
+		popd &> /dev/null
+	done
+
+	elibtoolize
+}
+
+src_configure() {
+	if use fltk; then
+		# hdspmixer requires fltk
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
+	fi
+
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		cd "${S}/${f}"
+		case "${f}" in
+			echomixer,envy24control,rmedigicontrol )
+				econf --with-gtk2
+				;;
+			* )
+				econf
+				;;
+		esac
+	done
+}
+
+src_compile() {
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		cd "${S}/${f}"
+		emake
+	done
+}
+
+src_install() {
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		# Install the main stuff
+		cd "${S}/${f}"
+		# hotplugdir is for usx2yloader/Makefile.am
+		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
+
+		# Install the text documentation
+		local doc
+		for doc in README TODO ChangeLog AUTHORS; do
+			if [[ -f "${doc}" ]]; then
+				mv "${doc}" "${doc}.$(basename ${f})" || die
+				dodoc "${doc}.$(basename ${f})"
+			fi
+		done
+	done
+
+	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
+	prune_libtool_files
+}
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild
new file mode 100644
index 000000000000..39e145485219
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
+alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
+alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
+alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
+
+COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
+	>=dev-python/pyalsa-1.0.26
+	fltk? ( >=x11-libs/fltk-1.3.0:1 )
+	gtk? (
+		>=dev-python/pygtk-2
+		x11-libs/gtk+:2
+		x11-libs/gtk+:3
+		)" #468294
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( media-fonts/font-misc-misc )" #456114
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/envy24control-config-dir.patch
+)
+
+pkg_setup() {
+	ALSA_TOOLS="seq/sbiload us428control hwmixvolume hda-verb"
+
+	if use gtk; then
+		ALSA_TOOLS="${ALSA_TOOLS} hdajackretask"
+		use alsa_cards_ice1712 && \
+			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
+		use alsa_cards_rme32 && use alsa_cards_rme96 && \
+			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
+	fi
+
+	if use alsa_cards_hdsp || use alsa_cards_hdspm; then
+		ALSA_TOOLS="${ALSA_TOOLS} hdsploader"
+		use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
+	fi
+
+	use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader"
+	use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader"
+	use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader"
+	use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr"
+	use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl"
+
+	{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \
+		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
+
+	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
+		ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1"
+	fi
+
+	use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer"
+}
+
+src_prepare() {
+	default
+
+	# This block only deals with the tools that still use GTK and the
+	# AM_PATH_GTK macro.
+	for dir in echomixer envy24control rmedigicontrol; do
+		has "${dir}" "${ALSA_TOOLS}" || continue
+		pushd "${dir}" &> /dev/null
+		eautoreconf
+		popd &> /dev/null
+	done
+
+	# This block deals with the tools that are being patched
+	for dir in hdspconf; do
+		has "${dir}" "${ALSA_TOOLS}" || continue
+		pushd "${dir}" &> /dev/null
+		eautoreconf
+		popd &> /dev/null
+	done
+
+	elibtoolize
+}
+
+src_configure() {
+	if use fltk; then
+		# hdspmixer requires fltk
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
+	fi
+
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		cd "${S}/${f}"
+		case "${f}" in
+			echomixer,envy24control,rmedigicontrol )
+				econf --with-gtk2
+				;;
+			* )
+				econf
+				;;
+		esac
+	done
+}
+
+src_compile() {
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		cd "${S}/${f}"
+		emake
+	done
+}
+
+src_install() {
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		# Install the main stuff
+		cd "${S}/${f}"
+		# hotplugdir is for usx2yloader/Makefile.am
+		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
+
+		# Install the text documentation
+		local doc
+		for doc in README TODO ChangeLog AUTHORS; do
+			if [[ -f "${doc}" ]]; then
+				mv "${doc}" "${doc}.$(basename ${f})" || die
+				dodoc "${doc}.$(basename ${f})"
+			fi
+		done
+	done
+
+	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
+	prune_libtool_files
+}
diff --git a/media-sound/alsa-tools/files/envy24control-config-dir.patch b/media-sound/alsa-tools/files/envy24control-config-dir.patch
new file mode 100644
index 000000000000..436f2c64db34
--- /dev/null
+++ b/media-sound/alsa-tools/files/envy24control-config-dir.patch
@@ -0,0 +1,12 @@
+diff -ru alsa-tools-1.0.20/envy24control/envy24control.h alsa-tools-1.0.20-r1/envy24control/envy24control.h
+--- alsa-tools-1.0.20/envy24control/envy24control.h	2009-05-06 09:07:25.000000000 +0200
++++ alsa-tools-1.0.20-r1/envy24control/envy24control.h	2009-06-08 04:18:04.000000000 +0200
+@@ -15,7 +15,7 @@
+ #endif
+ #define MAX_PROFILES 8
+ #define MAX_PROFILE_NAME_LENGTH 20
+-#define DEFAULT_PROFILERC "~/envy24control/profiles.conf"
++#define DEFAULT_PROFILERC "~/.envy24control/profiles.conf"
+ #define SYS_PROFILERC "/etc/envy24control/profiles.conf"
+ #ifndef MKDIR
+ #define MKDIR "/bin/mkdir"
diff --git a/media-sound/alsa-tools/metadata.xml b/media-sound/alsa-tools/metadata.xml
new file mode 100644
index 000000000000..1de885aecc13
--- /dev/null
+++ b/media-sound/alsa-tools/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>alsa-bugs@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
new file mode 100644
index 000000000000..7897790d6e27
--- /dev/null
+++ b/media-sound/alsa-utils/Manifest
@@ -0,0 +1,13 @@
+AUX alsa-modules.conf-rc 1028 SHA256 6060c101ca0793ea80e2b6b5bb8d6b118325092788ff26f07c280dd1ff546570 SHA512 20b309a44e23408ede66a121d81047f32970fa033728784c76a1caabb72143dbc1c5b970f9e73a910b7ef9026df597cde2afc7c1f52127fab532dba4955b1757 WHIRLPOOL 75fdfe4802af6a020bc6a4d46da7872b3481657f13d92e30c9fa61d5accdd8cd19b14a0c813c454d2ca89fa655f5ad375c0163fa4f947342ee759ab80a4700e4
+AUX alsasound.confd-r4 340 SHA256 d1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43 SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e WHIRLPOOL 0f46fe17f1a6626c3e2c8438d5006fdc8a302456820c2dfaa27955c295532aa1543e7ec0161702edd874e9588b6a383369693f080c91b0b38813b91588fc1e75
+AUX alsasound.initd-r6 2189 SHA256 cf67ba1c4bd13cc6fafdebab40b3e84d09f5b6ec768ed2dcf0ec53d9be296ba4 SHA512 960e6eff97174004abeb8d36d68c01a9f67e589174743928bb63dc37390f9868551e5b7e11c8386db67889c3d518f5ff4564b258dfee5e3317c164bc52aac04e WHIRLPOOL 96cf6acb7aa7cdb6b3a073245705a413704464f477bd2192a9b5743119a81b1c62512225ef33581d277f9a49ba413f02cd73c5c0d54b1cb9914dceba2d917076
+AUX alsasound.initd-r7 2190 SHA256 1e9245fd9f4edc51b2122f2440e60cd701f410add4b89612653f316313b1c6ca SHA512 725153b0843bae7a4fee5ed5b1d80e0839420f18314e6a759a00ba6895176823b1842fdbacfbcdce7aa755c44892090ba9e649580e7acd7df1677d8b387df115 WHIRLPOOL 74255c91cbf0116b66c084e27dabfc7ee91e92d0baa278bd2148e72e8a0bec0659afc01ca5a6d72b19ebe781cb73fd0c374d46f461d3b6ab4b1a8d58021d90fb
+DIST alsa-utils-1.1.2.tar.bz2 1193140 SHA256 7af603c0877d1251599d65b4fbc372e63a54371b888f5c26c6a86ac1d0519071 SHA512 38dc3331e8410123085738e74ca34c860666027ee2f6aaa21f48e726c84d8e6264043c8c7111ce2b1e158a0f38142a04d72a128ee54e00173dc4e4ba514d2f14 WHIRLPOOL 353d636271fd4354e7a7b986c08a3eabdb91bb8239b3d14a2163dea095dee010cd777276901c11df58a4fcba24680770512df4784e446a63941224f9ee79f632
+DIST alsa-utils-1.1.3.tar.bz2 1201424 SHA256 127217a54eea0f9a49700a2f239a2d4f5384aa094d68df04a8eb80132eb6167c SHA512 a0a00578e7f7ed8441628757048412813a0345f0a3f2e085cda7a881ae3c6e22f7cf1e5119f8200e2e4340e42152b91aa5bdc20646b8422adc74ba00e4c59363 WHIRLPOOL 10f1f8f5b7a659dc7ba79c934076eafbbd72f4892b571660a6224fc1061b4e893e2f5a937187a4eb50f2e982c07e097c965a88052451218adcde2e5cd3bfb6f9
+DIST alsa-utils-1.1.4.tar.bz2 1202047 SHA256 a7831044de92c5bf33bf3365a3f36e49397f4191e934df460ae1ca15138c9d9d SHA512 96852b3f5b57d7d9078a20881f28311543d446b69c80450179823a225089df7306456991890a7ef37672c1f55e9c386a7731c94e125504dcda2c88a674c8b4c7 WHIRLPOOL f09be2aeb3402b580ba103cfacb854b4fd55c2c19bfcfb7e56d4b924add5eb17d4fcb523cf7d85482728da8d8cfde0033cf205a7f9e53225a9b7a4a59a906f28
+EBUILD alsa-utils-1.1.2.ebuild 2202 SHA256 c19710f90252df41b95a05e2559ca2a321c167a8b9ee0ab88757762045c364cc SHA512 02849a9039acdd22f0d1fd6d0b322dced2ed368d4fa9982ef24beee44ae6f1b9c76bd5dd49910115c44048eb949964de31a75f0c44c400f66f4e9a21e13b5a4c WHIRLPOOL 7aaedc46f007c5818d223649b5e7053518257ab30065a81c3afa9d03367670b7503fe22a2e92805eaf4644072da7a171ca287802e925f5321a30d5c030e60fa9
+EBUILD alsa-utils-1.1.3.ebuild 2276 SHA256 6d58957668ffab637bb59318bb3c06c916adb726a52900e88a495281ca7a762c SHA512 3868a351c1303107bada5683a94ab17b77f99bd1e41bf1273674f86affe8dcee31cf8d8b6bc57d186ff09b4db4faf5a35fbee8048ca37c709233e939a375de08 WHIRLPOOL e72d98e131d8dbe2605db5aca0decfc71a6c8443abfb6c5f48b9aeaf7318017c56ddf6c2831c16b5667399c5db475a860af2003919e683f507e6a025bf81aa91
+EBUILD alsa-utils-1.1.4-r1.ebuild 2276 SHA256 96f11174b7db47b54a5c2856081f0f42cd31762edbbb1a0a365442ade5083a7d SHA512 d79feb69c4e942c2ccfaa012fa07f2d766030cffeb70b1b114b40e1c87d732826e355f2dc811d293bd7a7f3770076408241864e0bf543eb4095f473265bf06ba WHIRLPOOL 81150db010d34f5ea52b6ed4c4bd53ba7018b16ce053597c85fdeaa27fcec7b740006759d024236d8c208e9daf299c912ac050b3d85c8e90e4e0d137312d4059
+MISC ChangeLog 6640 SHA256 dc0aa8d9f2e28d3a0d780b287dbb92bfe691f892f2fcee077464119def9c61aa SHA512 44c681d862dbdc77bf6eea0321689001904882f8a110638ae95899b94cbc4e46690f39db06fb345c0fbd33ad9909225f845e88b5340db753e87bb371d2029a53 WHIRLPOOL 45ef640aaed0074f4a9c6bf7f05b0e9282772a946306a03000631fc94fe66b28098e2944c9f5df0ede6d20033d015dd1cb274a050ff5c8931a1e8bd73420f384
+MISC ChangeLog-2015 60020 SHA256 9cc1c84f5b62cbf38f8e9c7aee1ec7f6a9234f37a6f0f668dfbc47ca6eb0df5b SHA512 68636ed0f08a1ca6d7abb1da96ddf18f35e3a33925deff5f8d2db94a84769508dda7eaf4a4710b1b6ba7733cffaaef9bac5c66be1179305b0bfba2f9b611d437 WHIRLPOOL b85adaad0528a38134fc11db7277af3fbec3b3a4c1db30120d3ae0daa47cc7331697db9826e31ef485d355cfc1811c0c341a920da8f038004e034176314554a2
+MISC metadata.xml 479 SHA256 9f6f6e635c68171cea140add7512095c6e1d8318c4dd21257d566f2ee9f83bd4 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367 WHIRLPOOL 3480032467463c9b21ed32cc57a8c6a117d1549529da8844e2575d792b71ad498960627f5d4965af80b81f13eb088d69f926408aa284b65330b5da7d4b7157b1
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
new file mode 100644
index 000000000000..f8e171a61f91
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.1.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+IUSE="bat doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
+	bat? ( sci-libs/fftw:= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+
+src_configure() {
+	local myconf
+	use doc || myconf='--disable-xmlto'
+
+	# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+	econf \
+		--disable-maintainer-mode \
+		$(use_enable bat) \
+		$(use_enable libsamplerate alsaloop) \
+		$(use_enable nls) \
+		$(use_enable ncurses alsamixer) \
+		--disable-alsaconf \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
+		${myconf}
+}
+
+src_install() {
+	default
+	dodoc seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r6 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
+
+	keepdir /var/lib/alsa
+
+	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
+	# scan directory /usr/share/alsa/ucm: No such file or directory
+	# alsaucm: unable to obtain card list: No such file or directory
+	keepdir /usr/share/alsa/ucm
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "To take advantage of the init script, and automate the process of"
+		elog "saving and restoring sound-card mixer levels you should"
+		elog "add alsasound to the boot runlevel. You can do this as"
+		elog "root like so:"
+		elog "# rc-update add alsasound boot"
+		ewarn
+		ewarn "The ALSA core should be built into the kernel or loaded through other"
+		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	fi
+}
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.3.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.3.ebuild
new file mode 100644
index 000000000000..9c10bb2c4ec3
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.1.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="bat doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
+	bat? ( sci-libs/fftw:= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+
+src_configure() {
+	local myconf
+	use doc || myconf='--disable-xmlto'
+
+	# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+	econf \
+		--disable-maintainer-mode \
+		$(use_enable bat) \
+		$(use_enable libsamplerate alsaloop) \
+		$(use_enable nls) \
+		$(use_enable ncurses alsamixer) \
+		--disable-alsaconf \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d \
+		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa \
+		${myconf}
+}
+
+src_install() {
+	default
+	dodoc seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r6 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
+
+	keepdir /var/lib/alsa
+
+	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
+	# scan directory /usr/share/alsa/ucm: No such file or directory
+	# alsaucm: unable to obtain card list: No such file or directory
+	keepdir /usr/share/alsa/ucm
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "To take advantage of the init script, and automate the process of"
+		elog "saving and restoring sound-card mixer levels you should"
+		elog "add alsasound to the boot runlevel. You can do this as"
+		elog "root like so:"
+		elog "# rc-update add alsasound boot"
+		ewarn
+		ewarn "The ALSA core should be built into the kernel or loaded through other"
+		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	fi
+}
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..87137657c10e
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="bat doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
+	bat? ( sci-libs/fftw:= )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+
+src_configure() {
+	local myconf
+	use doc || myconf='--disable-xmlto'
+
+	# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+	econf \
+		--disable-maintainer-mode \
+		$(use_enable bat) \
+		$(use_enable libsamplerate alsaloop) \
+		$(use_enable nls) \
+		$(use_enable ncurses alsamixer) \
+		--disable-alsaconf \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d \
+		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa \
+		${myconf}
+}
+
+src_install() {
+	default
+	dodoc seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
+
+	keepdir /var/lib/alsa
+
+	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
+	# scan directory /usr/share/alsa/ucm: No such file or directory
+	# alsaucm: unable to obtain card list: No such file or directory
+	keepdir /usr/share/alsa/ucm
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "To take advantage of the init script, and automate the process of"
+		elog "saving and restoring sound-card mixer levels you should"
+		elog "add alsasound to the boot runlevel. You can do this as"
+		elog "root like so:"
+		elog "# rc-update add alsasound boot"
+		ewarn
+		ewarn "The ALSA core should be built into the kernel or loaded through other"
+		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	fi
+}
diff --git a/media-sound/alsa-utils/files/alsa-modules.conf-rc b/media-sound/alsa-utils/files/alsa-modules.conf-rc
new file mode 100644
index 000000000000..40e99df8d3f4
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-modules.conf-rc
@@ -0,0 +1,38 @@
+# Alsa kernel modules' configuration file.
+
+# ALSA portion
+alias char-major-116 snd
+# OSS/Free portion
+alias char-major-14 soundcore
+
+##
+## IMPORTANT:
+## You need to customise this section for your specific sound card(s)
+## and then run `update-modules' command.
+## Read alsa-driver's INSTALL file in /usr/share/doc for more info.
+##
+##  ALSA portion
+## alias snd-card-0 snd-interwave
+## alias snd-card-1 snd-ens1371
+##  OSS/Free portion
+## alias sound-slot-0 snd-card-0
+## alias sound-slot-1 snd-card-1
+##
+
+# OSS/Free portion - card #1
+alias sound-service-0-0 snd-mixer-oss
+alias sound-service-0-1 snd-seq-oss
+alias sound-service-0-3 snd-pcm-oss
+alias sound-service-0-8 snd-seq-oss
+alias sound-service-0-12 snd-pcm-oss
+##  OSS/Free portion - card #2
+## alias sound-service-1-0 snd-mixer-oss
+## alias sound-service-1-3 snd-pcm-oss
+## alias sound-service-1-12 snd-pcm-oss
+
+alias /dev/mixer snd-mixer-oss
+alias /dev/dsp snd-pcm-oss
+alias /dev/midi snd-seq-oss
+
+# Set this to the correct number of cards.
+options snd cards_limit=1
diff --git a/media-sound/alsa-utils/files/alsasound.confd-r4 b/media-sound/alsa-utils/files/alsasound.confd-r4
new file mode 100644
index 000000000000..6fec8f5938da
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsasound.confd-r4
@@ -0,0 +1,15 @@
+# RESTORE_ON_START:
+# Do you want to restore your mixer settings?  If not, your cards will be
+# muted.
+# no - Do not restore state
+# yes - Restore state
+
+RESTORE_ON_START="yes"
+
+# SAVE_ON_STOP:
+# Do you want to save changes made to your mixer volumes when alsasound
+# stops? 
+# no - Do not save state
+# yes - Save state
+
+SAVE_ON_STOP="yes"
diff --git a/media-sound/alsa-utils/files/alsasound.initd-r6 b/media-sound/alsa-utils/files/alsasound.initd-r6
new file mode 100644
index 000000000000..f80a3518f3e2
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsasound.initd-r6
@@ -0,0 +1,87 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+alsastatedir=/var/lib/alsa
+alsascrdir=/etc/alsa.d
+alsahomedir=/var/run/alsasound
+
+extra_commands="save restore"
+
+depend() {
+	need localmount
+	after bootmisc modules isapnp coldplug hotplug
+}
+
+restore() {
+	ebegin "Restoring Mixer Levels"
+
+	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
+
+	if [ ! -r "${alsastatedir}/asound.state" ] ; then
+		ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"
+		eend 0
+		return 0
+	fi
+
+	local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)"
+	local CARDNUM
+	for cardnum in ${cards}; do
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \
+			|| ewarn "Errors while restoring defaults, ignoring"
+	done
+
+	for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do
+		[ -e "${ossfile}" ] || continue
+		# We use cat because I'm not sure if cp works properly on /proc
+		local procfile=${ossfile##${alsastatedir}/oss}
+		procfile="$(echo "${procfile}" | sed -e 's,_,/,g')"
+		if [ -e /proc/asound/"${procfile}"/oss ] ; then
+		    cat "${ossfile}" > /proc/asound/"${procfile}"/oss 
+		fi
+	done
+
+	eend 0
+}
+
+save() {
+	ebegin "Storing ALSA Mixer Levels"
+
+	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
+
+	mkdir -p "${alsastatedir}"
+	if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then
+		eerror "Error saving levels."
+		eend 1
+		return 1
+	fi
+
+	for ossfile in /proc/asound/card*/pcm*/oss; do
+		[ -e "${ossfile}" ] || continue
+		local device=${ossfile##/proc/asound/} ; device=${device%%/oss}
+		device="$(echo "${device}" | sed -e 's,/,_,g')"
+		mkdir -p "${alsastatedir}/oss/"
+		cp "${ossfile}" "${alsastatedir}/oss/${device}"
+	done
+
+	eend 0
+}
+
+start() {
+	if [ "${RESTORE_ON_START}" = "yes" ]; then
+		restore
+	fi
+
+	return 0
+}
+
+stop() {
+	if [ "${SAVE_ON_STOP}" = "yes" ]; then
+		save
+	fi
+	return 0
+}
diff --git a/media-sound/alsa-utils/files/alsasound.initd-r7 b/media-sound/alsa-utils/files/alsasound.initd-r7
new file mode 100644
index 000000000000..da2d5b349b82
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsasound.initd-r7
@@ -0,0 +1,87 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+alsastatedir=/var/lib/alsa
+alsascrdir=/etc/alsa.d
+alsahomedir=/var/run/alsasound
+
+extra_commands="save restore"
+
+depend() {
+	need localmount
+	after bootmisc modules isapnp coldplug hotplug
+}
+
+restore() {
+	ebegin "Restoring Mixer Levels"
+
+	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
+
+	if [ ! -r "${alsastatedir}/asound.state" ] ; then
+		ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"
+		eend 0
+		return 0
+	fi
+
+	local cards="$(sed -n -e 's/^ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)"
+	local CARDNUM
+	for cardnum in ${cards}; do
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \
+			|| ewarn "Errors while restoring defaults, ignoring"
+	done
+
+	for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do
+		[ -e "${ossfile}" ] || continue
+		# We use cat because I'm not sure if cp works properly on /proc
+		local procfile=${ossfile##${alsastatedir}/oss}
+		procfile="$(echo "${procfile}" | sed -e 's,_,/,g')"
+		if [ -e /proc/asound/"${procfile}"/oss ] ; then
+		    cat "${ossfile}" > /proc/asound/"${procfile}"/oss 
+		fi
+	done
+
+	eend 0
+}
+
+save() {
+	ebegin "Storing ALSA Mixer Levels"
+
+	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
+
+	mkdir -p "${alsastatedir}"
+	if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then
+		eerror "Error saving levels."
+		eend 1
+		return 1
+	fi
+
+	for ossfile in /proc/asound/card*/pcm*/oss; do
+		[ -e "${ossfile}" ] || continue
+		local device=${ossfile##/proc/asound/} ; device=${device%%/oss}
+		device="$(echo "${device}" | sed -e 's,/,_,g')"
+		mkdir -p "${alsastatedir}/oss/"
+		cp "${ossfile}" "${alsastatedir}/oss/${device}"
+	done
+
+	eend 0
+}
+
+start() {
+	if [ "${RESTORE_ON_START}" = "yes" ]; then
+		restore
+	fi
+
+	return 0
+}
+
+stop() {
+	if [ "${SAVE_ON_STOP}" = "yes" ]; then
+		save
+	fi
+	return 0
+}
diff --git a/media-sound/alsa-utils/metadata.xml b/media-sound/alsa-utils/metadata.xml
new file mode 100644
index 000000000000..0df2c0a53a87
--- /dev/null
+++ b/media-sound/alsa-utils/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>alsa-bugs@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="bat">install basic audio tester (BAT) util</flag>
+    <flag name="libsamplerate">install utils that use libsamplerate (e.g. alsaloop)</flag>
+    <flag name="ncurses">install utils that use ncurses (e.g. alsamixer)</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/alsamixer-app/Manifest b/media-sound/alsamixer-app/Manifest
new file mode 100644
index 000000000000..af3682c217ac
--- /dev/null
+++ b/media-sound/alsamixer-app/Manifest
@@ -0,0 +1,6 @@
+AUX alsamixer-app-0.1-Makefile.patch 964 SHA256 d5d752ab82a0b93747d16994ebeb0f515f1114b6d749764df7584758bc599cff SHA512 105ef485de8339760608f9b95ff9ffc5059deff3f63d02c5ab4a82e7957e9cf52e878a35a06d58e5e4ed6bb73e074c22f977ec68afb8ab11703690e67c541a2f WHIRLPOOL 41eae2edc041fc3c0ec295caa111b88fed052ac6875392c44e7658c9a3e57dee2784c7465d0801373635bfd7788898ab2f10fa6b121dda5813e6202712e6ec38
+DIST AlsaMixer.app-0.1.tar.gz 26939 SHA256 7d55d3ba5ffd82bcddcb546e0aa33ab8638df5d1418aa170e91c42e35c0c8c15 SHA512 48f741c578b51a10d2bcaac375be07d9c2ed705c876fa17d69565b41ade6dc28e72af1509b7d817b452199e8ad60f4e24b78565c134b90ac7f29623b89765e24 WHIRLPOOL 4acee1f506b7a0b0b0ffb08f4b5d4458ff504d4416cf27e882170a849d4e30660583645284ec1985353182e2ffa1c31daee8164199185053904a01b2eaceb176
+EBUILD alsamixer-app-0.1.ebuild 794 SHA256 6e1135156010864841613d9dd74e9f99f8552fd2e92b13b53a75aa77589f42ed SHA512 d47b2654c451bdddb838400cbcf4411e1c6f4a38ab390368a667bbc0345a709027df69483375e77af92aabe824834444f0bc70fd8dad5c0e853a7961fcbb3583 WHIRLPOOL 6788f4a5020c2e51882fb89d575aa160aecb4e74f2c0d8cd1b6ec8096edc0e647a9378addfed6954c1506416b129cdf4b928c20e0adffa24a955edf7ad440235
+MISC ChangeLog 2945 SHA256 732db69c293e6b97b5f8f6f5bfefb1a39b7c94e58c4890a40fe559497d19f5e2 SHA512 38bd56b17b393498c83b06f4101916d2a58f53617587c10ef303e90a2b027b725928548903557e33b6be6d7831b23ffbba154fc60c0ba015be4a689c3f6aa94e WHIRLPOOL ca721863653d12b1c1c12048df2b396b33f7247cf6671d6b0f3308a794016cc840800444f296fa921e303555c8dd0e85ef2c50b3830d78790004bb991157f144
+MISC ChangeLog-2015 638 SHA256 813f561906080067f07b2d44d6527952d2b7dc00fa471eca00e9d3705f3e01d9 SHA512 0792966d4c7f2f32443c606bca7700c67a6470726775657979356e8700f6e692f364ceb531a0c57753fa5b89b97fe997dc6789cb87970193cdb5c3055821c4bc WHIRLPOOL 974717cb3e9b9208d7d618edc5988d8e62f0cb6e842359a20b1a11e25f70cb22b6e775356d07129f1d12f9a60f66e07c7dd0feda4b0825d8bd4cadab6e59f54b
+MISC metadata.xml 360 SHA256 f05bc23e4c10f4dd3e7c9fb10f5b1246786c9ecc1934f778ed9c96534973a42f SHA512 94dbf40a7a9a38902608e108dedc3c6667e436e7b04c00a7bb4bc9d90d05a88e2f3275facf275709c181a9650f954d31fb97a5c24bd775cdd2277bfe4f84bae1 WHIRLPOOL f21729a2e5ef96cfe8900d4e4f048f17429e83ab85a4fdb9c854bbbf4bdf81d1663a10453f8356ad4de5125f62c786880fb33e8021f00d0fb7d7e4a53413dc9f
diff --git a/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild b/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild
new file mode 100644
index 000000000000..166a6d308791
--- /dev/null
+++ b/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+MY_PN=AlsaMixer.app
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="AlsaMixer.app is a simple mixer dockapp"
+HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/253"
+SRC_URI="http://dockapps.windowmaker.org/download.php/id/517/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext
+	media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+	tc-export CXX
+	emake || die "emake failed."
+}
+
+src_install() {
+	dobin ${MY_PN} || die "dobin failed."
+	dodoc README
+}
diff --git a/media-sound/alsamixer-app/files/alsamixer-app-0.1-Makefile.patch b/media-sound/alsamixer-app/files/alsamixer-app-0.1-Makefile.patch
new file mode 100644
index 000000000000..c260ad1c88bf
--- /dev/null
+++ b/media-sound/alsamixer-app/files/alsamixer-app-0.1-Makefile.patch
@@ -0,0 +1,32 @@
+diff -ur AlsaMixer.app-0.1.orig/Makefile AlsaMixer.app-0.1/Makefile
+--- AlsaMixer.app-0.1.orig/Makefile	2004-09-30 23:44:06.000000000 +0300
++++ AlsaMixer.app-0.1/Makefile	2008-06-28 08:40:28.000000000 +0300
+@@ -4,22 +4,22 @@
+ 
+ DESTDIR =
+ GNUSTEP_BINDIR = /usr/local/GNUstep/Apps/AlsaMixer.app
+-X11_BINDIR = /usr/X11R6/bin
++X11_BINDIR = /usr/bin
+ 
+-CXX=c++
+-CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include
+-LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11 -lasound
++CXX ?= g++
++CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions
++LIBS = -lXpm -lXext -lX11 -lasound
+ 
+ OBJECTS = Main.o Mixer.o Xpm.o AMixer/AMixer.o AMixer/AItem.o AMixer/AChannel.o
+ 
+ all: AlsaMixer.app
+ 
+ AlsaMixer.app: $(OBJECTS)
+-	$(CXX) $(OBJECTS) -o $@ $(LDFLAGS)
++	$(CXX) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
+ 
+ .PHONY:	install clean distclean
+ 
+-install: install-gnustep
++install: install-x11
+ 
+ install-gnustep: all
+ 	install -d  $(DESTDIR)$(GNUSTEP_BINDIR)
diff --git a/media-sound/alsamixer-app/metadata.xml b/media-sound/alsamixer-app/metadata.xml
new file mode 100644
index 000000000000..fa8d74ec580b
--- /dev/null
+++ b/media-sound/alsamixer-app/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+
+</pkgmetadata>
diff --git a/media-sound/alsamixergui/Manifest b/media-sound/alsamixergui/Manifest
new file mode 100644
index 000000000000..c03a5f13aad7
--- /dev/null
+++ b/media-sound/alsamixergui/Manifest
@@ -0,0 +1,8 @@
+AUX alsamixergui-0.9.0.1.2-fltk-1.1.patch 477 SHA256 ea1aa84f24c4086cc5dd55fec264e1a75841511afbce22ba54e5fb2020d7801e SHA512 da74646008a039aa5278f40ca7e06d387dbb8c5fcaa4d53e7b8431e73c9465336efb36e33d8b16d204638c52686bf1356ce9892645497cad6c2353a8471b647e WHIRLPOOL 29f14876196506d2c09c76847e39d123e213d85befea039c2e5a67c499491bd6788ed82a2c320e24e91d061200d41fc31b0b962bf068de795a5ccde6c7155d9c
+AUX alsamixergui-0.9.0.1.2-gcc34.patch 334 SHA256 d982f5323b960402f8ac51aa5030a0cb2e010da417284882027aefbc26db475a SHA512 4f5bd6d25433a3795aeee16969e8850bb27c408510fd14f9fca8c2757b6153345c0a57caaff0a655603cd93adb5f76bb5a5b79c1f9fc06f1bb6bde90fd10acf0 WHIRLPOOL abb75d0dc90551edde81a79214b7fbd583336fc406664d7982ebbb75a69d4dab66cf33a5febc621ba5bee05b54b120ba0acef097d0e924755fe56f8d616d0c02
+AUX segfault-on-exit.patch 321 SHA256 393f632872c10599515872b98669b401a6ad356c6b9815d265f77c9104afcd37 SHA512 b9c806b78f246a65727bf75325ba08fd1a76fc6dc696afbdf4c81f972b6793c52eac404129829782e4b81edc19d9024a4795720a0d8f76cce61325bc063470cd WHIRLPOOL ff777789dbdfd6acecee5e74ed5873ff354272f1994242fb9edf97fadc03f36da1d94c4870647c0f4f7bed626c6dcb178c1e48ae5c5302f005dbb262eb74f00a
+DIST alsamixergui-0.9.0rc1-2.tar.gz 70255 SHA256 6053a352580fa90fc5d35a2edce138759726acd72283ff6797cf7720632481cd SHA512 c1eac24c87e3d3dd8a582312a24e4f517d084845a3a0cd0a7253e3386685d72a691fe138853002b0277361d397271fbc9f445fd5ad0f5d604e5ad022a408d6b7 WHIRLPOOL 5215402cf2033a0f1584131d90c8a04f6f88921533bbff7ab600e2c0edf427fba6e594db6e5f41d25b11ab5a72c3c7ac503728b6940b6ce74db03368ae9540df
+EBUILD alsamixergui-0.9.0.1.2-r4.ebuild 914 SHA256 4559c108636f475a56284f6419227217c43ac65e6e8376bfcf90a1c037954b91 SHA512 03495c2c26840d0db6bcb48f7659170bc948a7d2b915fd20171f7e37a79dc233e61d22e38959040396c3f569f56f8de99e0f5e231d2df7c17ebdb6a181b13f44 WHIRLPOOL b3aede187842b05e52ced20c5fa1af58c0726becd47571271fa0fcb9faccd9cf17a119651b874bd44adf91264f8388ed35fde2bdf1623b1888345d124bbbff1b
+MISC ChangeLog 2761 SHA256 aa1a604f92cb2459c66af4336c077388a856ebd5b5434c4b61072a6cc44b7884 SHA512 a2ed2c1f0c718cbe1a82e1f3544b094ee3c41446192c7ed8f6410e0a42e032a53e84b01fa4a9c546edb54ce880a10cbb23892dc38dac84307442c3ca4ac1c98f WHIRLPOOL bd54de3ef0ba685672b1e6a9fd8c6c722b8aac70764aa35d146a4594b78ac12e45c0980c8164da202316224eb3b16b0aff90bcd0b870ae76471fbb03b3f4d078
+MISC ChangeLog-2015 5351 SHA256 c86594f61d1adb8d6d559052b04a36a109927c966675695dd977ccee9f4f873d SHA512 b207ac9377bcb3a119206932d1fc702b7221eef542cb77fbfc2c1ef922aadb05d50b38c22642256b197533ba0e43e91caea1d92a248e993c8fb4a7f840843f42 WHIRLPOOL 5b5c3311c3ef0c9b09a067efe016f328b8609382cd490dbdcbed4bed7540dbc86f825baff370b3e6ca469ee1970fe857764c935ea4913dc9abb9da6655d47f1d
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
new file mode 100644
index 000000000000..2a3d2ac79e91
--- /dev/null
+++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils flag-o-matic
+
+MY_P=${PN}-0.9.0rc1-2
+
+DESCRIPTION="FLTK based amixer Frontend"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	media-sound/alsa-utils
+	x11-libs/fltk:1"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc34.patch \
+		"${FILESDIR}"/segfault-on-exit.patch \
+		"${FILESDIR}"/${P}-fltk-1.1.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags "-L$(dirname $(fltk-config --libs))"
+	append-flags "-I$(fltk-config --includedir)"
+	econf
+}
+
+src_install() {
+	default
+	newicon src/images/alsalogo.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Alsa Mixer GUI"
+}
diff --git a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch
new file mode 100644
index 000000000000..a7c121dbc9d1
--- /dev/null
+++ b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch
@@ -0,0 +1,16 @@
+--- configure.in
++++ configure.in
+@@ -11,11 +11,11 @@
+ AC_PROG_LN_S
+ 
+ dnl Checks for libraries.
+-AC_CHECK_LIB(fltk,numericsort,,AC_MSG_ERROR("missing fltk"))
++AC_CHECK_LIB(fltk,fl_numericsort,,AC_MSG_ERROR("missing fltk"))
+ AM_PATH_ALSA(0.9.0)
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+-AC_HAVE_HEADERS(stdio.h string.h stdlib.h getopt.h alsa/asoundlib.h FL/Fl.H)
++AC_HAVE_HEADERS(stdio.h string.h stdlib.h getopt.h alsa/asoundlib.h)
+ 
+ AC_OUTPUT(Makefile src/Makefile)
diff --git a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch
new file mode 100644
index 000000000000..6f37970aa568
--- /dev/null
+++ b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch
@@ -0,0 +1,11 @@
+--- src/alsamixer.cxx
++++ src/alsamixer.cxx
+@@ -654,7 +654,7 @@
+       if (joined) {
+ #ifdef ALSAMIXER_GUI
+ 	for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST; 
+-	snd_mixer_selem_channel_id_t(int(chn)++))
++	snd_mixer_selem_channel_id_t(int(chn)+1))
+ #else
+ 	for (chn = 0; chn < SND_MIXER_SCHN_LAST; chn++)
+ #endif
diff --git a/media-sound/alsamixergui/files/segfault-on-exit.patch b/media-sound/alsamixergui/files/segfault-on-exit.patch
new file mode 100644
index 000000000000..6dc2feb8cc58
--- /dev/null
+++ b/media-sound/alsamixergui/files/segfault-on-exit.patch
@@ -0,0 +1,11 @@
+--- src/alsamixer.cxx
++++ src/alsamixer.cxx
+@@ -1869,7 +1869,7 @@
+ 			if (procWindow) delete procWindow;
+ 			if (mainWindow) delete mainWindow;
+ 			mainWindow = 0; procWindow = 0; helpWindow = 0;
+-			return 0;
++			mixer_abort (ERR_NONE, "", 0);
+ #endif /* #ifdef ALSAMIXER_GUI */
+       break;
+     case 13:	/* Return */
diff --git a/media-sound/alsamixergui/metadata.xml b/media-sound/alsamixergui/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/alsamixergui/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
new file mode 100644
index 000000000000..1e9e7cdf715f
--- /dev/null
+++ b/media-sound/alsaplayer/Manifest
@@ -0,0 +1,5 @@
+DIST alsaplayer-0.99.81.tar.bz2 806906 SHA256 187897e5ad5a94ea819e42092cc35d53463e5fa43a3a5a78cb76ffd0d5ddee11 SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650 WHIRLPOOL 2f4849f5643768db14a7542c65504e937023585aaa7025a1d66e7f87568dfb25a981b304684a0fa242c0a4d9200c4111368669b8c6cd897cfdcfd1a43cee66f5
+EBUILD alsaplayer-0.99.81.ebuild 2018 SHA256 25f97d3823d015aafc1d5e9b06d5ecf33e48e2f2f5b10fc2190fa812cba5a958 SHA512 18dff9b822e0f612dfbd9cf62aff510167e773fb0d7aaaef984bcba971c3d531937e703d42dc002e9a667289e443b9b21e72c8182c9b0eff141d695ec124b154 WHIRLPOOL ee47586edee3ed725a3df85cf1ecd0aa89c336f45112d8654902d6dde5a136dd43b07cdac715433d23ab4784bdaadc25337af3d1be0cd722a889525710f938e4
+MISC ChangeLog 2556 SHA256 1a76bbfa6fea199e055931c1dbc92f70c7d83054c7b954327fc1c85c76ceb35a SHA512 729665081a0659d9b3e1ab8abc766de6c7028499c671776a84ad913b43b91aa05ff7732beb2e4b09bece8cbb49dc43af65191110ece311b9a4b22ecb6c8fdce3 WHIRLPOOL aee87cd68352d48e02d46518b921983748e9f65dcef8995e1b86f41dbbefbddb0afaac8c1a5483b843b4f896b74fa43d7d0603bfcf235291a9d2e6b554ae8153
+MISC ChangeLog-2015 13820 SHA256 bd0e3c64cb028db08bac82f0d6842b74164daa63b1f3ae6d26c18e83f29ebbce SHA512 600fef4c9bfda446190089e7d36cb045e6ced2c4147d5593ee2b484f35dfaf18be8ec2a8c0f3f2672f51068a4b0500191db3fc18d56825e3c6e8d3897fb228ba WHIRLPOOL a344e4f9b9785ebf3f1bfbb26085fa28dd3aceec437b06297464022c27fc77c796290c4b432257e48e0eee9c3f416d701082b7f8ac5f6a094d4f2bcad4a515fe
+MISC metadata.xml 337 SHA256 6a9e52ef4af0eb4cc7b50617d50ff5a8af496b3b868f59879578f833ef919ba7 SHA512 eb9f49ef0aaa5f6ec8c8a29f0459cde3fbbcce419217ae9c22ed6f50dea1893e02037b556daa4276de62aa18fd3193d8c213c6b819d701689fea845d64f97f61 WHIRLPOOL 5f15228d09ebdadd62491c5eaf09a0646f042dcbb9daafd89fa76e5e47fd4e33f37f5b9a91941087116e0bbfdab072124198c79bff4d49f6fad20ef8eb1f738a
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
new file mode 100644
index 000000000000..e5ada6c7bf4f
--- /dev/null
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A heavily multi-threaded pluggable audio player"
+HOMEPAGE="http://www.alsaplayer.org/"
+SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ~ppc ~sparc x86"
+IUSE="+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd"
+
+RDEPEND="media-libs/libsndfile
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	audiofile? ( media-libs/audiofile )
+	flac? ( media-libs/flac )
+	gtk? ( >=x11-libs/gtk+-2.10:2 )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.80 )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	nas? ( media-libs/nas )
+	ogg? ( media-libs/libogg )
+	opengl? ( virtual/opengl )
+	vorbis? ( media-libs/libvorbis )
+	xosd? ( x11-libs/xosd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+	oss? ( virtual/os-headers )"
+REQUIRED_USE="|| ( alsa jack nas oss )"
+
+src_prepare() {
+	sed -i \
+		-e 's:AM_CFLAGS = $(AM_CXXFLAGS)::' \
+		output/jack/Makefile.am || die
+
+	sed -i \
+		-e 's:-O2 -funroll-loops -finline-functions -ffast-math::' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use xosd || export ac_cv_lib_xosd_xosd_create=no
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable nls) \
+		$(use_enable opengl) \
+		$(use_enable mikmod) \
+		$(use_enable vorbis oggvorbis) \
+		$(use_enable audiofile) \
+		$(use_enable flac) \
+		$(use_enable mad) \
+		$(use_enable id3tag) \
+		$(use_enable gtk systray) \
+		$(use_enable jack) \
+		$(use_enable alsa) \
+		--disable-esd \
+		$(use_enable oss) \
+		$(use_enable gtk gtk2) \
+		$(use_enable nas)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README TODO docs/*.txt
+	newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-sound/alsaplayer/metadata.xml b/media-sound/alsaplayer/metadata.xml
new file mode 100644
index 000000000000..b3559d99410e
--- /dev/null
+++ b/media-sound/alsaplayer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
new file mode 100644
index 000000000000..99a9ab57ef54
--- /dev/null
+++ b/media-sound/amarok/Manifest
@@ -0,0 +1,12 @@
+AUX amarok-2.8.0-taglib110.patch 1537 SHA256 f751b1cce13860677af012534a02eaf7bc6e1c7a9b9d00aa2d6fa504dd80fe6f SHA512 b15456d5c297a92860306492f51449040504763c0862475a8ecdb732c3cdccab4b0f0d1bc6b9d62a7a01e2a5faa212200c5aba5ac703c267bada830d8033bac6 WHIRLPOOL 085e28d742e87356734ed47ce36eb562f7ae9761e7b09c9b6850339e91010399cec678196ceb854b58d38fbbd8d694e9943d77e625f075a7d9b31b049925fca1
+AUX amarok-2.8.90-ffmpeg3.patch 2606 SHA256 18e0fd0ac5533a8709e2b4725c677ec215f9d83ded6e3bb8cdbc86af27df544f SHA512 f2c6df1ec6aa526b3def250a11f7ef22d990d753d35dc9d6e8c29c426da63483ea7299d1e93466757ff1e2c645c41c2c69f7470c7a0d77e4c0ffec5e76006e59 WHIRLPOOL 432260cf03be331f670bfecbb121cccb709c7b214e5e7e7268ff3a5323de4b45f302f88ee7cd6de4d222eb38029ba4eec91a5da75c1cf90739e4c2d0e92ffeee
+AUX amarok-2.8.90-gcc6.patch 1322 SHA256 64713524dfac62ba5b50e9a622e4e1d11a7c0fd9c942c56eb1eadf82bdf9d081 SHA512 a8a361387c524ff72c8a788048b5b713a6e18bc2976cab6784f8b3e413d21652f861b2b7c92f667abf98a638d7d012f4500afb1f8ea0b5cba8c86e4270eafe7f WHIRLPOOL 48fa1632e2e19c3c6220ffa4a11ad2fefcc3d8b96a99ca13a4d0f65f78f807edfe886a508d7be3af2771b005a8b5d07a85f70e1031717f54eea9fa3dc0650ae9
+AUX amarok-2.8.90-mysql-embedded.patch 1224 SHA256 a1eeb209d09a6554daef22c82f2cf74cca6af3e0f5caedb4d5865c297138f4de SHA512 ead9d9d0dc141113d4144326dab525e6e58427f8c3e2d5f8441a87e7d0787199b2947e08a6ff445255f0b1154e23182336403266d8b4e0a040a6b658f0d57155 WHIRLPOOL e5ea88768b5740875c536997adc35b78dcb2a601f6c67e584f24018e79e588aa26dc0fd360dbf2325dbb6bde721849ca940b5ff90416eb85d55fd90fcc1c0d65
+AUX amarok-2.8.90-mysqld-rpath.patch 573 SHA256 6554585926ede69e01a3e4dd2521e25cba0f1b03d0b3fc71bb3fe73843272fc8 SHA512 724ee90912883baa374bdf8ceca77e1d8ec809279f2254705624fb3966e8300ed02a0ddfc4613e8b9add2b7b20eed333619b3c1d1426e14e5f8ce60bdff39be5 WHIRLPOOL 2fa4f9e9bc43b0c4c926acc0e2d3cd778106f55cfc1def55307f591810f596cfa48d4a7e79922f18323ae15d6d8c2b520e8b34bea2d6ddbd5cbe86a4f2fbea80
+AUX amarok-2.8.90-no-webkit.patch 1126 SHA256 43ed16b51fa6e190b2cd758b48b08ed9e027dcc173d30e859ab7f8529c5e2e43 SHA512 1c45e9d3f4d8cd9fe6adc1a10b78f7b439a0dddb09ccff399bc3ded62207d6862d61dd5bfaccceb7044f4740f59824a6c8eae34d2e9b2de9a400ffb3305a0707 WHIRLPOOL 9ecfae8e3ef3efa7044c841b8c0caab79f1586d66d49da391c589525aa65542acd76628f45f58af1dc8e6837af65ef3563b7cceac4e639601d23f4343d72df81
+AUX amarok-2.8.90-scriptconsole.patch 1272 SHA256 d0e0442d67e8ec85b7101acd366eb48197fc70ac1c1e6801f4290ebc9628506b SHA512 3bc31284faa45c717342917f220f7ae078e1f6b0afd313bf8f2ba28b97badb4d56dafcc1a319655b2ae01dee37e09ff34978af95d1743105be8f118be2c61c9d WHIRLPOOL 977c62c81704d6810a25bb9977bcb39daab7f185a4604a5cc1020b86162cc3b043d620eba376b449bb364f9b5621c3e69bc6668e5c29bf5aba981fd777638838
+DIST amarok-2.8.90.tar.xz 48890580 SHA256 b057369ab70d192b669ee6c2c11e9e7d4140663f6a60d6175ef0bb56b4bef9a7 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc WHIRLPOOL 22da35ea61dcda04d882f4c0da7327cab10edf50140b3ae891738d10e1b9e5062eb541e35e817fd04a7f0284eb085b5ccf3edfa20438b764a9ce3615de35ca8c
+EBUILD amarok-2.8.90-r3.ebuild 3574 SHA256 24003bec03b366c21c1d33b6c5e6f98d58bacf6607230bbc915f68cd3a46e688 SHA512 cbc17f61a90484f93ccb604ddb4928ac5de0036134cca4d3065d80d8a0c95aa64d9df638dd12d530be0460e96b22ecc91efb53e7e82687171bfd45e05fd984b7 WHIRLPOOL 3fe2e369ac10c78898089e20071b819b4e9442a76152fdedc4b0c472c865b6fad7584ff66c575cd57eabdbc79c10f57b1a7a631c73edb24cf1ed74580e6cae0d
+MISC ChangeLog 6056 SHA256 7181096808728ccac59970a3907fa0764bc7e3ea49243a51ec7050f2b88387f8 SHA512 18f6f0f786fa8b9dae352272dc87c8d4545b50f27197a59ba14654cc6ffebb045ea609d05341ab5971171f2421f52ef882e4604731b958f576b7339694b54802 WHIRLPOOL 2fb777b1d4d98559aae9948c287879ff2f8403561ee3cd2bb4d555464a389ef1b77fb99843d8fc29e9de6f704e28ca22e5b27d34ca53b8bda5e28db13a84d4f5
+MISC ChangeLog-2015 81302 SHA256 204f01e0cfbe58ca63651c9e6358716d3e220150bae0a0b484e5f7d0d23f5474 SHA512 44df498f4db3216b5bbf3524607181836078b7df34c8c4fe611f01cbb72988f66f07ed35ef579a80903e6d8a1050106c1c0ffa6350e570d17b2352c2c4a998d4 WHIRLPOOL e9c6f80ccc0ee8afdadbab368d158e460c2e3ee66db4c509e22110cc24b4e6da147d602bd5e7a68957ebf958ba4971a414f73759d696968b6693fdfa21a33d78
+MISC metadata.xml 1159 SHA256 359eb56dd95b008962fb673bc6cb161ffd3415076061df84e35fd1fe09db074b SHA512 0b4a4a1f388183923ce0d9f31bd622194165421c6db388fa4091b41aec8a343d6fb19c3bbac9dd288102bebf66c74df5ce81b14270dc954d8a68f7e0f76d318e WHIRLPOOL d298b5f5df1018e7332971a35755d86d488348e927b0098b9d54ec592062790232ca5044e9698a1af1453430d7f10643189d24e04744c0be0e94c1c06cdcde77
diff --git a/media-sound/amarok/amarok-2.8.90-r3.ebuild b/media-sound/amarok/amarok-2.8.90-r3.ebuild
new file mode 100644
index 000000000000..9165fb8d31e0
--- /dev/null
+++ b/media-sound/amarok/amarok-2.8.90-r3.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr ga gl hu it ja
+lt lv nb nl pa pl pt pt_BR ro ru sl sr sr@ijekavian sr@ijekavianlatin sr@latin
+sv tr uk zh_CN zh_TW"
+KDE_REQUIRED="never"
+KDE_HANDBOOK="optional"
+SQL_REQUIRED="always"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit flag-o-matic kde4-base pax-utils
+
+DESCRIPTION="Advanced audio player based on KDE framework"
+HOMEPAGE="https://amarok.kde.org/"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
+
+if [[ ${KDE_BUILD_TYPE} == live ]]; then
+	RESTRICT+=" test"
+fi
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+	app-crypt/qca:2[qt4(+)]
+	kde-frameworks/kdelibs:4[opengl?,plasma(+)]
+	$(add_kdeapps_dep kdebase-kioslaves)
+	>=media-libs/taglib-1.7[asf(+),mp4(+)]
+	>=media-libs/taglib-extras-1.0.1
+	sys-libs/zlib
+	>=virtual/mysql-5.1[embedded?]
+	>=dev-qt/qtcore-4.8:4
+	>=dev-qt/qtdbus-4.8:4
+	>=dev-qt/qtscript-4.8:4
+	>=x11-libs/qtscriptgenerator-0.1.0
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4(+)] )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl:0
+		>=dev-qt/qtcore-4.8.4:4[glib]
+		net-libs/loudmouth
+		net-misc/curl
+	)
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	ofa? ( >=media-libs/libofa-0.9.0 )
+	opengl? ( virtual/opengl )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/automoc
+	virtual/pkgconfig
+	test? ( dev-cpp/gmock )
+"
+RDEPEND="${COMMONDEPEND}
+	!media-sound/amarok-utils
+	$(add_kdeapps_dep phonon-kde)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.8.0-taglib110.patch"
+	"${FILESDIR}/${P}-mysql-embedded.patch"
+	"${FILESDIR}/${P}-mysqld-rpath.patch"
+	"${FILESDIR}/${P}-scriptconsole.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
+	"${FILESDIR}/${P}-ffmpeg3.patch"
+	"${FILESDIR}/${P}-no-webkit.patch"
+)
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# requires qtwebkit
+	sed -i -e "s/wikipedia,//" data/amarok_homerc || die
+}
+
+src_configure() {
+	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+	use ppc64 && append-flags -mminimal-toc
+
+	local mycmakeargs=(
+		-DWITH_PLAYER=ON
+		-DWITH_Libgcrypt=OFF
+		-DWITH_SPECTRUM_ANALYZER=OFF
+		-DWITH_NepomukCore=OFF
+		-DWITH_Soprano=OFF
+		-DWITH_MYSQL_EMBEDDED=$(usex embedded)
+		-DWITH_IPOD=$(usex ipod)
+		-DWITH_GDKPixBuf=$(usex ipod)
+		-DWITH_LibLastFm=$(usex lastfm)
+		-DWITH_MP3Tunes=$(usex mp3tunes)
+		-DWITH_Mtp=$(usex mtp)
+		-DWITH_LibOFA=$(usex ofa)
+		-DWITH_UTILITIES=$(usex utils)
+	)
+
+	# bug 581554: add libmysqld location for rpath patch
+	use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# bug 481592
+	pax-mark m "${ED}"/usr/bin/amarok
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if ! use embedded; then
+		echo
+		elog "You've disabled the amarok support for embedded mysql DBs."
+		elog "You'll have to configure amarok to use an external db server."
+		echo
+		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
+		elog "to configure the external db and migrate your data from the embedded database."
+		echo
+
+		if has_version "virtual/mysql[minimal]"; then
+			elog "You built mysql with the minimal use flag, so it doesn't include the server."
+			elog "You won't be able to use the local mysql installation to store your amarok collection."
+			echo
+		fi
+	fi
+}
diff --git a/media-sound/amarok/files/amarok-2.8.0-taglib110.patch b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
new file mode 100644
index 000000000000..093481659fa6
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
@@ -0,0 +1,40 @@
+From: Omar Plummer <omarplummer@imergetechnologies.com>
+Date: Thu, 06 Aug 2015 22:24:27 +0000
+Subject: Fix TagLib version check.
+X-Git-Url: http://quickgit.kde.org/?p=amarok.git&a=commitdiff&h=fec8817c530ce42b6485fdabff6051784b8d9904
+---
+Fix TagLib version check.
+
+The version check compared version strings lexicographically, so "1.7"
+(the min version) compared as greater than "1.10.0".
+
+BUG: 351013
+REVIEW: 124639
+---
+
+
+--- a/cmake/modules/FindTaglib.cmake
++++ b/cmake/modules/FindTaglib.cmake
+@@ -29,10 +29,10 @@
+ 
+   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+ 
+-  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+      set(TAGLIB_FOUND FALSE)
+-  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ 
+      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+ 
+@@ -42,7 +42,7 @@
+         set(TAGLIB_FOUND TRUE)
+      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
++  endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+ 
+ else(TAGLIBCONFIG_EXECUTABLE)
+
diff --git a/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch b/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch
new file mode 100644
index 000000000000..31feca0831fe
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch
@@ -0,0 +1,60 @@
+https://git.reviewboard.kde.org/r/129626
+
+Index: amarok-2.8.90/src/musicbrainz/MusicDNSAudioDecoder.cpp
+===================================================================
+--- amarok-2.8.90.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp
++++ amarok-2.8.90/src/musicbrainz/MusicDNSAudioDecoder.cpp
+@@ -223,7 +223,7 @@ MusicDNSAudioDecoder::decode( const QStr
+             {
+                 if( !decodedFrame )
+                 {
+-                    decodedFrame = avcodec_alloc_frame();
++                    decodedFrame = av_frame_alloc();
+                     if( !decodedFrame )
+                     {
+                         warning() << "Unable to allocate enough memory to decode file.";
+@@ -231,7 +231,7 @@ MusicDNSAudioDecoder::decode( const QStr
+                         break;
+                     }
+                     else
+-                        avcodec_get_frame_defaults( decodedFrame );
++		    	av_frame_unref ( decodedFrame );
+                 }
+ 
+                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
+@@ -341,7 +341,7 @@ MusicDNSAudioDecoder::decode( const QStr
+             {
+                 if( !decodedFrame )
+                 {
+-                    decodedFrame = avcodec_alloc_frame();
++                    decodedFrame = av_frame_alloc();
+                     if( !decodedFrame )
+                     {
+                         warning() << "Unable to allocate enough memory to decode file.";
+@@ -349,7 +349,7 @@ MusicDNSAudioDecoder::decode( const QStr
+                         break;
+                     }
+                     else
+-                        avcodec_get_frame_defaults( decodedFrame );
++		    	av_frame_unref( decodedFrame );
+                 }
+ 
+                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
+@@ -459,7 +459,7 @@ MusicDNSAudioDecoder::decode( const QStr
+             {
+                 if( !decodedFrame )
+                 {
+-                    decodedFrame = avcodec_alloc_frame();
++                    decodedFrame = av_frame_alloc();
+                     if( !decodedFrame )
+                     {
+                         warning() << "Unable to allocate enough memory to decode file.";
+@@ -467,7 +467,7 @@ MusicDNSAudioDecoder::decode( const QStr
+                         break;
+                     }
+                     else
+-                        avcodec_get_frame_defaults( decodedFrame );
++		    	av_frame_unref( decodedFrame );
+                 }
+ 
+                 decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt );
diff --git a/media-sound/amarok/files/amarok-2.8.90-gcc6.patch b/media-sound/amarok/files/amarok-2.8.90-gcc6.patch
new file mode 100644
index 000000000000..bad936a6645a
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-gcc6.patch
@@ -0,0 +1,36 @@
+From 9308403e1c8484052f277bf6de32ee07c93a4beb Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter@math.unl.edu>
+Date: Wed, 1 Jun 2016 13:58:26 -0500
+Subject: [PATCH] gcc6 buildfix
+
+courtesy of opensuse, thx
+
+BUG: 363054
+---
+ src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
+index 4bdb9b9..e327354 100644
+--- a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
++++ b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
+@@ -28,6 +28,7 @@
+ #include "playlist/PlaylistModelStack.h"
+ 
+ using namespace Playlists;
++using namespace Playlist;
+ 
+ XSPFPlaylist::XSPFPlaylist( const KUrl &url, Playlists::PlaylistProvider *provider, OnLoadAction onLoad )
+     : PlaylistFile( url, provider )
+@@ -101,7 +102,7 @@ XSPFPlaylist::load()
+     //FIXME: this needs to be moved to whatever is creating the XSPFPlaylist
+     if( m_autoAppendAfterLoad )
+         The::playlistController()->insertPlaylist(
+-                    ::Playlist::ModelStack::instance()->bottom()->rowCount(),
++                    ModelStack::instance()->bottom()->rowCount(),
+                     Playlists::PlaylistPtr( this )
+                 );
+ }
+-- 
+2.8.3
+
diff --git a/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
new file mode 100644
index 000000000000..b03aa1897cc4
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch
@@ -0,0 +1,34 @@
+From 048ca3d57228759f05af7b9553200fd362aeaa8b Mon Sep 17 00:00:00 2001
+From: Matt Whitlock <kde@mattwhitlock.name>
+Date: Tue, 29 Mar 2016 12:22:41 -0400
+Subject: [PATCH] Only link with MYSQL_EMBEDDED_LIBRARIES if
+ WITH_MYSQL_EMBEDDED
+
+REVIEW: 127523
+---
+ src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
+index 244cde1..4c618fc 100644
+--- a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
++++ b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt
+@@ -21,11 +21,14 @@ target_link_libraries(amarok_collection-mysqlcollection
+     ${KDE4_KDECORE_LIBS}
+     ${QT_QTCORE_LIBRARY}
+     ${QT_QTGUI_LIBRARY}
+-    ${MYSQL_EMBEDDED_LIBRARIES}
+     ${CMAKE_DL_LIBS}
+     ${ZLIB_LIBRARIES}
+ )
+ 
++if(WITH_MYSQL_EMBEDDED)
++    target_link_libraries( amarok_collection-mysqlcollection ${MYSQL_EMBEDDED_LIBRARIES} )
++endif(WITH_MYSQL_EMBEDDED)
++
+ if(NOT WIN32 AND NOT APPLE)
+     target_link_libraries( amarok_collection-mysqlcollection crypt pthread )
+ endif(NOT WIN32 AND NOT APPLE)
+-- 
+2.8.1
+
diff --git a/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
new file mode 100644
index 000000000000..c84975df7f2f
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
@@ -0,0 +1,12 @@
+--- a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt.old	2016-05-04 11:01:25.000000000 -0400
++++ b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt	2016-05-04 11:05:24.216625165 -0400
+@@ -28,6 +28,9 @@
+     ${ZLIB_LIBRARIES}
+ )
+ 
++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES INSTALL_RPATH "${MYSQLD_DIR}")
++
+ if(NOT WIN32 AND NOT APPLE)
+     target_link_libraries( amarok_storage-mysqlserverstorage crypt pthread )
+ endif(NOT WIN32 AND NOT APPLE)
diff --git a/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch b/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch
new file mode 100644
index 000000000000..91686b1f6545
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch
@@ -0,0 +1,39 @@
+Borrowed from Arch Linux.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -84,7 +84,7 @@ include_directories(
+     ${CMAKE_CURRENT_BINARY_DIR}/shared
+ )
+ 
+-find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml QtWebKit REQUIRED )
++find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml REQUIRED )
+ find_package( KDE4 4.8.4 REQUIRED )
+ 
+ include( KDE4Defaults )
+diff --git a/src/context/applets/CMakeLists.txt b/src/context/applets/CMakeLists.txt
+index f4d5456d9f..cad9036681 100644
+--- a/src/context/applets/CMakeLists.txt
++++ b/src/context/applets/CMakeLists.txt
+@@ -1,18 +1,18 @@
+ add_subdirectory( albums )
+ add_subdirectory( currenttrack )
+-add_subdirectory( info )
++# add_subdirectory( info )
+ add_subdirectory( labels )
+ add_subdirectory( lyrics )
+ add_subdirectory( photos )
+ add_subdirectory( tabs )
+-add_subdirectory( wikipedia )
++# add_subdirectory( wikipedia )
+ 
+ if( QT_QTOPENGL_FOUND )
+     add_subdirectory( analyzer )
+ endif()
+ 
+ if( LIBLASTFM_FOUND )
+-    add_subdirectory( upcomingevents )
++#    add_subdirectory( upcomingevents )
+     add_subdirectory( similarartists )
+ endif()
+ 
diff --git a/media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch b/media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch
new file mode 100644
index 000000000000..455146bdb5d1
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch
@@ -0,0 +1,33 @@
+From 2900fe47adde10999a6c0f907d73b00a1c1bd5b1 Mon Sep 17 00:00:00 2001
+From: Myriam Schweingruber <myriam@kde.org>
+Date: Wed, 18 May 2016 21:59:17 +0200
+Subject: [PATCH] Fix a crash in amarok when opening the Script Console
+
+The script console tries to write to a system folder instead of a user
+ folder. Note to devs: always make sure to test a system installation,
+ not just a local build.
+
+Thanks to Johannes Huber for the quick fix suggestion.
+
+BUG: 363176
+FIXED-IN: 2.9
+---
+ src/scripting/scriptconsole/ScriptConsole.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/scripting/scriptconsole/ScriptConsole.cpp b/src/scripting/scriptconsole/ScriptConsole.cpp
+index 6edd9a2..e4e0fab 100644
+--- a/src/scripting/scriptconsole/ScriptConsole.cpp
++++ b/src/scripting/scriptconsole/ScriptConsole.cpp
+@@ -161,7 +161,7 @@ ScriptConsole::ScriptConsole( QWidget *parent )
+     settings.endGroup();
+ 
+     if( m_savePath.isEmpty() )
+-        m_savePath = KUrl( KStandardDirs::locate( "data", "amarok/scriptconsole/" ) ).path();
++        m_savePath = KUrl( KStandardDirs::locateLocal( "data", "amarok/scriptconsole/" ) ).path();
+ 
+     slotNewScript();
+     connect( m_debugger, SIGNAL(evaluationSuspended()), SLOT(slotEvaluationSuspended()) );
+-- 
+2.8.2
+
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
new file mode 100644
index 000000000000..6ebc711247fd
--- /dev/null
+++ b/media-sound/amarok/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>jmbsvicetto@gentoo.org</email>
+	<name>Jorge Manuel B. S. Vicetto</name>
+</maintainer>
+<maintainer type="project">
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+<use>
+	<flag name="embedded">Use libmysqld, MySQL embedded server library.
+		Try disabling this if you encounter -PIC related in amarok,
+		it will make amarok rely only on standalone MySQL server.
+	</flag>
+	<flag name="lastfm">Enable Last.fm streaming services support through
+		<pkg>media-libs/liblastfm</pkg>
+	</flag>
+	<flag name="mp3tunes">Enable mp3tunes integration</flag>
+	<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp
+	</flag>
+	<flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
+		fingerprints (used by MusicBrainz)
+	</flag>
+	<flag name="utils">Build the utils - old media-sound/amarok-utils
+	</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
new file mode 100644
index 000000000000..98ca2b5f2c30
--- /dev/null
+++ b/media-sound/amsynth/Manifest
@@ -0,0 +1,13 @@
+DIST amSynth-1.3.2.tar.gz 635901 SHA256 3ad50c20d690865ea0fdef6745cd04a9f758e9ae654ad874902d3da896e0fa75 SHA512 c5f312fd1fa5335ccd2c1e7a81a7c0f9094faabec633fe654f04650e5604bb6d05f1348f6ce3c305e840692e2012ac9501ca83f5e5018a0218d9c35a99678e80 WHIRLPOOL 3b93486378a140ce7feb0789cc46a74375920ae717d38910e0b75011e4f1c827749f795ce38b7408d72adb4abfab090a104fc23f001977c68576bde05e1fa260
+DIST amsynth-1.5.1.tar.gz 1297131 SHA256 38e0764ae02ec38e689204581810adabedd9b4e0d306414c455f51c1dbf0bea4 SHA512 5f1551f9d1398a97738ac6f764f169d8cdd55e94464438adb226d1284fe8845e190fe5dd7a740b33972c1bbe76aa2d60467b7a663ec6717bb9fac75e5aac62d1 WHIRLPOOL 615ae1a55db42a0d6cb628ab84d9167894cb974594c45bf74aae6ad1e74b09f0303844fe54457b805ce4fd50af8ae99d9064531162106ef83c5c8103c24c8a73
+DIST amsynth-1.6.4.tar.gz 1380770 SHA256 489f57d506ea3495412bdd759be290930ff5da9d5b6b39ad8c82e19b4fd219ed SHA512 63ecc54ff0b26d61aa11a6cd1f6854c6b1f87b723808293a09f1b86831c574c8f709dd7987571914d285c52d94fa794f858c299927918ffa1ddad743bc180abb WHIRLPOOL f5b92d69543c479def140703df11efc27407f4869d0eea5b28ee1e8914c241184e6eccb726cb2d628b629c00c01c944425ea1d82522744ef7d5cbb5c49952634
+DIST amsynth-1.7.0.tar.gz 1399493 SHA256 176bfc8bc7eee60e6826572c8f9e9ce555c11687b063c5fb904836c44b4616b5 SHA512 4b9a56c7800a484b738985cf52f6956e8829c11b4fb10f72c1e3ede0aeb3fdcb424e72ac43995ea3dc988f9cb838a0f284719d274010dc52a115faa8a3beb8d9 WHIRLPOOL 7d631b697dfed88b5a8a4c28bb0b4158384676b472936b0dc735f484096d2a6b14fb555c0af83f74b3120f9a6baac0c4073bf22f194439beb903261d88d70bfa
+DIST amsynth-1.7.1.tar.gz 1409439 SHA256 cb2be6cfbf0c01cdacb3e7e0f717f70d093026811e5aefaa12337deaf62c0486 SHA512 ad5eff805f3ad30a7cc9f3933bbe82b99c670c669c0c405d5045a410afc75cdc0d692856e73ccf870d3ca66e0997a81a5c35baf57b33bb6012f19056cff725c9 WHIRLPOOL 583b426612e0b20515eaa8bd85847eac211f8cd463aa283499c3d585a7d45a7419c092acb0bdc92562997f57e01051fd783ed04321f97afaea4ebaec3dc74de8
+EBUILD amsynth-1.3.2-r1.ebuild 1002 SHA256 aab85b3f1056a9d26dbf12b7b177d42586dea03f47fdee81057542d7e7418903 SHA512 05c2673480294f4b208dbf138dd9c6d654d60f8c4e733a5a788116f3b179ebf3e12b9cae417b396159c83a95b707e96e8bc499e7b7510350eb388306f5120807 WHIRLPOOL e7b87f8111f6e3e07f6b266929fde794c9098e2380e5da0f7370ad6962f0e76ceb0ce8815bb9e2189a18d81c1222028b7a4887499b3c094c3831b9ca923b1b5f
+EBUILD amsynth-1.5.1-r1.ebuild 1065 SHA256 57e375bcd2ea5daea418fd98129616515f7b8171c01322d3e626ae627d2e42ad SHA512 a90ee63e289f8224ee844f1593dbced7f9fb52d319fee98c5edf0ae3aa25cb52d61a593b6785ef03c3122aca787ced5a71eb2e72e6186abaa0880e5e5918bff0 WHIRLPOOL 9df36b98150e0a0cd0690c36303cb0513b7ee1dbcb48474d8e4ccaf2fb7e72055f2d02e7b711fc7dcbc297b18d7fb9cbe39517f17eb932522cab129bdbf5917a
+EBUILD amsynth-1.6.4-r1.ebuild 1013 SHA256 adb30c7678d5c8dbd8e851a6ebe53f8b42481d2065ef0ec677273f07aea7d155 SHA512 31dafb8fe8df15c58fec9a65c54e48bb0e23f454deba8e21ca0b04e86033da62acc85cfd1773b52724a2c7bd6740523a1cff20e2cbf06e78a209407d293953d5 WHIRLPOOL 2987ebda9b63dd0e8b66263638506f8396723ab7e2affd875300263950c06c739a640fc96c712ed30ea8c24baa2bc70e0d8f4b5bc13617b0a08019e17b6eeaba
+EBUILD amsynth-1.7.0-r1.ebuild 1013 SHA256 adb30c7678d5c8dbd8e851a6ebe53f8b42481d2065ef0ec677273f07aea7d155 SHA512 31dafb8fe8df15c58fec9a65c54e48bb0e23f454deba8e21ca0b04e86033da62acc85cfd1773b52724a2c7bd6740523a1cff20e2cbf06e78a209407d293953d5 WHIRLPOOL 2987ebda9b63dd0e8b66263638506f8396723ab7e2affd875300263950c06c739a640fc96c712ed30ea8c24baa2bc70e0d8f4b5bc13617b0a08019e17b6eeaba
+EBUILD amsynth-1.7.1-r1.ebuild 1013 SHA256 adb30c7678d5c8dbd8e851a6ebe53f8b42481d2065ef0ec677273f07aea7d155 SHA512 31dafb8fe8df15c58fec9a65c54e48bb0e23f454deba8e21ca0b04e86033da62acc85cfd1773b52724a2c7bd6740523a1cff20e2cbf06e78a209407d293953d5 WHIRLPOOL 2987ebda9b63dd0e8b66263638506f8396723ab7e2affd875300263950c06c739a640fc96c712ed30ea8c24baa2bc70e0d8f4b5bc13617b0a08019e17b6eeaba
+MISC ChangeLog 3549 SHA256 2df630d46771540dc6ba13f3d1b2666cbd358b1fc8160c44fbbe46e8dc4f2cc4 SHA512 605fa1b1917ff4551ced13b7865f34ec655acc359cb2da6f1283610858ecd42c1a260e38f01af878616ac666653b6567232fa1214bf24d62b2f1295f92c664ab WHIRLPOOL f77f1ec772c09c38e0ccc0b213848ab6a03ea6a88d73c2368875031d9c6965c5dd541202c50cef11af6331a36f1ad389ddffbff89ada667243d5a86940c57d98
+MISC ChangeLog-2015 7084 SHA256 29623fc1bd043b0bbfd8e66d06cc01ae65c804d4d36e070acf047dcdc67cb125 SHA512 0405f0b3147dea9321ea12f360845fefefbc0ac12b9742ee12d8eb76755a44437d3af13fe6f1fe49e5fbe7b74311e11b3ba46c2c468bb1bc938e1a367b764e1e WHIRLPOOL 0ed785e5c1c707829ba9d3e351f87c4c902eee5e79b92695e830fe201422792fbfa0189708fe3d1b8a2e07e1bfbe65378fb34f885b2951816546a8324f82a1cd
+MISC metadata.xml 421 SHA256 e3224dbda6f7c86ab3a3ffb4c135594204bd1823e390cf654168ca4577c347a5 SHA512 0e2133cc1f8b6c25bc60e3e580858cbf4cecbd23dfc4d771a23781d8a7499edd4251cba3105ee9ae7d7ba81935769bfc197e5f4c3f7cf12409d102e8d0b6a0cb WHIRLPOOL 40904fa07453a61c30a049cfcfe92da0917325ca13ec9db85fc0151aed4039bbb082e015347d4fc0540468e713382f21e7ddf9208599c0de9ff15e1187f6cbd3
diff --git a/media-sound/amsynth/amsynth-1.3.2-r1.ebuild b/media-sound/amsynth/amsynth-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..bc363155b992
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.3.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools
+
+MY_P=${P/ams/amS}
+
+DESCRIPTION="Virtual analogue synthesizer"
+HOMEPAGE="https://code.google.com/p/amsynth/"
+SRC_URI="https://amsynth.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="alsa dssi jack lash oss sndfile"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	sndfile? ( >=media-libs/libsndfile-1:= )
+	alsa? (
+		media-libs/alsa-lib:=
+		media-sound/alsa-utils
+		)
+	dssi? (
+		media-libs/dssi:=
+		media-libs/liblo:=
+		>=x11-libs/gtk+-2.20:2
+		)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	oss? ( virtual/os-headers )"
+
+DOCS="AUTHORS README"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		CFLAGS="" \
+		CXXFLAGS="${CXXFLAGS}" \
+		$(use_with oss) \
+		$(use_with alsa) \
+		$(use_with jack) \
+		$(use_with lash) \
+		$(use_with sndfile) \
+		$(use_with dssi)
+}
diff --git a/media-sound/amsynth/amsynth-1.5.1-r1.ebuild b/media-sound/amsynth/amsynth-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..257e2bb0f5b3
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.5.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools flag-o-matic
+
+DESCRIPTION="Virtual analogue synthesizer"
+HOMEPAGE="https://github.com/nixxcode/amsynth/"
+SRC_URI="https://github.com/nixxcode/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="alsa dssi jack lash oss sndfile"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	sndfile? ( >=media-libs/libsndfile-1:= )
+	alsa? (
+		media-libs/alsa-lib:=
+		media-sound/alsa-utils
+		)
+	dssi? (
+		media-libs/dssi:=
+		media-libs/liblo:=
+		>=x11-libs/gtk+-2.20:2
+		)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	oss? ( virtual/os-headers )"
+
+DOCS="AUTHORS README"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		CFLAGS="" \
+		CXXFLAGS="${CXXFLAGS}" \
+		$(use_with oss) \
+		$(use_with alsa) \
+		$(use_with jack) \
+		$(use_with lash) \
+		$(use_with sndfile) \
+		$(use_with dssi)
+}
diff --git a/media-sound/amsynth/amsynth-1.6.4-r1.ebuild b/media-sound/amsynth/amsynth-1.6.4-r1.ebuild
new file mode 100644
index 000000000000..69a0cb904ff9
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.6.4-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Virtual analogue synthesizer"
+HOMEPAGE="https://github.com/nixxcode/amsynth/"
+SRC_URI="https://github.com/nixxcode/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa dssi jack lash oss sndfile"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	sndfile? ( >=media-libs/libsndfile-1:= )
+	alsa? (
+		media-libs/alsa-lib:=
+		media-sound/alsa-utils
+		)
+	dssi? (
+		media-libs/dssi:=
+		media-libs/liblo:=
+		>=x11-libs/gtk+-2.20:2
+		)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	oss? ( virtual/os-headers )"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		$(use_with oss) \
+		$(use_with alsa) \
+		$(use_with jack) \
+		$(use_with lash) \
+		$(use_with sndfile) \
+		$(use_with dssi)
+}
diff --git a/media-sound/amsynth/amsynth-1.7.0-r1.ebuild b/media-sound/amsynth/amsynth-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..69a0cb904ff9
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.7.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Virtual analogue synthesizer"
+HOMEPAGE="https://github.com/nixxcode/amsynth/"
+SRC_URI="https://github.com/nixxcode/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa dssi jack lash oss sndfile"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	sndfile? ( >=media-libs/libsndfile-1:= )
+	alsa? (
+		media-libs/alsa-lib:=
+		media-sound/alsa-utils
+		)
+	dssi? (
+		media-libs/dssi:=
+		media-libs/liblo:=
+		>=x11-libs/gtk+-2.20:2
+		)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	oss? ( virtual/os-headers )"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		$(use_with oss) \
+		$(use_with alsa) \
+		$(use_with jack) \
+		$(use_with lash) \
+		$(use_with sndfile) \
+		$(use_with dssi)
+}
diff --git a/media-sound/amsynth/amsynth-1.7.1-r1.ebuild b/media-sound/amsynth/amsynth-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..69a0cb904ff9
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.7.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Virtual analogue synthesizer"
+HOMEPAGE="https://github.com/nixxcode/amsynth/"
+SRC_URI="https://github.com/nixxcode/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa dssi jack lash oss sndfile"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	sndfile? ( >=media-libs/libsndfile-1:= )
+	alsa? (
+		media-libs/alsa-lib:=
+		media-sound/alsa-utils
+		)
+	dssi? (
+		media-libs/dssi:=
+		media-libs/liblo:=
+		>=x11-libs/gtk+-2.20:2
+		)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	oss? ( virtual/os-headers )"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		$(use_with oss) \
+		$(use_with alsa) \
+		$(use_with jack) \
+		$(use_with lash) \
+		$(use_with sndfile) \
+		$(use_with dssi)
+}
diff --git a/media-sound/amsynth/metadata.xml b/media-sound/amsynth/metadata.xml
new file mode 100644
index 000000000000..49d152f77885
--- /dev/null
+++ b/media-sound/amsynth/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="dssi">Enable support for DSSI Soft Synth Interface</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">nixxcode/amsynth</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/apetag/Manifest b/media-sound/apetag/Manifest
new file mode 100644
index 000000000000..28591a498345
--- /dev/null
+++ b/media-sound/apetag/Manifest
@@ -0,0 +1,5 @@
+DIST apetag.1.12.tar.gz 29942 SHA256 7376c326483098c9e1f200cbbb2f238705adc0cbafe854ca583febedf42737e9 SHA512 615c495721c6d46e6ce4546ede218efaac1f3fda91dcd9b8da2b8f7c79cc0f5fbee7dd5bc433c0b125973a816980abb8677f16d4000e5e71699524baddd16887 WHIRLPOOL 39ecb3cdb74bc44479cfc3cd832571fefc858723bc37ced09c746e0637bcfa2a6e1e5bfcb4b9be96188d7792c87e27a686599769d434e6bde4b730b66bf7fcd0
+EBUILD apetag-1.12-r2.ebuild 989 SHA256 0332a762c54f9ac3bbc11bf0b9b42002e0d15756a4aeb5b15d0b525204edb2dc SHA512 6086758aca87fe2440d4dae5bfdbcb0d2b266f39834cf4677269bdb2a5eee25636ca4296c5267b9c979daddec4a780e576e5cdfcdd72465d5f87a16bd78fab38 WHIRLPOOL d2ae6797d428f26ac34bb379161b447127e065cf68bfb21b205aa2cb4e05913ee55bbc8c454e16bf5199ebd757ba702350e41826776366c924c7b6942a22994d
+MISC ChangeLog 3050 SHA256 e0714014e97df9f4112095ba46f98680e45029c5309a474f2ca1ca290b180441 SHA512 92650c6e3f6758b227d37b8fa7732120d4b4a1ad502e247d03e12a24fb00d3d4e9f18a3d8d74c23384bfeec25372e025daac7d97b3baa19a7bfda5bdf710366c WHIRLPOOL 014dfecd7a654a2a9dcb27fced23f7a091f48ff9b6c0365ab961c7da1307d9331029254776b57a8985be2427fa5ebad8b83b279572fffc978eeec531812be62e
+MISC ChangeLog-2015 1844 SHA256 101f5760728e7b7d62776ecf69d8b450bfa22b2abd902caab28489b40695235b SHA512 4fdee6fc184955f7b20e67a5fb5c2428c4965425426ee0b0dbeb116f9811cae27e88eec5bc62f609b020bc4f42f4a8444918bd01510877f074ecd6d44c815cff WHIRLPOOL f60c02437ca63f23c8da8c152ecba9bc28736ac82ec049027ad6ecfc3249962c80e76f96de26e3a16606870fbe371879e830ebc303de364409a582e2f18de2c9
+MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/media-sound/apetag/apetag-1.12-r2.ebuild b/media-sound/apetag/apetag-1.12-r2.ebuild
new file mode 100644
index 000000000000..831122cb12a8
--- /dev/null
+++ b/media-sound/apetag/apetag-1.12-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="Command-line ape 2.0 tagger"
+HOMEPAGE="http://muth.org/Robert/Apetag/"
+SRC_URI="http://muth.org/Robert/Apetag/${PN}.${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN^}
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:CXXDEBUG:LDFLAGS:' \
+		Makefile || die
+	python_fix_shebang *.py
+}
+
+src_compile() {
+	tc-export CXX
+	emake \
+		CXXFLAGS="${CXXFLAGS} -Wall -pedantic" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+
+	python_moduleinto /usr/lib/apetag
+	python_domodule *.py
+
+	fperms +x /usr/lib/apetag/{rmid3tag,tagdir}.py
+	dosym ../lib/apetag/rmid3tag.py /usr/bin/rmid3tag.py
+	dosym ../lib/apetag/tagdir.py /usr/bin/tagdir.py
+
+	newdoc 00readme README
+}
diff --git a/media-sound/apetag/metadata.xml b/media-sound/apetag/metadata.xml
new file mode 100644
index 000000000000..39626a990be5
--- /dev/null
+++ b/media-sound/apetag/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
new file mode 100644
index 000000000000..735afbabacbf
--- /dev/null
+++ b/media-sound/apulse/Manifest
@@ -0,0 +1,6 @@
+AUX apulse 488 SHA256 b1a3969034615e6e0b44c2be1e48e66fe58ad66f5df7a7e9458d0848972c8878 SHA512 2b1ebb3d574af2469f50a42e324b3367b5e08d3de00076620ce2133226d544ab2507e6d752ff3ed427319978ab5e1a0e73189368666a5c7f5ed61f1294417228 WHIRLPOOL 88fcfb78826e5ebf000e8b566087d7682a1bf7e5791bf67f5f13aca57f34804c143d16e2ae1a1459271732f4e77ad7a8138bb8d7f928714fe207c3e4f96b8a87
+DIST apulse-0.1.10.tar.gz 110272 SHA256 4f8aa9059d07bac1006e920a4a6b875ad63fdde973b83c138507812c00dd5cd6 SHA512 e922448095b7e3c8ae5766fadd5912ad39c1d0d68c73954305d17909b6bafe3a95c7e1ad4d63a4824293e0ba1495c253204343f31330c0ddb4fb419fe1f9eb12 WHIRLPOOL 56db7a62d75babe269f124f296c6000d322c50c1de583e6b274dc97ec456b6786315cc054ab7e09b1bd436ad47b86b58fc291d8e6f8192b6e2deeca14bef349b
+EBUILD apulse-0.1.10.ebuild 1061 SHA256 511090a78fe44b6e92e379c10f9b9a27e1446282227773f893e79af7912a55f4 SHA512 3efcc51cef1fbbe5df7c8da928d7c7effcfea688c187a516b2192813c3ffad66e41cc61c6c9cb7a2a7c6a1b3b49ab6a8bd3437d1baafc008baaedd78ed453e11 WHIRLPOOL 3340f2ba07f1a09a704a4e249f98714213b825a1ac33732311385212675bdba77435188222ebba7d349e79f6948f653bdc103b360a2e01cae6ed7ed5c8b21c60
+MISC ChangeLog 4055 SHA256 2c123f8c480aa9061e156181fe9123e7450956c7cb97cf5b8ffce11503318359 SHA512 c308b50778ccfa3268392ef791ed0c9552c143b3883cbaf23ecb9b033f8d13c7e0036ed283fd8b37e3f07a777336efc92e7d3d8183137e44c79c90265e1ea053 WHIRLPOOL db80433cac7c46ee00e2b0c777e0a20482096eb5fff4cdbc5ccb0d80725a484a8f6edb52524fafb33c78b857f625950a0ec72c7477def610bd9b8b555488ad75
+MISC ChangeLog-2015 2310 SHA256 db890fb531d44258e4ad8c6f40cdae01bab1087ca43aeef0886e86caeaaff01a SHA512 bf8904085d867cc22671f2ab1381dd79eb150902d759439059d9a6455d47d9e8636121dd272dd82f8c3e570e9812dbed2ec15ba3e3ea7cb3764dfaac6ae3fd4b WHIRLPOOL 7a6bf537fca497f9b8b63e659cc5e6f8956c5960cb04f6831dfe4bdac8fb5c34574920f0103de2c62afea901a1cf5a8b74563cd5eada5ceaf1e82be1e902a837
+MISC metadata.xml 339 SHA256 5837214b520e592bedc70e5e9feeb16cb6d07d6047045cf2d60c1ad53d70a885 SHA512 d33b0678d50e2a48420629dfbd05ad9a5562886c7c051d2004dbf266c4280ec52db4c52a2f0774664ab17602cbb40ce333e02799e4c3bad858bf5cc66ea0562f WHIRLPOOL e20605897aaf0a018b36b4402fd8f5e9f68ba411bd16cfa75fa030f49888674bc71927a34787e7b7a480828919f1491bc7a4a72fdb77bea734f34bd31aa493df
diff --git a/media-sound/apulse/apulse-0.1.10.ebuild b/media-sound/apulse/apulse-0.1.10.ebuild
new file mode 100644
index 000000000000..c9c55450de00
--- /dev/null
+++ b/media-sound/apulse/apulse-0.1.10.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib cmake-multilib
+
+DESCRIPTION="PulseAudio emulation for ALSA"
+HOMEPAGE="https://github.com/i-rinat/apulse"
+SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]"
+RDEPEND="${DEPEND}
+	!!media-plugins/alsa-plugins[pulseaudio]"
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )
+
+src_prepare() {
+	# Ensure all relevant libdirs are added, to support all ABIs
+	DIRS=
+	_add_dir() { DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; }
+	multilib_foreach_abi _add_dir
+	sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > "${T}"/apulse
+	eapply_user
+}
+
+multilib_src_configure() {
+	local mycmakeargs=("-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse")
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	cmake-utils_src_install
+	einstalldocs
+	dobin "${T}"/apulse
+}
diff --git a/media-sound/apulse/files/apulse b/media-sound/apulse/files/apulse
new file mode 100755
index 000000000000..32633b2d9a50
--- /dev/null
+++ b/media-sound/apulse/files/apulse
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Author:  Daniel Campbell <zlg@gentoo.org>
+# License: Creative Commons Public Domain Dedication (CC0 1.0)
+#          <https://creativecommons.org/publicdomain/zero/1.0/>
+
+# apulse needs at least one argument
+if [ $# -lt 1 ]; then
+	echo "Usage: apulse <app-path> [options]"
+	exit
+fi
+
+# Set library path for the application so it'll use apulse. DIRS is
+# replaced by the ebuild to include the correct paths
+LD_LIBRARY_PATH=@@DIRS@@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} exec "$@"
diff --git a/media-sound/apulse/metadata.xml b/media-sound/apulse/metadata.xml
new file mode 100644
index 000000000000..7b8c0f8e4b74
--- /dev/null
+++ b/media-sound/apulse/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">i-rinat/apulse</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
new file mode 100644
index 000000000000..3aed6b940582
--- /dev/null
+++ b/media-sound/aqualung/Manifest
@@ -0,0 +1,8 @@
+AUX aqualung-1.0-ffmpeg3.patch 1148 SHA256 0496a98a827f09567342dbabc81a38cb656f8c4d9c7f42974566ea308a3d2365 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985 WHIRLPOOL f29f27d6a8cfc7cd508c73e888a3170f31f884a7bf0c5510151272e6851109159788615e08f3ad78391c9484f5af941b3947d03310fc6661fb95dfd7a184cbb2
+AUX aqualung-1.0-mac.patch 917 SHA256 00cdd9018715c4e0e338691d82e2dae22659e65fd16f44dd54ee36310e30576a SHA512 680acac4c588068baf39aa8f8892a8d4d95e49419d9fea0b3620a7850513be133986315455f293362cf5288f761474e48294607156657b37b0d4f98f003c3c2c WHIRLPOOL f59bdfa34743a0d57626dfe74334171553e8ba34cbbeb26560f0436f752c2843f3934386a98a9460362bdeac1a843926d84496c5abba08c18dc712d58bf5ee32
+DIST aqualung-1.0.tar.gz 2014854 SHA256 c286c1432c1475127f4e9525702bcb486ed85fc62539bd3ef344d92333e84347 SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a WHIRLPOOL 8afefd6463860b2e1c086c27b367be1b9c3ced0ae2500b4650ae46963437145e53c57457d7c28c9ca8a76d645f67289db85da606bcf7ef9a190ea50afe1d3bb1
+EBUILD aqualung-1.0-r1.ebuild 2491 SHA256 8876518411d1cd91ec966d68f65fd846d2942a910e21b25ed315a2d1a7d0b127 SHA512 49dbf6a9f53249c2f710f1f02720d35980b54d42d59d4a27a96f10ed157a94b32829c8151d03037ccbf8a8f83ba2c52a9a8627bad288670e1ff58b27005b6b32 WHIRLPOOL 308f05034a865b008219c3e22a66a86add7e2d815d971da1205a83c1091819c9944ba8f0cd6b69feb57aad33604f15e9cfe6682616cfa36101035e70499c9f38
+EBUILD aqualung-1.0-r2.ebuild 2476 SHA256 e50d7e767e010cc6081b626e25a4749b884bf6ee3fdcbb6f86e1e5fff192d82d SHA512 541797ff6efebfd55422b08deca067942e7722563bb4e7678fdfcdbc0e4b3945aa3ec65d2d3627c5c8cd060d6b1d6926e2e36b56644eb746c20dd6c744771b71 WHIRLPOOL 313e19650198d14608614b9f9d6e3641abefe983639e37e66ff4d3937ba578ff1122ee096f5d9497ad7f4faecd21548b012a5ad6fbdaa82a05869d161987b0aa
+MISC ChangeLog 2765 SHA256 1ec9e1992502df3c4b8f084de12fb5c517f47a1d70e3539ca818ce35359a4b9e SHA512 85433c6079bd92241f89cb675ce96bbe74c25b84d5ad0edaabc8b58635a3f833b8442aa142a4d6d51385464bd1edf71eaabcdac5d4e7af8a0b80283809c99bfe WHIRLPOOL 5572b69ba6a96303ce4f06963ab13a8fd8b4e73b5d86172038ee30cff40bf64c89c7f0fc09a66724632e6575c747172ee40098aa9901575d75c27090738d1d4c
+MISC ChangeLog-2015 7112 SHA256 616d82ec724a3d65399f11dee90c5bbb9ccf195fafd9736b46f99ede07429212 SHA512 bbedb8b144430d00d12cc181707fb3b0d7b377e536b2d9601cd00acb9c89381b1639d5765c2c9951043f376d3382868b54e1ecbf67936ef5e8d5a2cae75d6846 WHIRLPOOL 2b9043854ccc6fb889dec1f6899a93b255632b09b26c02bf2a844c1a0a89671bcfc8d8b25c776958114846a9bc66253a1e072f1f204a423fd8992dcac78c2b99
+MISC metadata.xml 918 SHA256 7dc0335ffea0f558e8e37b984b17f07634581f3aa2bb10b5b701e6cbe7ff02c3 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566 WHIRLPOOL e3910fd2bbfdffbb25068a7e2b8a496c550ac69e49e0801bdf191df6eeb78fa1ee220c4bb96cb3c728634cf3fcc7e2529597e4c52970729318811059b11d4f39
diff --git a/media-sound/aqualung/aqualung-1.0-r1.ebuild b/media-sound/aqualung/aqualung-1.0-r1.ebuild
new file mode 100644
index 000000000000..668e4bd19157
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
+HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
+SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate
+	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
+	vorbis wavpack"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/libxml2
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	alsa? ( media-libs/alsa-lib )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac )
+	ifp? ( media-libs/libifp )
+	jack? ( media-sound/jack-audio-connection-kit )
+	ladspa? ( media-libs/liblrdf )
+	lame? ( media-sound/lame )
+	libsamplerate? ( media-libs/libsamplerate )
+	lua? ( dev-lang/lua:0= )
+	mac? ( media-sound/mac )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( media-libs/libsndfile )
+	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+	"${FILESDIR}/${P}-ffmpeg3.patch"
+	"${FILESDIR}/${P}-mac.patch"
+)
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		--enable-loop \
+		--enable-nls \
+		--enable-transcoding \
+		$(use_enable debug) \
+		$(use_enable podcast) \
+		$(use_enable systray) \
+		$(use_enable jack jack-mgmt) \
+		$(use_with alsa) \
+		$(use_with cdda) \
+		$(use_with cddb) \
+		$(use_with ffmpeg lavc) \
+		$(use_with flac) \
+		$(use_with ifp) \
+		$(use_with jack) \
+		$(use_with ladspa) \
+		$(use_with lame) \
+		$(use_with libsamplerate src) \
+		$(use_with lua) \
+		$(use_with mac) \
+		$(use_with modplug mod) \
+		$(use_with mp3 mpeg) \
+		$(use_with musepack mpc) \
+		$(use_with oss) \
+		$(use_with pulseaudio pulse) \
+		$(use_with sndfile) \
+		$(use_with speex) \
+		$(use_with vorbis vorbis) \
+		$(use_with vorbis vorbisenc) \
+		$(use_with wavpack)
+}
+
+src_install() {
+	default
+
+	newicon src/img/icon_64.png aqualung.png
+	make_desktop_entry aqualung Aqualung
+}
diff --git a/media-sound/aqualung/aqualung-1.0-r2.ebuild b/media-sound/aqualung/aqualung-1.0-r2.ebuild
new file mode 100644
index 000000000000..5c6ec6bde400
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.0-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
+HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
+SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate
+	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
+	vorbis wavpack"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/libxml2
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	alsa? ( media-libs/alsa-lib )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac )
+	ifp? ( media-libs/libifp )
+	jack? ( media-sound/jack-audio-connection-kit )
+	ladspa? ( media-libs/liblrdf )
+	lame? ( media-sound/lame )
+	libsamplerate? ( media-libs/libsamplerate )
+	lua? ( dev-lang/lua:0= )
+	mac? ( >=media-sound/mac-4.11.4.5.7 )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( media-libs/libsndfile )
+	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+	"${FILESDIR}/${P}-ffmpeg3.patch"
+)
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		--enable-loop \
+		--enable-nls \
+		--enable-transcoding \
+		$(use_enable debug) \
+		$(use_enable podcast) \
+		$(use_enable systray) \
+		$(use_enable jack jack-mgmt) \
+		$(use_with alsa) \
+		$(use_with cdda) \
+		$(use_with cddb) \
+		$(use_with ffmpeg lavc) \
+		$(use_with flac) \
+		$(use_with ifp) \
+		$(use_with jack) \
+		$(use_with ladspa) \
+		$(use_with lame) \
+		$(use_with libsamplerate src) \
+		$(use_with lua) \
+		$(use_with mac) \
+		$(use_with modplug mod) \
+		$(use_with mp3 mpeg) \
+		$(use_with musepack mpc) \
+		$(use_with oss) \
+		$(use_with pulseaudio pulse) \
+		$(use_with sndfile) \
+		$(use_with speex) \
+		$(use_with vorbis vorbis) \
+		$(use_with vorbis vorbisenc) \
+		$(use_with wavpack)
+}
+
+src_install() {
+	default
+
+	newicon src/img/icon_64.png aqualung.png
+	make_desktop_entry aqualung Aqualung
+}
diff --git a/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch b/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
new file mode 100644
index 000000000000..111ee70c8774
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
@@ -0,0 +1,29 @@
+From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001
+From: Jamie Heilman <jamie@audible.transient.net>
+Date: Sun, 8 May 2016 19:34:36 +0000
+Subject: [PATCH] ffmpeg/libav: support libavcodec API 55 and later
+
+With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer()
+were deprecated; the new default AVCodecContext.get_buffer2()
+implementation works fine for us.
+---
+ src/decoder/dec_lavc.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/decoder/dec_lavc.c b/src/decoder/dec_lavc.c
+index e2c81c6..5268a64 100644
+--- a/src/decoder/dec_lavc.c
++++ b/src/decoder/dec_lavc.c
+@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char * filename) {
+ 		return DECODER_OPEN_BADLIB;
+ 
+ 	pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ #if LIBAVCODEC_VERSION_MAJOR >= 53
+ 	pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
+ 	pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
+ #endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
++#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
+ 
+ 	pd->time_base = pd->avFormatCtx->streams[pd->audioStream]->time_base;
+ 
diff --git a/media-sound/aqualung/files/aqualung-1.0-mac.patch b/media-sound/aqualung/files/aqualung-1.0-mac.patch
new file mode 100644
index 000000000000..16689ee0ae75
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.0-mac.patch
@@ -0,0 +1,26 @@
+Revert this patch.
+
+From 12c3a45a6d5b6ef0da70e0cdc424beff993eeef6 Mon Sep 17 00:00:00 2001
+From: Tom Szilagyi <tszilagyi@users.sourceforge.net>
+Date: Mon, 9 Jun 2014 12:54:54 +0000
+Subject: [PATCH] Make the APE decoder compile with current libmac-dev
+ (4.11-u4-b5-s7-d)
+
+git-svn-id: https://svn.code.sf.net/p/aqualung/code/trunk@1303 3cd24cdc-1f22-0410-b8b1-dcf80e670293
+---
+ src/decoder/dec_mac.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/decoder/dec_mac.cpp b/src/decoder/dec_mac.cpp
+index 024c8b9..2e9bc01 100644
+--- a/src/decoder/dec_mac.cpp
++++ b/src/decoder/dec_mac.cpp
+@@ -174,7 +174,7 @@ mac_decoder_open(decoder_t * dec, char * filename) {
+ 
+ 
+ 	int ret = 0;
++        wchar_t * pUTF16 = GetUTF16FromANSI(filename);
+-        wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
+         pdecompress = CreateIAPEDecompress(pUTF16, &ret);
+         free(pUTF16);
+ 
diff --git a/media-sound/aqualung/metadata.xml b/media-sound/aqualung/metadata.xml
new file mode 100644
index 000000000000..66cfd45a7245
--- /dev/null
+++ b/media-sound/aqualung/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>billie@gentoo.org</email>
+    <name>Daniel Pielmeier</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="ifp">Enable support for iRiver iFP portable audio players</flag>
+    <flag name="lua">Enable support for programmable title formatting with
+    <pkg>dev-lang/lua</pkg></flag>
+    <flag name="mac">Enable support for decoding Monkey's Audio files</flag>
+    <flag name="podcast">Enable podcast support</flag>
+    <flag name="systray">Enable system tray support</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">jeremyevans/aqualung</remote-id>
+    <remote-id type="sourceforge">aqualung</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
new file mode 100644
index 000000000000..cb40c56db25b
--- /dev/null
+++ b/media-sound/ardour/Manifest
@@ -0,0 +1,27 @@
+AUX ardour-2.8.11-flags.patch 926 SHA256 1b4762c15c329dbc89dba7149358ba5f82670f4d3e550dc166d55dda4e243304 SHA512 fbce5a750aad9eb2ffb1546a61b247bd39ffd37f757cdd545c319bbe427a2077a7334ff9171bc40d32ed0c0c25ac4ff170da159f0628ab4af6976127dcf70499 WHIRLPOOL e887017f5c64d60cba6eb88122ad8e5ef12c177973a0991e66249a3a880a838788398f35f9c35c6ee77277bb5fa4dcc39508dcb5b67f68bc45b480955d72f0ca
+AUX ardour-2.8.14-boost-150.patch 446 SHA256 e4b463dc007bdfdbbafdaf686a2a52ff34b5a519c26ef68364f3c27b2947a685 SHA512 3bccf463afd7a647f398c60498566b7103ca88702e630215afe4b75954a4eb96a333aab2f02c056bed7499eb7e64454c430a81c3d5d7abe0a7cb323b3111f0ef WHIRLPOOL 4c53083e420042d3ff6fb8e97852b5b70b619e8c5664b6127e6dcb50cb660db1f0e575b28da76e249a2bc395ba5bce67d74082871ab89720dcb3ab8d5552ce5f
+AUX ardour-2.8.14-syslibs.patch 3766 SHA256 44ad92ade9e0e06bf557b52ade3e20a9bb2631846efb08a84b40a92a81b3dcdc SHA512 16d1d37ea3474d0d393839d0e815096094fb3d5a914ccd041154cee11a627f7c236f070aff2379b1b4098b4da3909f0434aaa3ab52c9ac3be1ff7c8e6d3468eb WHIRLPOOL 28ded8c29de811b4dbcd6f3659d8787ec81d29718194d9877aebd9d25c06aae7dedf9530028cc410e03dc49b0fe4c1424d6e08a4064874e199263093bd76e23d
+AUX ardour-4.0-lv2.patch 2095 SHA256 b6c598bcd614c72a1071eb75e9f656824af65b06b542bb87560046a1824f4fd2 SHA512 77688faf865874b8d64785b33d3837a47c16de640bcfc5ef20006aaf2f21df0b5a81c89c8d7cf1456dbf160cdea91c5c02488a15fad202d9bfdb5aff04cf1c73 WHIRLPOOL 4aa0938f445c9257ea3ab32b3573f6777237ef204f78f31f287f1e1a3617ad2bb69b1a6a503909eed6f855725610d1bbb27d5758a630b85ace75325e19fbbaa9
+AUX ardour-4.7-gcc.patch 3081 SHA256 39640aa1aef34ff5be23b4574c02b5f92caff7294851fb207647a31f0eec4f1f SHA512 f01b60d00f2e66731cc0265a4c5fefb154eefd2b2a68bbfbefe483c37480c5b66e4978804e32fc700f20d75a67cff7076eec58ffff9efdfe4b3475d4f2c823af WHIRLPOOL 0e11b5e432abd6009b1e0dafed0ca057d38d1a4dbb3dd83de7680f91fbdafa78149d7391198327eea6d8dd64872e903e51ddd3d551e45987a31353da0950b045
+AUX ardour-4.x-revision-naming.patch 1107 SHA256 0da701e90e39fc1a7dcfa255136641bd4fd3382c1a9f05b42f7dfd9f493d602b SHA512 f9c742345b4f89bc0cabc7a7fe86c4084c99f962c3b3770a0e14b259fa4ca9a3f2cdac35c3b9214816f895fd083befab16e38d2b753cbe6ab94ca7da7b251580 WHIRLPOOL 6f1c2b53c5a3295b394d38f5e3458c4cac2c41d5946e11719054aa584bf0661c46b027669e35f2228026b88e71ce22429877e6b6953f9d21c49b425f95637eae
+DIST ardour-2.8.16.tar.bz2 2169916 SHA256 37ee32119ba105fa0883faa7e18c58ecd5276894568da224a554d9ef49075e40 SHA512 02e74883cf466fcd5588ec8f2fd9d032b4611071d630b412c853a7ae7cb46045c0cde4308abbc78da3f54aae0ab1c32a980b8d1e1a965c8633ef43d8e08e0d0d WHIRLPOOL 357b45e506da05b1ce17f006c3e2b22b17150b5556e06785b961b308d958fb66fa82b3e01d1d5e596e43caf6b9d1c83287696a6c694e54114fed5825e2fc5a51
+DIST ardour-4.7.tar.gz 9863149 SHA256 dfa3d102b3f7bb0702969153d22d9311ac98c587f691760ab0f1d3f4f455a86d SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096 WHIRLPOOL eb94b56a919d0088a312414f45475f53ee8c7f618d85f9ffcf5f27719422c2035ff4608108ecbe0f521d54ed1ad40c06ada0a1cb8f7d70531320f40aa107e4b4
+DIST ardour-5.10.tar.bz2 8844840 SHA256 2d88fad771e8f4df4c1ff06836152d486f392a71b4f369759934419b679ddd0f SHA512 4dc8c43ed81b931e855f4a19b5674712a8322edaa06f466d5dd0eb93076a67da12795944c8f17b30b89bb5e87f54279fc2b21d147d48e98e5cb69a3f965a8bb8 WHIRLPOOL 1b8d23c58a5ecb04410df29daa0e73c308b58b843b000a607e4ef2cd78b94e250252654e1c39d34373b5482f141491532914298589bd13e260864044f0ee8b1a
+DIST ardour-5.3.tar.bz2 8244811 SHA256 1289002cb81e372b663f9d66e2923c066b64c48f9bec3a9884f7a59cb007945a SHA512 464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f WHIRLPOOL b7d999805f2b5dda2dc1fd92cbec76d499b15c0f7517c208e7c6b46b624dcd759b0c25a4ee9ec23d974500873c93a8b76e1f45395a25936d5641e47e3027f038
+DIST ardour-5.5.tar.bz2 9237459 SHA256 867605614f6840341d37c388f6c5acf803579172b7d7edbebb4c8e36c8bfde1f SHA512 63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c WHIRLPOOL 16a7cdc5b5893bbd4e6e86bf3f6d06dc236ad3c7062ba51f313fc472fd46e63f9508f761e9d20ff929e915591fc1d3153098b115909671e4c357003b6c21f733
+DIST ardour-5.6.tar.bz2 8590451 SHA256 d8a55121540e1de8c1a040162316434a2c82d75b8c9e9673ab2143662c848372 SHA512 6d7c72f4bb91e0d9d63dfb2273108e3f61bddac9c21f1f58fe6cb73d5f0a028e735d226c3aa2d1404916b566a103d556a2934b083a4c5d629ec7e28c0abd34f9 WHIRLPOOL a55ac78ad64b56678ca0a6f278a6a4e118d5a0aa8e2d5fa7309583c20f87d5df58408b3deee6cbb0b7a1390fa73ec3a766445d08d94709be02869cbc1aa059da
+DIST ardour-5.8.tar.bz2 8669692 SHA256 0138a7cdc30353a3ceb520fab4d636a9ffca2d4d031839d5aa4cd36dcccba886 SHA512 96b3a81f8c48f66839fb8cddeec5ed0c4a95a6092eab15eacb69007cf093cc6572c308e37c8acbc0194eeecf809980c22c04449fe65d683c298d8d0611e7950e WHIRLPOOL 9e2cdda574d39f8abbc9ef2a127124b132011de84eb9808c4d1ae44a746aa96b550ba49365d545d5614559df1fe0d9f844befec59c82bf9c5da956971a77d5e7
+DIST ardour-5.9.tar.bz2 8830842 SHA256 dffebbee16d3fce71e5f5657e99adb97a88515a6607e45397dd774e77b22f559 SHA512 1ba713f3953456260df9d183b30730c959f2707f8c9dd1280a3ab5eb5d9dbdd0e81db98150346f60f777f6bd02eeaaf9f9bcf43cf2ec0b5addce3b50fcbf7413 WHIRLPOOL 6fb7d0711b6d6bfeaf4c7f52bb3f518377f84a94eec3e27364b00998c83964e418127c7ad5d6726b88ef7ecf360a95e176a4d0feb0054018c83956afdeca2678
+EBUILD ardour-2.8.16-r1.ebuild 1885 SHA256 103e88e8c306e4271acfad57c5ad3410ba41d32b5659f4ee3c3957b410a85013 SHA512 f635237138d56fb03c6dd4704b76ebc6e7a667b50175324f5c83a4ae5b3cf581d987899efa50830a5608492a18067fc583d9c40d619a1309b64bf41f067b15a3 WHIRLPOOL 04ee7a80aa5fe8839a549bd89c8c8b19fbe2c8638025172c3c80e22ebb535c1e2c9ca018d5541afaa3717fc86139a4730f8bcef8a6e2619c2a7235e3f263ef5f
+EBUILD ardour-4.7-r1.ebuild 3751 SHA256 bc8db519b77bac1f1763380d1a2c31cf5c706a3f3c1c488e5622d812203c5fc6 SHA512 4dd4e31544c7ad9ac7d011bcb26c5c9fe6749fff0832283191b18b89d5812ede37449eb839af0668a7b28ecac7559396a1c0f5da7cb180edefef20edebbff43e WHIRLPOOL 1282d9bf4277f00ac4a0ce9c96e9cb984c174dbdb7f54df13fc88e079c17790c5981c1df1d8dc5c055f8053d3392b5c85d5e446e774431e02449a917801fd718
+EBUILD ardour-4.7-r2.ebuild 3794 SHA256 2852d89ddb924fe87fe6cce997d325565dddc7c2487ff5b6e67208fd8b18366f SHA512 6fda1d81f66b6dc64c68ad179bca25868c7cb136937e173e82357e42f88bdaff4b198bf52b7c6e1a8b06d4e4814f3bce69c9cdf41f802ba64f30a8deaeecce77 WHIRLPOOL e072ae27efbe6994b34f7d94d5ce400fc1b0b1ba338760143e86d36639b1d28fdd2395bca599ab09ac9faf7ff2a8eeabbd5188be3e80907acc73ae27883fe994
+EBUILD ardour-5.10.ebuild 3921 SHA256 28e2001029c463127e56136baf28ed50a790ef17010fcadb8e93ae6847c90472 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92 WHIRLPOOL bff52735ca17437470fb19781ac20a18ca5b67a75c41c1f0a5e8862ecb890f0eaf41376488ed764b2a5c8a6dccd92b06c15c6089084c9d60460b2d0e9842ccc0
+EBUILD ardour-5.3-r1.ebuild 4021 SHA256 ce777ce90ca3af3bb31a5b01361efc86158d24a95475f21674e2895df2095c97 SHA512 5a369fb2317720d8ede4ecb266acef8d69e963c20b1300ab5a47d2dc69d8df2860c2a8c5363f20148c0c71c5f988bfdc6f9a62c92291bf3863b03357d4cfdf13 WHIRLPOOL 3d0556de6073a67454ff1a50a803b78db6ce75654c8afc8d67f1f1962f7a1066fbd5c26963e5045fd78314fc0c1b79daab6d714a251d89420fae609c8b2745c3
+EBUILD ardour-5.5-r1.ebuild 3921 SHA256 28e2001029c463127e56136baf28ed50a790ef17010fcadb8e93ae6847c90472 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92 WHIRLPOOL bff52735ca17437470fb19781ac20a18ca5b67a75c41c1f0a5e8862ecb890f0eaf41376488ed764b2a5c8a6dccd92b06c15c6089084c9d60460b2d0e9842ccc0
+EBUILD ardour-5.6-r1.ebuild 3921 SHA256 28e2001029c463127e56136baf28ed50a790ef17010fcadb8e93ae6847c90472 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92 WHIRLPOOL bff52735ca17437470fb19781ac20a18ca5b67a75c41c1f0a5e8862ecb890f0eaf41376488ed764b2a5c8a6dccd92b06c15c6089084c9d60460b2d0e9842ccc0
+EBUILD ardour-5.8-r1.ebuild 3921 SHA256 28e2001029c463127e56136baf28ed50a790ef17010fcadb8e93ae6847c90472 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92 WHIRLPOOL bff52735ca17437470fb19781ac20a18ca5b67a75c41c1f0a5e8862ecb890f0eaf41376488ed764b2a5c8a6dccd92b06c15c6089084c9d60460b2d0e9842ccc0
+EBUILD ardour-5.9.ebuild 3921 SHA256 28e2001029c463127e56136baf28ed50a790ef17010fcadb8e93ae6847c90472 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92 WHIRLPOOL bff52735ca17437470fb19781ac20a18ca5b67a75c41c1f0a5e8862ecb890f0eaf41376488ed764b2a5c8a6dccd92b06c15c6089084c9d60460b2d0e9842ccc0
+EBUILD ardour-9999.ebuild 3920 SHA256 f605d5a6ed6c803ccc7677521df268a7400be77aaee94bef0bb3b26232f031df SHA512 5d9ad35b47af782156639584e2c6c420d45f60fbfa5b98317f12e5c31cac06087c420ec0a62576443ffd9b175479a0d7b92fa745883d066b1d4204b4be7b6556 WHIRLPOOL 639756fe95703842fa8b998ff675c654fcc7cb06e00f28bd684a586651461b23588b55b39f952d269984433d7fa3563c616e26664b7f64872d3dc51117090172
+MISC ChangeLog 7557 SHA256 a59a122b4049a4e46e9c6ff5f8fc31867c4bc8e029ec1c7e7d1339eed4d089b6 SHA512 ab34e3b2332a475fdf66c2aa25a08be4ab8b1150ef3f04dbddc6cbb76a27f7cd34a7ee67dc20f2584b620691d4c1123ac1046c0ad302abcfd798e6e0575e71f7 WHIRLPOOL ce878a45e496787a8303f8755ae7665f23be550dd232e2a1971ec324da359e6f1aacd4f3b29d0e3fc0fb9a6fbb16442eda22edd6eb6663d0c2903cccee3d5111
+MISC ChangeLog-2015 24185 SHA256 e0746693507301ef37ee18f601929d5e1947ceca02e02ef091ff56a03d67a8b9 SHA512 4c4503240986267c5c6f7bc319da85ca4f6d9fda1f0e6b9867621caa18903ff25d2be4760b86e8f2eea16de6518ee48ae21fa2b5fba9d989fac12823532e6437 WHIRLPOOL f0ecd6b8aa4793af5c2cae22d7c9d4148f070a81aa7d3d6567e61946636bd2acaf5e01e0ea96967cba0b0458a33bcff500b125c3eda0c001c764641be2ca0f46
+MISC metadata.xml 418 SHA256 54445d1e3836dc00dba09de5f61c822b7ffcbfeff37adfef449d1dd694314054 SHA512 763a4192a9cd9d124a11d5f65449f68ac20bca1689f03ef97112d2e988b49949f82ca3478285b85644284982a9c267e6bd41938fb8298ddd0e84aaa7d617d27f WHIRLPOOL 604582209fe38e55f7c16d90a3e20e2af7a4d3bf791595d13075ab1fb8452ff5f03c6926e93d18b7c1b1fad8076000699664fe0bd9eaa36895c2c24165934945
diff --git a/media-sound/ardour/ardour-2.8.16-r1.ebuild b/media-sound/ardour/ardour-2.8.16-r1.ebuild
new file mode 100644
index 000000000000..20db704fb18c
--- /dev/null
+++ b/media-sound/ardour/ardour-2.8.16-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs scons-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="altivec curl debug nls lv2 cpu_flags_x86_sse"
+
+RDEPEND="media-libs/aubio
+	media-libs/liblo
+	sci-libs/fftw:3.0
+	media-libs/freetype:2
+	>=dev-libs/glib-2.10.1:2
+	dev-cpp/glibmm:2
+	>=x11-libs/gtk+-2.8.1:2
+	>=dev-libs/libxml2-2.6:2
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/flac
+	media-libs/raptor:2
+	>=media-libs/liblrdf-0.4.0-r20
+	virtual/jack
+	>=gnome-base/libgnomecanvas-2
+	media-libs/vamp-plugin-sdk
+	dev-libs/libxslt
+	dev-libs/libsigc++:2
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	media-libs/alsa-lib
+	x11-libs/pango
+	x11-libs/cairo
+	media-libs/libart_lgpl
+	virtual/libusb:0
+	dev-libs/boost
+	curl? ( net-misc/curl )
+	lv2? (
+		>=media-libs/slv2-0.6.1
+		media-libs/lilv
+		media-libs/suil
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.8.11-flags.patch \
+		"${FILESDIR}"/${PN}-2.8.14-syslibs.patch \
+		"${FILESDIR}"/${PN}-2.8.14-boost-150.patch
+}
+
+src_compile() {
+	local FPU_OPTIMIZATION=$($(use altivec || use cpu_flags_x86_sse) && echo 1 || echo 0)
+	tc-export CC CXX
+	mkdir -p "${D}"
+
+	escons \
+		DESTDIR="${D}" \
+		FPU_OPTIMIZATION="${FPU_OPTIMIZATION}" \
+		PREFIX=/usr \
+		SYSLIBS=1 \
+		$(use_scons curl FREESOUND) \
+		$(use_scons debug DEBUG) \
+		$(use_scons nls NLS) \
+		$(use_scons lv2 LV2)
+}
+
+src_install() {
+	escons install
+	doman ${PN}.1
+	newicon icons/icon/ardour_icon_mac.png ${PN}.png
+	make_desktop_entry ardour2 ardour2 ardour AudioVideo
+}
diff --git a/media-sound/ardour/ardour-4.7-r1.ebuild b/media-sound/ardour/ardour-4.7-r1.ebuild
new file mode 100644
index 000000000000..166114e42cd3
--- /dev/null
+++ b/media-sound/ardour/ardour-4.7-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	lv2? (
+		>=media-libs/slv2-0.6.1
+		media-libs/lilv
+		media-libs/sratom
+		dev-libs/sord
+		>=media-libs/suil-0.6.10
+		>=media-libs/lv2-1.4.0
+	)"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( virtual/jack )
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare(){
+	if ! [[ ${PV} == *9999* ]]; then
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
+	make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
+}
diff --git a/media-sound/ardour/ardour-4.7-r2.ebuild b/media-sound/ardour/ardour-4.7-r2.ebuild
new file mode 100644
index 000000000000..968572f28b59
--- /dev/null
+++ b/media-sound/ardour/ardour-4.7-r2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	lv2? (
+		>=media-libs/slv2-0.6.1
+		media-libs/lilv
+		media-libs/sratom
+		dev-libs/sord
+		>=media-libs/suil-0.6.10
+		>=media-libs/lv2-1.4.0
+	)"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( virtual/jack )
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare(){
+	if ! [[ ${PV} == *9999* ]]; then
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		epatch "${FILESDIR}"/${PN}-4.7-gcc.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
+	make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
+}
diff --git a/media-sound/ardour/ardour-5.10.ebuild b/media-sound/ardour/ardour-5.10.ebuild
new file mode 100644
index 000000000000..8998723b5075
--- /dev/null
+++ b/media-sound/ardour/ardour-5.10.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( virtual/jack )
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare(){
+	eapply_user
+	if ! [[ ${PV} == *9999* ]]; then
+		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		--lv2 \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
+	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/ardour/ardour-5.3-r1.ebuild b/media-sound/ardour/ardour-5.3-r1.ebuild
new file mode 100644
index 000000000000..d6f899d24322
--- /dev/null
+++ b/media-sound/ardour/ardour-5.3-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://fossies.org/linux/misc/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	lv2? (
+		>=media-libs/slv2-0.6.1
+		media-libs/lilv
+		media-libs/sratom
+		dev-libs/sord
+		>=media-libs/suil-0.6.10
+		>=media-libs/lv2-1.4.0
+	)"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( virtual/jack )
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare(){
+	if ! [[ ${PV} == *9999* ]]; then
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
+	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/ardour/ardour-5.5-r1.ebuild b/media-sound/ardour/ardour-5.5-r1.ebuild
new file mode 100644
index 000000000000..8998723b5075
--- /dev/null
+++ b/media-sound/ardour/ardour-5.5-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( virtual/jack )
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare(){
+	eapply_user
+	if ! [[ ${PV} == *9999* ]]; then
+		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		--lv2 \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
+	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/ardour/ardour-5.6-r1.ebuild b/media-sound/ardour/ardour-5.6-r1.ebuild
new file mode 100644
index 000000000000..8998723b5075
--- /dev/null
+++ b/media-sound/ardour/ardour-5.6-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( virtual/jack )
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare(){
+	eapply_user
+	if ! [[ ${PV} == *9999* ]]; then
+		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		--lv2 \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
+	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/ardour/ardour-5.8-r1.ebuild b/media-sound/ardour/ardour-5.8-r1.ebuild
new file mode 100644
index 000000000000..8998723b5075
--- /dev/null
+++ b/media-sound/ardour/ardour-5.8-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( virtual/jack )
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare(){
+	eapply_user
+	if ! [[ ${PV} == *9999* ]]; then
+		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		--lv2 \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
+	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/ardour/ardour-5.9.ebuild b/media-sound/ardour/ardour-5.9.ebuild
new file mode 100644
index 000000000000..8998723b5075
--- /dev/null
+++ b/media-sound/ardour/ardour-5.9.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( virtual/jack )
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare(){
+	eapply_user
+	if ! [[ ${PV} == *9999* ]]; then
+		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		--lv2 \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
+	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
new file mode 100644
index 000000000000..67a60199f1ba
--- /dev/null
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( virtual/jack )
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare(){
+	eapply_user
+	if ! [[ ${PV} == *9999* ]]; then
+		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		--lv2 \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
+	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/ardour/files/ardour-2.8.11-flags.patch b/media-sound/ardour/files/ardour-2.8.11-flags.patch
new file mode 100644
index 000000000000..607b072cffa2
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.8.11-flags.patch
@@ -0,0 +1,28 @@
+--- ardour-2.8.11/SConstruct.orig
++++ ardour-2.8.11/SConstruct
+@@ -414,6 +414,15 @@
+     if os.environ.has_key('CXX'):
+ 	context['CXX'] = os.environ['CXX']
+ 
++	if os.environ.has_key('CFLAGS'):
++		env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++
++	if os.environ.has_key('CXXFLAGS'):
++		env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++
++	if os.environ.has_key('LDFLAGS'):
++		env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++
+     if os.environ.has_key('DISTCC_HOSTS'):
+ 	context['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
+ 	context['ENV']['HOME'] = os.environ['HOME']
+@@ -807,9 +816,6 @@
+ if env['DEBUG'] == 1:
+     env.Append(CCFLAGS=" ".join (debug_flags))
+     env.Append(LINKFLAGS=" ".join (debug_flags))
+-else:
+-    env.Append(CCFLAGS=" ".join (opt_flags))
+-    env.Append(LINKFLAGS=" ".join (opt_flags))
+ 
+ if env['STL_DEBUG'] == 1:
+     env.Append(CXXFLAGS="-D_GLIBCXX_DEBUG")
diff --git a/media-sound/ardour/files/ardour-2.8.14-boost-150.patch b/media-sound/ardour/files/ardour-2.8.14-boost-150.patch
new file mode 100644
index 000000000000..0d23568a309c
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.8.14-boost-150.patch
@@ -0,0 +1,13 @@
+--- /home/mad/ardour-2.8.14/SConstruct      2012-11-21 00:30:54.000000000 +0100
++++ SConstruct  2012-11-21 17:34:02.000000000 +0100
+@@ -955,7 +961,9 @@
+ # FLAC ....
+ #
+
+-# boost (we don't link against boost, just use some header files)
++# boost (we need to link against boost with >=1.50. header files alone will not work anymore)
++
++env.Append(LIBS=['boost_system'])
+
+ libraries['boost'] = LibraryInfo ()
+ prep_libcheck(env, libraries['boost'])
diff --git a/media-sound/ardour/files/ardour-2.8.14-syslibs.patch b/media-sound/ardour/files/ardour-2.8.14-syslibs.patch
new file mode 100644
index 000000000000..a06c3b04e276
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.8.14-syslibs.patch
@@ -0,0 +1,108 @@
+--- SConstruct
++++ SConstruct
+@@ -891,39 +891,6 @@
+ 
+ 
+ #
+-# these are part of the Ardour source tree because they are C++
+-# 
+-
+-libraries['vamp'] = LibraryInfo (LIBS='vampsdk',
+-                                 LIBPATH='#libs/vamp-sdk',
+-                                 CPPPATH='#libs/vamp-sdk')
+-libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk',
+-                                 LIBPATH='#libs/vamp-sdk',
+-                                 CPPPATH='#libs/vamp-sdk')
+-
+-env['RUBBERBAND'] = False
+-
+-conf = Configure (env)
+-
+-if conf.CheckHeader ('fftw3.h'):
+-    env['RUBBERBAND'] = True
+-    libraries['rubberband'] = LibraryInfo (LIBS='rubberband',
+-                                           LIBPATH='#libs/rubberband',
+-                                           CPPPATH='#libs/rubberband',
+-                                           CCFLAGS='-DUSE_RUBBERBAND')
+-else:
+-    print ""
+-    print "-------------------------------------------------------------------------"
+-    print "You do not have the FFTW single-precision development package installed."
+-    print "This prevents Ardour from using the Rubberband library for timestretching"
+-    print "and pitchshifting. It will fall back on SoundTouch for timestretch, and "
+-    print "pitchshifting will not be available."
+-    print "-------------------------------------------------------------------------"
+-    print ""
+-
+-conf.Finish()
+-
+-#
+ # Check for libusb
+ 
+ libraries['usb'] = LibraryInfo ()
+@@ -1109,10 +1076,22 @@
+     # Comment the previous line and uncomment this for old versions of Debian:
+     #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
+ 
+-    libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
+-                                            LIBPATH='#libs/appleutility',
+-                                            CPPPATH='#libs/appleutility')
++    #libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
++    #                                        LIBPATH='#libs/appleutility',
++    #                                        CPPPATH='#libs/appleutility')
+     
++    env['RUBBERBAND'] = True
++    env.Append (CXXFLAGS="-DUSE_RUBBERBAND")
++    libraries['rubberband'] = LibraryInfo()
++    libraries['rubberband'].ParseConfig ('pkg-config --cflags --libs rubberband')
++
++    libraries['vamp-sdk'] = LibraryInfo()
++    libraries['vamp-sdk'].ParseConfig ('pkg-config --cflags --libs vamp-sdk')
++    libraries['vamp'] = LibraryInfo()
++    libraries['vamp'].ParseConfig ('pkg-config --cflags --libs vamp-sdk')
++    libraries['vamphost'] = LibraryInfo()
++    libraries['vamphost'].ParseConfig ('pkg-config --cflags --libs vamp-hostsdk')
++
+     coredirs = [
+         'templates',
+         'manual'
+@@ -1122,7 +1101,6 @@
+         'libs/pbd',
+         'libs/midi++2',
+         'libs/ardour',
+-        'libs/vamp-sdk',
+         'libs/vamp-plugins/',
+     # these are unconditionally included but have
+     # tests internally to avoid compilation etc
+@@ -1138,8 +1116,7 @@
+     gtk_subdirs = [
+ #        'libs/flowcanvas',
+         'libs/gtkmm2ext',
+-        'gtk2_ardour',
+-        clearlooks_version
++        'gtk2_ardour'
+         ]
+ 
+ else:
+@@ -1251,9 +1228,9 @@
+ # timestretch libraries
+ #
+ 
+-timefx_subdirs = []
+-if env['RUBBERBAND']:
+-    timefx_subdirs += ['libs/rubberband']
++#timefx_subdirs = []
++#if env['RUBBERBAND']:
++#    timefx_subdirs += ['libs/rubberband']
+ 
+ #
+ # Tools
+@@ -1441,7 +1418,7 @@
+ for subdir in coredirs:
+     SConscript (subdir + '/SConscript')
+ 
+-for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs, tools_subdirs ]:
++for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs, tools_subdirs ]:
+     for subdir in sublistdir:
+         SConscript (subdir + '/SConscript')
+ 
diff --git a/media-sound/ardour/files/ardour-4.0-lv2.patch b/media-sound/ardour/files/ardour-4.0-lv2.patch
new file mode 100644
index 000000000000..a79e3f20c447
--- /dev/null
+++ b/media-sound/ardour/files/ardour-4.0-lv2.patch
@@ -0,0 +1,56 @@
+diff -rupN ardour-4.0-vanilla/libs/ardour/automatable.cc ardour-4.0/libs/ardour/automatable.cc
+--- ardour-4.0-vanilla/libs/ardour/automatable.cc       2015-04-18 00:23:10.000000000 +0200
++++ ardour-4.0/libs/ardour/automatable.cc       2015-04-21 16:32:14.943812000 +0200
+@@ -34,7 +34,11 @@
+ #include "ardour/plugin.h"
+ #include "ardour/plugin_insert.h"
+ #include "ardour/session.h"
++
++#ifdef LV2_SUPPORT
+ #include "ardour/uri_map.h"
++#endif
++
+ #include "ardour/value_as_string.h"
+ 
+ #include "i18n.h"
+diff -rupN ardour-4.0-vanilla/libs/ardour/buffer_set.cc ardour-4.0/libs/ardour/buffer_set.cc
+--- ardour-4.0-vanilla/libs/ardour/buffer_set.cc        2015-04-18 00:23:10.000000000 +0200
++++ ardour-4.0/libs/ardour/buffer_set.cc        2015-04-21 16:40:44.216812000 +0200
+@@ -34,8 +34,8 @@
+ #include "ardour/midi_buffer.h"
+ #include "ardour/port.h"
+ #include "ardour/port_set.h"
+-#include "ardour/uri_map.h"
+ #ifdef LV2_SUPPORT
++#include "ardour/uri_map.h"
+ #include "ardour/lv2_plugin.h"
+ #include "lv2_evbuf.h"
+ #endif
+diff -rupN ardour-4.0-vanilla/libs/ardour/event_type_map.cc ardour-4.0/libs/ardour/event_type_map.cc
+--- ardour-4.0-vanilla/libs/ardour/event_type_map.cc    2015-04-18 00:23:10.000000000 +0200
++++ ardour-4.0/libs/ardour/event_type_map.cc    2015-04-21 16:47:28.489812000 +0200
+@@ -24,7 +24,9 @@
+ #include "ardour/event_type_map.h"
+ #include "ardour/parameter_descriptor.h"
+ #include "ardour/parameter_types.h"
++#ifdef LV2_SUPPORT
+ #include "ardour/uri_map.h"
++#endif
+ #include "evoral/Parameter.hpp"
+ #include "evoral/ParameterDescriptor.hpp"
+ #include "evoral/midi_events.h"
+diff -rupN ardour-4.0-vanilla/libs/ardour/globals.cc ardour-4.0/libs/ardour/globals.cc
+--- ardour-4.0-vanilla/libs/ardour/globals.cc   2015-04-18 00:23:10.000000000 +0200
++++ ardour-4.0/libs/ardour/globals.cc   2015-04-21 16:54:33.404812000 +0200
+@@ -106,8 +106,9 @@
+ #include "ardour/runtime_functions.h"
+ #include "ardour/session_event.h"
+ #include "ardour/source_factory.h"
++#ifdef LV2_SUPPORT
+ #include "ardour/uri_map.h"
+-
++#endif
+ #include "audiographer/routines.h"
+ 
+ #if defined (__APPLE__)
+
diff --git a/media-sound/ardour/files/ardour-4.7-gcc.patch b/media-sound/ardour/files/ardour-4.7-gcc.patch
new file mode 100644
index 000000000000..685eb2ab1178
--- /dev/null
+++ b/media-sound/ardour/files/ardour-4.7-gcc.patch
@@ -0,0 +1,100 @@
+--- libs/gtkmm2ext/actions.cc.old	2016-02-19 02:28:56.000000000 +0100
++++ libs/gtkmm2ext/actions.cc	2017-06-05 03:32:48.762688016 +0200
+@@ -401,7 +401,7 @@
+ 	   gtkmm2.6, so we fall back to the C level.
+ 	*/
+ 
+-	if (ui_manager == 0) {
++	if (ui_manager == (Glib::RefPtr<Gtk::UIManager>) 0) {
+ 		return RefPtr<Action> ();
+ 	}
+ 
+--- libs/gtkmm2ext/fastmeter.cc.old	2016-02-19 02:28:56.000000000 +0100
++++ libs/gtkmm2ext/fastmeter.cc	2017-06-05 05:01:57.075834979 +0200
+@@ -731,7 +731,7 @@
+ 
+ 	Glib::RefPtr<Gdk::Window> win;
+ 
+-	if ((win = get_window()) == 0) {
++	if ((win = get_window()) == (Glib::RefPtr<Gdk::Window>) 0) {
+ 		queue_draw ();
+ 		return;
+ 	}
+
+--- gtk2_ardour/editor.cc.old	2016-02-19 02:28:56.000000000 +0100
++++ gtk2_ardour/editor.cc	2017-06-05 05:38:20.971481110 +0200
+@@ -714,16 +714,16 @@
+ 	list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
+ 	Glib::RefPtr<Gdk::Pixbuf> icon;
+ 
+-	if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
++	if (icon = ::get_icon ("ardour_icon_16px")) {
+ 		window_icons.push_back (icon);
+ 	}
+-	if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
++	if (icon = ::get_icon ("ardour_icon_22px")) {
+ 		window_icons.push_back (icon);
+ 	}
+-	if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
++	if (icon = ::get_icon ("ardour_icon_32px")) {
+ 		window_icons.push_back (icon);
+ 	}
+-	if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
++	if (icon = ::get_icon ("ardour_icon_48px")) {
+ 		window_icons.push_back (icon);
+ 	}
+ 	if (!window_icons.empty()) {
+
+--- gtk2_ardour/fft_graph.cc.old	2016-02-19 02:28:56.000000000 +0100
++++ gtk2_ardour/fft_graph.cc	2017-06-05 06:21:56.644212996 +0200
+@@ -203,7 +203,7 @@
+ 
+ 
+ 
+-	if (graph_gc == 0) {
++	if (graph_gc == (Glib::RefPtr<Gdk::GC>) 0) {
+ 		graph_gc = GC::create( get_window() );
+ 	}
+ 
+@@ -213,7 +213,7 @@
+ 
+ 	graph_gc->set_rgb_fg_color( grey );
+ 
+-	if (layout == 0) {
++	if (layout == (Glib::RefPtr<Pango::Layout>) 0) {
+ 		layout = create_pango_layout ("");
+ 		layout->set_font_description (get_style()->get_font());
+ 	}
+
+--- gtk2_ardour/startup.cc.old	2016-02-19 02:28:56.000000000 +0100
++++ gtk2_ardour/startup.cc	2017-06-05 06:41:27.091051601 +0200
+@@ -79,23 +79,23 @@
+ 	set_position (WIN_POS_CENTER);
+ 	set_border_width (12);
+ 
+-	if ((icon_pixbuf = ::get_icon ("ardour_icon_48px")) == 0) {
++	if ((icon_pixbuf = ::get_icon ("ardour_icon_48px")) == (Glib::RefPtr<Gdk::Pixbuf>) 0) {
+ 		throw failed_constructor();
+ 	}
+ 
+ 	list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
+ 	Glib::RefPtr<Gdk::Pixbuf> icon;
+ 
+-	if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
++	if (icon = ::get_icon ("ardour_icon_16px")) {
+ 		window_icons.push_back (icon);
+ 	}
+-	if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
++	if (icon = ::get_icon ("ardour_icon_22px")) {
+ 		window_icons.push_back (icon);
+ 	}
+-	if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
++	if (icon = ::get_icon ("ardour_icon_32px")) {
+ 		window_icons.push_back (icon);
+ 	}
+-	if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
++	if (icon = ::get_icon ("ardour_icon_48px")) {
+ 		window_icons.push_back (icon);
+ 	}
+ 	if (!window_icons.empty ()) {
+
diff --git a/media-sound/ardour/files/ardour-4.x-revision-naming.patch b/media-sound/ardour/files/ardour-4.x-revision-naming.patch
new file mode 100644
index 000000000000..d558f4792a84
--- /dev/null
+++ b/media-sound/ardour/files/ardour-4.x-revision-naming.patch
@@ -0,0 +1,38 @@
+--- ardour-4.2/wscript
++++ ardour-4.2/wscript
+@@ -162,7 +162,7 @@
+ if os.path.isdir (os.path.join(os.getcwd(), '.git')):
+     rev = fetch_git_revision ()
+ else:
+-    rev = fetch_tarball_revision ()
++    rev = os.environ['PV']
+ 
+ #
+ # rev is now of the form MAJOR.MINOR[-rcX]-rev-commit
+@@ -238,16 +238,16 @@
+     return version
+ 
+ def create_stored_revision():
+-    rev = ""
+-    if os.path.exists('.git'):
+-        rev = fetch_git_revision();
+-        print("Git version: " + rev + "\n")
+-    elif os.path.exists('libs/ardour/revision.cc'):
+-        print("Using packaged revision")
+-        return
+-    else:
+-        print("Missing libs/ardour/revision.cc.  Blame the packager.")
+-        sys.exit(-1)
++    rev = os.environ['PV'] + "-gentoo"
++#    if os.path.exists('.git'):
++#        rev = fetch_git_revision();
++#        print("Git version: " + rev + "\n")
++#    elif os.path.exists('libs/ardour/revision.cc'):
++#        print("Using packaged revision")
++#        return
++#    else:
++#        print("Missing libs/ardour/revision.cc.  Blame the packager.")
++#        sys.exit(-1)
+ 
+     try:
+         #
diff --git a/media-sound/ardour/metadata.xml b/media-sound/ardour/metadata.xml
new file mode 100644
index 000000000000..c770fdfe0e97
--- /dev/null
+++ b/media-sound/ardour/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <use>
+    <flag name="lv2">Add support for Ladspa V2</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">Ardour/ardour</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/ario/Manifest b/media-sound/ario/Manifest
new file mode 100644
index 000000000000..6ec48c16e98f
--- /dev/null
+++ b/media-sound/ario/Manifest
@@ -0,0 +1,6 @@
+AUX ario-1.5.1-single-includes2.patch 16062 SHA256 5416d83482a3ae6682eaabf8acbd125e176a3d44fb23b1859a741afba3da9d97 SHA512 f832498f2445f2f937a1b9636ba6c75fce3a75e706296a315e0c33c3a852140ba829f6972d8cc2ade3fa4a45f21a964eef8134b315fdfe1155cd221e9ee0cbb2 WHIRLPOOL 6ca5474ee8cb3f2e7d291902c0ceec9f76f4de8e25fa3a41dab6dca718d7e210a17fd9715f33364114c218c02a0b655f2852f7b167eb55ea16c7a06e9aaabdcf
+DIST ario-1.5.1.tar.gz 1135444 SHA256 0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e SHA512 78c3d881d51c3109b73252da0742da2a77bcc24ec21ff2ff02fd3527d62d49a75e412bf092051a9035863d645cba73e6cd2fc674d97629909b931ae9d3ec002b WHIRLPOOL 3f280635019dca6dfff5e5681bb38a559986475b31c9c03831ae7e9893af18c03ee8fd3cfd1524a9756b80543bbde01ec3de1a7a4f223e5aeca4e6e8462fe87a
+EBUILD ario-1.5.1-r1.ebuild 1559 SHA256 06d087c4439af501395cf9c7bec3832dd740fe56e8da9a2ab0b719de29538fdc SHA512 8f401913bd6930d2f1979055bbe05f0612b3061bcafe601652399e0b1d4d6644b679db4feb9ad21e2fd211187e860ad1a5a346eb25c3e0e130e8fd9063815275 WHIRLPOOL 05416cb130d2f26e2881144542ed2effe41262d63614d8f9a5d9f951cdf478638033304aec5b200ff01219667b1ff81f27d60d7ad2bc18975b46cc17a395724a
+MISC ChangeLog 2813 SHA256 c4db7df6bdb341e9e00694065471ef8419542537f47ec98d937dcbf25377bee9 SHA512 aaa06080785e590f177352146f25974433589ba0cf95e3ad46914395ede1602b5bfc1b412973f4067dbb5842efd4aa6650be6cc929b35f33252382515f087b90 WHIRLPOOL 1573f0beeea44363dabfdbc33fcc8da58ae96062d99cefc443e885d378773cab146cfffc96ce93a3e2f6a72c25082c5d6a947ac3c752e1e14437c607f1a7e86b
+MISC ChangeLog-2015 4286 SHA256 ede8213bfb30dd168ca14a2cc690b7d703189689b4aef6cd9397c760a8a4a3ad SHA512 128e882b2b03b7ef695a37706729b216923549c7c6567baa27766298235fa2d4c80765ffc8cddf1f520806db385bd735bec8d7a218b90cb5a55d6d735c8029e0 WHIRLPOOL 325957735147c9c7782f7f5663f76a0cbcc9190acc47d136dc1fa6c9204756d71c0947d3b1039c9f97507a82da0c8a7654c1a4ade9ba738be8fcd2dc3f733a51
+MISC metadata.xml 436 SHA256 35813a6688a19e745cc7397da701f85953cf96ca6417d496480bb556ed6c0ebc SHA512 25031895d05402f35f2979f8bce734142d539b21ce602c17ee21bb3b49b9d3e097f948020b9a104c314f16dd22fc0436cc8ac65a927eb76442f66907311ad7bd WHIRLPOOL 1176a8758f3d494cd050b86eb124a6a0f316697bd2db2b6ac1efe79a311059d4bebff757e692886256267f3a83b2c4769549e86d58f60c11cbe914f4bf6c8554
diff --git a/media-sound/ario/ario-1.5.1-r1.ebuild b/media-sound/ario/ario-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..403cf04a8be5
--- /dev/null
+++ b/media-sound/ario/ario-1.5.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools gnome2 python-any-r1
+
+DESCRIPTION="a GTK2 MPD (Music Player Daemon) client inspired by Rythmbox"
+HOMEPAGE="http://ario-player.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}-player/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="audioscrobbler dbus debug +idle libnotify nls python taglib zeroconf"
+
+RDEPEND=">=dev-libs/glib-2.14:2
+	dev-libs/libgcrypt:0=
+	dev-libs/libunique:1
+	dev-libs/libxml2:2
+	media-libs/libmpdclient
+	net-misc/curl
+	net-libs/gnutls
+	>=x11-libs/gtk+-2.16:2
+	audioscrobbler? ( net-libs/libsoup:2.4 )
+	dbus? ( dev-libs/dbus-glib )
+	libnotify? ( x11-libs/libnotify )
+	python? ( dev-python/pygtk:2
+		dev-python/pygobject:2 )
+	taglib? ( media-libs/taglib )
+	zeroconf? ( net-dns/avahi )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOCS=( AUTHORS )
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-single-includes2.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-xmms2 \
+		--enable-libmpdclient2 \
+		--enable-search \
+		--enable-playlists \
+		--disable-deprecations \
+		$(use_enable audioscrobbler) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable idle mpdidle) \
+		$(use_enable libnotify notify) \
+		$(use_enable nls) \
+		$(use_enable python) \
+		$(use_enable taglib) \
+		$(use_enable zeroconf avahi)
+}
diff --git a/media-sound/ario/files/ario-1.5.1-single-includes2.patch b/media-sound/ario/files/ario-1.5.1-single-includes2.patch
new file mode 100644
index 000000000000..e5936cfbe2c1
--- /dev/null
+++ b/media-sound/ario/files/ario-1.5.1-single-includes2.patch
@@ -0,0 +1,557 @@
+Index: plugins/radios/ario-radio.h
+===================================================================
+--- plugins/radios/ario-radio.h	(revision 772)
++++ plugins/radios/ario-radio.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_RADIO_H
+ #define __ARIO_RADIO_H
+ 
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ #include "widgets/ario-playlist.h"
+ #include "sources/ario-source.h"
+Index: plugins/filesystem/ario-filesystem.h
+===================================================================
+--- plugins/filesystem/ario-filesystem.h	(revision 772)
++++ plugins/filesystem/ario-filesystem.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_FILESYSTEM_H
+ #define __ARIO_FILESYSTEM_H
+ 
+-#include <gtk/gtkhpaned.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ #include "widgets/ario-playlist.h"
+ #include "sources/ario-source.h"
+Index: plugins/information/ario-information.h
+===================================================================
+--- plugins/information/ario-information.h	(revision 772)
++++ plugins/information/ario-information.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_INFORMATION_H
+ #define __ARIO_INFORMATION_H
+ 
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ #include "sources/ario-source.h"
+ 
+Index: src/plugins/ario-plugin-info.c
+===================================================================
+--- src/plugins/ario-plugin-info.c	(revision 772)
++++ src/plugins/ario-plugin-info.c	(revision 774)
+@@ -27,7 +27,7 @@
+ 
+ #include <string.h>
+ #include <glib/gi18n.h>
+-#include <glib/gkeyfile.h>
++#include <glib.h>
+ 
+ #include "plugins/ario-plugin-info-priv.h"
+ #include "ario-debug.h"
+Index: src/sources/ario-search.h
+===================================================================
+--- src/sources/ario-search.h	(revision 772)
++++ src/sources/ario-search.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_SEARCH_H
+ #define __ARIO_SEARCH_H
+ 
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ #include "sources/ario-source.h"
+ 
+Index: src/sources/ario-storedplaylists.h
+===================================================================
+--- src/sources/ario-storedplaylists.h	(revision 772)
++++ src/sources/ario-storedplaylists.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_STOREDPLAYLISTS_H
+ #define __ARIO_STOREDPLAYLISTS_H
+ 
+-#include <gtk/gtkhpaned.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ #include "sources/ario-source.h"
+ 
+Index: src/sources/ario-source-manager.h
+===================================================================
+--- src/sources/ario-source-manager.h	(revision 772)
++++ src/sources/ario-source-manager.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_SOURCE_MANAGER_H
+ #define __ARIO_SOURCE_MANAGER_H
+ 
+-#include <gtk/gtknotebook.h>
++#include <gtk/gtk.h>
+ #include "sources/ario-source.h"
+ 
+ G_BEGIN_DECLS
+Index: src/sources/ario-browser.h
+===================================================================
+--- src/sources/ario-browser.h	(revision 772)
++++ src/sources/ario-browser.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_BROWSER_H
+ #define __ARIO_BROWSER_H
+ 
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include "sources/ario-source.h"
+ 
+ #define MAX_TREE_NB 5
+Index: src/sources/ario-tree.h
+===================================================================
+--- src/sources/ario-tree.h	(revision 772)
++++ src/sources/ario-tree.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_TREE_H
+ #define __ARIO_TREE_H
+ 
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include "servers/ario-server.h"
+ #include "sources/ario-source.h"
+ #include "shell/ario-shell-coverdownloader.h"
+Index: src/ario-util.h
+===================================================================
+--- src/ario-util.h	(revision 772)
++++ src/ario-util.h	(revision 774)
+@@ -18,8 +18,8 @@
+  */
+ 
+ #include "servers/ario-server.h"
+-#include "glib/gslist.h"
+-#include "gdk/gdkpixbuf.h"
++#include <glib.h>
++#include <gdk/gdk.h>
+ 
+ /* Number of covers used to generate the drag & drop image */
+ #define MAX_COVERS_IN_DRAG 3
+Index: src/ario-main.c
+===================================================================
+--- src/ario-main.c	(revision 772)
++++ src/ario-main.c	(revision 774)
+@@ -21,7 +21,7 @@
+ #include <locale.h>
+ #include <libintl.h>
+ #include <gtk/gtk.h>
+-#include <gdk/gdkkeysyms.h>
++#include <gdk/gdk.h>
+ #include <curl/curl.h>
+ #include <libxml/parser.h>
+ #include <glib/gi18n.h>
+Index: src/ario-profiles.h
+===================================================================
+--- src/ario-profiles.h	(revision 772)
++++ src/ario-profiles.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_PROFILES_H
+ #define __ARIO_PROFILES_H
+ 
+-#include <glib/gslist.h>
++#include <glib.h>
+ #include "servers/ario-server.h"
+ 
+ G_BEGIN_DECLS
+Index: src/covers/ario-cover-handler.h
+===================================================================
+--- src/covers/ario-cover-handler.h	(revision 772)
++++ src/covers/ario-cover-handler.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkdialog.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __ARIO_COVER_HANDLER_H
+ #define __ARIO_COVER_HANDLER_H
+Index: src/covers/ario-cover.c
+===================================================================
+--- src/covers/ario-cover.c	(revision 772)
++++ src/covers/ario-cover.c	(revision 774)
+@@ -19,8 +19,7 @@
+ 
+ #include "covers/ario-cover.h"
+ #include <glib.h>
+-#include <gtk/gtkdialog.h>
+-#include <gtk/gtkmessagedialog.h>
++#include <gtk/gtk.h>
+ #include <string.h>
+ #include <glib/gi18n.h>
+ #include "ario-util.h"
+Index: src/preferences/ario-others-preferences.h
+===================================================================
+--- src/preferences/ario-others-preferences.h	(revision 772)
++++ src/preferences/ario-others-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_OTHERS_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-lyrics-preferences.h
+===================================================================
+--- src/preferences/ario-lyrics-preferences.h	(revision 772)
++++ src/preferences/ario-lyrics-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_LYRICS_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-server-preferences.h
+===================================================================
+--- src/preferences/ario-server-preferences.h	(revision 772)
++++ src/preferences/ario-server-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_SERVER_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-cover-preferences.h
+===================================================================
+--- src/preferences/ario-cover-preferences.h	(revision 772)
++++ src/preferences/ario-cover-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_COVER_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-browser-preferences.h
+===================================================================
+--- src/preferences/ario-browser-preferences.h	(revision 772)
++++ src/preferences/ario-browser-preferences.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkdialog.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __ARIO_BROWSER_PREFERENCES_H
+ #define __ARIO_BROWSER_PREFERENCES_H
+Index: src/preferences/ario-taskbar-preferences.h
+===================================================================
+--- src/preferences/ario-taskbar-preferences.h	(revision 772)
++++ src/preferences/ario-taskbar-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_TASKBAR_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-stats-preferences.h
+===================================================================
+--- src/preferences/ario-stats-preferences.h	(revision 772)
++++ src/preferences/ario-stats-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_STATS_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-connection-preferences.h
+===================================================================
+--- src/preferences/ario-connection-preferences.h	(revision 772)
++++ src/preferences/ario-connection-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_CONNECTION_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/preferences/ario-playlist-preferences.h
+===================================================================
+--- src/preferences/ario-playlist-preferences.h	(revision 772)
++++ src/preferences/ario-playlist-preferences.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_PLAYLIST_PREFERENCES_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/lib/gtk-builder-helpers.h
+===================================================================
+--- src/lib/gtk-builder-helpers.h	(revision 772)
++++ src/lib/gtk-builder-helpers.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkbuilder.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __GTK_BUILDER_HELPERS_H
+ #define __GTK_BUILDER_HELPERS_H
+Index: src/widgets/ario-dnd-tree.h
+===================================================================
+--- src/widgets/ario-dnd-tree.h	(revision 772)
++++ src/widgets/ario-dnd-tree.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_DND_TREE_H
+ #define __ARIO_DND_TREE_H
+ 
+-#include <gtk/gtktreeview.h>
++#include <gtk/gtk.h>
+ #include <config.h>
+ 
+ G_BEGIN_DECLS
+Index: src/widgets/ario-songlist.h
+===================================================================
+--- src/widgets/ario-songlist.h	(revision 772)
++++ src/widgets/ario-songlist.h	(revision 774)
+@@ -21,10 +21,7 @@
+ #define __ARIO_SONGLIST_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkscrolledwindow.h>
+-#include <gtk/gtkliststore.h>
+-#include <gtk/gtktreeview.h>
+-#include <gtk/gtkuimanager.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/widgets/ario-tray-icon.h
+===================================================================
+--- src/widgets/ario-tray-icon.h	(revision 772)
++++ src/widgets/ario-tray-icon.h	(revision 774)
+@@ -26,8 +26,7 @@
+ 
+ #include <config.h>
+ #include "shell/ario-shell.h"
+-#include <gtk/gtkuimanager.h>
+-#include <gtk/gtkstatusicon.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/widgets/ario-volume.h
+===================================================================
+--- src/widgets/ario-volume.h	(revision 772)
++++ src/widgets/ario-volume.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_VOLUME_H
+ #define __ARIO_VOLUME_H
+ 
+-#include <gtk/gtkeventbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/widgets/ario-connection-widget.h
+===================================================================
+--- src/widgets/ario-connection-widget.h	(revision 772)
++++ src/widgets/ario-connection-widget.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_CONNECTION_WIDGET_H
+ #define __ARIO_CONNECTION_WIDGET_H
+ 
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ 
+ #define ARIO_DEFAULT_TIMEOUT 5000
+ 
+Index: src/widgets/ario-firstlaunch.h
+===================================================================
+--- src/widgets/ario-firstlaunch.h	(revision 772)
++++ src/widgets/ario-firstlaunch.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_FIRSTLAUNCH_H
+ #define __ARIO_FIRSTLAUNCH_H
+ 
+-#include <gtk/gtkassistant.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/widgets/ario-header.h
+===================================================================
+--- src/widgets/ario-header.h	(revision 772)
++++ src/widgets/ario-header.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_HEADER_H
+ #define __ARIO_HEADER_H
+ 
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/widgets/ario-lyrics-editor.h
+===================================================================
+--- src/widgets/ario-lyrics-editor.h	(revision 772)
++++ src/widgets/ario-lyrics-editor.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkvbox.h>
++#include <gtk/gtk.h>
+ #include "lyrics/ario-lyrics-provider.h"
+ 
+ #ifndef __ARIO_LYRICS_EDITOR_H
+Index: src/widgets/ario-tooltip.h
+===================================================================
+--- src/widgets/ario-tooltip.h	(revision 772)
++++ src/widgets/ario-tooltip.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_TOOLTIP_H
+ 
+ #include <config.h>
+-#include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/shell/ario-shell-coverdownloader.h
+===================================================================
+--- src/shell/ario-shell-coverdownloader.h	(revision 772)
++++ src/shell/ario-shell-coverdownloader.h	(revision 774)
+@@ -21,7 +21,7 @@
+ #define __ARIO_SHELL_COVERDOWNLOADER_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkwindow.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/shell/ario-shell-preferences.h
+===================================================================
+--- src/shell/ario-shell-preferences.h	(revision 772)
++++ src/shell/ario-shell-preferences.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkdialog.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __ARIO_SHELL_PREFERENCES_H
+ #define __ARIO_SHELL_PREFERENCES_H
+Index: src/shell/ario-shell.h
+===================================================================
+--- src/shell/ario-shell.h	(revision 772)
++++ src/shell/ario-shell.h	(revision 774)
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_SHELL_H
+ #define __ARIO_SHELL_H
+ 
+-#include <gtk/gtkwindow.h>
++#include <gtk/gtk.h>
+ 
+ G_BEGIN_DECLS
+ 
+Index: src/shell/ario-shell-lyrics.h
+===================================================================
+--- src/shell/ario-shell-lyrics.h	(revision 772)
++++ src/shell/ario-shell-lyrics.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkwindow.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __ARIO_SHELL_LYRICS_H
+ #define __ARIO_SHELL_LYRICS_H
+Index: src/shell/ario-shell-lyricsselect.h
+===================================================================
+--- src/shell/ario-shell-lyricsselect.h	(revision 772)
++++ src/shell/ario-shell-lyricsselect.h	(revision 774)
+@@ -22,7 +22,7 @@
+ #define __ARIO_SHELL_LYRICSSELECT_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkdialog.h>
++#include <gtk/gtk.h>
+ #include "lyrics/ario-lyrics.h"
+ 
+ G_BEGIN_DECLS
+Index: src/shell/ario-shell-songinfos.h
+===================================================================
+--- src/shell/ario-shell-songinfos.h	(revision 772)
++++ src/shell/ario-shell-songinfos.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkdialog.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __ARIO_SHELL_SONGINFOS_H
+ #define __ARIO_SHELL_SONGINFOS_H
+Index: src/shell/ario-shell-similarartists.h
+===================================================================
+--- src/shell/ario-shell-similarartists.h	(revision 772)
++++ src/shell/ario-shell-similarartists.h	(revision 774)
+@@ -17,7 +17,7 @@
+  *
+  */
+ 
+-#include <gtk/gtkwindow.h>
++#include <gtk/gtk.h>
+ 
+ #ifndef __ARIO_SHELL_SIMILARARTISTS_H
+ #define __ARIO_SHELL_SIMILARARTISTS_H
+Index: src/shell/ario-shell-coverselect.h
+===================================================================
+--- src/shell/ario-shell-coverselect.h	(revision 772)
++++ src/shell/ario-shell-coverselect.h	(revision 774)
+@@ -22,7 +22,7 @@
+ #define __ARIO_SHELL_COVERSELECT_H
+ 
+ #include <glib.h>
+-#include <gtk/gtkdialog.h>
++#include <gtk/gtk.h>
+ #include "servers/ario-server.h"
+ 
+ G_BEGIN_DECLS
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 772)
++++ configure.ac	(revision 774)
+@@ -298,9 +298,11 @@
+ if test x"$enable_deprecations" = xyes; then
+         WARNINGS="$WARNINGS -DG_DISABLE_DEPRECATED \
+ -DGDK_DISABLE_DEPRECATED \
++-DGTK_DISABLE_SINGLE_INCLUDES \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ -DGTK_DISABLE_DEPRECATED \
+--DGSEAL_ENABLE"
++-DGSEAL_ENABLE \
++-DG_DISABLE_SINGLE_INCLUDES"
+ fi
+ AC_SUBST(WARNINGS)
+ 
diff --git a/media-sound/ario/metadata.xml b/media-sound/ario/metadata.xml
new file mode 100644
index 000000000000..6e2b5222d277
--- /dev/null
+++ b/media-sound/ario/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<use>
+		<flag name="audioscrobbler">Enable song tracking via last.fm</flag>
+		<flag name="idle">Enable experimental support for MPD's idle command to reduce bandwidth and cpu usage, requires MPD 0.14</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">ario-player</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/aseqview/Manifest b/media-sound/aseqview/Manifest
new file mode 100644
index 000000000000..7b0354f401f8
--- /dev/null
+++ b/media-sound/aseqview/Manifest
@@ -0,0 +1,5 @@
+DIST aseqview-0.2.8.tar.gz 120287 SHA256 f2db64d4d0dee0800c204a87698f7dd8415c3e5d192218872231cb116629a947 SHA512 853dc2b1c54152c39a29cbbf17698c4f397f479b5a57397c778b22ecab803be0a69dce3b4a10d50a3c1ace08256f05bbc481ed695ab81c89c40af2034a97c203 WHIRLPOOL b2b5f3404100e1558765e1995bf5645ff3ca93091b3eb617af77c47eac77ea38b39f9982ec8256923606fe3e60e24380f817d0a518090b9d7a3944d33fb9695a
+EBUILD aseqview-0.2.8.ebuild 655 SHA256 13fb0f27b518622bd666800f842478151297a681cdee52fe75935071ac4f0502 SHA512 133eabb3b5998ab669250341e5679fcf2c6863df9123ec58387d2a33cee6ddd66bf6e8851f4af2900b0596a17b10936df4deeeedb3bae060f9ee347c0a76cfba WHIRLPOOL 9004783db5ccb7e59e5e1c71e81ee8699dba5ec97dd1bae6c517e5686fa7b5ddb697199a35e1b9425236e89707ad1c8bc20b546149db88387f52267a59ad357b
+MISC ChangeLog 2433 SHA256 bc1505603c957da6c63ccf730c5e291e3252f61a62193f5dd64988c195adba9d SHA512 363260472c3ab8578699e352f0128c998ee18ce81293cdc888d96ab3bd1c5e1bffef38bda81d99b91481da3814b2178659f521ff8b091a22dd43aeab0047becc WHIRLPOOL 488af67841d391b98946e595e9a25175d8a5c751ccaefbbf4252e5a2d7382421a1f498265b290600564c1144b1a06dc824712f16e9deb30bb9ff4256bf4f48bc
+MISC ChangeLog-2015 2261 SHA256 c48c9b6cb08700459f871cd59896471b384eeaa030bf90645e6d44dc60883031 SHA512 fb2a5c8b23cc20e59be4c0d664f60a0a3f823bacb941c0d42ac9a9b459531af9e122a12e8611051e10f5216ac73e158efdd0594c7b027cf328f0f599b40a5221 WHIRLPOOL d1b421e2160cc2580f1763177a7c875a818807b1c95bee4cc1453f08551309532e7cca961ff6014b0f07ba7440583084e2ada58b4589812ec0f24fa706bd8351
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/aseqview/aseqview-0.2.8.ebuild b/media-sound/aseqview/aseqview-0.2.8.ebuild
new file mode 100644
index 000000000000..0d5c975b9ec6
--- /dev/null
+++ b/media-sound/aseqview/aseqview-0.2.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+DESCRIPTION="ALSA sequencer event viewer/filter"
+HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html"
+SRC_URI="http://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+RDEPEND=">=media-libs/alsa-lib-0.9.0
+	x11-libs/gtk+:2
+	net-libs/libpcap"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf --disable-alsatest --disable-gtktest --enable-gtk2
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/media-sound/aseqview/metadata.xml b/media-sound/aseqview/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/aseqview/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
new file mode 100644
index 000000000000..07d82af915e3
--- /dev/null
+++ b/media-sound/asunder/Manifest
@@ -0,0 +1,11 @@
+DIST asunder-2.2.tar.bz2 208936 SHA256 bb608c1cdefcce2f533fb5d5cc23838846b2810ec89d0ebb083507cf27e7822f SHA512 6f2a9a2f6d047a41ef0aaa221fafdc86f3fe6e49f9c8cfcaae4e325b62f3f17cddafa57982d2d3aca0922bce6aa29015d398cbf97ddfb44c7d7dfdd75aefab4c WHIRLPOOL 16b0da49f44d09f95d2a86f6290718d850c014c7aef0e875654efda05e0b959bf64a21f2c101a4e897aec633dce215f41ee3f1db221c25d8b04cb600372a633b
+DIST asunder-2.8.1.tar.bz2 271124 SHA256 1e33339e5b0eaea81f1ca5b00745b1bc932f31a7db99bff55e0f3b6178fdf78d SHA512 3ba0e8f2cdc73ba818ea3363fa41ad16ce48e532b681645c762a0d58951ae048727d8b5fbe911472f75c21346f1d6719fee075389fb48245a9c417acf7213c39 WHIRLPOOL 78ab5da1b5c57173a30a90517f7d9ac68c0fb58c9505d9cea9dd56e430d1fc189c064e686491ff3cfa38fa77dbe0dc53f56dc38bb4324b74526ec54f50645ca6
+DIST asunder-2.9.1.tar.bz2 278842 SHA256 401d29d2ea5e6a70cb1485edd6ae5bfaf495fc02d3f0322991c8d6cbbbb2c6fb SHA512 91c4e323cb548d565d7af27259b312dbfcb6de4a9bb2811639009a9944ab514082c4f030a4aa0f3a13d4ccda52253f1597dfb8ef39764fcd12d02a0d7afc6bf2 WHIRLPOOL 153991c08b8af857490f9f0fa0a7eb3502812a44f1ed77d4f3fcf07c84f42be822fa1abe5213e40ab5c09b01058af3c84c49934ae6c65bcf82c61d4bb611620f
+DIST asunder-2.9.tar.bz2 271744 SHA256 12a0329871c938344954f9c10cd4391c630ba0d5b976023cbf91f6b915ff5467 SHA512 ac3f0265c31ee2ca9c57d9e189fa56b62113f2af541c7e17456f70ddff20994eeefbb74b3bb5deffed3aac6806bfd99493fb85411e42f9577c77d617bec246c1 WHIRLPOOL d50aeda80d0191b408a6d03c01f2d91b412d7aa44e5117b632699de64605e7be1fe30d7b1ecff333041ea9deca93e7ffb61bd5428f24d6b6382324f6b4b597d5
+EBUILD asunder-2.2.ebuild 763 SHA256 6a1019071da484e4dad248912bb0a2c55ef063178b223da0c7e79d82c5ed86c6 SHA512 936fdea24d035939f8c39874704b5d8fba6e15d8c2787d6eb10c6e9cced86d74a73909faf3bcadab9a25f27e6f3785b73ac3f33edb502b93b72a5330842dee80 WHIRLPOOL ef22824b085108d8132e768082fce6d7e82ab2591ee7eb7ecb1caee05e2aa1f4baa488960da64d57a00c12cb545fc9388acbfac825ec887ec6ca5a63b9739db3
+EBUILD asunder-2.8.1.ebuild 1018 SHA256 7aacac3a67cd58b38a7474dacf2b804868655cfe6ed2ca4d6a03cb65c0987bd8 SHA512 b2dcba8f928fadda61294b804d6897f2661c04bd6a1ef8868d371627628263480907650b41e396401143d24419ba0acab30dd20f12126c23a69a32df64cf698f WHIRLPOOL 247bf88ec7b43e01c1797dce5cb3cd0fd3005a77f3925d8f8e4dd9716a62b803b1b79f740ae9ee0541f9a2f9c76b9035e55c77341a1c0f3234eb775afa60ff60
+EBUILD asunder-2.9.1.ebuild 964 SHA256 761a98015db22f367c58ecf4ab93ee814701eb881484ac4ed3287e214943cbd6 SHA512 ae4d3d3fc3c456433477dc78084044f181de66ff5f1686699593714344c901bbee6c65e5ff8886279119f9527022fc766ca2280b2d481c0cfb99b2f6ccd3e567 WHIRLPOOL cbafb4244c3e1c068d7c3342315ad9d5b7de72f8310c4313e57b4c43cc579a9fc6b24467126d07b7945abb6d7dc7a7d57681e7c4cbe7c443132cecbabab1de1a
+EBUILD asunder-2.9.ebuild 964 SHA256 761a98015db22f367c58ecf4ab93ee814701eb881484ac4ed3287e214943cbd6 SHA512 ae4d3d3fc3c456433477dc78084044f181de66ff5f1686699593714344c901bbee6c65e5ff8886279119f9527022fc766ca2280b2d481c0cfb99b2f6ccd3e567 WHIRLPOOL cbafb4244c3e1c068d7c3342315ad9d5b7de72f8310c4313e57b4c43cc579a9fc6b24467126d07b7945abb6d7dc7a7d57681e7c4cbe7c443132cecbabab1de1a
+MISC ChangeLog 3314 SHA256 3615431eb2e3a02469f4177eabfd7465d22d7ba0f7a572b560a3c380eec98ad2 SHA512 67a1d11772a6eeeec034283e4909eb17697ceb35b332c374a3d4e70015ede980107512d29b096040585e196973adfa6f5e4181322d4a8daee5d273a50be31b23 WHIRLPOOL 449b19d0da90a83e5843da98e93072000de70d32fc1802fdd0fdfbf6070aea37f2f27f244a23b16c1ce0eb4585e1d563a242e0e9c175bad269e5ff376d3f1b79
+MISC ChangeLog-2015 6093 SHA256 367220dc8fb06c9a15a1b8c886dd51934139c929cb6b08814aeff20b13748849 SHA512 18fc93a195bf91fb5b2056bc32be96f490ef2bf30240e6f5a478eb8abdbe62e5e9b3252777ff603f06b9a69d7a74bb346775caef0e38e7fb7e77cec01ab9b93f WHIRLPOOL ad25a38046021838ac71f39a018af5d070b61ee5e25d6fe4ff0b881a4a10eafa31009e98bde3665243345dd7b89f6e64c0e552d15f269fc5b9bd50d95a06fb6c
+MISC metadata.xml 405 SHA256 66099e54a885ddd415387740dad8412b0e986116eadcdc5a0c37337ec781a05d SHA512 97a0107ea08e3e810e952625df66d990d4144915a3e6ab2504ca0432c129b99394ad702a4b4bfd3324fa213fad4445e66fb0eef53d628a989bd24431d156aaef WHIRLPOOL c4d3b7468a0e29121ecfce4a8b070caf086b4c2e3f632d780b75d9ba57e3664355e31235e2e34a8ea5c70b048144b06e3ed1ae647ccc2c5e67f4cfafda00b1b9
diff --git a/media-sound/asunder/asunder-2.2.ebuild b/media-sound/asunder/asunder-2.2.ebuild
new file mode 100644
index 000000000000..35a821e4134a
--- /dev/null
+++ b/media-sound/asunder/asunder-2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="A graphical Audio CD ripper and encoder with support for many output formats"
+HOMEPAGE="http://littlesvr.ca/asunder/"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="flac mp3 vorbis wavpack"
+
+COMMON_DEPEND=">=media-libs/libcddb-0.9.5
+	media-sound/cdparanoia
+	x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+RDEPEND="${COMMON_DEPEND}
+	flac? ( media-libs/flac )
+	mp3? ( media-sound/lame )
+	vorbis? ( media-sound/vorbis-tools )
+	wavpack? ( media-sound/wavpack )"
+
+DOCS="AUTHORS ChangeLog README TODO" # NEWS is dummy
diff --git a/media-sound/asunder/asunder-2.8.1.ebuild b/media-sound/asunder/asunder-2.8.1.ebuild
new file mode 100644
index 000000000000..923c1e94eede
--- /dev/null
+++ b/media-sound/asunder/asunder-2.8.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A graphical Audio CD ripper and encoder with support for many output formats"
+HOMEPAGE="http://littlesvr.ca/asunder/"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="aac flac mac mp3 musepack opus vorbis wavpack"
+
+COMMON_DEPEND=">=media-libs/libcddb-0.9.5
+	media-sound/cdparanoia
+	x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+RDEPEND="${COMMON_DEPEND}
+	aac? ( media-sound/neroaac )
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	mp3? ( media-sound/lame )
+	musepack? ( media-sound/musepack-tools )
+	opus? ( media-sound/opus-tools )
+	vorbis? ( media-sound/vorbis-tools )
+	wavpack? ( media-sound/wavpack )"
+
+DOCS="AUTHORS ChangeLog README TODO" # NEWS is dummy
+
+src_prepare() {
+	default
+	sed -i -e 's:cd syslogng && $(MAKE) install:true:' "${S}"/Makefile.in
+}
diff --git a/media-sound/asunder/asunder-2.9.1.ebuild b/media-sound/asunder/asunder-2.9.1.ebuild
new file mode 100644
index 000000000000..06b12e80c3c3
--- /dev/null
+++ b/media-sound/asunder/asunder-2.9.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A graphical Audio CD ripper and encoder with support for many output formats"
+HOMEPAGE="http://littlesvr.ca/asunder/"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="aac flac mac mp3 musepack opus vorbis wavpack"
+
+COMMON_DEPEND=">=media-libs/libcddb-0.9.5
+	media-sound/cdparanoia
+	x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+RDEPEND="${COMMON_DEPEND}
+	aac? ( media-sound/neroaac )
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	mp3? ( media-sound/lame )
+	musepack? ( media-sound/musepack-tools )
+	opus? ( media-sound/opus-tools )
+	vorbis? ( media-sound/vorbis-tools )
+	wavpack? ( media-sound/wavpack )"
+
+src_prepare() {
+	default
+	sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
+}
diff --git a/media-sound/asunder/asunder-2.9.ebuild b/media-sound/asunder/asunder-2.9.ebuild
new file mode 100644
index 000000000000..06b12e80c3c3
--- /dev/null
+++ b/media-sound/asunder/asunder-2.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A graphical Audio CD ripper and encoder with support for many output formats"
+HOMEPAGE="http://littlesvr.ca/asunder/"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="aac flac mac mp3 musepack opus vorbis wavpack"
+
+COMMON_DEPEND=">=media-libs/libcddb-0.9.5
+	media-sound/cdparanoia
+	x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+RDEPEND="${COMMON_DEPEND}
+	aac? ( media-sound/neroaac )
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	mp3? ( media-sound/lame )
+	musepack? ( media-sound/musepack-tools )
+	opus? ( media-sound/opus-tools )
+	vorbis? ( media-sound/vorbis-tools )
+	wavpack? ( media-sound/wavpack )"
+
+src_prepare() {
+	default
+	sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
+}
diff --git a/media-sound/asunder/metadata.xml b/media-sound/asunder/metadata.xml
new file mode 100644
index 000000000000..f5afbca69616
--- /dev/null
+++ b/media-sound/asunder/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+	</maintainer>
+<use>
+  <flag name="mac">Support for creation of Monkey's Audio files (APE)</flag>
+  <flag name="opus">Support for creation of Opus files</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/aucdtect/Manifest b/media-sound/aucdtect/Manifest
new file mode 100644
index 000000000000..4f98322f52a1
--- /dev/null
+++ b/media-sound/aucdtect/Manifest
@@ -0,0 +1,5 @@
+DIST aucdtect-0.8.2.rpm 221616 SHA256 ad56e301106d109274f5f9528ddfce6a6ac71e00951806682cb6ac823370e5d2 SHA512 9d7ff78915bb110e93907d74abc9201316927f80919c33617d7204027556ae30bdb358f90ce7688e4d02b4ac007b04409185c93ef59ed3212b6db2f55ee83d43 WHIRLPOOL 78356452976c92884b5cb3c360dff335cdc059f0968e9f8dbc4145abc60fd772d309a4b85080ef86d5d3afe517c0240299d681699f5b3660be5c02b08402e1e8
+EBUILD aucdtect-0.8.2-r1.ebuild 551 SHA256 32feb8a8555298748c7ce74c9d459b298b8ecead5661c2392bd59fbf9b23651d SHA512 cf4e3d573eb5d453a05f9fa7bdf64991e7db139fac770d72103378dc5bc2e9d434c0ff3c15fa42d5621dcabb198c08747a99ae449a640a45d0650b186019b771 WHIRLPOOL 28b8c154f05ec920fc19bf296d4db15a7b22d72acbbe1bc07e5a239358df3f072257e6d6c57259a77754607ccb4a7992c0a2efbebdb282d1dead7e57c8cc701d
+MISC ChangeLog 2439 SHA256 6b2352beccdda19a9624b81b2bad08fb0b80f7ee7c601b321e808a109a4ec618 SHA512 100a189c4268db6731329895e4b1555e52be86b93bf61a01dace2e81d92778a652880068a57082d7727778d921f365bea4b3a32f9a6ef54e7c9312ad4de641e6 WHIRLPOOL 09689c15d93af4885ad68534840361dce2f100a48745efca8a7a658f6ce3072bc0c73285a7fed85f7cb5e2e6d175d347d2f2126e17deb577bf52d4bd2f212788
+MISC ChangeLog-2015 716 SHA256 8576844067d5e9e599f050521a2f4465358d971a2a65669a2bad288940829084 SHA512 5f66ad6a507b20d1fd88a4eb2dc4a889b98af1116bf477833c2d5f86eb7800852b02decbb434bbdeafd17bf900054663ac572f573651c78c5d395f8bae569a64 WHIRLPOOL ab8a24be56e69d382b75518375f034398357f45b0cb7bca1f6df159b3a508012ea3f7c93214c640d9e8a7a0497f263b1dad247d92913af30c17ed1b0706f2126
+MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/media-sound/aucdtect/aucdtect-0.8.2-r1.ebuild b/media-sound/aucdtect/aucdtect-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..8bdbe7a48d9d
--- /dev/null
+++ b/media-sound/aucdtect/aucdtect-0.8.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit rpm versionator
+
+MY_PV=$(replace_version_separator 2 '-')
+MY_P="${PN}-${MY_PV}"
+MY_PN="${PN/cd/CD}"
+
+DESCRIPTION="Commandline FLAC CDDA authenticity verifier"
+HOMEPAGE="http://en.true-audio.com"
+SRC_URI="http://en.true-audio.com/ftp/${MY_P}.i586.rpm -> ${P}.rpm"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/usr/local/bin"
+
+QA_PREBUILT="opt/bin/.*"
+
+src_install() {
+	into /opt
+	dobin "${MY_PN}"
+}
diff --git a/media-sound/aucdtect/metadata.xml b/media-sound/aucdtect/metadata.xml
new file mode 100644
index 000000000000..39626a990be5
--- /dev/null
+++ b/media-sound/aucdtect/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
new file mode 100644
index 000000000000..5240345796f2
--- /dev/null
+++ b/media-sound/audacious/Manifest
@@ -0,0 +1,17 @@
+AUX audacious-3.7.1-c++11-throw-in-dtors.patch 1214 SHA256 0133fa37f5f8e5588fe3fc268c202d7d453d6bf3686c683895cfb7d89532e4b3 SHA512 dcba1e73f17919634d4c6770029bdba2774c752d8296c29f5c78f69bc454f421bf55a6e5b059ab68ffb462995023f63d6eb855a3242f4e806a0a348571adc417 WHIRLPOOL 3128479beb07d6c86186a973294973d9d64f25fddfbe386e3354a95db08357c9f13680b8e21733b22cafd138b25ffff1eaf53d9f1626e5671e1a4cc96d73c0e9
+DIST audacious-3.4.1.tar.bz2 474755 SHA256 57ed4d8378b1e753e266a82424c3ae595b6c0e88fc3e32957720cd6cc14ac971 SHA512 2a9e203544861a0b902b720823202ef1038927932826847dc9b9a9c321dbecc19e2187afbdeb62a22ee8e6348c7df609ad671c8c63da2abc003a37556df20ac3 WHIRLPOOL 4b8facfb9fb3187286a59f5ddbba4ec784a3fd42e2fcadf322ee27cd8d1ae08ee3d5e23cb5c56875d3d3a879c1dd7ba21407cf19ef400693b8ab7a0adc176087
+DIST audacious-3.6.2-gtk3.tar.bz2 539937 SHA256 ed951e588a9f3cb6766301cc387138a3fe2abc81c243eba478e4261390cb51ed SHA512 6667f71de1951265d7c8bfbd83079d67942c2c97323ffc7214394ef3f81b1f58e0432117417281833611964e88c629ef855bd90562da46be1c5d350a51c0d997 WHIRLPOOL 4e218ca1c236b3e02b20e5ed5bb9d91fd95d8132273de8451963c84e2aabb869298cf4c58704ab07036ed7c1e5a6b1ea7855f733812aaed7685b13ce7a4ecd9d
+DIST audacious-3.6.2.tar.bz2 539843 SHA256 b2fdb9f3cafd65b2afc50efea6f17a7a329547f1d394f525870e42cb0483cb04 SHA512 b2fbf0b0628031ae5c883108cb1963232b50381b44882bf01faa7e11cd645e10a1d686d9ed078305a2cda66d238feaf7bdffd45c512830d20cef6770df327dde WHIRLPOOL f7b069b7e1f9538032d1bc290c7d476f16b075cf44a5d5d2b6f582a9e95ca3aa3e0a87d21ca00d4fc57a19983a9e74f3ded5e883acbd990df2064ac75e3da69a
+DIST audacious-3.7.1-gtk3.tar.bz2 571720 SHA256 30d63066916d0de32891c74b6b39e3c9e81fc2449274eba3d0a9b8c9f70d02eb SHA512 0ead2827c74b31e10c555fd1254deb3d11e5aebf8c15d455cf5d6ab258012b293324700693b2b9da48b2b4c25418c7149a1901e1dfe3f210ddf730c25a43a358 WHIRLPOOL 2ceaa0194378b12ad8905c86fcf15e696f6deefa6da793d24e4e6282f0619f0fc9f7d7b8a7db0c231ba3a4e17052b4e8cdbad32c2b5a886f9aedec520c29cc25
+DIST audacious-3.7.1.tar.bz2 571450 SHA256 c8366870aea21d5f4a5a282dee45fba99390e4e3d5164cd119e343f79e9ecbbf SHA512 4c74fcfa6e575375501828905f01ed1e769d88fa346a99162c6800da5bc6aa33ec5598c5de1201c4e24cadb31b8c36768ea390aa4884de6bdbf42b0bea5a31a8 WHIRLPOOL 19fb9e0bd4b606e09ef21a66b8684fbc5ccac4e97c0f26abe96b42851fc3a2c629d89b39ec3f9a5ec82a779a2d6a5ae56ab36ab0993a2e0c1ff48861e6c28518
+DIST audacious-3.8.2-gtk3.tar.bz2 591423 SHA256 4ec6bd82d812c5cdcb1c32f4b0912b219edc8f1ce2603b07f714e0c4f2ed08bc SHA512 fc2c69748c8f044aa8eae1848771b45088d85fbb67baf5dcd3ab2ff52e0848ba626e138d1a37756df98249f32cb3d6c54de29355b218602c6a47ff15c8ba0b96 WHIRLPOOL 7d9e2c295e89ec40ef91613f4a4c1f808446f156bbbc6e6be89511fa94a4b9cce5bef209187d1396edd008dd4474c127ad97a493cf9bf3deffd6064f07cdec8e
+DIST audacious-3.8.2.tar.bz2 591209 SHA256 bdf1471cce9becf9599c742c03bdf67a2b26d9101f7d865f900a74d57addbe93 SHA512 13914d837ab5f283c45297424033486d9a5158f78f17f5538ecce780125fa76585e9e45852d15f6ecf3ed974e7a2f6289ceaaeffa97b2ea79b2bef449d8c786b WHIRLPOOL 9027baf4fe10e69fd41417d46db2d9105701a6a8c8b80f5bfa3f0aa9615b07a0103b159585b601c01b3483f93872ed890ed81f921b512d295648bffc820267f0
+DIST gentoo_ice-xmms-0.2.tar.bz2 51839 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05 WHIRLPOOL b7a4409629a860021477f34f8886c40c005ea2ec34373d80e6a696323866e54f361e38c76b1ac536775ae5912308f11416e613dec791f21473f01a2fad35bcfd
+EBUILD audacious-3.4.1.ebuild 1412 SHA256 b2e8fd64af6616d3d1c665b8aacd3ac700ecb7c4844acfd7dfac253ffbeb0cac SHA512 3216422c0426c0a63d9412899b4e8a721d3df5cf8233c3139b3687f7f686397bcd3653207e2b7163b0460ed54c4c53916946223f5f9bef2a191e1eb614710946 WHIRLPOOL 45f35ff6deb6a5c2c10ba952faf02bae9f6ef52d6a3ad874a4c605ff1157625bb6501357d4493612bedf571f6c1f166915045b0c531638fd05f1755699125cd4
+EBUILD audacious-3.6.2.ebuild 1737 SHA256 fb89f75637193dd0197aba3bccebe8e397b55e3d6b0851770a1f5d536015bd99 SHA512 621cfc40a2509302ec34de313427de8f0f5d792ac240396b5c3b508d1cfe287b0930bb834dceb6199622ef07f773294342ce095016e26e1806c987c318a37d80 WHIRLPOOL 2d6aadca2e5c99ca382f829c2a36e7c4abc11e8a64001e9fb6185ca3b71f07fb05da58b5785a8c52679d7c16192514751227c825dc7229bd47d6f60ea3398631
+EBUILD audacious-3.7.1-r1.ebuild 1981 SHA256 188814670ea2f656c5842c903f2921dce95d57d81b5e515af598e63756010e86 SHA512 f727ab57ec08543af48a383ebe2964a4a7aa7cad41ee20ca59452d0c73c61e233e82720bd64fb0eac06cde0d1b410cf89b1dc4b92fe403081aaf406688854682 WHIRLPOOL a8078114e225edfc50b0b1d6f0ccb25184834ace4a99f7af9a383a0416af96e94608a7aff33bd902af51e56540eaf35d8e150e29c4771b914558a5b8644b1667
+EBUILD audacious-3.7.1.ebuild 1902 SHA256 9decbb5f74d1ed979faad677f9333db7a81b6b657fbd4673575434904310a5ae SHA512 0e6f4d694c7ec951920ffa87bcfd5fc7bea7bac98c075891ca337a9d382cf280badaabbab38b7889b7a52ac6b1ae45df0d9ecac50459da5c3976eb5b08cf7f83 WHIRLPOOL 1052ddd9639a3b5f5c3b2ce2db38134c3d13c9e4b7879bbf848a03067a9c2cac09fd85bb349185bb92abe75bcb8911b084f61fb652d10fc1264f6647f04ced85
+EBUILD audacious-3.8.2.ebuild 1835 SHA256 0f5313f90f93e6d6990ce5f7824837e47b1bb08262ee89c2ff2a41c7713d991c SHA512 ca51ae6472f8b0bfce6cf355feee68f783a48f4ffc4e097c694b007bae87ff3a1c27432fc27a5a19149d1f09321a5834ce930e43130f2d11e03d920c4a6f15bf WHIRLPOOL 44d7f62d8157dcff03cc0fbbfe7f031044f251fd7f7d6ab3f0200098ba0eacc789fa548fc72472932ed7e6f8e0125dffa4f62b8847634a6bcc0d60c4fe1907ea
+MISC ChangeLog 4820 SHA256 5e50343e1b021f674bdbee0fa169ee49750c8bd840f65ec36702c5eb930bab1f SHA512 52c8774df9ab2e45fc26a02722870253f017849208b31cac1b7af69a4db82076db64676f3699bc1bfe4b6452a321c47906cdad9afdfbbac76d4fa3953b314f2a WHIRLPOOL 964b256ddf881c6cc1147c10c73ff85f5b4e702dd23c02cecf0fd92aaa1ab354987fd240cfac6398045a3700ae0df00c1822f190abac2823c731b1c0d3336406
+MISC ChangeLog-2015 51371 SHA256 974d56f687f6397ceede515c6da7959194b330ef7a453cc72291e6b1b4f299fc SHA512 f384f858eeef58567bfa6248e16c03a65a2d681a21f239354765c964455a77ec4777f707a62b148f5fbec8eada09c8938bd2b289e2cf88a893c42c5f03143dc2 WHIRLPOOL 6a80047e08fc60b1f21f57d1eb0b57bae75736ef14f13fcef91f893f616a9b54c3e9886b97af7cfbfe1f53501fe799694945b3d2306b1033cc9f0fa577ad4fa6
+MISC metadata.xml 572 SHA256 0492486fc71fb35796bba00dda24ab02b92aa8681cd6d70b2fbd58e559287251 SHA512 f54961e5da4f17200ee622ddfe439fa826dd7a195f1548fc7a7c038a6dc0683ece5e4147b082172d3ea6ff9b2e1f1bc67c62aa4c68057913216e3eaef29d0d25 WHIRLPOOL 463570a30a9c537e719195f7905852cc8585049f3c9e6f0b881c129c0d7af9e63ca1005a0fa74dd04158cc9abf8a93d5e3b2f9b92cc3d2d6689263d7d5662a4f
diff --git a/media-sound/audacious/audacious-3.4.1.ebuild b/media-sound/audacious/audacious-3.4.1.ebuild
new file mode 100644
index 000000000000..919d0e6cb270
--- /dev/null
+++ b/media-sound/audacious/audacious-3.4.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="chardet nls"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	x11-libs/gtk+:3"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.4.1"
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		$(use_enable chardet) \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.6.2.ebuild b/media-sound/audacious/audacious-3.6.2.ebuild
new file mode 100644
index 000000000000..de7671aaaa3e
--- /dev/null
+++ b/media-sound/audacious/audacious-3.6.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+	 gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="chardet nls gtk3 qt5"
+DOCS="AUTHORS"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	virtual/freedesktop-icon-theme
+	chardet? ( >=app-i18n/libguess-1.2 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	qt5? ( dev-qt/qtcore:5
+	      dev-qt/qtgui:5
+	      dev-qt/qtwidgets:5 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+src_unpack() {
+	default
+	if use gtk3 ; then
+		mv "${MY_P}-gtk3" "${MY_P}"
+	fi
+}
+
+src_configure() {
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable qt5 qt)
+}
+
+src_install() {
+	default
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.7.1-r1.ebuild b/media-sound/audacious/audacious-3.7.1-r1.ebuild
new file mode 100644
index 000000000000..808810c14cbc
--- /dev/null
+++ b/media-sound/audacious/audacious-3.7.1-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+	 gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="+chardet nls gtk gtk3 qt5"
+REQUIRED_USE="
+	^^ ( gtk gtk3 qt5 )
+"
+DOCS="AUTHORS"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	virtual/freedesktop-icon-theme
+	chardet? ( >=app-i18n/libguess-1.2 )
+	gtk?  ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	qt5? ( dev-qt/qtcore:5
+	      dev-qt/qtgui:5
+	      dev-qt/qtwidgets:5 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+src_unpack() {
+	default
+	if use gtk3 ; then
+		mv "${MY_P}-gtk3" "${MY_P}"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-c++11-throw-in-dtors.patch
+}
+
+src_configure() {
+	if use gtk ;then
+		gtk="--enable-gtk"
+	elif use gtk3 ;then
+		gtk="--enable-gtk"
+	else
+		gtk="--disable-gtk"
+	fi
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		${gtk} \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable qt5 qt)
+}
+
+src_install() {
+	default
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.7.1.ebuild b/media-sound/audacious/audacious-3.7.1.ebuild
new file mode 100644
index 000000000000..0836b1f236dc
--- /dev/null
+++ b/media-sound/audacious/audacious-3.7.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+	 gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="+chardet nls gtk gtk3 qt5"
+REQUIRED_USE="
+	?? ( gtk gtk3 qt5 )
+"
+DOCS="AUTHORS"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	virtual/freedesktop-icon-theme
+	chardet? ( >=app-i18n/libguess-1.2 )
+	gtk?  ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	qt5? ( dev-qt/qtcore:5
+	      dev-qt/qtgui:5
+	      dev-qt/qtwidgets:5 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+src_unpack() {
+	default
+	if use gtk3 ; then
+		mv "${MY_P}-gtk3" "${MY_P}"
+	fi
+}
+
+src_configure() {
+	if use gtk ;then
+		gtk="--enable-gtk"
+	elif use gtk3 ;then
+		gtk="--enable-gtk"
+	else
+		gtk="--disable-gtk"
+	fi
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		${gtk} \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable qt5 qt)
+}
+
+src_install() {
+	default
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/audacious-3.8.2.ebuild b/media-sound/audacious/audacious-3.8.2.ebuild
new file mode 100644
index 000000000000..2e2abf4eedee
--- /dev/null
+++ b/media-sound/audacious/audacious-3.8.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
+HOMEPAGE="http://audacious-media-player.org/"
+SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
+	 gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="nls gtk gtk3 qt5"
+REQUIRED_USE="
+	^^ ( gtk gtk3 qt5 )
+"
+DOCS="AUTHORS"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.28
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	virtual/freedesktop-icon-theme
+	gtk?  ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	qt5? ( dev-qt/qtcore:5
+	      dev-qt/qtgui:5
+	      dev-qt/qtwidgets:5 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+src_unpack() {
+	default
+	if use gtk3 ; then
+		mv "${MY_P}-gtk3" "${MY_P}"
+	fi
+}
+
+src_configure() {
+	if use gtk ;then
+		gtk="--enable-gtk"
+	elif use gtk3 ;then
+		gtk="--enable-gtk"
+	else
+		gtk="--disable-gtk"
+	fi
+	# D-Bus is a mandatory dependency, remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	econf \
+		--enable-dbus \
+		${gtk} \
+		$(use_enable nls) \
+		$(use_enable qt5 qt)
+}
+
+src_install() {
+	default
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins "${WORKDIR}"/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/files/audacious-3.7.1-c++11-throw-in-dtors.patch b/media-sound/audacious/files/audacious-3.7.1-c++11-throw-in-dtors.patch
new file mode 100644
index 000000000000..309dbc0319f2
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.7.1-c++11-throw-in-dtors.patch
@@ -0,0 +1,39 @@
+Bug: https://bugs.gentoo.org/600882
+Upstream commit: https://github.com/audacious-media-player/audacious/commit/1cf1a81a16cc70b2d9c78994ad98e26db99943ed
+
+From 1cf1a81a16cc70b2d9c78994ad98e26db99943ed Mon Sep 17 00:00:00 2001
+From: John Lindgren <john.lindgren@aol.com>
+Date: Sun, 8 May 2016 22:39:00 -0400
+Subject: [PATCH] Fix compiler warning.
+
+---
+ src/libaudcore/objects.h    | 2 +-
+ src/libaudcore/stringbuf.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libaudcore/objects.h b/src/libaudcore/objects.h
+index fd57f5e15..4b98cc624 100644
+--- a/src/libaudcore/objects.h
++++ b/src/libaudcore/objects.h
+@@ -250,7 +250,7 @@ class StringBuf
+     }
+ 
+     // only allowed for top (or null) string
+-    ~StringBuf ();
++    ~StringBuf () noexcept (false);
+ 
+     // only allowed for top (or null) string
+     void resize (int size);
+diff --git a/src/libaudcore/stringbuf.cc b/src/libaudcore/stringbuf.cc
+index 041b1e9de..fc646f6ab 100644
+--- a/src/libaudcore/stringbuf.cc
++++ b/src/libaudcore/stringbuf.cc
+@@ -139,7 +139,7 @@ EXPORT void StringBuf::resize (int len)
+     }
+ }
+ 
+-EXPORT StringBuf::~StringBuf ()
++EXPORT StringBuf::~StringBuf () noexcept (false)
+ {
+     if (m_data)
+     {
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
new file mode 100644
index 000000000000..617162bf4a6b
--- /dev/null
+++ b/media-sound/audacious/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="chardet">Try to handle non-UTF8 chinese/japanese/korean ID3 tags</flag>
+		<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
new file mode 100644
index 000000000000..f4c167af7ec6
--- /dev/null
+++ b/media-sound/audacity/Manifest
@@ -0,0 +1,6 @@
+DIST audacity-help-2.1.3.zip 20682229 SHA256 35a8f989ac8dfd24fa73716498feeffb82f838972280623309a557a3fa632a88 SHA512 4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec WHIRLPOOL 413390d10f977da3ebd339ed7925a8e81efede5b322d0e5c96c21ab86f8dd3c800d9a5eaeb5a69a6655e7c76ba7010b0ccb4da14864d77891d3028da54d3de04
+DIST audacity-minsrc-2.1.3.tar.xz 8073388 SHA256 c8fe1d52a58cef05390118a7f458f89252a3aa70155b78e8e25c92c4eeaabf31 SHA512 96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef WHIRLPOOL 730c962b6ff0861d9f96a58fb7d1c97af73cbf0072d3b8560c0250b4a37568741762d2891d8fb5097e6456a014e1ebe1dce4a41e039af5feb48d7bc454b67483
+EBUILD audacity-2.1.3-r1.ebuild 2716 SHA256 80af9aee40b6dace965c6cc7afa447534dfc16b94616eec40faae8071239b133 SHA512 1d92991b6295ac279c898c94fa30c9928b596918a0425ca30f7acbf77e417dbf0ab8e819df14e93c69293f6fd63b80845c2943c4cb2635204d5596a552ff86c5 WHIRLPOOL 33da065903c766fb6032562638cd485e376c63e0e3115f8573484ee0a5a7fe29a58d0b3ac6db371d3ce38348ae35e04edf0072a6b68f09b97be8335d53350a01
+MISC ChangeLog 5384 SHA256 ad0abc3d8d4aa596434004a717126b958abe96f379c7caabea2ed46f2a26de94 SHA512 053613349248958c99e619f6392b7b8e086bb7d1be08050e6f5e76255f610a85ef841afdea20158e2a1c0cac44c9ad864437bbda49c999f501f3a368c32ae573 WHIRLPOOL e0e32d2a1a1ea51d43e1512a03242a84f57dc381877cea637afe0c41c0e2adf2f236a44bfeb718bb056b60f0090462b67d1f243f33022166789b84b8b11baf0b
+MISC ChangeLog-2015 30913 SHA256 b1ac51c14249d021192d80c7cbd201ac9a6021e91a14b46042940cdb0da10b82 SHA512 194078bc41acd27bfeeee0a07b02aea368db98d7e32306dadbbeda3f90e4f0fee03dc8907ff33110ba4b64cb7a839bfd34be22bab2437d0f4d48cb2591f06ba8 WHIRLPOOL fa7e61b7d7482efe917353f99b5fba05d5ca624a663e13d64b44f04ee180ed93db96d9f335f189ee365dbf2b4132f768e3e2b260446156522a38c27cc7e5aecb
+MISC metadata.xml 1175 SHA256 d42a3128754301d8e594c592b8db289f3c8358fe7d56bc71dd468a1fa8169176 SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae WHIRLPOOL 9b504e7e277d1a60aed4cc667d1e6f173614b188c759a22a02ded3f5b793e13ade2247934582032d98351d303763a88a0edb63b618301a0d71871473090ec9dc
diff --git a/media-sound/audacity/audacity-2.1.3-r1.ebuild b/media-sound/audacity/audacity-2.1.3-r1.ebuild
new file mode 100644
index 000000000000..7c2c2b2d5b66
--- /dev/null
+++ b/media-sound/audacity/audacity-2.1.3-r1.ebuild
@@ -0,0 +1,104 @@
+# 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/metadata.xml b/media-sound/audacity/metadata.xml
new file mode 100644
index 000000000000..b7c2db3a2bd7
--- /dev/null
+++ b/media-sound/audacity/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>richard@audacityteam.org</email>
+    <name>Richard Ash</name>
+    <description>Upstream - please CC on bugs that concerns upstream</description>
+  </maintainer>
+  <use>
+    <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
+    <flag name="lv2">Add support for Ladspa V2</flag>
+    <flag name="midi">Enables MIDI support</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>
+    <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>
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
new file mode 100644
index 000000000000..f9c521411504
--- /dev/null
+++ b/media-sound/audex/Manifest
@@ -0,0 +1,5 @@
+DIST audex-0.95_pre20170727.tar.xz 148352 SHA256 f0afc791b1c6ded8fbdd2d7b746c37946711792004536bae419dbd99ae53b3aa SHA512 ea18d819942aa463c7d87ecc59b7053eecb4698cc452bdc520f9c785aaabcc68a7333175f9e9486f33602254ffb5becabe244e365b9d03277ab33b6d1ce56ba4 WHIRLPOOL f4bc10d3c2507bcce727d6be8a640f00622281aeb39035f3cb5a42bc62fa1dddf1fa812b384de679aac9dcdfe595f4a6f4dbca20ea4bdd4b77fa309e1f66de81
+EBUILD audex-0.95_pre20170727.ebuild 1020 SHA256 8f062a6d61bb0bc093bb31bff2d684863e7ca24d808682dc997944783dddc0bc SHA512 1d02a84ed23ec928e0ab46983b0fcdd4287103cc0f667bc1bf35d2721f0b7840a87d7f344389786c19c749fc873344fd6cee5f919e71c80917ee294fec469ce5 WHIRLPOOL 89df44987be9c53913ecd3cb013b19872824b38935d2d802a3cdbb33da03c488889af362afbc8ca7a4dcb8bc45a833168831d255312454a9adc35708d4afd5b1
+MISC ChangeLog 2585 SHA256 ff44729cafe7a949699090b48d5f60b31d1bff17c9f7ea3669c4dfaa22444852 SHA512 a5174d30472cfa564c9ce880b1e343ab7bc96484e7d3be050311f2840221cea906f1ea6cd275cf1a745bac98f71c681836b09a53a4faa56754f22f015982b275 WHIRLPOOL 7898188dfb7d247d214576f6bd7389b13378c15f20fd423a0eb4956177352b17090ceb4dc7b0709e4abe41dd73c749503ae41e6d13f03b10d41a8c1300ac3c85
+MISC ChangeLog-2015 3544 SHA256 0c2fd8a2695d34d768d606aeece4156506863e308553e65e43b5ec13967b8af1 SHA512 f65d538baef6fb6da3b3fc9bc1d74fc6298ddd13105c74b4ecdaa1e73d636d8b3d601d3be8f8553e865f317b714142b6cf9b036661eef9aeab367bfd65a5fa9b WHIRLPOOL 296bd09a37a08b9e1abc59804f311f49052b64232ddd71b8957f176f6780c5a715efdbcbc14177f150e928faf1c1efeb56a5fd319cfd1d27c649ed6ac46c03f6
+MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/media-sound/audex/audex-0.95_pre20170727.ebuild b/media-sound/audex/audex-0.95_pre20170727.ebuild
new file mode 100644
index 000000000000..6c7bd91bdb1d
--- /dev/null
+++ b/media-sound/audex/audex-0.95_pre20170727.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Tool for ripping compact discs"
+HOMEPAGE="https://userbase.kde.org/Audex"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep libkcddb)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-sound/cdparanoia
+"
+RDEPEND="${DEPEND}
+	!media-sound/audex:4
+"
diff --git a/media-sound/audex/metadata.xml b/media-sound/audex/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/media-sound/audex/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/audicle/Manifest b/media-sound/audicle/Manifest
new file mode 100644
index 000000000000..fd89c2960e60
--- /dev/null
+++ b/media-sound/audicle/Manifest
@@ -0,0 +1,9 @@
+AUX audicle-1.0.0.6-font.patch 2862 SHA256 ca958277aaead8c7cfe4f02a4ee78a0ba3d527bfb61857f4e349ad8f1389c152 SHA512 4cb763b5b38c5e3768d8da38129bdd6fd281c818adfa1ec7e28fcec1c1352d0d677408f3f79ee96ee64ace40e49722b8f2f9c12e3cac9206e0afd72949a95d31 WHIRLPOOL a63811dc4867dc0e4f51bf486cf196e2c41f3b936a6d4495623464b0c002104888446dbe51ae71ec702157f9ece3a62da9c45f9800964c16b0fb882610ab2a93
+AUX audicle-1.0.0.7-const.patch 455 SHA256 72283e31406be66ab7730584767a6f54c6a5ce52d43a9b4387325e7fa6050d2d SHA512 203e760a772f4283e5add18883091d819935226a0fa82a56bc79ff585a2450d08067fee0b3a4a4b6421f393c707d41d342966c5dc72527fb59cb877c1041079f WHIRLPOOL 712b6ac76a05744881803b42f2620050eb2f9bc6cd8a8e8a354256db54004d4f2f07a0c95299eaaab107cf2dd5fcf682807c972b0c8816ef282cc17856def0eb
+AUX audicle-1.0.0.7-gcc43.patch 2777 SHA256 95466803195f8d3eaec75fc74bf387c806f4ce876c6f9695467a2ac5be2dab17 SHA512 e9858e7c7cea35d8f5af5c4c8ca22c80c030eb14bd8798cb617b86bc55067413d3875c9cc30700c2a3aa86a5439dd60708a266acd41195280e744affa89503cf WHIRLPOOL 266557e06851f22ceb6657054ab7aa74e1eccc3176b9df8823b8f8890753a1a7d5ad40757d2ec1bc12ed38f47c6bc9afd6b4d8ad4adfb01409a490a029d51789
+AUX audicle-1.0.0.7-hid-smc.patch 3181 SHA256 992f7792208a164c6f03c7748f75bced25537d35dbfdfb6ce50ad7a1395aba49 SHA512 8092d8de0fb6aea240e38c98a45218c002e78af0b1d7b285bca8d9d81ae77a76b15b0db57aaf42c70a65fd52c8ced89c0e31b22213654ba52ac3105f2a764ff5 WHIRLPOOL bce1d702d2f529c459182062d6de394fc2a0aa01e197b73037e4382ec9047c1fd0662513eeaa74ae359bc2e0f480d31430c3995ef55db4ee8ae6fcdf08854e4c
+DIST audicle-1.0.0.7.tgz 5561088 SHA256 72d739c887eb8af612e821bf0ede966a7a84254e1224290fd8acfb80fadb2514 SHA512 c96506620e22e1f7846288cb4f34dc7efe59e14d845425673524d0a89712ea7d3dabed546eb921220e021d4e8526937990a4f5764fbf2bb90339b993f6703772 WHIRLPOOL e14627f1a2be219782403388fde1385c185b654b5c90d10d31bd397a7bfdaa916f91503c41aa5f2ad385bbf0b3c685427fff15c659cb2049a7857971cd5a69d2
+EBUILD audicle-1.0.0.7-r1.ebuild 2440 SHA256 5632786fea99bec33bfad4babc67951c701a29985395363bdd5ccd4421be8bcb SHA512 519c7b158d1a3ac3c33a58cb782b4b02d49bdbba3a5e010d9f489a48a4928fb7d065e05a9a41c4a6361531b609cbc5d088e5f59d47505fb3662e47bec3e54159 WHIRLPOOL 582d9d04528d320491705dfed53af2ae1217d1a8564b1e2ef01741edd13c0234f493e973d60f981458a57b5669ff25e24ac0d240be16ecf95ec6dc18565b58b3
+MISC ChangeLog 3077 SHA256 b9ce187c85c74fda38c91a8038de63724b531b5a39d1e87e849ffc6d9fc6e09f SHA512 4bbf4f9f03e96b227a67aaf98886823d56509e2cb80d646506dd5ff3e0b0f65d39559f1732846a0a1e743a535a30bf406d8f70048855c3496e7a2db97a087eef WHIRLPOOL 95c32eccee746737a9cddfea21714ae27d49c88f253e597afa2196b7e599ad8149bb70c4b5bb640374991d60ce1878d8bbc2433dc579fef18b6803d890eaef06
+MISC ChangeLog-2015 2334 SHA256 e84611ca79ebba45f74c21d9bfb34b09f398be6020fc8cff345b250d02276334 SHA512 97e3206192f4a936b15dbf9866071bd54007358ae89d20a3c79e79317cfd603291e96e5b266abc2d8dd0b5e63755e456930414505b991a1897858f4d3ea963c8 WHIRLPOOL 411855115d7aa28f7b99cdaa887a76813a785a6f15e3ad8794e2427a41a0285caa496e09d8267fb38eb030f1260d32fbfc3fc5f400ab69b7a8b5c6533e9d8fb5
+MISC metadata.xml 386 SHA256 ac8f820a53cbee86cf3d2dcf3d4bcf7490dd750484579c02db639e7a14646928 SHA512 df4591da51216c3a5b15ef353db9b5666b7e5e4082f3e8214a596a9ab7a344c5e64178c437fe2d15b9f8b5eb1ace88e6ed800595f3b94ebb17c972fe91bed414 WHIRLPOOL b6db9824a4d5b0edf414380c9d1f900f80c5c6fcf0c5a3df1125136bc1e2e94921e743a32cfd022327305174b8891513a588f64057d434a202af86b345d068b4
diff --git a/media-sound/audicle/audicle-1.0.0.7-r1.ebuild b/media-sound/audicle/audicle-1.0.0.7-r1.ebuild
new file mode 100644
index 000000000000..b09d488baa5f
--- /dev/null
+++ b/media-sound/audicle/audicle-1.0.0.7-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="A Context-sensitive, On-the-fly Audio Programming Environ/mentality"
+HOMEPAGE="http://audicle.cs.princeton.edu/"
+SRC_URI="http://audicle.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack oss truetype"
+
+RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	media-libs/libsndfile
+	media-libs/freeglut
+	virtual/opengl
+	virtual/glu
+	x11-libs/gtk+:2
+	truetype? ( media-libs/ftgl
+		media-fonts/corefonts )
+	app-eselect/eselect-audicle"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( alsa jack oss )"
+
+DOCS=( AUTHORS PROGRAMMER README THANKS TODO VERSIONS )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0.6-font.patch"
+	"${FILESDIR}/${P}-hid-smc.patch"
+	"${FILESDIR}/${P}-gcc43.patch"
+	"${FILESDIR}/${P}-const.patch"
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	sed -i \
+		-e 's@../ftgl_lib/FTGL/include@/usr/include/FTGL@' \
+		-e 's@../ftgl_lib/FTGL/mac/build@/usr/lib@' \
+		-e 's/gcc -o/$(CC) -o/' \
+		-e 's/-O3 -c/-c $(CFLAGS)/' \
+		-e 's/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
+		src/makefile.{alsa,jack,oss} || die "sed failed"
+
+	epatch_user
+}
+
+compile_backend() {
+	local backend="$1"
+	local config
+	use truetype && config="USE_FREETYPE_LIBS=1"
+	einfo "Compiling against ${backend}"
+	cd "${S}/src"
+	emake -f "makefile.${backend}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" LEX=flex \
+		YACC=bison ${config}
+	mv audicle{,-${backend}}
+	emake -f makefile clean
+}
+
+src_compile() {
+	# when compile with athlon or athlon-xp flags
+	# audicle crashes on removing a shred with a double free or corruption
+	# it happens in Chuck_VM_Stack::shutdown() on the line
+	#   SAFE_DELETE_ARRAY( stack );
+	replace-cpu-flags athlon athlon-xp i686
+
+	use jack && compile_backend jack
+	use alsa && compile_backend alsa
+	use oss && compile_backend oss
+}
+
+src_install() {
+	use jack && dobin src/audicle-jack
+	use alsa && dobin src/audicle-alsa
+	use oss && dobin src/audicle-oss
+	dodoc ${DOCS[@]}
+}
+
+pkg_postinst() {
+	elog "Audicle now can use many audio engines, so you can specify audio engine"
+	elog "with audicle-{jack,alsa,oss}"
+	elog "Or you can use 'eselect audicle' to set the audio engine"
+
+	einfo "Calling eselect audicle update..."
+	eselect audicle update --if-unset
+}
diff --git a/media-sound/audicle/files/audicle-1.0.0.6-font.patch b/media-sound/audicle/files/audicle-1.0.0.6-font.patch
new file mode 100644
index 000000000000..9e2658df16c3
--- /dev/null
+++ b/media-sound/audicle/files/audicle-1.0.0.6-font.patch
@@ -0,0 +1,65 @@
+diff -ru audicle-1.0.0.6~/src/audicle_font.cpp audicle-1.0.0.6/src/audicle_font.cpp
+--- audicle-1.0.0.6~/src/audicle_font.cpp	2008-03-30 00:29:37.000000000 +0100
++++ audicle-1.0.0.6/src/audicle_font.cpp	2008-03-30 01:04:46.000000000 +0100
+@@ -201,13 +201,13 @@
+ #ifdef __PLATFORM_WIN32__
+ char fontpath[] = "C:\\WINDOWS\\FONTS\\";
+ #else
+-char fontpath[] = "/define/this/directory/";
++char fontpath[] = "/usr/share/fonts/corefonts/";
+ 
+ #endif
+ #endif
+ 
+-char kernedfontfile[] = "FTGL:verdana.TTF";
+-char monospacedfontfile[] = "FTGL:LUCON.TTF";
++char kernedfontfile[] = "FTGL:verdana.ttf";
++char monospacedfontfile[] = "FTGL:couri.ttf";
+ 
+ 
+ class AudicleFTGLFont : public AudicleFont { 
+@@ -301,13 +301,11 @@
+ #endif
+ 
+     // we should do a directory scan here...
+-    AudicleFont::available_fonts().push_back( "FTGL:ARIAL.TTF" );
+-    AudicleFont::available_fonts().push_back( "FTGL:ARIBLK.TTF" );
+-    AudicleFont::available_fonts().push_back( "FTGL:BYTE.TTF" );
+-    AudicleFont::available_fonts().push_back( "FTGL:COUR.TTF" );
+-    AudicleFont::available_fonts().push_back( "FTGL:LUCON.TTF" );
+-    AudicleFont::available_fonts().push_back( "FTGL:TIMES.TTF" );
+-    AudicleFont::available_fonts().push_back( "FTGL:verdana.TTF" );
++    AudicleFont::available_fonts().push_back( "FTGL:arial.ttf" );
++    AudicleFont::available_fonts().push_back( "FTGL:ariblk.ttf" );
++    AudicleFont::available_fonts().push_back( "FTGL:cour.ttf" );
++    AudicleFont::available_fonts().push_back( "FTGL:times.ttf" );
++    AudicleFont::available_fonts().push_back( "FTGL:verdana.ttf" );
+ 
+ }; 
+ 
+diff -ru audicle-1.0.0.6~/src/audicle_ui_base.cpp audicle-1.0.0.6/src/audicle_ui_base.cpp
+--- audicle-1.0.0.6~/src/audicle_ui_base.cpp	2008-03-30 00:29:37.000000000 +0100
++++ audicle-1.0.0.6/src/audicle_ui_base.cpp	2008-03-30 00:30:32.000000000 +0100
+@@ -47,8 +47,8 @@
+ void init_UI_Fonts() { 
+     if ( _ui_fonts_inited ) return;
+ #ifdef _USE_FTGL_FONTS_
+-    labelFont = AudicleFont::loadFont ( "FTGL:verdana.TTF" );
+-    labelFontMono = AudicleFont::loadFont ( "FTGL:LUCON.TTF" );
++    labelFont = AudicleFont::loadFont ( "FTGL:verdana.ttf" );
++    labelFontMono = AudicleFont::loadFont ( "FTGL:couri.ttf" );
+ #else
+     labelFont = AudicleFont::loadFont ( "OpenGL:variable" ); 
+     labelFontMono = AudicleFont::loadFont ( "OpenGL:variable" ); 
+diff -ru audicle-1.0.0.6~/src/audicle_ui_editor.cpp audicle-1.0.0.6/src/audicle_ui_editor.cpp
+--- audicle-1.0.0.6~/src/audicle_ui_editor.cpp	2008-03-30 00:29:37.000000000 +0100
++++ audicle-1.0.0.6/src/audicle_ui_editor.cpp	2008-03-30 00:30:32.000000000 +0100
+@@ -46,7 +46,7 @@
+ 
+ void init_Buffer_Font() { 
+ #ifdef _USE_FTGL_FONTS_
+-    bufferFont = AudicleFont::loadFont ( "FTGL:LUCON.TTF" );
++    bufferFont = AudicleFont::loadFont ( "FTGL:couri.ttf" );
+ #else
+     bufferFont = AudicleFont::loadFont ( "OpenGL:mono" );
+ #endif
diff --git a/media-sound/audicle/files/audicle-1.0.0.7-const.patch b/media-sound/audicle/files/audicle-1.0.0.7-const.patch
new file mode 100644
index 000000000000..38acbf2f2ede
--- /dev/null
+++ b/media-sound/audicle/files/audicle-1.0.0.7-const.patch
@@ -0,0 +1,12 @@
+diff -ru audicle-1.0.0.7.orig//src/audicle_font.cpp audicle-1.0.0.7/src/audicle_font.cpp
+--- audicle-1.0.0.7.orig//src/audicle_font.cpp	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/src/audicle_font.cpp	2012-03-17 10:49:24.000000000 +0100
+@@ -215,7 +215,7 @@
+ protected :
+     FTFont * m_font;
+ public: 
+-    AudicleFTGLFont( char * name ) { 
++    AudicleFTGLFont( const char * name ) { 
+         
+         glEnable ( GL_TEXTURE_2D );
+         
diff --git a/media-sound/audicle/files/audicle-1.0.0.7-gcc43.patch b/media-sound/audicle/files/audicle-1.0.0.7-gcc43.patch
new file mode 100644
index 000000000000..f6fc08e7da47
--- /dev/null
+++ b/media-sound/audicle/files/audicle-1.0.0.7-gcc43.patch
@@ -0,0 +1,68 @@
+diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/chuck_vm.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/chuck_vm.cpp
+--- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/chuck_vm.cpp	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/chuck_vm.cpp	2012-03-17 10:27:23.000000000 +0100
+@@ -48,6 +48,7 @@
+ #else
+   #include <unistd.h>
+   #include <pthread.h>
++  #include <algorithm>
+ #endif
+ 
+ 
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: chuck_vm.cpp.orig
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: rtaudio.cpp.orig
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: rtaudio.cpp.rej
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_stk.cpp.orig
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_stk.cpp.rej
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_xxx.cpp.orig
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: ugen_xxx.cpp.rej
+diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp
+--- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:27:23.000000000 +0100
+@@ -38,6 +38,7 @@
+ #include <limits.h>
+ #include <vector>
+ #include <map>
++#include <climits>
+ 
+ using namespace std;
+ 
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: util_hid.cpp.orig
+diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_opsc.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_opsc.cpp
+--- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_opsc.cpp	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_opsc.cpp	2012-03-17 10:27:23.000000000 +0100
+@@ -57,6 +57,7 @@
+ #include <netinet/tcp.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <algorithm>
+ #endif
+ 
+ #if defined(__MACOSX_CORE__)
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: util_opsc.cpp.orig
+diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_string.h audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_string.h
+--- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_string.h	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_string.h	2012-03-17 10:27:23.000000000 +0100
+@@ -36,6 +36,7 @@
+ #include "chuck_def.h"
+ #include <string>
+ #include <vector>
++#include <cstdio>
+ 
+ 
+ // itoa
+diff -ru audicle-1.0.0.7.orig//src/audicle_def.h audicle-1.0.0.7/src/audicle_def.h
+--- audicle-1.0.0.7.orig//src/audicle_def.h	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/src/audicle_def.h	2012-03-17 10:28:40.000000000 +0100
+@@ -39,8 +39,9 @@
+ 
+ #include "chuck_def.h"
+ 
+-#include <stdio.h>
+-#include <math.h>
++#include <cstdio>
++#include <cmath>
++#include <algorithm>
+ #include <assert.h>
+ #ifndef __PLATFORM_WIN32__
+   #include <unistd.h>
diff --git a/media-sound/audicle/files/audicle-1.0.0.7-hid-smc.patch b/media-sound/audicle/files/audicle-1.0.0.7-hid-smc.patch
new file mode 100644
index 000000000000..d362ed06423a
--- /dev/null
+++ b/media-sound/audicle/files/audicle-1.0.0.7-hid-smc.patch
@@ -0,0 +1,149 @@
+diff -ru audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp
+--- audicle-1.0.0.7.orig//lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:23:39.000000000 +0100
++++ audicle-1.0.0.7/lang/chuck-1.2.1.3/src/util_hid.cpp	2012-03-17 10:25:03.000000000 +0100
+@@ -7392,14 +7392,139 @@
+ int WiiRemote_send( const HidMsg * msg ){ return -1; }
+ const char * WiiRemote_name( int wr ){ return NULL; }
+ 
++#define SYSFS_TILTSENSOR_FILE "/sys/devices/platform/applesmc/position"
++#define TILTSENSOR_BUF_LEN 32
++
++static struct t_TiltSensor_data
++{
++	union
++	{
++		struct t_macbook
++		{
++			int x;
++			int y;
++			int z;
++		} macbook;
++	} data;
++	int dataType;
++	int detected;
++	int refcount;
++
++	t_TiltSensor_data()
++	{
++		refcount = 0;
++		dataType = -1;
++		detected = 0;
++	}
++
++} TiltSensor_data;
++enum
++{
++	linuxAppleSMCMacBookDataType
++};
++static int TiltSensor_detect()
++{
++	int fd;
++
++	fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
++
++	if (fd > 0)
++	{
++		TiltSensor_data.dataType = linuxAppleSMCMacBookDataType;
++		TiltSensor_data.detected = 1;
++		close(fd);
++		return 1;
++	}
++
++	TiltSensor_data.detected = -1;
++
++	return 0;
++}
++
++static int TiltSensor_do_read()
++{
++
++	switch(TiltSensor_data.dataType)
++	{
++		case linuxAppleSMCMacBookDataType:
++			char buf[TILTSENSOR_BUF_LEN];
++			int ret, fd;
++			fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
++
++			if (fd < 0) {
++				return -1;
++			}
++			ret = read(fd, buf, TILTSENSOR_BUF_LEN);
++			if (ret < 0) {
++				close(fd);
++				return -1;
++			}
++			if (sscanf(buf, "(%d,%d,%d)\n", &TiltSensor_data.data.macbook.x, &TiltSensor_data.data.macbook.y, &TiltSensor_data.data.macbook.z) != 3) {
++				close(fd);
++				return -1;
++			}
++			close(fd);
++			break;
++		default:
++			return 0;
++	}
++	return 1;
++}
+ void TiltSensor_init(){}
+ void TiltSensor_quit(){}
+ void TiltSensor_probe(){}
+-int TiltSensor_count(){ return 0; }
+-int TiltSensor_open( int ts ){ return -1; }
+-int TiltSensor_close( int ts ){ return -1; }
+-int TiltSensor_read( int ts, int type, int num, HidMsg * msg ){ return -1; }
+-const char * TiltSensor_name( int ts ){ return NULL; }
++int TiltSensor_count()
++{
++	if(TiltSensor_data.detected == 0)
++		TiltSensor_detect();
++
++	if(TiltSensor_data.detected == -1)
++		return 0;
++	else if(TiltSensor_data.detected == 1)
++		return 1;
++
++	return 0;
++}
++int TiltSensor_open( int ts )
++{
++	if(TiltSensor_data.detected == 0)
++		TiltSensor_detect();
++
++	if(TiltSensor_data.detected == -1)
++		return -1;
++
++	TiltSensor_data.refcount++;
++
++	return 0;
++}
++int TiltSensor_close( int ts )
++{
++	TiltSensor_data.refcount--;
++
++	return 0;
++}
++int TiltSensor_read( int ts, int type, int num, HidMsg * msg )
++{
++
++	if(TiltSensor_data.detected == -1)
++		return -1;
++
++	if(!TiltSensor_do_read())
++		return -1;
++
++	if(TiltSensor_data.dataType == linuxAppleSMCMacBookDataType)
++	{
++		msg->idata[0] = TiltSensor_data.data.macbook.x;
++		msg->idata[1] = TiltSensor_data.data.macbook.y;
++		msg->idata[2] = TiltSensor_data.data.macbook.z;
++	}
++
++	return 0;
++}
++const char * TiltSensor_name( int ts )
++{
++	return "Apple Sudden Motion Sensor";
++}
+ 
+ 
+ #endif
+Only in audicle-1.0.0.7/lang/chuck-1.2.1.3/src: util_hid.cpp.orig
diff --git a/media-sound/audicle/metadata.xml b/media-sound/audicle/metadata.xml
new file mode 100644
index 000000000000..69313e7770a3
--- /dev/null
+++ b/media-sound/audicle/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		a potentially new type of audio programming environment that integrates
+		the programmability of the development environment with elements of the
+		runtime environment
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/audiocompress/Manifest b/media-sound/audiocompress/Manifest
new file mode 100644
index 000000000000..86f77346a55a
--- /dev/null
+++ b/media-sound/audiocompress/Manifest
@@ -0,0 +1,5 @@
+DIST AudioCompress-2.0.tar.gz 15752 SHA256 90886ee8a996e720764f01e2640f11cd4bedda18a3aab5a95d298b6f69b789fc SHA512 4ff900510f3f1c1c2f0cc3e5465ddeb3d72306faddfce452c2353c7233f64feff8fe9f5f0726e25a7300b6f016aeda56d61624f6e33af6bfafbbb955726c94bf WHIRLPOOL 51b3e3def5e41b46eed424bda2b3cffcf8c7b0c1b0ff10a32eeaea3fc167759f136b2d93f91c36f84e88d2116e16c9a6b37ae4b3c18b889f8da0e9f5576953bd
+EBUILD audiocompress-2.0.ebuild 676 SHA256 8aa67ec88e4b90320a3149b4859b991f4f8174701a6712db965a5c5052bf8f53 SHA512 c3fc3f63ef17738aff0c798432ca78aaee4f86856e89c621ff011f742d075c398bcff8ddcb8ed3b625077674aeb6902f463941d9938efa7c5ab56bacc8c386be WHIRLPOOL 5f025c22503ba9237765c6df2edc42bd1b9512354c514f3034eca78800de8023e76281c998ba2a6ab09e0af9015565302e7e5aba41e96cf29ed413bb7dfc2011
+MISC ChangeLog 2444 SHA256 4382897bec656170076bf6b82ff094cbf75c2155372a864324fbd2ecd4f8fd73 SHA512 77d2b47431392cfd939938bc82266640b016eec0f76dbad3b9a9a16199edb1e2e205f8dd4337f2bab2797476fbbbc507a9e9702d36778e5f15fae854152af875 WHIRLPOOL ff99b2ca993461db127c485a573c11cd6d8098e2ec859dfab50755cea9918c616eeec2e333bed2a39dbb1db9cfdd7c7a2ffd910f28e0efbeb9b90b5fba2f01ac
+MISC ChangeLog-2015 3007 SHA256 d7c488b860a3aeb7973eeaac2255825ac8cc5ffa12a55d49d717d0d0202e065d SHA512 13894b55cabb606537e1990d52bbb5f46ea4902eb499e3dc922b295b2c917330ca5a78ef2708fdebbeda8c643d7b05c58c8b32993f03495fc1e3f594c313b682 WHIRLPOOL 6d2ef643847461e1f763d437f21277be2ef7e533ca5f207f7e1843f704ad4522e1066164d5feafc7a386f95f7551a563305dc72e9a1d754f0477573e83dd7443
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/audiocompress/audiocompress-2.0.ebuild b/media-sound/audiocompress/audiocompress-2.0.ebuild
new file mode 100644
index 000000000000..afd6ed3bb397
--- /dev/null
+++ b/media-sound/audiocompress/audiocompress-2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+MY_P=AudioCompress-${PV}
+
+DESCRIPTION="Very gentle 1-band dynamic range compressor"
+HOMEPAGE="https://beesbuzz.biz/code/audiocompress.php"
+SRC_URI="https://beesbuzz.biz/code/audiocompress/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	emake \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" || die "emake failed"
+}
+
+src_install() {
+	dobin AudioCompress || die "dobin failed"
+	dodoc ChangeLog README TODO
+}
diff --git a/media-sound/audiocompress/metadata.xml b/media-sound/audiocompress/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/audiocompress/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/audiotag/Manifest b/media-sound/audiotag/Manifest
new file mode 100644
index 000000000000..67459686908f
--- /dev/null
+++ b/media-sound/audiotag/Manifest
@@ -0,0 +1,5 @@
+DIST audiotag-0.19.tar.bz2 15016 SHA256 7b6a2de751058a95755f0842b83f2b1d8b94e5cd7634cbe71d67257208bf4646 SHA512 a2e117deb78c3141ca1e17a12ee17033eb762fee822187d8aa708715ee4077b120ea2f7acf09d683d9dd292c0826e1152d09286830976b65d08738ced9a0529e WHIRLPOOL f27aaec64232ccdb8920e5ec9eb747a3bbfd828328deae697ed83af5fc39d7dc73ffc5c0639f136e05000acd00a3f4b89e79dbd8f16b0db648a463cc1e4bf8b0
+EBUILD audiotag-0.19.ebuild 651 SHA256 e3dff272b0bd90388778c8160c7369b8060ddc7dbb9f9a8e84ef4e805b8207b1 SHA512 fadfa81760a136dcc73f213b5361d2158feb4d7d0926805a0eccf165f3499e0578d3b6ac43a9a521bbd97aec129511367549c79ed53ecbde2704e81283486385 WHIRLPOOL 3a0b2135378b8838f66c81fdd1c28b4c2212f7b800065a15df1e4b89daf624243690443a1f9f57d5275e981af405881218babce42857a85764e8a5ba58512a63
+MISC ChangeLog 2574 SHA256 78fe92f8fcbe6aa94684856a09d8c80d891e967d5b82b63f3a2bd50999f39e4f SHA512 e421bce6a62fb9b805915eb77fa355c9541b1636bc20b81f89361f1da3b0b8940e7025e1fce11cf0c105646fd9b214a34b990132378b6ca0d8bd66e12ab943a3 WHIRLPOOL 769fbd5bf3596f4012b8c3695bc28f01e0affa6043b38897a6a979abe5639f49e106c0a269abcd41d3468c34362b0c8b9db839bd3b7d9abd7abcbd90a8136728
+MISC ChangeLog-2015 3961 SHA256 824fe8286d8259a553826b697963ecda56e0e5c774578ee658d7d695926cad10 SHA512 5d541bf678fb4fca067c21cc20cbb87badea3aede6106b868727984e8d098785b0e4ead942863d58ae5977bd4754392d5d925e5df8c5777dd1e6cf8ee449d9f6 WHIRLPOOL 0af42dc27a94b45bd062b9220e778403a4909dbdee2938d554f7b43e641f9b0081c0c1b13e43fb9ece4630616056ccab16c30c5f1f58dd8e42304d47c2060406
+MISC metadata.xml 335 SHA256 121aef19f111ebd412782b83da295454e2f43dd1cc8ad6f486136a33303484f2 SHA512 6652048b2ed7c99882375c57521d9a2a75cd07a8a54ef88ba351f93212e4cfc42a5eca93572b0ef956696d0fae61a741957b146ae048f5a954b0a0954486507a WHIRLPOOL 4fadfa91d8fdb6d5ddbe2f7eef380e5f9c8fd26df4acbdc149747a337bc6ff71f1339909b69c2910a3e1a06cec8601d17e8162abc8ec1b088c9abf85a0f8661c
diff --git a/media-sound/audiotag/audiotag-0.19.ebuild b/media-sound/audiotag/audiotag-0.19.ebuild
new file mode 100644
index 000000000000..8d725acf484e
--- /dev/null
+++ b/media-sound/audiotag/audiotag-0.19.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="A command-line tool for mass tagging/renaming of audio files"
+HOMEPAGE="https://github.com/Daenyth/audiotag"
+SRC_URI="https://github.com/downloads/Daenyth/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
+IUSE="aac flac mp3 vorbis"
+
+RDEPEND="dev-lang/perl
+	flac? ( media-libs/flac )
+	vorbis? ( media-sound/vorbis-tools )
+	mp3? ( media-libs/id3lib )
+	aac? ( || ( media-video/atomicparsley media-video/atomicparsley-wez ) )"
+DEPEND=""
+
+src_install() {
+	dobin ${PN} || die
+	dodoc ChangeLog README
+}
diff --git a/media-sound/audiotag/metadata.xml b/media-sound/audiotag/metadata.xml
new file mode 100644
index 000000000000..1992c4416bdf
--- /dev/null
+++ b/media-sound/audiotag/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">downloads/Daenyth</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
new file mode 100644
index 000000000000..3dc4e1df5058
--- /dev/null
+++ b/media-sound/aumix/Manifest
@@ -0,0 +1,6 @@
+AUX aumix.rc6 1037 SHA256 ba8734c5980b12b724dcd12900bf945d741f00e85e4cba8764333ded7cce42c3 SHA512 8960c6c5e61e15e981bfafff7b03aded627971c11d6c21ce9e0d953737f440885fb5dda6a9f942112697c344b4f3ad9f222e2a7cfa493a504dc75a8f4c8cf1c9 WHIRLPOOL a1d9eed275ac45a584235da2ef5418be121db72ee98875d708b77eb345be969b315835a652055c90d6e8c91b96fc557cab3ba989a4bb17fc418383ff82088344
+DIST aumix-2.9.1.tar.bz2 231622 SHA256 d2ce43d532ef75072c8d4e7922e3bc06be6d97765a508d9ceb0d1766bbe70e29 SHA512 bd063dc9dab8455f467fbe9e4ea1baa5cef914923e66ab5a8fca1e6964cac7851e3755f054bfe41657371e221920fe9a52f9807457996244f4bcd5db4659b21d WHIRLPOOL 7a78d8eeb0da49be924c6a71ac5ae6480380f2a6cf6244920dcd260f8605cf0d5a319eb300ab54d71afcdecfd1c197b53b0be8e8b3c2df63161137bc9fbdddd0
+EBUILD aumix-2.9.1.ebuild 995 SHA256 509e6c7370213cba88b0474f01ae7eca7ab94717266e1b16a64e761e2c534a39 SHA512 fa10366e6e09a6c6da69786417a6661f222bc99772033c12050343aba5fb07d26d5882ff03c5512037e5f982f0c417478aaecc63886203d621b70619e666ac86 WHIRLPOOL dd2471d4020310f6fd0e016c73c68fffede725740394ffbb7bac0948e9372dbbff37a6b6f0517418602b32bc0284f4beb21e4e45aa45ec9b67ac41ec1477f3b8
+MISC ChangeLog 2568 SHA256 722e24d5c87bee97aad1e150498516a85c354f62be6f076cac11155970fc4271 SHA512 e7cea1cf77693c4f2da494b218fc18e26dc67ce9ad3c9c3623a5a21c9e9402d3cf1bb67f23bcc36b6c4859d0b8dcb67e310dbf8773b92bc990f679a5a4e3724c WHIRLPOOL 24274a889cf4c0e51fc44705a7ca5a612f17218cd9b8a138bf4fa2f50f4b44ba454ed7bb0bcd83d8d4fed8fab23d3ad813d37576d27f40a9099858f46d1b3de8
+MISC ChangeLog-2015 9089 SHA256 7515429507b2aa6772b06c8c767dff23e82a19c88566d2a4727e9865838f808a SHA512 8c6f44e95df38c31af694548463a6403bfccba41bf3e8fdadf9634639c9bd9910cdf690093be1b696f133b672f4392a45675f2d80ccb988bfb84e9a5b419da91 WHIRLPOOL 1cc6d5af093300b6d20b42dd755194878440c5a12e56063efbd96ffd1af225eb173696ba1530e612e1a5d607ff18eb6ff8c20f8f2ea112793cd2f32b84d80335
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/aumix/aumix-2.9.1.ebuild b/media-sound/aumix/aumix-2.9.1.ebuild
new file mode 100644
index 000000000000..08f14da30e30
--- /dev/null
+++ b/media-sound/aumix/aumix-2.9.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Aumix volume/mixer control program"
+HOMEPAGE="http://jpj.net/~trevor/aumix.html"
+SRC_URI="http://jpj.net/~trevor/aumix/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
+IUSE="gpm gtk nls"
+
+RDEPEND="sys-libs/ncurses
+	gpm? ( sys-libs/gpm )
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	local myconf
+
+	use gtk || myconf="${myconf} --without-gtk"
+	use gpm || myconf="${myconf} --without-gpm"
+
+	econf \
+		$(use_enable nls) \
+		--disable-dependency-tracking \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+
+	newinitd "${FILESDIR}"/aumix.rc6 aumix
+
+	if use gtk; then
+		doicon data/aumix.xpm
+		make_desktop_entry aumix Aumix
+	fi
+}
diff --git a/media-sound/aumix/files/aumix.rc6 b/media-sound/aumix/files/aumix.rc6
new file mode 100644
index 000000000000..26634b6dff26
--- /dev/null
+++ b/media-sound/aumix/files/aumix.rc6
@@ -0,0 +1,41 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use modules hotplug coldplug alsasound
+}
+
+checkconfig() {
+	if ! grep -q -E 'sound|OSS|sparcaudio' /proc/devices && [ ! -d /proc/asound ] ; then
+		eerror "Sound support has not been compiled into the kernel,"
+		eerror "or is disabled.  Please check that the correct modules"
+		eerror "is loaded."
+		return 1
+	fi
+	# /dev/mixer can be a symlink
+	if [ ! -e /dev/mixer ] ; then
+		eerror "/dev/mixer does not exist, please create it, or load the"
+		eerror "correct modules to enable your card's mixer"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	if [ -f /etc/aumixrc ] ; then
+		ebegin "Loading Mixer settings"
+		/usr/bin/aumix -f /etc/aumixrc -L >/dev/null 2>&1
+	else
+		ebegin "Setting Mixer settings"
+		/usr/bin/aumix -v75 -c75 -w75 >/dev/null 2>&1
+	fi
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+	ebegin "Saving Mixer settings"
+	/usr/bin/aumix -f /etc/aumixrc -S >/dev/null 2>&1
+	eend $?
+}
diff --git a/media-sound/aumix/metadata.xml b/media-sound/aumix/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/aumix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/awesfx/Manifest b/media-sound/awesfx/Manifest
new file mode 100644
index 000000000000..48c6ff96f53f
--- /dev/null
+++ b/media-sound/awesfx/Manifest
@@ -0,0 +1,9 @@
+AUX sfxload.confd 165 SHA256 b0344444973ee0fee09353148aed2d7c87632c44f3116793eaa7e64244c9dfce SHA512 9725e28b10f512e6e8e3cf121f8d442b3f0148795e676760b434a02c9a4e19945915fd93d6fa012448f041d17819d32b38445a0946819e398647bfd5ce31c38e WHIRLPOOL e93bc9b0b022910c18ce2948eb72d3a06d451eb17b1a4f60cd46e167815bdca336e7c769a06b371bd84fe5ca14a9799bc68a7606d9dbd39ae328d13e9f7dc310
+AUX sfxload.initd 398 SHA256 0ec88b9048f18ea61c4b9829dc3c2be7e632e00c4ae36cb2eed7cabc3bb8dc20 SHA512 dd3522d112a0efefa1786ce37b9f9be3ee07eb50b0a618d7adb386ff007d9e9e907dcd9e184ed5122118723d702caeadc190018f0af5ad393c931eb0a549f31c WHIRLPOOL cbdb1e95ed704eedca9a1a9d2fae889a051d34c2829395c7d66fa2ab44d17adce0bdeb52cf160eb0f9f404f6e31cd52957dde7720db128e813079f3980dd82fd
+DIST awesfx-0.5.1d.tar.bz2 282981 SHA256 4d5e57f18d9b353b08cdbd6bd4277843f14efb1a6175344bb1f7e64384a65a61 SHA512 50cd27ca4da8bd38fd11fcdbb2eb8806ea8956c834433c92cb094e0a6ee143175ba85be4665431527133abf8430e6fb60eb69ee35b0afed81d11db517cbb3758 WHIRLPOOL 0d5ee63384343bf1182b5797b35ddbc679d5cb95388b77680e509e2cb005ca25605c8955ba4e260e676f5b3809e0c2497f9c7113e487c70d0f309b6326a34217
+DIST awesfx-0.5.1e.tar.bz2 307929 SHA256 27a9b0090474ff9a0a6fb3ceb95422e9e36ecb3cf4dbf1b6720aa486e8c7f812 SHA512 f70e631b6ab6ec6dcbde7773c1da5cba72763d2198c2ac51f4bde0fee80f057f296cabc915aed805e744f7b2323b4e2b20b6d894c79cf5682457a3fc6a9be11d WHIRLPOOL abe1716f42aca14ffd92d99fe774c0561290aef10cbf44802ef4cddd2ce116d9551a96bbf6b81d99256c6719afc5e5ecb5cc08f1a6974f3eabbe58a5b53f9b96
+EBUILD awesfx-0.5.1d.ebuild 874 SHA256 8223713a3922fcdd687f5bc9865ce1f897ba9583a4f865b6f2a7d332d57acb7a SHA512 2a784d392ec1da69b4ae90a19db5f1629dbe253671b13345e33f3b2afdf325d49238b3c24a89fb9892b2aff8fb62c344ad82d9f7df705cc8570ab34a4b0d763e WHIRLPOOL 18da0614db2e8e1ccd96913508761fa48cdb41081f23f3e96fd6401c9effc7c12fa5cf566c8c4cfb7819642588d0cdafdef92c571f119ce0342ccef9ddd3cc59
+EBUILD awesfx-0.5.1e.ebuild 876 SHA256 df89e8744379d8b0dd4ff5e4ead594807c640efc06ffcdf59c372e47d7c78ed4 SHA512 83042eac3b1eec2ea42ad65095dcdcbb9cd876b0d820ef049d9e8c0b879d845d4e60a184cc84640a5d0b9ec52db68a9465498b3777f9ce2c51bc6ce113bd8535 WHIRLPOOL b79958907c1c3dff9463b75186a647d4e49bfe3d9d59e313627b7a2fff0bcb3bb654aaced6093b403b50c4d0c65dc86525ef723e4ff8e6e6c9ed17ff8af8540a
+MISC ChangeLog 2657 SHA256 2e78bb238c28ce009889f985431c8ab02bcdb17e10a096eda600f4a77c58c69f SHA512 1a267d8ddbfd77b683332c8da65136cc3e4e528d2fe9bd18be3f622b28a70bd7bb02530af093f4196e69b4ac7e65e8c1d82ee07bf7f6e220002c15c948b59f6f WHIRLPOOL b8ca78a3eb0d60151a07d7d2e733695134b718d0ba31d5901c079cae46c4e49cb0cbef98af96ec3d3934d2eb721d168672160acf104625009c7528f950aa3d53
+MISC ChangeLog-2015 5530 SHA256 e5714001cd53e7d04b63e3375e7e3a7a6eca3fbe611b8e54f065dee466cf38a9 SHA512 bd9ac2baac3db72a54bd91e5728bacc3dfedcc3b44a50203b908bfe281ec5d0bb2a9df1544df87d4cc393ebfe33d081e973f853ee14950fae47de4c7280f65b8 WHIRLPOOL 9ad3c57f75b68f2c980c9a904eaab2860777f435a6c86ad06ae38553a6f81e6f365da4f03b0cc6ef18a8ee7173d2cba82ec0c09f66ed1df1d7b543341f1ee56f
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/awesfx/awesfx-0.5.1d.ebuild b/media-sound/awesfx/awesfx-0.5.1d.ebuild
new file mode 100644
index 000000000000..c0150488b671
--- /dev/null
+++ b/media-sound/awesfx/awesfx-0.5.1d.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="AWE32 Sound Driver Utility Programs"
+HOMEPAGE="http://ftp.suse.com/pub/people/tiwai/awesfx"
+SRC_URI="http://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib"
+DEPEND="${RDEPEND}"
+
+BANK_LOC="${EPREFIX}/usr/share/sounds/sf2"
+
+DOCS=( AUTHORS ChangeLog README SBKtoSF2.txt samples/README-bank )
+
+src_configure() {
+	econf \
+		--with-sfpath=${BANK_LOC}
+}
+
+src_install() {
+	default
+
+	rm -f "${ED}"/usr/share/sounds/sf2/README-bank
+	newinitd "${FILESDIR}"/sfxload.initd sfxload
+	newconfd "${FILESDIR}"/sfxload.confd sfxload
+}
+
+pkg_postinst() {
+	elog "Copy your SoundFont files from the original CDROM"
+	elog "shipped with your soundcard to ${BANK_LOC}."
+}
diff --git a/media-sound/awesfx/awesfx-0.5.1e.ebuild b/media-sound/awesfx/awesfx-0.5.1e.ebuild
new file mode 100644
index 000000000000..1c993f919762
--- /dev/null
+++ b/media-sound/awesfx/awesfx-0.5.1e.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="AWE32 Sound Driver Utility Programs"
+HOMEPAGE="http://ftp.suse.com/pub/people/tiwai/awesfx"
+SRC_URI="http://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib"
+DEPEND="${RDEPEND}"
+
+BANK_LOC="${EPREFIX}/usr/share/sounds/sf2"
+
+DOCS=( AUTHORS ChangeLog README SBKtoSF2.txt samples/README-bank )
+
+src_configure() {
+	econf \
+		--with-sfpath=${BANK_LOC}
+}
+
+src_install() {
+	default
+
+	rm -f "${ED}"/usr/share/sounds/sf2/README-bank
+	newinitd "${FILESDIR}"/sfxload.initd sfxload
+	newconfd "${FILESDIR}"/sfxload.confd sfxload
+}
+
+pkg_postinst() {
+	elog "Copy your SoundFont files from the original CDROM"
+	elog "shipped with your soundcard to ${BANK_LOC}."
+}
diff --git a/media-sound/awesfx/files/sfxload.confd b/media-sound/awesfx/files/sfxload.confd
new file mode 100644
index 000000000000..e44815a7c71b
--- /dev/null
+++ b/media-sound/awesfx/files/sfxload.confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/sfxload
+
+# sfxload or asfxload
+sfxload="asfxload"
+
+# Example location of sound bank for sfxload init script
+sfxbank="/usr/share/sounds/sf2/foobar.bin"
diff --git a/media-sound/awesfx/files/sfxload.initd b/media-sound/awesfx/files/sfxload.initd
new file mode 100644
index 000000000000..852e45c8a4fd
--- /dev/null
+++ b/media-sound/awesfx/files/sfxload.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need alsasound
+}
+
+start() {
+	ebegin "Loading sound font bank"
+	${sfxload} -q "${sfxbank}"
+	eend $? "Error at loading sound font bank ${sfxbank}"
+}
+
+stop() {
+	ebegin "Unloading sound font bank"
+	${sfxload} -i -q
+	eend $? "Error at unloading sound font bank"
+}
diff --git a/media-sound/awesfx/metadata.xml b/media-sound/awesfx/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/awesfx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/aylet/Manifest b/media-sound/aylet/Manifest
new file mode 100644
index 000000000000..997765b145b0
--- /dev/null
+++ b/media-sound/aylet/Manifest
@@ -0,0 +1,6 @@
+AUX aylet-0.5-gtk.patch 7850 SHA256 a7fbada3868c038c55969773e19f7b386192a3ec2efc682a478a34251619bffb SHA512 e35bcdf111e5b819cd286e22d30bd45522fb3672de1fd841aa3dee7b0556927a912f17ab84bcad21a765bcda452ca20621a60e165db7ac38a9dff209953acf88 WHIRLPOOL 30cca5ecb1373bc13fa598b53cfeb7249bf2e2f08826dfb046d2bda346d0b32296588bb1a26e39ab5f91608f607634322a63604fc13d86e7e7f63ce9a3a20dcf
+DIST aylet-0.5.tar.gz 43577 SHA256 c8c428a63abe5087b0345709a9a8034c2e6873b6071d9f7b05578aae0f3a4f72 SHA512 9f45982bdd18f4b9d001cd8681132b89a8fa379fd4f64131d00c749975308e9d9f7fb29c196448c60d07273f36295d9b85093a542a0993c184dec411c7fbb7f7 WHIRLPOOL 16897b4b4645d935c88b20db30c29b47a36f21d6afe3941b0ddc6ac59b2f08b18a558c9f3f291ba14bb1e0fa4dfbf3fe8d5820ddd8e8f19dee2a455f19ecee97
+EBUILD aylet-0.5.ebuild 848 SHA256 4708f1d09f9afdb6bc6c95d4cd49083ebfa45b38cf951fb3f2603c7c02b2068d SHA512 f9d914e92ce725f8615b039e2827838dd5d6f8a4a1de3e3316b863dd541ba013dabe025f9c36c90eee018beafec470d0facbe668790f5346cce87b93423bd467 WHIRLPOOL a80efb9d2b92d8412805cf40dee1a7815f2fa7c622fdac8ba23270a2c0947e99e9753755115e58393f5accb84409f434c4ac9c786d9b2f6b08b6511a84917c19
+MISC ChangeLog 2448 SHA256 ba2d63dae7af982f9c3653b61ef57aa8b44e0e3641d282cdc3d6b4adacedff9c SHA512 f934ca47c2fbb460d37e5f6eff8957b2551c3fe72bb913e2fd2e69afa3f55b412b12416697bddf1964031ae819d707dec298a54c82f62059652ba14ea8e6b841 WHIRLPOOL 016066aa3a0ce9beb5ec46dc5ca6ccde27609c59dd1cd62864bd3a65f85194c1117a6cef5a766d910422fa319c98e49140073082bfd8869df0832e4e67d077c9
+MISC ChangeLog-2015 2453 SHA256 80f9cec75e8346e4a610e7aaefdc8435495ca05ba4b4fbe0a7541b9fb3513d3e SHA512 04a452f92c638e9226dad349b02b17a6486bc566c4f7803ef74c0cd1bfeacaf0278736baa440c58f70ff1d4711ca46daa6cf13c053696c2d8fb67bfd005b36af WHIRLPOOL c0cf671459c8511e50b61ac1618d91f4c17e43579ac18bbf8fa19d3b88e18b40c109f911dbb78bef517219b3c87831c9c6ab147f2f14535f8f7ac39994bed3ff
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/aylet/aylet-0.5.ebuild b/media-sound/aylet/aylet-0.5.ebuild
new file mode 100644
index 000000000000..05c703dca0f4
--- /dev/null
+++ b/media-sound/aylet/aylet-0.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Aylet plays music files in the .ay format"
+HOMEPAGE="http://rus.members.beeb.net/aylet.html"
+SRC_URI="http://ftp.ibiblio.org/pub/Linux/apps/sound/players/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE="gtk"
+
+RDEPEND="sys-libs/ncurses
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gtk.patch
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+
+	emake ${PN} CURSES_LIB="$( ${PKG_CONFIG} --libs ncurses)"
+	use gtk && emake gtk2
+}
+
+src_install() {
+	dobin ${PN}
+	use gtk && dobin x${PN}
+
+	doman ${PN}.1
+	use gtk && echo '.so aylet.1' > "${D}"/usr/share/man/man1/xaylet.1
+
+	dodoc ChangeLog NEWS README TODO
+}
diff --git a/media-sound/aylet/files/aylet-0.5-gtk.patch b/media-sound/aylet/files/aylet-0.5-gtk.patch
new file mode 100644
index 000000000000..ddd701d1df7e
--- /dev/null
+++ b/media-sound/aylet/files/aylet-0.5-gtk.patch
@@ -0,0 +1,250 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,12 +2,12 @@
+ 
+ # You need an ANSI C compiler. gcc is probably best.
+ #
+-CC=gcc
++CC?=gcc
+ 
+ # Compiler options (and sound driver) to use. This one is for Linux,
+ # and other OSS-using systems.
+ #
+-CFLAGS=-O -Wall -DDRIVER_OSS
++CFLAGS+=-Wall -DDRIVER_OSS
+ 
+ # for OpenBSD, uncomment this:
+ #CFLAGS=-O -Wall -DDRIVER_OPENBSD
+@@ -39,14 +39,29 @@
+ 
+ all: aylet xaylet
+ 
++
++# GTK+1.2 stuff: "make all" or "make gtk1"
++GTKCONFIG=gtk-config
++GTKFLAGS=-UGTK2
++gtk1: all
++
++# GTK+2 stuff: "make gtk2"
++gtk2: GTKCONFIG:=$(PKG_CONFIG) gtk+-2.0
++gtk2: GTKFLAGS:=-DGTK2 $(shell \
++			 $(GTKCONFIG) --modversion | \
++			 awk 'BEGIN { FS="." } \
++			      1 { if ($$1 > 2 || ($$1 == 2 && $$2 >= 6)) \
++				  { print "-DGTK2_6" } }')
++gtk2: all
++
+ aylet: $(OBJS)
+-	$(CC) -o aylet $(OBJS) $(CURSES_LIB)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o aylet $(OBJS) $(CURSES_LIB)
+ 
+ xaylet: $(XOBJS)
+-	$(CC) -o xaylet $(XOBJS) `gtk-config --libs`
++	$(CC) $(LDFLAGS) $(CFLAGS) -o xaylet $(XOBJS) $(shell $(GTKCONFIG) --libs)
+ 
+ uigtk.o: uigtk.c
+-	$(CC) $(CFLAGS) `gtk-config --cflags` -c uigtk.c -o uigtk.o
++	$(CC) $(CFLAGS) $(GTKFLAGS) $(shell $(GTKCONFIG) --cflags) -c uigtk.c -o uigtk.o
+ 
+ installdirs:
+ 	/bin/sh ./mkinstalldirs $(BINDIR) $(XBINDIR) $(MANDIR)
+--- a/ui.c
++++ b/ui.c
+@@ -5,7 +5,9 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <signal.h>
+ #include <curses.h>
+@@ -188,8 +190,8 @@
+   {
+   need_update=0;
+   draw_frame();
+-  draw_status(ay_filenames[ay_file],aydata.miscstr,aydata.authorstr,
+-              ay_track+1,aydata.tracks[ay_track].namestr);
++  draw_status(ay_filenames[ay_file],(char *)aydata.miscstr, (char *)aydata.authorstr,
++              ay_track+1, (char *)aydata.tracks[ay_track].namestr);
+   }
+ 
+ /* update time display */
+--- a/uigtk.c
++++ b/uigtk.c
+@@ -14,11 +14,13 @@
+ #include "ui.h"
+ 
+ /* button pixmaps */
++#ifndef GTK2_6
+ #include "button1.xpm"
+ #include "button2.xpm"
+ #include "button3.xpm"
+ #include "button4.xpm"
+ #include "button5.xpm"
++#endif
+ 
+ 
+ static GtkWidget *window,*vbox,*detailstbl,*detaillabel[5];
+@@ -107,6 +109,11 @@
+ GdkBitmap *bitmap,*mask;
+ int tbl_row,width;
+ 
++#ifdef GTK2
++#define gtk_accel_group_get_default() accel
++  GtkAccelGroup *accel;
++#endif
++
+ window=gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_signal_connect(GTK_OBJECT(window),"destroy",
+                    GTK_SIGNAL_FUNC(cb_doquit),NULL);
+@@ -116,6 +123,11 @@
+ gtk_window_set_title(GTK_WINDOW(window),"xaylet");
+ gtk_window_set_policy(GTK_WINDOW(window),FALSE,TRUE,FALSE);	/* XXX? */
+ 
++#ifdef GTK2
++  accel = gtk_accel_group_new ();
++  gtk_window_add_accel_group (GTK_WINDOW (window), accel);
++#endif
++
+ /* main vbox */
+ vbox=gtk_vbox_new(FALSE,0);
+ gtk_container_add(GTK_CONTAINER(window),vbox);
+@@ -194,7 +206,11 @@
+ DO_TBL_RIGHT(statustbl,1, 1,2,"");
+ label_for_time=label;
+ 
++#ifdef GTK2
++  highspeed_widget = gtk_check_button_new_with_mnemonic ("_High speed");
++#else
+ highspeed_widget=gtk_check_button_new_with_label("High-speed");
++#endif
+ /* don't allow focus, looks too weird and we have shortcut */
+ GTK_WIDGET_UNSET_FLAGS(highspeed_widget,GTK_CAN_FOCUS);
+ gtk_table_attach_defaults(GTK_TABLE(statustbl),highspeed_widget, 2,4, 0,2);
+@@ -227,6 +243,21 @@
+ gtk_container_set_border_width(GTK_CONTAINER(buttontbl),5);
+ gtk_widget_show(buttontbl);
+ 
++#ifdef GTK2_6 /* >= GTK+ 2.6 */
++#define ADD_PIXMAP_TO_BUTTON(button,xpm,stock) \
++  pixmap = gtk_image_new_from_stock (GTK_STOCK_MEDIA_##stock, \
++				     GTK_ICON_SIZE_BUTTON); \
++  gtk_container_add (GTK_CONTAINER ((button)), pixmap); \
++  gtk_widget_show (pixmap)
++#else /* < GTK+ 2.6 */
++#define ADD_PIXMAP_TO_BUTTON(button,xpm,stock) \
++  bitmap=gdk_pixmap_create_from_xpm_d(window->window,&mask,	\
++                                      &(window->style->black),	\
++                                      (xpm));			\
++  pixmap=gtk_pixmap_new(bitmap,mask);				\
++  gtk_container_add(GTK_CONTAINER(button),pixmap);		\
++  gtk_widget_show(pixmap)
++#endif
+ 
+ hbox=gtk_hbox_new(TRUE,5);
+ gtk_table_attach_defaults(GTK_TABLE(buttontbl),hbox, 0,4, 0,1);
+@@ -236,16 +267,8 @@
+ /* XXX this seems to be needed here, but is it ok? */
+ gtk_widget_realize(window);
+ 
+-#define ADD_PIXMAP_TO_BUTTON(button,xpm) \
+-  bitmap=gdk_pixmap_create_from_xpm_d(window->window,&mask,	\
+-                                      &(window->style->black),	\
+-                                      (xpm));			\
+-  pixmap=gtk_pixmap_new(bitmap,mask);				\
+-  gtk_container_add(GTK_CONTAINER(button),pixmap);		\
+-  gtk_widget_show(pixmap)
+-
+ button=gtk_button_new();
+-ADD_PIXMAP_TO_BUTTON(button,button1);
++ADD_PIXMAP_TO_BUTTON(button,button1,PREVIOUS);
+ gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_prev_track),NULL);
+@@ -256,7 +279,7 @@
+ gtk_widget_show(button);
+ 
+ button=gtk_button_new();
+-ADD_PIXMAP_TO_BUTTON(button,button2);
++ADD_PIXMAP_TO_BUTTON(button,button2,PLAY);
+ gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_play),NULL);
+@@ -266,7 +289,7 @@
+ gtk_widget_show(button);
+ 
+ button=gtk_button_new();
+-ADD_PIXMAP_TO_BUTTON(button,button3);
++ADD_PIXMAP_TO_BUTTON(button,button3,PAUSE);
+ gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_pause),NULL);
+@@ -276,7 +299,7 @@
+ gtk_widget_show(button);
+ 
+ button=gtk_button_new();
+-ADD_PIXMAP_TO_BUTTON(button,button4);
++ADD_PIXMAP_TO_BUTTON(button,button4,STOP);
+ gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_stop),NULL);
+@@ -286,7 +309,7 @@
+ gtk_widget_show(button);
+ 
+ button=gtk_button_new();
+-ADD_PIXMAP_TO_BUTTON(button,button5);
++ADD_PIXMAP_TO_BUTTON(button,button5,NEXT);
+ gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_next_track),NULL);
+@@ -295,7 +318,11 @@
+ GTK_WIDGET_UNSET_FLAGS(button,GTK_CAN_FOCUS);
+ gtk_widget_show(button);
+ 
++#ifdef GTK2
++  button = gtk_button_new_with_mnemonic ("_Restart");
++#else
+ button=gtk_button_new_with_label("Restart");
++#endif
+ gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_restart),NULL);
+@@ -304,17 +331,24 @@
+ GTK_WIDGET_UNSET_FLAGS(button,GTK_CAN_FOCUS);
+ gtk_widget_show(button);
+ 
+-
+ /* second row, these go straight on the table */
+ /* backspace/delete/space are dealt with by keypress() */
++#ifdef GTK2
++  button = gtk_button_new_with_mnemonic ("_Previous file");
++#else
+ button=gtk_button_new_with_label("Prev File");
++#endif
+ gtk_table_attach_defaults(GTK_TABLE(buttontbl),button, 1,2, 1,2);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_prev_file),NULL);
+ GTK_WIDGET_UNSET_FLAGS(button,GTK_CAN_FOCUS);
+ gtk_widget_show(button);
+ 
++#ifdef GTK2
++  button = gtk_button_new_with_mnemonic("_Next file");
++#else
+ button=gtk_button_new_with_label("Next File");
++#endif
+ gtk_table_attach_defaults(GTK_TABLE(buttontbl),button, 2,3, 1,2);
+ gtk_signal_connect(GTK_OBJECT(button),"clicked",
+                    GTK_SIGNAL_FUNC(cb_button_next_file),NULL);
+@@ -386,8 +420,8 @@
+ if(need_update)
+   {
+   need_update=0;
+-  ui_draw_status(ay_filenames[ay_file],aydata.miscstr,aydata.authorstr,
+-                 ay_track+1,aydata.tracks[ay_track].namestr);
++  ui_draw_status(ay_filenames[ay_file], (char *)aydata.miscstr, (char *)aydata.authorstr,
++                 ay_track+1, (char *)aydata.tracks[ay_track].namestr);
+   }
+ 
+ /* update time display */
diff --git a/media-sound/aylet/metadata.xml b/media-sound/aylet/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/aylet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/baudline/Manifest b/media-sound/baudline/Manifest
new file mode 100644
index 000000000000..2adca39bf7e3
--- /dev/null
+++ b/media-sound/baudline/Manifest
@@ -0,0 +1,8 @@
+DIST baudline_1.08_linux_i686.tar.gz 1945014 SHA256 4b42e8d03c9fe9738ec66ee51a8d594a60a5770e8e22bb1d73ae38566fb951f1 SHA512 eb53b0508316f156b4d8ee86b9280657260039e41b7ab946796d9780af2b105c7839fd2d7bfcee032a96e27a8bc87acc7ce564b8eeccbaf348af96b2f5828e16 WHIRLPOOL 9c00ab437c7aa739a65005db90af44356ba67ddc431fcd3429c0928041d9810186e878f8156f84386e5ce92c250a1bdc3974e8b7dd927fe7bbb27a3333d1cbdf
+DIST baudline_1.08_linux_ppc.tar.gz 2369780 SHA256 846628197d4541510d38bdcbcae261be4832b68d183a5c8c42bb0073b9f9dd66 SHA512 7cb43cfec5cced3a6c051fcb56485b9a55d543a988f311f9130a41514d44a47fc0565415b5c9106cdd495283c62f03a137940afae4386fd4e87e3234fdece41f WHIRLPOOL 218167873f362b9ef1e0d3c6de7b72f6273f4b7f5317791602277b3c89b62fcb11bac45eb0b085d94d32c66ec3db610ba1596993041dc8c6b01422ff7aa5b8bd
+DIST baudline_1.08_linux_s390.tar.gz 459868 SHA256 c3e27c1f2322e7f35bcd8c8c6fdb3325eb774e66ae263fc6165a7461acf0e9d6 SHA512 636380e7b67b7885676ab9ae89a2ee97ac5a7934c1636f984ecbabc3bc78a3d1cd2b15a7e0572bb0f7a78d65a69df60550edad424dd102b5b85e244ae87ea5c7 WHIRLPOOL 175633afb5959e0f3bb0decc0c128e90fbd13bea1c8b2d90103671b1880a8d43330203fd568232a6d49c8e01aeeec99b37d4e611b584b04193d47c3d89f4db12
+DIST baudline_1.08_linux_x86_64.tar.gz 2270546 SHA256 79ff55c3817cd4a97d565733ea6e0532be57b05a7ffe7865b03199680800d625 SHA512 d0cb5dc0e6cc3fd79dbc2a37e7a1b9bbb050c953d1d2893f24f87a45f301fbc69ba4ba3b2f32903caec391ed0ca6913d2c320ca82039bb41185b21e100a754c4 WHIRLPOOL 39b9f59f5d71d65ed1ddc8ad5cbee306157480c4b6c6f1f237cd28b56bfd93df4e961140ad60478064ceae2119f3fe8a45d0d2037f7b4d1c136013dd7579c71f
+EBUILD baudline-1.08-r1.ebuild 1696 SHA256 40e638d012e789d795b8069e44bbe2ea1a87afc52e5327338c17d13448ccfec1 SHA512 f3a6e8a3f732a6a81db95eed6bc1b8da310edad1320fc0f2aa0a7524d11a4496a9e5b6146aeea2f74ec7fcf00eac444557d5e5d8b4749b2e5c22771421381902 WHIRLPOOL dcedd37685c02efa3b4bf62f063fa0c164c941a7d5ebc19f376448e4413bb11ae25d59fe649a4ccd6779f4a4b12c884e3788222b8573b825afa5d82c12d09e52
+MISC ChangeLog 2579 SHA256 a995d10c3d3042f999c4b9b91e9f2b575d2238c933a5e88a1cc31581fd8a4c7e SHA512 852af8e5611705194d5919388d0d2f1be534716d820466ef0337dd7fe62280f30a833cdf1620990be98d54c478f66bbced6651181993a589540b28636a5b9390 WHIRLPOOL 7951bdac96bb02978a12fca677eb9e9910d21fcf03aa849ea03bf9c37b3ba5619e7162acfd6e4e0ed9f6f95a4775c5ec1fe84fa7eb7743590d0e955ae6f34a93
+MISC ChangeLog-2015 1460 SHA256 b772dba472749d34205b7307e4646cd94fbcaa8ee954df50b5511a1105a7ba4c SHA512 a5190c7448bfc403efc8c2a9794e8f77526f5e189d6d3be1fce673fa0714a7d06d1a52a9d456b07f9409f385806ea7cbb49564306571c61e8ba8fa65203e12a2 WHIRLPOOL 6fdb98857c692072827f5a8545350f9df529733e81e731a305322600f6d2d1a9fe25e24c8e562def5b5bfa13fe5e41a8996049bd1def70b79d2e34342500573a
+MISC metadata.xml 854 SHA256 452cb969620b0af3f3d55c54da1980cb8e4317d7b60758850a88d54936f9b8bc SHA512 ad0defc486701f1265e64df7ce28b589d37e990d6ca4a9342f549ecf01ac8a522d5201334234c3c6878a4c0e5a9d6e22526ea2dac1428d9607a26ff93b887fae WHIRLPOOL a0f668fc8e5d1841a7041dec2144ff837b676e5f5db17f3b2fc22bb1aa3eb6c2ab8fa423a79bfd418bbbf5eee2a1d18b418ed9166bc82a602b4cf0d7c91ce74a
diff --git a/media-sound/baudline/baudline-1.08-r1.ebuild b/media-sound/baudline/baudline-1.08-r1.ebuild
new file mode 100644
index 000000000000..c5af15f0b264
--- /dev/null
+++ b/media-sound/baudline/baudline-1.08-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="A time-frequency browser designed for visualization of spectral domains"
+HOMEPAGE="http://www.baudline.com/"
+SRC_URI="amd64? ( http://www.baudline.com/${PN}_${PV}_linux_x86_64.tar.gz )
+	ppc? ( http://www.baudline.com/${PN}_${PV}_linux_ppc.tar.gz )
+	s390? ( http://www.baudline.com/${PN}_${PV}_linux_s390.tar.gz )
+	x86? ( http://www.baudline.com/baudline_1.08_linux_i686.tar.gz )"
+
+LICENSE="${PN}"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="jack"
+
+RESTRICT="mirror bindist"
+QA_PREBUILT="/opt/baudline/baudline*"
+
+RDEPEND="media-fonts/font-adobe-75dpi
+	media-fonts/font-misc-misc
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXxf86vm"
+
+src_unpack() {
+	default
+	# strip arch names from S
+	mv -v baudline_* ${P} || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r icons palettes
+
+	newicon icons/spectro512.png ${PN}.png
+
+	exeinto /opt/${PN}
+	doexe ${PN}
+	dosym ../../opt/${PN}/${PN} /usr/bin/${PN}
+	make_desktop_entry /usr/bin/${PN} Baudline ${PN} "AudioVideo;Player;" \
+		"MimeType=audio/x-aiff;audio/basic;audio/x-mp3;audio/x-flac;audio/vorbis;audio/x-wav;" \
+		"audio/x-vorbis;audio/mpeg;audio/x-gsm;audio/x-voc;application/x-ogg;"
+
+	if use jack ; then
+		doexe ${PN}_jack
+		dosym ../../opt/${PN}/${PN}_jack /usr/bin/${PN}_jack
+		make_desktop_entry /usr/bin/${PN}_jack "Baudline (jack support)" ${PN} "AudioVideo;Player;" \
+			"MimeType=audio/x-aiff;audio/basic;audio/x-mp3;audio/x-flac;audio/vorbis;audio/x-wav;" \
+			"audio/x-vorbis;audio/mpeg;audio/x-gsm;audio/x-voc;application/x-ogg;"
+	fi
+
+	dodoc README_unix.txt
+}
diff --git a/media-sound/baudline/metadata.xml b/media-sound/baudline/metadata.xml
new file mode 100644
index 000000000000..13c289ccad72
--- /dev/null
+++ b/media-sound/baudline/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+<longdescription lang="en">
+Baudline is a time-frequency browser designed for scientific visualization of the spectral domain.  Signal analysis is performed by Fourier, correlation, and raster transforms that create colorful spectrograms with vibrant detail.  Conduct test and measurement experiments with the built in function generator, or play back audio files with a multitude of effects and filters.  The baudline signal analyzer combines fast digital signal processing, versatile high speed displays, and continuous capture tools for hunting down and studying elusive signal characteristics.
+</longdescription>
+</pkgmetadata>
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
new file mode 100644
index 000000000000..ed547e3c2391
--- /dev/null
+++ b/media-sound/beets/Manifest
@@ -0,0 +1,9 @@
+DIST beets-1.3.13.tar.gz 1269748 SHA256 6d973c3484079b22b7d281f771a97c03f9bb14bdd94f45b673f9d754875b2c59 SHA512 ffee7e16a115f16c26ab07a75e614746cd5871a7311660d37978deff34245f3aeab97b1a453fc0900442f40e6ac7d102c5adfce910edfec78387fc149fbea261 WHIRLPOOL 79b345612b04965aa6d4b7cc819d7ed1942b5686bf3990612f2c243dc47a2cfc3f15550f97ee30502ce42f4c24cf2ade27e9db6393f40022ffedf6842f4dc05c
+DIST beets-1.3.19.tar.gz 1349402 SHA256 6b241e62764a9c4bf9bf570acacc4681d30513f0f2268faa5da494ec066c21ee SHA512 86d2bae8d047a81b7a21f3fc322bb23e383193004de02e8ba0641d564054b58c8828dd112ba437e6fb1d40d9b9521d00b7717c29f33b88b8b559cdbf0ca407ae WHIRLPOOL bb25144deff5234db04b9e18c7e4c0be15a754251671f7a5461731114023fac6b866bb0abe8275a4efa66d3eec0096081dc8ed3c3e029dc0270236c4dcb818c2
+DIST beets-1.4.3.tar.gz 1428494 SHA256 b93fbe11998a29cd432b0a88741b9ced0e5ac50e80362d41e13e867d851ae464 SHA512 b95a9056abae5da3db7786342e8969b4f9c86c2c4589dd48bad244d28ef3d3da4900d3d3eaee1e45964960c62ecaa8d754a33829e0d7f497f01ecc763c0f492d WHIRLPOOL 514aef47d59db4489d0bf48e9ed3a4e8c9a9e1d7dee2a8b1ecf0568bb319511c3bedec012cfa6270e5d5ef50ecc0befd17c908951df2da1875a5c4e088abab2b
+EBUILD beets-1.3.13-r1.ebuild 2677 SHA256 16e4e7e17d37e4ac34a12bee6a08c2fbf74b0ab374d3c5510b90a18d6e99cca7 SHA512 6a683c225410602033eb85b8d5bc9616e0dde085f52c775beebe7f8bc4c15217def7934dd3101d2e6bc90c2d5ca3db8b6af351a958e08956d6ebd921ed08f539 WHIRLPOOL 0a522d342e32c089d3acef4b8154db54df23abdcdbb0af64e0c27ea68acf1191600e48320d7f289b684e0cf7bf1b6d2373fda5116dfe532de6a73b034507ec1e
+EBUILD beets-1.3.19.ebuild 2746 SHA256 df968f56d0f4d927d7453025e21a2fc72df44cfab9273605bb9aa9a6e0b071fb SHA512 8c8926b6dbefafef6f7fde48450b1c721c7e2079baec64a2c75838b149ce1af5c31b6dafdd0d2b0063f3fc7a68f2d5da8af8389b3757959815dfa56deff44eb0 WHIRLPOOL 0535323227cc6eb1680dd73ca776b9a62c1f11e3299a39f2029a30c20bdddedd9d4bbb48be6237f656c86c0e1287b5c0cccd8670571ff9929a11c8bd943649a0
+EBUILD beets-1.4.3.ebuild 3066 SHA256 601b2f6b6a8d701ade5f6cd8b7bf156fd853ba22d34bb476bba2eafd37a262fc SHA512 489fe8cf53512859602a43dbd0d9cbf5188453acd3c61f911bf391670d8942b71a15a93ab9853c69faefaadffb92a8e7dba9435d4b746740586e5804a07dcea4 WHIRLPOOL 8c450ac2f65c3c04a6b4a9be378d347956f1907e8b9d6b79fc148223f6f60377ad0745603488e729283cce011bf7db4d5907e49e894926a969528916ca33bb6f
+MISC ChangeLog 2761 SHA256 6df632a268b4f135486c31d6a34e53812c3b7265df531cfce6a6eca0c2d336b5 SHA512 397075bf4faeb6d697518cd6ec729f74a9be152517156731d45b20c5e810f3e17c3b1d020d3b898d24989cfcd6354c8131a62453743c2dd078047205ea3b09ab WHIRLPOOL f35935c0164a432e154dd686eb697fa26f5ba8bf1276fc97b3bb8df7c886ea114d62d617f95f4a321d16dc827cd86fdd9523d09de29bbb9041f2af7561683ebb
+MISC ChangeLog-2015 4728 SHA256 292135f3c36b23a6002679950912cedf2d468a02bbeb91b3b6eeec0a1cf68704 SHA512 042f37e87992c5dca66e18c994a8cf33867814e038f5ebab2925863c0331c1a27556041c3f3088f282c47f46b3caf397d2dd98163af054b630f889b6604bd060 WHIRLPOOL 87b3890bb71c521061ad7d4a67f64fe08d583a7d0c23058ccc251153b616a5bf15ac3de91b87397f6a2107262cf79298f805609816c557611947e209aacd942e
+MISC metadata.xml 2713 SHA256 ee3a43384fd6e572c9da55e1fe8c37b9aa17e449d7314e34f9c59436a323afc7 SHA512 0df7e29ad135bbfd5bb01b7efe34e378c0d56c8bba9535ca2fd93362d2c62c863c9bcbbbad6df37d1f1a31abb6f886fa9285b91852667ae15c1d2dd37472d941 WHIRLPOOL 3c4ec837f7112675e909c1a1db43b9416585fdcc22fd4b471487e926201d8034b379061c4184cd4959584f0ae39ea0b624c7c3c9cf90fb2a265034017709ec31
diff --git a/media-sound/beets/beets-1.3.13-r1.ebuild b/media-sound/beets/beets-1.3.13-r1.ebuild
new file mode 100644
index 000000000000..2382db78d403
--- /dev/null
+++ b/media-sound/beets/beets-1.3.13-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1 eutils
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://beets.radbox.org/ https://pypi.python.org/pypi/beets"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="bpd chroma convert doc discogs flac gstreamer lastgenre mpdstats
+	ogg opus replaygain test web"
+
+RDEPEND=">=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]
+	dev-python/jellyfish[${PYTHON_USEDEP}]
+	dev-python/munkres[${PYTHON_USEDEP}]
+	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.27[${PYTHON_USEDEP}]
+	bpd? ( dev-python/bluelet[${PYTHON_USEDEP}] )
+	chroma? ( dev-python/pyacoustid[${PYTHON_USEDEP}] )
+	convert? ( media-video/ffmpeg:0[encode] )
+	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	mpdstats? ( dev-python/python-mpd[${PYTHON_USEDEP}] )
+	lastgenre? ( dev-python/pylast[${PYTHON_USEDEP}] )
+	replaygain? (
+		gstreamer? ( media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-good:1.0
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			ogg? ( media-plugins/gst-plugins-ogg )
+			flac? ( media-plugins/gst-plugins-flac:1.0 )
+			opus? ( media-plugins/gst-plugins-opus:1.0 ) )
+		!gstreamer? ( || ( media-sound/mp3gain
+			media-sound/aacgain ) ) )
+	web? ( dev-python/flask[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# requires removed package pyechonest, bug #587976
+	rm beetsplug/echonest.py || die
+
+	# remove plugins that do not have appropriate dependencies installed
+	for flag in bpd chroma convert discogs lastgenre mpdstats replaygain web; do
+		if ! use ${flag}; then
+			rm -r beetsplug/${flag}.py || \
+			rm -r beetsplug/${flag}/ ||
+				die "Unable to remove ${flag} plugin"
+		fi
+	done
+
+	for flag in bpd lastgenre web; do
+		if ! use ${flag}; then
+			sed -e "s:'beetsplug.${flag}',::" -i setup.py || \
+				die "Unable to disable ${flag} plugin "
+		fi
+	done
+
+	use bpd || rm -f test/test_player.py
+
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd test
+	if ! use web; then
+		rm test_web.py || die "Failed to remove test_web.py"
+	fi
+	"${PYTHON}" testall.py || die "Testsuite failed"
+}
+
+python_install_all() {
+	doman man/beet.1 man/beetsconfig.5
+	use doc && dohtml -r docs/_build/html/
+}
diff --git a/media-sound/beets/beets-1.3.19.ebuild b/media-sound/beets/beets-1.3.19.ebuild
new file mode 100644
index 000000000000..97f53817e3bb
--- /dev/null
+++ b/media-sound/beets/beets-1.3.19.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1 eutils
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://beets.radbox.org/ https://pypi.python.org/pypi/beets"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="badfiles bpd chroma convert doc discogs flac gstreamer lastgenre mpdstats
+	ogg opus replaygain test web"
+
+RDEPEND=">=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]
+	dev-python/jellyfish[${PYTHON_USEDEP}]
+	dev-python/munkres[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.27[${PYTHON_USEDEP}]
+	badfiles? ( media-sound/mp3val media-libs/flac )
+	bpd? ( dev-python/bluelet[${PYTHON_USEDEP}] )
+	chroma? ( dev-python/pyacoustid[${PYTHON_USEDEP}] )
+	convert? ( media-video/ffmpeg:0[encode] )
+	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	mpdstats? ( dev-python/python-mpd[${PYTHON_USEDEP}] )
+	lastgenre? ( dev-python/pylast[${PYTHON_USEDEP}] )
+	replaygain? (
+		gstreamer? ( media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-good:1.0
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			ogg? ( media-plugins/gst-plugins-ogg )
+			flac? ( media-plugins/gst-plugins-flac:1.0 )
+			opus? ( media-plugins/gst-plugins-opus:1.0 ) )
+		!gstreamer? ( || ( media-sound/mp3gain
+			media-sound/aacgain ) ) )
+	web? ( dev-python/flask[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# remove plugins that do not have appropriate dependencies installed
+	for flag in badfiles bpd chroma convert discogs lastgenre mpdstats replaygain web; do
+		if ! use ${flag}; then
+			rm -r beetsplug/${flag}.py || \
+			rm -r beetsplug/${flag}/ ||
+				die "Unable to remove ${flag} plugin"
+		fi
+	done
+
+	for flag in bpd lastgenre web; do
+		if ! use ${flag}; then
+			sed -e "s:'beetsplug.${flag}',::" -i setup.py || \
+				die "Unable to disable ${flag} plugin "
+		fi
+	done
+
+	use bpd || rm -f test/test_player.py
+
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd test
+	if ! use web; then
+		rm test_web.py || die "Failed to remove test_web.py"
+	fi
+	"${PYTHON}" testall.py || die "Testsuite failed"
+}
+
+python_install_all() {
+	doman man/beet.1 man/beetsconfig.5
+	use doc && dohtml -r docs/_build/html/
+}
diff --git a/media-sound/beets/beets-1.4.3.ebuild b/media-sound/beets/beets-1.4.3.ebuild
new file mode 100644
index 000000000000..80bae16a2efe
--- /dev/null
+++ b/media-sound/beets/beets-1.4.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1 eutils
+
+MY_PV=${PV/_beta/-beta.}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://beets.io/ https://pypi.python.org/pypi/beets"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="badfiles bpd chroma convert doc discogs flac gstreamer lastgenre lastimport mpdstats ogg opus replaygain test thumbnails web"
+
+RDEPEND=">=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]
+	dev-python/jellyfish[${PYTHON_USEDEP}]
+	dev-python/munkres[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
+	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
+	badfiles? ( media-sound/mp3val media-libs/flac )
+	bpd? ( dev-python/bluelet[${PYTHON_USEDEP}] )
+	chroma? ( dev-python/pyacoustid[${PYTHON_USEDEP}] )
+	convert? ( media-video/ffmpeg:0[encode] )
+	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	mpdstats? ( dev-python/python-mpd[${PYTHON_USEDEP}] )
+	lastgenre? ( dev-python/pylast[${PYTHON_USEDEP}] )
+	lastimport? ( dev-python/pylast[${PYTHON_USEDEP}] )
+	replaygain? (
+		gstreamer? ( media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-good:1.0
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			ogg? ( media-plugins/gst-plugins-ogg )
+			flac? ( media-plugins/gst-plugins-flac:1.0 )
+			opus? ( media-plugins/gst-plugins-opus:1.0 ) )
+		!gstreamer? ( || ( media-sound/mp3gain media-sound/aacgain ) )
+		)
+	thumbnails? (
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/pathlib[${PYTHON_USEDEP}]
+		|| ( dev-python/pillow[${PYTHON_USEDEP}] media-gfx/imagemagick )
+		)
+	web? ( dev-python/flask[${PYTHON_USEDEP}] dev-python/flask-cors[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# remove plugins that do not have appropriate dependencies installed
+	for flag in bpd chroma convert discogs lastgenre lastimport mpdstats replaygain thumbnails web; do
+		if ! use ${flag}; then
+			rm -r beetsplug/${flag}.py || \
+			rm -r beetsplug/${flag}/ ||
+				die "Unable to remove ${flag} plugin"
+		fi
+	done
+
+	for flag in bpd lastgenre web; do
+		if ! use ${flag}; then
+			sed -e "s:'beetsplug.${flag}',::" -i setup.py || \
+				die "Unable to disable ${flag} plugin "
+		fi
+	done
+
+	use bpd || rm -f test/test_player.py
+
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	cd test
+	if ! use web; then
+		rm test_web.py || die "Failed to remove test_web.py"
+	fi
+	"${PYTHON}" testall.py || die "Testsuite failed"
+}
+
+python_install_all() {
+	doman man/beet.1 man/beetsconfig.5
+	use doc && dohtml -r docs/_build/html/
+}
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
new file mode 100644
index 000000000000..a6f2243141f4
--- /dev/null
+++ b/media-sound/beets/metadata.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    The purpose of beets is to get your music collection right once and for
+    all. It catalogs your collection, automatically improving its metadata as
+    it goes using the MusicBrainz database. (It also downloads cover art for
+    albums it imports.) Then it provides a bouquet of tools for manipulating
+    and accessing your music.
+
+    Because beets is designed as a library, it can do almost anything you can
+    imagine for your music collection. Via plugins, beets becomes a panacea:
+    * Embed and extract album art from files’ tags.
+    * Listen to your library with a music player that speaks the MPD protocol
+    and works with a staggering variety of interfaces.
+    * Fetch lyrics for all your songs from databases on the Web.
+    * Manage your MusicBrainz music collection.
+    * Analyze music files’ metadata from the command line.
+    * Clean up crufty tags left behind by other, less-awesome tools.
+    * Browse your music library graphically through a Web browser and play it
+    in any browser that supports HTML5 Audio.
+
+    If beets doesn’t do what you want yet, writing your own plugin is
+    shockingly simple if you know a little Python.
+  </longdescription>
+  <use>
+    <flag name="badfiles">
+      Validate MP3 &amp; FLAC files.
+    </flag>
+    <flag name="bpd">
+      Enable support for <pkg>media-sound/mpd</pkg> server emulation
+    </flag>
+    <flag name="chroma">Enable support for acoustic fingerprinting plugin using
+      <pkg>media-libs/chromaprint</pkg></flag>
+    <flag name="convert">Enable support for the convert plugin which makes it
+      possible to transcode files</flag>
+    <flag name="discogs">Enable support for the discogs API plugin</flag>
+    <flag name="lastgenre">Enable support for importing music genres from
+      last.fm tags</flag>
+    <flag name="lastimport">Enable support for importing your last.fm playcounts</flag>
+    <flag name="mpdstats">Enable support for collecting statistic about
+      listening habits from <pkg>media-sound/mpd</pkg></flag>
+    <flag name="opus">Enable opus support in gstreamer-based replaygain</flag>
+    <flag name="replaygain">Enable support for Replay Gain metadata calculation
+      during import</flag>
+	<flag name="thumbnails">Generate thumbnails for albums</flag>
+    <flag name="web">
+      Enable embedded webserver support through <pkg>dev-python/flask</pkg>
+    </flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">beets</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/bempc/Manifest b/media-sound/bempc/Manifest
new file mode 100644
index 000000000000..dcb594c2343c
--- /dev/null
+++ b/media-sound/bempc/Manifest
@@ -0,0 +1,5 @@
+DIST bempc-0.11.tar.xz 182588 SHA256 62ce13e82c42b891d2e49ff691f2c7c60b8d62809ea44f729af5e1685a108703 SHA512 ec1cd82d7b93b45c16ff54e6e14f0625af0042b863c65f72e06eeaf67933384fd527f6db15725363fc02ca1ce9a6855fbf215da2bef2e8c52e8fec70d742de5c WHIRLPOOL 1e72200c28928aee34a3458a45012990ca22619024c8adf700b6a789e188b6a6ab7526a317945dde7a5ce567240b1a9154364a2a2d2eb0d5c75538d56e72a113
+EBUILD bempc-0.11.ebuild 1127 SHA256 a4b4f87901f5b39b55bf644e233ef9e21b7397a0795b8f53de45f8cc3fe234b5 SHA512 a05cca0b16fc36fc16aeacf6c96300dc90c21c3bce8aea18c5db9473c741b2c5420bbb8506e5c136823f211a92e01dc7563538b1a37a6af3b5212559f7d71baf WHIRLPOOL 4e0ec1b1c0eebf14969d02f1c77366e9d572ace7008c3eec544daaf8b832f3e4520e10fc811723e496b2052bd19faa07141743ef0d13f4ab79ffd3c51d7e33ed
+MISC ChangeLog 2422 SHA256 61a8d0cd381b65b004b41a5ac877fc19ad802afdfff946ae61413e4745cab623 SHA512 1759ec3bb0e6a6a0e93eb60ad30ac51f63d393b8014e1169f491b53b8b940994fc27f2939cdaaf183952a1a472db193f8f9d53edc35066831990e5fabd4cfe20 WHIRLPOOL aadf37bf80c168b44c9eae4e82d5086e13ff96614969cd6f275680b19fbb7f5ec5f7378492848a3e75692b41f539b648a3bfe0e7d95859e4d35544d70da79cde
+MISC ChangeLog-2015 694 SHA256 7c64db7bc696fcc8cccaf5cf1efa828749301114509e051a2ece4aa4e86172a4 SHA512 96f0b5b26d4487a5154daf706e7611f07cebf636a576ae68b3930e654481626268533d294ddda1f10ce6441c3899c44e17333d21df08277cf2e3cf9dd2be8de1 WHIRLPOOL 1a37186c3778e87c7413ca11eca091bf3298e874976bc271fe10a204f79a4509107e23d07dc07c888eceaeff3bbd6d92531af7a16e85e719dfa0868bd76c5752
+MISC metadata.xml 369 SHA256 db0571e8b8135f5c6456e7b1f4b599df9596e7cfa6a1651af091b3b830bb3a33 SHA512 4a5f9587d7d6e58b88a42d1873d0945de00c2ec12d27b2e2d04807e4d3d64155a253570e0e2afb56e75404ae30358d5bdb0421da1e52d3a175a4f5ac710f8041 WHIRLPOOL c2e3564ccb9e944fd2f5eaa52cedde6c0e30a2d46bb8beeacd76bf24ba16d47c3f4b7b8e8f95815a1ea7135330da4aa3219457707a5e5be844db3c17dec772b2
diff --git a/media-sound/bempc/bempc-0.11.ebuild b/media-sound/bempc/bempc-0.11.ebuild
new file mode 100644
index 000000000000..a37a3c92b55d
--- /dev/null
+++ b/media-sound/bempc/bempc-0.11.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+LANGS="cs de"
+inherit qt4-r2 fdo-mime
+
+DESCRIPTION="Qt4 MPD client with experimental UI"
+HOMEPAGE="http://qt-apps.org/content/show.php?content=137091"
+SRC_URI="http://qt-apps.org/CONTENT/content-files/137091-${P}.txz -> ${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libmpdclient
+	>=dev-qt/qtcore-4.6:4
+	>=dev-qt/qtgui-4.6:4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	local INSTALLED_LANGS= LANG=
+
+	# Install on live fs should be done by portage itself
+	sed -ie 's/postinstall/#postinstall/g' be.mpc.pro
+
+	# Install only chosen locales
+	for LANG in ${LINGUAS}; do
+		if has ${LANG} ${LANGS}; then
+			INSTALLED_LANGS="${INSTALLED_LANGS} be.mpc_${LANG}.qm"
+		fi
+	done
+	sed -ie "s/i18n.files += be.mpc_cs.qm be.mpc_de.qm/i18n.files += ${INSTALLED_LANGS}/" be.mpc.pro
+
+	# Fix invalid desktop file
+	sed -ie 's/Categories=Application;Qt;Audio;/Categories=Qt;AudioVideo;Audio;/' be.mpc.desktop
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-sound/bempc/metadata.xml b/media-sound/bempc/metadata.xml
new file mode 100644
index 000000000000..7039969c29c6
--- /dev/null
+++ b/media-sound/bempc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>pinkbyte@gentoo.org</email>
+    <name>Sergey Popov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
+  </pkgmetadata>
diff --git a/media-sound/bitmeter/Manifest b/media-sound/bitmeter/Manifest
new file mode 100644
index 000000000000..b0e2d0e816ca
--- /dev/null
+++ b/media-sound/bitmeter/Manifest
@@ -0,0 +1,7 @@
+AUX bitmeter-1.2-fix-build-system.patch 709 SHA256 f3b498335f589ceee9d7127318f0aada486551968ba565e6ad87c73192f93508 SHA512 6358c6a930d525c6a6c487556ed8db7d507d1cfbf20381c70106bf888889eee09c3d4b84ac27c757e1c2713e97f2987a051b255052881f77a5249b4dd9ff290d WHIRLPOOL 8b58fd248dbf134ea5b7e3e5ae8c77df8de5ac23e971550d6e22eb3fa9001a4389e9387b104d4d5714f3d8833681edae21d0e3b8a535f08180daadd161329547
+AUX bitmeter-1.2-qa-desktop-file.patch 381 SHA256 31fd43ebd6f8c57317c343e771e4ae287319dce24dbe2f97768fb378fdc75f99 SHA512 8de6edd11597d9f9c0a6588b49874de5d69debcf155a3f9ea88dbcb28a75e5d0325a8f904be7c6ff0ec17d6fa0f8789566713c736aba71e928198dd774889c69 WHIRLPOOL 3462ab5298abe99ee852c7c1e41f062db63d49663b17fccd17b01fd9a7d3851c9cdff27b018fa524b029090c7e17abf172ebb38d1313954c9032a11e177df6b8
+DIST bitmeter-1.2.tar.gz 216592 SHA256 4789370a677f98a6058302c6c3da05db049b733037821b580be0f889fb139325 SHA512 aa034b572d499bb0858d8c0e9a0487bf1c83c8edfa43916e1a0618ad2c3a71272f0ed740c8e62d17d8a504d88c7e0fc4f36b736628e481f036812d07f6e251f8 WHIRLPOOL 14a07dc21ee102282e0632e1b4fba96321e4de35a93f570f8f3b219ae0f650b35b21b6eb38c394ae0041e915ee530da100af61594502860248e8ab5df1be4d5d
+EBUILD bitmeter-1.2-r1.ebuild 719 SHA256 6ceba476d5b0f3a87760d3d9252badc0f327acf4ba00c331834b5eb9098fbcf2 SHA512 fea8335b569550a8f1154ddddb75b496b472df7176059d9f18de23cb404e91e18b8819a9b8a681696f56691db7e1ceb06a30708c0e7d1db809bbda5d7021cb2f WHIRLPOOL 16bf7ddc731044acde505234aef5b9840782bcb8f6f0b36f30c9cbe8153bc482631bc1dd5b7b72550b62528449db10ddb10002dd5c2ec82b1427a4a3b332f84f
+MISC ChangeLog 2857 SHA256 22a2394fedfc5cc9cde88cd3a96e9a67f7f1c460c87294e85627b8312789ed3b SHA512 e0eb7b6a534bc2ca71a63f8b547e48e9b403b051e1275726e231bbebde3d67b9492f6236d6099bcf2dc42705a02390995308303fa568ef001a9b94fd9f13507b WHIRLPOOL 84cd084f86787cd13869782539f4b9bee60bd2755626cb840de435de0b8e76a1dbf2c12687de2ba99150506d5b665d23feb126546f6c7abaeb1da42ab2193a70
+MISC ChangeLog-2015 1284 SHA256 d31c5ffe1ff8274974c0b5cd3c7f508af9a0d0105db26bcde75c29d34aece9f7 SHA512 a08b39145cf2d36d9fb8fb3984b0a1ca539f9ae603cbb45db771eb9567258dbb9b400d0bd76b62386c9c3c5f3e906c790397b64beb84f5c653147cde6d2bf811 WHIRLPOOL c66b0fad191eab0c51e31ebe2f3e8c172a8e2274d70003a0829270df92359e1411dcf3f2ab22d679d444dd493ffc25d2a15e5387353a002ed0edbe22b99f6f4b
+MISC metadata.xml 255 SHA256 fc6dd027d0011f9f42d437ea0687857760a11bf2137f8822ec8692186d0bcbe3 SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 WHIRLPOOL de03966b13986c67a61f862755281e80740260a9031e5e34cbee88a3053e66f705df0f36499b154744ff447c94e19a28b8649535e08819216569e78eb4ce9a38
diff --git a/media-sound/bitmeter/bitmeter-1.2-r1.ebuild b/media-sound/bitmeter/bitmeter-1.2-r1.ebuild
new file mode 100644
index 000000000000..35b1faaa6ff9
--- /dev/null
+++ b/media-sound/bitmeter/bitmeter-1.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Diagnosis tool for JACK audio software"
+HOMEPAGE="http://devel.tlrmx.org/audio/"
+SRC_URI="http://devel.tlrmx.org/audio/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="x11-libs/gtk+:2
+	media-sound/jack-audio-connection-kit"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.2-qa-desktop-file.patch
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/*.{png,html} )
+	default
+}
diff --git a/media-sound/bitmeter/files/bitmeter-1.2-fix-build-system.patch b/media-sound/bitmeter/files/bitmeter-1.2-fix-build-system.patch
new file mode 100644
index 000000000000..37c75266887f
--- /dev/null
+++ b/media-sound/bitmeter/files/bitmeter-1.2-fix-build-system.patch
@@ -0,0 +1,30 @@
+Look for log10f function in libm.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=586148
+
+--- a/configure.in
++++ b/configure.in
+@@ -1,8 +1,8 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT(configure.in)
+-AM_INIT_AUTOMAKE(bitmeter, 1.2)
+-AM_CONFIG_HEADER(config.h)
++AC_INIT([bitmeter], [1.2])
++AM_INIT_AUTOMAKE
++AC_CONFIG_HEADERS([config.h])
+ AM_MAINTAINER_MODE
+ 
+ AC_ISC_POSIX
+@@ -10,6 +10,12 @@
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
++dnl Find log10f
++dnl Gentoo-bug: 586148
++AC_SEARCH_LIBS([log10f], [m], [], [
++	AC_MSG_ERROR([unable to find the log10f() function])
++])
++
+ pkg_modules="gtk+-2.0 >= 2.0.0"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)
diff --git a/media-sound/bitmeter/files/bitmeter-1.2-qa-desktop-file.patch b/media-sound/bitmeter/files/bitmeter-1.2-qa-desktop-file.patch
new file mode 100644
index 000000000000..25bfa77340e9
--- /dev/null
+++ b/media-sound/bitmeter/files/bitmeter-1.2-qa-desktop-file.patch
@@ -0,0 +1,18 @@
+Fix broken .desktop file to comply with FDO specifications.
+
+--- a/bitmeter.desktop
++++ b/bitmeter.desktop
+@@ -4,10 +4,10 @@
+ Comment=JACK diagnostic tool
+ TryExec=bitmeter
+ Exec=bitmeter
+-Icon=bitmeter.xpm
+-Terminal=0
++Icon=bitmeter
++Terminal=false
+ Type=Application
+ StartupWMClass=Bitmeter
+-Categories=Application;Audio;AudioVideo;X-Jack
++Categories=Audio;AudioVideo;X-Jack
+ 
+ 
diff --git a/media-sound/bitmeter/metadata.xml b/media-sound/bitmeter/metadata.xml
new file mode 100644
index 000000000000..f79bb67acbd9
--- /dev/null
+++ b/media-sound/bitmeter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/bladeenc/Manifest b/media-sound/bladeenc/Manifest
new file mode 100644
index 000000000000..1cb527f34a3b
--- /dev/null
+++ b/media-sound/bladeenc/Manifest
@@ -0,0 +1,6 @@
+AUX bladeenc-0.94.2-secfix.diff 394 SHA256 e57d8d91881e15889e7cb4f965c6f026061f0f7dbd33c24ad43e5060aed20d5e SHA512 6f590d4f9bdc34f36cb9aef3fc1a590893dd4aa52f9caeaeee9375653f1a80658dc1c52ec6bd679ef5836335b05d6ec02a3987392d3220294a78a23adac09400 WHIRLPOOL 514d33107daefb698ddfad35382bf096be02bcd2a4f931a6b7f401eafbeca32bcc2dd8e24d107df77b72da0655c55830e64fb8388e14d851d505324a23c2eeaa
+DIST bladeenc-0.94.2-src-stable.tar.gz 142949 SHA256 c5e9dd180f28d1865599d0755e36fa1a4c146bb5e1b7ba9ad099955261fc1164 SHA512 570202a201c3582483078248fae7330d978d69018e4367d51322f84f26875cf84250de6c46527d11624cd6f19d4a98e30421447358b15ce9f256cade28e604ef WHIRLPOOL 530dcb738c6e335437122bb7c31540ff4181581ca9f4cc54ab4730ca2dffb0bd1f9d88cb94f4826ac9ee9052f61911dc2677e0e32205f6f943f3445eff25c83e
+EBUILD bladeenc-0.94.2-r1.ebuild 504 SHA256 bcdebdf28f84dcd101bd27de4b0b242d6818d07f99102aec8dea8fe7096d759b SHA512 88dc0edd54f2df014dd437d402dd759a02ab0c99fdc46f499716e65bd08543ef389a8553eddc4e767cbfb91eba1806c7c332edbdc7f0e7a50cff2d9d4806c851 WHIRLPOOL b851d4b84ecdb4b9a6ca8d157b3c514e0ebc5440eb5a844f2ced81b463ad0afe116178a68290274dcbfaaea6a390924de2cbb57f8b36b2a36af10e7a3aac7519
+MISC ChangeLog 2479 SHA256 5d4d59fe862c7ce6be0ff50984a0d8051ffa5c692cb16dba30e26ab261b43271 SHA512 67b19a8ddec0aa71abb274ea6a8e3dc7db6275b0ecea47774c50392b703af6cf515567921d3104b1952aafc61077be35f595045bd6c8b01eb2e9e0fe6a310f2a WHIRLPOOL 28d639038e4e00b0f1cae7d520cc3d1ab0c8f17398b2d95b43c13ab49abbd8913dad049f0471240a39953f3cc5bc211ee9a1071b01ad18f6f29ca1c246f61030
+MISC ChangeLog-2015 2095 SHA256 c51c2f069610f8ada78ac2e966ae94dfddbc462fb136d7ad36cb2d80b2d1a0bf SHA512 bd9e25d0b0a31a344872e811ca9fe55eded6a39830e939e6e6252e4c42643ebb81d29707d35282c9a64e5cf3ee7a7d1517f625d2f8d2faac32086e08662ead63 WHIRLPOOL 538217b8487f5b5fb9027dab78429431b8d9be9b6dbcd643dd190944640d67f3679e0f96e0cdeccd1bc8aa8c1014d34093e9c3b9366956859c009de12f8f8a2a
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild b/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild
new file mode 100644
index 000000000000..2f80c8918298
--- /dev/null
+++ b/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="An mp3 encoder"
+SRC_URI="http://bladeenc.mp3.no/source/${P}-src-stable.tar.gz"
+HOMEPAGE="http://bladeenc.mp3.no/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-secfix.diff
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/media-sound/bladeenc/files/bladeenc-0.94.2-secfix.diff b/media-sound/bladeenc/files/bladeenc-0.94.2-secfix.diff
new file mode 100644
index 000000000000..5a126f2ceedd
--- /dev/null
+++ b/media-sound/bladeenc/files/bladeenc-0.94.2-secfix.diff
@@ -0,0 +1,11 @@
+diff -Naur bladeenc-0.94.2/bladeenc/samplein.c bladeenc-0.94.2-fixed/bladeenc/samplein.c
+--- bladeenc-0.94.2/bladeenc/samplein.c	2001-05-08 14:11:53.000000000 +0200
++++ bladeenc-0.94.2-fixed/bladeenc/samplein.c	2003-02-05 11:19:59.000000000 +0100
+@@ -616,6 +616,7 @@
+ static int					myFseek (FILE *fp, int offset)
+ {
+ 	char					dummy[256];
++	offset = abs(offset);
+ 
+ 	while (offset >= 256)
+ 	{
diff --git a/media-sound/bladeenc/metadata.xml b/media-sound/bladeenc/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/bladeenc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
new file mode 100644
index 000000000000..b2af8974ab43
--- /dev/null
+++ b/media-sound/bluez-alsa/Manifest
@@ -0,0 +1,9 @@
+AUX bluealsa-conf.d 107 SHA256 f67e734636fd9ae18f40bdc0865f3eda782387006e2376945dc001cadfba9482 SHA512 3cac8c573ccc3dfe95e66df17e7af99601bb3672f950828eae17ab80ec00a2ead96923559a9c65ddcf666cc0afaabb12a7a9d0b07e771110d972f6676c49dd62 WHIRLPOOL 2e2b8ce72f3a3250f5bcbf7efd87c64a51a5c7a1bc2851662b4b94d707a35792d46d8675fab1d4c201e365a18bf38280ea5a398c3a2ad9a74214ac720134b17b
+AUX bluealsa-init.d 368 SHA256 cfb9d79647cc90f9cbdd988a80840ab2cb3ccba54d98cf7e3d040e540e91743d SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d WHIRLPOOL bb78d0fe66e301eb5ca3ff9a9663784cd39d827fceb53d07b653c541da42c8be67905bd8151ca23068b515b6f8957a3c3a5f12ebdc6179bf74b8362c1e7238b7
+DIST bluez-alsa-1.1.0.tar.gz 73676 SHA256 93396e581c196f9283d5907c7b8059ded21f5ec75a58f1c96f01d9ba295f5179 SHA512 167fa45994b57b0b44d5827762638d36ef782d7789c229e5c1ca99b59c13636dc53161cd45bec41e61890acd38b44d20778bc2085385582329a1c666530b21f1 WHIRLPOOL 2faba9fbd57fac2a519fe382c8a98654159a51819fea11da93ea3e198d31e51d3357bf2effa9df31713c2f201717dbd395a721efa81c9000a4da15df7e542a70
+DIST bluez-alsa-1.2.0.tar.gz 63662 SHA256 0a7a27e8cf135ec6bb30ea1a2365736681ced7d8293003c274fa78319f936838 SHA512 a6bf0068b3fb88acaa11990db411f1d3be7ad19219e7bdfd091fe81acc2ba5d5992dfb377e4fcc332ac330bb7e5ab5e4f4a9cee3e700e366fd983e81a272a5b4 WHIRLPOOL 5f4e3469b72dd375b946bb551edf318ec20e47490ec93d5fd54b0980a49a3b54f66f59f3bd65c65ce019d00f6808aa306025f0f0c045049d8fb62d7ff25f5f51
+EBUILD bluez-alsa-1.1.0-r2.ebuild 990 SHA256 4c5496c7d56ddb0eaab28f3a80c3147d0e0ffe42d2864c94b7cc1706c3a8eaab SHA512 a4b95242d46eeb23d7f03bcce26149ce851693390efbca96af7cbd6f9b1fd5d1d3b34827e547bcf394cf21923a7290f2f4b46818b79ec4a77c6fc2b623290e8c WHIRLPOOL 0dca894f767a8cd740b0ee4a13499330b9a64e5871df9fd669e59644d5922735db5d20e4cdc707583a3a0b8bd517067c24ef2a8e01f5eca6a6d122277be458b4
+EBUILD bluez-alsa-1.2.0.ebuild 1316 SHA256 802e41fe1d7949a9a586d78efd9687794a0ab2f63b5d9e0e767bd8a144c4afc9 SHA512 fe23b6623c76bf44dd695ac4b4b2af7b10eb4a5f3fbfc9b8a88643e69c1cbc846948d5f26e6e2a65bae2c2c8581fd7deb6ac156f90273ebadc0b07984d1e1b6c WHIRLPOOL d4637fb4d946bc8ec5fba2ed995e6b568b926764afe94662f3896c75ca4f7e0141627faffb7215ba189c209bdea3c073b9c7943856657f36898ebc96b39ef703
+EBUILD bluez-alsa-9999.ebuild 1316 SHA256 802e41fe1d7949a9a586d78efd9687794a0ab2f63b5d9e0e767bd8a144c4afc9 SHA512 fe23b6623c76bf44dd695ac4b4b2af7b10eb4a5f3fbfc9b8a88643e69c1cbc846948d5f26e6e2a65bae2c2c8581fd7deb6ac156f90273ebadc0b07984d1e1b6c WHIRLPOOL d4637fb4d946bc8ec5fba2ed995e6b568b926764afe94662f3896c75ca4f7e0141627faffb7215ba189c209bdea3c073b9c7943856657f36898ebc96b39ef703
+MISC ChangeLog 1101 SHA256 903821715753f8bff29748f964833668d8be6a051d7f30eac74d98114b3bebad SHA512 9ee69575d2d3782fe1a6a80e2afe0601904bd72ce30641876db9affe45be259e4ffcec3679d715eb46119fb50471e50bea7b65ffa1b4ab688a8eb21c062a4b20 WHIRLPOOL 68e19484c2aa5fa919bbf0cee64f0b37ff595537b02e7e1c521c6bcff53556e5532ea23bca2e4b85cb1d0e83dfae0e6781a15ae362b63eb0d00101f5493c5c1d
+MISC metadata.xml 429 SHA256 31f61955dd400efb644723d866c7a432d9548e4dbe431121510e7dc60cbaf860 SHA512 3d78a456405cffae4f5995197ca02dfeaf447d3ec417ddb00494cb07defc294329254c227aec5d24ed6c144a97606547b8fca184653e3882ec0c229f19621a8c WHIRLPOOL 4a146cf360539c3e103f2963fe66f35c66a919c3551c83cb0d6fca441784b03a698de0a0c84115d65e9917fb80307e241660273a9033ca8aeba368cb50eedf4b
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.1.0-r2.ebuild b/media-sound/bluez-alsa/bluez-alsa-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..f89afab59996
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-1.1.0-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="Bluetooth Audio ALSA Backend"
+HOMEPAGE="https://github.com/Arkq/bluez-alsa"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
+else
+	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.16[dbus]
+	>=media-libs/alsa-lib-1.0
+	>=media-libs/sbc-1.2
+	>=net-wireless/bluez-5"
+DEPEND="${RDEPEND}
+	net-libs/ortp
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+
+	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d bluealsa
+}
+
+pkg_postinst() {
+	elog "Users can use this service when they are members of the \"audio\" group."
+}
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.2.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-1.2.0.ebuild
new file mode 100644
index 000000000000..8b3787db68d9
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-1.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="Bluetooth Audio ALSA Backend"
+HOMEPAGE="https://github.com/Arkq/bluez-alsa"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
+else
+	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="aac debug hcitop"
+
+RDEPEND=">=dev-libs/glib-2.16[dbus,${MULTILIB_USEDEP}]
+	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
+	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
+	>=net-wireless/bluez-5[${MULTILIB_USEDEP}]
+	aac? ( >=media-libs/fdk-aac-0.1.1[${MULTILIB_USEDEP}] )
+	hcitop? (
+		dev-libs/libbsd
+		sys-libs/ncurses:0=
+	)"
+DEPEND="${RDEPEND}
+	net-libs/ortp
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable aac) \
+		$(use_enable debug) \
+		$(multilib_native_use_enable hcitop)
+}
+
+multilib_src_install_all() {
+	default
+	prune_libtool_files --modules
+
+	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d bluealsa
+}
+
+pkg_postinst() {
+	elog "Users can use this service when they are members of the \"audio\" group."
+}
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
new file mode 100644
index 000000000000..8b3787db68d9
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="Bluetooth Audio ALSA Backend"
+HOMEPAGE="https://github.com/Arkq/bluez-alsa"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
+else
+	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="aac debug hcitop"
+
+RDEPEND=">=dev-libs/glib-2.16[dbus,${MULTILIB_USEDEP}]
+	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
+	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
+	>=net-wireless/bluez-5[${MULTILIB_USEDEP}]
+	aac? ( >=media-libs/fdk-aac-0.1.1[${MULTILIB_USEDEP}] )
+	hcitop? (
+		dev-libs/libbsd
+		sys-libs/ncurses:0=
+	)"
+DEPEND="${RDEPEND}
+	net-libs/ortp
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable aac) \
+		$(use_enable debug) \
+		$(multilib_native_use_enable hcitop)
+}
+
+multilib_src_install_all() {
+	default
+	prune_libtool_files --modules
+
+	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d bluealsa
+}
+
+pkg_postinst() {
+	elog "Users can use this service when they are members of the \"audio\" group."
+}
diff --git a/media-sound/bluez-alsa/files/bluealsa-conf.d b/media-sound/bluez-alsa/files/bluealsa-conf.d
new file mode 100644
index 000000000000..feb2e1e6a662
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluealsa-conf.d
@@ -0,0 +1,4 @@
+# Config file for /etc/init.d/bluealsa
+
+# Allow additional options to be set
+BLUEALSA_CONF="--disable-hsp"
diff --git a/media-sound/bluez-alsa/files/bluealsa-init.d b/media-sound/bluez-alsa/files/bluealsa-init.d
new file mode 100644
index 000000000000..9b6a3178b63a
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluealsa-init.d
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/bluealsa.pid"
+command="/usr/bin/bluealsa"
+command_args="${BLUEALSA_CONF}"
+command_background="true"
+
+depend() {
+	after bluetooth
+	need dbus localmount
+}
+
+start_pre() {
+	checkpath -q -D -m 0770 -o :audio /var/run/bluealsa
+}
diff --git a/media-sound/bluez-alsa/metadata.xml b/media-sound/bluez-alsa/metadata.xml
new file mode 100644
index 000000000000..d35dea0f11fb
--- /dev/null
+++ b/media-sound/bluez-alsa/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Arkq/bluez-alsa</remote-id>
+  </upstream>
+  <use>
+    <flag name="hcitop">Enable top-like monitoring tool for HCI</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/bplay/Manifest b/media-sound/bplay/Manifest
new file mode 100644
index 000000000000..cdaa892197c6
--- /dev/null
+++ b/media-sound/bplay/Manifest
@@ -0,0 +1,5 @@
+DIST bplay-0.991.tar.gz 18920 SHA256 c2ac63fb34012259f9636ea79ee298a7e6d4c361a2754d0954af7c0c7ee553aa SHA512 95f1dbecf97aa9ca96c56220a96873ba3895b61e70b6873665fd054617a9d46b9fb973115efc906116d477db4a665a13c8d50157f6bfb6581d080ec27c853971 WHIRLPOOL aa8c377138d04a12ea538df75101686cc08098c9246da21a72ad79aed765fb4c71c0cef43a06081b6110e777b17bbe890afbc24eb789cb8789b88d5a28784378
+EBUILD bplay-0.991.ebuild 686 SHA256 d6f2f3238c5c1db2643cd2d7ef91e4be2303d66ef246876f1c3c6e9510261e17 SHA512 9637840a7572c8e15fb9863ca82ba714c91c9647e1e6edd00c11da4b6fd58692c654716be926652f1f2341e233800a394b116d09734b503e6e9277fc39a504e3 WHIRLPOOL 61c27d57d8c8a53f3f4deea08fc34daeae364393aa5f392d1cb3f419d3585930604d0743d7bbf1e7fd5c0a3836559b6a7cbb4c210280006bac3bb940e160c5c6
+MISC ChangeLog 2424 SHA256 0f7fa3b23784d3b8cf575e56763440c2b09b5c01b312892525e886cbaa2d0f98 SHA512 637ce217b39bfaa6204bd1005a710fc0dea63120c5ed6359bdbfcfcf19e28160f668d502a7a0cdf7cb3e6ebe9eb2bd4dd0adbd6ea7166f746b77daf76d93f917 WHIRLPOOL 4f305a235c7fbd0e1c9197fecfa6459cb52b9eb9121ad9c7fdefb6801803a5f17f807d1cdd7678bd93d6849cbe033015d23711f2f0ac8f03582495594e8c8f67
+MISC ChangeLog-2015 1556 SHA256 49deffcd5fddba963657313c6eebbcf850a1dde5cc09aa1b1672004a1f8df500 SHA512 d8a06e0b637afe788538d9464a16572576cda9833d38b61682649c3fcf1627954820942242655838ab80bb5df578503d51827e864f63e58cbb7ec8f707f7fb03 WHIRLPOOL 2e0a2c9a8dc5c8078a870530a1a27322ac6ff7e08220ebff5a2874f274ef5fe94f25b68d05fcd0e710eef983855b515d49740707ad93b46007bbd676571fa68b
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/bplay/bplay-0.991.ebuild b/media-sound/bplay/bplay-0.991.ebuild
new file mode 100644
index 000000000000..4289c10578b8
--- /dev/null
+++ b/media-sound/bplay/bplay-0.991.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="No-frills command-line buffered player and recorder"
+HOMEPAGE="http://www.amberdata.demon.co.uk/bplay/"
+SRC_URI="http://www.amberdata.demon.co.uk/bplay/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ~ppc sparc x86"
+IUSE=""
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" \
+		CFLAGS="${CFLAGS} -DUSEBUFFLOCK" bplay || die "emake failed"
+}
+
+src_install () {
+	newbin bplay bplay-bin || die "dobin failed"
+	dosym bplay-bin /usr/bin/brec || die "dosym failed"
+	doman brec.1
+	newman bplay.1 bplay-bin.1
+	dodoc README
+}
diff --git a/media-sound/bplay/metadata.xml b/media-sound/bplay/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/bplay/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/bpmdetect/Manifest b/media-sound/bpmdetect/Manifest
new file mode 100644
index 000000000000..7b8bc9ec7583
--- /dev/null
+++ b/media-sound/bpmdetect/Manifest
@@ -0,0 +1,8 @@
+AUX bpmdetect-0.6.1-fix-buildsystem.patch 1903 SHA256 d38a74d0810a08b438a75ff75375d5a8ba2ea224756f8f1ac8f670df97a0e5d9 SHA512 52500e1be213b19d2081e5a0d444afb3f55c955ba29fddd9c799cfe0d2359962c19fc64bc8d6649e8a5261fbf9ec8f16efe83b7decdbcf5b71abfd3ecbf15a4d WHIRLPOOL d7f19990dd49c4b1084f15c82eb646c1e6e0fd7821475cf247447032f59a60a65ee88f664564f9fee24e45deeea59c9af1e58ced1a2ebe60df0c54138b61e167
+AUX bpmdetect-0.6.1-fix-printf-format.patch 1328 SHA256 bf4b31fe663306ac46ab2f5a0d1020928731653eb26dabd3621c9bbc19aff58a SHA512 fa12b7daaf76e04d20b2a681e4e0849e99c93f2aa7a750aadec32c57d478d97005db294e1b613c29f7ad707a361b120863bf3dd69c18dac1be2bf8cbd61d9254 WHIRLPOOL 87094658a1774fefe9797a531fd19c89aae431da003220134b9c4c2b00128d1fec2947d9e9224164c4f1f18cb78e7977721919114b4772e71387313b853e0df9
+AUX bpmdetect-0.6.1-gcc44_and_fmodex_path.patch 1439 SHA256 7848687ce6e58a3307ac608061c7d8a30530b103f00cd35240057293ffb60a70 SHA512 abd719d7bb3f6bd773643b6cf082fcd7cb39f48d5f6a4143d5f6ec650e2496f97a311ef9c8f762622e04aeea7fbbe79cd7941615499ce655ab434ae69b46d297 WHIRLPOOL 33c5ec9dc759c217db456b6320e4c8f051fda651954588c649aa15b957415636bcb0ff7b7bb5b0e17e06d0e7faa92708b5213a55dfacafd6d5f807bec4b5dfd3
+DIST bpmdetect-0.6.1-src.tar.bz2 1433211 SHA256 2b7fb3e0595b5b9dd63381c079140656df196be1bee3365807f18ef4593c0b8f SHA512 9018b81d4ccca94d000a304ae640b071a0ac748c9c7922f4d3c6894a647594dd712964870898e01ee1d93fb8890491ed62b1d4e5f60f07dae74bda7525f0672a WHIRLPOOL f76ff18a9a3093aed7a965a2a97df7d5e29dcdf96c449091981de2805ce95452297692222fdc97180057dc7d06d076e969c4d66babd52fb3b1a3bc722288182f
+EBUILD bpmdetect-0.6.1-r1.ebuild 945 SHA256 4857e030d26a77c56692f2521bfd7033da7314b6779f0a7411885cca4da72f53 SHA512 883cd4d0ae80882d5039804398bb8740bc1cf04dab86d4afab56ddb3768b4e22519fd49253909fe8f93de8fd65cabad18aad0a25e5a3932b54faf896a7344238 WHIRLPOOL 242d396f2e450a4c89a1f2a7f1874ddbf209dfd8bb710c2ae55803783511e322ee5d8c37f6c47625d171934611ab603dd91fe8c7f0b847a1491fcff79f67fcfe
+MISC ChangeLog 3346 SHA256 4b048c27a2d25ab344cc0f61094a4f663c5c8fcc64ff21fd61bb4361347481e5 SHA512 0bd381b93095f7249974abad906097497fe0bd3addc7e6073b8afe5b169a50767998dbfa97fb046d1df0ff3a63babc273600781702ba81aed37abc7837a586a4 WHIRLPOOL 44a75f7eee07a38b5ebba0459d1b063d33222e9789ce3da9f911a1e37fbca8467b6a488d809d728d32a9b0a86aa4effd1c81aaaf0b9a52de8c8f5a20fa5fcb0c
+MISC ChangeLog-2015 898 SHA256 86714e34b579323e006a549289bf4011700a5c73b8b3b107075772f9f987d78f SHA512 9598b660e5fafefce45636da0b2d0ce9969d279b6bf7d32b4a1362d957d551814bbdf697e86897296e2020fe221b79e3d9aee15e816867edf5a24553a824b6b2 WHIRLPOOL eb7058eebb55e13e20900a0b0f71e24de8e70e9e5a4b409dfeb8a1d882b536d5540651b5c2a855e2d9af0414e0709992b8720cf15bbd19fbd8972c7af6480b37
+MISC metadata.xml 332 SHA256 150ac5e90b862d17749b725484b4c9fc38e3f26ad07bd73dcc8a6bd61afaf130 SHA512 7a6f93e001d436f33d8ee55b467eb2e398b65193ee0c77c0d087916372cba7a5b9693d15aec27e738ea05d54901c1f4f855722384bb9f86d59e10b7d6b6b17d7 WHIRLPOOL 7697e7d3c4dbe3879bc828127a834094fe93513b629afa14a640e187e63481d958c53d02ff9d72e0b29483de7689da583df39be8ba2ded3d918328b2cb4772af
diff --git a/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild b/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..03402a37eec2
--- /dev/null
+++ b/media-sound/bpmdetect/bpmdetect-0.6.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils scons-utils toolchain-funcs
+
+DESCRIPTION="Automatic BPM detection utility"
+HOMEPAGE="https://sourceforge.net/projects/bpmdetect"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-libs/taglib
+	media-libs/id3lib
+	>=media-libs/fmod-4.25.07-r1:1
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	sys-apps/sed
+	dev-util/scons
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}/${P}-gcc44_and_fmodex_path.patch"
+	"${FILESDIR}/${P}-fix-buildsystem.patch"
+	"${FILESDIR}/${P}-fix-printf-format.patch"
+)
+
+src_configure() {
+	myscons=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		QTDIR="/usr/$(get_libdir)"
+		prefix="${D}/usr"
+	)
+}
+
+src_compile() {
+	escons "${myscons[@]}"
+}
+
+src_install() {
+	escons "${myscons[@]}" install
+	dodoc authors readme todo
+}
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch
new file mode 100644
index 000000000000..fa6c0e59db68
--- /dev/null
+++ b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-buildsystem.patch
@@ -0,0 +1,67 @@
+* Fix QA issues in desktop file
+* Make buildsystem respect CXX, CXXFLAGS and LDFLAGS
+https://bugs.gentoo.org/show_bug.cgi?id=334465
+
+--- bpmdetect/src/bpmdetect.desktop
++++ bpmdetect/src/bpmdetect.desktop
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Name=BPMDetect
+ Exec=bpmdetect
+-Icon=bpmdetect-icon.png
++Icon=bpmdetect-icon
+ Type=Application
+ Comment=Automatic BPM detection utility
+-Categories=Application;AudioVideo;Audio:
++Categories=AudioVideo;Audio;
+--- bpmdetect/src/SConscript
++++ bpmdetect/src/SConscript
+@@ -1,5 +1,6 @@
+ #! /usr/bin/env python
+ import os, sys, glob
++import SCons.Util
+ 
+ if not sys.platform.startswith('win'):
+   BOLD   ="\033[1m"
+@@ -156,17 +157,18 @@
+     env.__delitem__('CPPPATH')
+   if env.has_key('CPPDEFINES'):
+     env.__delitem__('CPPDEFINES')
+-  if env.has_key('CXXFLAGS'):
+-    env.__delitem__('CXXFLAGS')
+   if env.has_key('LIBPATH'):
+     env.__delitem__('LIBPATH')
+   if env.has_key('LIBS'):
+     env.__delitem__('LIBS')
+-  if env.has_key('LINKFLAGS'):
+-    env.__delitem__('LINKFLAGS')
+   if env.has_key('QT3'):
+     env.__delitem__('QT3')
+ 
++  if os.environ.has_key('CXXFLAGS'):
++    env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++  if os.environ.has_key('LDFLAGS'):
++    env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++
+   print BOLD + """
+ --------------------------------------------------""" + NORMAL
+   print "Use MinGW compiler                : ",
+@@ -189,7 +191,6 @@
+       env.Append(CXXFLAGS   = '-g')
+   else:
+     print 'no '
+-    env.Append(CXXFLAGS = '-O2' )
+     env.Append(CPPDEFINES = ['NDEBUG', 'NO_DEBUG'])
+     env['DEBUG'] = 0
+ 
+@@ -309,6 +310,10 @@
+   ( 'LINKFLAGS', 'linker flags'),
+   ( 'QT3', 'use qt3')
+ )
++if os.environ.has_key('CC'):
++  env['CC'] = os.environ['CC']
++if os.environ.has_key('CXX'):
++  env['CXX'] = os.environ['CXX']
+ opts.Update(env)
+ 
+ # to avoid an error message 'how to make target configure... ?'
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch
new file mode 100644
index 000000000000..89bf64445e76
--- /dev/null
+++ b/media-sound/bpmdetect/files/bpmdetect-0.6.1-fix-printf-format.patch
@@ -0,0 +1,37 @@
+Fix broken printf statements:
+* src/main.cpp:49:62: warning: too many arguments for format [-Wformat-extra-args]
+*    printf("Usage:\n bpmdetect [switches] [files]\n\n", version);
+*
+* src/track.cpp:111:57: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘double’ [-Wformat=]
+*      snprintf(buffer, BPM_LEN, "%05d", (int) dBPM * 100. );
+
+--- bpmdetect/src/main.cpp
++++ bpmdetect/src/main.cpp
+@@ -34,6 +34,7 @@
+ #endif
+ 
+ #include <getopt.h>
++#include <stdio.h>
+ 
+ #include "track.h"
+ #include "trackfmod.h"  // for FMOD system
+@@ -46,7 +47,7 @@
+ 
+ void display_help() {
+   printf("BPMDetect version %s\n\n", version);
+-  printf("Usage:\n bpmdetect [switches] [files]\n\n", version);
++  fputs("Usage:\n bpmdetect [switches] [files]\n\n", stdout);
+   printf("Switches:\n");
+ #ifndef NO_GUI
+   printf("-c --console         - run in console mode\n");
+--- bpmdetect/src/track.cpp
++++ bpmdetect/src/track.cpp
+@@ -108,7 +108,7 @@
+   } else if( format == "000" ) {
+     snprintf(buffer, BPM_LEN, "%03d", (int) dBPM );
+   } else if( format == "00000" ) {
+-    snprintf(buffer, BPM_LEN, "%05d", (int) dBPM * 100. );
++    snprintf(buffer, BPM_LEN, "%05d", static_cast<int>(dBPM * 100.) );
+   } else { // all other formats are converted to "0.00"
+     snprintf(buffer, BPM_LEN, "%.2f", dBPM );
+   }
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch b/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch
new file mode 100644
index 000000000000..c29961645615
--- /dev/null
+++ b/media-sound/bpmdetect/files/bpmdetect-0.6.1-gcc44_and_fmodex_path.patch
@@ -0,0 +1,36 @@
+diff -ur bpmdetect.orig/src/main.cpp bpmdetect/src/main.cpp
+--- bpmdetect.orig/src/main.cpp	2008-05-01 12:50:18.000000000 +0300
++++ bpmdetect/src/main.cpp	2009-06-03 22:24:56.000000000 +0300
+@@ -20,6 +20,8 @@
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
+ 
++#include <cstdio>
++
+ #ifndef NO_GUI
+  #ifdef USE_QT3
+   #include "dlgbpmdetect3.h"
+diff -ur bpmdetect.orig/src/SConscript bpmdetect/src/SConscript
+--- bpmdetect.orig/src/SConscript	2008-04-24 19:49:52.000000000 +0300
++++ bpmdetect/src/SConscript	2009-06-03 22:33:57.000000000 +0300
+@@ -234,7 +234,7 @@
+ 
+   env.Append(LIBS = ['id3', 'fmodex', 'z'])
+   env.Append(CPPPATH = ['.', '..', '../includes'])
+-  env.Append(LIBPATH = ['.', '../libs'])
++  env.Append(LIBPATH = ['.', '../libs', '/opt/fmodex/api/lib'])
+   env['ISCONFIGURED']=1
+   # And finally save the options in the cache
+   opts.Save(cachefile, env)
+diff -ur bpmdetect.orig/src/track.cpp bpmdetect/src/track.cpp
+--- bpmdetect.orig/src/track.cpp	2008-04-25 22:33:18.000000000 +0300
++++ bpmdetect/src/track.cpp	2009-06-03 22:26:24.000000000 +0300
+@@ -20,6 +20,8 @@
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
+ 
++#include <cstdio>
++
+ #include "track.h"
+ #include "trackfmod.h"
+ #include "BPMDetect.h"
diff --git a/media-sound/bpmdetect/metadata.xml b/media-sound/bpmdetect/metadata.xml
new file mode 100644
index 000000000000..9a466099f162
--- /dev/null
+++ b/media-sound/bpmdetect/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">bpmdetect</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest
new file mode 100644
index 000000000000..a5badcd77a78
--- /dev/null
+++ b/media-sound/bristol/Manifest
@@ -0,0 +1,10 @@
+AUX bristol-0.60.11-cflags.patch 7046 SHA256 d1314d1ee4609eb4526917e8da37edba484c670b1aff953f6ca08126f90f35d9 SHA512 92881949eeeabd3afa6253f4830bcc3925bd8889ac8335c08b86a3d9c7e53ca097527a51a341d5f7bcb2fd81eda5e038a33eff92af381d8d6b6e0f03e5bcbe1e WHIRLPOOL 0b4285cf878891bf9a3a08d4e3509e68e2513dc3dcb6775da2c0cf957201658c81876431a2caf3088a113e9d1f9c7eae10ce827619866669f78b161415b99aa3
+AUX bristol-0.60.11-implicit-dec.patch 320 SHA256 435bd056aebe46075b001fd4b47627008b33e09a4dbb4a167564e5df8ca15161 SHA512 50a59747c75a8843b06fc412c65d724d8f205be1c6d9d5c0aa0d38c57f0f1401634dd301b531f8a28ca43f3804727d9ded82e6fa49abd5372fc8e70f87f5b341 WHIRLPOOL d9050f9ee39c215d5263ed2bdf654eea416947e6d4222c06e322e7168215e50c974c8b2c5cf6903efb2d103f04c2edbc42bfaeedbf403f0aa4a9f5995d9b0b54
+AUX bristol-0.60.9-cflags.patch 553 SHA256 1ea85c533865fe71147b7438b9e96a032d12309d06e0886bd6bf6fa8eb55eef0 SHA512 a687832402925cf596fdc563496607dd366bb6bd0f0ca6873ab28053eb6f03a164308cbcb2a9da3acce199610b225b3581e2dc3dab723693a57a1498aa32c4f3 WHIRLPOOL d10632ee0d2274247d87767cf4077dc2bafa9c89301c96cb4e2f64a46303b2391ec13f195dc857d15874b2cee811008965a70c9e44eafe51cba3a5ef366839cf
+DIST bristol-0.60.11.tar.gz 4218697 SHA256 7d1f0bbd0d7d303fc77c6b9549b61708d7a83b4dc007818011b1f55d1fa922ba SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180 WHIRLPOOL dee8b8937b36747426bde32c5d027e44dd1d0b7791997e130122b4bad0abfb31c4957983610086b64e358963fbf78b4e2014af1105c1300dc8deec14e669d2bf
+DIST bristol-0.60.9.tar.gz 4323706 SHA256 0f3e67a18ffeaadd0600facdb4e10437c855fd078ce26292f6f905aa96cd6cf6 SHA512 216af07af507ecefa4f2ddcd61fda1c1b7456df1d50cd31112fcf2aa6a3aa153557f72d7ec35f5df70b9ce33935f01d27c8ad2cd42fef9622f3645179ae685ff WHIRLPOOL 0454f205a7cbe5c652d7b4ba006081a8c23186e7b4144259c34bc6f979409207619f7ce709857abac9751a527cbfda1d61e9a07dd3432646ab0f135560823cfb
+EBUILD bristol-0.60.11.ebuild 1077 SHA256 10b87d30811744e726fa486e518ad1aaa3a1c55695ff6393f4eeca7b7065dd3f SHA512 b980fcd0c402a44360fca7192f20128fde81827984bda8d55371cfe67f86fb6499aef2a57d8586f8458d93b20697f7a19b00d8d5afd4f8ba581969b385cf7e46 WHIRLPOOL a46767bc8de5e53c1e3eb3973691276c68baeaf587ac1d14bf80fc369080215191bf7bd1cae77f5add317120ec365ae25eafe00c6890d353bf5e72481fb2503f
+EBUILD bristol-0.60.9.ebuild 1022 SHA256 3b5e51addc37e62d724a51dfe73eb4bd2c714e7d4eb9442e6addd37ec4a72991 SHA512 10764e2d9d328295a8b3b58f90ebbc869886c3478c8f6a1f94f7969bf5956d5bad8cf115b4497d2ecfc408551874e8acf31b74940dd4c829759794608470f9b6 WHIRLPOOL 0033c631c2207c70a38cc49ed8270b4f446691f8da1685176eb850f5de640370176a294664882c75872d8269bc37245243c38ae18ebb50f7db1a27bc3b3c463d
+MISC ChangeLog 2747 SHA256 30fe4e92fe30cff69c56653dbe4b461d62a87e09d8cd9f1bfe336c8ce2dabeb0 SHA512 5a9b68bb7cfff5157db74c21891262e1dbf58c7896402752452a1d5e2686fd3e49de229bd64e41fce98a8242ea766c7eb7e33bf945ee037acb4f9c390c2b30cc WHIRLPOOL 4b344ae07eaaada5c963d582854880662b71aa1b9d7b2e8e143d004f87b31f33ffb78495e1c00dff45d4d79ce5a9a0aa3d5bc62d73ece9cb0f94eeb0f3e9bd3f
+MISC ChangeLog-2015 2738 SHA256 57d922233bb6c0ccc2001291fa7cf1be9cd84041e78c4470494d239d513e65fc SHA512 8ea4b17b547758cab8a35d41f9bcef6f34368114f00c952a2f3ba06af5637b0491da542601057526b43313ace88674d5cce3dfb8590cf04515798936fe862d03 WHIRLPOOL 28cfbd84550ca429f2ac528018ca58c448aff4bd2436077e4e47dd6aa5d6cf865eff30984b66ffb777b6354bbcf662c5c3be4ef4719084b137481e0ee3ba408f
+MISC metadata.xml 599 SHA256 782b26d0b288e6682c9f6e1a401bdbfce0c1245c50fdf9ba7d7c28b64f38f545 SHA512 ca1be472e9a1dce6e55d3313e9b11f0839fbb321c5b662ebf4a9aca0915d10b15cbe3aee3629b285886e84b53f8c7d0c65613e58be32d5d98f04360b368da1ba WHIRLPOOL aa3dd49994973d05ecd2bd7e31fb0bcf8f6921238efea65101ecf464caf0d3e53b49663f552b4f5ea61ae813e1d20a6ff9b626e14456840c6676c79b779c8860
diff --git a/media-sound/bristol/bristol-0.60.11.ebuild b/media-sound/bristol/bristol-0.60.11.ebuild
new file mode 100644
index 000000000000..70e8fdeb0cdc
--- /dev/null
+++ b/media-sound/bristol/bristol-0.60.11.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
+HOMEPAGE="https://sourceforge.net/projects/bristol"
+SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa oss static-libs"
+# osc : configure option but no code it seems...
+# jack: fails to build if disabled
+# pulseaudio: not fully supported
+
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	x11-libs/libX11"
+# osc? ( >=media-libs/liblo-0.22 )
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-implicit-dec.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-version-check \
+		$(use_enable oss) \
+		$(use_enable alsa)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/media-sound/bristol/bristol-0.60.9.ebuild b/media-sound/bristol/bristol-0.60.9.ebuild
new file mode 100644
index 000000000000..84cc501d0363
--- /dev/null
+++ b/media-sound/bristol/bristol-0.60.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils autotools-utils
+
+DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
+HOMEPAGE="https://sourceforge.net/projects/bristol"
+SRC_URI="mirror://sourceforge/bristol/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa oss static-libs"
+# osc : configure option but no code it seems...
+# jack: fails to build if disabled
+
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	x11-libs/libX11"
+# osc? ( >=media-libs/liblo-0.22 )
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog HOWTO NEWS README )
+
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
+
+src_prepare() {
+	autotools-utils_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-version-check
+		$(use_enable alsa)
+		$(use_enable oss)
+		#$(use_enable osc liblo)
+	)
+	autotools-utils_src_configure
+}
diff --git a/media-sound/bristol/files/bristol-0.60.11-cflags.patch b/media-sound/bristol/files/bristol-0.60.11-cflags.patch
new file mode 100644
index 000000000000..ebce6f444fbe
--- /dev/null
+++ b/media-sound/bristol/files/bristol-0.60.11-cflags.patch
@@ -0,0 +1,111 @@
+--- bristol-0.60.11/bin/Makefile.am
++++ bristol-0.60.11/bin/Makefile.am
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+ LDFLAGS = -Bdynamic -lm -lpthread `pkg-config --silence-errors --libs jack`
+-AM_CFLAGS = -pthread -Wall -g -I. -I$(srcdir)/../include/bristol @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @JACK_CFLAGS@
++AM_CFLAGS = -pthread -Wall -I. -I$(srcdir)/../include/bristol @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @JACK_CFLAGS@
+ 
+ #bin_PROGRAMS = bristoljackstats bristolnotegen bristolNRPgen
+ bin_PROGRAMS = bristoljackstats
+--- bristol-0.60.11/brighton/Makefile.am
++++ bristol-0.60.11/brighton/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRIGHTON_HAS_X11@ -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton -I$(srcdir)/../include/bristol -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRIGHTON_HAS_X11@ -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@
+ 
+ bin_PROGRAMS = brighton
+ brighton_LDFLAGS = -Bdynamic -L../libbrighton/ -L../libbristolmidi/.libs @BRIGHTON_LIBXLIBS@ -L/usr/X11R6/lib -L../libbvg
+--- bristol-0.60.11/bristol/Makefile.am
++++ bristol-0.60.11/bristol/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -I. -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@ @BRISTOL_JACK_DEFAULT_MIDI@ @BRISTOL_JACK_DEFAULT@ @BRISTOL_JACK_MULTI_CLOSE@ @BRISTOL_SEMAPHORE@ @BRISTOL_SEM_OPEN@ @BRISTOL_BARRIER@ @BRISTOL_HAS_PA@ -DBRISTOL_RAMP_RATE=@BRR@ @BRISTOL_LIN_ATTACK@ @BRISTOL_HAS_DRAIN@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @BRISTOL_HAS_JACK_SESSION@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@ -msse -mfpmath=sse -ffast-math -fomit-frame-pointer -O2
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -I. -DBRISTOL_VOICECOUNT=@_BRISTOL_VOICES@ @BRISTOL_JACK_DEFAULT_MIDI@ @BRISTOL_JACK_DEFAULT@ @BRISTOL_JACK_MULTI_CLOSE@ @BRISTOL_SEMAPHORE@ @BRISTOL_SEM_OPEN@ @BRISTOL_BARRIER@ @BRISTOL_HAS_PA@ -DBRISTOL_RAMP_RATE=@BRR@ @BRISTOL_LIN_ATTACK@ @BRISTOL_HAS_DRAIN@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @BRISTOL_HAS_JACK_SESSION@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@
+ 
+ bin_PROGRAMS = bristol
+ #bristol_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol -L../libbristolic
+--- bristol-0.60.11/libbrighton/Makefile.am
++++ bristol-0.60.11/libbrighton/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. -O0 @BRIGHTON_HAS_X11@ @BRIGHTON_HAS_AUTOZOOM@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. -O0 @BRIGHTON_HAS_X11@ @BRIGHTON_HAS_AUTOZOOM@
+ 
+ noinst_LIBRARIES = libbrighton.a
+ #libbrighton_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ @BRIGHTON_LIBXLIBS@ @BRIGHTON_LIBXLIBS@
+--- bristol-0.60.11/libbrightonC11/Makefile.am
++++ bristol-0.60.11/libbrightonC11/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton @BRIGHTON_HAS_XIMAGE@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton @BRIGHTON_HAS_XIMAGE@
+ 
+ #libC11_la_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@
+ #libC11_la_LIBADD=
+--- bristol-0.60.11/libbrightonX11/Makefile.am
++++ bristol-0.60.11/libbrightonX11/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ @BRIGHTON_HAS_XIMAGE@ @BRIGHTON_HAS_SHMIMAGE@ @BRIGHTON_HAS_X11@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ @BRIGHTON_HAS_XIMAGE@ @BRIGHTON_HAS_SHMIMAGE@ @BRIGHTON_HAS_X11@
+ 
+ #libB11_a_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@
+ #libB11_a_LIBADD= -L/usr/X11R6/lib -lX11
+--- bristol-0.60.11/libbristol/Makefile.am
++++ bristol-0.60.11/libbristol/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_PA@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_PA@
+ #libbristol_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -march=core2 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3
+ #libbristol_la_LIBADD=$(top_builddir)/libbristol/libbristol.la
+ 
+--- bristol-0.60.11/libbristolaudio/Makefile.am
++++ bristol-0.60.11/libbristolaudio/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -DBRISTOL_HAS_OSS=@BRISTOL_HAS_OSS@ @BRISTOL_HAS_DRAIN@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @BRISTOL_HAS_JACK_SESSION@ @ALSA_CFLAGS@ @JACK_CFLAGS@ @BRISTOL_HAS_PA@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -DBRISTOL_HAS_OSS=@BRISTOL_HAS_OSS@ @BRISTOL_HAS_DRAIN@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ @BRISTOL_HAS_JACK_SESSION@ @ALSA_CFLAGS@ @JACK_CFLAGS@ @BRISTOL_HAS_PA@
+ 
+ #libbristolaudio_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
+ #libbristolaudio_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@
+--- bristol-0.60.11/libbristolic/Makefile.am
++++ bristol-0.60.11/libbristolic/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/bristol -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/bristol -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@
+ #libbristolic_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
+ 
+ noinst_LIBRARIES = libbristolic.a
+--- bristol-0.60.11/libbristolmidi/Makefile.am
++++ bristol-0.60.11/libbristolmidi/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol @ALSA_CFLAGS@ @JACK_CFLAGS@ @BRISTOL_HAS_JACK_MIDI@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ -O1
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol @ALSA_CFLAGS@ @JACK_CFLAGS@ @BRISTOL_HAS_JACK_MIDI@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_JACK@ -O1
+ libbristolmidi_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
+ libbristolmidi_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ -lm
+ 
+--- bristol-0.60.11/libbvg/Makefile.am
++++ bristol-0.60.11/libbvg/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@
+ 
+ noinst_LIBRARIES = libbvg.a
+ #libbvg_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
diff --git a/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch b/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch
new file mode 100644
index 000000000000..4f3ba054cd9b
--- /dev/null
+++ b/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch
@@ -0,0 +1,10 @@
+--- bristol-0.60.11/bristol/bristolmemorymoog.c
++++ bristol-0.60.11/bristol/bristolmemorymoog.c
+@@ -33,6 +33,7 @@
+ #include "bristolmemorymoog.h"
+ 
+ extern int buildCurrentTable(Baudio *, float);
++extern void doPitchWheel(Baudio *);
+ 
+ /*
+  * Use of these memorymoog global buffers will be an issue with use of multiple
diff --git a/media-sound/bristol/files/bristol-0.60.9-cflags.patch b/media-sound/bristol/files/bristol-0.60.9-cflags.patch
new file mode 100644
index 000000000000..502b8eb937fe
--- /dev/null
+++ b/media-sound/bristol/files/bristol-0.60.9-cflags.patch
@@ -0,0 +1,10 @@
+--- bristol-0.60.9/libbrighton/Makefile.am.orig
++++ bristol-0.60.9/libbrighton/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. -O0 @BRIGHTON_HAS_X11@ @BRIGHTON_HAS_AUTOZOOM@
++AM_CFLAGS = -pthread -Wall -I$(srcdir)/../include/brighton -I/usr/X11R6/include/ -I. @BRIGHTON_HAS_X11@ @BRIGHTON_HAS_AUTOZOOM@
+ libbrighton_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ @BRIGHTON_LIBXLIBS@ @BRIGHTON_LIBXLIBS@
+ 
+ lib_LTLIBRARIES = libbrighton.la
diff --git a/media-sound/bristol/metadata.xml b/media-sound/bristol/metadata.xml
new file mode 100644
index 000000000000..52e6ed1b7497
--- /dev/null
+++ b/media-sound/bristol/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Bristol is synth emulation package for a diverse range of vintage
+		synthesisers, electric pianos and organs. The application consists of a
+		multithreaded audio synthesizer and a user interface called brighton.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">bristol</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/brutefir/Manifest b/media-sound/brutefir/Manifest
new file mode 100644
index 000000000000..44d7bc2b1e57
--- /dev/null
+++ b/media-sound/brutefir/Manifest
@@ -0,0 +1,6 @@
+AUX brutefir-1.0k-ld.patch 4655 SHA256 8ddc87a93892a71b1da62d05ac1b9f17b9e4d8646da6c6ca3221bac85ba8e005 SHA512 606d32f1b76901e3cb6d106259d19c64e3a6f841fd5d0791623ad824c7264ff3ecd7178073fe488c7f1d26b996b9900f9661406f987f2443e9eb8ef9eeb6491a WHIRLPOOL b5acf6913101b2561642e51eca7f7f6ee96322478149703974ddaa0dcfd68d891df578b5211fde04bf918f53b02b29774b0ca8ad61e5f63d251ee718a164e2a0
+DIST brutefir-1.0k.tar.gz 246987 SHA256 e262ea30402e06a23c0396b46b38019f7e9bc66493feabb8792d43e16068e715 SHA512 5eb81a18935fc3f014613b74c30b2e9a3acfe0ab58b72358f0428b60f0296ab54796b99fa00b12a671935b57589d710dd81b1e0ca675bd2b841c9e932a2c94ef WHIRLPOOL 3d8fb3375e7efe1e08bdd1cf9da285b0d13c238e5f48e8eb605e6fde216861fb035ca2804d5f1f09f0e212261d10d16cabf2ce29a0051b463311d1db7b155b78
+EBUILD brutefir-1.0k-r1.ebuild 1217 SHA256 b799ec6d76cf59f0521dd05506dd6f4d12525e1fcb044e91e403ad49cfa1c7f6 SHA512 86a2d22827c14dd89105976676f7c9e48143a610b07e3ea53e5cf7536716ee4acaec0eea1ebd78d3879b0c1c6c45e2fbe30983d57bb14409232453df02951dae WHIRLPOOL fe8e19444c2f35497f5e580636a7a955a781c1cd4a0a916cca676c1642c063c251840dea8e83fea36662c71e49c4c8ba5474f6aeff0cd99f99e7fb22b559a206
+MISC ChangeLog 2468 SHA256 509c4841e524cfabbdf133c0d9a940a0cb5d00db90e32b4f826da84d031863d2 SHA512 be0f8e9a82281eecb7e6157ebb4f94dac354af13001798ba4e1adf7d009ad4f510f72da11c80ad2310a8085b9d3f70a1c11d1872eb3637fd9c27e37a436c3493 WHIRLPOOL 015765da152f62775e3cd295c84a27729b4e1209f7d2ef421183d9251d6b975b435b2ce13c84df457ba6384149a1a619a6ee01c1d7d0520053ebd380f762df23
+MISC ChangeLog-2015 2748 SHA256 0a64993a00012439750185d1fe98ecccbede56d4fd794cd9e88a3cb1f6913626 SHA512 dd231cdd3f4d0b38450c0dde9d3c91d449c5e08ea63802a9bdfb4aee99688e844af1333ea15be60fe76690c2407f2ec010f3ef7dba2d6e51b27a21e6ec1c3865 WHIRLPOOL a579b300115cba44d3b03721f333cfdbd8a90843aee15d304c059e1d7dd1c3f7aa4dc1389e83fe1c03611560dadf3e85c9cde6e3e8c30ccdb4a107dd691bf78c
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/brutefir/brutefir-1.0k-r1.ebuild b/media-sound/brutefir/brutefir-1.0k-r1.ebuild
new file mode 100644
index 000000000000..1ec006053754
--- /dev/null
+++ b/media-sound/brutefir/brutefir-1.0k-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Software convolution engine for applying long FIR filters"
+HOMEPAGE="http://www.ludd.luth.se/~torger/brutefir.html"
+SRC_URI="http://www.ludd.luth.se/~torger/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	media-sound/jack-audio-connection-kit
+	sci-libs/fftw:3.0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ld.patch
+}
+
+src_compile() {
+	tc-export AS CC
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" \
+		install || die "emake install failed"
+	dodoc CHANGES README
+
+	insinto /usr/share/${PN}
+	doins xtc_config directpath.txt crosspath.txt massive_config \
+		bench1_config bench2_config bench3_config bench4_config \
+		bench5_config || die "doins failed"
+}
+
+pkg_postinst() {
+	elog "Brutefir is a complicated piece of software. Please"
+	elog "read the documentation first! You can find"
+	elog "documentation here: http://www.ludd.luth.se/~torger/brutefir.html"
+	elog "Example config files are in /usr/share/brutefir"
+}
diff --git a/media-sound/brutefir/files/brutefir-1.0k-ld.patch b/media-sound/brutefir/files/brutefir-1.0k-ld.patch
new file mode 100644
index 000000000000..6860b5f360b5
--- /dev/null
+++ b/media-sound/brutefir/files/brutefir-1.0k-ld.patch
@@ -0,0 +1,132 @@
+The problem is that it passes -fPIC to the linker, and it does not use gcc as
+frontend, it uses ld directly. The problem is that -f on ld that produces a
+DT_AUXILIARY rather than causing any PIC code production. Fix also DESTDIR
+handling and add LIBDIR variable for multilib systems.
+
+See, http://bugs.gentoo.org/252338
+
+diff -ur brutefir-1.0k.orig/Makefile brutefir-1.0k/Makefile
+--- brutefir-1.0k.orig/Makefile	2009-03-31 22:36:20.000000000 +0300
++++ brutefir-1.0k/Makefile	2009-06-21 05:44:03.000000000 +0300
+@@ -1,11 +1,13 @@
+ ###################################
+ # Where to install
+-INSTALL_PREFIX	= $(DESTDIR)/usr/local
++# PREFIX	= /usr/local
++PREFIX		= /usr
++LIBDIR		= $(PREFIX)/lib
+ 
+ ###################################
+ # Where to find libraries, and their header files.
+-LIBPATHS	= -L/usr/local/lib
+-INCLUDE		= -I/usr/local/include
++# LIBPATHS	= -L/usr/local/lib
++# INCLUDE	= -I/usr/local/include
+ ifdef FFTW_PATH
+ LIBPATHS	+= -L$(FFTW_PATH)/lib
+ INCLUDE		+= -I$(FFTW_PATH)/include
+@@ -17,19 +19,15 @@
+ 
+ ###################################
+ # Binaries
+-FLEX	= flex
+-LD	= ld
+-CC	= gcc
+-AS	= as
++FLEX	?= flex
++CC	?= gcc
++AS	?= as
+ 
+ ###################################
+ # Flags
+-CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
++CFLAGS		+= -Wall -Wlong-long -Wpointer-arith -Wshadow \
+ -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes \
+ -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
+-CC_FLAGS	= $(DEFINE) -O2
+-CC_FPIC		= -fPIC
+-LD_SHARED	= -shared
+ 
+ ###################################
+ # Objects and libs for targets
+@@ -74,7 +72,7 @@
+ BRUTEFIR_OBJS	+= $(BRUTEFIR_IA32_OBJS)
+ endif
+ BRUTEFIR_LIBS	+= -ldl
+-LDMULTIPLEDEFS	= -Xlinker --allow-multiple-definition
++LINKFLAGS	= -fPIC -shared -Xlinker --allow-multiple-definition
+ # assume that we have alsa, osss and jack
+ LIB_TARGETS	+= alsa.bfio
+ LIB_TARGETS	+= oss.bfio
+@@ -83,11 +81,11 @@
+ 
+ # Solaris
+ ifeq ($(UNAME),SunOS)
+-CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
++CFLAGS		+= -Wall -Wlong-long -Wpointer-arith -Wshadow \
+ -Wcast-qual -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations \
+ -Wnested-externs
+ ifeq ($(UNAME_P),sparc)
+-CC_FLAGS	+= -Wa,-xarch=v8plus
++CFLAGS		+= -Wa,-xarch=v8plus
+ endif
+ BRUTEFIR_LIBS	+= -lrt -ldl
+ endif
+@@ -112,43 +110,44 @@
+ 	$(AS) -o $@			$<
+ 
+ %.fpic.o: %.c
+-	$(CC) -o $@			-c $(INCLUDE) $(CC_FPIC) $(CC_WARN) $(CC_FLAGS) $<
++	$(CC) -fPIC -shared -o $@	-c $(INCLUDE) $(CFLAGS) $<
+ 
+ %.o: %.c
+-	$(CC) -o $@			-c $(INCLUDE) $(CC_WARN) $(CC_FLAGS) $<
++	$(CC) -o $@			-c $(INCLUDE) $(CFLAGS) $<
+ 
+ # special rule to avoid to get warnings from code generated by flex
+ bfconf_lexical.o: bfconf_lexical.c
+-	$(CC) -o $@			-c $(INCLUDE) $(CC_FLAGS) $<
++	$(CC) -o $@			-c $(INCLUDE) $(CFLAGS) $<
+ 
+ %.c: %.lex
+ 	$(FLEX) -o$@ $<
+ 
+ brutefir: $(BRUTEFIR_OBJS)
+-	$(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
++	$(CC) $(LDFLAGS) $(LDMULTIPLEDEFS) $(CFLAGS) $(LIBPATHS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
+ 
+ alsa.bfio: $(BFIO_ALSA_OBJS)
+-	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
+ 
+ oss.bfio: $(BFIO_OSS_OBJS)
+-	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
+ 
+ jack.bfio: $(BFIO_JACK_OBJS)
+-	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
+ 
+ file.bfio: $(BFIO_FILE_OBJS)
+-	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
+ 
+ cli.bflogic: $(BFLOGIC_CLI_OBJS)
+-	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
+ 
+ eq.bflogic: $(BFLOGIC_EQ_OBJS)
+-	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
++	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
+ 
+ install: $(BIN_TARGETS) $(LIB_TARGETS)
+-	install -d $(INSTALL_PREFIX)/bin $(INSTALL_PREFIX)/lib/brutefir
+-	install $(BIN_TARGETS) $(INSTALL_PREFIX)/bin
+-	install $(LIB_TARGETS) $(INSTALL_PREFIX)/lib/brutefir
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install $(BIN_TARGETS) $(DESTDIR)$(PREFIX)/bin
++	install -d $(DESTDIR)$(LIBDIR)/brutefir
++	install $(LIB_TARGETS) $(DESTDIR)$(LIBDIR)/brutefir
+ 
+ clean:
+ 	rm -f *.core core bfconf_lexical.c $(BRUTEFIR_OBJS) $(BFIO_FILE_OBJS)  \
diff --git a/media-sound/brutefir/metadata.xml b/media-sound/brutefir/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/brutefir/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
new file mode 100644
index 000000000000..71b60a6c1ffc
--- /dev/null
+++ b/media-sound/cantata/Manifest
@@ -0,0 +1,9 @@
+AUX cantata-2.1.0-headers.patch 1018 SHA256 6dcb056e22db3d2633235caa3dbb7b52b7bb4ac35c370cfa65438704bcc1324a SHA512 4e5f2d37ab36196919a78c0c4277c2428ef1e7681324ac071fc91408d40f4aa856dfe94bde7d7f600aac13e773921814ab416631fd534ac17a13177c21439a30 WHIRLPOOL fbb9f13a557ee47061689a2be3842cff65c1853a48e06801ab728827892e7ca7460a9b8966b3590b61e5ce9fa2b3f5c5acef71a0dc6958438b1bea14c33849ba
+AUX cantata-2.2.0-headers.patch 1345 SHA256 360b7600d99395684fb6d3cb57817c94646fb7d4290343e776eb4241b08bbeab SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df WHIRLPOOL 354e2d42f8164cb90d9ee3600945e0f9c00d9ce1061278640389fb6bfae39677ac0d21dd7bf98b730a73539001e6134061af4def3f6df3c7aa082fa024f8a247
+DIST cantata-2.1.0.tar.bz2 2207271 SHA256 9317afcae75c709ec733da069d4245b47e6e2c297a259eaf87a181fa9d1cd4c4 SHA512 bf03933785110d0d0c1dfbfc27f4974869ae7c79afe3cf1da1f3024c95d86733d8bea77f2a882887de79a7897ffcdac4262e58747dd4e979824943991675c5d2 WHIRLPOOL 5d58b84290c387d535e556553e64bba36520a099565c44bed1c4e9cf800c2a432ac09296b989a557e72d81a951c926b4bb638f2d2ab7976735059ebb74b8c8e2
+DIST cantata-2.2.0.tar.bz2 2251649 SHA256 c84691eb17711118d3c512d70cb422267f7a137290082cdd1ff0a871b4a8e5c0 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd WHIRLPOOL 50a44192368ee90708ecf906401c28d6a06878d61cfefae04bcab3463343c11bcfe3054880364886e57f797cc303fe14a4f2010e87ad873ba4de3738c05399e7
+EBUILD cantata-2.1.0.ebuild 2725 SHA256 54c6793a89ed016aff139fa039634af0f2aa885e7b8d196738489599dd224754 SHA512 d823027e8181e50e4eccbaf11aa45456d8f04b6f3a403ed4f23962830fa53bf822bea3ae4c6af564a10e3566b25ed4f5829ca5c6530917bf245b26991f2c43e5 WHIRLPOOL e8641a969bf3667674f4a5f12b0522f419c513598deb02b75814bb515e780bcb84a30438afe560873430c6d699b32cbe9740ae11aa979a893651d146bbd97a20
+EBUILD cantata-2.2.0.ebuild 2784 SHA256 337cb9cb32a2f13a856beb300bc6cb7b6374c1ada01b409942d2a7f6c932b7c7 SHA512 f50abe7ba97aae423d48d6fc29099633c9be1c6c500c8725a1bbbd6b743ee6b39bf0d133229959c3a8fa943355716be270fdacbf130ea9060d71c2034329338e WHIRLPOOL 36c65d11f4b7e70c6ce23da1433ac3983062d6f8225965d9179801c25e0d34fa90c48eb898d656ff98f8e99d28142b3535213ff887dc9f64c07554d014edc6b1
+MISC ChangeLog 4843 SHA256 c02d7b259f24e9f14dad63626564aa1145641a0d51de8917409827182e856af6 SHA512 c39f1feb920ce7e4dcdce22b93ff1c14876305aec11e29b0e52cf96f286cb267a6388ad5a665ccef9d625e04cd0b82be1dcdc7526f6a649cab3962533010b54e WHIRLPOOL 6c6b93df770ec945ac481d827880b4bf93836e95e6f8bfb599ab3b7f2d32d6d510359cfd181ce55e5b3be20251b3ff273cb57b0df39136522c87814ce3ec55cb
+MISC ChangeLog-2015 5497 SHA256 9ebde97b0b56ec60a5f1c83fbebd8e180d5421fd389249afafcec7ad4bf674ee SHA512 2bd57729bbc7f86b5149e9c61b7da340a9b4435b68b05e0e31f1ecd983738180ffc4c91027137f89c54018186ee4e1d33f77ea5a97405dae44bdc1a463157193 WHIRLPOOL 9b6be1f1d1e14ecb5bd1a5377d0145e3a42174ec06ea882f775d9fecbb1d4e622c70a732c65c12b88ae1da80d0a20434e5f7656056cce3f13f75f0fa5ce76ad6
+MISC metadata.xml 739 SHA256 eeacc7f784bb39383fe7343cde6f5558465011e86678a41da9fc16a10c6d6fca SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97 WHIRLPOOL 255b97ad9b0e411307e16b8679992542560b2e2588e5a375aa2bc55dc742f7eca8156a34cf494767855d8aa50efb9cfedf191bdcc4bccec4881e7f29a2b7ea47
diff --git a/media-sound/cantata/cantata-2.1.0.ebuild b/media-sound/cantata/cantata-2.1.0.ebuild
new file mode 100644
index 000000000000..e60ac6b3c74a
--- /dev/null
+++ b/media-sound/cantata/cantata-2.1.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN"
+inherit cmake-utils gnome2-utils l10n qmake-utils xdg
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
+HOMEPAGE="https://github.com/CDrummond/cantata"
+SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain taglib udisks"
+REQUIRED_USE="
+	?? ( cdda cdio )
+	cdda? ( udisks || ( cddb musicbrainz ) )
+	cddb? ( || ( cdio cdda ) taglib )
+	cdio? ( udisks || ( cddb musicbrainz ) )
+	mtp? ( taglib udisks )
+	musicbrainz? ( || ( cdio cdda ) taglib )
+	replaygain? ( taglib )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+	sys-libs/zlib
+	virtual/libudev:=
+	cdda? ( media-sound/cdparanoia )
+	cdio? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	mtp? ( media-libs/libmtp )
+	musicbrainz? ( media-libs/musicbrainz:5= )
+	replaygain? (
+		media-libs/libebur128
+		media-sound/mpg123
+		virtual/ffmpeg
+	)
+	taglib? (
+		media-libs/taglib[asf(+),mp4(+)]
+		media-libs/taglib-extras
+		udisks? ( sys-fs/udisks:2 )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/linguist-tools:5
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-headers.patch" )
+
+src_prepare() {
+	remove_locale() {
+		rm "translations/${PN}_${1}".ts || die
+	}
+
+	cmake-utils_src_prepare
+
+	# Unbundle 3rd party libs
+	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
+
+	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
+	l10n_for_each_disabled_locale_do remove_locale
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
+		-DENABLE_CDPARANOIA=$(usex cdda)
+		-DENABLE_CDIOPARANOIA=$(usex cdio)
+		-DENABLE_CDDB=$(usex cddb)
+		-DENABLE_HTTP_SERVER=$(usex http-server)
+		-DENABLE_MTP=$(usex mtp)
+		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
+		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+		-DENABLE_FFMPEG=$(usex replaygain)
+		-DENABLE_MPG123=$(usex replaygain)
+		-DENABLE_TAGLIB=$(usex taglib)
+		-DENABLE_TAGLIB_EXTRAS=$(usex taglib)
+		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
+		-DENABLE_HTTP_STREAM_PLAYBACK=OFF
+		-DENABLE_REMOTE_DEVICES=OFF
+		-DENABLE_UDISKS2=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_pkg_postrm
+}
diff --git a/media-sound/cantata/cantata-2.2.0.ebuild b/media-sound/cantata/cantata-2.2.0.ebuild
new file mode 100644
index 000000000000..3a22fc204396
--- /dev/null
+++ b/media-sound/cantata/cantata-2.2.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN"
+inherit cmake-utils gnome2-utils l10n qmake-utils xdg
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
+HOMEPAGE="https://github.com/CDrummond/cantata"
+SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks"
+REQUIRED_USE="
+	?? ( cdda cdio )
+	cdda? ( udisks || ( cddb musicbrainz ) )
+	cddb? ( || ( cdio cdda ) taglib )
+	cdio? ( udisks || ( cddb musicbrainz ) )
+	mtp? ( taglib udisks )
+	musicbrainz? ( || ( cdio cdda ) taglib )
+	replaygain? ( taglib )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+	sys-libs/zlib
+	virtual/libudev:=
+	cdda? ( media-sound/cdparanoia )
+	cdio? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	mtp? ( media-libs/libmtp )
+	musicbrainz? ( media-libs/musicbrainz:5= )
+	replaygain? (
+		media-libs/libebur128
+		media-sound/mpg123
+		virtual/ffmpeg
+	)
+	streaming? ( media-video/vlc:0= )
+	taglib? (
+		media-libs/taglib[asf(+),mp4(+)]
+		media-libs/taglib-extras
+		udisks? ( sys-fs/udisks:2 )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/linguist-tools:5
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-headers.patch" )
+
+src_prepare() {
+	remove_locale() {
+		rm "translations/${PN}_${1}".ts || die
+	}
+
+	cmake-utils_src_prepare
+
+	# Unbundle 3rd party libs
+	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
+
+	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
+	l10n_for_each_disabled_locale_do remove_locale
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
+		-DENABLE_CDPARANOIA=$(usex cdda)
+		-DENABLE_CDIOPARANOIA=$(usex cdio)
+		-DENABLE_CDDB=$(usex cddb)
+		-DENABLE_HTTP_SERVER=$(usex http-server)
+		-DENABLE_MTP=$(usex mtp)
+		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
+		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+		-DENABLE_FFMPEG=$(usex replaygain)
+		-DENABLE_MPG123=$(usex replaygain)
+		-DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
+		-DENABLE_TAGLIB=$(usex taglib)
+		-DENABLE_TAGLIB_EXTRAS=$(usex taglib)
+		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
+		-DENABLE_REMOTE_DEVICES=OFF
+		-DENABLE_UDISKS2=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_pkg_postrm
+}
diff --git a/media-sound/cantata/files/cantata-2.1.0-headers.patch b/media-sound/cantata/files/cantata-2.1.0-headers.patch
new file mode 100644
index 000000000000..a442a2c1022d
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.1.0-headers.patch
@@ -0,0 +1,42 @@
+Description: Fix include location for ebur128 files
+ The Debian packages for ebur128 are shipping the headers in:
+
+    libebur128-dev: /usr/include/ebur128.h
+
+ while the upstream code expects ebur128/ebur128.h
+
+Author: Stuart Prescott <stuart@debian.org>
+Forwarded: not sure -- check interaction with cmake rules
+--- a/replaygain/ffmpeginput.cpp
++++ b/replaygain/ffmpeginput.cpp
+@@ -31,7 +31,7 @@
+ #include <QString>
+ #include <QList>
+ #include <QByteArray>
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ #include "ffmpeginput.h"
+ 
+ static QMutex mutex;
+--- a/replaygain/mpg123input.cpp
++++ b/replaygain/mpg123input.cpp
+@@ -18,7 +18,7 @@
+ #include <QFile>
+ #include <QString>
+ #include <QByteArray>
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ #include "mpg123input.h"
+ 
+ struct Mpg123Input::Handle {
+--- a/replaygain/trackscanner.h
++++ b/replaygain/trackscanner.h
+@@ -25,7 +25,7 @@
+ #define _SCANNER_H_
+ 
+ #include "jobcontroller.h"
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ 
+ class Input;
+ 
diff --git a/media-sound/cantata/files/cantata-2.2.0-headers.patch b/media-sound/cantata/files/cantata-2.2.0-headers.patch
new file mode 100644
index 000000000000..962c8413a9fd
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.2.0-headers.patch
@@ -0,0 +1,48 @@
+Description: Fix include location for ebur128 files
+ The Debian packages for ebur128 are shipping the headers in:
+
+    libebur128-dev: /usr/include/ebur128.h
+
+ while the upstream code expects ebur128/ebur128.h
+
+Author: Stuart Prescott <stuart@debian.org>
+Forwarded: not sure -- check interaction with cmake rules
+diff --git a/replaygain/ffmpeginput.cpp b/replaygain/ffmpeginput.cpp
+index 24e47d34..382bac90 100644
+--- a/replaygain/ffmpeginput.cpp
++++ b/replaygain/ffmpeginput.cpp
+@@ -31,7 +31,7 @@ extern "C" {
+ #include <QString>
+ #include <QList>
+ #include <QByteArray>
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ #include "ffmpeginput.h"
+ 
+ static QMutex mutex;
+diff --git a/replaygain/mpg123input.cpp b/replaygain/mpg123input.cpp
+index 43ae0371..6a7b266f 100644
+--- a/replaygain/mpg123input.cpp
++++ b/replaygain/mpg123input.cpp
+@@ -18,7 +18,7 @@ extern "C" {
+ #include <QFile>
+ #include <QString>
+ #include <QByteArray>
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ #include "mpg123input.h"
+ 
+ struct Mpg123Input::Handle {
+diff --git a/replaygain/trackscanner.h b/replaygain/trackscanner.h
+index b8709115..631e551a 100644
+--- a/replaygain/trackscanner.h
++++ b/replaygain/trackscanner.h
+@@ -25,7 +25,7 @@
+ #define _SCANNER_H_
+ 
+ #include "jobcontroller.h"
+-#include "ebur128/ebur128.h"
++#include "ebur128.h"
+ 
+ class Input;
+ 
diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
new file mode 100644
index 000000000000..1bc1b0bb262c
--- /dev/null
+++ b/media-sound/cantata/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="cdio">Use <pkg>dev-libs/libcdio-paranoia</pkg> for CD support (instead of cdparanoia)</flag>
+		<flag name="http-server">Enable internal HTTP server to play non-MPD files</flag>
+		<flag name="replaygain">Enable ReplayGain support, for relative volume adjustments</flag>
+		<flag name="streaming">Enable playback of MPD HTTP streams using LibVLC (<pkg>media-video/vlc</pkg>)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">cdrummond/cantata</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/cd-discid/Manifest b/media-sound/cd-discid/Manifest
new file mode 100644
index 000000000000..2ed009c1efc8
--- /dev/null
+++ b/media-sound/cd-discid/Manifest
@@ -0,0 +1,7 @@
+DIST cd-discid-1.3.tar.gz 12324 SHA256 5396f862bf5fe81dee615de244f77c39b91612890c5c7ae42f93e8040cf6cae1 SHA512 947910ba2d8f8b3e82ea1ac155d38591ce6b574fb26e750c0462ad535dde546e627b5348e54094ddc6b1933cf928aadcccc79c81db72423c3e6f14b812c5e1b3 WHIRLPOOL 45eea1f33bf9a3a597a1c1e6f1c7a1e0d7e8204b4831bd7318c5535ee07fa08369c5a4da15a0c2ba2fd4cf1ce798aa06ab2d622401243bc84f1ff83add1bd5d9
+DIST cd-discid-1.4.tar.gz 12487 SHA256 b6b72db2934a6e2560c7aa26c52c88e27fba571e39a303ebf9cef022aa509d43 SHA512 f601ea8b7ad73e22ebafc22c392f120fe2e5ed2e275f8c53aab92b27ca1738b9f0c53dd5ed7a012915fe8f1f30fd2356f973895e2dbfe649937930e69faa0c29 WHIRLPOOL bfd8e1757699b15ed0dabe77dc24caaeeea24640ac4b5190a8df91a191f997c73d66026b50949ac290d36d36b6a20da9ba76b849d90af8994ecf3d24c17ca275
+EBUILD cd-discid-1.3.ebuild 597 SHA256 5fcb2be23f5a1d4b4356449b3d7971f268b27d5718be4947d1c554ad9b06ce66 SHA512 88f46adddd0142c6d0e86eaf3cafdbd7e8af52b7b9d30b0610baa951204c1d2026e9a546ecf7a4f805899b2f1c27df127d4aee9ffe390ed2694b5bc8843673de WHIRLPOOL 48205383d086ae6471b14b94355cbe8489e197e4a7385311851f1143a2a5bc6a29aab172013dc2966fd9d2dd4991ae68463e2e1235cf3f5a82a259914e89c7df
+EBUILD cd-discid-1.4.ebuild 577 SHA256 2f50eb23a1afd69c3cab08945e9c060cfd87af8381b25158fede3a99ec5aa30a SHA512 913f0727c1854e58c1d6f288a188e156f4351c9f6fb426f6a9d7007ab5943b4aece86f99981de6d6d03da420e453bae971bc305f4b8c04f55600c80251ae9140 WHIRLPOOL b1d50e89f73727fd083abe819b87c1c62e175cec5a88d61575c395b588219aad900167958469adf0408be395d737b348c4be21348dda618763357e2a4caa52e0
+MISC ChangeLog 2484 SHA256 0f7a85f4ff4d31d3cf17fc0b95f55902b77ea8a018b3c4abbe3d00a857af40f3 SHA512 7ef1de984f9fdf39999250a0825e6dfea059007997a210d3a485135fb3e309c0460d12afb58417aabf047cf8a192beaa434aca196a23fb6312757f166cf2f86a WHIRLPOOL a28d8d61067324df1580cd8d72d9c4996d90a5682b5fb43952663a7903cb3f168d1b2edc65a6c603802259f36e7a3bd8ddcdb338be23c9a9fc9190389fa7bc8c
+MISC ChangeLog-2015 3581 SHA256 695817d3577708945635ce3c801effc447f24f8d8f6d249364c55f5913540cc3 SHA512 3e749e1fbebb86c282e2e2b64aa60bf0e5739cc17f708e533446d683268e8f0bed6a8b9699e5baa540fbcad91a71be740bca22e9fbc0c6827d4e47bc1bcd46c5 WHIRLPOOL ecf5d4657180026998599fbef68ceb10f5587fdb9be01e6ff541c047afa65d5c43d4e59b0ada572100e19c59a1c7f0b67ea70f3c2098a00c6c071b090782c9ef
+MISC metadata.xml 332 SHA256 ed364d750ef1765e230b455df604169bd1ab3021742284722e8cefc6bf3dcb4f SHA512 7d666d017c5e01e7afc7c27eb98175177a5a8b3cb0a1d964cc827b2e31922bb1bbc866393906ef9ec5e29336d79d1e9aecb344ffcbffabc5d1ae7a2eecb1d76e WHIRLPOOL 7d8897f4e0671119b7b70ef5c55abed437596518c5acb7e876dda620c621cda05354e5590967117f4adab7ee89a9031656f2b50c2c66a456c687a1ee3d56504c
diff --git a/media-sound/cd-discid/cd-discid-1.3.ebuild b/media-sound/cd-discid/cd-discid-1.3.ebuild
new file mode 100644
index 000000000000..e73daf603fa8
--- /dev/null
+++ b/media-sound/cd-discid/cd-discid-1.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="returns the disc id for the cd in the cd-rom drive"
+HOMEPAGE="https://github.com/taem/cd-discid"
+SRC_URI="https://github.com/taem/${PN}/tarball/upstream/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
+IUSE=""
+
+DOCS=( changelog README )
+
+src_unpack() {
+	unpack ${A}
+	mv *-${PN}-* "${S}" || die
+}
+
+src_prepare() {
+	sed -i -e "/^\(C\|LD\)FLAGS/d" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/media-sound/cd-discid/cd-discid-1.4.ebuild b/media-sound/cd-discid/cd-discid-1.4.ebuild
new file mode 100644
index 000000000000..66f0a297ba05
--- /dev/null
+++ b/media-sound/cd-discid/cd-discid-1.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="returns the disc id for the cd in the cd-rom drive"
+HOMEPAGE="https://github.com/taem/cd-discid"
+SRC_URI="https://github.com/taem/${PN}/archive/upstream/1.4.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
+
+S=${WORKDIR}/${PN}-upstream-${PV}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr STRIP=/bin/true install
+	dodoc changelog README
+}
diff --git a/media-sound/cd-discid/metadata.xml b/media-sound/cd-discid/metadata.xml
new file mode 100644
index 000000000000..b17a82602b7f
--- /dev/null
+++ b/media-sound/cd-discid/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">taem/cd-discid</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/cdcd/Manifest b/media-sound/cdcd/Manifest
new file mode 100644
index 000000000000..8f0cf5d28897
--- /dev/null
+++ b/media-sound/cdcd/Manifest
@@ -0,0 +1,7 @@
+AUX cdcd-0.6.6-acinclude.m4 17866 SHA256 9fe78cde3760eda37be15689c0b4648034759e26f9b9c4c947a564159f3bd6fb SHA512 c2011160ac6db7b73c495fd35f5bdd5284026a7d615a0706185cb0547b5f0ddd5107fee7e99e5026e7481b39f8440518e5ca8762580332b246a3410e960d4de3 WHIRLPOOL eabf1689fdc2ffa1c7f1d588fa73a20be52bb5ad604fad8a0cdd0cd857a4046d8486be58f1a99c06634acef3d0fb936ecbe66f8976d3d653e3e1e204cb831b02
+AUX cdcd-0.6.6-configure.patch 2032 SHA256 f10d5d7d9de86eb863efba05a8aef51070d8d2880f498093830526c8f6f165bb SHA512 2029f39b924473a33417fe4bf24419be010e1bd508e2544fc612b7db2aceedb4575534b69030d25e471118be6df4272121ddaa6e29b2ac93eda3dadb8189ecba WHIRLPOOL 23e4faa3f05c7baf6559d4f88822c41b7b978615eaaf03740f3b03ad4af561931d89b442706c1d608dd15f35f41302a736a5c8481042e1e655370fd16950c549
+DIST cdcd-0.6.6.tar.gz 246286 SHA256 06ae2508926b7d1f811d9ce9a53991f8886aef078db4cde617125bda24fbf717 SHA512 841f2d7f85c81a8cc9e88bc13515959a911e22fe9cff7fd272bab63fccb3e6bbf44e9d66fc2524f1670da20568d6e10434de8143a5e94fc576c7193b4a68f418 WHIRLPOOL 9cc8f718f67f60fc20dafed83749e8542b1f6dee43e2e78ef94323ee21eaad79314c873ba32f6ebdcf2eb77aa630e774a21aed2b232d030f6e032785a7a25bad
+EBUILD cdcd-0.6.6-r2.ebuild 647 SHA256 f1ae455def05bd7668e707755360d84096bb52cc47559d5fb9370a6076032db2 SHA512 32488d51ace3ba3fe71b82110a1401be942ea378a235c6cfad1c33bb3f26d358938c691fcfe7da0fbbef882b599b0561420fc58615e07c88f1d8bf7f303d1a09 WHIRLPOOL 2d30553b8b28682c6c0748605b90c64a6accb9a3ab3165a729e1f6ab2da81f9d7db61fb31e85948e579e1c307c374bae7b86ad12f653176efd6af8e73211eb3b
+MISC ChangeLog 2496 SHA256 90504e321e1cf5a1e8ba362d1494cf3f5e83d8df098cc63a75c4a4a9f7ad0f37 SHA512 9b9c610be3c07e31601b99379ee2f8c406dd48d5308a341207fc44e385e32e8a6467c4142e52956469cba7e9c58226f915e0af0c9df20128a22d4ebfb989c42f WHIRLPOOL f662e0b9a61662ba24ff1f83f755a3f53af762e85676406bb35c2e374903ec22f8aadf723ef278972c409c8c886ef15e79623c571adf8efb17e59196ffff4b51
+MISC ChangeLog-2015 4331 SHA256 b728a5a0add5181f84842816c1f9d92f486153f4895af10e3683324a182c69bd SHA512 f5aab4a1536271d1ed3a954a612e2a3a008fcc373a1ec72e0e65a8bcbe2cc1cbeeb06dbf4c9554eb4473fd489bbfc6b327e5e9accc9aaf301a4c64140e38893b WHIRLPOOL 0b09cbb0a9c46a125823b4157dfcb06f921f58d9311ffda02ca1cecbaac1ae34d187e921944a5f251897d340e3a5aeb610f3d6b52bd4abe9315ac309a8fd64de
+MISC metadata.xml 333 SHA256 d0a4053906ad2742571bcd17c7623208ad416e96b2810d72f2914de9c3ea9b5b SHA512 5ac86238b0db4069b133127f007fec468f87847cb219dc0c5dab8df5544a5e515057b4c44f44dfa843b5b81a62141a21352dec9e9a0fec98c300e9e9509cd034 WHIRLPOOL ed9f956deeefa059b9196219b6a4aa8194a5642f38b692e2f9e83efe32f6061338d9033dedee4454b3dd651c040bb9e8cf502f52cc4a8344e095ba478c93cf6b
diff --git a/media-sound/cdcd/cdcd-0.6.6-r2.ebuild b/media-sound/cdcd/cdcd-0.6.6-r2.ebuild
new file mode 100644
index 000000000000..a101ff69a31c
--- /dev/null
+++ b/media-sound/cdcd/cdcd-0.6.6-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="a simple yet powerful command line cd player"
+HOMEPAGE="http://libcdaudio.sourceforge.net"
+SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 sparc x86 ~x86-fbsd"
+
+RDEPEND="
+	>=sys-libs/readline-4.2
+	>=media-libs/libcdaudio-0.99.4
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cp "${FILESDIR}"/${P}-acinclude.m4 "${S}"/acinclude.m4 || die
+	epatch "${FILESDIR}"/${P}-configure.patch
+	eautoreconf
+}
+
+DOCS=( AUTHORS ChangeLog NEWS README )
diff --git a/media-sound/cdcd/files/cdcd-0.6.6-acinclude.m4 b/media-sound/cdcd/files/cdcd-0.6.6-acinclude.m4
new file mode 100644
index 000000000000..bce268a78c71
--- /dev/null
+++ b/media-sound/cdcd/files/cdcd-0.6.6-acinclude.m4
@@ -0,0 +1,405 @@
+# Configure paths for GLIB
+# Owen Taylor     97-11-3
+
+dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
+dnl gthread is specified in MODULES, pass to glib-config
+dnl
+AC_DEFUN(AM_PATH_GLIB,
+[dnl 
+dnl Get the cflags and libraries from the glib-config script
+dnl
+AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX   Prefix where GLIB is installed (optional)],
+            glib_config_prefix="$withval", glib_config_prefix="")
+AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
+            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
+AC_ARG_ENABLE(glibtest, [  --disable-glibtest       Do not try to compile and run a test GLIB program],
+		    , enable_glibtest=yes)
+
+  if test x$glib_config_exec_prefix != x ; then
+     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
+     if test x${GLIB_CONFIG+set} != xset ; then
+        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
+     fi
+  fi
+  if test x$glib_config_prefix != x ; then
+     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
+     if test x${GLIB_CONFIG+set} != xset ; then
+        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
+     fi
+  fi
+
+  for module in . $4
+  do
+      case "$module" in
+         gmodule) 
+             glib_config_args="$glib_config_args gmodule"
+         ;;
+         gthread) 
+             glib_config_args="$glib_config_args gthread"
+         ;;
+      esac
+  done
+
+  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
+  min_glib_version=ifelse([$1], ,0.99.7,$1)
+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+  no_glib=""
+  if test "$GLIB_CONFIG" = "no" ; then
+    no_glib=yes
+  else
+    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
+    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
+    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_glibtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
+      LIBS="$GLIB_LIBS $LIBS"
+dnl
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+dnl checks the results of glib-config to some extent
+dnl
+      rm -f conf.glibtest
+      AC_TRY_RUN([
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.glibtest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_glib_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_glib_version");
+     exit(1);
+   }
+
+  if ((glib_major_version != $glib_config_major_version) ||
+      (glib_minor_version != $glib_config_minor_version) ||
+      (glib_micro_version != $glib_config_micro_version))
+    {
+      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+             glib_major_version, glib_minor_version, glib_micro_version);
+      printf ("*** was found! If glib-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
+      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    } 
+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
+           (glib_micro_version != GLIB_MICRO_VERSION))
+    {
+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     glib_major_version, glib_minor_version, glib_micro_version);
+    }
+  else
+    {
+      if ((glib_major_version > major) ||
+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
+               glib_major_version, glib_minor_version, glib_micro_version);
+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
+        printf("*** correct copy of glib-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_glib" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$GLIB_CONFIG" = "no" ; then
+       echo "*** The glib-config script installed by GLIB could not be found"
+       echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
+       echo "*** full path to glib-config."
+     else
+       if test -f conf.glibtest ; then
+        :
+       else
+          echo "*** Could not run GLIB test program, checking why..."
+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
+          LIBS="$LIBS $GLIB_LIBS"
+          AC_TRY_LINK([
+#include <glib.h>
+#include <stdio.h>
+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***"
+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
+          echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
+          echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GLIB_CFLAGS=""
+     GLIB_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GLIB_CFLAGS)
+  AC_SUBST(GLIB_LIBS)
+  rm -f conf.glibtest
+])
+
+# Configure paths for libcdaudio                -*- Autoconf -*-
+#
+# Derived from glib.m4 (Owen Taylor 97-11-3)
+#
+
+dnl AM_PATH_LIBCDAUDIO([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libcdaudio, and define LIBCDAUDIO_CFLAGS, LIBCDAUDIO_LIBS and
+dnl LIBCDAUDIO_LDADD
+dnl
+AC_DEFUN([AM_PATH_LIBCDAUDIO],
+[dnl 
+dnl Get the cflags and libraries from the libcdaudio-config script
+dnl
+AC_ARG_WITH(libcdaudio-prefix,
+            AS_HELP_STRING([--with-libcdaudio-prefix=PFX],
+                           [Prefix where libcdaudio is installed (optional)]),
+            [libcdaudio_config_prefix="$withval"], [libcdaudio_config_prefix=""])
+AC_ARG_WITH(libcdaudio-exec-prefix,
+            AS_HELP_STRING([--with-libcdaudio-exec-prefix=PFX],
+                           [Exec prefix where libcdaudio is installed (optional)]),
+            [libcdaudio_config_exec_prefix="$withval"],
+            [libcdaudio_config_exec_prefix=""])
+AC_ARG_ENABLE(libcdaudiotest,
+              AS_HELP_STRING([--disable-libcdaudiotest],
+	                     [Do not try to compile and run a test libcdaudio program]),,
+	      [enable_libcdaudiotest=yes])
+
+  if test "x$libcdaudio_config_exec_prefix" != x ; then
+     libcdaudio_config_args="$libcdaudio_config_args --exec-prefix=$libcdaudio_config_exec_prefix"
+     if test "x${LIBCDAUDIO_CONFIG+set}" != xset ; then
+        LIBCDAUDIO_CONFIG=$libcdaudio_config_exec_prefix/bin/libcdaudio-config
+     fi
+  fi
+  if test x$libcdaudio_config_prefix != x ; then
+     libcdaudio_config_args="$libcdaudio_config_args --prefix=$libcdaudio_config_prefix"
+     if test "x${LIBCDAUDIO_CONFIG+set}" != xset ; then
+        LIBCDAUDIO_CONFIG=$libcdaudio_config_prefix/bin/libcdaudio-config
+     fi
+  fi
+
+  AC_PATH_PROG(LIBCDAUDIO_CONFIG, libcdaudio-config, no)
+  min_libcdaudio_version=ifelse([$1], ,0.99.0,$1)
+  AC_MSG_CHECKING([for libcdaudio - version >= $min_libcdaudio_version])
+  no_libcdaudio=""
+  if test "$LIBCDAUDIO_CONFIG" = "no" ; then
+    no_libcdaudio=yes
+  else
+    LIBCDAUDIO_CFLAGS=`$LIBCDAUDIO_CONFIG $libcdaudio_config_args --cflags`
+    LIBCDAUDIO_LIBS=`$LIBCDAUDIO_CONFIG $libcdaudio_config_args --libs`
+    LIBCDAUDIO_LDADD=`$LIBCDAUDIO_CONFIG $libcdaudio_config_args --ldadd`
+    libcdaudio_config_major_version=`$LIBCDAUDIO_CONFIG $libcdaudio_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+    libcdaudio_config_minor_version=`$LIBCDAUDIO_CONFIG $libcdaudio_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+    libcdaudio_config_micro_version=`$LIBCDAUDIO_CONFIG $libcdaudio_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+    if test "x$enable_libcdaudiotest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $LIBCDAUDIO_CFLAGS $LIBCDAUDIO_LDADD"
+      LIBS="$LIBCDAUDIO_LIBS $LIBS"
+dnl
+dnl Now check if the installed libcdaudio is sufficiently new. (Also sanity
+dnl checks the results of libcdaudio-config to some extent
+dnl
+      rm -f conf.cdaudiotest
+      AC_TRY_RUN([
+#include <cdaudio.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+char* my_strdup (char *str)
+{
+  char *new_str;
+
+  if (str) {
+    new_str = malloc ((strlen (str) + 1) * sizeof(char));
+    strcpy (new_str, str);
+  } else
+    new_str = NULL;
+
+  return new_str;
+}
+
+int main()
+{
+  int major,minor,micro;
+  int libcdaudio_major_version,libcdaudio_minor_version,libcdaudio_micro_version;
+  char *tmp_version;
+
+  system ("touch conf.cdaudiotest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = my_strdup("$min_libcdaudio_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_libcdaudio_version");
+     exit(1);
+   }
+
+  libcdaudio_major_version=(cdaudio_getversion()>>16)&255;
+  libcdaudio_minor_version=(cdaudio_getversion()>> 8)&255;
+  libcdaudio_micro_version=(cdaudio_getversion()    )&255;
+
+  if ((libcdaudio_major_version != $libcdaudio_config_major_version) ||
+      (libcdaudio_minor_version != $libcdaudio_config_minor_version) ||
+      (libcdaudio_micro_version != $libcdaudio_config_micro_version))
+    {
+      printf("\n*** 'libcdaudio-config --version' returned %d.%d.%d, but libcdaudio (%d.%d.%d)\n", 
+             $libcdaudio_config_major_version, $libcdaudio_config_minor_version, $libcdaudio_config_micro_version,
+             libcdaudio_major_version, libcdaudio_minor_version, libcdaudio_micro_version);
+      printf ("*** was found! If libcdaudio-config was correct, then it is best\n");
+      printf ("*** to remove the old version of libcdaudio. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If libcdaudio-config was wrong, set the environment variable LIBCDAUDIO_CONFIG\n");
+      printf("*** to point to the correct copy of libcdaudio-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    } 
+  else if ((libcdaudio_major_version != LIBCDAUDIO_VERSION_MAJOR) ||
+	   (libcdaudio_minor_version != LIBCDAUDIO_VERSION_MINOR) ||
+           (libcdaudio_micro_version != LIBCDAUDIO_VERSION_MICRO))
+    {
+      printf("*** libcdaudio header files (version %d.%d.%d) do not match\n",
+	     LIBCDAUDIO_VERSION_MAJOR, LIBCDAUDIO_VERSION_MINOR, LIBCDAUDIO_VERSION_MICRO);
+      printf("*** library (version %d.%d.%d)\n",
+	     libcdaudio_major_version, libcdaudio_minor_version, libcdaudio_micro_version);
+    }
+  else
+    {
+      if ((libcdaudio_major_version > major) ||
+        ((libcdaudio_major_version == major) && (libcdaudio_minor_version > minor)) ||
+        ((libcdaudio_major_version == major) && (libcdaudio_minor_version == minor) && (libcdaudio_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of libcdaudio (%d.%d.%d) was found.\n",
+               libcdaudio_major_version, libcdaudio_minor_version, libcdaudio_micro_version);
+        printf("*** You need a version of libcdaudio newer than %d.%d.%d.\n",
+	       major, minor, micro);
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the libcdaudio-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of libcdaudio, but you can also set the LIBCDAUDIO_CONFIG environment to point to the\n");
+        printf("*** correct copy of libcdaudio-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_libcdaudio=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_libcdaudio" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$LIBCDAUDIO_CONFIG" = "no" ; then
+       echo "*** The libcdaudio-config script installed by libcdaudio could not be found"
+       echo "*** If libcdaudio was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the LIBCDAUDIO_CONFIG environment variable to the"
+       echo "*** full path to libcdaudio-config."
+     else
+       if test -f conf.cdaudiotest ; then
+        :
+       else
+          echo "*** Could not run libcdaudio test program, checking why..."
+          CFLAGS="$CFLAGS $LIBCDAUDIO_CFLAGS"
+          LIBS="$LIBS $LIBCDAUDIO_LIBS"
+          AC_TRY_LINK([
+#include <cdaudio.h>
+#include <stdio.h>
+],      [ return (cdaudio_getversion()!=0); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding libcdaudio or finding the wrong"
+          echo "*** version of libcdaudio. If it is not finding libcdaudio, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location. Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means libcdaudio was incorrectly installed"
+          echo "*** or that you have moved libcdaudio since it was installed. In the latter case, you"
+          echo "*** may want to edit the libcdaudio-config script: $LIBCDAUDIO_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     LIBCDAUDIO_CFLAGS=""
+     LIBCDAUDIO_LIBS=""
+     LIBCDAUDIO_LDADD=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(LIBCDAUDIO_CFLAGS)
+  AC_SUBST(LIBCDAUDIO_LIBS)
+  AC_SUBST(LIBCDAUDIO_LDADD)
+  rm -f conf.cdaudiotest
+])
+
diff --git a/media-sound/cdcd/files/cdcd-0.6.6-configure.patch b/media-sound/cdcd/files/cdcd-0.6.6-configure.patch
new file mode 100644
index 000000000000..6755dab4d39f
--- /dev/null
+++ b/media-sound/cdcd/files/cdcd-0.6.6-configure.patch
@@ -0,0 +1,76 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,8 +2,6 @@
+ 
+ SUBDIRS = doc
+ 
+-AUTOMAKE_OPTIONS = ansi2knr
+-
+ bin_PROGRAMS = cdcd
+ man_MANS = cdcd.1
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,5 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(cdcd.c)
++AC_INIT(cdcd, 0.6.6)
+ 
+ MAJOR_VERSION=0
+ MINOR_VERSION=6
+@@ -8,29 +8,22 @@
+ PACKAGE=cdcd
+ VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
+ 
+-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
++AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
+-AM_MAINTAINER_MODE
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_CPP
+-AM_C_PROTOTYPES
+ AC_CANONICAL_HOST
+ 
+ dnl Checks for libraries.
+-AC_CHECK_LIB(curses, tputs,,
+-             [AC_MSG_ERROR([cannot find the curses library.
+-Check the INSTALL file, maybe you can find how to solve the problem.])])
+ AC_CHECK_LIB(readline, rl_completion_matches,,
+-             [AC_MSG_ERROR([cannot find GNU libreadline 4.2 or higher.
+-Check the INSTALL file, maybe you can find how to solve the problem.])])
++             [AC_MSG_ERROR([cannot find GNU libreadline 4.2 or higher.])])
+ AC_CHECK_LIB(socket, socket)dnl Needed for Solaris 2.9.
+ 
+-AM_PATH_LIBCDAUDIO(,,[AC_MSG_ERROR([cannot find libcdaudio.
+-Check the INSTALL file, maybe you can find how to solve the problem.])])
++AM_PATH_LIBCDAUDIO(,,[AC_MSG_ERROR([cannot find libcdaudio.])])
+ 
+ have_libcdaudio=0
+ have_cdaudio=0
+@@ -40,6 +33,11 @@
+     default_device=/dev/unspecified
+     have_libcdaudio=1
+     ;;
++   
++  *freebsd[567]*)
++    default_device=/dev/cd0
++    have_cdaudio=1
++    ;;
+ 
+   *bsd*)
+     default_device=/dev/wcd0a
+@@ -69,8 +67,8 @@
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_FUNC_ALLOCA
+-AC_CHECK_HEADERS([string.h strings.h sys/ptyvar.h])
+-AC_CHECK_HEADERS([errno.h locale.h malloc.h stdlib.h \
++AC_CHECK_HEADERS([string.h strings.h sys/ptyvar.h malloc.h])
++AC_CHECK_HEADERS([errno.h locale.h stdlib.h \
+ readline/readline.h readline/history.h sys/socket.h unistd.h],, \
+ [AC_MSG_ERROR([missing header file.])])
+ 
diff --git a/media-sound/cdcd/metadata.xml b/media-sound/cdcd/metadata.xml
new file mode 100644
index 000000000000..6ca1fc91648d
--- /dev/null
+++ b/media-sound/cdcd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">libcdaudio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
new file mode 100644
index 000000000000..37bae4991d73
--- /dev/null
+++ b/media-sound/cdparanoia/Manifest
@@ -0,0 +1,6 @@
+DIST cdparanoia-III-10.2-patches-2.tbz2 6242 SHA256 3c06fa469d7d7774e1c168b4a79851f50aeb6a4054a515ce4e30ef5ed83d1fbc SHA512 523a9ef9f3de263236aad6da102b807a6620cde8767e297e54dcd552f59077d959a89187bc82ad71c577fa66c4862d7c651e922b8b8b8369dd63685cbda9cb74 WHIRLPOOL 238b8aed5edab02350263455b7205531a8cf830fdb5f8d3d8245756bd712295d8d32c17f53518fc8410112d6b1adb377e6eb3658a3649e0df7a9bd7ed3227269
+DIST cdparanoia-III-10.2.src.tgz 183236 SHA256 005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7 WHIRLPOOL fe0c211ce42c58534978669bc1d9c63de7cba6dcd8fbfe6d6c78fc1d2600680c5a94e52e5552c8423f1929a070b2bba35c6921a7c7ddb8921a6ebd9127dacb60
+EBUILD cdparanoia-3.10.2-r6.ebuild 1466 SHA256 9f18e3a7053b1ce09ff004ebf9feca53541b2a3d56781a1a0208bfdc63d80294 SHA512 ba102e1a866f3818b411a024a4f36523ade02febc9524037c0ed78a19ab23baffdc779cb1f66b337edb83bd15d951782089cd9cf7fbae89db16b4410c4f31076 WHIRLPOOL 561e815067fb39e57fdf2e8ded96d7834d512cf4856baedfa264ef81e55038c82fdc7766a3816d5e7e7b64c7dba63a24f3afc1f4a3654cc08d16aa9e49fc03b1
+MISC ChangeLog 2478 SHA256 338ebc69ea306665d38e6374c3f5a1dd22d794302eec293e1ce0431ce4451114 SHA512 31a053721f5f08f27b45a72a5b65ee41f8ed31b97a143945b004b00dd3d69e197da06b3ca3a663c4a153ef002a687026cb7f294aacd234de0220ce2fcfef4857 WHIRLPOOL f4cb990bf4bd4e4e3210ca4b78afe28060acdd2d73a38f47a5c001de62c9b3cecb1b57775f3e5265e6686aabd1757b9355223ddbfd665ede804b92cded368703
+MISC ChangeLog-2015 18970 SHA256 4bc533c0f1fa4964d3af1b70bb377ca771c1a5b2718fba63e2ba996b56924500 SHA512 370ed15dadd93f551f22d408b1c0c8f433c170056d4c9c3cd968ac003c3c920e2980343e248f6f6ef496e4c5475471e0bd3aea7deed1e40685399fdc1cb0de4b WHIRLPOOL e88fa82cf25812d1a665fd4a2e6c561e6f74e4c5b43a35d81d71e600e209537fd001007fd253b84ed418d8f673575dc0f75fc61adae555ad2036bb612c7f798b
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
new file mode 100644
index 000000000000..db2ce30179e1
--- /dev/null
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils libtool toolchain-funcs versionator multilib-minimal
+
+MY_P=${PN}-III-$(get_version_component_range 2-3)
+DESCRIPTION="an advanced CDDA reader with error correction"
+HOMEPAGE="http://www.xiph.org/paranoia"
+SRC_URI="http://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
+	https://dev.gentoo.org/~ssuominen/${MY_P}-patches-2.tbz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="app-eselect/eselect-cdparanoia
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND=${RDEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
+
+	mv configure.guess config.guess
+	mv configure.sub config.sub
+
+	sed -i -e '/configure.\(guess\|sub\)/d' configure.in || die
+
+	eautoconf
+	elibtoolize
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	tc-export AR CC RANLIB
+	econf
+}
+
+multilib_src_compile() {
+	emake OPT="${CFLAGS} -I${S}/interface"
+	use static-libs && emake lib OPT="${CFLAGS} -I${S}/interface"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/${PN}{,-paranoia}
+}
+
+pkg_postinst() {
+	eselect ${PN} update ifunset
+}
+
+pkg_postrm() {
+	eselect ${PN} update ifunset
+}
diff --git a/media-sound/cdparanoia/metadata.xml b/media-sound/cdparanoia/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/cdparanoia/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/cdplay/Manifest b/media-sound/cdplay/Manifest
new file mode 100644
index 000000000000..8bd4f79672e6
--- /dev/null
+++ b/media-sound/cdplay/Manifest
@@ -0,0 +1,5 @@
+DIST cdplay-1.0.tar.gz 12779 SHA256 5ff855acdd94fd527774f73673716380cc23308d969c579fc216ee4b4ea05dd8 SHA512 545f2f6b5fbb8f5c27b4140f805875d7923d7fdc9fb5c77ba7f702c934d9f22540b3d9153424bed3040375965bc30ef065924070eac7d06c31c3be7c185508e6 WHIRLPOOL dd83cd6b29763b241674d4d66ef8352405f374a94b3539fecfaf04735b70061b8925ed642448668fb7792258e576b4455b137b8ae62091e23efdb508dce247bd
+EBUILD cdplay-1.0.ebuild 551 SHA256 cd9f14b108f202cf3e1c4a986a4aa82c56ebaace8004d90d0cbab59ffcb2279d SHA512 f9e1c26403deeee86564016011e1c2b46d39882bfd12d8fe4b57306b22f69f540e164ebfcd9b8aac557effcb0b853aff2dad5544bd13f9cdbf8bc97a774a6242 WHIRLPOOL e82728769ab48682bff723dd9bd63949f0f4e8db652fa50ec14fc067955988d266d3093a9d637d9d611974a7eef40a733e1667bcd3e7ec64a2a00e0674598c23
+MISC ChangeLog 2423 SHA256 635f43c3cede786257dd7e85e5c7a38389996562bc72cfcb1201766f51ae8a0d SHA512 9e95db6ec8723d883d995a021f978ed5a6c79f650603b56aadf6cc1b2c337f3e38517cc5b089f965de231be380a099d3c0041964ef5a7c85556fb372adc58d88 WHIRLPOOL 17db13a56c3ae7f06045779fe971646ec7e99a1a19082cd37bed5547fb634bb88a18b17cdb146cfea1a1cfff1907d4595a285041eaf21b4e4fa154adf42ec4eb
+MISC ChangeLog-2015 2796 SHA256 481dd06b81b19b98476d42032d7972d6c901fec2ab6b71f33445612535d17fb1 SHA512 e085eb92cb61107be6612a243ddab6428e5a0b82436d24234df224fb20979d1b46d14529a342bebc5387aa7876b3235e5a97a86a914d2ac970f86e1c4ff88084 WHIRLPOOL c92d3183dfd091ab99ec45c5092eb534c4c7846b7b9a8525ef5fbcfe762ad6fd7f4b3d695c82c5659ef7240e73cac5ead4cb7307cd97cb2c7aba72fe97b3d6b4
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/cdplay/cdplay-1.0.ebuild b/media-sound/cdplay/cdplay-1.0.ebuild
new file mode 100644
index 000000000000..36ef301d8e42
--- /dev/null
+++ b/media-sound/cdplay/cdplay-1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="a commandline CD Player"
+HOMEPAGE="http://www.ta-sa.org/?entry=cdplay"
+SRC_URI="http://www.ta-sa.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="!media-sound/cdtool"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		|| die "emake failed."
+}
+
+src_install() {
+	dobin cdplay
+	dodoc Changes CREDITS README TODO
+}
diff --git a/media-sound/cdplay/metadata.xml b/media-sound/cdplay/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/cdplay/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/cdstatus/Manifest b/media-sound/cdstatus/Manifest
new file mode 100644
index 000000000000..4162ffb3959e
--- /dev/null
+++ b/media-sound/cdstatus/Manifest
@@ -0,0 +1,5 @@
+DIST cdstatus-0.97.03.tar.gz 115982 SHA256 46552c966dd3cc1b429b461254bf87b16b2247f940596d85fa6b37f22ecf1ba6 SHA512 d9819bfd40360b8796810d38b2c9f75c87a1256adc289d261e0cf56557170492eabc7fb0c4f7ee91c6303f24867ff4540962556edfdd8cf46b02df0236037177 WHIRLPOOL e6b47d565a9cd9cfd01dbff761daa85b634387ceadc13478aadc3172fe9368d0a9118a15e653c80070081311115e0269a699e3ea8b091b1b5da737e07e5b7f85
+EBUILD cdstatus-0.97.03.ebuild 486 SHA256 661f34ada0560488424aacc1fa773a8e19a17a2e4764d103737a4445d51c955d SHA512 c30c13b5c5083db7a1bb7fce39abda28eaf306f6996447ffade05b83ab1b4788fdefd51bc3719a4ac4f14256c13faeb6366fa44b161e5324568abb8d2a7a2db0 WHIRLPOOL f812045949c2aca72213b00e3415c434a6ebf98cd107c43cc4509a67fa5d61abbf154194e4828118fe17d1aaa4e6a83acf5acd0c2442975223fbf7e7e00c9740
+MISC ChangeLog 2437 SHA256 7c020aa61c4880d89f8641a7ef4e8ba0e557bbeff14123169cd0132ffa026435 SHA512 a2098b48b5d26a1cb94bdfb11775cfc4c538f3a6fbda65a2ece0da228063f65fcc72df0dce53f058f5d12155bf20ac4aa0d1bd88970377cd75101af547d526cf WHIRLPOOL fb0d390de86dcee727417fd907d5009df46973af604b24b34c934bb1b3c35a4e162847ffd1097b620b8e37b16a985f0c2efc72a385d4ff4130ceca99cc9bb4f3
+MISC ChangeLog-2015 2541 SHA256 ba1afdb4130495623257d37428e6b382c75504c6079d07775942860a749f4dc2 SHA512 bf0b14316d3c166eb4a5ab31dd71c3a11e166d00a8678704a8e75f40f2a1b36793eedbe1c5fab4569d833b592be306c3f33fb8b8124794ea700f84f44ca133e5 WHIRLPOOL 9bc8c4f8dab90acc9a5c363b2322d22bd686d035de5e07bd840ed4632ff7a64221dc50cc71dd016cc6786e8bc2f3d5460d72b8d5c880c1eb52d8557142aa6ee5
+MISC metadata.xml 331 SHA256 4bebbbe60e69a1d8fede00d956f7df17c01a8cc6eba5b288386d0925829aa294 SHA512 9f671ef16e9fc4800e4f4d1c003679332b467654a860ce36558c671208077e325116b8f9355c6888c38cedfc95a7ee226b720c8bf4ef9a8287facb21ab6ac5aa WHIRLPOOL b70afee2a84daccb6fff50a49d44fc51b1bc058f435d02e50c2437fe741cb90cb68436d3d5f08214a3bac10f1f75b090d84198714bf6cd88b3130e2cfcebd66e
diff --git a/media-sound/cdstatus/cdstatus-0.97.03.ebuild b/media-sound/cdstatus/cdstatus-0.97.03.ebuild
new file mode 100644
index 000000000000..09a57010bdba
--- /dev/null
+++ b/media-sound/cdstatus/cdstatus-0.97.03.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Tool for diagnosing cdrom drive and digital data (audio) extraction"
+HOMEPAGE="http://cdstatus.sourceforge.net"
+SRC_URI="mirror://sourceforge/cdstatus/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ppc64 x86"
+IUSE=""
+
+pkg_postinst() {
+	elog "Copy cdstatus.cfg from /usr/share/cdstatus.cfg"
+	elog "to your home directory and edit as needed."
+}
diff --git a/media-sound/cdstatus/metadata.xml b/media-sound/cdstatus/metadata.xml
new file mode 100644
index 000000000000..a913f6e5561b
--- /dev/null
+++ b/media-sound/cdstatus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cdstatus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/cdtool/Manifest b/media-sound/cdtool/Manifest
new file mode 100644
index 000000000000..33897ec895fe
--- /dev/null
+++ b/media-sound/cdtool/Manifest
@@ -0,0 +1,6 @@
+AUX cdtool-2.1.8-glibc-2.10.patch 3511 SHA256 cd5d70ec6e19d12ca83b0d5de6064d291d25385a4cea4db04637880970d21664 SHA512 5b58d80d1cd28cbedeae89bc8452d3b047faf9eb61c3444b3b3fba5a709adf834b4451fac74cf8c48fe1b6e41c33683f427856ba1d9acc4ecbb5f0eb3b135326 WHIRLPOOL 6d62c9eb99ee8daac4ceec2b3494776a296702f833be0cb3d0eda426a1de08a51fcafc6369b5dd576cf975c652642aa489bb0663045d0430b3ecbbbe86243c20
+DIST cdtool-2.1.8.tar.gz 116847 SHA256 73de81ea2de2eae64b888e1b2739ef643ccea13c79790569f8e6278369976a21 SHA512 9e4e65c753b0be024f0ceb04ec0fee52031992196e0e4a2b8dfef9dbc9feaa81462be61700c6d01f413941d66f7f3e374fb327e1bebcb79207c7b4c790cea006 WHIRLPOOL 038337d081acf3dfde53686d43d76dce10ed2a35449b724b70b90457eba82017caca4c38a455686c56eaf29d3fabca949e659df76242d323fc1ed3976b417f9a
+EBUILD cdtool-2.1.8-r1.ebuild 622 SHA256 578c8c4e97915922de3c229d8827389175ac308714f82f1d9a69c099e3d0fb0b SHA512 f4717364d0fa3d09df1c9ef2135aea4da4e98e93b9007d5baee7fa60e194be8a25bfa4a3b6c190c575a476697e11b6a3ab81aa725fd910d88997e81e9ea67c31 WHIRLPOOL 5361784e5079481662345121074b36b1d61ce49086bc6c04f7823e045c92d94212a09feb998808aa1e5409f13754adb8295610df1697957a1c2352425d64d07e
+MISC ChangeLog 2471 SHA256 2ba76b06e0d577ea1ad60f4114a933f1a2206b8646d82778c4c9d89cb9b6e627 SHA512 d6f4dc641614b644860ee7433ff8823f0a91870d6da84ed4b9cf5aed8f7a70957b675dd3e90ab3f08e6564d12460b94945b8279dcb8754910010fa2ded24f775 WHIRLPOOL a10f37ab1f8eb120b3c7840d1488b45dbb378f6293a106c91f35891aab0c95671e17f51b861a44bbd3f7529aa5580501a69f7cd292f5d69ba0e7a2882e0d42f9
+MISC ChangeLog-2015 3080 SHA256 b10f8abefebd95a34cc12ba916996afba4657da0a993f67285dc4ba104052d93 SHA512 7c87f27fb4675a2625540bfd34b9271af791d9cab24460107069a62dc9dfb1003d7895e500f0599287a41e782e1637f9125e52d5c01da78055a2502323b23b31 WHIRLPOOL 39135d21520d5d5db7e8cf0856b1e49e177b9d47b624d9c372d743bd56870b9f83f84c2647a686d18a4b34b8808f846712f98761a75609fcc8ac390bce5b3a05
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/cdtool/cdtool-2.1.8-r1.ebuild b/media-sound/cdtool/cdtool-2.1.8-r1.ebuild
new file mode 100644
index 000000000000..6706ada72f63
--- /dev/null
+++ b/media-sound/cdtool/cdtool-2.1.8-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+inherit eutils
+
+DESCRIPTION="collection of command-line utilities to control cdrom devices"
+HOMEPAGE="http://hinterhof.net/cdtool/"
+SRC_URI="http://hinterhof.net/cdtool/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="!media-sound/cdplay"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+	sed -i \
+		-e '/INSTALL/s:-o root::' \
+		-e '/LINKTARGET/s:/lib/:/$(notdir $(libdir))/:' \
+		-e '/^install-links:/s:$: install-files:' \
+		Makefile.in || die
+}
diff --git a/media-sound/cdtool/files/cdtool-2.1.8-glibc-2.10.patch b/media-sound/cdtool/files/cdtool-2.1.8-glibc-2.10.patch
new file mode 100644
index 000000000000..77f15a41ce68
--- /dev/null
+++ b/media-sound/cdtool/files/cdtool-2.1.8-glibc-2.10.patch
@@ -0,0 +1,111 @@
+Fix building with GLIBC 2.10+ as reported in http://bugs.gentoo.org/273764
+
+diff -ur cdtool-2.1.8.orig/cdown.c cdtool-2.1.8/cdown.c
+--- cdtool-2.1.8.orig/cdown.c	2005-10-17 22:11:59.000000000 +0300
++++ cdtool-2.1.8/cdown.c	2009-06-19 20:15:57.000000000 +0300
+@@ -325,7 +325,7 @@
+ }
+ 
+ /************************************************************************/
+-/* Procedure:  getline
++/* Procedure:  get_line
+  * Purpose:    read a line of text from the CDDB server
+  * 
+  * Inputs:     
+@@ -333,14 +333,14 @@
+  * Returns:    The line of text
+  * Notes:  
+  *   1. The CDDB databases use \r\n to end lines.  All lines returned
+- *      by getline() have the \r and \n stripped.
++ *      by get_line() have the \r and \n stripped.
+  *   2. Non-reentrant: the memory buffer returned previously is
+  *      recycled
+  *   3. Do NOT modify the contents of the returned buffer past the
+  *      NULL - data from the network is stored there
+  */
+ /************************************************************************/
+-char *getline(void) {
++char *get_line(void) {
+   static char *buffer = NULL;
+   static char *lastline = NULL;
+   static int buffered = 0;
+@@ -451,7 +451,7 @@
+   char *cdtitle;
+ 
+   netprintf(sock, "cddb read %s %s\n", categ, discid);
+-  message = getline();
++  message = get_line();
+   switch (atoi(message)) {
+     case 401: fprintf(stderr, "error: entry not found\n"); return;
+     case 402: fprintf(stderr, "error: server error\n"); return;
+@@ -461,13 +461,13 @@
+     default: fprintf(stderr, "error: bad message: %s\n", message); return;
+   }
+   while (iRawMode) {	/* infinite loop, or skip if !iRawMode */
+-    message = getline();
++    message = get_line();
+     if (!strcmp (message, "."))
+       return;
+     printf ("%s\r\n", message);
+   }
+   do {
+-    message = getline();
++    message = get_line();
+     firstword = strchr(message, '=');
+     if (firstword != NULL) {
+       *firstword = '\0';
+@@ -511,7 +511,7 @@
+   int input = 0;
+   int exact = 1;
+ 
+-  message = getline();
++  message = get_line();
+   switch (atoi(message)) {
+     case 403: fprintf(stderr, "error: database entry is corrupt\n"); return;
+     case 409: fprintf(stderr, "error: no handshake\n"); return;
+@@ -523,7 +523,7 @@
+   if (!exact) {
+     fprintf(stderr, "CD has no exact match\n 0: None\n");
+     do {
+-      message = getline();
++      message = get_line();
+       if (strcmp(message, ".") != 0) {
+         matches = realloc(matches, sizeof(char*) * (++count));
+         fprintf(stderr, " %d: ", count); printcd(message);
+@@ -628,15 +628,15 @@
+ void parsesites(void) {
+   char *buffer;
+ 
+-  buffer = getline();
++  buffer = get_line();
+   switch (atoi(buffer)) {
+     case 210: break;		/* OK */
+     case 401: fprintf(stderr, "error: no site list available\n"); return;
+   }
+-  buffer = getline();
++  buffer = get_line();
+   do {
+     printf("%s\n", buffer);
+-  } while (strcmp(buffer = getline(), ".") != 0);
++  } while (strcmp(buffer = get_line(), ".") != 0);
+ }
+ 
+ /************************************************************************/
+@@ -755,7 +755,7 @@
+       exit(3);
+   }
+ 
+-  bleh = getline();
++  bleh = get_line();
+   if (!signon(bleh)) { 
+       errormsg("%s:  signon error on host %s", progname, pszHost);
+       close(sock); 
+@@ -773,7 +773,7 @@
+     getuname(), gethname(), progname, VERSIONSTRING);
+   
+   /* get welcome message */
+-  bleh = getline();
++  bleh = get_line();
+   if (!welcome(bleh)) { 
+       errormsg("%s: bad welcome message [%s]", progname, bleh);
+       close(sock); 
diff --git a/media-sound/cdtool/metadata.xml b/media-sound/cdtool/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/cdtool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/chordii/Manifest b/media-sound/chordii/Manifest
new file mode 100644
index 000000000000..cc077af35352
--- /dev/null
+++ b/media-sound/chordii/Manifest
@@ -0,0 +1,9 @@
+DIST chordii-4.5.1.tar.gz 156976 SHA256 16a3fe92a82ca734cb6d08a573e513510acd41d4020a6306ac3769f6af5aa08d SHA512 92996893417cfecb3cc18db283f2f608721172540f1fbb9ea300a0235fa99228a89d2c65417e8ddee91453d4bc12190d1504039e9689ed28ca863546fa938088 WHIRLPOOL a935ab83731da23c9aef5fffb8a15070ed341fd8db69ef9e108b2c07cdaafdbe96fc415b21a8473397d0456af6b20f5fbe314b5433618c79e782788a059ef80b
+DIST chordii-4.5.3.tar.gz 172983 SHA256 140d24a8bc8c298e8db1b9ca04cf02890951aa048a656adb7ee7212c42ce8d06 SHA512 d877400e4b55cf7a4f9fd17a17d829fc9189ce1e79775ca67c94fbe9047c36bf5efbd947501814c797e54bed74d4abbc62c8609f75a79e14e9aed219cb7d9772 WHIRLPOOL cb4e4a0abc0ca4985d7e66ad6c305b86cbcbac4230d4751292a62688749c8162acb4178a179cb10fabbdc1d9692ecca7d656238c7a4a7f43209d721af1a6039d
+DIST user_guide-4.5.3.pdf 495972 SHA256 be10e1f461089c264f47695bb5e5f15842bc87930ee3fe6b2b6683e1adb05773 SHA512 0fa8ca45c8911368db82cd16ede757205d3ce776b2a21762644133867f47109a482fe3064506123c984317b02af8ec88a2ee81109c0ab86940499eeb35dd3bd1 WHIRLPOOL 49700e7f8fb4e611f9dcef0d62e363f752cde00d1c08b711c799bb1c86e5d9ecd225b507e57bdb564da950dcfcb3b6292d6f8fdc625e74831bbc030f9ce556d0
+DIST user_guide-4.5.pdf 389353 SHA256 b103e4da20c0f2af52ca9f7d34dfa75b7bd5c5da169ff395443c0029673fbf56 SHA512 9ad15cf89ae6790f59d4a224367d1b5d8ffb0aec04f217875d9f31477751046e22ab7f90f798ce2347d7dc781bcdf1665323cd315ad1148d600d5e5bf27ee096 WHIRLPOOL d050b8811f6c3cff2f6460b1a78c8d1a821df0058e49cb9f694e6c654a1569ff0a21ebc2d8b006f2d322e1b637bc5e15c9251a74037b93059a1a46ff55784032
+EBUILD chordii-4.5.1.ebuild 565 SHA256 fc4158500ceda0553dcf4da856261930e67df2af4b3913460898f34b45c50502 SHA512 e54efa186886373a4d8f61f333d3a40981fe7890a0c8b0efc8fe8d2f2cfd40f2c5ab1c444992b330745ba615faa4fc740c3a079f2d2e006a8ed09f72f3c67c1e WHIRLPOOL a5a57cc55d8de929d86cbf6aba3f6ba246b0e280f8fd46ba98083709ff4130c0f2535e5c40ba155d87d88894d9cb3f3e865ce639d1c4c9c6fc3c542f969afff9
+EBUILD chordii-4.5.3.ebuild 569 SHA256 532648c98a4620be6df80d8db25eebe4281be2460ce3a19191efffb21604ebed SHA512 ac8438d90b8cbf9f7a3c1660b641981fd03ea90bf6b8be0b264fc1a6881c352c831cf3eb5eff1bdb53f3221be5db9a7d0b1668d7062e97ff463dd2390c4dbd9a WHIRLPOOL 9a33ed151653dde736634b605b5de723d873141536592652b2285839851f21265e7d23262d9b820bdd41821b806d6e716dd1d8e6673b9cbc3323f1e89a6acdd1
+MISC ChangeLog 2689 SHA256 7ac0602ca41a1e0529fe17f0f9a051aa70982ea307a2e0d428441a05eac28d36 SHA512 2049a0a5074cc9f0b295e2818b5311c3d9344b394bd93354acc80b2503939038faa9203ac2e171f8863e53a17aafa55ae51a3884d79911dfa5c7038b058c7338 WHIRLPOOL 15906e71c7d4b95adf0310709c55a5854cc577379cd7b4d5b0e45d49fba06ba755e42bda39bb4672befe614318fc26eb94cc8fe3230de879f56b4442c9a60b32
+MISC ChangeLog-2015 593 SHA256 a943b4c415c02a4cb663858f7b0a9f60972bb18f6b734bb2d2fefdcfdd5fc3f2 SHA512 2e30310d243b9786146ba9d6e75e73dd962ed2e9a6aa8490b24e0c1469914b9a2820dc78d31dc0d844a10afdebbba7cc4b91cedda996a08dd2b9d926a41a07e2 WHIRLPOOL eafc650f4b597599618e2bac21076cb341bd9adbade7e621ddd725ae849a2a4c8105eba0a7f5841e3185eecb9a0b2d5a8c7351b807ba106fc6a5364f4240e2a6
+MISC metadata.xml 1257 SHA256 b00346c0f6562faab08bddda0ff574cb5cd0e7152b311ddabb2ad0976a7bae1b SHA512 2761d63f4130afd75abb5717c1ab8571d2018cfc21b7635cc7b68f078992cc4bf6c13fed317f87c0bc9430c4370763d823c9f3248abef08e8a5f1c66aa76b160 WHIRLPOOL 710e355602cdfbf13f3b8695201babb6c491eaf40e7bbfdf85cd3d1649b90b9c28fc341b149ba3a6b3b1da597166f90b14f3e675868722fd0202da5e919ef6f5
diff --git a/media-sound/chordii/chordii-4.5.1.ebuild b/media-sound/chordii/chordii-4.5.1.ebuild
new file mode 100644
index 000000000000..303f9e0f67d4
--- /dev/null
+++ b/media-sound/chordii/chordii-4.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A guitar music typesetter"
+HOMEPAGE="http://chordii.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( mirror://sourceforge/${PN}/user_guide-4.5.pdf )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+src_install() {
+	default
+
+	use doc && dodoc "${DISTDIR}"/user_guide-4.5.pdf
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/media-sound/chordii/chordii-4.5.3.ebuild b/media-sound/chordii/chordii-4.5.3.ebuild
new file mode 100644
index 000000000000..605ec52c35a4
--- /dev/null
+++ b/media-sound/chordii/chordii-4.5.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A guitar music typesetter"
+HOMEPAGE="http://chordii.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( mirror://sourceforge/${PN}/user_guide-${PV}.pdf )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+src_install() {
+	default
+
+	use doc && dodoc "${DISTDIR}"/user_guide-${PV}.pdf
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/media-sound/chordii/metadata.xml b/media-sound/chordii/metadata.xml
new file mode 100644
index 000000000000..0a7ee796fdd3
--- /dev/null
+++ b/media-sound/chordii/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Chordii is a fork of Chord, a program very popular several years
+		ago and most famous for its trendsetting 'ChordPro' music file format.
+
+		Chordii's purpose is to provide guitar players with a tool to produce
+		good looking, self-descriptive music sheets from text files.
+
+		Chordii reads a text file containing the lyrics of a song, the chords
+		to be played, their description and some other optional data to
+		produce a PostScript document that includes:
+
+			* Centered titles
+			* Chord names above the words
+			* Graphical representation of the chords at the end of the songs
+			* Transposition
+			* Multiple columns on a page
+			* Index of a songbook
+			* Multiple logical pages per physical pages (1, 2 or 4)
+			* Configurable fonts for the lyrics and the chord names
+			* Multiple songs inside one file
+			* The complete ISO 8859-1 character set
+			* Chorus marking
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">chordii</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
new file mode 100644
index 000000000000..6028f693a39e
--- /dev/null
+++ b/media-sound/chuck/Manifest
@@ -0,0 +1,9 @@
+AUX chuck-1.2.1.1-hid-smc.patch 3066 SHA256 5b07a22881c36bede4d041993cc4b6b26faf13f3e3c549ff9f31cc127fda1554 SHA512 854e2134f49b29f928f2752ab5228879f5fb2be4eab07ad68d2a66effcc8b0e6cb798bcd499a7cef6f3476923ae9f4dafe9e299c714a22020094074d2cbd3482 WHIRLPOOL 79a293fad5632ebef2fbee94e4ee8b3da23dd7fe4cf6c8a5b8a113ea8eaca9bbb3fd2c2acb049bdf646b59facf127d6963c714fc017fb6678ddc4e1c18c5b2eb
+AUX chuck-1.3.5.1-makefile.patch 865 SHA256 031ad7f4798477f8aafe54f1de7444aacb4eff2ad6be64ae5f0096c94df4ad7e SHA512 3b338b8f744e273ad90d8982a5df0c516eef070c27c604d22c9c091ff2f6ac713305ac6f52db121f3bb224b4171bfa6996d16f1e364532386bf17d05267450f2 WHIRLPOOL 19a34825e877145e4112863d9a258155c814cabbf13aaed211d3da3982f489bf92506ff806c1edc1f363f60276c5c8e3df62f145973fadd48ea5b7076fa02d07
+DIST chuck-1.3.5.1.tgz 14686970 SHA256 d141ca61547131edd2b29bdb88183835e4133ef09807674bfa33a4e6e09d1f53 SHA512 450237207150b285954dc2661d6f7829424d4353cdc457a7dce637b6877247b106ad0ed58bdbded17c1f7558e0f01daa7a06642f2727136f6edca5a64d202f73 WHIRLPOOL 5b70e6badffa39e38ea795ea688b4a452cd290dd849d6779e799c7a79e00513fa4b8c07ed64b7243bd0075936ce3ab4bdc99482268d564391ef3a1a96b9f9e8f
+DIST chuck-1.3.5.2.tgz 14687476 SHA256 e900b8545ffcb69c6d49354b18c43a9f9b8f789d3ae822f34b408eaee8d3e70b SHA512 00407b0f20fa9adcd9d0c31078ef7593f8a5b026f19086942c3fa56128fd07e202848651e5e8f41f1d70566de766e84f4a049ca4013e65a61b6f6fb10d69ffbc WHIRLPOOL 1eb7da2136d88cec35d7cb26b56e2e4073eb546ee304d6113cf44a82852e0bc5b87e4064bfb87224cfb1080931e68e179d6468be26da9b8e1ad6d987f7d71d7e
+EBUILD chuck-1.3.5.1.ebuild 1929 SHA256 105351ce22648f73276f994b02983b5dd74a59593ed30836e1812c9d8704e1af SHA512 e220556b04dc04e84accecddc815fe7e38ce856eca1731e8eb22d49daae7bfb54a8844c5454f4a311b423354cb70f70ae7cd329995f0671d2118c4b310bfafa5 WHIRLPOOL e1f9a16eeb07c4dcc366754e5c7d61b8cfa5131794b64ee99bb88d3e7fec79285fbe5dea337fa9fd52bb7aebb68ebf230d5409a211fda4489aa5fdf8a8e4070f
+EBUILD chuck-1.3.5.2.ebuild 1918 SHA256 d5fffe72add71ecbd1e69b0461b4b1e61c787c53676184433fcd7c8cf1cac5c6 SHA512 45e6e77187cc65a4e4740b84a6e18212b62f98a7be100b0d374102b6ae30c554a5ac1d5f6ed62b6266a542c821eaab61c603d6d56e122b4e79e23a7610168c8f WHIRLPOOL db332d177f5ddf1a346837f8d53b3416b3da576e8135202c8789a742398f307c984db98800359f30e9471de7ef5bb63015c6b70282066feb4c07fa2b11445c7d
+MISC ChangeLog 2721 SHA256 302e32482f21d5b3dd2e1b66bab3d0925a926ab6310d4d1cfdf0be91eca328db SHA512 2ae28af8d1d1546e8d798e397405eaa28793aefdeddfc4949ab3470c4e3e5f0adba35085cf77ee7184f28b5996e7e61b826752ca6fb2e3fd7c42414cf55ad72c WHIRLPOOL 7033ac0778342555099461fe6ade4e8133ffdd61ae1064a550eb480a73858afa6b7fb2648657b8c9dbd8757dee9bf6d44cde70b95075dc7780cb4a33b0eb9a54
+MISC ChangeLog-2015 3282 SHA256 729557d5899753decf066aaec1ee6cccb0e3406b03234c0099b6f8210cb8b556 SHA512 76dab5863a80aa0cd6272e48a8d96dd5a9fbd223ae6157915e5c92fae821354573fd804e8b6ebb8f800190285401a00cb95d2fe5f7016c2a23f037cb8a35c2a2 WHIRLPOOL 5a70c636c7927b0d7b364638742e0d7ca55a3541561d21ad80421a9d3f1096de22d4072d7d090c4b5029788157a0f98308f2e5c1ff5b04786f53117a8af4c72d
+MISC metadata.xml 967 SHA256 5644ca43484755597c4b3b8d3496b8b49665974da7f2a5819dba71724ac2ef60 SHA512 9d4c5d826ec6f90bf81a84e389f2ecca527b5116693fc5c32ccb456f5cb29f7daa42f4d655d57d4ed11a0c7625ec65904777e765a64217a4c3b5ad8a9e17b6e0 WHIRLPOOL 9a08bd1f0cbc497c48608bf7c070d48fffeb95c5e339434a0fd7ca67fb01d5b2d7f42c02b3465090ad32b9d88585d22816d4b158b75719eac2302fa4a70f4877
diff --git a/media-sound/chuck/chuck-1.3.5.1.ebuild b/media-sound/chuck/chuck-1.3.5.1.ebuild
new file mode 100644
index 000000000000..249ca778cb9a
--- /dev/null
+++ b/media-sound/chuck/chuck-1.3.5.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language"
+HOMEPAGE="http://chuck.cs.princeton.edu/"
+SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack examples"
+REQUIRED_USE="|| ( alsa jack )"
+
+RDEPEND="app-eselect/eselect-chuck
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.1.1-hid-smc.patch \
+		"${FILESDIR}"/${PN}-1.3.5.1-makefile.patch
+}
+
+compile_backend() {
+	backend=$1
+	pushd "${S}/src" &>/dev/null || die
+	einfo "Compiling against ${backend}"
+	emake  CC=$(tc-getCC) CXX=$(tc-getCXX) linux-${backend}
+	mv chuck{,-${backend}}
+	emake clean
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	# when compile with athlon or athlon-xp flags
+	# chuck crashes on removing a shred with a double free or corruption
+	# it happens in Chuck_VM_Stack::shutdown() on the line
+	#   SAFE_DELETE_ARRAY( stack );
+	replace-cpu-flags athlon athlon-xp i686
+
+	use jack && compile_backend jack
+	use alsa && compile_backend alsa
+}
+
+src_install() {
+	use jack && dobin src/chuck-jack
+	use alsa && dobin src/chuck-alsa
+
+	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
+	docinto doc
+	dodoc doc/*
+	if use examples; then
+		insinto /usr/share/doc/${PF}/
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	elog "Chuck now can use multiple audio engines, so you can specify"
+	elog "the preferred audio engine with chuck-{jack,alsa}"
+	elog "Or you can use 'eselect chuck' to set the audio engine"
+
+	einfo "Calling eselect chuck update..."
+	eselect chuck update --if-unset
+}
diff --git a/media-sound/chuck/chuck-1.3.5.2.ebuild b/media-sound/chuck/chuck-1.3.5.2.ebuild
new file mode 100644
index 000000000000..fd5abfa7224b
--- /dev/null
+++ b/media-sound/chuck/chuck-1.3.5.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language"
+HOMEPAGE="http://chuck.cs.princeton.edu/"
+SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack examples"
+REQUIRED_USE="|| ( alsa jack )"
+
+RDEPEND="app-eselect/eselect-chuck
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1.1-hid-smc.patch
+	"${FILESDIR}"/${PN}-1.3.5.1-makefile.patch
+)
+
+compile_backend() {
+	backend=$1
+	pushd "${S}/src" &>/dev/null || die
+	einfo "Compiling against ${backend}"
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX) linux-${backend}
+	mv chuck{,-${backend}} || die
+	emake clean
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	# when compile with athlon or athlon-xp flags
+	# chuck crashes on removing a shred with a double free or corruption
+	# it happens in Chuck_VM_Stack::shutdown() on the line
+	#   SAFE_DELETE_ARRAY( stack );
+	replace-cpu-flags athlon athlon-xp i686
+
+	use jack && compile_backend jack
+	use alsa && compile_backend alsa
+}
+
+src_install() {
+	use jack && dobin src/chuck-jack
+	use alsa && dobin src/chuck-alsa
+
+	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
+	docinto doc
+	dodoc doc/*
+	if use examples; then
+		insinto /usr/share/doc/${PF}/
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Chuck now can use multiple audio engines, so you can specify"
+		elog "the preferred audio engine with chuck-{jack,alsa}"
+		elog "Or you can use 'eselect chuck' to set the audio engine"
+	fi
+	eselect chuck update --if-unset
+}
diff --git a/media-sound/chuck/files/chuck-1.2.1.1-hid-smc.patch b/media-sound/chuck/files/chuck-1.2.1.1-hid-smc.patch
new file mode 100644
index 000000000000..e5dcef9da811
--- /dev/null
+++ b/media-sound/chuck/files/chuck-1.2.1.1-hid-smc.patch
@@ -0,0 +1,149 @@
+diff -ru chuck-1.2.1.1~/src/util_hid.cpp chuck-1.2.1.1/src/util_hid.cpp
+--- chuck-1.2.1.1~/src/util_hid.cpp	2008-03-29 23:24:21.000000000 +0100
++++ chuck-1.2.1.1/src/util_hid.cpp	2008-03-29 23:24:54.000000000 +0100
+@@ -7175,14 +7175,139 @@
+ int WiiRemote_send( const HidMsg * msg ){ return -1; }
+ const char * WiiRemote_name( int wr ){ return NULL; }
+ 
++#define SYSFS_TILTSENSOR_FILE "/sys/devices/platform/applesmc/position"
++#define TILTSENSOR_BUF_LEN 32
++
++static struct t_TiltSensor_data
++{
++	union
++	{
++		struct t_macbook
++		{
++			int x;
++			int y;
++			int z;
++		} macbook;
++	} data;
++	int dataType;
++	int detected;
++	int refcount;
++
++	t_TiltSensor_data()
++	{
++		refcount = 0;
++		dataType = -1;
++		detected = 0;
++	}
++
++} TiltSensor_data;
++enum
++{
++	linuxAppleSMCMacBookDataType
++};
++static int TiltSensor_detect()
++{
++	int fd;
++
++	fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
++
++	if (fd > 0)
++	{
++		TiltSensor_data.dataType = linuxAppleSMCMacBookDataType;
++		TiltSensor_data.detected = 1;
++		close(fd);
++		return 1;
++	}
++
++	TiltSensor_data.detected = -1;
++
++	return 0;
++}
++
++static int TiltSensor_do_read()
++{
++
++	switch(TiltSensor_data.dataType)
++	{
++		case linuxAppleSMCMacBookDataType:
++			char buf[TILTSENSOR_BUF_LEN];
++			int ret, fd;
++			fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
++
++			if (fd < 0) {
++				return -1;
++			}
++			ret = read(fd, buf, TILTSENSOR_BUF_LEN);
++			if (ret < 0) {
++				close(fd);
++				return -1;
++			}
++			if (sscanf(buf, "(%d,%d,%d)\n", &TiltSensor_data.data.macbook.x, &TiltSensor_data.data.macbook.y, &TiltSensor_data.data.macbook.z) != 3) {
++				close(fd);
++				return -1;
++			}
++			close(fd);
++			break;
++		default:
++			return 0;
++	}
++	return 1;
++}
+ void TiltSensor_init(){}
+ void TiltSensor_quit(){}
+ void TiltSensor_probe(){}
+-int TiltSensor_count(){ return 0; }
+-int TiltSensor_open( int ts ){ return -1; }
+-int TiltSensor_close( int ts ){ return -1; }
+-int TiltSensor_read( int ts, int type, int num, HidMsg * msg ){ return -1; }
+-const char * TiltSensor_name( int ts ){ return NULL; }
++int TiltSensor_count()
++{
++	if(TiltSensor_data.detected == 0)
++		TiltSensor_detect();
++
++	if(TiltSensor_data.detected == -1)
++		return 0;
++	else if(TiltSensor_data.detected == 1)
++		return 1;
++
++	return 0;
++}
++int TiltSensor_open( int ts )
++{
++	if(TiltSensor_data.detected == 0)
++		TiltSensor_detect();
++
++	if(TiltSensor_data.detected == -1)
++		return -1;
++
++	TiltSensor_data.refcount++;
++
++	return 0;
++}
++int TiltSensor_close( int ts )
++{
++	TiltSensor_data.refcount--;
++
++	return 0;
++}
++int TiltSensor_read( int ts, int type, int num, HidMsg * msg )
++{
++
++	if(TiltSensor_data.detected == -1)
++		return -1;
++
++	if(!TiltSensor_do_read())
++		return -1;
++
++	if(TiltSensor_data.dataType == linuxAppleSMCMacBookDataType)
++	{
++		msg->idata[0] = TiltSensor_data.data.macbook.x;
++		msg->idata[1] = TiltSensor_data.data.macbook.y;
++		msg->idata[2] = TiltSensor_data.data.macbook.z;
++	}
++
++	return 0;
++}
++const char * TiltSensor_name( int ts )
++{
++	return "Apple Sudden Motion Sensor";
++}
+ 
+ 
+ #endif
+Only in chuck-1.2.1.1/src: util_hid.cpp.orig
diff --git a/media-sound/chuck/files/chuck-1.3.5.1-makefile.patch b/media-sound/chuck/files/chuck-1.3.5.1-makefile.patch
new file mode 100644
index 000000000000..e714d20e6b92
--- /dev/null
+++ b/media-sound/chuck/files/chuck-1.3.5.1-makefile.patch
@@ -0,0 +1,27 @@
+--- chuck-1.3.5.1/src/makefile
++++ chuck-1.3.5.1/src/makefile
+@@ -40,8 +40,6 @@
+ 
+ ifneq ($(CHUCK_DEBUG),)
+ CFLAGS+= -g
+-else
+-CFLAGS+= -O3
+ endif
+ 
+ ifneq ($(USE_64_BIT_SAMPLE),)
+--- chuck-1.3.5.1/src/makefile.alsa
++++ chuck-1.3.5.1/src/makefile.alsa
+@@ -1,4 +1,4 @@
+ 
+-CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
++CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
+ LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread
+ 
+--- chuck-1.3.5.1/src/makefile.jack
++++ chuck-1.3.5.1/src/makefile.jack
+@@ -1,4 +1,4 @@
+ 
+-CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
++CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
+ LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread
+ 
diff --git a/media-sound/chuck/metadata.xml b/media-sound/chuck/metadata.xml
new file mode 100644
index 000000000000..2be677dfc4d0
--- /dev/null
+++ b/media-sound/chuck/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+    ChucK is a programming language for real-time sound synthesis and music
+    creation. It is open-source and freely available on MacOS X, Windows, and
+    Linux. ChucK presents a unique time-based, concurrent programming model
+    that is precise and expressive (we call this strongly-timed), dynamic
+    control rates, and the ability to add and modify code on-the-fly. In
+    addition, ChucK supports MIDI, OpenSoundControl, HID device, and
+    multi-channel audio. It is fun and easy to learn, and offers composers,
+    researchers, and performers a powerful programming tool for building and
+    experimenting with complex audio synthesis/analysis programs, and real-time
+    interactive music.
+  </longdescription>
+</pkgmetadata>
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
new file mode 100644
index 000000000000..b8a1832b101d
--- /dev/null
+++ b/media-sound/clementine/Manifest
@@ -0,0 +1,12 @@
+AUX clementine-1.3-fix-tokenizer.patch 674 SHA256 eeb5828314e8531dd0d3ce8c3af38b61840a864345314aee73b5ed3299f04baa SHA512 4f520dcd4937634ebf5bb814ec64267d42473886fc5abd4924ac551bbae8ecc7643ddbacd9e2f9a5b0d8c7b0f67cf5aec420b5eb73162b248cbf6b3eafafbbd8 WHIRLPOOL cd49b399587c1726e2a409df3fecad7b71959326812003edbd3a69eb459947e49590e36e5476ba886d6407c522d840907c2b2091596245209149b4c6b4045a72
+AUX clementine-1.3.1-add-missing-functional-includes.patch 1377 SHA256 7356b5210985a9e030eb57ac2d6190ad5ec66fa25a73497503337be6679780a8 SHA512 bea6fa8d7213404e1d048ec866cbc6d8b60ce7ff76af7f8c2bbc2c89959f478ff3201ddf072691c3e4d5c007e2ea8ad5c07150076920516f82ae1956b1be4075 WHIRLPOOL 2d248bc7d723d77a3296c0535a70e63f7b7f5728b5b6309a11b1d7987cf56ad4ddc8d360aedb92b66cf0bd5a54224ada5c3aee519bab1ad06630a1086fae9bab
+AUX clementine-1.3.1-chromaprint14.patch 1535 SHA256 cf5c1c625885cc4436722ac38dc201cdc491478dc73e171ea2af95bfb59fd0c6 SHA512 21ceda98534e4fe7f860d869cf83387e6c2a5c4c1a0db75c29dc8c9de18a3a117cebcfb98ea816723370009dc08e1804ec2b46c118e657eb293fb45d1fba2601 WHIRLPOOL 3341d3b3c9eda2d4e27b4df085c1cb500e852c1fe985a04088eb7e98e2f042dbc064b5c3bd04ce58404aa9a153b44b8cfcd68e1c4646f08eeab97ccfce15f007
+AUX clementine-1.3.1-fix-desktop-file.patch 1488 SHA256 af6f32da9324a3a6fdbb6ff0bccf2ba770ea82b3d25948e93285600624b04fa9 SHA512 55a787a63da9b1b4970e794d95233b22d704ff591e32cfc6c9b73023289e58a4cce2f2a43ec8186beb2feffe44b3cffa6b50f015a41cab5bba559087a868e826 WHIRLPOOL 52f8af4584b90cf0f52d2246f44fc22c2259a909c82cb6d9d591cbaa002d6005dacc9266d1a41196fdf5d02f8113da0ae3224292c17de150e6acb8b0dcd8bd8d
+AUX clementine-1.3.1-libechonest_removal.patch 23130 SHA256 7623f26a3a9cacf9f4850c51d128b575988059e07c4c35ed030e9d86a77f4f2b SHA512 44f28096567d48446fdd5769d91e32d3987f121e04f8f8fec956892c3a42693863cd5c9ab878e88c0477353fd369a005047c04e5da4661c701ab85103893947a WHIRLPOOL 121077646ea620d4d9633726848f5997aaaafd4a443844fc8c6f5bc196d9b6fe73ee99b332d90c335357612ed74541ea60e0a54b916dcb325ea930436c21ddff
+DIST clementine-1.3.1.tar.gz 8501827 SHA256 f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c SHA512 1942a046be24a583b5e2095dd39dc736c1b14a47dc4aad61d6252c1fccf745c26d7b35da907a220d5dc8c0736f5b589d050ed9582de343aa3cb5abc607001790 WHIRLPOOL 20a57177dc740865f35c407b981e146d9ddec6aff39e662a27dfe0e238f3baa87b331cc6dc50eebf848279c8860fb74454b4997924e2d4d93357a870364af1a7
+EBUILD clementine-1.3.1-r5.ebuild 4964 SHA256 73875d197550f2e10f9c123391ba0a662ea56801911e5596ad9dcdf504101f3a SHA512 da7ea645cd0c4e25233582d1e3c99738913d50bfcd59b17e495a2b27592a8b3af2a69ecb417a225bed00078057397e1ad657b325acb7e0673a460ec97f194b9f WHIRLPOOL 2aa20c99b722073f1b788f2d35ec995211215c0bacfc679ad6937f8a6b59e415170ccd57e652c59aa183d4f43c726477812cba91b99b5af970245d58e20b81b5
+EBUILD clementine-1.3.1-r6.ebuild 5299 SHA256 2568f07932ee246dec4176a5086bce4d23bdeeb48a25d68817e30e0fa1c2bc57 SHA512 334762d043acbc0792677db2f18e56943dbf9f488f8360b36b057d545a383f64f7164e743c97ef42a081f9bc663d611bc611ca66b939d53bb1afd6254b29c12d WHIRLPOOL b56ca3059814a5d6f147388f8bcbe7017b5f88bb9757ae2521cb3a8fce85e332a5193a9e7cc7f0042bb741393dbb9c3c04df72d6dcaf16db3c5552ea95063427
+EBUILD clementine-9999.ebuild 5113 SHA256 24c7209c65251af7ed553fd254a1256ce865e1121e993b11bdb6461f2a1e37e9 SHA512 732b960b264c37e3ffd2ebca697eff8071b39cbe67acee1c404effc1552d12323b43d9d9e24eb7a83b9feb4d940936fe7cb0f1f89787de0cb6cee51229d4e2af WHIRLPOOL b50eae04eeb964c2e2247042f3de8dd1e627286f08bc02fd083e35c098ea64625b4b1b2323ed4c9e5630ca430c9e83f0a9444aef9a68a202238a848aea7ca274
+MISC ChangeLog 9850 SHA256 5be4c79e7322aac6053e857bf192cd1dfc755d14d4eb6fd625ae6057a95ec483 SHA512 60dee44e488580005a61584743363789e1a34ef8526773efa7b91dfa16903e9d72b0c4f237fed17527d73925bf086a5be8878d64ba4057e4adfef90ea47efbcf WHIRLPOOL c80e7694a32e8577081d5acb2569fafe3553efde2154cac6f04c312cc8261771c98ea672f2bb98014966dca83d744d18111117b4dad9e8f70c4bf5e4553da067
+MISC ChangeLog-2015 15896 SHA256 f0ea70385e7167c03bd2864689f9a6ba8a09fb96cd606dc6d6e3d2a5c214705b SHA512 0e7f8cee28a56e833fdb1290cf7ed34bb439451a9500fd6e617743262dcd32bfc64a12cde09fb2ea309235fda464b55315ce8f01bc645c2d41eb4bf4551d482c WHIRLPOOL b953911d7c5695feccb32f8a53aef0a20f2c620f0ab4cbb67b9189d54fef4f38b62568b7664aa9a11a87879a44ff9af10fa9433c2d103ded1c4f878f4d089585
+MISC metadata.xml 1645 SHA256 0a1b5ddba729698f936723963d2abab5a5afe305c0221ab4dfef53559db78c9b SHA512 aebce1b21379c5dd33f8675f26124449a66277fc8d736620f20304d091d4a3ac4cb1dcbe31afc4512d18c2cb246b4ee6c246c763eb197a4bad77ed5e707f8ecd WHIRLPOOL d3004303a10da8c0ac324759044a3c9f6159db6a34742f4160712cf139dee9f63a1b342e9b6d7c2fd0946ca6fdf4580237e9335bba61b3beb0e4b377f95d9ad3
diff --git a/media-sound/clementine/clementine-1.3.1-r5.ebuild b/media-sound/clementine/clementine-1.3.1-r5.ebuild
new file mode 100644
index 000000000000..0edd5356ffe9
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1-r5.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+
+LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+inherit cmake-utils flag-o-matic xdg-utils gnome2-utils virtualx
+[[ ${PV} == *9999* ]] && inherit git-r3
+
+DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
+HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="amd64 x86"
+IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+	dev-db/sqlite:=
+	>=dev-libs/glib-2.24.1-r1
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-libs/qjson
+	>=dev-qt/qtcore-4.5:4[ssl]
+	>=dev-qt/qtgui-4.5:4
+	>=dev-qt/qtopengl-4.5:4
+	>=dev-qt/qtsql-4.5:4
+	>=media-libs/chromaprint-0.6
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt4(+)]
+	>=media-libs/taglib-1.8[mp4(+)]
+	sys-libs/zlib
+	dev-libs/crypto++
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio )
+	dbus? ( >=dev-qt/qtdbus-4.5:4 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	moodbar? ( sci-libs/fftw:3.0 )
+	projectm? ( media-libs/glew:=
+			>=media-libs/libprojectm-1.2.0 )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches:
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
+RDEPEND="${COMMON_DEPEND}
+	dbus? ( udisks? ( sys-fs/udisks:0 ) )
+	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	mtp? ( gnome-base/gvfs[mtp] )
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-taglib:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.39:=
+	virtual/pkgconfig
+	sys-devel/gettext
+	dev-qt/qttest:4
+	|| (
+		>=dev-cpp/gtest-1.8.0
+		dev-cpp/gmock
+	)
+	amazoncloud? ( dev-cpp/sparsehash )
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	pulseaudio? ( media-sound/pulseaudio )
+	skydrive? ( dev-cpp/sparsehash )
+	test? ( gnome-base/gsettings-desktop-schemas )
+"
+DOCS=( Changelog README.md )
+
+MY_P="${P/_}"
+[[ ${PV} == *9999* ]] || \
+S="${WORKDIR}/${MY_P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch
+	"${FILESDIR}"/${P}-fix-desktop-file.patch
+	"${FILESDIR}"/${P}-chromaprint14.patch #603662
+	"${FILESDIR}"/${P}-libechonest_removal.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# some tests fail or hang
+	sed -i \
+		-e '/add_test_file(translations_test.cpp/d' \
+		tests/CMakeLists.txt || die
+}
+
+src_configure() {
+	local langs x
+	for x in ${LANGS}; do
+		use linguas_${x} && langs+=" ${x}"
+	done
+
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		-DLINGUAS="${langs}"
+		-DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_DBUS="$(usex dbus)"
+		-DENABLE_DEVICEKIT="$(usex udisks)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBLASTFM="$(usex lastfm)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_GIO=ON
+		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+		-DENABLE_VISUALISATIONS="$(usex projectm)"
+		-DENABLE_BOX="$(usex box)"
+		-DENABLE_DROPBOX="$(usex dropbox)"
+		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_SKYDRIVE="$(usex skydrive)"
+		-DENABLE_VK="$(usex vkontakte)"
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
+		-DUSE_BUILTIN_TAGLIB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		-DUSE_SYSTEM_PROJECTM=ON
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		# force to find crypto++ see bug #548544
+		-DCRYPTOPP_LIBRARIES="crypto++"
+		-DCRYPTOPP_FOUND=ON
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	virtx emake test
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/clementine/clementine-1.3.1-r6.ebuild b/media-sound/clementine/clementine-1.3.1-r6.ebuild
new file mode 100644
index 000000000000..5aac7220fd64
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3.1-r6.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+
+LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+inherit cmake-utils flag-o-matic xdg-utils gnome2-utils virtualx
+[[ ${PV} == *9999* ]] && inherit git-r3
+
+DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
+HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks wiimote"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+	dev-db/sqlite:=
+	>=dev-libs/glib-2.24.1-r1
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-libs/qjson
+	>=dev-qt/qtcore-4.5:4[ssl]
+	>=dev-qt/qtgui-4.5:4
+	>=dev-qt/qtopengl-4.5:4
+	>=dev-qt/qtsql-4.5:4
+	>=media-libs/chromaprint-0.6
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt4(+)]
+	>=media-libs/taglib-1.8[mp4(+)]
+	sys-libs/zlib
+	dev-libs/crypto++
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio )
+	dbus? ( >=dev-qt/qtdbus-4.5:4 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	moodbar? ( sci-libs/fftw:3.0 )
+	projectm? ( media-libs/glew:=
+			>=media-libs/libprojectm-1.2.0 )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches:
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
+RDEPEND="${COMMON_DEPEND}
+	dbus? ( udisks? ( sys-fs/udisks:0 ) )
+	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	mtp? ( gnome-base/gvfs[mtp] )
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-taglib:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.39:=
+	virtual/pkgconfig
+	sys-devel/gettext
+	dev-qt/qttest:4
+	|| (
+		>=dev-cpp/gtest-1.8.0
+		dev-cpp/gmock
+	)
+	amazoncloud? ( dev-cpp/sparsehash )
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	pulseaudio? ( media-sound/pulseaudio )
+	skydrive? ( dev-cpp/sparsehash )
+	test? ( gnome-base/gsettings-desktop-schemas )
+"
+DOCS=( Changelog README.md )
+
+MY_P="${P/_}"
+[[ ${PV} == *9999* ]] || \
+S="${WORKDIR}/${MY_P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch
+	"${FILESDIR}"/${P}-fix-desktop-file.patch
+	"${FILESDIR}"/${P}-chromaprint14.patch #603662
+	"${FILESDIR}"/${P}-libechonest_removal.patch
+	"${FILESDIR}"/${P}-add-missing-functional-includes.patch #618214
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# some tests fail or hang
+	sed -i \
+		-e '/add_test_file(translations_test.cpp/d' \
+		tests/CMakeLists.txt || die
+}
+
+src_configure() {
+	local langs x
+	for x in ${LANGS}; do
+		use linguas_${x} && langs+=" ${x}"
+	done
+
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		-DLINGUAS="${langs}"
+		-DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_DBUS="$(usex dbus)"
+		-DENABLE_DEVICEKIT="$(usex udisks)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBLASTFM="$(usex lastfm)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_GIO=ON
+		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+		-DENABLE_VISUALISATIONS="$(usex projectm)"
+		-DENABLE_BOX="$(usex box)"
+		-DENABLE_DROPBOX="$(usex dropbox)"
+		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_SKYDRIVE="$(usex skydrive)"
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
+		-DUSE_BUILTIN_TAGLIB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		-DUSE_SYSTEM_PROJECTM=ON
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		# force to find crypto++ see bug #548544
+		-DCRYPTOPP_LIBRARIES="crypto++"
+		-DCRYPTOPP_FOUND=ON
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		# see https://github.com/clementine-player/Clementine/issues/5591
+		-DENABLE_VK=OFF
+		)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	virtx emake test
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be intrested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
new file mode 100644
index 000000000000..48a9e1e41b5e
--- /dev/null
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
+
+LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
+
+inherit cmake-utils flag-o-matic xdg-utils gnome2-utils virtualx
+[[ ${PV} == *9999* ]] && inherit git-r3
+
+DESCRIPTION="A modern music player and library organizer based on Amarok 1.4 and Qt4"
+HOMEPAGE="http://www.clementine-player.org https://github.com/clementine-player/Clementine"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks udisks_legacy wiimote"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	udisks_legacy? ( dbus )
+	wiimote? ( dbus )
+"
+
+COMMON_DEPEND="
+	dev-db/sqlite:=
+	>=dev-libs/glib-2.24.1-r1
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-libs/qjson
+	>=dev-qt/qtcore-4.5:4[ssl]
+	>=dev-qt/qtgui-4.5:4
+	>=dev-qt/qtopengl-4.5:4
+	>=dev-qt/qtsql-4.5:4
+	>=media-libs/chromaprint-0.6
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/libmygpo-qt-1.0.9[qt4(+)]
+	>=media-libs/taglib-1.8[mp4(+)]
+	sys-libs/zlib
+	dev-libs/crypto++
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio )
+	dbus? ( >=dev-qt/qtdbus-4.5:4 )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	moodbar? ( sci-libs/fftw:3.0 )
+	projectm? ( media-libs/glew:=
+			>=media-libs/libprojectm-1.2.0 )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches:
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# Still possibly essential but not applied yet patches are:
+# 06-fix-numeric-locale.patch
+# 08-stdlib.h-for-rand.patch
+RDEPEND="${COMMON_DEPEND}
+	dbus? ( udisks? ( sys-fs/udisks:2 )
+	        udisks_legacy? ( sys-fs/udisks:0 ) )
+	mms? ( media-plugins/gst-plugins-libmms:1.0 )
+	mtp? ( gnome-base/gvfs[mtp] )
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-taglib:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.39:=
+	virtual/pkgconfig
+	sys-devel/gettext
+	dev-qt/qttest:4
+	|| (
+		>=dev-cpp/gtest-1.8.0
+		dev-cpp/gmock
+	)
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	seafile? ( dev-cpp/sparsehash )
+	pulseaudio? ( media-sound/pulseaudio )
+	skydrive? ( dev-cpp/sparsehash )
+	test? ( gnome-base/gsettings-desktop-schemas )
+"
+DOCS=( Changelog README.md )
+
+MY_P="${P/_}"
+[[ ${PV} == *9999* ]] || \
+S="${WORKDIR}/${MY_P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# some tests fail or hang
+	sed -i \
+		-e '/add_test_file(translations_test.cpp/d' \
+		tests/CMakeLists.txt || die
+}
+
+src_configure() {
+	local langs x
+	for x in ${LANGS}; do
+		use linguas_${x} && langs+=" ${x}"
+	done
+
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		-DLINGUAS="${langs}"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_DBUS="$(usex dbus)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_DEVICEKIT="$(usex udisks_legacy)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBLASTFM="$(usex lastfm)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_GIO=ON
+		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
+		-DENABLE_VISUALISATIONS="$(usex projectm)"
+		-DENABLE_BOX="$(usex box)"
+		-DENABLE_DROPBOX="$(usex dropbox)"
+		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_SEAFILE="$(usex seafile)"
+		-DENABLE_SKYDRIVE="$(usex skydrive)"
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
+		-DUSE_BUILTIN_TAGLIB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		-DUSE_SYSTEM_PROJECTM=ON
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		# force to find crypto++ see bug #548544
+		-DCRYPTOPP_LIBRARIES="crypto++"
+		-DCRYPTOPP_FOUND=ON
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	virtx emake test
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+	elog "USE flags. You may be intrested in setting aac, flac, mp3, ogg or wavpack USE flags "
+	elog "depending on your preferences"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
new file mode 100644
index 000000000000..437518695a32
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3-fix-tokenizer.patch
@@ -0,0 +1,21 @@
+https://github.com/clementine-player/Clementine/issues/5297
+
+--- a/src/core/database.cpp
++++ b/src/core/database.cpp
+@@ -265,6 +265,16 @@
+   StaticInit();
+ 
+   {
++#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
++    QVariant v = db.driver()->handle();
++    if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
++      sqlite3* handle = *static_cast<sqlite3**>(v.data());
++      if (handle) {
++        sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL);
++      }
++    }
++#endif
++
+     QSqlQuery set_fts_tokenizer("SELECT fts3_tokenizer(:name, :pointer)", db);
+     set_fts_tokenizer.bindValue(":name", "unicode");
+     set_fts_tokenizer.bindValue(
diff --git a/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch b/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch
new file mode 100644
index 000000000000..e480212b883b
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1-add-missing-functional-includes.patch
@@ -0,0 +1,51 @@
+From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001
+From: Morris Hafner <mmha@users.noreply.github.com>
+Date: Mon, 13 Feb 2017 17:46:46 +0100
+Subject: [PATCH] Add missing <functional> includes (#5630)
+
+---
+ src/core/mergedproxymodel.cpp | 1 +
+ src/devices/giolister.cpp     | 1 +
+ src/library/groupbydialog.cpp | 2 ++
+ 3 files changed, 4 insertions(+)
+
+diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp
+index 56217f6..8c210d3 100644
+--- a/src/core/mergedproxymodel.cpp
++++ b/src/core/mergedproxymodel.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include <QStringList>
+ 
++#include <functional>
+ #include <limits>
+ 
+ // boost::multi_index still relies on these being in the global namespace.
+diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp
+index aa3bddb..5f63ef2 100644
+--- a/src/devices/giolister.cpp
++++ b/src/devices/giolister.cpp
+@@ -17,6 +17,7 @@
+ 
+ #include "config.h"
+ 
++#include <functional>
+ #include <memory>
+ 
+ #include <QFile>
+diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp
+index 5efdc9f..e5f711b 100644
+--- a/src/library/groupbydialog.cpp
++++ b/src/library/groupbydialog.cpp
+@@ -20,6 +20,8 @@
+ 
+ #include <QPushButton>
+ 
++#include <functional>
++
+ // boost::multi_index still relies on these being in the global namespace.
+ using std::placeholders::_1;
+ using std::placeholders::_2;
+-- 
+2.10.2
+
diff --git a/media-sound/clementine/files/clementine-1.3.1-chromaprint14.patch b/media-sound/clementine/files/clementine-1.3.1-chromaprint14.patch
new file mode 100644
index 000000000000..bfdc49265aa3
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1-chromaprint14.patch
@@ -0,0 +1,41 @@
+From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001
+From: Chocobozzz <florian.bigard@gmail.com>
+Date: Thu, 8 Dec 2016 23:12:17 +0100
+Subject: [PATCH] Add compatibility with chromaprint >= 1.4
+
+---
+ src/musicbrainz/chromaprinter.cpp | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
+index 9579b62..c7ad99e 100644
+--- a/src/musicbrainz/chromaprinter.cpp
++++ b/src/musicbrainz/chromaprinter.cpp
+@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() {
+   ChromaprintContext* chromaprint =
+       chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT);
+   chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels);
+-  chromaprint_feed(chromaprint, reinterpret_cast<void*>(data.data()),
++  chromaprint_feed(chromaprint, reinterpret_cast<int16_t *>(data.data()),
+                    data.size() / 2);
+   chromaprint_finish(chromaprint);
+ 
+-  void* fprint = nullptr;
+   int size = 0;
++
++#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4
++  u_int32_t *fprint = nullptr;
++  char *encoded = nullptr;
++#else
++  void *fprint = nullptr;
++  void *encoded = nullptr;
++#endif
++
+   int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size);
++
+   QByteArray fingerprint;
+   if (ret == 1) {
+-    void* encoded = nullptr;
+     int encoded_size = 0;
+     chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT,
+                                    &encoded, &encoded_size, 1);
diff --git a/media-sound/clementine/files/clementine-1.3.1-fix-desktop-file.patch b/media-sound/clementine/files/clementine-1.3.1-fix-desktop-file.patch
new file mode 100644
index 000000000000..bb561318c59d
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1-fix-desktop-file.patch
@@ -0,0 +1,52 @@
+This patch fixes gentoo QA notices against the desktop file (see gentoo bug 460412#3)
+Based upon patch extracted from upstream git; original patch info:
+commit 04f73d125365d97fa6f72677ec5d220292690e56
+Author: Golubev Alexander <fatzer2@gmail.com>
+Date:   Mon Jul 18 13:45:03 2016 +0400
+
+    Remove OnlyShowIn=Unity from clementine.desktop's action sections (#5444)
+
+diff --git a/dist/clementine.desktop b/dist/clementine.desktop
+index 2fb9559..9ee881e 100644
+--- a/dist/clementine.desktop
++++ b/dist/clementine.desktop
+@@ -38,7 +38,6 @@ Actions=Play;Pause;Stop;Previous;Next;
+ [Desktop Action Play]
+ Name=Play
+ Exec=clementine --play
+-OnlyShowIn=Unity;
+ Name[af]=Speel
+ Name[be]=Прайграць
+ Name[bg]=Възпроизвеждане
+@@ -89,7 +88,6 @@ Name[zh_TW]=播放
+ [Desktop Action Pause]
+ Name=Pause
+ Exec=clementine --pause
+-OnlyShowIn=Unity;
+ Name[be]=Прыпыніць
+ Name[bg]=Пауза
+ Name[br]=Ehan
+@@ -135,7 +133,6 @@ Name[zh_TW]=暫停
+ [Desktop Action Stop]
+ Name=Stop
+ Exec=clementine --stop
+-OnlyShowIn=Unity;
+ Name[be]=Спыніць
+ Name[bg]=Спиране
+ Name[br]=Paouez
+@@ -184,7 +181,6 @@ Name[zh_TW]=停止
+ [Desktop Action Previous]
+ Name=Previous
+ Exec=clementine --previous
+-OnlyShowIn=Unity;
+ Name[af]=Vorige
+ Name[be]=Папярэдні
+ Name[bg]=Предишна
+@@ -232,7 +228,6 @@ Name[zh_TW]=往前
+ [Desktop Action Next]
+ Name=Next
+ Exec=clementine --next
+-OnlyShowIn=Unity;
+ Name[af]=Volgende
+ Name[be]=Далей
+ Name[bg]=Следваща
diff --git a/media-sound/clementine/files/clementine-1.3.1-libechonest_removal.patch b/media-sound/clementine/files/clementine-1.3.1-libechonest_removal.patch
new file mode 100644
index 000000000000..63eb096d84d0
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3.1-libechonest_removal.patch
@@ -0,0 +1,701 @@
+Remove depend upon media-libs/libechonest and its support from clementine due to echonest service
+was shutdown and this functionality is useless now and results in nothing but a slight security
+and privacy risk.
+See Gentoo bug #573712.
+Based upon patch extracted from upstream git; original patch info:
+commit a8a0f2e4fdd3d4b2fd23b8628a3abc27c290d01d
+Author: John Maguire <john.maguire@gmail.com>
+Date:   Mon Jun 27 14:45:40 2016 +0100
+
+    Remove echonest and update songkick concert fetcher.
+--- Clementine-1.3.1/CMakeLists.txt
++++ Clementine-1.3.1/CMakeLists.txt
+@@ -365,9 +365,6 @@
+   endif (NOT APPLE)
+ endif (USE_SYSTEM_QXT)
+ 
+-find_path(ECHONEST_INCLUDE_DIRS echonest/echonest_export.h)
+-find_library(ECHONEST_LIBRARIES echonest)
+-
+ # Use system gmock if it's available
+ # We need to look for both gmock and gtest
+ find_path(GMOCK_INCLUDE_DIRS gmock/gmock.h)
+--- Clementine-1.3.1/src/CMakeLists.txt
++++ Clementine-1.3.1/src/CMakeLists.txt
+@@ -35,7 +35,6 @@
+ include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
+ include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS})
+ include_directories(${QXT_INCLUDE_DIRS})
+-include_directories(${ECHONEST_INCLUDE_DIRS})
+ include_directories(${SHA2_INCLUDE_DIRS})
+ include_directories(${CHROMAPRINT_INCLUDE_DIRS})
+ include_directories(${MYGPOQT_INCLUDE_DIRS})
+@@ -297,8 +296,6 @@
+   songinfo/artistinfoview.cpp
+   songinfo/collapsibleinfoheader.cpp
+   songinfo/collapsibleinfopane.cpp
+-  songinfo/echonestbiographies.cpp
+-  songinfo/echonestimages.cpp
+   songinfo/songinfobase.cpp
+   songinfo/songinfofetcher.cpp
+   songinfo/songinfoprovider.cpp
+@@ -586,8 +583,6 @@
+   songinfo/artistinfoview.h
+   songinfo/collapsibleinfoheader.h
+   songinfo/collapsibleinfopane.h
+-  songinfo/echonestbiographies.h
+-  songinfo/echonestimages.h
+   songinfo/songinfobase.h
+   songinfo/songinfofetcher.h
+   songinfo/songinfoprovider.h
+@@ -822,16 +817,12 @@
+     internet/lastfm/lastfmcompat.cpp
+     internet/lastfm/lastfmservice.cpp
+     internet/lastfm/lastfmsettingspage.cpp
+-    songinfo/echonestsimilarartists.cpp
+-    songinfo/echonesttags.cpp
+     songinfo/lastfmtrackinfoprovider.cpp
+     songinfo/tagwidget.cpp
+   HEADERS
+     covers/lastfmcoverprovider.h
+     internet/lastfm/lastfmservice.h
+     internet/lastfm/lastfmsettingspage.h
+-    songinfo/echonestsimilarartists.h
+-    songinfo/echonesttags.h
+     songinfo/lastfmtrackinfoprovider.h
+     songinfo/tagwidget.h
+   UI
+@@ -1241,7 +1232,6 @@
+   ${TAGLIB_LIBRARIES}
+   ${MYGPOQT_LIBRARIES}
+   ${CHROMAPRINT_LIBRARIES}
+-  ${ECHONEST_LIBRARIES}
+   ${GOBJECT_LIBRARIES}
+   ${GLIB_LIBRARIES}
+   ${GIO_LIBRARIES}
+--- Clementine-1.3.1/src/main.cpp
++++ Clementine-1.3.1/src/main.cpp
+@@ -76,8 +76,6 @@
+ #include <glib.h>
+ #include <gst/gst.h>
+ 
+-#include <echonest/Config.h>
+-
+ #ifdef Q_OS_DARWIN
+ #include <sys/resource.h>
+ #include <sys/sysctl.h>
+@@ -401,8 +399,8 @@
+   // Add root CA cert for SoundCloud, whose certificate is missing on OS X.
+   QSslSocket::addDefaultCaCertificates(
+       QSslCertificate::fromPath(":/soundcloud-ca.pem", QSsl::Pem));
+-  QSslSocket::addDefaultCaCertificates(
+-      QSslCertificate::fromPath(":/Equifax_Secure_Certificate_Authority.pem", QSsl::Pem));
++  QSslSocket::addDefaultCaCertificates(QSslCertificate::fromPath(
++      ":/Equifax_Secure_Certificate_Authority.pem", QSsl::Pem));
+ 
+   // Has the user forced a different language?
+   QString override_language = options.language();
+@@ -440,10 +438,6 @@
+   Application app;
+   app.set_language_name(language);
+ 
+-  Echonest::Config::instance()->setAPIKey("DFLFLJBUF4EGTXHIG");
+-  Echonest::Config::instance()->setNetworkAccessManager(
+-      new NetworkAccessManager);
+-
+   // Network proxy
+   QNetworkProxyFactory::setApplicationProxyFactory(
+       NetworkProxyFactory::Instance());
+--- Clementine-1.3.1/src/songinfo/artistinfoview.cpp
++++ Clementine-1.3.1/src/songinfo/artistinfoview.cpp
+@@ -16,25 +16,12 @@
+ */
+ 
+ #include "artistinfoview.h"
+-#include "echonestbiographies.h"
+-#include "echonestimages.h"
+ #include "songinfofetcher.h"
+ #include "songkickconcerts.h"
+ #include "widgets/prettyimageview.h"
+ 
+-#ifdef HAVE_LIBLASTFM
+-#include "echonestsimilarartists.h"
+-#include "echonesttags.h"
+-#endif
+-
+ ArtistInfoView::ArtistInfoView(QWidget* parent) : SongInfoBase(parent) {
+-  fetcher_->AddProvider(new EchoNestBiographies);
+-  fetcher_->AddProvider(new EchoNestImages);
+   fetcher_->AddProvider(new SongkickConcerts);
+-#ifdef HAVE_LIBLASTFM
+-  fetcher_->AddProvider(new EchoNestSimilarArtists);
+-  fetcher_->AddProvider(new EchoNestTags);
+-#endif
+ }
+ 
+ ArtistInfoView::~ArtistInfoView() {}
+--- Clementine-1.3.1/src/songinfo/echonestbiographies.cpp
++++ Clementine-1.3.1/src/songinfo/echonestbiographies.cpp
+@@ -1,123 +0,0 @@
+-/* This file is part of Clementine.
+-   Copyright 2010, David Sansome <me@davidsansome.com>
+-
+-   Clementine is free software: you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation, either version 3 of the License, or
+-   (at your option) any later version.
+-
+-   Clementine is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License
+-   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+-*/
+-
+-#include "echonestbiographies.h"
+-
+-#include <memory>
+-
+-#include <echonest/Artist.h>
+-
+-#include "songinfotextview.h"
+-#include "core/logging.h"
+-#include "ui/iconloader.h"
+-
+-struct EchoNestBiographies::Request {
+-  Request(int id) : id_(id), artist_(new Echonest::Artist) {}
+-
+-  int id_;
+-  std::unique_ptr<Echonest::Artist> artist_;
+-};
+-
+-EchoNestBiographies::EchoNestBiographies() {
+-  site_relevance_["wikipedia"] = 100;
+-  site_relevance_["lastfm"] = 60;
+-  site_relevance_["amazon"] = 30;
+-
+-  site_icons_["amazon"] = IconLoader::Load("amazon", IconLoader::Provider);
+-  site_icons_["aol"] = IconLoader::Load("aol", IconLoader::Provider);
+-  site_icons_["cdbaby"] = IconLoader::Load("cdbaby", IconLoader::Provider);
+-  site_icons_["lastfm"] = IconLoader::Load("as", IconLoader::Lastfm);
+-  site_icons_["mog"] = IconLoader::Load("mog", IconLoader::Provider);
+-  site_icons_["mtvmusic"] = IconLoader::Load("mtvmusic", IconLoader::Provider);
+-  site_icons_["myspace"] = IconLoader::Load("myspace", IconLoader::Provider);
+-  site_icons_["wikipedia"] = IconLoader::Load("wikipedia", IconLoader::Provider);
+-}
+-
+-void EchoNestBiographies::FetchInfo(int id, const Song& metadata) {
+-  std::shared_ptr<Request> request(new Request(id));
+-  request->artist_->setName(metadata.artist());
+-
+-  QNetworkReply* reply = request->artist_->fetchBiographies();
+-  connect(reply, SIGNAL(finished()), SLOT(RequestFinished()));
+-  requests_[reply] = request;
+-}
+-
+-void EchoNestBiographies::RequestFinished() {
+-  QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
+-  if (!reply || !requests_.contains(reply)) return;
+-  reply->deleteLater();
+-
+-  RequestPtr request = requests_.take(reply);
+-
+-  try {
+-    request->artist_->parseProfile(reply);
+-  }
+-  catch (Echonest::ParseError e) {
+-    qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
+-                  << e.what();
+-  }
+-
+-  QSet<QString> already_seen;
+-
+-  for (const Echonest::Biography& bio : request->artist_->biographies()) {
+-    QString canonical_site = bio.site().toLower();
+-    canonical_site.replace(QRegExp("[^a-z]"), "");
+-
+-    if (already_seen.contains(canonical_site)) continue;
+-    already_seen.insert(canonical_site);
+-
+-    CollapsibleInfoPane::Data data;
+-    data.id_ = "echonest/bio/" + bio.site();
+-    data.title_ = tr("Biography from %1").arg(bio.site());
+-    data.type_ = CollapsibleInfoPane::Data::Type_Biography;
+-
+-    if (site_relevance_.contains(canonical_site))
+-      data.relevance_ = site_relevance_[canonical_site];
+-    if (site_icons_.contains(canonical_site))
+-      data.icon_ = site_icons_[canonical_site];
+-
+-    SongInfoTextView* editor = new SongInfoTextView;
+-    QString text;
+-    // Add a link to the bio webpage at the top if we have one
+-    if (!bio.url().isEmpty()) {
+-      QString bio_url = bio.url().toEncoded();
+-      if (bio.site() == "facebook") {
+-        bio_url.replace("graph.facebook.com", "www.facebook.com");
+-      }
+-      text += "<p><a href=\"" + bio_url + "\">" +
+-              tr("Open in your browser") + "</a></p>";
+-    }
+-
+-    text += bio.text();
+-    if (bio.site() == "last.fm") {
+-      // Echonest lost formatting and it seems there is currently no plans on
+-      // Echonest side for changing this.
+-      // But with last.fm, we can guess newlines: "  " corresponds to a newline
+-      // (this seems to be because on last.fm' website, extra blank is inserted
+-      // before <br /> tag, and this blank is kept).
+-      // This is tricky, but this make the display nicer for last.fm
+-      // biographies.
+-      text.replace("  ", "<p>");
+-    }
+-    editor->SetHtml(text);
+-    data.contents_ = editor;
+-
+-    emit InfoReady(request->id_, data);
+-  }
+-
+-  emit Finished(request->id_);
+-}
+--- Clementine-1.3.1/src/songinfo/echonestbiographies.h
++++ Clementine-1.3.1/src/songinfo/echonestbiographies.h
+@@ -1,48 +0,0 @@
+-/* This file is part of Clementine.
+-   Copyright 2010, David Sansome <me@davidsansome.com>
+-
+-   Clementine is free software: you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation, either version 3 of the License, or
+-   (at your option) any later version.
+-
+-   Clementine is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License
+-   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+-*/
+-
+-#ifndef ECHONESTBIOGRAPHIES_H
+-#define ECHONESTBIOGRAPHIES_H
+-
+-#include <memory>
+-
+-#include "songinfoprovider.h"
+-
+-class QNetworkReply;
+-
+-class EchoNestBiographies : public SongInfoProvider {
+-  Q_OBJECT
+-
+- public:
+-  EchoNestBiographies();
+-
+-  void FetchInfo(int id, const Song& metadata);
+-
+- private slots:
+-  void RequestFinished();
+-
+- private:
+-  QMap<QString, int> site_relevance_;
+-  QMap<QString, QIcon> site_icons_;
+-
+-  struct Request;
+-  typedef std::shared_ptr<Request> RequestPtr;
+-
+-  QMap<QNetworkReply*, RequestPtr> requests_;
+-};
+-
+-#endif  // ECHONESTBIOGRAPHIES_H
+--- Clementine-1.3.1/src/songinfo/echonestsimilarartists.cpp
++++ Clementine-1.3.1/src/songinfo/echonestsimilarartists.cpp
+@@ -1,76 +0,0 @@
+-/* This file is part of Clementine.
+-   Copyright 2010, David Sansome <me@davidsansome.com>
+-
+-   Clementine is free software: you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation, either version 3 of the License, or
+-   (at your option) any later version.
+-
+-   Clementine is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License
+-   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+-*/
+-
+-#include "echonestsimilarartists.h"
+-#include "tagwidget.h"
+-#include "core/logging.h"
+-#include "ui/iconloader.h"
+-
+-#include <echonest/Artist.h>
+-
+-Q_DECLARE_METATYPE(QVector<QString>);
+-
+-void EchoNestSimilarArtists::FetchInfo(int id, const Song& metadata) {
+-  using Echonest::Artist;
+-
+-  Artist::SearchParams params;
+-  params << Artist::SearchParamEntry(Artist::Name, metadata.artist());
+-  params << Artist::SearchParamEntry(Artist::MinHotttnesss, 0.5);
+-
+-  QNetworkReply* reply = Echonest::Artist::fetchSimilar(params);
+-  connect(reply, SIGNAL(finished()), SLOT(RequestFinished()));
+-  requests_[reply] = id;
+-}
+-
+-void EchoNestSimilarArtists::RequestFinished() {
+-  QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
+-  if (!reply || !requests_.contains(reply)) return;
+-  reply->deleteLater();
+-
+-  int id = requests_.take(reply);
+-
+-  Echonest::Artists artists;
+-  try {
+-    artists = Echonest::Artist::parseSimilar(reply);
+-  }
+-  catch (Echonest::ParseError e) {
+-    qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
+-                  << e.what();
+-  }
+-
+-  if (!artists.isEmpty()) {
+-    CollapsibleInfoPane::Data data;
+-    data.id_ = "echonest/similarartists";
+-    data.title_ = tr("Similar artists");
+-    data.type_ = CollapsibleInfoPane::Data::Type_Similar;
+-    data.icon_ = IconLoader::Load("echonest", IconLoader::Provider);
+-
+-    TagWidget* widget = new TagWidget(TagWidget::Type_Artists);
+-    data.contents_ = widget;
+-
+-    widget->SetIcon(IconLoader::Load("x-clementine-artist", IconLoader::Base));
+-
+-    for (const Echonest::Artist& artist : artists) {
+-      widget->AddTag(artist.name());
+-      if (widget->count() >= 10) break;
+-    }
+-
+-    emit InfoReady(id, data);
+-  }
+-
+-  emit Finished(id);
+-}
+--- Clementine-1.3.1/src/songinfo/echonestsimilarartists.h
++++ Clementine-1.3.1/src/songinfo/echonestsimilarartists.h
+@@ -1,38 +0,0 @@
+-/* This file is part of Clementine.
+-   Copyright 2010, David Sansome <me@davidsansome.com>
+-
+-   Clementine is free software: you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation, either version 3 of the License, or
+-   (at your option) any later version.
+-
+-   Clementine is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License
+-   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+-*/
+-
+-#ifndef ECHONESTSIMILARARTISTS_H
+-#define ECHONESTSIMILARARTISTS_H
+-
+-#include "songinfoprovider.h"
+-
+-class QNetworkReply;
+-
+-class EchoNestSimilarArtists : public SongInfoProvider {
+-  Q_OBJECT
+-
+- public:
+-  void FetchInfo(int id, const Song& metadata);
+-
+- private slots:
+-  void RequestFinished();
+-
+- private:
+-  QMap<QNetworkReply*, int> requests_;
+-};
+-
+-#endif  // ECHONESTSIMILARARTISTS_H
+--- Clementine-1.3.1/src/songinfo/echonesttags.cpp
++++ Clementine-1.3.1/src/songinfo/echonesttags.cpp
+@@ -1,80 +0,0 @@
+-/* This file is part of Clementine.
+-   Copyright 2010, David Sansome <me@davidsansome.com>
+-
+-   Clementine is free software: you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation, either version 3 of the License, or
+-   (at your option) any later version.
+-
+-   Clementine is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License
+-   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+-*/
+-
+-#include "echonesttags.h"
+-
+-#include <memory>
+-
+-#include <echonest/Artist.h>
+-
+-#include "tagwidget.h"
+-#include "core/logging.h"
+-#include "ui/iconloader.h"
+-
+-struct EchoNestTags::Request {
+-  Request(int id) : id_(id), artist_(new Echonest::Artist) {}
+-
+-  int id_;
+-  std::unique_ptr<Echonest::Artist> artist_;
+-};
+-
+-void EchoNestTags::FetchInfo(int id, const Song& metadata) {
+-  std::shared_ptr<Request> request(new Request(id));
+-  request->artist_->setName(metadata.artist());
+-
+-  QNetworkReply* reply = request->artist_->fetchTerms();
+-  connect(reply, SIGNAL(finished()), SLOT(RequestFinished()));
+-  requests_[reply] = request;
+-}
+-
+-void EchoNestTags::RequestFinished() {
+-  QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
+-  if (!reply || !requests_.contains(reply)) return;
+-  reply->deleteLater();
+-
+-  RequestPtr request = requests_.take(reply);
+-
+-  try {
+-    request->artist_->parseProfile(reply);
+-  }
+-  catch (Echonest::ParseError e) {
+-    qLog(Warning) << "Error parsing echonest reply:" << e.errorType()
+-                  << e.what();
+-  }
+-
+-  if (!request->artist_->terms().isEmpty()) {
+-    CollapsibleInfoPane::Data data;
+-    data.id_ = "echonest/artisttags";
+-    data.title_ = tr("Artist tags");
+-    data.type_ = CollapsibleInfoPane::Data::Type_Tags;
+-    data.icon_ = IconLoader::Load("icon_tag", IconLoader::Lastfm);
+-
+-    TagWidget* widget = new TagWidget(TagWidget::Type_Tags);
+-    data.contents_ = widget;
+-
+-    widget->SetIcon(data.icon_);
+-
+-    for (const Echonest::Term& term : request->artist_->terms()) {
+-      widget->AddTag(term.name());
+-      if (widget->count() >= 10) break;
+-    }
+-
+-    emit InfoReady(request->id_, data);
+-  }
+-
+-  emit Finished(request->id_);
+-}
+--- Clementine-1.3.1/src/songinfo/echonesttags.h
++++ Clementine-1.3.1/src/songinfo/echonesttags.h
+@@ -1,43 +0,0 @@
+-/* This file is part of Clementine.
+-   Copyright 2010, David Sansome <me@davidsansome.com>
+-
+-   Clementine is free software: you can redistribute it and/or modify
+-   it under the terms of the GNU General Public License as published by
+-   the Free Software Foundation, either version 3 of the License, or
+-   (at your option) any later version.
+-
+-   Clementine is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
+-
+-   You should have received a copy of the GNU General Public License
+-   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+-*/
+-
+-#ifndef ECHONESTTAGS_H
+-#define ECHONESTTAGS_H
+-
+-#include <memory>
+-
+-#include "songinfoprovider.h"
+-
+-class QNetworkReply;
+-
+-class EchoNestTags : public SongInfoProvider {
+-  Q_OBJECT
+-
+- public:
+-  void FetchInfo(int id, const Song& metadata);
+-
+- private slots:
+-  void RequestFinished();
+-
+- private:
+-  struct Request;
+-  typedef std::shared_ptr<Request> RequestPtr;
+-
+-  QMap<QNetworkReply*, RequestPtr> requests_;
+-};
+-
+-#endif  // ECHONESTTAGS_H
+--- Clementine-1.3.1/src/songinfo/songkickconcerts.cpp
++++ Clementine-1.3.1/src/songinfo/songkickconcerts.cpp
+@@ -21,9 +21,6 @@
+ #include <QVBoxLayout>
+ #include <QXmlStreamWriter>
+ 
+-#include <echonest/Artist.h>
+-#include <echonest/TypeInformation.h>
+-
+ #include <qjson/parser.h>
+ 
+ #include "core/closure.h"
+@@ -31,77 +28,64 @@
+ #include "songkickconcertwidget.h"
+ #include "ui/iconloader.h"
+ 
+-const char* SongkickConcerts::kSongkickArtistBucket = "songkick";
+-const char* SongkickConcerts::kSongkickArtistCalendarUrl =
+-    "https://api.songkick.com/api/3.0/artists/%1/calendar.json?"
+-    "per_page=5&"
+-    "apikey=8rgKfy1WU6IlJFfN";
++namespace {
++const char* kSongkickArtistCalendarUrl =
++    "https://api.songkick.com/api/3.0/artists/%1/calendar.json";
++const char* kSongkickArtistSearchUrl =
++    "https://api.songkick.com/api/3.0/search/artists.json";
++const char* kSongkickApiKey = "8rgKfy1WU6IlJFfN";
++}  // namespace
+ 
+ SongkickConcerts::SongkickConcerts() {
+   Geolocator* geolocator = new Geolocator;
+   geolocator->Geolocate();
+   connect(geolocator, SIGNAL(Finished(Geolocator::LatLng)),
+           SLOT(GeolocateFinished(Geolocator::LatLng)));
+-  NewClosure(geolocator, SIGNAL(Finished(Geolocator::LatLng)), geolocator,
+-             SLOT(deleteLater()));
++  connect(geolocator, SIGNAL(Finished(Geolocator::LatLng)), geolocator,
++          SLOT(deleteLater()));
+ }
+ 
+ void SongkickConcerts::FetchInfo(int id, const Song& metadata) {
+-  Echonest::Artist::SearchParams params;
+-  params.push_back(
+-      qMakePair(Echonest::Artist::Name, QVariant(metadata.artist())));
+-  qLog(Debug) << "Params:" << params;
+-  QNetworkReply* reply = Echonest::Artist::search(
+-      params,
+-      Echonest::ArtistInformation(Echonest::ArtistInformation::NoInformation,
+-                                  QStringList() << kSongkickArtistBucket));
+-  qLog(Debug) << reply->request().url();
++  if (metadata.artist().isEmpty()) {
++    emit Finished(id);
++    return;
++  }
++
++  QUrl url(kSongkickArtistSearchUrl);
++  url.addQueryItem("apikey", kSongkickApiKey);
++  url.addQueryItem("query", metadata.artist());
++
++  QNetworkRequest request(url);
++  QNetworkReply* reply = network_.get(request);
+   NewClosure(reply, SIGNAL(finished()), this,
+              SLOT(ArtistSearchFinished(QNetworkReply*, int)), reply, id);
+ }
+ 
+ void SongkickConcerts::ArtistSearchFinished(QNetworkReply* reply, int id) {
+   reply->deleteLater();
+-  try {
+-    Echonest::Artists artists = Echonest::Artist::parseSearch(reply);
+-    if (artists.isEmpty()) {
+-      qLog(Debug) << "Failed to find artist in echonest";
+-      emit Finished(id);
+-      return;
+-    }
+-
+-    const Echonest::Artist& artist = artists[0];
+-    const Echonest::ForeignIds& foreign_ids = artist.foreignIds();
+-    QString songkick_id;
+-    for (const Echonest::ForeignId& id : foreign_ids) {
+-      if (id.catalog == "songkick") {
+-        songkick_id = id.foreign_id;
+-        break;
+-      }
+-    }
+-
+-    if (songkick_id.isEmpty()) {
+-      qLog(Debug) << "Failed to fetch songkick foreign id for artist";
+-      emit Finished(id);
+-      return;
+-    }
+-
+-    QStringList split = songkick_id.split(':');
+-    if (split.count() != 3) {
+-      qLog(Error) << "Weird songkick id";
+-      emit Finished(id);
+-      return;
+-    }
+-
+-    FetchSongkickCalendar(split[2], id);
+-  } catch (Echonest::ParseError& e) {
+-    qLog(Error) << "Error parsing echonest reply:" << e.errorType() << e.what();
++
++  QJson::Parser parser;
++  QVariantMap json = parser.parse(reply).toMap();
++
++  QVariantMap results_page = json["resultsPage"].toMap();
++  QVariantMap results = results_page["results"].toMap();
++  QVariantList artists = results["artist"].toList();
++
++  if (artists.isEmpty()) {
+     emit Finished(id);
++    return;
+   }
++
++  QVariantMap artist = artists.first().toMap();
++  QString artist_id = artist["id"].toString();
++
++  FetchSongkickCalendar(artist_id, id);
+ }
+ 
+ void SongkickConcerts::FetchSongkickCalendar(const QString& artist_id, int id) {
+   QUrl url(QString(kSongkickArtistCalendarUrl).arg(artist_id));
++  url.addQueryItem("per_page", "5");
++  url.addQueryItem("apikey", kSongkickApiKey);
+   qLog(Debug) << url;
+   QNetworkReply* reply = network_.get(QNetworkRequest(url));
+   NewClosure(reply, SIGNAL(finished()), this,
+--- Clementine-1.3.1/src/songinfo/songkickconcerts.h
++++ Clementine-1.3.1/src/songinfo/songkickconcerts.h
+@@ -44,9 +44,6 @@
+ 
+   NetworkAccessManager network_;
+   Geolocator::LatLng latlng_;
+-
+-  static const char* kSongkickArtistBucket;
+-  static const char* kSongkickArtistCalendarUrl;
+ };
+ 
+ #endif
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
new file mode 100644
index 000000000000..145208285ecf
--- /dev/null
+++ b/media-sound/clementine/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fatzer2@gmail.com</email>
+		<name>Fat-Zer</name>
+		<description>Proxied maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+		<description>Proxy maintainer for Fat-Zer. Please CC on bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="amazoncloud">Enable Amazon cloud drive support</flag>
+		<flag name="box">Enable filesharing via Box.com</flag>
+		<flag name="dropbox">Enable Dropbox support</flag>
+		<flag name="googledrive">Enable Google Drive support</flag>
+		<flag name="lastfm">Use liblastfm for fetching song info, scrobbling and radio streams</flag>
+		<flag name="moodbar">Enable moodbar support</flag>
+		<flag name="projectm">Build with ProjectM visualization</flag>
+		<flag name="seafile">Enable support for seafile: a file sync service</flag>
+		<flag name="skydrive">Enable Skydrive support</flag>
+		<flag name="udisks_legacy">Enable storage management support via legacy <pkg>sys-fs/udisks</pkg>:0</flag>
+		<flag name="vkontakte">Enable vk.com support</flag>
+		<flag name="wiimote">Enable support for Wii remote</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">clementine-player/Clementine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/cmix/Manifest b/media-sound/cmix/Manifest
new file mode 100644
index 000000000000..431905513f23
--- /dev/null
+++ b/media-sound/cmix/Manifest
@@ -0,0 +1,6 @@
+AUX cmix-1.6-ldflags.patch 296 SHA256 25fffb41722ae8f8a8d7cbbd7a9069bef1c3f3422a19d3b475bacb117945f2de SHA512 39808ce3fa29b13dac4a80a4406fb30d852983a64012c3c27a8d91a5274d86cac0175c0d1395e8a7095477947989d8fa825a79541866a23c63dbe904bd3d8700 WHIRLPOOL 6a6c5cb189e52691ea3929e140b52bdf1c97fc08d11095f2b18256fb178ac1508e642297b48c2f8dcd503af023a03f8649494cd3ae6782c45d7e9e5a27af1e5f
+DIST cmix-1.6.tbz2 12880 SHA256 3c63e687c0afac50f5218f2ee0f594132f1656073d5a9cf3f7f0da525b4e8afe SHA512 5d8409872bbea0575a1cb7d15d1f1469571860d06f4f71bf78b685077d0ff394323ef12498d3f8424e00b31a7c7430115ee7a810b7bbf291bb586a3d95f19a38 WHIRLPOOL 08d496d71d2d016679df5c99056d625f097aef7c334a38bbff448145a11cec931c0bb5557a33872459781202c12a46e3cd97b98a32db0f6dc39458eaa8303612
+EBUILD cmix-1.6.ebuild 646 SHA256 9845d80dd6c99262b87d199b9212c5b823259057fdbf215a483094c85f0c453b SHA512 e3261da204c80c995b35f3bacf3f2c0bf456c19f210233da1690a2481ecec3f62bebefc20ca582adc10a403d8e74a18bc3def759fd7ac161b0700187912eb4ac WHIRLPOOL 610b3342d1344f96f3f9e8e219f2d5699be3b554ed467dc8f9415a0d11bf13df0bdcbe8108a2394d9723c0cc6d31f2c759919836a6ab605c8b1a13eb3eade76e
+MISC ChangeLog 2994 SHA256 430d1391a6954c8a9e35daec7a55217603e0ff0940b725e82836d8af7eb0b029 SHA512 bd60ffa41770794fe5af785625871233c9085005362013c1f4c2c674acfc35906a4836bc482225699356e97bf2d65461353b2afd919972090fe499e321c437a4 WHIRLPOOL 2300929e055b64d3da854afba65438b67de9849e04d34bfb18aefac71b1fec6f3ab44e9a1f6fd0d48b024d6e539d7146e88556434347e36db08746e95f906915
+MISC ChangeLog-2015 1102 SHA256 97947b2a8a6beb0773bedbbbd3390d22a4761630253bd4ed78e3c61d160a0723 SHA512 ad5eaa1ced5732536e9dbbc65f32ff6d7ab6f82fc85e2dd5c4e9f6b032683bb1deb0abf299302c48a07f7ae44f02845e55493e44d82c0bd1e8b0f4d2fd1da295 WHIRLPOOL a3209919fad47c7b8fbdf20315ac649d1acab4be170d246436ae657b76aa3f4ba13c537d447eadbcd835b7e9f5ff9ea96a21ce393d9af6a8da9f195c1a0d7ee3
+MISC metadata.xml 327 SHA256 f64b8287d74a87da7041e9e1b577a79d077d3c69bbb8e16544fc534d28ed3cfa SHA512 d962a2ab67c8dec05a40fd6b52625d9d260861386e62d851ba72551afec5dcd68b4454c3057921d66bddad3c8ac5c137e7d16a6eb84850b0d7d9a763eeec424b WHIRLPOOL 687f2a9172d16c992153baa39728fc101d00875117472a9cfeceb64dfcb202f3a3e42527639a174a369834fe671854500d30dfdc8e4742a69c1c9eed28ec773c
diff --git a/media-sound/cmix/cmix-1.6.ebuild b/media-sound/cmix/cmix-1.6.ebuild
new file mode 100644
index 000000000000..933e6189f5a0
--- /dev/null
+++ b/media-sound/cmix/cmix-1.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+IUSE=""
+
+DESCRIPTION="command line audio mixer"
+HOMEPAGE="http://cmix.sourceforge.net/"
+SRC_URI="http://antipoder.dyndns.org/downloads/${P}.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-amd64: 1.6: 'cmix list' gives: MIXER_READ(SOUND_MIXER_OUTSRC): Input/output error
+KEYWORDS="-amd64 ~ppc sparc x86"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	einstall || die
+	dobin cmix
+	dodoc README || die
+}
diff --git a/media-sound/cmix/files/cmix-1.6-ldflags.patch b/media-sound/cmix/files/cmix-1.6-ldflags.patch
new file mode 100644
index 000000000000..ba8dacb2567b
--- /dev/null
+++ b/media-sound/cmix/files/cmix-1.6-ldflags.patch
@@ -0,0 +1,14 @@
+Index: cmix-1.6/Makefile
+===================================================================
+--- cmix-1.6.orig/Makefile
++++ cmix-1.6/Makefile
+@@ -3,8 +3,7 @@ CC=gcc
+ #CFLAGS=-Wall -O2
+ 
+ cmix: mix.c
+-	$(CC) $(CFLAGS) mix.c -o $@
+-	strip $@
++	$(CC) $(CFLAGS) $(LDFLAGS) mix.c -o $@
+ 
+ install: 
+ 
diff --git a/media-sound/cmix/metadata.xml b/media-sound/cmix/metadata.xml
new file mode 100644
index 000000000000..fb16954db726
--- /dev/null
+++ b/media-sound/cmix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cmix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
new file mode 100644
index 000000000000..b7a2c4ad9e1d
--- /dev/null
+++ b/media-sound/cmus/Manifest
@@ -0,0 +1,5 @@
+DIST cmus-2.8.0_rc0.tar.gz 315613 SHA256 b594087f16053f4db49e89d72b1c6dbb12e221373e806e62b3e97c327de1dac9 SHA512 0379f18497d6510fad35a2d905c932d12f2726a5694d3ab272ce139e9ea4520cb4dd1cf3fafe890f6ada8a64285f8c04ef7571647a66c2d44df17e2dca80f869 WHIRLPOOL 47fb7c22727bcc6e2a231c469b4ff67ec8a56902ec1786357eef33445ae0fac5b66e68649193af03b7fd1cb6274da1742ab2a1c6473ec764ff210b9ce60afcb5
+EBUILD cmus-2.8.0_rc0.ebuild 3300 SHA256 3fae4a930e16f598eb5de663707575802db33455ef1f73683df55173771fc705 SHA512 306d304bc131a67960188573ad46da113539c86eb40e7bf78762214065fb69c8653f2af8e19ac140499ad199139c0c12a82249e6f6d13d632704fd99cf49d2a8 WHIRLPOOL ea4312a9ebbaf72044e58b0716c61ac8ce6b5cc72fda0e524c87f85e7c4462eac48cf41b140a481145d1736ca5524c77a54afb127d6fa3452e5f9fc3fb8199c1
+MISC ChangeLog 4861 SHA256 2d3a4cd63c293646dd89cb356d7e25fe5d9017bfd18d5b959fdd483438699068 SHA512 f0ac9c6215021af0d1be3a1ceecd0947dc57a681eff7e50f17f35bf602cf2d35ca7a69bc8be0480d7a166b992f306235cb860c6f8ffd9f386117274cfc0e8d71 WHIRLPOOL 9ffee9ad7ef2eaa665d7df5b7a524177c8d45e35bb154d369a707558ad80ffdcdef56d17f2b522856693efded33d28328dcea4b8c2d972616100d6e351940f3a
+MISC ChangeLog-2015 10896 SHA256 00bbf172f99d955e7d916f065bceaaf0afc0f709dd7fde7ef9f03b193fc846ed SHA512 e7fc591f22267fb30fa75111fa8b4d0b988df14bd593a2cec6021c4cff84b510ce1addb295a3c2f7567fd1706c88e8caff28af4d80a043d109977ed0a2b6bb79 WHIRLPOOL 0c332a7a4eff5942b517073df57fcbcf3a9397e3c249754a11612d3cb12546bdcf5eb3333dd3255657c02b2d45f9d180a408b8b3a548b9ddc7abc69f5bc8902b
+MISC metadata.xml 872 SHA256 ebfa56de66249b44362fd848f93ab0c109dfb94cd800674b3c81a282ab7e1b96 SHA512 3d4ef1bf44ff73be65e203c2ba979a782cb64ee821316edf5885b037a4ca89f868bbaa54e65eab8eb315811c976f867678fd3ac22fa021ea494d0e6c08e7760a WHIRLPOOL ce43e4f82dd9979e54ea751a64de32c4ed285778586b50c3536439175a227e9dde62fe9ba62ed6fe38280391bb70de4750d4b10902bd494f3188a5b8c6e6d5f3
diff --git a/media-sound/cmus/cmus-2.8.0_rc0.ebuild b/media-sound/cmus/cmus-2.8.0_rc0.ebuild
new file mode 100644
index 000000000000..f1776a8b9554
--- /dev/null
+++ b/media-sound/cmus/cmus-2.8.0_rc0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit bash-completion-r1 multilib
+
+DESCRIPTION="A ncurses based music player with plugin support for many formats"
+HOMEPAGE="https://cmus.github.io/"
+SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="aac alsa ao cue cdio cddb discid debug examples ffmpeg +flac jack libsamplerate
+	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor +unicode
+	+vorbis wavpack"
+
+S="${WORKDIR}/${P/_/-}"
+
+CDEPEND="sys-libs/ncurses:0=[unicode?]
+	aac? ( media-libs/faad2 )
+	alsa? ( >=media-libs/alsa-lib-1.0.11 )
+	ao? ( media-libs/libao )
+	cue? ( media-libs/libcue )
+	cdio? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	discid? ( media-libs/libdiscid )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( >=media-libs/libmad-0.14 )
+	mikmod? ( media-libs/libmikmod:0 )
+	modplug? ( >=media-libs/libmodplug-0.7 )
+	mp4? ( >=media-libs/libmp4v2-1.9:0 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	pulseaudio? ( media-sound/pulseaudio )
+	tremor? ( media-libs/tremor )
+	!tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	pidgin? ( net-im/pidgin dev-python/dbus-python )"
+
+# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
+REQUIRED_USE="tremor? ( vorbis )
+	mp4? ( aac )" # enabling mp4 adds -lfaad
+
+DOCS="AUTHORS README.md"
+
+my_config() {
+	local value
+	use ${1} && value=a || value=n
+	myconf="${myconf} ${2}=${value}"
+}
+
+src_configure() {
+	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"
+
+	use debug && debuglevel=2
+
+	my_config cddb CONFIG_CDDB
+	my_config cdio CONFIG_CDIO
+	my_config discid CONFIG_DISCID
+	my_config flac CONFIG_FLAC
+	my_config mad CONFIG_MAD
+	my_config modplug CONFIG_MODPLUG
+	my_config mikmod CONFIG_MIKMOD
+	my_config musepack CONFIG_MPC
+	my_config vorbis CONFIG_VORBIS
+	my_config tremor CONFIG_TREMOR
+	my_config opus CONFIG_OPUS
+	my_config wavpack CONFIG_WAVPACK
+	my_config mp4 CONFIG_MP4
+	my_config aac CONFIG_AAC
+	my_config ffmpeg CONFIG_FFMPEG
+	my_config cue CONFIG_CUE
+	my_config pulseaudio CONFIG_PULSE
+	my_config alsa CONFIG_ALSA
+	my_config jack CONFIG_JACK
+	my_config libsamplerate CONFIG_SAMPLERATE
+	my_config ao CONFIG_AO
+	my_config oss CONFIG_OSS
+
+	./configure prefix="${EPREFIX}"/usr ${myconf} \
+		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
+}
+
+src_install() {
+	default
+
+	use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/_cmus
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use pidgin; then
+		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
+	fi
+}
+
+pkg_postinst() {
+	einfo "USE flag 'wma' was replaced by 'ffmpeg'"
+	einfo "Details here - https://bugs.gentoo.org/show_bug.cgi?id=553834"
+}
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
new file mode 100644
index 000000000000..b6311fbd0308
--- /dev/null
+++ b/media-sound/cmus/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="cdio">use libcdio for CD support </flag>
+    <flag name="cue">enable CUE sheet parsing</flag>
+    <flag name="discid">enable reading the ID of the inserted CD</flag>
+    <flag name="pidgin">install support script for <pkg>net-im/pidgin</pkg></flag>
+    <flag name="opus">enable support for <pkg>media-libs/opusfile</pkg></flag>
+    <flag name="tremor">use libivorbis from <pkg>media-libs/tremor</pkg> instead of <pkg>media-libs/libvorbis</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">cmus/cmus</remote-id>
+    <remote-id type="sourceforge">cmus</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/cmusfm/Manifest b/media-sound/cmusfm/Manifest
new file mode 100644
index 000000000000..7273f564934f
--- /dev/null
+++ b/media-sound/cmusfm/Manifest
@@ -0,0 +1,7 @@
+DIST cmusfm-0.2.5.tar.gz 28651 SHA256 f6f0a2e60a3c00480903035f71339aa4ea8a70d2f64b3ff9a6ea2f75b61543af SHA512 0db8d865342438531bfb800d835800240e47732444795159f72ed3c91a4c3f0747ba2da1dcc8e71ef340ba5a3febdb39d8dd5868b134afcbcf7b3614a7790eae WHIRLPOOL 3fe8dc2bc233f031b83fe43186a70877acafc16057dc93f2c1155031c5f65553eb525a4bd9d83afb4d8f5224b785c43c95a75d1d8147b0c92ba19d049bb47b3e
+DIST cmusfm-0.3.1.tar.gz 34521 SHA256 359a46e60c59940d53b2c25093298d518f520be6aa2f4ee2363174ead6542e09 SHA512 2d4d551d2a82fc2d70c7f75705f8cec236a0cf7b8e5268c91cc32b4ede4ecd51c4577d673b8c36f041e514af59142f2c9c001cd422c0790f0e0b3596b4394064 WHIRLPOOL bb9039159b80eb221a38595734f7c2cf518f88f98ca19f94c636fb0630ffb5117ed99dacd6373aff04875224a98829b6d8c8043eede489f4b2ceb435f1d70e59
+EBUILD cmusfm-0.2.5.ebuild 867 SHA256 a7a9b7ce65d73dca76b209ecab6908ffcdb04f2b72e51f91867f68c8e454ca76 SHA512 a66b67a699e56e9b8d09e66e1e969ef914f98b465811a581a99460b48572dd2e1f9786c493d003c151198183616c5e1074e8f8a46435d1c223378fa3a7a17a69 WHIRLPOOL f37edbb313a28ae1daeda160b7159a2eff2fa7f63d8d195288ada614e953cb47c583505c7452acacd51a4724ad418686907daf976ecf3dea75c347268d71357a
+EBUILD cmusfm-0.3.1.ebuild 840 SHA256 cbc98401f679096ec2e41945531a09df9e49237f6f580fefab97c150d65bde72 SHA512 30d2b76f3ad5f5ae6d590f7d7432bfaef706021d98615424a2145edf15591254e7330316abbc392a66607767fdeafac8075dfaa9ce537432335a903607a3e6d8 WHIRLPOOL 454f9d1090e2f9fb1e633a88e544f7b61feb0ca2384b96b47ce659a53820fbd627dac8027af22822658efdadd74c41192d1c7d0f9d787e10a07c5153b8edfcd0
+MISC ChangeLog 2552 SHA256 224e2773af1220886075c21c1862e0d12776175531e287f1f9b3a943cc58608c SHA512 4169dbe81de60fa67d8834f5f0dc15ddd23074b84f185220b91d362cecbc216b1fa0421d7d4943ebd385e6cd629275cb03750f68313c2ea4e544ee2ccaf463de WHIRLPOOL b85cdff1dbacdaa34f6ceb10babdc51a39cf298234a972544385c3acbec91b41c160121fe0d39b63231380331e4f3674742b521581e4c0d7aefe678587625a49
+MISC ChangeLog-2015 414 SHA256 2178e2c56dc2871e2ff9399f9b7fb58ba3a3fa6c87bbaca7a2ee7d5e2ae86a4a SHA512 5e1d142488aa298c6d260cf4473e64db06cc040c4441faae3de5acb75427203b205f7270f6f337048f9ec7be690e6259577214688b4e6dbb9ca3ba8cfce87583 WHIRLPOOL d9f05c9a096fff0b05eb472bca81affd9ac5050e154a9871e7b252de03267387314663356b0b4fadc375a4d880e78d20f04ef9c4b66e402ea09082e5a10c1c2a
+MISC metadata.xml 339 SHA256 ceb8eec1a1c6572678b2057a268bf553656d6bc5a0f7df01198113bb1d205525 SHA512 78c63eceb28e387d635e34fe4800d0af9e30fd5ba4687955bb5383bd8ff4c9e3573d200ddcb36f3efd16d732cc6d7ca48c59381826ea80f6791a0c31da91d08b WHIRLPOOL c013f50036cf6fbeaaf3c1f659956991ddfacbcbf547bb730b7543835e53af519a5aa43a7c2e4e10c8d2a6b90a4cfb9ba9a2053df09c0f19af528df6ae7bd01c
diff --git a/media-sound/cmusfm/cmusfm-0.2.5.ebuild b/media-sound/cmusfm/cmusfm-0.2.5.ebuild
new file mode 100644
index 000000000000..df0641f9480c
--- /dev/null
+++ b/media-sound/cmusfm/cmusfm-0.2.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools-utils readme.gentoo
+
+DESCRIPTION="Last.fm scrobbler for cmus music player"
+HOMEPAGE="https://github.com/Arkq/cmusfm"
+SRC_URI="https://github.com/Arkq/cmusfm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+DEPEND="net-misc/curl
+	dev-libs/openssl
+	libnotify? ( x11-libs/libnotify )"
+RDEPEND="${DEPEND}
+	media-sound/cmus"
+
+src_prepare() {
+	epatch_user
+	eautoreconf
+	DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time."
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable libnotify)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+}
diff --git a/media-sound/cmusfm/cmusfm-0.3.1.ebuild b/media-sound/cmusfm/cmusfm-0.3.1.ebuild
new file mode 100644
index 000000000000..841a36a0b073
--- /dev/null
+++ b/media-sound/cmusfm/cmusfm-0.3.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools readme.gentoo-r1
+
+DESCRIPTION="Last.fm scrobbler for cmus music player"
+HOMEPAGE="https://github.com/Arkq/cmusfm"
+SRC_URI="https://github.com/Arkq/cmusfm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+CDEPEND="net-misc/curl
+	dev-libs/openssl:0=
+	libnotify? ( >=x11-libs/libnotify-0.7 )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	media-sound/cmus"
+
+src_prepare() {
+	default
+	eautoreconf
+	DOC_CONTENTS="Please refer to the README.md file before running cmusfm the first time."
+}
+
+src_configure() {
+	econf $(use_enable libnotify)
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+}
diff --git a/media-sound/cmusfm/metadata.xml b/media-sound/cmusfm/metadata.xml
new file mode 100644
index 000000000000..d288df6549bf
--- /dev/null
+++ b/media-sound/cmusfm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Arkq/cmusfm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/codecgraph/Manifest b/media-sound/codecgraph/Manifest
new file mode 100644
index 000000000000..afe88fed5943
--- /dev/null
+++ b/media-sound/codecgraph/Manifest
@@ -0,0 +1,6 @@
+AUX 20120114-makefile-prefix.diff 657 SHA256 18d5a9ae120cbfd60f387039a0b8fcf99ad0d4ed90daec1aa6ecf7fc3308fcf7 SHA512 7d5fab593aefba8175e1e6301a1b47ad78de6efd88f30401a57e3693c022cc1af1073a1fab54f5bafb280a120b458d68f7ae53323d0200ccf66c1ce0f4e48097 WHIRLPOOL 6a9573b81ec8955dc0e785a5f84dd04f3ccb48fb402663023e82cd1c53190f1f6e7a05fe525e476f30d7f8409b139e28ab2897b888e7bd84ea2c473aa726a88b
+DIST codecgraph-20120114.tar.gz 94168 SHA256 24dca78c6a8cf894385df304d29f348d48868000d5ffbd03bf12c5b4f9805106 SHA512 85053ea83707c817e5d190a981458b271814602fda36757dd4dd14ded3a992abc613f4023dbb9eac7d10589f32fa1489fc68c98e80b235588fcde5390bdc099c WHIRLPOOL 5c527b279987c14d62fee0243d4aab8d7437ab42579de7a782659d210be011271b99e4fe8e7e48aa9ff535ef2a86bdecc2ba2d9fb651edb9ce532d4d84f2909c
+EBUILD codecgraph-20120114-r2.ebuild 680 SHA256 a449618845929964d46aeab04b3fd9b99628e83244e0e17f8c404e9785fee379 SHA512 d0f63d7e5c5ce98c601b102dccc838406b353fd46f7193e655c29ca92849304f1cb4fc5ec808f3eb094f24bdc990c870b02bfb219a410b8b381bb2d31f8d9354 WHIRLPOOL 0cd275f8a942ac9158585ea204e4247332dbf0a7034aa48ce83f02dba47e679c4ffbd7b4aa69a472984ac0a04099fb873b22e8f1b7832bc8c156258d1902b2c8
+MISC ChangeLog 2485 SHA256 29de28a053ef9385355c78b51fcb3c312dd033380a92868464cc29fbd50f7afa SHA512 d1997bab48fd42ba4bb02787d9ddde58d4cef3e0c7e13bea1fa95d3f7d151b8c5815270540d981079f201eb5aa4311aa0df598f4168c3a0b0fb64f779895671f WHIRLPOOL c82825ad0c219707552c22582dbcbe88419f9797ec3797e647f1e544bb20b863664a5b8e7388e1f64d2325fb7af49b1c602ec1de3ad227e282603987f1340f31
+MISC ChangeLog-2015 2057 SHA256 a9a39519bc1e63d1731affe76fd6d2d93cd166bf116d657d68588c6059add48b SHA512 eed668b551e0eb4f621b0030642879e0c1b92b0a3935dbb5a21523f37a17011b6c0101b26e043d043601e78c779f2252e9e2e3e96457f07ec73f55dc71f80925 WHIRLPOOL c727809eb7ac35f7c3ac5d2021ff364bb47b683a0215f4841cf8feb641167566e44bf04738ce5f98c0be42c0220f7405309a44ef9211c722cdf049c5ea37d0c3
+MISC metadata.xml 355 SHA256 ceed92d1de72254dcf6fb32245c46038597455a2b7028671b8bbf4a39b8fd95a SHA512 67f7562f4f2882838136fa69cfc0927da31bc1f75b0e3226ffc8ae1ae0bb6997160b7de36294bf757b566a79e8937e1aafd74fd59e5978a4ef847fb1e4e876be WHIRLPOOL 6b20cffd636ab8cd6750469b27ae4996f46092ae2f0cd8d247d0ac32f959278e1dc3d45fa3e788cb91d8f445234f76bee31a531f2e7254e8fe24c8f7baba3f9e
diff --git a/media-sound/codecgraph/codecgraph-20120114-r2.ebuild b/media-sound/codecgraph/codecgraph-20120114-r2.ebuild
new file mode 100644
index 000000000000..dfe7a09d932a
--- /dev/null
+++ b/media-sound/codecgraph/codecgraph-20120114-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Generates a graph based on the ALSA description of an HD Audio codec"
+HOMEPAGE="http://helllabs.org/codecgraph/"
+SRC_URI="http://helllabs.org/codecgraph/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	media-gfx/graphviz"
+DEPEND="${RDEPEND}
+	media-gfx/imagemagick"
+
+PATCHES=( "${FILESDIR}/${PV}-makefile-prefix.diff" )
+
+src_configure() {
+	python_fix_shebang *.py
+}
+
+src_install() {
+	default
+	dodoc codecs.txt IDEAS
+}
diff --git a/media-sound/codecgraph/files/20120114-makefile-prefix.diff b/media-sound/codecgraph/files/20120114-makefile-prefix.diff
new file mode 100644
index 000000000000..2636fad59e57
--- /dev/null
+++ b/media-sound/codecgraph/files/20120114-makefile-prefix.diff
@@ -0,0 +1,18 @@
+diff -uNr codecgraph-20120114.ORIG/Makefile codecgraph-20120114/Makefile
+--- codecgraph-20120114.ORIG/Makefile	2012-04-20 11:46:16.585852026 +0100
++++ codecgraph-20120114/Makefile	2012-04-20 11:46:50.730851052 +0100
+@@ -1,4 +1,4 @@
+-PREFIX = /usr/local
++PREFIX = /usr
+ DOTTY = dot
+ 
+ samples = \
+@@ -87,7 +87,7 @@
+ install:
+ 	install -m755 -D codecgraph $(DESTDIR)$(PREFIX)/bin/codecgraph
+ 	install -m755 -D codecgraph.py $(DESTDIR)$(PREFIX)/bin/codecgraph.py
+-	install -m644 -D codecgraph.1 $(DESTDIR)$(PREFIX)/man/man1/codecgraph.1
++	install -m644 -D codecgraph.1 $(DESTDIR)$(PREFIX)/share/man/man1/codecgraph.1
+ 
+ thumbs: png
+ 	for p in $(pngfiles);do \
diff --git a/media-sound/codecgraph/metadata.xml b/media-sound/codecgraph/metadata.xml
new file mode 100644
index 000000000000..5f92e8882156
--- /dev/null
+++ b/media-sound/codecgraph/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>chainsaw@gentoo.org</email>
+  <name>Tony Vroon</name>
+</maintainer>
+<maintainer type="project">
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/combine_wave/Manifest b/media-sound/combine_wave/Manifest
new file mode 100644
index 000000000000..fa4d82fe93b0
--- /dev/null
+++ b/media-sound/combine_wave/Manifest
@@ -0,0 +1,6 @@
+AUX combine_wave-0.3.1-overflow.patch 840 SHA256 25c283da8c22c890a9220d1a959abc93b1447ed43b74f3a7f69c76d7f14e91de SHA512 2352267f8bcad2485e26ea6f49188cea39e720efde324aa09943f1f9bde449c37b1b626328a8a3f19e5fefaeac65ce2f19af6666efa0473a85e6b6e60ad313b1 WHIRLPOOL 222842e2261e87488d874f373192e48ed0976a41d5dd29258fc89524fe1812fdedf5e0b0cd35b34632c1b69d286e1a8d5aa12631effb01847ec735d93146b347
+DIST combine_wave-0.3.1.tgz 14875 SHA256 871dd240bce9f19a8f190496dc8aff7ef4f09c3a55bff2ec3f1c1fc2a2f68078 SHA512 81c97074b86945d6dc7299a79e38483ce50693f25b450e9bbdfc60ea1812e9a767e726805f0cd638e27321146cd72a9ed4df77cae5522b1777d0980c3eaaa3a8 WHIRLPOOL c53b3af14aeda99e41df3a825954dd7c291df0dcacc37330ce25ff67148fdb9270c27e3cf97f0f201767d324b41a9f072771929d87a265685cad48d5ce983e55
+EBUILD combine_wave-0.3.1-r1.ebuild 718 SHA256 05f97f31e6276d3f650bb72e47927e5b8d0c96d3d792fe3bce834e06f2b8fbb7 SHA512 a0285a40be48e3b94936b53f800f596ee163b98e5e4d671d088e1e37253b829577d204e55da68b51c3e23ab187ad7077015d717b04457a722eda5c4481133a07 WHIRLPOOL ab411f4aa92c0be3abb06b4f35eed29ad102199c9d16bb729cd2b402ecf8acba6eb04a79526fc5ab98690ee8ecd36fe70585980570253270aef1470e4f6622ae
+MISC ChangeLog 2495 SHA256 e0637f0282e48e80a5c82edc5562030a15c6842365951b0ed1d548c8f4405c1c SHA512 8e3044b810feacfafc6d69a92d086be08ab494db7eab66cad0701e36b515135e911c58dbb964a01d9ba1a78bc47eebc9bfa5af3b3850117579ebcda7957618f1 WHIRLPOOL 438734b5ce91dcb0b3ae62d081ec9ed80a693fd3b3579ee9e75e857ecd654acdc3b06006e4df887b15b5edd0aa8e1219294c128460eae2399f319ba061c81468
+MISC ChangeLog-2015 1447 SHA256 0f2e46abce94d47e8475e02380d8c2472ee35706c885d39bbaf20b82ce505bba SHA512 fbefa056b96cddc69690a966155d5e348723dbe799bfcfa1178836e2baefc3bba4b9bf3eb26ea728733803a25797fb51b1850488ed32bbadf74139bdd8a32499 WHIRLPOOL 4c20db9c8d694d32be5d4366d95d54047ddb5c174d70beb7e569349d4af0f6361ec36eef6c922c1bfe878d753ba88c8dd1d76d0402c4a9791505e038622e8172
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild b/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..cee491df0ef9
--- /dev/null
+++ b/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+IUSE=""
+
+DESCRIPTION="sync up 2 audio ch. and/or combine 2 mono audio ch. into one stereo wave ch"
+HOMEPAGE="http://panteltje.com/panteltje/dvd/"
+SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	# fix makefile
+	sed -i -e "s:gcc:\$(CC):g" -e "s:= -O2:+=:g" \
+		-e "s:\( -o \): \$(LDFLAGS)\1:g" Makefile
+	epatch "${FILESDIR}"/${P}-overflow.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dobin combine_wave || die
+	dodoc CHANGES README combine_wave.man
+}
diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch
new file mode 100644
index 000000000000..ee7fe38da458
--- /dev/null
+++ b/media-sound/combine_wave/files/combine_wave-0.3.1-overflow.patch
@@ -0,0 +1,26 @@
+diff --git a/combine_wave.c b/combine_wave.c
+index 5bfa4aa..391db25 100644
+--- a/combine_wave.c
++++ b/combine_wave.c
+@@ -601,9 +601,9 @@ for(i = 0; i < header_size; i++)
+ 	*ptr = 0;
+ 	ptr++;
+ 	}
+-strcpy(out_header -> main_chunk, "RIFF");
+-strcpy(out_header -> chunk_type, "WAVE"); 
+-strcpy(out_header -> sub_chunk, "fmt ");
++memcpy(out_header -> main_chunk, "RIFF", 4);
++memcpy(out_header -> chunk_type, "WAVE", 4);
++memcpy(out_header -> sub_chunk, "fmt ", 4);
+ out_header -> length_chunk = 16; //always 16
+ out_header -> format = 1; //PCM
+ 
+@@ -622,7 +622,7 @@ else
+ 
+ out_header -> sample_fq = left_header -> sample_fq;
+ out_header -> bit_p_spl = 16; // left_header -> bit_p_spl;
+-strcpy(out_header -> data_chunk, "data");
++memcpy(out_header -> data_chunk, "data", 4);
+ 
+ if(right_header -> data_length > left_header -> data_length) 
+ 	{
diff --git a/media-sound/combine_wave/metadata.xml b/media-sound/combine_wave/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/combine_wave/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/coquillo/Manifest b/media-sound/coquillo/Manifest
new file mode 100644
index 000000000000..c1b8e8352bec
--- /dev/null
+++ b/media-sound/coquillo/Manifest
@@ -0,0 +1,5 @@
+DIST coquillo-1.12-src.tar.gz 570833 SHA256 5c1a46786e25dc3bb10ac063314aed173350cf6bc0436f181ad666d01899cd7d SHA512 4d0b7dad811019aa488baa27f0d655dc2ee126fa81c5944aa7de9093306c170863bd323de6f0233efef38e96b21b10f4a04239c0e277d42993667213e2bd2817 WHIRLPOOL 46046e32813cc46289694a8c010d026217143d59a19f0ccabdc356913fdf57867518fcf3ad61baebea7c1cc98568d9b6de619dbf3148ab10595954e9829f3cb5
+EBUILD coquillo-1.12.ebuild 496 SHA256 f72feb808e9fdd3986559fdf60cf54f5ee5bc6d499cb2f75970aed32eff74a89 SHA512 f0183444138f3d228c1798fc60077a6abd23dba4e0d45d2753ff74cb18f26d1c05b8f1025a01beb23f28db6458a8296b86970927dc47ec3430657fc259a7f7e9 WHIRLPOOL 43717c75db47c6c6fe0f70dce26ddc01d082251c04694c95734931ab45733e1d04eb174cfbe30628d9d9e80b65ffbe0cc2333af9633c38d2527fbf1db6ba6bef
+MISC ChangeLog 2562 SHA256 e981791d1064267bf9125aea86f066d78869d3df4343eafce24792e743541215 SHA512 76f03737b833473e96eff9b836cdb3e3902288e919a6830c525426c22cd8c3fef77ac46f0d26178082e82d618980150ab10451712c7960b37ac883e6ccf78cd7 WHIRLPOOL 4d410090719d0b542eefda16567df61f165e69d26f1d253c88404d3b92ca31dad74d7c4b38d3f19807b50e64daeecfe2652ec0c3d6b9812ee59c1b9ac5dca661
+MISC ChangeLog-2015 582 SHA256 5b61d18131cdbee9b0fd28448ffc881572d28948e6addeda8aa573b8455b20ac SHA512 154dffbc6014cffabd0732b8a12ca24361adcaabc7f18fd9bfe55dc0c294ce15ee18cb75ca9633a28e02fb049c99a99f2a9144fb299ea05e340edf326d72dc31 WHIRLPOOL 873d7134ea12eb9dc5814f525e02a385ed098050ad00dd24464cee49ffbc31a9574ed3c8abadbf89e61ae545b0512940ded9cd1bde50c91898da8b488cffdc1f
+MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/media-sound/coquillo/coquillo-1.12.ebuild b/media-sound/coquillo/coquillo-1.12.ebuild
new file mode 100644
index 000000000000..646bf1461800
--- /dev/null
+++ b/media-sound/coquillo/coquillo-1.12.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit qt4-r2
+
+DESCRIPTION="GUI audio tagger based on Qt4 and taglib"
+HOMEPAGE="http://qt-apps.org/content/show.php/Coquillo?content=141896"
+SRC_URI="http://cs.joensuu.fi/~sjuvonen/${PN}/${PV}/${P}-src.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/taglib-1.7
+	>=dev-qt/qtgui-4.6:4
+	>=dev-qt/qtcore-4.6:4"
+RDEPEND="${DEPEND}"
diff --git a/media-sound/coquillo/metadata.xml b/media-sound/coquillo/metadata.xml
new file mode 100644
index 000000000000..39626a990be5
--- /dev/null
+++ b/media-sound/coquillo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/cplay/Manifest b/media-sound/cplay/Manifest
new file mode 100644
index 000000000000..398a7de8e488
--- /dev/null
+++ b/media-sound/cplay/Manifest
@@ -0,0 +1,5 @@
+DIST cplay-1.50.tar.gz 43904 SHA256 a3ad98a1648453dd591529f9783d4b7669241d2dfa681793a95bbcb0c2ea6780 SHA512 7d105fd01b22b3c5e602ccb700db3501a3c1781cbf53ac265b68f6f977edaaa5566268ca72742b70d4d5eabf278ad5a6fd1a22bc8711d22607cb505d0a197c94 WHIRLPOOL d8ab093ef8065acd88cd9fdb03aca502850cd3cddf111d3f36957c5bc704310aefca768261ab3a4f8799a1240620c60c31bcb614c82f84ca2ddc0b4333b963bb
+EBUILD cplay-1.50.ebuild 945 SHA256 6cfc4fefb88a5ded5b6068a72fc923e8512ffb95ada6cf5c79f0070cad399a1f SHA512 8e381724061b03cf37b4d312c205971b13eb890f5b19a16e951919ec327240f244583895184b11b969a081e75507e766e046f996bbff22141ff8b86f835ff79d WHIRLPOOL 656dd555d82b74956c2c0adea44ce23bd82f2fb5398373eb0232e69bb6d33756006c32d9123dcb7a2dc8e9e03a935515edd053bb9a1eb4f573428aa6f352e7e3
+MISC ChangeLog 2735 SHA256 d985059207c506081de0f5246045b7d94731f531b0942d1d138c459febc804c8 SHA512 80c55c4b51d31cf0531cd4c179a9d2ac6cb50b59944d14fcb1ec27d04490b6d8190e2c466bffac99464dd693b642f7de136fe22d306a4091e47601364c3f0806 WHIRLPOOL 33f5e17267679130fefbcebe0b3ed2e56c56f0bdc74f44b709507c47e2db1291603fb76a87c26fdb020f4aa9062a7fadb4c885f36d0f81c26c650c438818d020
+MISC ChangeLog-2015 3350 SHA256 df6f195aa5ace75719f73bc5cabc773c9f8b909f6f7b4eedaae8d4ed60c84d29 SHA512 3b680d40458b5c4b79215264e937d4c3b9c4e528010279e24b782f8f44eb405263d88937c755c0db7956cc7a0d5c1be078e4716e283933095fac252a62accd0b WHIRLPOOL 5b4e92eebf1f41098b985d24f1ef920acda06c4b0c2c80eac1569af739766923bd94f025a411b4f5f8cacb48cfed8423a4a04353b69efc5541a6532b5b8564a3
+MISC metadata.xml 329 SHA256 0dcaba8a2970d0cb28002728f2481858422201727c20b2ec3f3f8fd0012a3303 SHA512 ff15b3aec9d16ae31b0dcb7a93d3a4d3bd0c23f56370c609dd06e2fe4882babc706751ff1dea83a4bd470328c7d4fb1c5cf72aef4f7ebce453476228d8b42abc WHIRLPOOL aab229fb594edb9467417a62e9ec1aac34e6c34d99165f24d40901c95d014a2df9cff841b8a667c5239238bb1832d76ca79d8c464e4581114df38725fd279528
diff --git a/media-sound/cplay/cplay-1.50.ebuild b/media-sound/cplay/cplay-1.50.ebuild
new file mode 100644
index 000000000000..0d68f7d3c841
--- /dev/null
+++ b/media-sound/cplay/cplay-1.50.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A Curses front-end for various audio players"
+HOMEPAGE="https://github.com/hukka/cplay/"
+SRC_URI="https://github.com/hukka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="mp3 vorbis"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	vorbis? ( media-sound/vorbis-tools )
+	mp3? ( || ( media-sound/mpg123
+		media-sound/mpg321
+		media-sound/madplay
+		media-sound/splay ) )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	default
+	sed -i -e 's:make:$(MAKE):' Makefile || die
+	sed -i -e "s:/usr/local:${EPREFIX}/usr:" cplay || die
+}
+
+src_install() {
+	emake PREFIX="${ED%/}/usr" recursive-install
+	einstalldocs
+
+	python_fix_shebang cplay
+	dobin cplay
+	doman cplay.1
+}
diff --git a/media-sound/cplay/metadata.xml b/media-sound/cplay/metadata.xml
new file mode 100644
index 000000000000..6fd5a891d174
--- /dev/null
+++ b/media-sound/cplay/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hukka/cplay</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
new file mode 100644
index 000000000000..4225babdb9b7
--- /dev/null
+++ b/media-sound/csound/Manifest
@@ -0,0 +1,12 @@
+AUX csound-6.05-python.patch 661 SHA256 54d5a4316009c0f77624f52eebdc0491ffa33d23c29ec5f6b3b24452389fcc28 SHA512 db931a76d0b386232d932c87ef30300497145dab3196cc059278947eeefc41723043392d652583f00512b306abbf33db3d7c9bc5203ead81689ed1ea8d0a541c WHIRLPOOL 809afda320f5b6fbce53671c2c7c01f2ee90f636243f317ef35a4d958995c61f0d4907cd13a21d1f7e5d20ffdea68369cb3250b7bfe7846ca1edc92e039da259
+AUX csound-6.09.1-python.patch 742 SHA256 2cfd522984210f903071227272c845c49b7bd3bd0a7193c2f5369093e426c4f8 SHA512 52d2cb16831eb4090f22c7153f76213bbf4dfbf66ec791655714aa84db97dab6271022e64707247d24946ec5e019d20fe479a7a5d1711eac2c030625c4c86cdc WHIRLPOOL ce7ad2e9d370db1bb99d67ce5246926b24c7f8206f6dc3373d532d7b99d2f16619d6068052828f4ef572d89916511f7d1f8cbcff682e0ea11fc432185505b77e
+DIST Csound6.09.1_manual_html.zip 15537547 SHA256 b2e8ef90e43762c64643c6adddb1e276ac6b496b4fe64fe83e2b8393dbd69100 SHA512 8ddd821737b003d277eadf5b966907314ee50380ab5cc7b9716588d1bcfac8950f591e076752650508c924d1068bac0334523a3d3b869a4f6d4118b822003afd WHIRLPOOL e5d0091dca95c311af5ecf42482a2693851fda4b38f66d3ccc3d06568a6c548a0410b1d5c444b655cf9a3bc73fbbf7cede896311bf109f30bb907b9ed1b5b744
+DIST Csound6.09.1_manual_pdf.zip 8647957 SHA256 6c4287758791d4cd04c75adfea310d7d34581294d520d4da881a5653f47c9b24 SHA512 1dd2c0058751fe1f176a51741380884db115bdb52416512882c43212fd5ded1c489cc9c423059c1154a1e01528e7bf6e70621eac6ee83a1a4b5e2388ab85ae1b WHIRLPOOL b6460e66a2d043cef9adbd5bef61913f46bafdb3cb55ea107af5903c160e066544bed0011e4d0780d04945c7f585ea8952e48046e14ec74d8fb29cc3e2493050
+DIST csound-6.08.0.tar.gz 33948686 SHA256 480bde5c07ac7fb8303b4c84c01710999815c2334501d007170adc9cdbf826a1 SHA512 22237f7c8ac875fd44789a729f5513dd7f751bbe0446b8a6e43c6a824b1c40978ef051122632af0c3975761fa7f873c01e88b9de7be313d9d23be09ed52c29ca WHIRLPOOL 987fb74135a55a945e67a2ef083bb69e315fa3807018db5619bb8a57d33760b3aa85a8f6bfcfb2ac46b9a3f8676398ea12e2ac068b97bf917ef3e1f698d33faf
+DIST csound-6.09.1.tar.gz 41969942 SHA256 d49735b4ed50f2818b577abcface45fe7f9b7fb49ccd898db030893cbcdfc738 SHA512 c82d3e4fa5fba2c47f916ee102ba841477a819e1905e578089474ce5a7c4a4e70c4ec2768337621fcd2e3843af9b1129ce50f4a4fd3c33bfa27da52815b99454 WHIRLPOOL 31b3bba6ae60760cc70ca8e8234c45dcee1a070ab7a63891acac62218cfd39de3e11d24cb13789b9fb2152cebfa6a6a450a9c5c078531e8b7c5066206ae09079
+EBUILD csound-6.08.0.ebuild 5588 SHA256 f9191b1b2cbb1c251168f29377384fde41a386d404a87cdb231c2590e055b865 SHA512 ef0a2682a0745b26dbeee7f0cfb4d1762f8e19d0dd0a1656a8dcdef155fb7cc3fc92d9a0d9844585ddc7be87d1f998da3a60a09df966f53a26615ff7f3981661 WHIRLPOOL 8aed44a866f4143da866a469b438075d59d6cc9f00b3596562b486052d41ed46591fb4061892829b54ce9c337b04f3d3afdefd9555f6635598fab15e75222250
+EBUILD csound-6.09.1.ebuild 5996 SHA256 15ff7eb3623d063e6a5efa9bdbbd4b38e0f23d38d79a201e87d5a100e60e37c0 SHA512 d0edde0996eeff0944f2ee0bb6624cee5e82a038eee1abaf5a9b6eb87001ce842d54e52ba26d3b49dc6510ac2d1840578fde53e26a8ffde630a1e7eba8edc352 WHIRLPOOL 4cb9448ba5aa0b914a486d91fe4aed24f6618ec91636d7d6f2020937d3d5c5ec5eca8df60fdd951616b5103cffb00f3e9bbbb4c0c2eddd4ab1ca78ccd83414df
+EBUILD csound-9999.ebuild 5951 SHA256 250ab54cbc086cbb4eab08bf233b8824aac8d6a4f801aeefad2c8d9f4672bdec SHA512 daa32b0c28b357855d3600040eb8a3d1ed6a12fbb32c64fdeef819c2fc4ef4fcd19aae021c67927ba81b8675eea8bd162ca6b019355547307258f94db84b0ccd WHIRLPOOL 13724c2da523a9ae98c7e0cc67e5083bdbc3fc2eb29c7dae6c052ea37220f2a3602bd3e8bc2ae07839c37eb067ed33c047c3080daf88070101d578075a5bd979
+MISC ChangeLog 4732 SHA256 7658383fa7e7ca7dab664cedbe4620bd46ba8f8abb335e882f93efa13a5e812e SHA512 18f018551d62a92e04873df1ca2c1808b93ee91edfe2017c8548f817ecc63c64a8c81ba21e347a7ed300b8e611fad63a6e8a3c52094daee685333211fc148f1d WHIRLPOOL e01ed7eb914b52ed0f3810f4b0dc9be1f3a9fef0123a432c0e499eabecea0674d008b3a526fa5edb7904733daa03f61d4e16f0a46bbbc2253fbda4e9866b2eeb
+MISC ChangeLog-2015 6199 SHA256 5aec5518fb201f61ab268f290313214115cae347341da5474f3bc4f89cd8bc73 SHA512 54a61c210d89cbee92e03607c1ee655426585552127b81390c7f08be8e36e1e5136fd3efd1b777d6438c3103489962725e3fbff9ac09b314dc3342acfcd299b4 WHIRLPOOL 4002b35567c3f7a172dddca7c71ee808b28e0e20d834b09fe99204d4c5798d5f1f1829e2814f42ab33332980d2df5249409bd8ef895c188bdc63a7bdbe86f518
+MISC metadata.xml 1612 SHA256 7bec9602ffd3ce4700ac5e617aa3e3f2705f04b23b9e619375540f7401b83de1 SHA512 2a471051eddcd4e46a28e5101aac7d2ae3ffb3e19cfc0fa137e1445e502a3aba5a9c0e0fb4e40b8539715bee30be33bc80d66e2c8ac7cf40ee9834f15e52cbbf WHIRLPOOL 1a7ce9cfa4515e2e3e3a67cf181594a7a26630482687a356f9fd6d5c55753346525a6745464429cbb841f9520d31aaffcd0fd88ad770f1cfc349b1fdcdfbc2cb
diff --git a/media-sound/csound/csound-6.08.0.ebuild b/media-sound/csound/csound-6.08.0.ebuild
new file mode 100644
index 000000000000..9cf35beeed2b
--- /dev/null
+++ b/media-sound/csound/csound-6.08.0.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils java-pkg-opt-2 toolchain-funcs versionator python-single-r1 cmake-utils
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/csound/csound.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	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"
+SLOT="0"
+IUSE="+alsa beats chua csoundac curl +cxx debug 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"
+
+LANGS=" de en_US es_CO fr it ro ru"
+IUSE+="${LANGS// / linguas_}"
+
+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}
+	)
+"
+
+# requires specific alsa settings
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/csound-6.05-python.patch )
+
+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 ${LANGS} ; do
+		if ! use 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
+}
+
+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/csound/csound-6.09.1.ebuild b/media-sound/csound/csound-6.09.1.ebuild
new file mode 100644
index 000000000000..75d255548604
--- /dev/null
+++ b/media-sound/csound/csound-6.09.1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2017 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"
+IUSE+="${IUSE_LANGS// / linguas_}"
+
+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"
+
+PATCHES=( "${FILESDIR}"/${P}-python.patch )
+
+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 ! use 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/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
new file mode 100644
index 000000000000..afdb7ee63159
--- /dev/null
+++ b/media-sound/csound/csound-9999.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2017 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"
+IUSE+="${IUSE_LANGS// / linguas_}"
+
+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 ! use 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/csound/files/csound-6.05-python.patch b/media-sound/csound/files/csound-6.05-python.patch
new file mode 100644
index 000000000000..3e9ee857fe98
--- /dev/null
+++ b/media-sound/csound/files/csound-6.05-python.patch
@@ -0,0 +1,19 @@
+--- csound-6.05.0.orig/CMakeLists.txt	2015-04-26 03:06:22.941646148 +0800
++++ csound-6.05.0/CMakeLists.txt	2015-07-08 22:31:16.637995822 +0800
+@@ -41,15 +41,9 @@
+     set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
+ endif()
+
+-
+-execute_process (
+-     COMMAND python -c
+-     "import site, sys; sys.stdout.write(site.getusersitepackages())"
+-     OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
+-   )
+-
+ set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
+ set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
++set(PYTHON_MODULE_INSTALL_DIR ${REPLACE_ME})
+ set(LOCALE_INSTALL_DIR "share/locale")
+ set(HEADER_INSTALL_DIR "include/csound")
+
diff --git a/media-sound/csound/files/csound-6.09.1-python.patch b/media-sound/csound/files/csound-6.09.1-python.patch
new file mode 100644
index 000000000000..47461e48aaf4
--- /dev/null
+++ b/media-sound/csound/files/csound-6.09.1-python.patch
@@ -0,0 +1,23 @@
+Respect externally set PYTHON_MODULE_INSTALL_DIR.
+
+--- csound-6.09.1/CMakeLists.txt
++++ csound-6.09.1/CMakeLists.txt
+@@ -218,11 +218,13 @@
+     set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}")
+ endif()
+ 
+-execute_process (
+-     COMMAND python -c
+-     "import site, sys; sys.stdout.write(site.getusersitepackages())"
+-     OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
+-   )
++if(NOT DEFINED PYTHON_MODULE_INSTALL_DIR)
++    execute_process (
++        COMMAND python -c
++        "import site, sys; sys.stdout.write(site.getusersitepackages())"
++        OUTPUT_VARIABLE PYTHON_MODULE_INSTALL_DIR
++    )
++endif()
+ 
+ set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
+ set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR})
diff --git a/media-sound/csound/metadata.xml b/media-sound/csound/metadata.xml
new file mode 100644
index 000000000000..7bee7a51e80e
--- /dev/null
+++ b/media-sound/csound/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="beats">Build the beats score frontend</flag>
+		<flag name="chua">Build the chua opcodes</flag>
+		<flag name="csoundac">Build the CsoundAC extension module</flag>
+		<flag name="double-precision">Use double-precision floating point for audio samples</flag>
+		<flag name="dssi">Build the DSSI opcodes</flag>
+		<flag name="fluidsynth">Build the fluidsynth opcodes</flag>
+		<flag name="image">Build the image opcodes</flag>
+		<flag name="keyboard">Build Virtual MIDI keyboard</flag>
+		<flag name="linear">Build the linear algebra Opcodes</flag>
+		<flag name="luajit">Use the lua just-in-time compiler <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
+		<flag name="portmidi">Build the PortMIDI I/O module</flag>
+		<flag name="samples">Install the HRTF datafiles for use with hrtfmove, hrtfmove2, hrtfstat, hrtfearly, and hrtfreverb</flag>
+		<flag name="score">Build the alternative score parser</flag>
+		<flag name="stk">Build the stk opcodes</flag>
+		<flag name="tcl">Build the tcl interface and clients</flag>
+		<flag name="utils">Build stand-alone executables for utilities that can also be used via `csound -U`</flag>
+		<flag name="websocket">Build the websocket opcode</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">csound</remote-id>
+		<remote-id type="github">csound/csound</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/cvoicecontrol/Manifest b/media-sound/cvoicecontrol/Manifest
new file mode 100644
index 000000000000..86def34f2f87
--- /dev/null
+++ b/media-sound/cvoicecontrol/Manifest
@@ -0,0 +1,8 @@
+AUX cvoicecontrol-0.9_alpha-gentoo-2.patch 1512 SHA256 b0785aedc49d9627f5706b9253a9a749975f2632a9aa9cf51b84e1997579e50f SHA512 dd116c7e30ad94680fa355a765e8a39e8bb85ffb59d886e2c7ed6e77e6fd5c440c4db2490d5505042c5b57d06df8a14951a06f38348ff390832b39bfa1f47f53 WHIRLPOOL 0b046a51f25b6786b0e9a3a4b1fc3e83c553140bd90bb05ff9bae03c8bf10b6a1c7bf5d838acb64c7b2e5f80d67f2918de9905385a9b849dd06d861908dddc8e
+AUX cvoicecontrol-0.9_alpha-gentoo.diff 442 SHA256 b7b75041979115416f36f61a045b3d6a00cb04c6ec7ebd7a7b1a079405183223 SHA512 6c32c51d621662be71dfc1801296e5766001ac645251f34e69de711f80ce8781bbacf329af51556c72fe70a6fbb823ea84cb55229a0ba667488d0c0ae79287a0 WHIRLPOOL 8de13c0c6eb7edd6111c23451e8b5d7f7f188ee396ac15e63f9ce29e5cb16436ed340127075c129cc0c7506e07424fedddb96f7b989f2e7b689af081a9098d61
+DIST cvoicecontrol-0.9alpha.tar.bz2 78081 SHA256 dbcb03ae8370c400b7d398c7715e100b5b719f109e1955a40042cd268df981ad SHA512 c01d932edf563f7c50f5edf36ccc03401372915776489026fa69a12dc545f8698f542dcba054d0d1694a86ce78171bc9507feb47a924996cf3a22e865e0ed187 WHIRLPOOL a1deb50b3de24a7087f8515d03ca52061cdfb632f0d2e7205bc8330069f3dcad07accd028a127c205db29a8dd510150e2c54560072e18ff0e1acb6b1221708a9
+EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 815 SHA256 dc87c390a2da7764c178f0c3f2be49e86a938cfc6309d4275b65a4f754902983 SHA512 01d416b6198ba3adccb85fb5c5d4d815b973e0bd461a54aa2d195956ffd2c2c34b8de5ae9af20078f4308925a934b9a905133fdb5bbde32d4a387ac748babf5a WHIRLPOOL 62cd4b64044ae5a664d589590057706b89c2bb5c08af9ab0c68dac60dd9d809fc66613ceeb1a57e35b98882e9983c8d94688377fc49df031770765f9ecea1c8a
+EBUILD cvoicecontrol-0.9_alpha.ebuild 943 SHA256 bbf323a4c3371dec52c787ff3cc9fae30330588cdd810aa031d3e04868904b85 SHA512 28e45ebeae136191b00d2c1cccde46f9ecc5db1107c9da2346240e284d382c01ca8d354d92696e1fe876c7062c41fa94f8f6dc78ec0d5e8f579ee88766637a73 WHIRLPOOL 9d9678794fd88868226fb3ee20d4b3014578998289736abad34ae60570fac47e3b5fbf9c333d42c70351abe1ab8bf94dabf1438b057982cfa82297c4b7391e49
+MISC ChangeLog 2629 SHA256 a6ea9c1f5ad1df8387e1c29992d8b18a6ec74a9f8a78a5c1f0a0390b3978e420 SHA512 185f081d0e60c14f1ad204a612bc458c512d509f8bda59bd95a24e913a5d578fd9766b5dd3af90e398efa4b90022afde58fdf8bd08ee6ce3ea6bc278fd8f4826 WHIRLPOOL ed96cda974f782b3d02d0c79b4f2d9d42137417ce52a725c7acbd4c54cc5a65ed28e3d58b55b9433ebd7dd45ac3a51d5c8b1e436d5266d755df0ad38180afb47
+MISC ChangeLog-2015 2010 SHA256 e1a320a9f9d60c0dbdf7f7c755c151318a0349180a2c1fe67a6c63e682a3584c SHA512 180dff0e69d68dd7f50389d85700508b63f0ebbbf56b381909e1ac316b113dfe53b73060dc47c971f32b378b3a586d99cd080ee01bc5ce6129d9d93d7721e90e WHIRLPOOL 721072237d1f0ab8f67d5b14f450e1ebfeaa3618510d2b49db18c6417a5c92fe23ce9644228717988756206c0875684eab8e2b5d7e4c1f2a396ab88ca0d788d1
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
new file mode 100644
index 000000000000..eb49302b044e
--- /dev/null
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils
+
+MY_P=${P/_/}
+
+DESCRIPTION="Console based speech recognition system"
+HOMEPAGE="http://www.kiecza.net/daniel/linux"
+SRC_URI="http://www.kiecza.net/daniel/linux/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo-2.patch
+	sed -i -e "s/install-data-am: install-data-local/install-data-am:/" Makefile.in
+	# Handle documentation with dohtml instead.
+	sed -i -e "s:SUBDIRS = docs:#SUBDIRS = docs:" cvoicecontrol/Makefile.in
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS BUGS ChangeLog FAQ README
+	dohtml cvoicecontrol/docs/en/*.html
+}
diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha.ebuild
new file mode 100644
index 000000000000..1218a2b19f0e
--- /dev/null
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+IUSE=""
+
+inherit eutils
+
+MY_P=${P/_/}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Console based speech recognition system"
+HOMEPAGE="http://www.kiecza.net/daniel/linux/"
+SRC_URI="http://www.kiecza.net/daniel/linux/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+KEYWORDS="amd64 ppc sparc x86"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+
+	#remove "docs" from SUBDIRS in Makefile.in
+	#Makefile will try to install few html files directly under the /usr
+	#much easier to do with dohtml
+	cd "${S}"/cvoicecontrol/
+	sed -i -e "s:SUBDIRS = docs:#SUBDIRS = docs:" Makefile.in
+
+	cd "${S}"
+	sed -i -e "s/install-data-am: install-data-local/install-data-am:/" Makefile.in
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+
+	#install documentation
+	dodoc AUTHORS BUGS ChangeLog FAQ README
+	dohtml cvoicecontrol/docs/en/*.html
+}
diff --git a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch
new file mode 100644
index 000000000000..7e1ae985b18d
--- /dev/null
+++ b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch
@@ -0,0 +1,35 @@
+diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/cvoicecontrol.c cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c
+--- cvoicecontrol-0.9alpha.orig/cvoicecontrol/cvoicecontrol.c	2002-09-05 19:09:06.000000000 +0300
++++ cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c	2007-07-29 23:35:33.000000000 +0300
+@@ -38,6 +38,8 @@
+ #include<sys/select.h>
+ #endif
+ 
++#include <values.h>
++
+ #include "cvoicecontrol.h"
+ 
+ #include "model.h"
+diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/microphone_config.c cvoicecontrol-0.9alpha/cvoicecontrol/microphone_config.c
+--- cvoicecontrol-0.9alpha.orig/cvoicecontrol/microphone_config.c	2000-02-19 14:08:47.000000000 +0200
++++ cvoicecontrol-0.9alpha/cvoicecontrol/microphone_config.c	2007-07-29 23:36:08.000000000 +0300
+@@ -1099,8 +1099,6 @@
+       free(command);
+     }
+     fclose(f);
+-
+-    free(home);
+   }
+   else /***** couldn't retrieve home directory -> store results in /tmp/ */
+   {
+diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/semaphore.c cvoicecontrol-0.9alpha/cvoicecontrol/semaphore.c
+--- cvoicecontrol-0.9alpha.orig/cvoicecontrol/semaphore.c	2000-02-12 18:05:24.000000000 +0200
++++ cvoicecontrol-0.9alpha/cvoicecontrol/semaphore.c	2007-07-29 23:34:38.000000000 +0300
+@@ -26,6 +26,7 @@
+ ****************************************************************************/
+ 
+ #include "semaphore.h"
++#include <stdlib.h>
+ 
+ /********************************************************************************
+  * function must be called prior to semaphore use.
diff --git a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo.diff b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo.diff
new file mode 100644
index 000000000000..c22dbb04d47b
--- /dev/null
+++ b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo.diff
@@ -0,0 +1,12 @@
+diff -r -u cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c cvoicecontrol-0.9alpha-gentoo/cvoicecontrol/cvoicecontrol.c
+--- cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c	2000-02-17 22:59:41.000000000 +0000
++++ cvoicecontrol-0.9alpha-gentoo/cvoicecontrol/cvoicecontrol.c	2002-06-03 23:39:46.000000000 +0000
+@@ -37,6 +37,8 @@
+ #include<sys/select.h>
+ #endif
+ 
++#include <values.h>
++
+ #include "cvoicecontrol.h"
+ 
+ #include "model.h"
diff --git a/media-sound/cvoicecontrol/metadata.xml b/media-sound/cvoicecontrol/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/cvoicecontrol/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/dagrab/Manifest b/media-sound/dagrab/Manifest
new file mode 100644
index 000000000000..9a201ec50a9b
--- /dev/null
+++ b/media-sound/dagrab/Manifest
@@ -0,0 +1,7 @@
+AUX dagrab-0.513-build.patch 1207 SHA256 b613412fb64b8871d56eb7528250372683b80822a3566166fb1697b98ed38e27 SHA512 f86f59d3877551162505ea0d15e5f90248aee45f6217771143b2809a650d720a203a147f7d8ebbad52902b61054b6786f51b85c98dd4c5d8e2df812e7011e537 WHIRLPOOL 57e7cc947355328005af4248055e1201322152c6a35292ec939715c1ee60ce06d6d00b3f22b57c7b3a69e179f4121311c7bead2b208ca1c84df59ff8e31c642c
+AUX dagrab-0.513-freedb.patch 716 SHA256 c111c46980bd3bb8211a5caf15ccd501279e1a640ea02ca23cd25c2ff1551ad4 SHA512 5516bb2db854fef1c371f8f96213055ec24086ec773e2b8e1f12c8ca9ce87d2b43b3575112763e7bcf401e029dee47386c244f61bbc675ec3ad64c5f7788a0fe WHIRLPOOL 446f2af10e5e353d23db3cab11b1d7174b9af4faad64a502eed01f4f41f6f9286a85ede8ae3fd711a6055973dd5227386c4b3856fa53edadc63246bc156b6535
+DIST dagrab-S0.513.tgz 38747 SHA256 f8e4d30fc5943d1806a3320150256219bc63724f4cc7787e01d1f11fd3b3cf8a SHA512 196a9b0282715bc28dc68b56cf04370369a6403c8178fd943dd3e029c91c6ecc67f7500a4be2b3277e10e9af06a39cb701bbe76cc57e4f97732e0d53d7c9efa7 WHIRLPOOL 3e84d5622663dcb069d087147b4d46ed7494c031bc1dc2618db770d3f0dad310dad8d966a6701445d2cd50383ad43d511cdde8a36836ec65d4573863fe8786f6
+EBUILD dagrab-0.513-r1.ebuild 652 SHA256 ab7b9f2b5a614ae6253faf50fa400e1fb6bb3eb05c2a3b6f8046f89b77204531 SHA512 429163b9a053b684e36da274b6566c5d1e96a524467ed810a3b7cb130a649b6208cf3188412f57e2963d7abcc8a2421b514386a1e61de34fc16b39598dbcfb26 WHIRLPOOL c42b5dc655c9314c56708e4e7400dfd4923217b988d96f0d4de42ba023bb8a73227c6e48376afa96d2a3102393af625ce15a5a5addc56a848b3e8049c9cd44e5
+MISC ChangeLog 2804 SHA256 36e0e0d6095e1a9d6fc1d9ea34bc877616ba1fd97ee924dbcbabe6f18981ee33 SHA512 58ea24bb5e9af97839eb7ae5826e0db6718ec705ed236c0ea7926d9ae434adfa8da6f49484692738af3a4f731fbdde4ed9a49f5d17a6c358907c422bcfb3e1da WHIRLPOOL c682bc2e0c22d09e2bad66ea6adc3d2f734030f21f2313ca30a9d27f3c0f5afe37f2ee0e2c638ae95ce8f2367da55286c14fa16e235f8c3bf563125583de3975
+MISC ChangeLog-2015 705 SHA256 7d82c64286cb5316ff6b249846c4984bc5447c5fa99f8306b7fc0b5deed25382 SHA512 7e5d9fc343b80712e5eff78785e150f4c5111f105500b3384fe39d5635bf4d38440bcf390d44bb3341c01c7baea8213bf395643d92c37dc559c03b364cbe357a WHIRLPOOL f8d34066e54060783044df93a3160cb3635343f5c6cae6733ae9243505c7aca306e84772a9fd35195ff998262a9f2ab8e5e15dc1c9bf9eb0faa172ca32475a7e
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/dagrab/dagrab-0.513-r1.ebuild b/media-sound/dagrab/dagrab-0.513-r1.ebuild
new file mode 100644
index 000000000000..e288a0d2df40
--- /dev/null
+++ b/media-sound/dagrab/dagrab-0.513-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+MY_P="${PN}-S${PV}"
+DESCRIPTION="fixed point cd ripper"
+HOMEPAGE="http://vertigo.fme.vutbr.cz/~stibor/dagrab.html"
+SRC_URI="http://ashtray.jz.gts.cz/~smsti/archiv/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-freedb.patch"
+)
+
+src_prepare() {
+	# fix #570732 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	default
+}
+
+src_install() {
+	dobin dagrab
+	dodoc BUGS CHANGES FAQ grab TODO
+	doman dagrab.1
+}
diff --git a/media-sound/dagrab/files/dagrab-0.513-build.patch b/media-sound/dagrab/files/dagrab-0.513-build.patch
new file mode 100644
index 000000000000..43408d56b374
--- /dev/null
+++ b/media-sound/dagrab/files/dagrab-0.513-build.patch
@@ -0,0 +1,50 @@
+--- dagrab-S0.513/dagrab.c
++++ dagrab-S0.513/dagrab.c
+@@ -776,6 +776,7 @@
+ 		thread_save(NULL);
+ #endif
+ 	      do_not_write_now:
++		;
+ 	}
+ 	/****************************************************************
+ 	 * Close output file 						*
+--- dagrab-S0.513/jit_in.c
++++ dagrab-S0.513/jit_in.c
+@@ -74,5 +74,6 @@
+ 			*p = (*(p + SSIZE) + *(p - SSIZE)) / 2;
+ 			view_status(ID_JITTER, NULL);
+ 		      is_ok:	/* means continue */
++			;
+ 		}
+ }
+--- dagrab-S0.513/Makefile
++++ dagrab-S0.513/Makefile
+@@ -3,14 +3,12 @@
+ # Note: PTHREAD support is optional, you can comment it out
+ ################################################################################
+ 
+-CC=	gcc
+-CFLAGS=	-O ${UCD} -W -Wall -DPTHREAD #-g # #-DDEBUG
+-LDFLAGS=-O -s -lpthread # -static
+ PREFIX=/usr/local
+-
+-ifneq ($(wildcard /usr/include/linux/ucdrom.h),)
+-       CFLAGS +=-DUSE_UCDROM
+-endif
++CC ?= gcc
++CFLAGS ?= -O
++CFLAGS += -W -Wall -DPTHREAD
++LDFLAGS ?= -O
++LIBS = -lpthread
+ 
+ all:	dagrab
+ 
+@@ -28,7 +26,7 @@
+ err.o:		dagrab.h main.h
+ 
+ dagrab:	$(OBJ) Makefile
+-	$(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o dagrab
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o dagrab
+ 
+ clean:
+ 	rm -f dagrab *.o *.wav *.mp[23] *.ogg .*swp *~ gmon.out tags
diff --git a/media-sound/dagrab/files/dagrab-0.513-freedb.patch b/media-sound/dagrab/files/dagrab-0.513-freedb.patch
new file mode 100644
index 000000000000..5725867a26e0
--- /dev/null
+++ b/media-sound/dagrab/files/dagrab-0.513-freedb.patch
@@ -0,0 +1,25 @@
+--- dagrab-S0.513/dagrab.1
++++ dagrab-S0.513/dagrab.1
+@@ -209,7 +209,7 @@
+ .B -H
+ .I [host][:port]
+ .RS 3
+-sets the remote cddb server and/or port, defaults to de.freedb.org:888.
++sets the remote cddb server and/or port, defaults to freedb.org:8880.
+ .RE
+ 
+ .B -D
+--- dagrab-S0.513/const.h
++++ dagrab-S0.513/const.h
+@@ -18,9 +18,9 @@
+ #define BLEN		1024	/* length in chars of command/trackname */
+ #define OVERLAP		1	/* minimum number of sectors for overlapping */
+ 
+-#define CDDB_PORT	888
++#define CDDB_PORT	8880
+ #define CDDB_PATH	"/usr/lib/X11/xmcd/cddb"
+-#define CDDB_HOST	"de.freedb.org"
++#define CDDB_HOST	"freedb.org"
+ #define CDDB_MAX	65535
+ 
+ #define KEYLEN		16	/* number of samples for overlap checking */
diff --git a/media-sound/dagrab/metadata.xml b/media-sound/dagrab/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/dagrab/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
new file mode 100644
index 000000000000..c8612c10ae55
--- /dev/null
+++ b/media-sound/darkice/Manifest
@@ -0,0 +1,8 @@
+AUX darkice-1.2-gcc47.patch 236 SHA256 bcd7e2bd9d5901e1118971c3db02ef26206198a0a850421b8c155358f7df1d16 SHA512 4f77a2694f2bb574c600edfe1d2b88dd1d9c932ff8280e8fe0739c50f5ec346c284d49ac34993e351582c1a4909b9dd380073df7a16b62b8db71c66b0f1c7326 WHIRLPOOL e90bd4880e44bef724e5ea37f4c253b0eb4b865b002cc210eaa8605c5b7a3f3aaceb61651c778a4a5fa95cb04cf59301108e445ab012d63aa482c2e8d8930a08
+DIST darkice-1.2.tar.gz 357026 SHA256 b3fba9be2d9c72f36b0659cd9ce0652c8f973b5c6498407f093da9a364fdb254 SHA512 d8959819d70eb9b44a34d087fcf3897be5e4cb23681c049f8d88e251d83dfd86b90fdd37744fe27d861dfcbb6bb6e1521b48c5c7b4967bb061ede75596f0a823 WHIRLPOOL f12ff32ce31cf508f556146baeb64860b3a698edf0836675a62c817b34fa1df499c3a281a3e2a66a1db5be3eb89d5fc91438184c998f4a7a0ad24e27fd7fea1e
+DIST darkice-1.3.tar.gz 371411 SHA256 2c0d0faaa627c0273b2ce8b38775a73ef97e34ef866862a398f660ad8f6e9de6 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674 WHIRLPOOL 60cb890227303468a58fa1610fec84cf878b71fbbd3f199dbe0c8ea37971340b7e3f87db2731e2186f7e5e87789b942961e12acd16dc2fac6aac6ee35e108d69
+EBUILD darkice-1.2.ebuild 1431 SHA256 0c6cf26fdeed1fc926a79b3aa2adb1ea76bd69e45541b639d26bc3475e976041 SHA512 69f6c945a9aab85805bf3a55636f4f2f292fc29ab22bc3f92bd9aa081beceafed55affa811178d5568d8be62d70fbd5749294cbe8d0ab77b2f36808a279282ee WHIRLPOOL d2bf1c724fe23520045b01214e4ac5ea018fa19fb88099aff9d1457369f93bc4e93ec804291870c0121d593fa66498ea2b9bbced65257a2bcf738cb4b33a3a2b
+EBUILD darkice-1.3.ebuild 1309 SHA256 a5e2df0f3244473700aad2273d6e5f4ce3fee2cfc1134994b955924db64ac556 SHA512 923c2bca3c9d7e166b46c945a771745a874feb3ad8244863fb3857882dd64005dee846164a0628f62f25db15201611c188864a320fc838c0a9fba496ad7f3e4e WHIRLPOOL 8171525a522553e171049e81c080dbf557100cab230885ac6aeea776ed5da5c4dd4137ce5184557ada055ca2bb6d81ed1de6b5ce74fabb2024200bebe1f03535
+MISC ChangeLog 3372 SHA256 ab1919f1d0534e101858608493c33fb3f69acba95a55194d9b19054f135c5028 SHA512 f6c5696e1d85ba30db170d5b2626c27591a0f9c771b513ca70056c3bfc07ea8cdef087301ada2074d1c82b137ccfe8de1430349903e3681a4c5002dd7d3c8adb WHIRLPOOL debec628ac2ec5c6dca0c4545d8f9cc2e66d5a7636034e995cdf04253ea3851b298f243def89b6ab1913bc8c6903c66bf1cda8fbbd858149676e4a71fcb6c165
+MISC ChangeLog-2015 8906 SHA256 1d23ee17d82646c3d2918c01a2094929a9aea0288e37725ab496a0c82457c502 SHA512 dc84035208ca3dc4f03375f523e45d3e0b0dbd92e299c1f41ff2bfac4c5ebdf1462f284966f02fdef88c049e3d08b88fa445c2b122d63fde6880dc85102dd397 WHIRLPOOL 5e92e2d0dd4e64e25bfabd75a0b3a8cbb3e24ff0de78ab11538ae89b0b6198fbe5d0a4a73a2785161589eaec3bd3dedf341731e187b4439124d5515d1b09f40a
+MISC metadata.xml 583 SHA256 bd92c392cdb290b8326fe9c52eb76cabca7c423186116eaa3035e60e53eb356b SHA512 673e3a01b1a5bd92119ad87e56b85dae309fa3f7a9de66d21908557819887ed3804477566ce0a00c2a919ae760ea7896cf67b2d25e894fa52463110fa0e23ba8 WHIRLPOOL d5197492b72276d6e381585db629d1c6addaffab887c019e13d21b425ddc7138155adf881861f99bd191cb23418d215f621679f13c22a69db1afaabac69d1c27
diff --git a/media-sound/darkice/darkice-1.2.ebuild b/media-sound/darkice/darkice-1.2.ebuild
new file mode 100644
index 000000000000..3efe53015512
--- /dev/null
+++ b/media-sound/darkice/darkice-1.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A live audio streamer"
+HOMEPAGE="http://www.darkice.org/"
+SRC_URI="https://darkice.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc sparc x86"
+IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
+
+RDEPEND="aac? ( media-libs/faac )
+	aacplus? ( >=media-libs/libaacplus-2.0.0 )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	mp3? ( media-sound/lame )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}"
+
+# Version 1.2 doesn't check for opus as input codec (bug #593790).
+# This is fixed in version 1.3
+REQUIRED_USE="|| ( aac aacplus mp3 twolame vorbis )
+		|| ( alsa jack pulseaudio )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+}
+
+src_configure() {
+	econf \
+		$(use_with aac faac) \
+		$(use_with aacplus) \
+		$(use_with alsa) \
+		$(use_with debug) \
+		$(use_with jack) \
+		$(use_with libsamplerate samplerate) \
+		$(use_with mp3 lame) \
+		$(use_with opus) \
+		$(use_with pulseaudio) \
+		$(use_with twolame) \
+		$(use_with vorbis)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
+}
diff --git a/media-sound/darkice/darkice-1.3.ebuild b/media-sound/darkice/darkice-1.3.ebuild
new file mode 100644
index 000000000000..b3c01b466369
--- /dev/null
+++ b/media-sound/darkice/darkice-1.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="A live audio streamer"
+HOMEPAGE="http://www.darkice.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
+
+RDEPEND="aac? ( media-libs/faac )
+	aacplus? ( >=media-libs/libaacplus-2.0.0 )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	mp3? ( media-sound/lame )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="|| ( aac aacplus mp3 opus twolame vorbis )
+		|| ( alsa jack pulseaudio )"
+
+#PATCHES=(
+#	"${FILESDIR}"/${PN}-1.2-gcc47.patch
+#)
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_with aac faac) \
+		$(use_with aacplus) \
+		$(use_with alsa) \
+		$(use_with jack) \
+		$(use_with libsamplerate samplerate) \
+		$(use_with mp3 lame) \
+		$(use_with opus) \
+		$(use_with pulseaudio) \
+		$(use_with twolame) \
+		$(use_with vorbis)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
+}
diff --git a/media-sound/darkice/files/darkice-1.2-gcc47.patch b/media-sound/darkice/files/darkice-1.2-gcc47.patch
new file mode 100644
index 000000000000..e10439f27e45
--- /dev/null
+++ b/media-sound/darkice/files/darkice-1.2-gcc47.patch
@@ -0,0 +1,11 @@
+--- darkice-1.2/src/PulseAudioDspSource.cpp
++++ darkice-1.2/src/PulseAudioDspSource.cpp
+@@ -43,6 +43,8 @@
+ #include "config.h"
+ #endif
+ 
++#include <stdio.h>
++
+ #include "Util.h"
+ #include "Exception.h"
+ #include "PulseAudioDspSource.h"
diff --git a/media-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
new file mode 100644
index 000000000000..456878486386
--- /dev/null
+++ b/media-sound/darkice/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="aacplus">AAC+ encoding via media-libs/libaacplus</flag>
+		<flag name="opus">Enable Opus audio codec support</flag>
+		<flag name="twolame">Build with twolame support</flag>
+	</use>
+	<upstream>
+		<remote-id type="google-code">darkice</remote-id>
+		<remote-id type="sourceforge">darkice</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/darksnow/Manifest b/media-sound/darksnow/Manifest
new file mode 100644
index 000000000000..3def8fdb5c96
--- /dev/null
+++ b/media-sound/darksnow/Manifest
@@ -0,0 +1,6 @@
+AUX darksnow-0.7.1-Makefile.patch 2081 SHA256 c0d4b0e6fa9e4a3c926517d37cb3e115a3fd3a41eb401bd4df1f809af73cda0a SHA512 6d9d9ae3922278e9aaa11452550302f31f6060ca9141266f4253784556deba9eeb1880401579b5c220051221458e0b359b208994fde57f7ba4a62404f0ce20b1 WHIRLPOOL 1102d3c899afd877994c8aa146682243e69f26b40f905cda5455403178a6f23bb642fb388fa8e4173891e5aafad977ad7b32b7672a2ebc86ffb13d0ec1ee5a5a
+DIST darksnow-0.7.1.tar.gz 78928 SHA256 7c7c55761f7536cea2e8b6d8037c9ce7ca71f6a044c1b6026ea80e13d35b04fd SHA512 0ea1ff9f085127185d47169df358d2940fa9e52c52408bbaaefdf517402ddcb37b2df8b8c65bb22c3493820b47a3b4a2571cc819e81c70718684e8c3c3fe77ae WHIRLPOOL eec2209934cf9129528bb15dc05e6e726649a8be7f4178770776e1728f4ff69ff8dab80808e81ca5983afd77ab252e426dc384e47d12d9bbc53b60f39326b37c
+EBUILD darksnow-0.7.1.ebuild 806 SHA256 cf4785c6650c7823150bd868f590a0398bcedcacca169d3333898c0e2e6f2148 SHA512 c2bd937482e583e4c2356a7cb7c516d330a9200ed7cafd175208e6af655207761b165d23d5ab110c4cc244ebb8ebfa3e122537f5573050c90e808154bc0b9f3d WHIRLPOOL c26f35ad3b5a421700ac97fd776331db597808fdfeb2116231aded612994f8e64aa0083c9eb2915f39ef0bee6a566b223f0644e8abaf049ef168e469163885cd
+MISC ChangeLog 2471 SHA256 1829960e0de9f934797a0755065a1d108715dd2a627ca373f1f1e9011bae0712 SHA512 94a3a9b9fc6f80e84ad41ea410676c870fce7921a1e9372dc0aa491ce4c2057bf77bbd7eb8b6149bb79b979ce68f502157cf17ba3a0f34d62ed588bb3676c3d9 WHIRLPOOL e034b625a056018bbb99d22bf47a892e062eb93bbe894d594c6508dd86acb815bd4fd17890009aa2c499e2c772180e79ac79c48b888f75e705d47cffb8d4c338
+MISC ChangeLog-2015 3160 SHA256 e2da8d0b68f8484d22660ddccb0026e40f93fbda02cd86364a78cd08deb7be8b SHA512 7fa9886c7b3eb288cb916d918788b10c989db37ae4eea424c3b586221168f041756c0e6478713bf2e91ca7b121901a924a59d57d2fd9a3ed0497cb78fb319b6f WHIRLPOOL 1f41dc8a1fdbe1b3f9ef0e3cafc3f1f7e05e6c403694303cb1928310bc4322eef21df2011aa07acfbd3d1ff65d71d3b9e01e9f69baccbf090b66a28d8f536217
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/darksnow/darksnow-0.7.1.ebuild b/media-sound/darksnow/darksnow-0.7.1.ebuild
new file mode 100644
index 000000000000..e91b0b6ce786
--- /dev/null
+++ b/media-sound/darksnow/darksnow-0.7.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils gnome2-utils
+
+DESCRIPTION="Streaming GTK+ Front-End based in Darkice Ice Streamer"
+HOMEPAGE="http://darksnow.radiolivre.org"
+SRC_URI="http://darksnow.radiolivre.org/pacotes/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+PDEPEND=">=media-sound/darkice-1.2"
+RDEPEND=">=x11-libs/gtk+-2.14.0:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc documentation/{CHANGES,CREDITS,README*}
+	make_desktop_entry ${PN} "DarkSnow" ${PN}
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/darksnow/files/darksnow-0.7.1-Makefile.patch b/media-sound/darksnow/files/darksnow-0.7.1-Makefile.patch
new file mode 100644
index 000000000000..0e7e6a1bfedc
--- /dev/null
+++ b/media-sound/darksnow/files/darksnow-0.7.1-Makefile.patch
@@ -0,0 +1,45 @@
+--- darksnow-0.7.1/Makefile.in
++++ darksnow-0.7.1/Makefile.in
+@@ -38,8 +38,8 @@
+ 
+ all: darksnow
+ 
+-darksnow: darksnow.o interface.o config_files.o tooltips.o man_gzip
+-	$(CC) darksnow.o interface.o config_files.o tooltips.o -o darksnow  @GTK_LIBS@ @GTK_CFLAGS@ -DVERSION="\"$(VERSION)\""
++darksnow: darksnow.o interface.o config_files.o tooltips.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -DVERSION="\"$(VERSION)\"" darksnow.o interface.o config_files.o tooltips.o -o darksnow @GTK_LIBS@ @GTK_CFLAGS@
+ 
+ darksnow.o: darksnow.c
+ 	$(CC) $(FUNNY) @GTK_CFLAGS@ -DINTLPREFIX="\"$(INTLPREFIX)\"" -DVERSION="\"$(VERSION)\"" -c darksnow.c -o darksnow.o
+@@ -53,19 +53,15 @@
+ tooltips.o: tooltips.c
+ 	$(CC) $(CFLAGS) $(FUNNY) @GTK_CFLAGS@ -DINTLPREFIX="\"$(INTLPREFIX)\"" -DVERSION="\"$(VERSION)\"" -c tooltips.c -o tooltips.o
+ 
+-man_gzip:
+-	gzip -c man/darksnow.1 > man/darksnow.1.gz 
+-
+ clean:
+-	rm -f *.o *~ darksnow man/darksnow.1.gz
++	rm -f *.o *~ darksnow
+ 	rm -rf slack darksnow.tgz
+ 
+ install: darksnow
+-	$(INSTALL) -D --mode=0755 darksnow $(PREFIX)/bin/darksnow
+-	$(INSTALL) -D --mode=0644 documentation/CHANGES $(PREFIX)/share/darksnow/changelog
+-	$(INSTALL) -D --mode=0644 po/pt_BR.mo $(PREFIX)/share/locale/pt_BR/LC_MESSAGES/darksnow.mo
+-	$(INSTALL) -D --mode=0644 icon/darksnow_icon.png $(PREFIX)/share/icons/hicolor/32x32/apps/darksnow.png
+-	$(INSTALL) -D --mode=0644 man/darksnow.1.gz $(PREFIX)/share/man/man1/darksnow.1.gz
++	$(INSTALL) -D --mode=0755 darksnow $(DESTDIR)$(PREFIX)/bin/darksnow
++	$(INSTALL) -D --mode=0644 po/pt_BR.mo $(DESTDIR)$(PREFIX)/share/locale/pt_BR/LC_MESSAGES/darksnow.mo
++	$(INSTALL) -D --mode=0644 icon/darksnow_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/darksnow.png
++	$(INSTALL) -D --mode=0644 man/darksnow.1 $(DESTDIR)$(PREFIX)/share/man/man1/darksnow.1
+ 
+ make_pkg: darksnow
+ 	echo "Remember to run this option as root!"
+@@ -89,5 +85,5 @@
+ 	/sbin/upgradepkg darksnow-*-1rd.tgz
+ 
+ dist-clean: clean
+-	rm aclocal.m4 config.status config.log man/darksnow.1.gz Makefile
++	rm aclocal.m4 config.status config.log Makefile
+ 	rm -r autom4te.cache
diff --git a/media-sound/darksnow/metadata.xml b/media-sound/darksnow/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/darksnow/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/daudio/Manifest b/media-sound/daudio/Manifest
new file mode 100644
index 000000000000..7e38575cd88a
--- /dev/null
+++ b/media-sound/daudio/Manifest
@@ -0,0 +1,8 @@
+AUX daudio-0.3-makefile.patch 1683 SHA256 945eb5afd0fe8763d0dac6cd1ffa5feeb66ae707f37c4e202cbab0944df6fb84 SHA512 4ca11073dcfef61fede2cdb7d99be6f3ec7d6c3c8e587faf33c6e06c4468c8e25b4726aa66ba119fc871c4930b42accff331db9a4bd76cac37f56a15c32bc5aa WHIRLPOOL eecb575d7065164dbce3a8dcf87844dfa304c515bd516656b638c271d59e9555a204ac4cf573343b21f6cca964999232e7089895ff72785e65cc4e5d719370ce
+AUX daudio-0.3-qa-implicit-declarations.patch 1980 SHA256 e2e5d687445ea427594872c67cc653ebdf7c858097534441a2e8873a97109219 SHA512 0da091005e36825ef0f35e4029e48781a23d2c8ab00af33528de4999dcb7d2e98006b2623852ab7cadd6e129d1847a6a85f8f60b7340c755939d9fa45d094a5e WHIRLPOOL 8ac1bf28bf2b34891252a8adb06baad7eb752710de193ac2e2f2946a18eb8e47a3f39bdaa944949e31d82e1bdf70ee4c2fb4039e576f5cbed54d9d0236695c82
+AUX daudio.rc 425 SHA256 501c64d910716e258b74fbf83f099861c0110dd2da1db704bef1d088dd4c259b SHA512 c6f816faeac497e31365d9bf7b2c37c4c8688d88820c0dbc9e4819be13119e477cc3aea2fe3ca249d82b8d84ebb485d9516f0b93180a7c756d573dcb5f1e1900 WHIRLPOOL c709c647944a4be512561ecf17589e78e52ea32bbd9a45f9985fadf75876086953e5d1be03e189023eb940f8cdd34390fa8ecbe3e55afca456b182adca07d425
+DIST daudio-0.3.tar.gz 76683 SHA256 f2abf767b6be1ff9ed0c2d2f983484bd7a41dbdc3fa7e0839729aa857d4a60f8 SHA512 63266348c8235b09efb6958646b003a5e7ae1cfd7d97aeff928ed8e7b9ffc71666c0bcd93ee89db6c28cae5019056748631e9fef850ebf6ead7aefecc3037e3c WHIRLPOOL 3a492d276bd2782c27a37f1d6c6e87993b6cbf4d17bee9ca40dd40bd854c57d7a5d76d9e4042c598146c9152356d9045dd51d0745ab1a9127bbc870bc69e1967
+EBUILD daudio-0.3-r1.ebuild 946 SHA256 6f0b6cf38c6cd80e45308fe0b3b5eeec26724be42a7c69bf36a84def92e4282e SHA512 ccf77eef1f59b3661bb9443c55ba426e4ef99ef2c5272af479e0db2bddffe17f4cb1ed8880fd84573b57a8254712d4baf024c720f4143b3bf883aab3a77eb9d1 WHIRLPOOL e267a90005b851c8b87580203850d63a411d5779574ab967c292fc0407d58cf01a74bbac3a380b2eb4b1d1b6685edb81de8cc5ec28c121cb8df77bbd1043e3ea
+MISC ChangeLog 2934 SHA256 e0f7656c3c75a6455f54378a9a59d7199241df1b05d5d60c96959e2b452a55e4 SHA512 081f3b4fdb3844afeb356dd0a8f14b56800a13d9783590721b4d7d7de46c2c9bff2836b3dc585386e3ba9141ef787c0de1becf4a956f3aebf01821d14e8c5f13 WHIRLPOOL a6b8e22cc3e6bad5a54171541ad952b1faa99a46ac924dc98b9d22220586fef7dc94c7707e09bdf49df813ef1f3c1172d98402e3562ae810437efd23cfab06cb
+MISC ChangeLog-2015 1147 SHA256 e5d79063b6a5698e6b840d3003e7570172b457ab675027ede4423fef397fe884 SHA512 0959c770f7da91cbbcdcba01f0e630e1e41192b65c9688ea2b7fe43cd147e0fac02603f3a592a06777c3469f77eab5b9e37a45f62f2d848649c152b7f1454e34 WHIRLPOOL d59107e770387baa040df1acd46559ae0a5b92c3fce3fff3407323ff8b0fe6811ab6cc28ce94b5637488ce9bb7e39a3187c573fadc7041364b4066d130d2bb58
+MISC metadata.xml 329 SHA256 5fe2ec3562fcbec5163e842defa30f6f8cd62709bde2334e58403e9009030dc4 SHA512 d17c82265b7361ea26bca0ac2c07221502942ca5c90386ded0b208f54d8f98f326075ef2624c0be275187f2e54778094de123be64705d85e9f8c6b589b962054 WHIRLPOOL 31c53e8beeaf7d616bef552f2d1a75dbf29a0e6c9ee771aceea76c20f3bb114b5bbae7f7c4a9f2b925b7bdfbd240521aded421e3527b8f14e17608f95b739dee
diff --git a/media-sound/daudio/daudio-0.3-r1.ebuild b/media-sound/daudio/daudio-0.3-r1.ebuild
new file mode 100644
index 000000000000..9acf3de2df18
--- /dev/null
+++ b/media-sound/daudio/daudio-0.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Distributed audio on the local network"
+HOMEPAGE="http://daudio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-sparc: 0.3: static audio on local daemon. No audio when client connects to amd64 daemon
+KEYWORDS="amd64 ~ppc -sparc x86"
+
+IUSE=""
+DEPEND=">=media-libs/libmad-0.15.0b-r1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
+)
+
+src_prepare() {
+	# fix #570582 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	tc-export CC
+	default
+}
+
+src_compile() {
+	emake -C client
+	emake -C server
+	emake -C streamer
+}
+
+src_install() {
+	dobin client/daudioc server/daudiod streamer/dstreamer
+	newinitd "${FILESDIR}"/daudio.rc daudio
+	dodoc doc/*
+}
diff --git a/media-sound/daudio/files/daudio-0.3-makefile.patch b/media-sound/daudio/files/daudio-0.3-makefile.patch
new file mode 100644
index 000000000000..28f1215f7c94
--- /dev/null
+++ b/media-sound/daudio/files/daudio-0.3-makefile.patch
@@ -0,0 +1,50 @@
+Index: daudio-0.3/client/Makefile
+===================================================================
+--- daudio-0.3.orig/client/Makefile
++++ daudio-0.3/client/Makefile
+@@ -13,10 +13,10 @@ install: $(PROG)
+ 	install -c -m755 --owner=0 --group=0 -b -D daudioc $(PREFIX)/bin/daudioc
+ 
+ debug: $(SRCS)
+-	gcc $(DEFINES) -DDEBUG $(INCLUDES) $(LIBS) -o $(PROG) $^
++	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -DDEBUG $(INCLUDES) -o $(PROG) $^ $(LIBS)
+ 
+ $(PROG): $(SRCS)
+-	gcc $(DEFINES) $(INCLUDES) $(LIBS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -o $@ $^ $(LIBS)
+ 
+ clean:
+ 	rm -f $(PROG)
+Index: daudio-0.3/server/Makefile
+===================================================================
+--- daudio-0.3.orig/server/Makefile
++++ daudio-0.3/server/Makefile
+@@ -10,13 +10,13 @@ PREFIX = /usr/local
+ all: $(SBINS)
+ 
+ debug: $(SRCS)
+-	gcc -g $(DEFINES) $(INCLUDES) $(LIBS) -o daudiod $^
++	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -o daudiod $^ $(LIBS)
+ 
+ install: $(SBINS)
+ 	install -c -m755 --owner=0 --group=0 -b -D daudiod $(PREFIX)/bin/daudiod
+ 
+ $(SBINS): $(SRCS)
+-	gcc $(DEFINES) $(INCLUDES) $(LIBS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -o $@ $^ $(LIBS)
+ 
+ clean:
+ 	rm -f $(SBINS)
+Index: daudio-0.3/streamer/Makefile
+===================================================================
+--- daudio-0.3.orig/streamer/Makefile
++++ daudio-0.3/streamer/Makefile
+@@ -12,7 +12,7 @@ install: $(SBINS)
+ 	install -c -m755 --owner=0 --group=0 -b -D dstreamer $(PREFIX)/bin/dstreamer
+ 
+ $(SBINS): $(SRCS)
+-	gcc $(DEFINES) $(INCLUDES) $(LIBS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -o $@ $^ $(LIBS)
+ 
+ clean:
+ 	rm -f $(SBINS)
diff --git a/media-sound/daudio/files/daudio-0.3-qa-implicit-declarations.patch b/media-sound/daudio/files/daudio-0.3-qa-implicit-declarations.patch
new file mode 100644
index 000000000000..d60be6f64e68
--- /dev/null
+++ b/media-sound/daudio/files/daudio-0.3-qa-implicit-declarations.patch
@@ -0,0 +1,98 @@
+Fix implicit declarations, such as:
+
+main.c: In function ‘main’:
+main.c:45:2: warning: incompatible implicit declaration of built-in function ‘exit’
+  exit(1);
+  ^
+--- daudio-0.3/client/main.c
++++ daudio-0.3/client/main.c
+@@ -22,6 +22,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <sched.h>
++#include <stdlib.h>
+ 
+ int main(int argc, char **argv) {
+     int s;
+@@ -50,7 +51,7 @@
+     
+     /* drop priveledges */
+     uid = getuid();
+-    seteuid(uid);
++    if(seteuid(uid)){};
+ 
+     set_default_options(void);
+ 
+--- daudio-0.3/client/net.c
++++ daudio-0.3/client/net.c
+@@ -27,6 +27,7 @@
+ #include <asm/unistd.h>
+ #include <mad.h>
+ #include <pthread.h>
++#include <stdlib.h>
+ 
+ #include "net.h"
+ #include "../common/frame.h"
+--- daudio-0.3/server/local.c
++++ daudio-0.3/server/local.c
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <netinet/in.h>
++#include <stdlib.h>
+ 
+ #include "timer.h"
+ #include "data.h"
+@@ -71,7 +72,7 @@
+     
+     /* drop priveleges */
+     uid = getuid();
+-    seteuid(uid);
++    if(seteuid(uid)){};
+     
+     current = bigbuf.buffer;
+ 
+--- daudio-0.3/server/main.c
++++ daudio-0.3/server/main.c
+@@ -25,6 +25,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <signal.h>
++#include <stdlib.h>
+ 
+ int main () {
+     int r;
+@@ -40,19 +41,19 @@
+     uid = getuid();
+     r = d_init();
+     if(r == -1) {
+-	seteuid(uid);
++	if(seteuid(uid)){};
+ 	perror("d_init failed");
+ 	exit(1);
+     }
+     r = b_init();
+     if(r == -1) {
+-	seteuid(uid);
++	if(seteuid(uid)){};
+ 	perror("b_init failed");
+ 	exit(1);
+     }
+     r = t_init();
+     /* drop priveleges */
+-    seteuid(uid);
++    if(seteuid(uid)){};
+     if(r == -1) {
+ 	perror("t_init failed");
+ 	exit(1);
+--- daudio-0.3/server/timer.c
++++ daudio-0.3/server/timer.c
+@@ -124,7 +124,7 @@
+     
+     /* drop priveleges */
+     uid = getuid();
+-    seteuid(uid);
++    if(seteuid(uid)){};
+     
+     mytimer.it_value.tv_sec = 0;
+     mytimer.it_value.tv_usec = 0;
diff --git a/media-sound/daudio/files/daudio.rc b/media-sound/daudio/files/daudio.rc
new file mode 100644
index 000000000000..5f934107051a
--- /dev/null
+++ b/media-sound/daudio/files/daudio.rc
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting daudio"
+	start-stop-daemon --start --quiet --background --make-pidfile --pidfile /var/run/daudio.pid --exec /usr/bin/daudiod
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping daudio"
+	start-stop-daemon --stop --quiet --pidfile /var/run/daudio.pid
+	eend $?
+}
diff --git a/media-sound/daudio/metadata.xml b/media-sound/daudio/metadata.xml
new file mode 100644
index 000000000000..377486ca9df4
--- /dev/null
+++ b/media-sound/daudio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">daudio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/dbmeasure/Manifest b/media-sound/dbmeasure/Manifest
new file mode 100644
index 000000000000..5571fa757763
--- /dev/null
+++ b/media-sound/dbmeasure/Manifest
@@ -0,0 +1,5 @@
+DIST dbmeasure-0.0.20100217-ed8105083ab72f9afac9d18b7563fbc3d6c1c925.tar.gz 6647 SHA256 8258db8cee11ca6da051033a6bc0db4c556deede712e31ebc02c72c64160c8d9 SHA512 d52a6d8d34625b3ddbeff70e712ddefabfb955ceedc525377d672b472b57163c1194df29ffcc23d881bfb7a5d38cd2850c09ee7c5e30e579414f5c599ad2b78b WHIRLPOOL 2f58741bf6b54073689354674fe51dc44d9708aacb54a40d380deb5bf98989a861032a9bb4bda94177c9d79dbb8a4bd03b0fb3fbac7f57a4088c89a798e1e215
+EBUILD dbmeasure-0.0.20100217.ebuild 995 SHA256 b69a34817b8afd8593e1d68595887a8a8cf7626800343aef442d13e250cdf265 SHA512 9ae55290bb900b6d41fa5489c314f35a1b5b3b76a62e81c23c98816c448e0f2b6d80e1d0d2d516196e341c41f7e19eb73ab377b34ded2c4a7f45a8659447a5f2 WHIRLPOOL 60b38e34f3d728fea308cda062088a63785abeebd073aed0e1803e0d46edda1ae757040231248a5d4c2a38d26fa1550c34a69a70f58e61929405ee18dc8b47b5
+MISC ChangeLog 2545 SHA256 649971312605dae1e719c7503fa13020ac1197238fd970c3ef2780694d1a7b35 SHA512 2912e2da6a1ef4e1634de1fe1ddd0a40a414223def5a1dfb70a155656d5e45ec5c8cdbbfe157d43630ec273059ab11c9c1d30d2790290dc42b2f4291184346b9 WHIRLPOOL a7e176140adceeddc22f5e33af3d131af94be473c5ab938cc74598af7e39db824498b5da07fbb2c19b6e5e3018407e1d891a807b6e9a36917ae958e6b3782cc0
+MISC ChangeLog-2015 1084 SHA256 630e908cbe201747ccf26d1b7cf46cb5851a974c85993e673e3c8a1011764505 SHA512 28a402d0d19cb5a0cf79dd87c7272bfc67b971deaedeba82718d446f06fd0d7cb634bc6b4ff0aa5f3181d29af9707018dbf11ec83bc184054f7fa5ce898ef882 WHIRLPOOL 6f4b639046019374139c7c35ec1f5e12e4a6fc7db3b2438dcbcefdfd541716b12c8dda490855b9ea8ccb9454b07d6635ade8ccecb8520625216c6d5c59257dc0
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild b/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
new file mode 100644
index 000000000000..274d72ed6f75
--- /dev/null
+++ b/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GIT_COMMITID="ed8105083ab72f9afac9d18b7563fbc3d6c1c925"
+MY_PV="${PV}-${GIT_COMMITID}"
+MY_P="${PN}-${MY_PV}"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="ALSA Volume Control Attenuation Measurement Tool"
+HOMEPAGE="http://pulseaudio.org/wiki/BadDecibel"
+SRC_URI="http://git.0pointer.de/?p=${PN}.git;a=snapshot;h=${GIT_COMMITID};sf=tgz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD" # need to confirm w/ upstream
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/alsa-lib-1.0.26"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	tc-export CC
+	# We drop the -g for debug output but we keep the -O0, as we don't want GCC
+	# to optimize out some critical math.
+	strip-flags
+	sed -i \
+		-e 's:$(CC):& $(LDFLAGS):' \
+		-e '/^CFLAGS/s:=:+=:' \
+		-e '/^CFLAGS/s:-g -pipe::' \
+		Makefile || die
+}
+
+src_install() {
+	dobin db{measure,verify}
+	dodoc README
+}
diff --git a/media-sound/dbmeasure/metadata.xml b/media-sound/dbmeasure/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/media-sound/dbmeasure/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/media-sound/dcadec/Manifest b/media-sound/dcadec/Manifest
new file mode 100644
index 000000000000..6d2d0dbdd10b
--- /dev/null
+++ b/media-sound/dcadec/Manifest
@@ -0,0 +1,4 @@
+DIST dcadec-0.2.0.tar.gz 225305 SHA256 ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44 SHA512 94edcc0b4449882ebeb08f8b39fe44a5302731df2dad3a3e0b0f787fd7c2c3e3992fed95e6f594af516e982cec34b057aab30e6457c098df61f495a487125acb WHIRLPOOL 33aa735fed95dcb5cb97fec767971bc151c7925f40589beb9c10fca57e0871da66b800fc9a23613a14e8ffbec2758a5e516debf3bb600e2c2c9f1fcad14b66e4
+EBUILD dcadec-0.2.0.ebuild 1280 SHA256 ab3983fb63d50dc1657a4296b447b7951100df52c8bbdf6544f5b9fdacc01160 SHA512 543d9f5c415e5d12dbc137b26411e4444f591d72a3b5632b8a39f002e805b267f12519b210ea6f78dfeb4b1ccf27210be178551282a1b37eb4af3a04e93eed32 WHIRLPOOL cbd2c03d14d63e5422ce57290d5dc4bd2f1862cc23687d311ba745b9cd15563416980ad197907172c8b875188f811ddd9998969f993b9664941dc3e3dfc12d7b
+MISC ChangeLog 487 SHA256 4daf80c4605c5f2809d2d012d1b65aac12c0d0e7558d859e0bf38f93059ec886 SHA512 47e5ff6e9c15cbbafcfa6322eb4dc1a1438cc7598e2e980957644e58f001271d2830745e685aa8f403e9bceaaa44ca9c50052d57fa9840516de7c7d3a7805eb5 WHIRLPOOL e520b54a409dafe3a6a0614d0b3c133e125af242b3ae36f6dbccf47c3073932e2ff2871789b46b017a094f4d63a987a18ac36f37f9638aacfed2e9e57dd8b5e1
+MISC metadata.xml 288 SHA256 e197f3ac1b57386d555af6bab978a82c7c28767943c56e1a096aac641cc61400 SHA512 8fb0bfd20af44eddc2b9c9b94595a7237bb22f7ea33ac7c16056bce5b62e406ecf66eafbf1a664efad44cd8eb44fe207139d123c03d8d062f5c169fd296e4877 WHIRLPOOL f4f73f10a9b18ea6ebfcb3e193c1a8bafe1430a190f3759131c63d56276835644864dd7dfe3e75e823979cbe8aa59e6c2547280332322b005853727c17f85c57
diff --git a/media-sound/dcadec/dcadec-0.2.0.ebuild b/media-sound/dcadec/dcadec-0.2.0.ebuild
new file mode 100644
index 000000000000..d0506427c012
--- /dev/null
+++ b/media-sound/dcadec/dcadec-0.2.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs multilib multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/foo86/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/foo86/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
+fi
+
+DESCRIPTION="DTS Coherent Acoustics decoder with support for HD extensions"
+HOMEPAGE="https://github.com/foo86/dcadec"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	sed -i \
+		-e '/^CFLAGS/s:-O3::' \
+		Makefile || die
+}
+
+multilib_src_compile() {
+	# Build shared libs
+	echo 'CONFIG_SHARED=1' >> .config
+
+	local target=all
+	multilib_is_native_abi || target=lib
+	tc-export AR CC
+	PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		emake -f "${S}/Makefile" ${target}
+}
+
+multilib_src_install() {
+	local target=install
+	multilib_is_native_abi || target=install-lib
+	PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		emake -f "${S}/Makefile" DESTDIR="${D}" ${target}
+}
+
+multilib_src_install_all() {
+	# Rename the executable since it conflicts with libdca.
+	mv "${ED}"/usr/bin/dcadec{,-new} || die
+
+	einstalldocs
+}
diff --git a/media-sound/dcadec/metadata.xml b/media-sound/dcadec/metadata.xml
new file mode 100644
index 000000000000..7294e2a4987a
--- /dev/null
+++ b/media-sound/dcadec/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+</maintainer>
+<upstream>
+	<remote-id type="github">foo86/dcadec</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/media-sound/dcaenc/Manifest b/media-sound/dcaenc/Manifest
new file mode 100644
index 000000000000..7004e8aeac44
--- /dev/null
+++ b/media-sound/dcaenc/Manifest
@@ -0,0 +1,7 @@
+DIST dcaenc-2.tar.gz 351199 SHA256 1054e6113cd1304f35ca830f027a53e9efd989530fe6523f732a0a9cd4110199 SHA512 0029f7c3b06199fb8100ce933827013fdc58e5fddf984ddf1744849e5d6cc24ce76e09b868eef19a49e1036a142419c3304c1822492f64301ed4feaa6bea4910 WHIRLPOOL 6e806bbf2194a9380c5f0bab186be3f14d4163b0b029fc44328cbbce4e6b209d4faf07f0a5fb809214c90aeaaff332e47f187ff13b597876fbc6fd664b1d0019
+EBUILD dcaenc-2-r1.ebuild 636 SHA256 09de1ce091882b11307c5dd8fb2bb812e976674d8c1655d060f5e655d56fdd5c SHA512 465b3080cf779a327364377e9209374cb20126ce92f6823508909e957b6900af852497ccde32061fe6ca2e98450c24656d6e16da073c92b8cc6a80b03ca99d9f WHIRLPOOL 72b132df51dce0fadad7e34c3d910b5b909aecf4de75c426376a73071c12b155efc2db19f5efb759ba37db39e342c43a88870d808b8c51a2bded1ac220d7eefb
+EBUILD dcaenc-2.ebuild 382 SHA256 3989bbee10c8e2516c3eec41ae10bf02e2776772534eb0cdfbfb4b55e2543427 SHA512 d31cd5534b436542753bd259a77abb9c8009639ad3272a2c1bcdfad5d873c112ae9211ab3544628d3571cf07d80d04a67ad0063662c309cb05438866a05d52e4 WHIRLPOOL 1a40eb6fccdb3cc4aec4a87bca410d3f5e4a04a97d5360f96e9de5b8b28fe72f98acc32f7d1832c0b4fe1a54730b769832a8a26002f9ee99f59d718b738a6c6e
+EBUILD dcaenc-9999.ebuild 636 SHA256 09de1ce091882b11307c5dd8fb2bb812e976674d8c1655d060f5e655d56fdd5c SHA512 465b3080cf779a327364377e9209374cb20126ce92f6823508909e957b6900af852497ccde32061fe6ca2e98450c24656d6e16da073c92b8cc6a80b03ca99d9f WHIRLPOOL 72b132df51dce0fadad7e34c3d910b5b909aecf4de75c426376a73071c12b155efc2db19f5efb759ba37db39e342c43a88870d808b8c51a2bded1ac220d7eefb
+MISC ChangeLog 2515 SHA256 1a73f64a2d6a937d2330c26d85e4f1f86b3ebde9b24a7f7fe87c554ff0bbb20c SHA512 2024c579066828d826de97e6ec97a29a6f5878eebf805798dec1114774ac0830b74081b41b685a42cc4748cab7df5ef1c4c53b29ff59745dd6d8f15507fa189a WHIRLPOOL dc4965664313b28a1cfafce2c575a2fc7e73ddbe72e4056db96d7534723ecb441c2bb134b5d3a411ba3f4a48e07c7022099b69943564f0cc7ec4c6161bc4e8e8
+MISC ChangeLog-2015 668 SHA256 f69c6068f9207e0d26e26eecee587929c79b3d4e0b180729e0645d3947bb6ada SHA512 e8ca47b61589a094e7bb06df22c54c75211e84e85b555ff8006a8923eb600957b3a686a3e02c99393a8cafc0292593a4fa03e6f953c2ff179083c127dfc47456 WHIRLPOOL de7adb46ceb10b20e1071ed54f61db34c304fb716e6c1fc2af70f57f320d0d4e7d4ced383bea5fe2b3dcefc5595d9f3039e40eecb304c1fbff2732ce42b2845e
+MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/media-sound/dcaenc/dcaenc-2-r1.ebuild b/media-sound/dcaenc/dcaenc-2-r1.ebuild
new file mode 100644
index 000000000000..18cb16497e2a
--- /dev/null
+++ b/media-sound/dcaenc/dcaenc-2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} == 9999* ]]; then
+AUTOTOOLS_AUTORECONF=1
+EGIT_REPO_URI="git://gitorious.org/dtsenc/dtsenc.git"
+else
+SRC_URI="http://aepatrakov.narod.ru/olderfiles/1/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools autotools-multilib
+
+[[ ${PV} == 9999* ]] && inherit git-r3
+
+DESCRIPTION="DTS Coherent Acoustics audio encoder"
+HOMEPAGE="http://aepatrakov.narod.ru/index/0-2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="alsa"
+
+RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/media-sound/dcaenc/dcaenc-2.ebuild b/media-sound/dcaenc/dcaenc-2.ebuild
new file mode 100644
index 000000000000..d07ff3684592
--- /dev/null
+++ b/media-sound/dcaenc/dcaenc-2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="DTS Coherent Acoustics audio encoder"
+HOMEPAGE="http://aepatrakov.narod.ru/index/0-2"
+SRC_URI="http://aepatrakov.narod.ru/olderfiles/1/${P}.tar.gz"
+LICENSE="LGPL-2.1+"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa"
+
+DEPEND="alsa? ( media-libs/alsa-lib )"
diff --git a/media-sound/dcaenc/dcaenc-9999.ebuild b/media-sound/dcaenc/dcaenc-9999.ebuild
new file mode 100644
index 000000000000..18cb16497e2a
--- /dev/null
+++ b/media-sound/dcaenc/dcaenc-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} == 9999* ]]; then
+AUTOTOOLS_AUTORECONF=1
+EGIT_REPO_URI="git://gitorious.org/dtsenc/dtsenc.git"
+else
+SRC_URI="http://aepatrakov.narod.ru/olderfiles/1/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+fi
+
+inherit autotools autotools-multilib
+
+[[ ${PV} == 9999* ]] && inherit git-r3
+
+DESCRIPTION="DTS Coherent Acoustics audio encoder"
+HOMEPAGE="http://aepatrakov.narod.ru/index/0-2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="alsa"
+
+RDEPEND="alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/media-sound/dcaenc/metadata.xml b/media-sound/dcaenc/metadata.xml
new file mode 100644
index 000000000000..39626a990be5
--- /dev/null
+++ b/media-sound/dcaenc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/dcd/Manifest b/media-sound/dcd/Manifest
new file mode 100644
index 000000000000..942d3ddfaf22
--- /dev/null
+++ b/media-sound/dcd/Manifest
@@ -0,0 +1,6 @@
+AUX dcd-0.95-makefile.patch 393 SHA256 f6d89f91b04fd91d8951f077d147cea2e68ed14e1bbc862cce6da43d29d64a47 SHA512 fe2114a891ca1ab16a9ec352b381410ec85c974eb9b2d82acae87e757f62bc4e9b0bf107d0ef7e3dc20b54a50f3fe9655b312498ac0ff173d0d36cb98a009c8d WHIRLPOOL b7b446eeffea0aaad1d570b61ae97122b4671d8b7a06b50f37623ada26037d3cc3ccdc5f680f4a2919de4626545bb4a598db7cc8ec9e2fbec9c9a4860ae7982e
+DIST dcd-0.95.tar.bz2 33620 SHA256 6fc5b1e0b21fb299d52ea4d70d5a2c09172c3b939913d1b605afe8c48ca8bd41 SHA512 12e9af435ba857e6b3f65881303ff72b349f0645b2649ffb39b17ffa4ab7f16e0f84d385f24cfd32e386185d78abc575cf326a05febfe0acc56b286a64ac6ff2 WHIRLPOOL 94ad10c0807cd1326e464421d89bbf6d43f057b6ec1802c949b4384277a389d2ee1ef5320e15aab74de7e2eea679e3d424b7c83fda625ff7a63805dc36761f11
+EBUILD dcd-0.95.ebuild 660 SHA256 b47b49412782112e48942894ffa4c368aa249add33cd7914d2c81feb2543d465 SHA512 ddc87d0b4d9ba62dfd03d34ee3a9ad68e294f68cd29393e4804a6ab319deea39d7dfd8ae52ad775ef98dafc4770c8ea0da4a1df72126117e8f6bacb95ce61eac WHIRLPOOL c2092c23a525c8d6c9ac0726c6fccfa75fe37ca96abf6bf1ecf7bf1f11c7ae73193a5857a4b5ff042fb2b3a813c680d4933a47ee8f942e6f2a061a770def728e
+MISC ChangeLog 2448 SHA256 a3fc9d8e9aaadf86dd16bd333cf2b73d990f0ceecb0187276d05341200939957 SHA512 d0f5aa92d0b6a0448208848de7f9412bf0b75f3f69d1ffe3fbecbd3df3c794e6eae3ef162fbc2fdba27c207228df99fb7c329d359522c07ee8b42033cfb08088 WHIRLPOOL 6b038d6998b45714900e5085a4fe39f38b233c44a7023d6f7c0f9990b51ebec95d8debc325cc581bedea83fdbfc4252cf5b5dbfa3945a3f6f911bdd718bd1a2a
+MISC ChangeLog-2015 1786 SHA256 813921449e7658cc61cb8061275b897e28fefebfef3a0934680db873607758cc SHA512 d26c8ba840221c13d57073c3b9609de523be6609ce9a79849d18d93589a26a9a56a9324b9e52648c622204444bb4bda22ae9ffae7b3e2d8ecf97f6dd3ebc9014 WHIRLPOOL adf30599921ee510c8254f4fd0cf48d46cb9ea6ac2a728d9d182fa1f5b6a9fa13e7a2c00f6f6bddf7f42b139e8b60ed1e6007feebc164aa16495e0d36fec331b
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/dcd/dcd-0.95.ebuild b/media-sound/dcd/dcd-0.95.ebuild
new file mode 100644
index 000000000000..9c6b1594a85d
--- /dev/null
+++ b/media-sound/dcd/dcd-0.95.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A simple command-line based CD Player"
+HOMEPAGE="http://www.technopagan.org/dcd"
+SRC_URI="http://www.technopagan.org/dcd/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CDROM="/dev/cdrom" EXTRA_CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin dcd || die "dobin failed"
+	doman dcd.1
+	dodoc README BUGS ChangeLog
+}
diff --git a/media-sound/dcd/files/dcd-0.95-makefile.patch b/media-sound/dcd/files/dcd-0.95-makefile.patch
new file mode 100644
index 000000000000..b59fedb6180c
--- /dev/null
+++ b/media-sound/dcd/files/dcd-0.95-makefile.patch
@@ -0,0 +1,13 @@
+Index: dcd-0.95/Makefile
+===================================================================
+--- dcd-0.95.orig/Makefile
++++ dcd-0.95/Makefile
+@@ -114,7 +114,7 @@ all: ${PROGS}
+ 	$(CC) -c $(CFLAGS) ${EXTRA_CFLAGS} $< -o $@
+  
+ ${PROGS}: ${OBJECTS}
+-	${CC} ${CFLAGS} ${EXTRA_CFLAGS} ${OBJECTS} -o $@
++	${CC} ${CFLAGS} ${LDFLAGS} ${EXTRA_CFLAGS} ${OBJECTS} -o $@
+ 
+ clean:;
+ 	-${RM} *.o ${PROGS}
diff --git a/media-sound/dcd/metadata.xml b/media-sound/dcd/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/dcd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/declick/Manifest b/media-sound/declick/Manifest
new file mode 100644
index 000000000000..7357bc3c1e70
--- /dev/null
+++ b/media-sound/declick/Manifest
@@ -0,0 +1,5 @@
+DIST declick-0.6.5.tar.gz 17932 SHA256 ce049078fd39ee68da9297cf0fa05ebce48c242934db8da1b87c2a6cdc985786 SHA512 d5605f092ceda2781a6c22fd6babf99e43529982f8b546bdc7f68455c6c09c635e2b5d36c9568e2e895a63e7a5308120807da613af5b8454b4dd986bf5f00b74 WHIRLPOOL 441412256c579fb9824b4b869daf84bd9e33b42212ccb95e5cc67b179bdf4190df42d9e18118562e1fa3e38cb5778ffd3ba048dfbff95953e1f35a3c559c3670
+EBUILD declick-0.6.5.ebuild 854 SHA256 8f131b5ab975fded4ac868fe8ffd6fdce70ee01c97794eec73af5126370bcdf4 SHA512 98fc5d3f69cc63ec112ad4b389b889197f0c1f8bf812ddbc06f78459dd1ddc34e8ee16dd4aba4d5b0f804319a85d2a0f5f7eb98d4719c5483c890b197de37b6b WHIRLPOOL f16f845b22c1abc83b43d39ed20ada57588a579ea375904e711cd1a04b53734c9156ac304a1e017c2314a4707c74feabd4ead7934bec7cfee7017845058b4a7b
+MISC ChangeLog 2525 SHA256 51ab1827a4af19a3f94d796bdb6eb71b4bbfc40f74cda17aae03b1b3c7f878c6 SHA512 4ba16cfd255b1ec7ab3599fd8f57a6e652026e486309434775549129b07777e893a566ddcaff239da7c0613f3868c09cf4e814e26b5a1ee1e13ea158171509e4 WHIRLPOOL a4bc7f95da2dbeddb79bcfffa4c5185eeabebbb756b79d90aba5a637e34d3a7bb7a4b0e689119134fbb382c30d2b9735d013bf1c36ee12b8bb7fb314180e4202
+MISC ChangeLog-2015 913 SHA256 42feda00a784c8ab6942744a0eb0e3bce0a5edb273c407701c6de88b1b8ce49e SHA512 2aea84b7006131b52f80174e27dd4e7d3b70cc216506afdcc0f3c984a2780122900a4fcaf4b64ceab6b6478adf896513eb2a0c6fa7bcf9e3ce4d1d458960c379 WHIRLPOOL aaf9296864ebd6ce888765139c1f281c3b3dc60342f5d8b54e7b4492349713cd515845581098a5f00fa242f35c7c41f611cc32414a7f80c43088889ed8cc0fe1
+MISC metadata.xml 524 SHA256 0c7bfd538f02612684a7861b1679deeff99a1e1dedbb26b315cfe6a66bab4e90 SHA512 45900b6dbe08a3bb653e8b5a0ceee6630755c032fc5bf52e53af66ef9ae0a4ab7d203b2238504de47eff95d1c3f56597a15907c97b2601b7f74171ed8136c09b WHIRLPOOL cc01942de97644bfea5ee13c59e089ca78d502b070acdd687e4352d7395adb10decc3f9ba99ca55dad078651303e148389e4125dfabc5e91b60385d8f6b6a1f4
diff --git a/media-sound/declick/declick-0.6.5.ebuild b/media-sound/declick/declick-0.6.5.ebuild
new file mode 100644
index 000000000000..e680690eb326
--- /dev/null
+++ b/media-sound/declick/declick-0.6.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="declick is a dynamic digital declicker for audio sample files"
+HOMEPAGE="http://home.snafu.de/wahlm/dl8hbs/declick.html"
+SRC_URI="http://home.snafu.de/wahlm/dl8hbs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+DEPEND=""
+
+src_prepare() {
+	# add $LDFLAGS to link command
+	sed -i -e "s:\(-o declick\):\$(LDFLAGS) \1:g" Makefile
+
+	# convert docs to utf-8
+	if [ -x "$(type -p iconv)" ]; then
+		for X in README; do
+			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" || rm -f "${X}~"
+		done
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" COPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" declick || die "emake failed"
+}
+
+src_install() {
+	dobin declick
+	dodoc README
+}
diff --git a/media-sound/declick/metadata.xml b/media-sound/declick/metadata.xml
new file mode 100644
index 000000000000..ac844abfd21d
--- /dev/null
+++ b/media-sound/declick/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		The main purpose of declick is the removal of digital clicks in the
+		input material. It is intended for the automatic removal of clicks
+		produced by scratched CDs or poorly working CD grabbers, for example
+		when using an IDE CD-ROM. It is not designed to remove analogue clicks
+		as from scratched LPs.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
new file mode 100644
index 000000000000..0e107e34188b
--- /dev/null
+++ b/media-sound/denemo/Manifest
@@ -0,0 +1,8 @@
+AUX denemo-0.9.6-desktop.patch 297 SHA256 62fa7a062d9d734fc0d9c9ad93a60509dec359aeb080cc187622502641733279 SHA512 0a9bc51fc0cd45a1c3e4f5d88f6ea5b147dd733a364b756d02e112ad0254b1d3a6de3217b71ed4aa26699c9961f1c3206777363ef861a924c65912d9b1f563a2 WHIRLPOOL 0319a509bd6de90b69d3ed6509d652eac35e41710cc503907e38e037fd43301ce0fc91312231b9264da71168fd5bad9f3c454fe4e7a54bed33ac38e125a01a25
+DIST denemo-1.0.0.tar.gz 13810392 SHA256 a13795e7ad17753b9db5886a6deb6abad7de3f16dc19a592c99dbd4237076945 SHA512 38a1b8d8a08495e0103b88802843465148a1ec6aaf49c5b2d71e58c662579f5ab25e06eba1e6855e3eb21f6f4a11efeb97196a6759a587ec5b3f3fac698eef30 WHIRLPOOL 113b5217c51a013089aefeef40c2cc703c91de9bb671b654ab87a0c887ec7e9c7bb717095edb4cd13444d7e538ac22790501cf943663a8742aae11d5bc9d6785
+DIST denemo-1.0.2.tar.gz 13923398 SHA256 274f807c52a9ad518e79999dcca8a1c3f249608eee692c061454a07963c0c14a SHA512 f6f642af1385a8020f8d64a7c9da31d8f61e1dc01f221709b31c081640f99b367d2bbb5b6dffb6be6cef21fc2b423618ddef8965398850d60a5f0113f98d1f55 WHIRLPOOL 16207a7c85e1ef82f9034a74aa8bb7749ca2586f684b4111e589fc7d96e7ff34b3e33c00006d1133900cfbc73913a64f7f41e66072a58294c585eb8e5927db09
+EBUILD denemo-1.0.0.ebuild 1486 SHA256 cf748715f43a8803614bc0571ea6f39342a9eee009f297447bd17f2963303ff4 SHA512 611856732e9a506fe8111b3e367aeb1055b5554c8835851f41ae08f164138f3e169d9f761cfcdd87e76afb58bd895401093080076ea8a087ad8ffa6f4a3a5736 WHIRLPOOL 655c55d01c1bd282bbd8add3f460fd4bdbebd93e0ef6c539e7e0bbd37336cd68c43f5ecca66ef0773026818eb17f682a2b54fdf28ea44d3b7664dbf42b699644
+EBUILD denemo-1.0.2.ebuild 1486 SHA256 cf748715f43a8803614bc0571ea6f39342a9eee009f297447bd17f2963303ff4 SHA512 611856732e9a506fe8111b3e367aeb1055b5554c8835851f41ae08f164138f3e169d9f761cfcdd87e76afb58bd895401093080076ea8a087ad8ffa6f4a3a5736 WHIRLPOOL 655c55d01c1bd282bbd8add3f460fd4bdbebd93e0ef6c539e7e0bbd37336cd68c43f5ecca66ef0773026818eb17f682a2b54fdf28ea44d3b7664dbf42b699644
+MISC ChangeLog 2800 SHA256 72a5b2bc758614e7e4c77e95d6a1904e1a9ff6e15fb3ec4ad7387675d469ba9c SHA512 09353e937a3d5cb434e41120ba80eaf0a1a6140a3f4dc5552147f706977896cbee0dacd5f36a720e2862e624e2c12200672a61121dfc7419c734beeb1137ff72 WHIRLPOOL 65e25b43a6e195bafd0dc2297e0a9afab4954196652c1911b5548e6072e22250d15c756090a3bc94996bf501d64050c6e3f986471d88a839e652667a9564bf56
+MISC ChangeLog-2015 6079 SHA256 29968df2649274a5375c061e5752ec7377fa2772fe65cad2a77f6ee27690f687 SHA512 9fb1eeade5ba972ca01aa1de35f1002319d916b7c56cd546fa1fd2b0fbaf64b6ea848438d53672f811b0e9b2cd7db69d687ddeac70e7773d52c8b6b7f9207339 WHIRLPOOL 19a7b20f87fcb08ba29f1d94d1d518b4eee4dd0f9830ad3838dbdffecad311466531fd7f127cedc8092461fac7ebaa56c99e26d7339f96933d721863f0f6678d
+MISC metadata.xml 406 SHA256 2a6972cfb97e823c24b1aedc3b99519bd6f945efde154dae05b3830f313ff586 SHA512 61df8bac3cda4177ab47ae946ad4241ee4f281554ec4c00711c1a4eee10b2c729941002a00fbb54db9b2088d489fb72bda8b816d431799d1be24076d95d56d4b WHIRLPOOL 65c7ef54a9f3072d460cb07a78330ce82fdcebf42df983916f98af2563f5557ead3fc34ff9d381989612578f0fab2e0cdb93bd570132e1f940c5f31d971d9025
diff --git a/media-sound/denemo/denemo-1.0.0.ebuild b/media-sound/denemo/denemo-1.0.0.ebuild
new file mode 100644
index 000000000000..de6b3f32da22
--- /dev/null
+++ b/media-sound/denemo/denemo-1.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils fdo-mime
+
+DESCRIPTION="A music notation editor"
+HOMEPAGE="http://www.denemo.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack +fluidsynth nls +portaudio portmidi"
+
+COMMON_DEPEND="
+	>=app-text/evince-3
+	dev-libs/libxml2:2
+	>=dev-scheme/guile-1.8
+	gnome-base/librsvg:2
+	media-libs/fontconfig:1.0
+	>=media-libs/libsmf-1.3
+	media-libs/libsndfile
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.102 )
+	fluidsynth? ( media-sound/fluidsynth )
+	portaudio? (
+		media-libs/portaudio
+		media-libs/aubio
+		sci-libs/fftw:3.0
+		media-libs/libsamplerate
+	)
+	portmidi? ( media-libs/portmidi )"
+RDEPEND="${COMMON_DEPEND}
+	media-sound/lilypond"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog doc/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.6-desktop.patch
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-gtk3 \
+		$(use_enable alsa) \
+		$(use_enable fluidsynth) \
+		$(use_enable jack) \
+		$(use_enable nls) \
+		$(use_enable portaudio) \
+		$(use_enable portmidi) \
+		--enable-x11
+}
+
+pkg_postinst() { fdo-mime_desktop_database_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; }
diff --git a/media-sound/denemo/denemo-1.0.2.ebuild b/media-sound/denemo/denemo-1.0.2.ebuild
new file mode 100644
index 000000000000..de6b3f32da22
--- /dev/null
+++ b/media-sound/denemo/denemo-1.0.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils fdo-mime
+
+DESCRIPTION="A music notation editor"
+HOMEPAGE="http://www.denemo.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack +fluidsynth nls +portaudio portmidi"
+
+COMMON_DEPEND="
+	>=app-text/evince-3
+	dev-libs/libxml2:2
+	>=dev-scheme/guile-1.8
+	gnome-base/librsvg:2
+	media-libs/fontconfig:1.0
+	>=media-libs/libsmf-1.3
+	media-libs/libsndfile
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.102 )
+	fluidsynth? ( media-sound/fluidsynth )
+	portaudio? (
+		media-libs/portaudio
+		media-libs/aubio
+		sci-libs/fftw:3.0
+		media-libs/libsamplerate
+	)
+	portmidi? ( media-libs/portmidi )"
+RDEPEND="${COMMON_DEPEND}
+	media-sound/lilypond"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog doc/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.9.6-desktop.patch
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-gtk3 \
+		$(use_enable alsa) \
+		$(use_enable fluidsynth) \
+		$(use_enable jack) \
+		$(use_enable nls) \
+		$(use_enable portaudio) \
+		$(use_enable portmidi) \
+		--enable-x11
+}
+
+pkg_postinst() { fdo-mime_desktop_database_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; }
diff --git a/media-sound/denemo/files/denemo-0.9.6-desktop.patch b/media-sound/denemo/files/denemo-0.9.6-desktop.patch
new file mode 100644
index 000000000000..ade8c4595ed0
--- /dev/null
+++ b/media-sound/denemo/files/denemo-0.9.6-desktop.patch
@@ -0,0 +1,11 @@
+--- denemo-0.9.6/pixmaps/denemo.desktop
++++ denemo-0.9.6/pixmaps/denemo.desktop
+@@ -4,7 +4,7 @@
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Audio;AudioVideo;Music;Education
++Categories=GNOME;GTK;Audio;AudioVideo;Music;Education;
+ 
+ Name=GNU Denemo
+ Name[de]=GNU Denemo
diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
new file mode 100644
index 000000000000..056cd93b5bd8
--- /dev/null
+++ b/media-sound/denemo/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+<use>
+	<flag name="fluidsynth">Enable Fluidsynth MIDI software synthesis</flag>
+	<flag name="portmidi">Enable support for the portmidi backend</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
new file mode 100644
index 000000000000..f6597843ec63
--- /dev/null
+++ b/media-sound/din/Manifest
@@ -0,0 +1,9 @@
+AUX din-5.2.1-desktop.patch 226 SHA256 49d132be87291fd5b99d03ca4448cdf2a203ca4b9402197426e0da83b45f7e80 SHA512 fe6d1e8774232077cfa585f79fcfcf4ac441a61b5f9d3f556e526094fd7a049530ebd028ec0d18807335038d0e65809726fe59ee4b7c1f32811b4b349d00e76b WHIRLPOOL 4fcee081af7da92578190b005d087bd6666ec87033f6d1199a94dec11f1228787eaa8a98ef17dfc1116a410bb20161154600bff1f95b97233634d84ae79c710d
+AUX din-5.2.1-makefile.patch 691 SHA256 d6aa5a03a6298f007f191bc9d5093201fda097d20e9b1817c81f7661a28192d6 SHA512 dbb0390dacd7aed6320955b9573e9c09ce88b0297ffd28e38fd6f1d9ab0b875dde6e2bbc8b38e87eefd5aa790cd2a6c817dd39a3d5919cb2e1404ace99cf4cff WHIRLPOOL cbba0e73bd705d8c643a1b663f32fe557a00709ac3745aadb5ebe65cc5edcf956610a59ff22f259d7c49ff5e1ab8a7eb142d958c2700351884a6001151279ba0
+AUX din-5.2.1-tcl.patch 644 SHA256 1769288c792119aa7267881dda40b5c81453bc27239206179d53a485df0de441 SHA512 ac7f1b63bd90c04ba89651c9932b25368db57e143177d14a93c7b750426c60f91a8127d576562b3e61af855ef7f8c352a149dcbff6469a27dd05774d133d21ea WHIRLPOOL 7d46c5dca9b126c51a7ad550bb6242614e9605a26be62d1f7d58e3853fb8d638a2028be301a5ffd025fed90e3642be74934db7fbaf543e4cafa5b95db0100af8
+AUX fix-random-constants.patch 1279 SHA256 a8ade3c31751368f151d76a0c7b712a3c7937842ec27fba85f88d086d8ead238 SHA512 0cf71beed7e46fc83fdf7360b4cc7fd2c8f26f5d3a2c7a43d39454b79f3d63b71dbf056b3f61b8b53c363e50e2506a92b891715667bf32b251b668251da5e058 WHIRLPOOL 5bb47fbee372d8e1b8148605f4469bd9589456d8362b0f38bbc5525781614bf3881e4e6a0b11a43be774813814f276d83ad3ece8121ec479dccd878b93016b8e
+DIST din-5.2.1.tar.gz 321269 SHA256 ef2485963a2435256dcb099364918c2cb0560701bf4f374738f9c54a2c316447 SHA512 0fa7de383c869f9f55ee055f821f3b541ca7df83d61f9bdb6b9e0227a724abe098073985cb4f3eb381199d4baa84d9ee2b86b74614e11cb8b58b119230ca3c09 WHIRLPOOL 762fb7b5e7908da31737929d607c16a538071137fc9f50fd1be7d2c81bb190f68b82f7321b2cfa8c8e1232dddb7178ed263fd5c4ce0f90c98bbf6107e5d91466
+EBUILD din-5.2.1.ebuild 842 SHA256 a0c14c516e3f06385a93818ca55ea4167a659b93a4dd86c224a69f6ba94085ab SHA512 f01c83f185bf3a08e4bbf66de498849b16e05e96a081228b33a0237ad964c439f367307615115a64081d47babf2c81cd379f9b72258b641415f4aaa958c02e4d WHIRLPOOL 08b8adf9be0d4e4c1706caffd320c0fa7428bd6bf10537f5f9d87fa5a2a0e9cc86ed21d6fcc4bffd7cce58e5dca8b02559b7ad59a2628f1188db2880dae4316d
+MISC ChangeLog 2672 SHA256 8c186bc5863ba23b76bb5ebbffd424981ff4e0eee2159e0e4b8ac50438524e90 SHA512 6fb89dcb5e1291abe455d6761cecc6d363ccf7c35c50277d61a4c9fd30308bf52c4dd438fbcc73031899b3a4f5e16c096e06a8b8c5cfd05a4eb759b6058a8890 WHIRLPOOL 5d40fbcfbdc24031816f13bb9140614408a5f31ecd1581491db0dd5be8af7447b1ff0b9ca4d766fb1293655a3cf3cfcd066b4565bf4825814338a22dfd9cf55e
+MISC ChangeLog-2015 513 SHA256 2f7459b3787a81d9895044e726f58632e6eb719da56ac5ad4e59bbac0f6f7cd8 SHA512 5beff22baf66b77d8c04369a217c24fd1c02307e34472db6d77eb445fabc6c7f415fa35fdf2efb425a53100f8e1fbcf7442fa031356f742da8b3b6d1549f73dc WHIRLPOOL ff1657eff900c3d43a0043db51fb2ab6c10b35fe2587548ac6cd07ffdef416b2b80fd8d2a13451274abe19af8f7caef6c6acbde8420b6b2211c8915d848a740e
+MISC metadata.xml 255 SHA256 fc6dd027d0011f9f42d437ea0687857760a11bf2137f8822ec8692186d0bcbe3 SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 WHIRLPOOL de03966b13986c67a61f862755281e80740260a9031e5e34cbee88a3053e66f705df0f36499b154744ff447c94e19a28b8649535e08819216569e78eb4ce9a38
diff --git a/media-sound/din/din-5.2.1.ebuild b/media-sound/din/din-5.2.1.ebuild
new file mode 100644
index 000000000000..592a773fe05f
--- /dev/null
+++ b/media-sound/din/din-5.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="a software musical instrument and audio synthesizer"
+HOMEPAGE="http://dinisnoise.org/"
+SRC_URI="https://din.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	media-libs/liblo
+	media-sound/jack-audio-connection-kit
+	net-libs/libircclient
+	sci-libs/fftw:3.0
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-tcl.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/fix-random-constants.patch
+
+	# force script to be regenerated so it uses the right data path
+	rm data/checkdotdin || die
+
+	eautoreconf
+}
diff --git a/media-sound/din/files/din-5.2.1-desktop.patch b/media-sound/din/files/din-5.2.1-desktop.patch
new file mode 100644
index 000000000000..e9bd7a62bc56
--- /dev/null
+++ b/media-sound/din/files/din-5.2.1-desktop.patch
@@ -0,0 +1,8 @@
+--- din-5.2.1/data/din.desktop
++++ din-5.2.1/data/din.desktop
+@@ -8,4 +8,4 @@
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=Application;AudioVideo;Audio;Midi;Music;
++Categories=AudioVideo;Audio;Midi;Music;
diff --git a/media-sound/din/files/din-5.2.1-makefile.patch b/media-sound/din/files/din-5.2.1-makefile.patch
new file mode 100644
index 000000000000..1f79f82ce495
--- /dev/null
+++ b/media-sound/din/files/din-5.2.1-makefile.patch
@@ -0,0 +1,10 @@
+--- din-5.2.1/src/Makefile.am
++++ din-5.2.1/src/Makefile.am
+@@ -1,5 +1,5 @@
+-AM_CXXFLAGS = $(liblo_CFLAGS) $(jack_CFLAGS) $(fftw3f_CFLAGS) -I /usr/include -I /usr/local/include -I /opt/include -I/usr/include/tcl8.5 -I/usr/local/include/tcl8.5 -I /opt/include/tcl8.5 -I ../include  -Wall -O3
+-LIBS += $(liblo_LIBS) $(jack_LIBS) $(fftw3f_LIBS) -L/usr/lib/tcl8.5 -L/usr/local/lib/tcl8.5 -L /opt/lib/tcl8.5 -L /usr/lib -L /opt/lib -L /usr/local/lib -ltcl8.5 -lGL -lircclient -lrt -lX11
++AM_CXXFLAGS = $(liblo_CFLAGS) $(jack_CFLAGS) $(fftw3f_CFLAGS) -I /usr/include -I ../include  -Wall
++LIBS += $(liblo_LIBS) $(jack_LIBS) $(fftw3f_LIBS) -ltcl -lGL -lircclient -lrt -lX11
+ 
+ bin_PROGRAMS = din
+ 
diff --git a/media-sound/din/files/din-5.2.1-tcl.patch b/media-sound/din/files/din-5.2.1-tcl.patch
new file mode 100644
index 000000000000..a5582f1bba15
--- /dev/null
+++ b/media-sound/din/files/din-5.2.1-tcl.patch
@@ -0,0 +1,11 @@
+--- din-5.2.1/configure.ac
++++ din-5.2.1/configure.ac
+@@ -3,7 +3,7 @@
+ AC_CONFIG_SRCDIR([configure.ac])
+ AC_PROG_CXX
+ AC_CHECK_HEADERS([GL/gl.h],AC_MSG_NOTICE([+++ Found OpenGL +++]),[AC_MSG_ERROR([!!! Please install OpenGL !!!])])
+-AC_CHECK_HEADERS([tcl.h] [tcl8.5/tcl.h],AC_MSG_NOTICE([+++ Found Tcl 8.5 +++]),[AC_MSG_WARN([!!! Is Tcl 8.5 installed? !!!])])
++AC_CHECK_HEADERS([tcl.h], AC_MSG_NOTICE([+++ Found Tcl +++]),[AC_MSG_ERROR([!!! Please install Tcl !!!])])
+ AC_CHECK_HEADERS([libircclient/libircclient.h],,[AC_MSG_ERROR([!!! Please install libircclient !!!])])
+ PKG_CHECK_MODULES([liblo], [liblo])
+ PKG_CHECK_MODULES([jack], [jack])
diff --git a/media-sound/din/files/fix-random-constants.patch b/media-sound/din/files/fix-random-constants.patch
new file mode 100644
index 000000000000..f055b10140d6
--- /dev/null
+++ b/media-sound/din/files/fix-random-constants.patch
@@ -0,0 +1,30 @@
+Description: Redefine some constants in include/random.h as unsigned
+ These constants are used with unsigned variables, so redefine them
+ for consistency.
+ .
+ This also fixes compilation errors under C++11: In C++11, array initialization
+ is considered list initialization and so prohibits narrowing conversions
+ (from negative signed values to unsigned).
+Author: Philip Chung <philipchung1995@yahoo.com>
+Bug-Debian: https://bugs.debian.org/811778
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ include/random.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- din-5.2.1.orig/include/random.h
++++ din-5.2.1/include/random.h
+@@ -28,9 +28,9 @@
+ 
+ const int N = 624;
+ const int M = 397;
+-const int MATRIX_A = 0x9908b0df; /* constant vector a */
+-const int UPPER_MASK = 0x80000000; /* most significant w-r bits */
+-const int LOWER_MASK = 0x7fffffff; /* least significant r bits */
++const unsigned int MATRIX_A = 0x9908b0df; /* constant vector a */
++const unsigned int UPPER_MASK = 0x80000000; /* most significant w-r bits */
++const unsigned int LOWER_MASK = 0x7fffffff; /* least significant r bits */
+ 
+ static unsigned int mt[N]; /* the array for the state vector  */
+ static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */
diff --git a/media-sound/din/metadata.xml b/media-sound/din/metadata.xml
new file mode 100644
index 000000000000..f79bb67acbd9
--- /dev/null
+++ b/media-sound/din/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
new file mode 100644
index 000000000000..57b9d6973bc6
--- /dev/null
+++ b/media-sound/dir2ogg/Manifest
@@ -0,0 +1,7 @@
+DIST dir2ogg-0.11.6.tar.gz 19442 SHA256 cd3b6baa42a5ee0acde95f2ef41a2a56d9fd6be1c9877e8bba2bf15834f935dc SHA512 c5b82640b21e5c94bf15ae174b1351bab11511fee15c30ba39f8ac64103fd5f6934687eb5c025f68adb3e70701f1b644f61800e2d745e33ecb02005f07b6c6b0 WHIRLPOOL e9270627f1f395af0becd5c7d900b7d2d65f5aef701bf578983212dcadddb5638f9ee4063098b9d86e51807ca389ff5fc044584fd3361dc2968fe9c2f56aa5fe
+DIST dir2ogg-0.11.8.tar.gz 21145 SHA256 0b6fd089fc1eb20cc92b7901c947ff6033ce04c897f9af9f962fa421a67ba7e0 SHA512 44275ab5b1bda26e2148b24a1b9fc49ee09e6f2848c1e62d13da12369e28a1f787c695c1547b002f13e1733d14984bf3ca0c425d60ace8bda69f0de28af0ed8f WHIRLPOOL e1e5bcb116e706ce90a63f661f6a20234a7fc350207a021392e9983f343c439d5a0471ac42b0114f47a74e7e93d6f589126cf4789ee69d455e459936d65f7600
+EBUILD dir2ogg-0.11.6.ebuild 864 SHA256 32ea9c2c37b7df0b23a9d220b92657b57a691c3224f10d01b048c0856243ef95 SHA512 8278a5b5efb9f3275fbd768a400882b2327b67df04dc882fcf55d945fcce08a1ab27f9272020ef6475c14fd46c292186c8c94bc2694f5643f97731da7039f144 WHIRLPOOL 457103ce868986eb456e199c78bf1bb667bfbaf099e703539680038e2c2434ed44752e6f45c804612f8f428fbb1e3657d8a56c49ee7e9119ddab65c44e1ba0a5
+EBUILD dir2ogg-0.11.8-r1.ebuild 1197 SHA256 ec18eb7461146b66c4189a138291f27f32158d84e60cf66e9cbce270d535066a SHA512 1594417a158e9b3ee93cd435b7bdb29c2fcf55304cad2c265c3ace3485e793d99c0fb82010e0737f41f93244d2aa1f698ebd70153a5b9760ce3d88ea1e36a6b1 WHIRLPOOL 00972bda173a68308783738bab7094548bbeb450f386dc42c862fd2f39eb1d1cd79374e8069eda7d89499f270a682bbc8a07a703514132bc555631b3ce52cdb3
+MISC ChangeLog 2492 SHA256 a20ab2d3bf086c05eab3ddaa7ac1c3d961ee43bb63544eb74c3afcaea5469faf SHA512 440a50327df510c2ccec90b0920926f0ed882916e344de7002f31d9c4d6c592d6a41968ad9e355905c2c820e75df6bd0aebedbe2db893f92cd4ed269c42450c7 WHIRLPOOL 235b99854000c642ec7ba4379fda913ddd6b63cb331daa3888d262795c6638f4ea430c9ecbe03a3e64a08785377fa2f5946f4b201d200fe3eb85c9e4e71dae94
+MISC ChangeLog-2015 5463 SHA256 4ba4efb4285c0e6b51807eee8011a58962cbd0f90d1d757799bf9f4fa5e540a0 SHA512 257c479b483c116e2349c60b4a2fd3f055f0238b96996d104590bb90cef103ca643c958326ca362bdbdf627213bb58a56bb4d3beff22f5cc4cef67a5b1cf2ba9 WHIRLPOOL cc99b768b89610ad169c9e3f1e716fdb6e38e415be59d6b80bfefc035dcef3ab4099769635b6c8828c8e6d07d568069c2cc0d55e2056f2e4ea6662971e0e1150
+MISC metadata.xml 420 SHA256 918ca89f0870f503660ebf45ead3ab53f8430ac4eb0279530ff7ea10a95b7a0e SHA512 3c87da9d9f935209757f3731cb1b80817d28eab005b9ce29cc5113e3ad063e61666d1e00585e709b77f1ba3aca5703f4c9f64100c075062cddf58c2f72edc074 WHIRLPOOL 34581aaaff45ba230ea094b55270bf8dd41825bc4e7b109c883f09a24fca6448d9427ae8af184327d7a4e46e7f1d4437f2d37656d9e08babaa070a728d3b341d
diff --git a/media-sound/dir2ogg/dir2ogg-0.11.6.ebuild b/media-sound/dir2ogg/dir2ogg-0.11.6.ebuild
new file mode 100644
index 000000000000..bc7b6cc67ac2
--- /dev/null
+++ b/media-sound/dir2ogg/dir2ogg-0.11.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit versionator
+
+MY_PR=$(get_version_component_range 1-2)
+
+DESCRIPTION="Converts mp3, m4a, wma, and wav files to Ogg Vorbis format"
+HOMEPAGE="http://jak-linux.org/projects/dir2ogg/"
+SRC_URI="http://jak-linux.org/projects/${PN}/${MY_PR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE="aac cdparanoia mp3 wma"
+
+DEPEND=""
+RDEPEND="dev-lang/python
+	dev-python/pyid3lib
+	media-sound/vorbis-tools
+	>=media-libs/mutagen-1.11
+	aac? ( media-libs/faad2 media-video/mplayer )
+	cdparanoia? ( media-sound/cdparanoia )
+	mp3? ( || ( media-sound/lame
+		media-sound/mpg123
+		media-sound/mpg321
+		media-video/mplayer ) )
+	wma? ( media-video/mplayer )"
+
+src_install() {
+	dobin ${PN} || die "dobin failed."
+	doman ${PN}.1
+	dodoc NEWS README
+}
diff --git a/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild
new file mode 100644
index 000000000000..6dce143a8128
--- /dev/null
+++ b/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit versionator
+
+MY_PR=$(get_version_component_range 1-2)
+
+DESCRIPTION="Converts mp3, m4a, wma, and wav files to Ogg Vorbis format"
+HOMEPAGE="http://jak-linux.org/projects/dir2ogg/"
+SRC_URI="http://jak-linux.org/projects/${PN}/${MY_PR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="aac cdparanoia flac mac mp3 musepack wavpack wma"
+
+RDEPEND=">=dev-lang/python-2.5
+	dev-python/pyid3lib
+	media-sound/vorbis-tools[ogg123]
+	>=media-libs/mutagen-1.11
+	aac? ( || ( media-libs/faad2
+		media-video/mplayer ) )
+	cdparanoia? ( || ( dev-libs/libcdio-paranoia
+		media-sound/cdparanoia ) )
+	flac? ( || ( media-libs/flac
+		media-video/mplayer ) )
+	mac? ( || ( media-sound/mac
+		media-video/mplayer ) )
+	mp3? ( || ( media-sound/mpg123
+		media-sound/lame
+		media-video/mplayer
+		media-sound/mpg321 ) )
+	musepack? ( || ( >=media-sound/musepack-tools-444
+		media-video/mplayer ) )
+	wavpack? ( || ( media-sound/wavpack
+		media-video/mplayer ) )
+	wma? ( media-video/mplayer )"
+DEPEND=""
+
+src_install() {
+	dobin dir2ogg || die
+	doman dir2ogg.1
+	dodoc NEWS README
+}
diff --git a/media-sound/dir2ogg/metadata.xml b/media-sound/dir2ogg/metadata.xml
new file mode 100644
index 000000000000..46aecfa8ee87
--- /dev/null
+++ b/media-sound/dir2ogg/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="mac">Add support for decoding Monkey's Audio files</flag>
+    <flag name="wma">Add support for wma files through mplayer</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
new file mode 100644
index 000000000000..6606ab946b43
--- /dev/null
+++ b/media-sound/drumstick/Manifest
@@ -0,0 +1,13 @@
+AUX 0.5.0-doc_automagicness.patch 743 SHA256 b6f66f77573c367dac672f50d9e4f14e576d47c4f10c7b24a28898b985914bfc SHA512 171913c74f329d468caafba723db7f6c531330013c20b3613e0320bc9336e639fa103e2010334f66d9b950721104aaf9bdc6cb2e4ed66162bab4bcbc3880d975 WHIRLPOOL 79c9765d6d7044a35f2d5a8c790a984cd2bbd7de36741022c19e1a31b557db238cf04571edb91e8504795f40d4a6b146451b5a1aa41117fa11e5df8768e2120a
+AUX 0.5.0-gcc6-narrowing.patch 1196 SHA256 827b949ab208d50bfec09e5821fc38eb12d680a7cc6d424f201904a92f1c8159 SHA512 f4eaa98b0b85f0d28ce273b03ed0fd3948f95e05918223a51b0f53c3a3e73d4d2e01b3aca6f6166a6e7b7712e36eaa1ce4d5d94811e36fa1292eacd4a770e342 WHIRLPOOL fcf55c69bc6897831b3a2e04eb9b9e6b43a730610de16965e0a9bef1498591eefbd0887441809f1db123bb56ca5050ae7b020f36ec68eea80596132e494e33a5
+AUX 0.5.0-underlinking.patch 368 SHA256 2ea4242dee90c18154ea959826dd6ea629ee17e07d97ede29d5656f20be0bef8 SHA512 1f015f2bac64ce84c075383c6c0997e761dcd3618d970f2c3f7dbd918a91511ac0db81ca6cb08647df019acdde3f330d04f492661f444c811af705f55249a450 WHIRLPOOL df2ba2c2826e5663cf8bd5e910b63ea0843b7a2ae5fd8a5dcd6006b161a296830a353845cad3d48f1f886acd2e0f7d876601e25e4c93663c39190c8dd4816201
+AUX drumstick-1.0.2-gcc6.patch 1900 SHA256 7e01de593eb93979c89d013bf493caf09065eb9577532645dac5f5766772929d SHA512 d8969aabee72d701bd69bed74ad1067537152b5a7ca0014b6fb56f7e0bdc29180d898aad61885ea85aa6b050f1026887a85f18f95eb2a05afbc3e0bfcf6bc0b1 WHIRLPOOL 285024e7d3ae1eace9507c51d9860db2dfcb5388ba0eb2d60e2fc9d5e58f03e07aa2bbfc32d54b022442af2aca1165b936de168f4e25d25b168a96f55b992f35
+DIST drumstick-0.5.0.tar.bz2 200914 SHA256 5a12bcf2a26dac7f2a5c9507c662c4c85556881c64bb55365dceb437cf3652cd SHA512 12078dbeae7166da210ccbbaee9d55b4c9e233fd317de72c20482466cd29987c976290efecd29cc28a5be6ed7e3b9fe95ddf1081d75222d9cf9d6aef13080a21 WHIRLPOOL 6d7b35259280aacf0ec414868068f136c39bb8e488848d110739481cbf6bb874cb46c95b98bc8f541185816ff81819494716e2706d9e6a59519bdc2e9520a425
+DIST drumstick-1.0.2.tar.bz2 233666 SHA256 34aab5812c35ba16f8e606632a56c38879f470e3e395d580412c73ef937f8750 SHA512 df8d36b58e83b1e06cd1e4788e63c504bf2282c26f505509b2125e6c7be8ce8bc013774755b68e36f372a8682328459a5efb67ff09be1e0190805528458b3e45 WHIRLPOOL 8dba872973649ece08b37447c76c96a7da4382075f9682be9e0bb9b491aec2eab9ba969abaaf9396abff3c98a9d0a224ae1b48e6bca093c305675133669c11de
+DIST drumstick-1.1.0.tar.bz2 1012405 SHA256 ae1d2c0d21b45d144e181b873ffbc2979a294fab31b8d71a5b0b8cad3276f38e SHA512 1099b80e1d2819a8343e877742c5f01c114419b2c63a965717bcff2c220aa218f40ac3860cf9496d3586663e73a6c2c7b62aee74c51229578a5ae3044da208da WHIRLPOOL fb070609049b329c1258dde8a8ff4e2ebcbec577d6fa46e59b51f39c8708a186976f94925a1407fc0ce92e77257f4133f811daf79258455fb9389d54b8044f9f
+EBUILD drumstick-0.5.0.ebuild 1244 SHA256 7fb87d5de11cd020f36afff7420514517d0402cd3d0ea165c2632566b9cbf099 SHA512 65a6041d7dde795f7d1bf857df2a5021b6ba2dff44ddfc0ea6c2a76c637ee488259f59a1b472956a97f2d21225692520a2d73b2716178eaae0f885fc371752d6 WHIRLPOOL 8d4be4281041a3269e1fa571f248db0010f51ec7ef0e24b777412195bfbc9ea5efc57bbf0bea790a3ea6a478e6ddf90db53adb804b3cf6d6f95698dc9c0af471
+EBUILD drumstick-1.0.2.ebuild 1310 SHA256 c59166ce714aa8d860fc9d26033e399d746a0403fcc6955902726c5933f844b5 SHA512 568c3b7a2345b7bfde09da866caa30f8c02a7b92e7ef23c55d9627c61c493f52a905bf71560e60510f1c68051fb1105f830eb02c1dd4b3e1c2021afe5622163b WHIRLPOOL 287a0ae31d79c00e831160282a9f0e944e9614f333d87236762523294e62420b541915295f1da4cb274433af033939152af5dfa8f0dbc461049bf33ac997d142
+EBUILD drumstick-1.1.0.ebuild 1777 SHA256 6b8ec4fbd17ff24061f62f8218da6771895ae9188112535c489a279c5756eede SHA512 dd790f04c44dbdaccf5de2fcfb3294875494eec004cd504beb9c0ba5726a7ca0616d732c650118d15795cd5b33cd3a819986b2ef73463a77d51954064f426d58 WHIRLPOOL 70ad68b05774517c3cb5230b8b522a104245c40a3a69513fe635f63e5ca5b0aae1861cd2ddfa7dc090ba48604e62452610ed0104761fd5fd937ee2b0f87738f9
+MISC ChangeLog 3757 SHA256 1ffe4cf39da74d362bef9380b9aa1d5fe52db49cc1c51c52074c10c12e022c70 SHA512 8e14235c795c5247da033082ff655e8a1193375e8dca37a5de2e3a0e77d33cc0d2054b33750412661f6578b3f735fcdab09a6dfc0af5fff4ced29d981f96b169 WHIRLPOOL 1cbc7c3e9f0f879c262fee50e2933dff82b28f5aadd1a6b4b858d25e9a23133f727765b2b16f18214373e55e32ce60061a6cca3ed0b618bad658b919abaecf6e
+MISC ChangeLog-2015 2296 SHA256 ed0b4564aa02cb7e3b908dea7f16b8c9856221a24cbc5e99a55d1bae29192e3d SHA512 69767b8368a5026b9548f0a2bbcbecb184a458e3eeef6865092ad301ceb61f8691da4ad3f56269693e437258b43b1b700ee72815c264c8088db0a62917c78dca WHIRLPOOL f66353be44748677eaf91d6a89406fcde451a51f996f251b6f3e95f9fcfa60285a90b2bd980205fc1b39cdca9cbf8adc5db403c3a5d5a61313a457b753a93586
+MISC metadata.xml 543 SHA256 fc425bdeeef3108b5575e65dd39ac205a7c7bc7b1a22aab3c479a390da4e2df7 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f WHIRLPOOL d7f73f9c15419cde1adae0382cf78b7dca61d16ff2cab74225457ea10646c1dfdbcd6b0713c6b4f9ba9e80584f68894ed2a00282a7b15086ae170579fe0367d8
diff --git a/media-sound/drumstick/drumstick-0.5.0.ebuild b/media-sound/drumstick/drumstick-0.5.0.ebuild
new file mode 100644
index 000000000000..23e0adbaad10
--- /dev/null
+++ b/media-sound/drumstick/drumstick-0.5.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fdo-mime gnome2-utils cmake-utils
+
+DESCRIPTION="Qt4/C++ wrapper for ALSA sequencer"
+HOMEPAGE="http://drumstick.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="dbus doc"
+
+RDEPEND="
+	media-libs/alsa-lib
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+	x11-misc/shared-mime-info
+	dbus? ( dev-qt/qtdbus:4 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-doc_automagicness.patch
+	"${FILESDIR}"/${PV}-underlinking.patch
+	"${FILESDIR}"/${PV}-gcc6-narrowing.patch
+)
+
+src_prepare() {
+	sed -i \
+		-e '/CMAKE_EXE_LINKER_FLAGS/d' \
+		CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_DBUS=$(usex dbus)
+		-DWITH_DOC=$(usex doc)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/drumstick/drumstick-1.0.2.ebuild b/media-sound/drumstick/drumstick-1.0.2.ebuild
new file mode 100644
index 000000000000..3facc49b0469
--- /dev/null
+++ b/media-sound/drumstick/drumstick-1.0.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils fdo-mime gnome2-utils
+
+DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
+HOMEPAGE="http://drumstick.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	doc? (
+		app-doc/doxygen
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package doc Doxygen)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && cmake-utils_src_compile doxygen
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc ; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/drumstick/drumstick-1.1.0.ebuild b/media-sound/drumstick/drumstick-1.1.0.ebuild
new file mode 100644
index 000000000000..4545970a4f5e
--- /dev/null
+++ b/media-sound/drumstick/drumstick-1.1.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils fdo-mime gnome2-utils
+
+DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
+HOMEPAGE="http://drumstick.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fluidsynth pulseaudio"
+
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.7:5
+	>=dev-qt/qtdbus-5.7:5
+	>=dev-qt/qtgui-5.7:5
+	>=dev-qt/qtnetwork-5.7:5
+	>=dev-qt/qtsvg-5.7:5
+	>=dev-qt/qtwidgets-5.7:5
+	media-libs/alsa-lib
+	fluidsynth? ( media-sound/fluidsynth )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	doc? (
+		app-doc/doxygen
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use fluidsynth ; then
+		sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
+			library/rt/CMakeLists.txt \
+			library/rt-backends/CMakeLists.txt \
+			utils/vpiano/CMakeLists.txt || die
+	fi
+
+	if ! use pulseaudio ; then
+		sed -i -e "/pkg_check_modules(PULSE/d" CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		$(cmake-utils_use_find_package doc Doxygen)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && cmake-utils_src_compile doxygen
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc ; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/drumstick/files/0.5.0-doc_automagicness.patch b/media-sound/drumstick/files/0.5.0-doc_automagicness.patch
new file mode 100644
index 000000000000..c2474ae4f1e1
--- /dev/null
+++ b/media-sound/drumstick/files/0.5.0-doc_automagicness.patch
@@ -0,0 +1,20 @@
+diff -urN drumstick-0.5.0.old/CMakeLists.txt drumstick-0.5.0/CMakeLists.txt
+--- drumstick-0.5.0.old/CMakeLists.txt	2010-09-09 12:38:56.000000000 +0200
++++ drumstick-0.5.0/CMakeLists.txt	2011-05-13 11:03:30.156962982 +0200
+@@ -143,6 +143,8 @@
+ ADD_SUBDIRECTORY(library)
+ ADD_SUBDIRECTORY(utils)
+ ADD_SUBDIRECTORY(icons)
++OPTION(WITH_DOC "Build documentation" ON)
++IF( WITH_DOC )
+ IF(${CMAKE_SYSTEM} MATCHES "Linux")
+     FIND_PACKAGE(Doxygen)
+     IF(DOXYGEN_FOUND)
+@@ -157,6 +159,7 @@
+     ENDIF(DOXYGEN_FOUND)
+     ADD_SUBDIRECTORY(doc)
+ ENDIF(${CMAKE_SYSTEM} MATCHES "Linux")
++ENDIF( WITH_DOC )
+ 
+ CONFIGURE_FILE(drumstick-alsa.pc.in drumstick-alsa.pc IMMEDIATE @ONLY)
+ CONFIGURE_FILE(drumstick-file.pc.in drumstick-file.pc IMMEDIATE @ONLY)
diff --git a/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch b/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch
new file mode 100644
index 000000000000..165db470592e
--- /dev/null
+++ b/media-sound/drumstick/files/0.5.0-gcc6-narrowing.patch
@@ -0,0 +1,26 @@
+Fix GCC 6 failures caused by -Wnarrowing
+
+--- a/utils/buildsmf/buildsmf.cpp
++++ b/utils/buildsmf/buildsmf.cpp
+@@ -53,8 +53,8 @@
+     m_engine->writeKeySignature(0, 2, major_mode); // D major (2 sharps)
+ 
+     // system exclusive event
+-    static char gsreset[] = { 0xf0, 0x41, 0x10, 0x42, 0x12, 
+-                              0x40, 0x00, 0x7f, 0x00, 0x41, 0xf7 };
++    static char gsreset[] = { (char)0xf0, 0x41, 0x10, 0x42, 0x12, 
++                              0x40, 0x00, 0x7f, 0x00, 0x41, (char)0xf7 };
+     m_engine->writeMidiEvent(0, system_exclusive, sizeof(gsreset), gsreset);
+ 
+     // some note events
+--- a/utils/testevents/testevents.cpp
++++ b/utils/testevents/testevents.cpp
+@@ -262,7 +262,7 @@
+     dumpEvent(new KeyPressEvent(5, 60, 124));
+     dumpEvent(new ChanPressEvent(6, 111));
+     dumpEvent(new PitchBendEvent(7, 1234));
+-    char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, 0xf7};
++    char sysex[] = {(char)0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, (char)0xf7};
+     dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex))));
+     QString text = "This can be a copyright, song name, instrument, lyric...";
+     TextEvent te(text, 3);
diff --git a/media-sound/drumstick/files/0.5.0-underlinking.patch b/media-sound/drumstick/files/0.5.0-underlinking.patch
new file mode 100644
index 000000000000..1ec4fd186029
--- /dev/null
+++ b/media-sound/drumstick/files/0.5.0-underlinking.patch
@@ -0,0 +1,17 @@
+--- a/utils/vpiano/CMakeLists.txt
++++ b/utils/vpiano/CMakeLists.txt
+@@ -1,3 +1,5 @@
++find_package(X11 REQUIRED)
++
+ SET(vpiano_forms_SRCS
+     vpianoabout.ui
+     connections.ui
+@@ -52,7 +54,7 @@
+ TARGET_LINK_LIBRARIES(drumstick-vpiano
+     ${QT_LIBRARIES} 
+     ${ALSA_LIBS} 
+-    ${QT_X11_X11_LIBRARY}
++    ${X11_X11_LIB}
+     drumstick-common
+     drumstick-alsa
+ )
diff --git a/media-sound/drumstick/files/drumstick-1.0.2-gcc6.patch b/media-sound/drumstick/files/drumstick-1.0.2-gcc6.patch
new file mode 100644
index 000000000000..4bb66e85536f
--- /dev/null
+++ b/media-sound/drumstick/files/drumstick-1.0.2-gcc6.patch
@@ -0,0 +1,35 @@
+Index: library/file/qove.cpp
+===================================================================
+--- a/library/file/qove.cpp	(revision 316)
++++ b/library/file/qove.cpp	(working copy)
+@@ -11356,7 +11356,7 @@
+ 				OVE::MeasureData* measureData = d->ove.getMeasureData(i, j, k);
+ 				QList<OVE::MusicData*> tempoPtrs = measureData->getMusicDatas(OVE::MusicData_Tempo);
+ 
+-				if (k == 0 || (k > 0 && abs(measure->getTypeTempo()	- d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) {
++				if (k == 0 || (k > 0 && std::abs(measure->getTypeTempo()	- d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) {
+ 					int tick = d->mtt.getTick(k, 0);
+ 					int tempo = (int) measure->getTypeTempo();
+ 					tempos[tick] = tempo;
+@@ -11739,7 +11739,7 @@
+ 				}
+ 				case OVE::Articulation_Arpeggio: {
+ 					//if( art->getChangeSoundEffect() ) {
+-						unsigned int soundEffect = abs(art->getSoundEffect().first) + abs(art->getSoundEffect().second);
++						unsigned int soundEffect = std::abs(art->getSoundEffect().first) + std::abs(art->getSoundEffect().second);
+ 						int tickAmount = (soundEffect / notes.size()) * ((notes.size() - i) - 1);
+ 						startTick -= tickAmount;
+ 					//}
+Index: utils/testevents/testevents.cpp
+===================================================================
+--- a/utils/testevents/testevents.cpp	(revision 316)
++++ b/utils/testevents/testevents.cpp	(working copy)
+@@ -262,7 +262,7 @@
+     dumpEvent(new KeyPressEvent(5, 60, 124));
+     dumpEvent(new ChanPressEvent(6, 111));
+     dumpEvent(new PitchBendEvent(7, 1234));
+-    char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, 0xf7};
++    char sysex[] = {'\xf0', '\x41', '\x10', '\x42', '\x12', '\x40', '\0', '\x7f', '\0', '\x41', '\xf7'};
+     dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex))));
+     QString text = "This can be a copyright, song name, instrument, lyric...";
+     TextEvent te(text, 3);
diff --git a/media-sound/drumstick/metadata.xml b/media-sound/drumstick/metadata.xml
new file mode 100644
index 000000000000..ffb8a67c8158
--- /dev/null
+++ b/media-sound/drumstick/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="fluidsynth">Enable support for <pkg>media-sound/fluidsynth</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">drumstick</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/dvda-author/Manifest b/media-sound/dvda-author/Manifest
new file mode 100644
index 000000000000..1b42dfbb377c
--- /dev/null
+++ b/media-sound/dvda-author/Manifest
@@ -0,0 +1,6 @@
+DIST dvda-author-10.06-300.tar.gz 828028 SHA256 d16ff7fe9af9d1b53240cf9f62f79766e0dfc0236b64c9aa1befb88832339fbe SHA512 619215e5e9ac4a3e55d2bef0222a931412946f129927f1042807ee25541d64609a5a9189c843fdc30d34bb0e41e0779d821d8c32a16cf89c6227d9925ea07024 WHIRLPOOL 5e4d04ff93ec83aed3ecf7ba2e10662899a82bd5a527b6573e5a6c33c93dc66b3e5c96a99f79c212b1fb57a492274db6603780fbdf8983a3f90c55988dfe8028
+EBUILD dvda-author-10.06-r1.ebuild 1309 SHA256 811162f145c06564cbe8b4fd7a414ac3b84cac316c9fd66db99a79b75ecefdb2 SHA512 cc67b275e3c5764b04ac68d2cdd27eb19f8f8e4791cbcdb0a2eaefc642c952686a7683332f430ddb3a5226b328366f4ee4c689ef92792695434f9fe9ff8588dd WHIRLPOOL 27c10f308361fdecfdf5d921064169e1c1823786a1c5fa843673ac9a9633cf6b10167057b796a10657b3e132789fb89b3d214959e64b24553eb8dd017d90ca6d
+EBUILD dvda-author-10.06.ebuild 1018 SHA256 8ef3988339d398284fa32747122f57f87818c673a4b169df720f53a359a53d5e SHA512 53c7e799cfff95d1294a30fdd44de15a51c9dd9b43d89273bf4955a6c24540093b2b555f836d2d03a711d07a312dd0c82cde578fe28a83e9f3662cf1825166a4 WHIRLPOOL eb9866da634e2c501dd1fba6a7ac7ab315fc7995d0a9e481b5a4cb6fe56d2adcab92bdc31b5ffd31efdf3f82db10627600446a8f7e889306f15140f3cf3870ca
+MISC ChangeLog 2508 SHA256 5fa7c32bd1550556d8e32dc4d951d62340d2433ca44acc64cbf881c14686d122 SHA512 7ac4f42e818c73d3f402c95f6989347fc7a7ad4e0daf4671250cf092949513a393a6e9136bd1e2c5db7f7edefbc905893f5b5eb2be23d13edf425fb8981bf2a9 WHIRLPOOL c967ec5e258fc9fb1c45a1cfd30f98dcac9c581038a66667f2940fd8d59a836f9ec966ca1cf0b996def8dfdc1caba8397a4432647cdc9ee2cde177ddd703a9e4
+MISC ChangeLog-2015 1681 SHA256 e6f65d18ba80345e7c8522b27a311291d91bc2968ef883e876745e33454d9a09 SHA512 11fe1e1914016ec434677d7b6009bfe98717737336ee54659eb56a8fe6d2b6a5cdfab687a3e11e776e4e842edb41605a1e91b354f33b2962409bd29b8d9d2a69 WHIRLPOOL c1f5f09245e43dfd27faf40aa716c763875374f76e45697ffb9a2fd4940522ddd67f87693c4f48e81715fb293225026174ac2029062d997b0a2420c7b8177ae4
+MISC metadata.xml 332 SHA256 d3e6057e1a65da4eac81ebb4fdee148cec49932dbd0e1d45a8016c7c4897781f SHA512 85c9b13baabe446a5c74613084fb53f83071219d872dccef40b946c2f36c4df4f0cbc1e964779fe9c989d8081c483d82c10ad454e5d225b00361a851b5e0400c WHIRLPOOL 7911a65143a030b54982272c6102e4050d643907fd49f7c248cc2977d55a605f46eb12fe97018828e1146fff3e78bcf44830d60bba68560f07a2e9be5ec4b375
diff --git a/media-sound/dvda-author/dvda-author-10.06-r1.ebuild b/media-sound/dvda-author/dvda-author-10.06-r1.ebuild
new file mode 100644
index 000000000000..57af4246a3b6
--- /dev/null
+++ b/media-sound/dvda-author/dvda-author-10.06-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Author a DVD-Audio DVD"
+HOMEPAGE="http://dvd-audio.sourceforge.net"
+SRC_URI="mirror://sourceforge/dvd-audio/${P}-300.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=media-sound/sox-14.1[png]
+	>=media-libs/flac-1.2.1[ogg]"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2"
+
+src_prepare() {
+	# Fix parallel make
+	sed -i -e 's:^\(\tcd ${MAYBE_CDRTOOLS}\):@HAVE_CDRTOOLS_BUILD_TRUE@\1:' \
+		Makefile.in || die "sed failed"
+
+	# Don't pre-strip binaries
+	sed -i -e 's:$LIBS -s:$LIBS:' configure || die "sed failed"
+
+	# Fix up --as-needed.
+	MY_AS_NEEDED_F='$(LINK) \($(dvda_OBJECTS)\)'
+	MY_AS_NEEDED_R='$(CCLD) $(AM_CFLAGS) $(CFLAGS) \1 $(AM_LDFLAGS) $(LDFLAGS) -o $@'
+	sed -i -e "s/${MY_AS_NEEDED_F}/${MY_AS_NEEDED_R}/" src/Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--with-config=/etc \
+		$(use_with debug debug full)
+}
+
+src_compile() {
+	# make[1]: warning: jobserver unavailable: using -j1.
+	#                   Add '+' to parent make rule.
+	emake -j1
+}
+
+src_install() {
+	newbin src/dvda ${PN}
+	insinto /etc
+	doins ${PN}.conf
+	dodoc AUTHORS BUGS ChangeLog EXAMPLES HOWTO.conf LIMITATIONS NEWS TODO
+}
diff --git a/media-sound/dvda-author/dvda-author-10.06.ebuild b/media-sound/dvda-author/dvda-author-10.06.ebuild
new file mode 100644
index 000000000000..34c331c5bd75
--- /dev/null
+++ b/media-sound/dvda-author/dvda-author-10.06.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Author a DVD-Audio DVD"
+HOMEPAGE="http://dvd-audio.sourceforge.net"
+SRC_URI="mirror://sourceforge/dvd-audio/${P}-300.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=media-sound/sox-14.1[png]
+	>=media-libs/flac-1.2.1[ogg]"
+DEPEND="${RDEPEND}
+	>=sys-devel/libtool-2"
+
+src_prepare() {
+	# Fix parallel make
+	sed -i -e 's:^\(\tcd ${MAYBE_CDRTOOLS}\):@HAVE_CDRTOOLS_BUILD_TRUE@\1:' \
+		Makefile.in || die "sed failed"
+
+	# Don't pre-strip binaries
+	sed -i -e 's:$LIBS -s:$LIBS:' configure || die "sed failed"
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--with-config=/etc \
+		$(use_with debug debug full)
+}
+
+src_install() {
+	newbin src/dvda ${PN} || die "newbin failed"
+	insinto /etc
+	doins ${PN}.conf || die "doins failed"
+	dodoc AUTHORS BUGS ChangeLog EXAMPLES HOWTO.conf LIMITATIONS NEWS TODO \
+		|| die "dodoc failed"
+}
diff --git a/media-sound/dvda-author/metadata.xml b/media-sound/dvda-author/metadata.xml
new file mode 100644
index 000000000000..b262e0967672
--- /dev/null
+++ b/media-sound/dvda-author/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dvd-audio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
new file mode 100644
index 000000000000..432504a1c7f9
--- /dev/null
+++ b/media-sound/easytag/Manifest
@@ -0,0 +1,11 @@
+AUX easytag-2.1.8-desktop.patch 476 SHA256 e482218771bbc30ba953ae6b133ee457bf393c57604b9b04086bc7418c7b8fae SHA512 82bdc8af5958150037e344f90c06384dfca0597e044a7ad24cf8138fde8212af0d4b2448a1f10f7c78a4bf2324fb5618110763c7ad632578744edd7410129f08 WHIRLPOOL bafdd51ec6723873c1b8b392958977a8dacb91a7498fed0e2e8e3516bf8f24f76616e3160743abee04fff2d22d784c21dd8e9195c3ff319950652a8cda7edb47
+AUX easytag-2.1.8-docs.patch 270 SHA256 5162e3fdd0a0bba073d6b40466e2a8cd284e6f62189daadb5a004e2607e5f281 SHA512 282f0eda4ea992833c8869040b914505bf079408739727e148f32e800f9b95b412d034f92462030760aaa30224f3241f549eefb6bb6ac07038b089f4974e9bb5 WHIRLPOOL 7b35b38ca7d7ba3faa308a19c850f3d3a142fa6fbfcfcb1af140ca82e1063ec6c7668d6d5d28f3fa3bab638f54e06e7606e126bf384eafc0f3372f3cce721a9a
+AUX easytag-2.1.8-taglib.patch 398 SHA256 08e2014708a63a892aa5d10801a7f4827e235d8e86b33fcb3b76598812bf712a SHA512 eb9c80664c61cf4974b198c4800ffbf5252c5765c1b7069bf442408c89522c86fc272df22d2ac0b1758e0070b4bb2fd1fa9cee8374445d2db34ef37d08386ec2 WHIRLPOOL 6b970930deaefdd9d00dc4a55b1f08d5216aec0af0cd3857050d79e2b0bd575661389296146d82dba67e70abbdc9269441bc3a9dd21c735999e2d1d8275bc2b1
+AUX easytag-2.1.8-werror.patch 547 SHA256 730ca3145805f2588ccddc45a15eca89bf8cf0dc0a2e2142ef4efa46282b43aa SHA512 0367944be501f741e75c61872840282fddbd2503b3bc25f5d5f392a9cb05fa451623acc157dad2f3b415af0f6c396aab23f4927306c15fea5f1b10435a200e2c WHIRLPOOL 253d1c4ffc6568207500ced97b1a5e098bb1275ed335a731a39af630d54e28364494426926e46700d706e3481f2848846e0bcd3f2d55bfa94fe5113d5ae0f617
+DIST easytag-2.1.8.tar.xz 2459496 SHA256 1a2f75c9a70aeb7a404dfaa96e0df0eaaa325df301c58f0f708d0da4c08e65a9 SHA512 cf5d92902276b8d462c695aaa0d1072684d60cbfc45d07fb2ac7b345907a775b94665612088b33f3272db22d4b4eb78f4a4e36f2caf6e151a08f640841208e48 WHIRLPOOL ab37d4942bde4a88c233869b3cf84d13dd4a259cd894941bd9c26ec4f3b22c02af3fc7633a09670ee707d0287bb8bb9fc654ea00e0fe694319a6cf24b220420c
+DIST easytag-2.4.3.tar.xz 1381084 SHA256 fc51ee92a705e3c5979dff1655f7496effb68b98f1ada0547e8cbbc033b67dd5 SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087 WHIRLPOOL de1e3ec43fe7c2dfbb64d1f6ec2dec88455a2129f26c08ebfb1fa59a79405a5c16bc5c5c2cc55dcf5692d4c337431ec2fe91417315ef30c6ffd5a26d4563c2a3
+EBUILD easytag-2.1.8.ebuild 1452 SHA256 1248bbf3faa7cf0f76b3969acc7c2d341535bc1584ee4be5e6896c90db7d93c8 SHA512 12bed0206871c56e53329684127283ef36c7f3f3418537a59a5d4244883c6c407e8a88c15d21294b2363334030c2438a1843c4c84a50af2df96958d4258d56c3 WHIRLPOOL ab754129c903f39e632bc29b7d4592b2b06d4e90712d1897e8bd6de6529e4c1c3c3de53ffec09e204c1ee4049eabdab1d3ac0da3dec83dacde7c7b6ff550cbe9
+EBUILD easytag-2.4.3.ebuild 1645 SHA256 36df1c3b0a9cf2e339073b4c97401ab635434de084a2d0eada8b30999d2960c7 SHA512 c722d39fd6f08e9999b71914af9e6efe8f263bde9063707a330cfb26c1e200f54e50a2a344f2056d62ad316df8576b00cd5c389078ff7fb26e5771c4cfa12404 WHIRLPOOL b6d9531b62f43cdf606605039a2671f7e7ee533ce2063eda254dc9eb026ca936a53a134b43803d94e89b666d16c97c8f8994fae87324a791be892988b699d03e
+MISC ChangeLog 5684 SHA256 5cdd2aab3c9e3a6282d04287f18259127bb9900b415d779d4b268937a8cc3c8f SHA512 747f8d4521bc4a993a448937177f98155039a48e9e73670e700ff8571fbaedca97675b5aa9f9a17c6395ae4b44ce1d3b1db118b76e52cc0bf1ff71a24904007e WHIRLPOOL 91bf7cc822f0a4e7b9e914632ede9e09a2c87ef5a93a6342f942e28448c8acfd214b0839f804a44b20a0fbd0bff78f6284dac9f8e5e4de3b22a37fddfee90693
+MISC ChangeLog-2015 29708 SHA256 66707bd477b9b7d8324a25e4b17029c5cdc8fb4d9c599215cf41e1d3e8799810 SHA512 59148ac30ed9192410e4b5aab0ec7fd7cd0c0bf2aef4f87b7aaac91d3d23a0285c2fd48440926e3303df64e239e797c4edbef693c75664567673ba7410af4b9a WHIRLPOOL 3d52e56bbfe4f551505cef44e3ac742f77e89009cf82e7593fff684d565ab9997fc84597111ddff7ba0d2abb9ff47fab91464f7ae2ca709a18aee77bf47bdca6
+MISC metadata.xml 565 SHA256 bdb334a21791be4d565066a71b304447fc9fd761ba16338855d60e2571f0acd7 SHA512 20baf00e8f0315ff490b5379d9c6dc14f66c46837d9d3eea073ff85596370e48356a80534e795f3023b7251a79e749f04a575a1d4e7deaba1e909f6038f7718a WHIRLPOOL b48ac52f4dd4a37e1450abbaf00c9a7bb5e03c6e439b91ab4629e353d91bc3896a7585fcf614b557fa7531bb66571750b345afa21cca769daf725ce46c3856b9
diff --git a/media-sound/easytag/easytag-2.1.8.ebuild b/media-sound/easytag/easytag-2.1.8.ebuild
new file mode 100644
index 000000000000..fc78c472d7c2
--- /dev/null
+++ b/media-sound/easytag/easytag-2.1.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools gnome.org fdo-mime
+
+DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
+HOMEPAGE="https://projects.gnome.org/easytag/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac mp3 mp4 nls speex vorbis wavpack"
+
+RDEPEND=">=x11-libs/gtk+-2.24:2
+	mp3? (
+		>=media-libs/id3lib-3.8.3-r7
+		media-libs/libid3tag
+		)
+	flac? (
+		media-libs/flac
+		media-libs/libvorbis
+		)
+	mp4? ( media-libs/taglib[mp4(+)] )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	speex? (
+		media-libs/speex
+		media-libs/libvorbis
+		)"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-werror.patch
+	epatch "${FILESDIR}"/${P}-taglib.patch
+	epatch "${FILESDIR}"/${P}-docs.patch
+	eautoreconf
+}
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable mp3) \
+		$(use_enable mp3 id3v23) \
+		$(use_enable vorbis ogg) \
+		$(use_enable speex) \
+		$(use_enable flac) \
+		$(use_enable mp4) \
+		$(use_enable wavpack)
+}
+
+pkg_postinst() { fdo-mime_desktop_database_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.4.3.ebuild b/media-sound/easytag/easytag-2.4.3.ebuild
new file mode 100644
index 000000000000..c5aaafa076ea
--- /dev/null
+++ b/media-sound/easytag/easytag-2.4.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
+HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
+
+LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
+REQUIRED_USE="
+	opus? ( vorbis )
+	speex? ( vorbis )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.38:2
+	media-libs/libcanberra[gtk3]
+	>=x11-libs/gtk+-3.10:3
+	flac? ( >=media-libs/flac-1.3 )
+	mp3? (
+		>=media-libs/id3lib-3.8.3-r8
+		>=media-libs/libid3tag-0.15.1b-r4
+		)
+	mp4? ( >=media-libs/taglib-1.9.1[mp4(+)] )
+	opus? (
+		>=media-libs/opus-1.1
+		>=media-libs/opusfile-0.4
+		)
+	speex? ( >=media-libs/speex-1.2_rc1 )
+	vorbis? (
+		>=media-libs/libogg-1.3.1
+		>=media-libs/libvorbis-1.3.4
+		)
+	wavpack? ( >=media-sound/wavpack-4.70 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.4
+	app-text/yelp-tools
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.50
+	>=sys-devel/gettext-0.18.3.2
+	virtual/pkgconfig
+	!<dev-util/pkgconfig-0.27
+	test? (
+		dev-libs/appstream-glib
+		>=dev-util/desktop-file-utils-0.22
+		)
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-Werror \
+		$(use_enable test appdata-validate) \
+		$(use_enable test tests) \
+		$(use_enable mp3) \
+		$(use_enable mp3 id3v23) \
+		$(use_enable vorbis ogg) \
+		$(use_enable opus) \
+		$(use_enable speex) \
+		$(use_enable flac) \
+		$(use_enable mp4) \
+		$(use_enable wavpack)
+}
diff --git a/media-sound/easytag/files/easytag-2.1.8-desktop.patch b/media-sound/easytag/files/easytag-2.1.8-desktop.patch
new file mode 100644
index 000000000000..6cc72765a65d
--- /dev/null
+++ b/media-sound/easytag/files/easytag-2.1.8-desktop.patch
@@ -0,0 +1,11 @@
+--- easytag.desktop.in
++++ easytag.desktop.in
+@@ -6,7 +6,7 @@
+ Type=Application
+ Icon=easytag
+ Categories=GTK;AudioVideo;AudioVideoEditing;
+-MimeType=x-directory/normal;inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape;
++MimeType=audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape;
+ Exec=easytag %F
+ Terminal=false
+ StartupNotify=true
diff --git a/media-sound/easytag/files/easytag-2.1.8-docs.patch b/media-sound/easytag/files/easytag-2.1.8-docs.patch
new file mode 100644
index 000000000000..1ecb076d0d36
--- /dev/null
+++ b/media-sound/easytag/files/easytag-2.1.8-docs.patch
@@ -0,0 +1,14 @@
+--- Makefile.am
++++ Makefile.am
+@@ -197,11 +197,6 @@
+ 	$(AM_V_at)$(POST_UNINSTALL)
+ 	test -n "$(DESTDIR)" || $(UPDATE_ICON_CACHE) "$(iconthemedir)"
+ 
+-dist_doc_DATA = \
+-	HACKING \
+-	THANKS \
+-	TODO
+-
+ dist_noinst_DATA = \
+ 	$(desktop_in_files) \
+ 	$(easytag_headers) \
diff --git a/media-sound/easytag/files/easytag-2.1.8-taglib.patch b/media-sound/easytag/files/easytag-2.1.8-taglib.patch
new file mode 100644
index 000000000000..d565a7615d77
--- /dev/null
+++ b/media-sound/easytag/files/easytag-2.1.8-taglib.patch
@@ -0,0 +1,11 @@
+--- easytag-2.1.8/configure.ac
++++ easytag-2.1.8/configure.ac
+@@ -202,7 +202,7 @@
+ TAGLIB_DEPS="taglib_c >= 1.6.0"
+ AS_IF([test "x$enable_mp4" != "xno"],
+       [PKG_CHECK_EXISTS([$TAGLIB_DEPS], [have_taglib=yes], [have_taglib=no])],
+-      [have_wavpack=no])
++      [have_taglib=no])
+ 
+ AS_IF([test "x$have_taglib" != "xno"],
+       [AC_DEFINE([ENABLE_MP4], [], [Define for taglib MP4 support])],
diff --git a/media-sound/easytag/files/easytag-2.1.8-werror.patch b/media-sound/easytag/files/easytag-2.1.8-werror.patch
new file mode 100644
index 000000000000..d7a770665033
--- /dev/null
+++ b/media-sound/easytag/files/easytag-2.1.8-werror.patch
@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -239,7 +239,7 @@
+      AC_MSG_RESULT([$have_ws2])])
+ 
+ dnl Check that the compiler accepts the given warning flags.
+-warning_flags="-Wall -Wstrict-prototypes -Wnested-externs -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self -Werror=format-security -Werror=format=2 -Werror=missing-include-dirs -Werror=declaration-after-statement"
++warning_flags="-Wall -Wstrict-prototypes -Wnested-externs"
+ 
+ realsave_CFLAGS="$CFLAGS"
+ for option in $warning_flags; do
diff --git a/media-sound/easytag/metadata.xml b/media-sound/easytag/metadata.xml
new file mode 100644
index 000000000000..086aae70a896
--- /dev/null
+++ b/media-sound/easytag/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="opus">Enable support for <pkg>media-libs/opus</pkg> and <pkg>media-libs/opusfile</pkg> (opus audio codec)</flag>
+	</use>
+	<longdescription>a utility for viewing and editing tags for MP3, MP2, FLAC, AAC, MP4 and OGG files. It features a simple and attractive GTK+ interface</longdescription>
+</pkgmetadata>
diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
new file mode 100644
index 000000000000..c9e3075f4ef3
--- /dev/null
+++ b/media-sound/ecasound/Manifest
@@ -0,0 +1,8 @@
+AUX ecasound-2.8.1-ldflags.patch 2715 SHA256 79267748a8954eaf37b332033f7ee8e2a85113cde5ce17afae153c7e7b39381a SHA512 2cf1d68b04c651480fdabb04e6e68c2d52d05405ea3c4813aa12cdca1c7fca8f80aa524d7424b98d4cf376cfabe372766a2fc2e5f564f8eff0125c7c4ad06d1b WHIRLPOOL db57c7dd3954e4028c82544f83b2a831996d542a41dcc3e0b9897d2878afd136ed7c52f6e2b90efdca5bf5684ca6c1a319061f0756e7ce849b6b3caeffdb80a5
+DIST ecasound-2.6.0.tar.gz 966629 SHA256 925d12a422883c356565c542110d070f61c3693e01eaa1b00eb25082e4779f88 SHA512 48b3c65e301a775499765c55b09bddacfde24bfd7a5be6c03389c7bda882abe98b061aaa39ec12a797e3a5a2808f446751155b36c263f0f12da2db1495515c5e WHIRLPOOL 3e39c977e2561d1be207c5788e29633094ba8542254f1f770d892c58cb64b7a35ff4300fbfb3b83842ccc1649b6a3941927bd3cc7c96ecc5282b167cdab79619
+DIST ecasound-2.9.1.tar.gz 1057333 SHA256 39fce8becd84d80620fa3de31fb5223b2b7d4648d36c9c337d3739c2fad0dcf3 SHA512 b91fd68cb4809fdf62b25323fbf52c9bb7de6663287d5aa2576cc4fb28e322850b7020df2718ed6087f5d9f5f96692a476287378ea65853d01834523e8eb7033 WHIRLPOOL ef4eccd6a2ac1b508246ce7660614e52bc9033814011cff588382f1a76ac9fc124aecd6dbd3fb4ffeb337a8eb7ef1e87c438e2c994faddd70d9a2fc49561a80d
+EBUILD ecasound-2.6.0-r1.ebuild 1724 SHA256 2d080c4b8d02069811e9bf58a4cdd403e333b65e784717e2a233e44a1c759687 SHA512 3ac59b9ebff9cfd07473258c5489363a4b34a3c957f9af1fd9adbed3d72d1e620f72b06886ce5bbf7a9030cd921c939ceb4a3c01774774119a48f34f5dd0cc30 WHIRLPOOL 5095a1b8b31cc2076c3507807b9c7bb762889c2835ba7e464c4fd095289a394e5c78d9d02f5c40e34bf089aa6dead6dedcd6eb0b4e94b24b025585e65231a656
+EBUILD ecasound-2.9.1-r1.ebuild 2278 SHA256 e94305b31aefdb818e16d2505bf48036bd60cc055634264a4d4ddb0efd98ca09 SHA512 a8fa902eecb44188e5cd0f12505c1cdd19f257b28af3b6308652217b6839343537c372a2d16ac4aecad4fd225879c84018ce9868bac72bf66b15a04ea013c79f WHIRLPOOL 826b00bc9b8145c0771548be5fb281119dfa3385c7d198a9934dbe175f75b85ac41f2bcab51f1b78dc9574c92fc80ac3985bc4729878537c6ce7068832078544
+MISC ChangeLog 2580 SHA256 82f48e051312860cb635f257e8c6fb37861f1e6713510efe906d1fd64a65c1a5 SHA512 adaf6f9ae52db1fe806625ec24545b13ff6ec0f802bc0a542f8461fac436f6b4c6b4acf88b661435f1382dff3dc1f16376c0b72c9cde2c344aca0f92223bb9b2 WHIRLPOOL 6fdaaad7cc15175fbbe6f96b756321af3c38f2d3a404f8ab638908731c3f6493ddb0cd54bd93602dd98de5a5430b086bea4ce83bfc9be735be9336c3bb08fc21
+MISC ChangeLog-2015 10585 SHA256 f00eb47635bdf09f7611885202bd5505e6dd358111bba2cb88b0dc1e2c186a3f SHA512 19126e74e2734913607d7d80175964afeddfd818049eb82d4b194136c65bd04ec88eb654e908ca630ed5c0097f3cca56942a349019f40d4a8b90eeae002492cf WHIRLPOOL 4dcc237b4401ece90beca0f65c7a94fff3217aa5fd9ea5e5fb65ce2dec56b171712b20d2a789a3c27963a6f057903899df1a3dd67668faf91561e9667e861ad5
+MISC metadata.xml 991 SHA256 601f6409862e1840d9fed84281d8cb8a3e9be9ca856acc68c696f5c74be6ef80 SHA512 a057fab8c46cfec1f615671b8c511978c077362e4943134d6a572f141e9cd42dbc4a8d303fbd2d8c28b94d8423e5c0cf5105c352c0fab3a1bd18ff0a2141450c WHIRLPOOL 9e6f2e33a90eb7413c62dde54860f4b3799ba0dbdc1254fa1fbab9d72ead512552d917541dda5ceb9b0ab5fc0d176f1d80893cb89c2e75b40790b45efb4df421
diff --git a/media-sound/ecasound/ecasound-2.6.0-r1.ebuild b/media-sound/ecasound/ecasound-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..9db836fa9200
--- /dev/null
+++ b/media-sound/ecasound/ecasound-2.6.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+DESCRIPTION="a package for multitrack audio processing"
+HOMEPAGE="http://ecasound.seul.org/ecasound"
+SRC_URI="http://${PN}.seul.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="alsa audiofile debug doc jack libsamplerate mikmod ncurses vorbis oss python ruby sndfile"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	jack? ( media-sound/jack-audio-connection-kit )
+	media-libs/ladspa-sdk
+	audiofile? ( media-libs/audiofile )
+	alsa? ( media-libs/alsa-lib )
+	vorbis? ( media-libs/libvorbis )
+	libsamplerate? ( media-libs/libsamplerate )
+	mikmod? ( media-libs/libmikmod:0 )
+	ruby? ( dev-lang/ruby )
+	python? ( dev-lang/python )
+	ncurses? ( sys-libs/ncurses )
+	sndfile? ( media-libs/libsndfile )
+	sys-libs/readline"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local pyconf=()
+
+	if use python ; then
+		pyconf=( "--with-python-modules=${EPREFIX}/usr/$(get_libdir)/${EPYTHON}" )
+	fi
+
+	econf \
+		$(use_enable alsa) \
+		--disable-arts \
+		$(use_enable audiofile) \
+		$(use_enable debug) \
+		$(use_enable jack) \
+		$(use_enable libsamplerate) \
+		$(use_enable ncurses) \
+		$(use_enable oss) \
+		$(use_enable python pyecasound c) \
+		$(use_enable ruby rubyecasound) \
+		$(use_enable sndfile) \
+		--enable-shared \
+		--with-largefile \
+		--enable-sys-readline \
+		"${pyconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use python && python_optimize
+	dodoc BUGS NEWS README TODO
+	use doc && dodoc Documentation/*.html
+}
diff --git a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..5485c1404a08
--- /dev/null
+++ b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="a package for multitrack audio processing"
+HOMEPAGE="http://ecasound.seul.org/ecasound"
+SRC_URI="http://ecasound.seul.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss
+python ruby sndfile static-libs test"
+REQUIRED_USE="test? ( lv2 )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="sys-libs/readline:0=
+	alsa? ( media-libs/alsa-lib:= )
+	audiofile? ( media-libs/audiofile:= )
+	jack? ( virtual/jack:= )
+	libsamplerate? ( media-libs/libsamplerate:= )
+	lv2? ( >=media-libs/lilv-0.5.0:= )
+	media-libs/ladspa-sdk
+	mikmod? ( media-libs/libmikmod:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	oil? ( dev-libs/liboil:= )
+	osc? ( media-libs/liblo:= )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( dev-lang/ruby )
+	sndfile? ( media-libs/libsndfile:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-2.8.1-ldflags.patch
+	eapply_user
+
+#	if use python ; then
+#		sed -i -e "s:\$(ecasoundc_libs):\0 $(python_get_library -l):" \
+#			pyecasound/Makefile.am || die "sed failed"
+#	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local pyconf=()
+
+	if use python ; then
+		pyconf=( "--with-python-modules=${EPREFIX}/usr/$(get_libdir)/${EPYTHON}" )
+	fi
+
+	econf \
+		--disable-arts \
+		--enable-shared \
+		--enable-sys-readline \
+		--with-largefile \
+		$(use_enable alsa) \
+		$(use_enable audiofile) \
+		$(use_enable debug) \
+		$(use_enable jack) \
+		$(use_enable libsamplerate) \
+		$(use_enable lv2 liblilv) \
+		$(use_enable ncurses) \
+		$(use_enable oil liboil) \
+		$(use_enable osc liblo) \
+		$(use_enable oss) \
+		$(use_enable python pyecasound) \
+		$(use_enable ruby rubyecasound) \
+		$(use_enable sndfile) \
+		$(use_enable static-libs static) \
+		"${pyconf[@]}"
+}
+
+src_install() {
+	default
+	use python && python_optimize
+
+	if use doc ; then
+		dodoc Documentation/*.html
+		dodoc Documentation/programmers_guide/ecasound_programmers_guide.txt
+	fi
+
+	prune_libtool_files
+}
diff --git a/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch b/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch
new file mode 100644
index 000000000000..8dca486f06e1
--- /dev/null
+++ b/media-sound/ecasound/files/ecasound-2.8.1-ldflags.patch
@@ -0,0 +1,64 @@
+--- ecasound-2.8.1.orig/kvutils/Makefile.am
++++ ecasound-2.8.1/kvutils/Makefile.am
+@@ -56,13 +56,12 @@
+ 			kvu_value_queue.h
+ 
+ libkvutils_la_SOURCES = $(kvutil_sources) $(kvutil_headers)
+-libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@ -static
++libkvutils_la_LDFLAGS = -version-info @LIBKVUTILS_VERSION@:0:@LIBKVUTILS_VERSION_AGE@
+ 
+ libkvutils_debug_la_SOURCES = $(libkvutils_la_SOURCES)
+ libkvutils_debug_la_LDFLAGS = $(libkvutils_la_LDFLAGS)
+ 
+ libkvutils_tester_SOURCES = libkvutils_tester.cpp
+-libkvutils_tester_LDFLAGS = -static
+ libkvutils_tester_LDADD = $(lib_LTLIBRARIES)
+ 
+ noinst_HEADERS = $(kvutil_headers)
+--- ecasound-2.8.1.orig/libecasound/Makefile.am
++++ ecasound-2.8.1/libecasound/Makefile.am
+@@ -364,7 +364,7 @@
+ 
+ libecasound_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
+ libecasound_debug_la_SOURCES = $(ecasound_common1_src) $(ecasound_common2_src)
+-libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags) -static
++libecasound_la_LDFLAGS = -export-dynamic $(eca_ldflags)
+ libecasound_la_LIBADD = $(eca_libadd)
+ libecasound_debug_la_LDFLAGS = $(libecasound_la_LDFLAGS)
+ libecasound_debug_la_LIBADD = $(libecasound_la_LIBADD)
+--- ecasound-2.8.1.orig/libecasound/plugins/Makefile.am
++++ ecasound-2.8.1/libecasound/plugins/Makefile.am
+@@ -105,7 +105,7 @@
+ libecasound_plugins_la_SOURCES          = audioio_dummy.cpp $(plugin_cond_sources)
+ EXTRA_libecasound_plugins_la_SOURCES    = $(plugin_all_sources)
+ libecasound_plugins_la_LIBADD		= $(ECA_S_EXTRA_LIBS)
+-libecasound_plugins_la_LDFLAGS 		= -static
++libecasound_plugins_la_LDFLAGS 		=
+ 
+ libecasound_plugins_debug_la_SOURCES	= $(libecasound_plugins_la_SOURCES)
+ EXTRA_libecasound_plugins_debug_la_SOURCES = $(EXTRA_libecasound_plugins_la_SOURCES)
+--- ecasound-2.8.1.orig/libecasoundc/Makefile.am
++++ ecasound-2.8.1/libecasoundc/Makefile.am
+@@ -14,9 +14,9 @@
+ # !!!
+ # remember to update eca-version.cpp
+ if ECA_AM_DEBUG_MODE
+-eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static
++eca_ldflags = -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@
+ else
+-eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@ -static
++eca_ldflags = -s -version-info @LIBECASOUNDC_VERSION@:0:@LIBECASOUNDC_VERSION_AGE@
+ endif
+ 
+ INCLUDES = -I$(srcdir)
+--- ecasound-2.8.1.orig/pyecasound/Makefile.am
++++ ecasound-2.8.1/pyecasound/Makefile.am
+@@ -28,7 +28,7 @@
+ 				$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/ecacontrol.py
+ endif
+ if ECA_AM_PYECASOUND_CEXT
+-pyecasound_install_list2 = 	pyecasound.so
++pyecasound_install_list2 = 	.libs/pyecasound.so
+ pyecasound_uninstall_list2 =   	$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyecasound.so
+ endif
+ 
diff --git a/media-sound/ecasound/metadata.xml b/media-sound/ecasound/metadata.xml
new file mode 100644
index 000000000000..7a9880111e68
--- /dev/null
+++ b/media-sound/ecasound/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+<longdescription>
+	Ecasound is a software package designed for multitrack audio
+	processing. It can be used for simple tasks like audio playback,
+	recording and format conversions, as well as for multitrack
+	effect processing, mixing, recording and signal recycling.
+	Ecasound supports a wide range of audio inputs, outputs and
+	effect algorithms. Effects and audio objects can be combined
+	in various ways, and their parameters can be controlled by operator
+	objects like oscillators and MIDI-CCs. A versatile console mode
+	user-interface is included in the package.
+</longdescription>
+<use>
+	<flag name="oil">Use <pkg>dev-libs/liboil</pkg> for inner loop optimizations</flag>
+	<flag name="lv2">Add support for Ladspa V2</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/edna/Manifest b/media-sound/edna/Manifest
new file mode 100644
index 000000000000..be3b1c9caddc
--- /dev/null
+++ b/media-sound/edna/Manifest
@@ -0,0 +1,10 @@
+AUX edna-0.6-SystemExit.patch 357 SHA256 530edecafcce36325efa7a68bb44438141639cc2d46bcda6cdf647ae28477cbf SHA512 281557f2a4c90941918bc7b0330b9edceb6f37441bd6726f64f0633e7b5dc0a507a933fe011e0e2eb9eae7639db9c54195ec3374b24cffa7697fbcad855e0bd7 WHIRLPOOL 0ab11df5aec4c3a917dc32c65a437dceb20775b25dbe3f6860639d85dc7f5476894e748cadea797600bebbd93d89b42d04b21e0fb721a993fb161081f58e8aed
+AUX edna-0.6-daemon.patch 2160 SHA256 eda1dc40464a031f816f1023978bb2f7180532cd1e3d134d9bbf52f37cdb7fcd SHA512 ade179d94a2ecdaafc3da58323e4e0cd8a7ede123fad51d6367b23fea235dfd70e5afd6b1562ee8703c4c5478d28358adb6d454893bff70885563e09cc03245e WHIRLPOOL d0f07e608bb459a9f9a24f9e768692fa91b89ca6509049842ceeb9943402353ad2f78500f0f244b7516a5015fa94c53b844ff93eb3cfff4b5067774e2e22af3a
+AUX edna-0.6-flac.patch 1989 SHA256 ff09556d11afa9c3681c71e6223f0fe1de10f7f4e345023ef4f6ebd45f80bea8 SHA512 4b87735c7458893371298d5a2596c74eec467ae75736cd485f5e7713db675784fed924ae744727b187be4cf2b4c60043c3dcd2a7a93ebf07e900a1d5b5b822ac WHIRLPOOL fe4ebf198099344565893185ee50139ff3cc97d74c9c5899021979f9dcff8c16c2b4d04c12272ac3a1dde09a4184943d9a0b0f2ccaa0be43135c7d9680c47d45
+AUX edna-0.6-syslog.patch 2455 SHA256 0f1afbe35cffbb0cd355ef658e2fee142f9e05e7e798a989dd08a0cf850cb453 SHA512 458e3170c7b1dc556474811c6786576e6b6b72ad3a887f96f91a1a7f1563274f72b5e717e1e650f3ddff63a6dee41bd51893a2f5a856401f286f7a9b52af153d WHIRLPOOL 153ee57533dcd46c97bd09ffbe7fdde9ec1f6a5e5ba6ce6fc02c0abf97755f7700056fd0753396f9f84ff634af15cff9be27b3d3d3758265c2e51a001cacc5e4
+AUX edna.gentoo 595 SHA256 25edec63fea541682759e4b2caf7c7c6234d80d13b489666a1bc80b7e2d14819 SHA512 9a005074cb39fa2669405fe60b633d388d47d92c73fb4f6ac1c8b384f62a7681604e62dfab57fcdc491076da7fd03b9d41797bf57fd6c4cb4a073b5a8cdf5b04 WHIRLPOOL e257ca317b6e275172b7763432092a2d1590f7318d99855a81cf804ee8758af0cdeb3ffec64c2c92d342b2f29b2cfa4f88a09e76ef89a8ce3319b3557b022203
+DIST edna-0.6.tar.gz 50303 SHA256 601aea3af9fe37407cd9523978e69c71785e09b5d8d57ca911a74c3ce3740c4c SHA512 d48786829c127b0a1e24116524b8b95a91990c8952882ef00d7761fc6c1dd9b4b0037af2b176dbfd066b6d80670bad7a0c724af984b24c6b4bde93c884c3b76b WHIRLPOOL 3850124bdf07f79f10db2926968a0fde99884781d5afb9a67b9ad5afd014e65723e80fd966f9b91cb5e4aba709a6faadcf494be71421d0e1c3b150541db4dcad
+EBUILD edna-0.6.ebuild 1817 SHA256 53f500003767d34a83988cc53673b768742b2eceab963aa1b61e061c6faf6650 SHA512 55b7d4dd43ead18d580013bd16e9655b7fc0714f0fbec5582f18a71b2a604fbf283034546c8323b2fe6b6859cb4aa8f95e5c47b0d033ba67635e94681f0f8389 WHIRLPOOL b3384477cf625fa5761992abd0f12d69bda034d89f4d19d7ece0c7f01457577350208b23d3bcf4fb838b83f1bc75747d3caaf471d3b3dff3e1dc3bcb326b8898
+MISC ChangeLog 2691 SHA256 fa9d22a180d444f6b7651907accf1dd42c1789934707115fa9d9482c0ecebf86 SHA512 9b6712374d89cd5ae4e3780aa3e0a23bdcf7fe40dd6462c00b32631c2ca64c948b1d7c9331331dbad1a3aa8f3d54fb0f5e67d4c84cdcf9a9d39bb4882e43bf1b WHIRLPOOL 1e041fc7285ef016dfc42d82222ef337f26cc649c57e48f12abd87ea66230371f84babeb6d08a88a39810e0e826696d301001352cd1f422b26978f3466718c51
+MISC ChangeLog-2015 5127 SHA256 db2f01f8626f316e11d603c64fe7fc5087e4e38bf2d615ea62ae4fc524e9ef5d SHA512 36ae0d93c22eb197075be82a4ee0e96a8d3c194ef6001b17f59929362b283829665b78f200e55f650a905efe0d9a2e56d952dec22518099adfd75c94e5c1a382 WHIRLPOOL babaf0259a500e332360d06e8f3c8f5941b0d5a43c75594dae17084bfa8d9d72f537a34611fd82125cbc9ea1f2809f3ba499aa9f004ccb73aa8325d862dfb69f
+MISC metadata.xml 450 SHA256 3160511eedcac605117e75e462194e6ee515c72ad52801c1b39592ae55cc0f22 SHA512 8598429fe8407b3522d408ed0de58310bb3902d6f27f78c980adc9ca43992a7010f43d059bd7b85849465ba60b019f7b858405d7d5f950b86bdb4f0ed3d1dbfd WHIRLPOOL 7301b4a8faa40a88a834187ca9059a43cd8dbccfcf80498b5c628a2e54d5bdd904a9bd56044f24ed21bba2182978765f78a0c4fdfc8faabfcdb8a61a8eba6d1e
diff --git a/media-sound/edna/edna-0.6.ebuild b/media-sound/edna/edna-0.6.ebuild
new file mode 100644
index 000000000000..4e8485623966
--- /dev/null
+++ b/media-sound/edna/edna-0.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib user python-r1
+
+DESCRIPTION="Greg Stein's python streaming audio server for desktop or LAN use"
+HOMEPAGE="http://edna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/edna/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+IUSE="flac ogg"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	flac? ( media-libs/mutagen[${PYTHON_USEDEP}] )
+	ogg? ( dev-python/pyogg[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}"-SystemExit.patch \
+		"${FILESDIR}/${P}"-flac.patch \
+		"${FILESDIR}/${P}"-daemon.patch \
+		"${FILESDIR}/${P}"-syslog.patch
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/edna.gentoo edna
+
+	python_foreach_impl python_newscript edna.py edna
+
+	python_scriptinto /usr/$(get_libdir)/edna
+	python_foreach_impl python_domodule ezt.py MP3Info.py
+
+	python_foreach_impl python_optimize
+
+	insinto /usr/$(get_libdir)/edna
+	doins -r templates resources
+
+	insinto /etc/edna
+	doins edna.conf
+
+	dosym /usr/$(get_libdir)/edna/resources /etc/edna/resources
+	dosym /usr/$(get_libdir)/edna/templates /etc/edna/templates
+
+	dodoc README ChangeLog
+	dohtml -r www/*
+}
+
+pkg_postinst() {
+	enewgroup edna
+	enewuser edna -1 -1 -1 edna
+
+	elog "Edit edna.conf to taste before starting (multiple source"
+	elog "directories are allowed).  Test edna from a shell prompt"
+	elog "until you have it configured properly, then add edna to"
+	elog "the default runlevel when you're ready.  Add the USE flag"
+	elog "vorbis if you want edna to serve ogg files."
+	elog "See edna.conf and the html docs for more info, and set"
+	elog "PYTHONPATH=/usr/lib/edna to run from a shell prompt."
+}
diff --git a/media-sound/edna/files/edna-0.6-SystemExit.patch b/media-sound/edna/files/edna-0.6-SystemExit.patch
new file mode 100644
index 000000000000..78aec6f3176a
--- /dev/null
+++ b/media-sound/edna/files/edna-0.6-SystemExit.patch
@@ -0,0 +1,11 @@
+--- edna.py.orig	2007-01-27 15:31:00.000000000 +0000
++++ edna.py	2007-01-27 16:03:30.000000000 +0000
+@@ -1159,7 +1159,7 @@
+ 
+   if os.path.isfile(fname) != 1:
+     print "edna: %s:No such file" %fname
+-    raise systemExit
++    raise SystemExit
+ 
+   if daemon_mode:
+     daemonize('/dev/null', '/var/log/edna.log', '/var/log/edna.log', '/var/run/edna.pid')
diff --git a/media-sound/edna/files/edna-0.6-daemon.patch b/media-sound/edna/files/edna-0.6-daemon.patch
new file mode 100644
index 000000000000..e003689956a7
--- /dev/null
+++ b/media-sound/edna/files/edna-0.6-daemon.patch
@@ -0,0 +1,67 @@
+--- edna.py.orig	2007-01-27 18:49:16.000000000 +0000
++++ edna.py	2007-01-27 18:47:19.000000000 +0000
+@@ -36,7 +36,9 @@
+ import string
+ import os
+ import cgi
++import ctypes
+ import urllib
++import pwd
+ import socket
+ import re
+ import stat
+@@ -1149,7 +1151,7 @@
+       print '  if config-file is not specified, then edna.conf is used'
+       sys.exit(0)
+ 
+-def daemonize(stdin='/dev/null', stdout='/dev/null', stderr='/dev/null',pname=''):
++def daemonize(stdin='/dev/null', stdout='/dev/null', stderr='/dev/null', pname='', uid = None):
+     '''This forks the current process into a daemon.
+     The stdin, stdout, and stderr arguments are file names that
+     will be opened and be used to replace the standard file descriptors
+@@ -1159,6 +1161,11 @@
+     if it shares a file with stdout then interleaved output
+     may not appear in the order that you expect.
+     '''
++    # Rename process in /proc/<pid>/stat from python to edna
++    # (helps start-stop-daemon find us)
++    libc = ctypes.CDLL('/lib/libc.so.6')
++    libc.prctl(15, 'edna\0', 0, 0, 0)
++    
+     # Do first fork.
+     try: 
+         pid = os.fork() 
+@@ -1186,6 +1193,8 @@
+         sys.stderr.write("fork #2 failed: (%d) %s\n" % (e.errno, e.strerror)    )
+         sys.exit(1)
+     # Now I am a daemon!
++    # If specified change the process owner
++    if uid: os.setuid(uid)
+     # Redirect standard file descriptors.
+     si = open(stdin, 'r')
+     so = open(stdout, 'a+')
+@@ -1198,9 +1207,16 @@
+ if __name__ == '__main__':
+   fname = 'edna.conf'
+   daemon_mode=0
++  uid = os.getuid()
++  pidfile = '/var/run/edna.pid'
+   for a in sys.argv[1:]:
+     if a == "--daemon":
+       daemon_mode=1
++    elif a.startswith("--user"):
++      uname = a.split("=")[1].strip()
++      uid = pwd.getpwnam(uname)[2]
++    elif a.startswith("--pidfile"):
++      pidfile = a.split("=")[1].strip()
+     elif a == "--help" or a == "-h" or string.find(a, '--')==0:
+       usage()
+     else:
+@@ -1211,6 +1227,6 @@
+     raise SystemExit
+ 
+   if daemon_mode:
+-    daemonize('/dev/null', '/var/log/edna.log', '/var/log/edna.log', '/var/run/edna.pid')
++    daemonize(uid = uid, pname = pidfile)
+ 
+   run_server(fname)
diff --git a/media-sound/edna/files/edna-0.6-flac.patch b/media-sound/edna/files/edna-0.6-flac.patch
new file mode 100644
index 000000000000..b22687d2fb05
--- /dev/null
+++ b/media-sound/edna/files/edna-0.6-flac.patch
@@ -0,0 +1,79 @@
+--- edna.py.orig	2007-01-31 19:25:14.000000000 +0000
++++ edna.py	2007-01-31 20:55:09.000000000 +0000
+@@ -64,6 +64,12 @@
+   oggSupport = 'no'
+ 
+ try:
++  from mutagen.flac import FLAC
++  flacSupport = True
++except ImportError:
++  flacSupport = False
++
++try:
+   import cStringIO
+   StringIO = cStringIO
+ except ImportError:
+@@ -920,6 +926,9 @@
+     if ext == '.ogg':
+       info = OggInfo(fullpath)
+       self.__dict__.update(info.__dict__)
++    elif ext == '.flac':
++      info = FlacInfo(fullpath)
++      self.__dict__.update(info.__dict__)
+     else:
+       info = MP3Info.MP3Info(open(fullpath, 'rb'))
+       self.__dict__.update(info.__dict__)
+@@ -1001,6 +1010,45 @@
+             self.transcoded = val
+     self.valid = 1
+ 
++class FlacInfo:
++	def __init__(self, name):
++		# Setup the defaults
++		self.valid = 0
++		self.total_time = 0
++		self.samplerate = 'unknown'
++		self.bitrate = 'unknown'
++		self.mode = ''
++		self.mode_extension = ''
++		
++		if not flacSupport: return
++		
++		mflac = FLAC(name)
++		streaminfo = mflac.metadata_blocks[0]
++		
++		self.samplerate = streaminfo.sample_rate
++		self.total_time = streaminfo.length
++		self.bitrate =int(round((streaminfo.bits_per_sample * streaminfo.total_samples) / streaminfo.length))
++		self.filesize = os.path.getsize(name) / (1024 ** 2)
++		
++		for key, val in mflac.tags:
++			if key == 'TITLE':
++				self.title = val
++			elif key == 'ARTIST':
++				self.artist = val
++			elif key == 'ALBUM':
++				self.album = val
++			elif key == 'DATE':
++				self.year = val
++			elif key == 'GENRE':
++				self.genre = val
++			elif key == 'VENDOR':
++				self.vendor = val
++			elif key == 'TRACKNUMBER':
++				self.track = val
++			elif key == 'DESCRIPTION':
++				self.comment = val
++		
++		self.valid = 1
+ 
+ def _usable_file(fname):
+   return fname[0] != '.'
+@@ -1044,6 +1092,7 @@
+   '.avi' : 'video/x-msvideo',
+   '.mpg' : 'video/mpeg',
+   '.ogg' : 'application/x-ogg',
++  '.flac' : 'audio/x-flac',
+   '.m4a' : 'audio/mp4',
+   '.mp4' : 'video/mp4',  
+   }
diff --git a/media-sound/edna/files/edna-0.6-syslog.patch b/media-sound/edna/files/edna-0.6-syslog.patch
new file mode 100644
index 000000000000..4ff0bbf8bdb9
--- /dev/null
+++ b/media-sound/edna/files/edna-0.6-syslog.patch
@@ -0,0 +1,83 @@
+--- edna.py.orig	2007-01-27 18:53:24.000000000 +0000
++++ edna.py	2007-01-27 18:58:38.000000000 +0000
+@@ -42,6 +42,7 @@
+ import socket
+ import re
+ import stat
++import syslog
+ import random
+ import time
+ import struct
+@@ -144,6 +145,12 @@
+           self.log = open(log, 'a')
+         except IOError:
+           pass
++    else:
++      try:
++        syslog.openlog('edna')
++        self.log = True
++      except:
++        pass
+     
+     template_path = config.get('server', 'template-dir')
+     template_file = config.get('server', 'template')
+@@ -254,7 +261,7 @@
+             (config.get('server', 'binding-hostname'), self.port),
+             EdnaRequestHandler)
+     except socket.error, value:
+-        self.log_message( "edna: bind(): %s" % str(value[1]) )
++        self.log_message( "bind(): %s" % str(value[1]) )
+         raise SystemExit
+ 
+   def server_bind(self):
+@@ -290,12 +297,17 @@
+     return 0
+ 
+   def log_message(self, msg):
+-    if self.log:
+-      try:
+-        self.log.write(msg + '\n')
+-        self.log.flush()
+-      except IOError:
+-        pass
++      if self.log == True:
++        try:
++           syslog.syslog(msg)
++        except:
++           pass
++      elif self.log:
++        try:
++           self.log.write('edna: ' + msg + '\n')
++           self.log.flush()
++        except IOError:
++           pass
+ 
+   def debug_message(self, msg):
+     if debug_level<1:
+@@ -1125,21 +1137,21 @@
+ 
+   svr = Server(fname)
+   if oggSupport == 'yes':
+-    svr.log_message('edna: Ogg Vorbis support enabled')
++    svr.log_message('Ogg Vorbis support enabled')
+   else:
+-    svr.log_message('edna: Ogg Vorbis support disabled, to enable it you will need to install the "pyogg" and the "pyvorbis" modules')
++    svr.log_message('Ogg Vorbis support disabled, to enable it you will need to install the "pyogg" and the "pyvorbis" modules')
+ 
+-  svr.log_message("edna: serving on port %d..." % svr.port)
++  svr.log_message("serving on port %d..." % svr.port)
+   try:
+     while running:
+ #      print 'waiting ... '
+       if config_needed:
+-        svr.log_message('edna: Reloading config %s' % fname)
++        svr.log_message('Reloading config %s' % fname)
+         svr.server_close()
+         svr = Server(fname)
+         config_needed  = None
+       svr.handle_request()
+-    svr.log_message ("edna: exiting")
++    svr.log_message ("exiting")
+     sys.exit(0)
+   except KeyboardInterrupt:
+     print "\nCaught ctr-c, taking down the server"
diff --git a/media-sound/edna/files/edna.gentoo b/media-sound/edna/files/edna.gentoo
new file mode 100644
index 000000000000..add215faca76
--- /dev/null
+++ b/media-sound/edna/files/edna.gentoo
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+#
+# Startup script for the edna mp3 mini server 
+#
+# description: edna is a mini mp3 webserver
+# processname: python
+# pidfile: /var/run/ednad.pid
+# config:
+
+PYTHONPATH=/usr/lib/edna
+EDNA=/usr/bin/edna
+EDNACONF=/etc/edna/edna.conf
+PIDFILE=/var/run/edna.pid
+USER=edna
+
+depend() {
+	need local
+}
+
+start() {
+	ebegin "Starting edna mp3 server"
+	start-stop-daemon --env PYTHONPATH=$PYTHONPATH \
+		--start --exec $EDNA -- --daemon --user=$USER --pidfile=$PIDFILE $EDNACONF
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ednad"
+	start-stop-daemon --quiet --stop --pidfile $PIDFILE
+	eend $?
+}
diff --git a/media-sound/edna/metadata.xml b/media-sound/edna/metadata.xml
new file mode 100644
index 000000000000..34878382b07c
--- /dev/null
+++ b/media-sound/edna/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <longdescription>
+  Edna is Greg Stein's http streaming audio server for mp3 and ogg files.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">edna</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/entagged-tageditor/Manifest b/media-sound/entagged-tageditor/Manifest
new file mode 100644
index 000000000000..104309858a73
--- /dev/null
+++ b/media-sound/entagged-tageditor/Manifest
@@ -0,0 +1,6 @@
+AUX entagged-tageditor-0.35-buildfixes.patch 1861 SHA256 54e2bbbe1b735a25af09d1da2f990b1b147086a38f3c7a225238b516256c902a SHA512 3a13a22f9bc06e55eddf8fdc3786799a652cc4122989f836b2636536ba81fbb44af7c8ac921c861658ec4f3bd51f37ab60079a6cb4aa4045fb799d90a461d477 WHIRLPOOL 5864a094de38ae8d33d678e7227d8e2f35e4905b759d199b52e44f1e2b1c9ae8b365f496d011aa7e20d9d38f0ca2cd97d596939713de3af1037d887fbcc79e2b
+DIST entagged-tageditor-0.35.tar.gz 4606721 SHA256 c9e9b69a49bdf6646cc21dc3cc0734e6c54ac91e99774b1d87a6765b365611ac SHA512 cefebce7381d489ccd821933c3a1d330713d4de6cf9366aa699f5017939620589c95a2ee162aabc7bfa6d42d56b5986f4ecaa2f1f77ec586cda5f6780f0a06f3 WHIRLPOOL 0f3b08f4dc268d6965250fecd5eb801e463221ce27b2098bfc0f63e4b068d5b4f26c330c8ea894ec05e92ce231facb57793e816f3f74175b04dfdeab444ce1e0
+EBUILD entagged-tageditor-0.35.ebuild 1113 SHA256 66a2298636fc632090e3cf8ab5aee643bfb21cebefdcacaf549a78d4b970c694 SHA512 249ceef4824168d325b2853031879a7052d87f98dec7e40a95390c51354ca6382b2d1b10c3d50c76ff7c31f77a6a905a31bbb40d5ec097110dae1de6d450f513 WHIRLPOOL a60a291c4674c250c47310c1cdc031cfecf17de18704ee980beabef66cbe4677652985c1b1a43fa0deb410cce91559cc125bec3eeb04db0492e25a0dcd1510e9
+MISC ChangeLog 3058 SHA256 490982a1e83785771e496db523f8bb7885584489ce64dad2e49b1bea64d5d8fb SHA512 1a2046e3f157a05c8eb760e5b50524e2b38e84823430038b7453dca4f9330ff7c7d9eef9225ff50de1097d78ec7954b62e41cd15dc59953c31da5e2a40bbbe2a WHIRLPOOL 3f05c4ae1dcb79dd156235ace59df920c4eb018b9a1f1842f34a90d172a1df8219005272337131e2d89ea852a7372ece56639cf50679094d94ab2fb80eabf67f
+MISC ChangeLog-2015 578 SHA256 708ffb3b94f17ec3779d4fbfe5bc53f7cbc3c6a27733279acccd5ef393610fdf SHA512 2e28271dd84c4bdbf8c0bec1c46be78697ec906bf03ca7340d68902b4f48ba89dfaeb53df8c30bb88837679b3f515c0e06eb67a311e21cb2c3ada7d321a4937a WHIRLPOOL c13d33807d8ec660ff58e23f4491770daa17f0cf9b174594e774dba5b4c021fd8a538789072158ac4584eb8be4a344067993d1869d86ccf2540d0d1da8e3c20c
+MISC metadata.xml 294 SHA256 465d8774fdd97c0fdad9d38e6d233805a695ae5412d4d04cfadbf7496fc2292e SHA512 d9ab3a99fc847b029f4c1ac9ab321b066de58a68c2e5841147b6a4a25a940c8629f0dd4acb06a057acafc7420009fbd4b3843ed82ce85ece6e32b21aad24690e WHIRLPOOL 933be7b451fd1324a6d2bc4ed8a0369d8ef2d3a6610da6aed4c276ecc4e4020e54af82b854ac8a0259d649042a066bd9448a8b834d29f0b253f5a6cfc924816f
diff --git a/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild b/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
new file mode 100644
index 000000000000..79edbc44d76c
--- /dev/null
+++ b/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Open-source audiofile tagger"
+HOMEPAGE="http://entagged.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+S="${WORKDIR}"
+
+RDEPEND=">=virtual/jre-1.5
+	dev-java/squareness-jlf
+	dev-db/hsqldb"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-db/hsqldb"
+
+EANT_BUILD_XML="entagged/build.xml"
+EANT_BUILD_TARGET="build"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p test/entagged/junit || die
+	mv entagged/entagged/junit test/entagged || die
+	rm entagged/*.jar || die
+	java-pkg_jarfrom hsqldb hsqldb.jar entagged/hsqldb.jar
+	cd entagged || die
+	epatch "${FILESDIR}"/${P}-buildfixes.patch
+}
+
+src_install() {
+	cd entagged || die
+	java-pkg_newjar ${P}.jar ${PN}.jar
+	java-pkg_register-dependency squareness-jlf
+	java-pkg_dolauncher ${PN} --main entagged.tageditor.TagEditorFrameSplash
+	newicon entagged/tageditor/resources/icons/entagged-icon.png ${PN}.png
+	make_desktop_entry ${PN} "Entagged Tag Editor" ${PN}
+}
diff --git a/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch b/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch
new file mode 100644
index 000000000000..7b470e2dbeb5
--- /dev/null
+++ b/media-sound/entagged-tageditor/files/entagged-tageditor-0.35-buildfixes.patch
@@ -0,0 +1,31 @@
+--- build.xml	2007-03-23 16:25:25.000000000 +0200
++++ build.xml.fixed	2007-09-01 09:20:44.000000000 +0300
+@@ -30,7 +30,7 @@
+ 	<property name="entagged_dir" location="."/>

+ 	<property name="entagged_base_dir" location=".."/>

+ 	<property name="tageditor_dir" location="tageditor"/>

+-	<property name="tageditor_version" value="0.21"/>

++	<property name="tageditor_version" value="0.35"/>

+ 	<property name="tageditor_jar" value="entagged-tageditor-${tageditor_version}.jar"/>

+ 	<property name="tageditor_zip" value="entagged-tageditor-${tageditor_version}.zip"/>

+ 	<property name="tageditor_tar" value="entagged-tageditor-${tageditor_version}.tar"/>

+@@ -52,7 +52,7 @@
+ 	

+ 	<!-- Compile the sources -->

+     <target name="compile" depends="clean">

+-		<javac srcdir="${entagged_dir}" classpath="${entagged_base_dir}" excludes="entagged/junit/*" source="1.4"/>

++		<javac srcdir="${entagged_dir}" classpath="hsqldb.jar" excludes="entagged/junit/*"/>

+ <echo>

+ Entagged Tag editor is now fully compiled.

+ You can use either:

+@@ -71,9 +71,8 @@
+ 	<!-- Prepares the classes to be packaged -->

+ 	<target name="build" depends="compile">

+ 		<!-- Jar the classes files  -->

+-		<jar destfile="${tageditor_jar}" basedir="${entagged_base_dir}" includes="entagged/**/*.class entagged/**/*.xsl entagged/**/*.dtd entagged/**/*.properties entagged/**/*.html entagged/tageditor/resources/**/*" excludes="**/*.java" >

++		<jar destfile="${tageditor_jar}" basedir="${entagged_base_dir}/entagged" includes="entagged/**/*.class entagged/**/*.xsl entagged/**/*.dtd entagged/**/*.properties entagged/**/*.html entagged/tageditor/resources/**/* miage/**/*.class" excludes="**/*.java" >

+ 			<manifest>

+-				<attribute name="Class-Path" value="${tageditor_jar_classpath}"/>

+ 				<attribute name="Main-Class" value="${tageditor_jar_mainclass}"/>

+ 			</manifest>

+ 		</jar>

diff --git a/media-sound/entagged-tageditor/metadata.xml b/media-sound/entagged-tageditor/metadata.xml
new file mode 100644
index 000000000000..4d2b70e37efa
--- /dev/null
+++ b/media-sound/entagged-tageditor/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">entagged</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/erec/Manifest b/media-sound/erec/Manifest
new file mode 100644
index 000000000000..6c6d45e4bfad
--- /dev/null
+++ b/media-sound/erec/Manifest
@@ -0,0 +1,6 @@
+AUX erec-2.2.0.1-gcc43.patch 340 SHA256 246e49e242b8985a396029c3031b7d8a70cb913e9b5e29b2f2041be76738459a SHA512 12f94249223911709ce46b3c5b1985019232f2d2ea906cfdebc30f6fd9e314e38ec40b734ea235d063f499e651a76fb05bcbfdd3be190b41e03625180b154cb0 WHIRLPOOL 6a97b4ec2f4211419ec9fd2f270e233f63ba4858fbd07af5b84a350a5a4030c956831a4fe88f899ca55c0178c86d2bfd61a7b1edd8b530cb9743361236abb1d8
+DIST erec-2.2.0.1.tar.bz2 25966 SHA256 31fe1baa2738aa690e6af24c01950b4f67cf1b71feaeab4cdfbd9f5f76fe060f SHA512 24832483ebca011294931a40be192fa1f6a0fbf69d2b515529bd6d9cbdb5bbd904f266bd824f816d044ed7ba63bc8cc6886868a0d594a0071e757c3e9ebfef28 WHIRLPOOL 38fca9949453615797a1aa31dcb7d7e88a21be35fe40544e4352e59e49cf9c03434075b61a44f0b932ea6e5005c4920a57ff993e20fe61757ad0103ae8ee757c
+EBUILD erec-2.2.0.1.ebuild 1009 SHA256 a0c1f3729c4b34201b4a78d3d8ec3a708ef419a6f84b20430c663b61dda2bd3f SHA512 5e2a421057ecf12ab43cf5554c4e8e5286b21c1e5c043079e75e8c8d87d29555cde3f38ba83fdff4aef3cb24b3e79c424711d450b7fd9364aafbd9f6071b3fd1 WHIRLPOOL e7108c10d10e3144815c80dfbd490e304a289b7d5a1ee765e3df25b9eba6a4d5b0e82a3bd86f92e3753445926ef47ba4750f8a492512b1bdbd7811a5a5b7eb81
+MISC ChangeLog 2458 SHA256 5fa709f34e15997b76307f43ffdee589d3725ad418672455886ca8bd701c5430 SHA512 83d3d36315084cdf7ee318b466324c94c80c434fbd3c97b422c3720bec829d94d750caaff06550aff1278feadf530a11515a7ccb29db212dae83f19903193278 WHIRLPOOL d701551f00a98184b8e7bffe4765eca78cd6d779f4797d74abde9df455f00f5c86136a9cec7615361d97db20c7a9b76bde5ed8248f80d9fc34405ccffca88478
+MISC ChangeLog-2015 1478 SHA256 5a2a18335703179120d0cdb19685962704e383d57dc347c4a98c3d82f8a6fb2d SHA512 c8d5f0a1138be460102ae41ef77fa2820a3bf057ec370bef43d0243c43d3b82b75bc2e117f13323e3c898903d8e3495705712455483cd03a2f61ccc027bd067f WHIRLPOOL 1fac4114caf0e7a480c1af6f82da6eb8dcb6c6f8d935d504107722046df736e57f850f91ac501ae28306998a7ae19640aeafff71ace9d9ed6fd22738be6b2948
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/erec/erec-2.2.0.1.ebuild b/media-sound/erec/erec-2.2.0.1.ebuild
new file mode 100644
index 000000000000..128267ee67b5
--- /dev/null
+++ b/media-sound/erec/erec-2.2.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A shared audio recording server"
+HOMEPAGE="http://bisqwit.iki.fi/source/erec.html"
+SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+
+KEYWORDS="amd64 ~ppc sparc x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="sys-apps/sed"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e "s:BINDIR=/usr/local/bin:BINDIR=${D}usr/bin:" \
+		-e "s:^\\(ARGHLINK.*-L.*\\):#\\1:" \
+		-e "s:^#\\(ARGHLINK=.*a\\)$:\\1:" \
+		-e "s:\$(CXX):\$(CXX) \$(CXXFLAGS) -I\"${S}\"/argh:g" \
+		Makefile
+
+	sed -i \
+		 -e "s:CPPFLAGS=:CPPFLAGS=-I\"${S}\"/argh :" \
+		Makefile.sets
+
+	echo "" > .depend
+	echo "" > argh/.depend
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -j1 || die
+}
+
+src_install() {
+	dobin erec || die
+	dodoc README
+	dohtml README.html
+}
diff --git a/media-sound/erec/files/erec-2.2.0.1-gcc43.patch b/media-sound/erec/files/erec-2.2.0.1-gcc43.patch
new file mode 100644
index 000000000000..9e6fdcb7182c
--- /dev/null
+++ b/media-sound/erec/files/erec-2.2.0.1-gcc43.patch
@@ -0,0 +1,11 @@
+diff -Nurpa erec-2.2.0.1.orig/argh/argh.cc erec-2.2.0.1/argh/argh.cc
+--- erec-2.2.0.1.orig/argh/argh.cc	2008-12-17 03:48:35.000000000 +0300
++++ erec-2.2.0.1/argh/argh.cc	2008-12-17 03:49:19.000000000 +0300
+@@ -1,6 +1,7 @@
+ #include <map>
+ #include <cstdio>
+ #include <cstring>
++#include <cstdlib>
+ 
+ using std::strchr;
+ using std::sprintf;
diff --git a/media-sound/erec/metadata.xml b/media-sound/erec/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/erec/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
new file mode 100644
index 000000000000..a4af28774536
--- /dev/null
+++ b/media-sound/exaile/Manifest
@@ -0,0 +1,5 @@
+DIST exaile-3.4.5.tar.gz 3662446 SHA256 c875a5c13aa8efb0864d6bafc37e6d3b09f84e251cdb7b77098e6609fb5d00ad SHA512 9337b86ed2f6a13071615bd46a7a05a6564011a4e1fef4cb42925336864c07854cfe497d8defe65c4e287fd9546de6a51543180c5ce6a84525506e57209914be WHIRLPOOL e84c95bab48a9488e2738c16088a3fff333a8af712dd52ac5f0b9d4ce1bdbfc379c2be4fafaf532bb8f44605f1a6ec26cac2e5e96a4a29ba813fdc8b70bbea94
+EBUILD exaile-3.4.5.ebuild 1284 SHA256 a0544ce13125ba324cb704f30aa6d5956561d1065b0ccb34a68ac1ddf56539b2 SHA512 3af1d3389aa7d54a81743130efa5414d1cfe717445d8beb13232d54e82e81ec67451c5491f9af96c5de8ab3cb9d8ed03b5b426f3cdef532e72d4c58151648634 WHIRLPOOL 94cade1203a0f0a16647bc09f01ae440a7915b2de90ecb4f5cd1aeb95b703ed3efff8bd2c69bdb9e41610be75aaacf7587dbe44bd864d4d77646790ed1ac7576
+MISC ChangeLog 3635 SHA256 fa318015fbe891bda4c42b72e3164f2772f9ce44e35efddd610855607af847fe SHA512 4a8d03ca5f43dfe44fbd57a981e5d782342cbc6d0121d275a69db712cc40baf2ec9db1ef11bbb66c1cc33f7566d076dfbcf3e0080f924e09c59691904cf5f45d WHIRLPOOL 4b90971e4dc8b6859650fa93219246125861794f75cb090ca1f48c992fd6465c7f01cc32be6528bfd99ade767f47070d7d731c2fa0b348fa0e40c556b690950f
+MISC ChangeLog-2015 12037 SHA256 372f78f192f6fbb276b7b00be165c602091ef15d24a2da6106ab8dbffd5ef185 SHA512 babb07b6907352549ccf902cced7699873214d6cb7a765d53bfdb7d8c526032cc59ebdb860f91bd352345d2369ce3df4dc5f59d0ee27cd7036c13d1ffcaa2ba7 WHIRLPOOL 75bf15ca362aae1a3154b3173463880d58d70d72e307fcc0028f354a26c9feec6a3b11820373a2bfa4ba73e96aa4d661698e8c1bdbfb9c546370157bb120def6
+MISC metadata.xml 380 SHA256 159dd951b9c2d719b7e2274a93fc838c5bd37fdd20bbb3642914a636ce431231 SHA512 763f538de48767038faac1b7ffed4ac1422be573b6e2e01ff6679e8aeff00f2d14a3fc6bcf40e742a639f36f13cfe893fea77e5fd4f8a273af5d8cfa8db529bf WHIRLPOOL 9325bfb480618d67f825ddb7e27b98cef18996a3cfbe496c79befcbababa24518c57b5437022217adc8bc7136ccaa65103dc5f440a958dd3c8caa59f140a25b3
diff --git a/media-sound/exaile/exaile-3.4.5.ebuild b/media-sound/exaile/exaile-3.4.5.ebuild
new file mode 100644
index 000000000000..de353fde214d
--- /dev/null
+++ b/media-sound/exaile/exaile-3.4.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit fdo-mime multilib python-r1
+
+DESCRIPTION="a media player aiming to be similar to AmaroK, but for GTK+"
+HOMEPAGE="http://www.exaile.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="cddb libnotify nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/dbus-python
+	dev-python/gst-python:0.10
+	>=dev-python/pygtk-2.17
+	>=dev-python/pygobject-2.18:2
+	media-libs/gst-plugins-good:0.10
+	>=media-libs/mutagen-1.10
+	media-plugins/gst-plugins-meta:0.10
+	cddb? ( dev-python/cddb-py )
+	libnotify? ( dev-python/notify-python )"
+DEPEND="
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
+
+RESTRICT="test" #315589
+
+src_compile() {
+	if use nls; then
+		emake locale
+	fi
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		LIBINSTALLDIR=/$(get_libdir) \
+		DESTDIR="${D}" \
+		install$(use nls || echo _no_locale)
+
+	dodoc FUTURE
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-sound/exaile/metadata.xml b/media-sound/exaile/metadata.xml
new file mode 100644
index 000000000000..3f99551b683a
--- /dev/null
+++ b/media-sound/exaile/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">exaile</remote-id>
+		<remote-id type="github">exaile/exaile</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/ezstream/Manifest b/media-sound/ezstream/Manifest
new file mode 100644
index 000000000000..b3a3536646da
--- /dev/null
+++ b/media-sound/ezstream/Manifest
@@ -0,0 +1,7 @@
+AUX ezstream.confd 60 SHA256 29464e3c0833a2214351d27c73c0d9a347715e0b62768846b701c214ada51941 SHA512 09f178f665d8677e3c75055028f975b98310fb2017ac0d69ae40b6417134ecec40ac90493fb861e1c46a2473fdd87bc088955032e62ddfbb8e201b306066d9c3 WHIRLPOOL 9b123b2f13100e9f965996f44ba7e6fc5a2913db1fb6e95dcb9ed4cc02247eb45037ca645f256b5f09eaa2a253d40528d09517affbc08faeb796dbc954293422
+AUX ezstream.initd 633 SHA256 cd7a90b019700ac28e5b007dea52602aecdd6c3708a6986602f217e57b71186c SHA512 684b56d3f828ce518d5fa1d5d9be64ef4b1d591fd0bed75d9842cc8d2ed79c8aab500d22465e02c60b8be5f1662462ff3a4b19a789ac807d290113cf29f6efd3 WHIRLPOOL 333d2c2e5f77aadd627f974cd4c0525f26b3f95337baf15415ba5af187edd8962b46a6ca93f82cf729ccd86cdf3150fdf2e8b971ea9cdeb4e9f3cbb2d64ca0e4
+DIST ezstream-0.6.0.tar.gz 250448 SHA256 f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9 SHA512 d6b621db85a0d56dcc54a8b7a0136c25342ec507f04ab397a53f46a74e85e94806e17d0a0a59e66096b5c0d97b7f98eaba95a50c1ca6c8d82aed11b854d0d33d WHIRLPOOL 7f9960add62ec83c72fef7db8a7d7836a689879127ba7ad72f0584c152e74d76cef9def4f9251d3101b3e21b344ac8a64e47145969880c5f1fedead8ab80d398
+EBUILD ezstream-0.6.0-r1.ebuild 913 SHA256 1a35a312d49bbb44c26ff66001cd68b7d59259bab042e674af98fb9a1802279e SHA512 14ce2e86599df973e9a8d720ea730b4503bac63dce677d1b63b05d57ba03524ebff7b0a1c066daa1d81a14b22ce4357145b166a2ca96c7acea950ad14217003b WHIRLPOOL 55c9d487f738e7d07e8adf03dc6f6cecefb9d6a596de90c74b19ab37c60ae5f4edadca041a6e7fc7f86a25cbc7d05d1407077369d6c39b279b5b5436ec009d30
+MISC ChangeLog 2666 SHA256 b54010c965a2ea615cd693068f4f9161eb1f7f8ae9d167c7b4cce8107e58efab SHA512 7b59602e443ba6bff4027c6b4dae50180d7f06d3e2cc16b340ce20c6fb69785b4d29eec46b112b47139615edf487d16182b97df8aebd111777420bbb1c0846c7 WHIRLPOOL 268ed766efc901ad36296622f1e4e2a0f62b220312eced137004734199f5902ac35489806baa0fb4a9feb24296fff1cb416b4b554698e79229ab99d1d4488b65
+MISC ChangeLog-2015 2024 SHA256 cee2ef447f5faede74585d238b843fe38bc41842c1ff32d58e43cdd03852bb52 SHA512 9d35fe785946be5b21bce303d7abc4cc3b4781ab0a0b133240659b8e0a435ac73ae2e2e8d1bf6fe43c0dd43fc297a711ae1cbd29f849627cca1514a66216343b WHIRLPOOL 72e12ee88dc99d6ed4e8b67b4b59a183196d69c7c5c2479b57bf213a7eb4e35ecaa28d86e88f8374b0bd21996d28e67f92ff178f3747d05b63beec2c24b6ea81
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild b/media-sound/ezstream/ezstream-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..59af61c756cb
--- /dev/null
+++ b/media-sound/ezstream/ezstream-0.6.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A command line source client for Icecast media streaming servers"
+HOMEPAGE="http://www.icecast.org/ezstream/"
+SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="taglib"
+
+COMMON_DEPEND="dev-libs/libxml2
+	>=media-libs/libshout-2.2
+	!taglib? ( media-libs/libvorbis )
+	taglib? ( media-libs/taglib )"
+RDEPEND="${COMMON_DEPEND}
+	net-misc/icecast"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local docdir=/usr/share/doc/${PF}
+
+	econf \
+		--docdir=${docdir} \
+		--enable-examplesdir=${docdir}/examples \
+		$(use_with taglib taglib "/usr")
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	rm -f "${D%/}"/usr/share/doc/${PF}/COPYING
+}
diff --git a/media-sound/ezstream/files/ezstream.confd b/media-sound/ezstream/files/ezstream.confd
new file mode 100644
index 000000000000..6480e0c7a71f
--- /dev/null
+++ b/media-sound/ezstream/files/ezstream.confd
@@ -0,0 +1,5 @@
+# Config location
+CONFIGFILE=""
+
+# Options
+EZSTREAM_OPTS=""
diff --git a/media-sound/ezstream/files/ezstream.initd b/media-sound/ezstream/files/ezstream.initd
new file mode 100644
index 000000000000..f83e96473e35
--- /dev/null
+++ b/media-sound/ezstream/files/ezstream.initd
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+
+depend() {
+	need icecast
+}
+
+checkconfig() {
+	if [ ! -e ${CONFIGFILE} ]; then
+		eerror "You need to make a config file"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ezstream"
+	start-stop-daemon --background --start --pidfile /var/run/ezstream.pid \
+		--make-pidfile --user icecast --group nogroup \
+		--exec /usr/bin/ezstream -- ${EZSTREAM_OPTS} -c "${CONFIGFILE}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ezstream"
+	start-stop-daemon --stop --pidfile /var/run/ezstream.pid --name ezstream
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading ezstream"
+	kill -1 `cat /var/run/ezstream.pid`
+	eend $?
+}
diff --git a/media-sound/ezstream/metadata.xml b/media-sound/ezstream/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/ezstream/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/fapg/Manifest b/media-sound/fapg/Manifest
new file mode 100644
index 000000000000..8ab33bfdc820
--- /dev/null
+++ b/media-sound/fapg/Manifest
@@ -0,0 +1,7 @@
+DIST fapg-0.41.tar.gz 94315 SHA256 0c09229c1473999f5939770326d8294adfa1847ae3da5f0c7827747284fc54ae SHA512 17efde8cf0760f2eb3136814d9d332352b9c378213104a5540aee381482d3da72fd17e63e96360bcffe1850399124f1c6fcff9471a89881f746453a092d64ceb WHIRLPOOL 5e3cda2ca73490e536eaead81bbb731a6516d63c6bcea58fa05435c4727bb22dce2e713e04f44a9c55ec4d5739a8761fe0df9a934ecf0f236c79894406ac7eb8
+DIST fapg-0.42.tar.gz 94920 SHA256 f324eca6d5fe958be74beb6336d685aa305133c5da26c99b2c0dbc17c68c0076 SHA512 e3bbef35b9c845d80bcd1ee1116e4eb99b98e9d84cff034f2a49bbfcaa7664ab48b9453fb680fe7274fa74e9e0126950fbb15deb793eb95362f74c11151f8731 WHIRLPOOL bdf021c64996599d9a0eb415dd9494f1c0bb5a08c6d78bcdffebdf1076a9f721ca03895dcc088049cfac0f5b1b985245596c6e4cd5e552709b80b32b1940881c
+EBUILD fapg-0.41.ebuild 620 SHA256 bb30840be6a1e6e0594aadb5041170f6a0d54aa9d3e5ed382db254a99db8dc8b SHA512 89beef2b4f38b78065e021c7398211ec75bc80459a792e53f9d06fac535d6efb885e693b0eb4dc8cdcd434b6973985f4b4ee8da6b3befaf9d7356844881f69fe WHIRLPOOL a01b3361e8086d5306b7d01461a96f95c413a6b937f2c15595ae5cb132245500cca227323f69ba00eccd7271743773f76149be7848f7fd9121e0aa2ca71d4edd
+EBUILD fapg-0.42.ebuild 623 SHA256 d43a49e5e7292e854cdfcb96bb9d89d24dc5ac40c0829cdf72bec2f53c576dd7 SHA512 37af20fa61f3db243637cb4862475667c1bb6989d56722ad7b38f27ea2758b791a5c9fa7c8e10b472b94a7978ffb253f96b8f6440a59de606f22f258d20afd48 WHIRLPOOL 87c63c7cf7b338b952954afb6251fb15d5615b36edcadf66cfb351a7c6769524a51c348d3b50b05747c3575de06fa09e95100d7639d6e661cd6124df037c5a05
+MISC ChangeLog 2463 SHA256 7d06a109e961ee71185eb59bc5db0f00f074592b1148a7cb83f10e62cefdee01 SHA512 f23c669cccdc4ac71c34679ea41ba67d28ac818494e1974749565359e10ce92d5758ee615f94f8fdf353c69199fdea392972e0dce4e55cea729682cc278abd2e WHIRLPOOL cfa4185ed268423b21e47de1d8bd6883cb1b25912dac5cf24cb251e238f1080a6215232aed10f53df9b46364eca49d9fd350366d63aa738aa777457d906f9fff
+MISC ChangeLog-2015 3544 SHA256 b760d983278b4952d426e809ca044bbb3f6828a7b0d178a064a1d1fe131f6e4c SHA512 79759f0a7b8c98c425aced70ec53dc221589f8f9c561fe98007681163906a50457208ac40e1678b999b541f2578f186ebf50722d3103bb1934a84151383a507c WHIRLPOOL 772f8c8071e0529735afdc514a49a084b430bbce9fc2de6377a8f5ce9c0771e4e769d9f627457f2105726b88d77609869ed900dc1f2c6d5aa7e01c5239d54f19
+MISC metadata.xml 345 SHA256 62ca91ee17b0f9b057f4a30c8d8a1579ae6417571508a6fae182d23ea92b856f SHA512 d8286400b18dfe0d38bd49478c84c5d7bebb24a734a74cbdf60a9e91c51f4ecafa476868351a7f09c064887da841f79e0449910df1f3b2a49f460d74cbebccb6 WHIRLPOOL 8a7340bbcf07e67231f1ba6d65deaecd99c1b2a4938d2a6d7c926098f217f9fd82766856e169040714d21367a37c274eaa3b90a201e30a60fc884797583ba5ff
diff --git a/media-sound/fapg/fapg-0.41.ebuild b/media-sound/fapg/fapg-0.41.ebuild
new file mode 100644
index 000000000000..8c2ff799671f
--- /dev/null
+++ b/media-sound/fapg/fapg-0.41.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Fast Audio Playlist Generator"
+HOMEPAGE="http://royale.zerezo.com/fapg/"
+SRC_URI="http://royale.zerezo.com/fapg/${P}.tar.gz"
+IUSE="xspf"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+RDEPEND="xspf? ( >=dev-libs/uriparser-0.6.3 )"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	local myconf=""
+	use xspf || myconf="${myconf} --disable-xspf"
+	econf ${myconf}
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/media-sound/fapg/fapg-0.42.ebuild b/media-sound/fapg/fapg-0.42.ebuild
new file mode 100644
index 000000000000..12892ca36bd3
--- /dev/null
+++ b/media-sound/fapg/fapg-0.42.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Fast Audio Playlist Generator"
+HOMEPAGE="http://royale.zerezo.com/fapg/"
+SRC_URI="http://royale.zerezo.com/fapg/${P}.tar.gz"
+IUSE="xspf"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+RDEPEND="xspf? ( >=dev-libs/uriparser-0.6.3 )"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	local myconf=""
+	use xspf || myconf="${myconf} --disable-xspf"
+	econf ${myconf}
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/media-sound/fapg/metadata.xml b/media-sound/fapg/metadata.xml
new file mode 100644
index 000000000000..1de4614839c0
--- /dev/null
+++ b/media-sound/fapg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="xspf">Enable support for saving XSPF playlists.</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/flac-image/Manifest b/media-sound/flac-image/Manifest
new file mode 100644
index 000000000000..13a52792a0e2
--- /dev/null
+++ b/media-sound/flac-image/Manifest
@@ -0,0 +1,7 @@
+AUX flac-image-1.00-add-missing-string-include.patch 168 SHA256 a982bbfe6e2148dd9c0280a2545cbb9c611c7f9fd5d0aef410b26233258f7c6c SHA512 17045e55a0542399e2698c8c1311b9c6638755d8ec744871ba40e0164f5c062c75997c9d36c5720c64bafb8aab8acbdf763c2c443564504bebc0cc33b52509e4 WHIRLPOOL 018b60de7fdf878aa30b0a37759f5899d0ec5cbdefa9eb402a70a7ce134a8d8e5c42c095463f82ec964e8e0170d65f78efd068af5226ecc1a6d8e509cdab3119
+AUX flac-image-1.00-fix-build-system.patch 490 SHA256 d34a0ab51d630a6dea2110f3a42ffc2638be98e30fded1f11ecb6aebd9f4fb20 SHA512 e47597bb4abe8d1106e7e637979455243beddb816f2570719fe7d467be49d00d1b724db6434ca39f328a82db2f2822dfcc654e02a629d930b98501df6971ece6 WHIRLPOOL e92bdcaa7f738908ab63bb2eec2636eb64bf7f450b599a71430b62e34006544fd8854634501fe3b5769563f8d8e26cb1f72af5f72df417f3ccfd01530f94a0ce
+DIST flac-image-1.00.tar.gz 13948 SHA256 c4ee58d7f447a2a48b12b338682ddca4d9e7630e1dd04cc5e6e190b8a5ce7109 SHA512 71d72a240c0f156b546310bf356f3304bf04152317df683e30205ae79d8b97fe2a29d63e3fdea5b21d0a62390459527ecf33f6d509b36196a8dc0e28cd1a3e1d WHIRLPOOL 4b7f2e8fd42dcf6e7d38a5b4055f869078ce415065a7a297930dcecf0b9c1ea27638f4a49de9dde467854687b5595bb4f4d7a36f335a6894547a2b27d1c138f0
+EBUILD flac-image-1.00.ebuild 796 SHA256 04e7f1372acd87d2351817ac583c60fb04366d3f05e5d3ea19eb7a47d0472199 SHA512 fdecc920b4e0f9107ebcc407e7976deaabef74c841b59c84553d4a4d95f140765a8a82f07df8dfbc5113a66f7c89ea80f9b1111bd81c4c7a9a3a03e630228d86 WHIRLPOOL 3312b1df5659c7f09fb5968846f22f2835d7507ea24f78c000d7dde7d26c3a251c5277832974e918f0671569debb69329c2d7084d07a4da214e5f9682afa1b58
+MISC ChangeLog 2437 SHA256 b6a52df27e8f05abdaa74c9a9dff0c90d513f50fec9cea947b39d01784fd32b2 SHA512 d8d54362b33cd3e46665ba94c1b8ae51f2450ee6c60ded9fcece17b8f053598bad5893643282a5622aace35658bf9a86ed7ec4a94f3d5176488021df22fd090d WHIRLPOOL 1d2e204639d07d70770668a287f11063ae48662271bd0d96845a54624abb4e61f220d0b4a3ed64836770ef81fa4a33449a60d642c51a6de458dfa2abd51b31ea
+MISC ChangeLog-2015 629 SHA256 85218c4def458e159dfb67fdaac6247a65e2e4f0956fc0eaf1ad7be313f604a1 SHA512 0c8e8d191dfd32a451e602addfd6a5db4cfa53e612df2df7001d50b53e67a5fbe6b26edab93ff0ccaac8ffda0fab857c9da1540acc41eb3682aed8d543eadb22 WHIRLPOOL edf7b219da27e3f4e30533c2218795167efdcc2a370a04f004a5b901863772f280370451625a5834fca6c47d7326a1da966ddda9f1b9dec25fff4bc1d4e6b20e
+MISC metadata.xml 503 SHA256 f387e1efe3577542acc77e47715906fd510ac3113304b3dc98444e77f7002478 SHA512 91a737565ae9701d230252a1d182a9fb5056fbcbab5e47c41fb1d46eb34da56a61fd3133128bee83f20d08aefba7a9d55b69f9e2f57150d8cce0fe2f5450faff WHIRLPOOL f9d0d0efc73dc9ddec497c29a6654cbb1d6b3b1837d0c23f73e228b811904eb2ae282edfe81d6cbf72ffcb9e20dfba14c46231ed797eb2380c2f9111c2e94859
diff --git a/media-sound/flac-image/files/flac-image-1.00-add-missing-string-include.patch b/media-sound/flac-image/files/flac-image-1.00-add-missing-string-include.patch
new file mode 100644
index 000000000000..0ba842c7ee02
--- /dev/null
+++ b/media-sound/flac-image/files/flac-image-1.00-add-missing-string-include.patch
@@ -0,0 +1,10 @@
+--- a/flac-image.c
++++ b/flac-image.c
+@@ -15,6 +15,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
diff --git a/media-sound/flac-image/files/flac-image-1.00-fix-build-system.patch b/media-sound/flac-image/files/flac-image-1.00-fix-build-system.patch
new file mode 100644
index 000000000000..2cd8c538b475
--- /dev/null
+++ b/media-sound/flac-image/files/flac-image-1.00-fix-build-system.patch
@@ -0,0 +1,18 @@
+Fix Makefile to respect user variables
+
+--- a/Makefile
++++ b/Makefile
+@@ -3,9 +3,8 @@
+ # by default, you probably need to add -I/usr/whereever/flac to CFLAGS and
+ # -L/usr/lib/whereever to the link step.
+ 
+-CFLAGS="-Wall -g"
+-
+ flac-image: flac-image.o
+-	gcc -o flac-image -lFLAC flac-image.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lFLAC
+ 
+-flac-image: flac-image.c flac-image.h
+\ No newline at end of file
++flac-image.o: flac-image.c flac-image.h
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
diff --git a/media-sound/flac-image/flac-image-1.00.ebuild b/media-sound/flac-image/flac-image-1.00.ebuild
new file mode 100644
index 000000000000..78ea6acddc74
--- /dev/null
+++ b/media-sound/flac-image/flac-image-1.00.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Utility for adding image files (e.g. album cover art) to metadata of FLAC files"
+HOMEPAGE="http://www.singingtree.com/software/"
+SRC_URI="http://www.singingtree.com/software/${PN}.tar.gz -> ${P}.tar.gz"
+# FIXME: no version in tarball, but also no updates for a long time. So it's ok.
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/flac"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.00-add-missing-string-include.patch
+	"${FILESDIR}"/${PN}-1.00-fix-build-system.patch
+)
+
+src_configure() {
+	# remove pre-compiled binary
+	rm -f "${PN}" || die
+
+	tc-export CC
+}
+
+src_install() {
+	dobin "${PN}"
+}
diff --git a/media-sound/flac-image/metadata.xml b/media-sound/flac-image/metadata.xml
new file mode 100644
index 000000000000..fedce680ca10
--- /dev/null
+++ b/media-sound/flac-image/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription lang="en">
+		A tiny utility for stuffing image files (e.g. album cover art) into
+		metadata blocks in FLAC files. Actually you could store and retrieve
+		any arbitrary file you wanted; this program doesn't care.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/flac123/Manifest b/media-sound/flac123/Manifest
new file mode 100644
index 000000000000..1d4392bd4f5f
--- /dev/null
+++ b/media-sound/flac123/Manifest
@@ -0,0 +1,5 @@
+DIST flac123-0.0.12-release.tar.gz 129795 SHA256 1976efd54a918eadd3cb10b34c77cee009e21ae56274148afa01edf32654e47d SHA512 4bfabecae86cf11a13bd45025d7fbdee189918e0cd4eee0128856897710b44afd19df5675cae9426d30e9d8cd09b358333438cd05701fa0a7a00a8493a77e1f7 WHIRLPOOL 4c185575c39ad6d377d55e7ff3117156e2e857b62e2ecf9e8dfe97a59563e9341c73ccbd6072d9c6dbdf28b5a42da45c781459c0fa7424a7b6ddf04b98bb92f8
+EBUILD flac123-0.0.12.ebuild 556 SHA256 1e0aa70f785e738234bdbe5ce9ce530aa570ace88ba7a202582839a2b515a90b SHA512 f19901f64faa4fbe9c3ea76a78b70a95fbea39f2000cc9f9c3f316c65bd9ea6a3155f424176b6ea32ca26cb65e3af4600be4405820454afb1a8dad513541051a WHIRLPOOL 6e70e8e481f14aff34ce6f8aa89f984d3547ebabb849dab98f438eb7a0b772145d781045d6dab5362bc73ec9e54b55a6b1239618d721f0a70b48fa000990e236
+MISC ChangeLog 2432 SHA256 83a13032e35ebd178c43d1313639be47aff1b7a9968e90b198814753e5124931 SHA512 8ca3e3ab1965b4b4fb53e735ee34e1e31a5a51679f58aa4832fcfca107b17d51819aa11092409539524424f16ff926fa176c1c373b9b981b3135b1d0385f5103 WHIRLPOOL be74bfb8ef338a2d9c910ff6ae67a66be3f34c4e571b480dd16df731328a3547d7a3c9d7e018ab5ef0c5d7d2e04212df1fe4d0484d0990412738ced563af974e
+MISC ChangeLog-2015 4338 SHA256 0b1f16da60b693e6837660cdae63752339c53363e87fb24b43a616182740a625 SHA512 5ed1cfbfdc4d7833affce11052ada10a4f77d42fb741895e0f05dcd697cc3cc12fd6bacdc873cc74d69d6678d8f2dc3703415839fa166a793e6d7057ab99bb1e WHIRLPOOL 8ea2997ebda2e55084a6fd663aae8e119d6c26034b45c70fb69efa24d2c959a699c9a67bb486aace4d3b559ea14c44e01575206365795ca7cb0f9d94a38fe69c
+MISC metadata.xml 333 SHA256 1128fe56741d5f9eb1969f12d948e89652ec163e53fe1d2e3a92332e2766ce78 SHA512 33515fc05332bf95b555a3748ae1e766d6fdfd401599f79a1668dcac1f0434fe8d70fa50e8111a1a76f6d689a13b37e8e7cc314913744c983baf188999559f08 WHIRLPOOL 74bc2e58b96a7e1d1516046f59a2f0f25f7e8b112f302c26855aaef480552c311fad3ed8d13d7d084e90448e01f3a070dc216b7f0c5fad2f2c4cba342ba7129e
diff --git a/media-sound/flac123/flac123-0.0.12.ebuild b/media-sound/flac123/flac123-0.0.12.ebuild
new file mode 100644
index 000000000000..bf451bafd806
--- /dev/null
+++ b/media-sound/flac123/flac123-0.0.12.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools
+
+DESCRIPTION="console app for playing FLAC audio files"
+HOMEPAGE="http://flac-tools.sourceforge.net"
+SRC_URI="mirror://sourceforge/flac-tools/${P}-release.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sh sparc x86"
+IUSE=""
+
+RDEPEND="dev-libs/popt
+	media-libs/flac
+	media-libs/libao
+	media-libs/libogg"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README*"
+
+src_prepare() {
+	eautoreconf
+}
diff --git a/media-sound/flac123/metadata.xml b/media-sound/flac123/metadata.xml
new file mode 100644
index 000000000000..c45796b63777
--- /dev/null
+++ b/media-sound/flac123/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">flac-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/flack/Manifest b/media-sound/flack/Manifest
new file mode 100644
index 000000000000..c85db129d7e5
--- /dev/null
+++ b/media-sound/flack/Manifest
@@ -0,0 +1,5 @@
+DIST flack-2.0.6.tar.gz 16273 SHA256 38c7f78e54f894faa9ee37d7d4363d1ec84f6e0939f3d8211ebdc4bda9803acd SHA512 64b9bf75aa24e3ee2cbebdda91ed6a6326b88107c1d0ef3f407a9e4d8a30af63b828ec8f52fb91d3788fab3f4bc73043e68c56650defa26042292c4dd4165c9f WHIRLPOOL 06680ff423f53a30e654332e538c63d22c73fc312c297bd46e55c27bc7d674c258aaace7034e69bfb6d2541920d8b04da2f750fb7d9a5611688c6d34e450fd1a
+EBUILD flack-2.0.6.ebuild 528 SHA256 79d05552de5a94bffb371608b7c3221488364775fac715d1b5e81cc47fec8971 SHA512 c165725335a72c505c3ec3f290d15448c04443e363ce861431be04c51940effe1d4ad29507cee57b6b4e4d09cdaeee28f2e547746d8f6ec93c2c606907db0eb7 WHIRLPOOL 75ea36155f48f2139295cc16da7b8960a9f939524f275daa8ea27ee246dffe47c8299845888c37f8d58f69d989c39ad8d6c62d3bae799cb693c3b929599b09fa
+MISC ChangeLog 3080 SHA256 9fa1bec30d2e6fb8ccd775bdb5e85800d8ac93485c2bf52da1fa0d21d76b20d5 SHA512 1e34430e54d9d4157bb7ff5d25d039bd8f2084089b87c664d3de6c1548f55133877fa15f70d410d5c896c42dbcaa7cdd951e92e4ae56566ff7fe50baceb0d1c5 WHIRLPOOL a58bf92c799f314158c44c40b8ac430c95e791bd5b2e6fe2ba6eece05724182c6c154bebae16e288ca9707d164d0995a46d6e7f36468cb45decc2f374ea73a95
+MISC ChangeLog-2015 426 SHA256 e8f544fab3bba2d95bd7f23955928cf21a16870a83ed5e441fd8c08ad0e3d7bf SHA512 8d53f2c92fc619e60c0681cca89bb4db92de7dc95d59192a82ace2c4a78a9216116e842b79ae42ec0cbc795560833c5ad1690aad1c36872373a153573c8753ae WHIRLPOOL a1374f7c886b3b10d5427a556d9872156123d9a59634eef4dea1542b5395b73ac02f63d50c94cc5b5a84407c981ff14bb58587f352d7b1ebb4d69672438be543
+MISC metadata.xml 502 SHA256 4453e4124571d5872cfb5201f9ef093d6bcd8e4427524c5cd99aefaf25354d75 SHA512 9e95da323bb6af545f8686f7437249106207d14d5c114c67733a917090536fe497404d32354f825cf704021af2471a45f19dfebe63986e8a7a1cb7b792608f5f WHIRLPOOL 135c3b407ca3a19cf6fd561027fbb9089803af6cb2c515452e25d42f023b549420c81a3c528a7580fde8ff870d6c1e77cbfb181b085b607aae142b2fff92d910
diff --git a/media-sound/flack/flack-2.0.6.ebuild b/media-sound/flack/flack-2.0.6.ebuild
new file mode 100644
index 000000000000..189070829b3f
--- /dev/null
+++ b/media-sound/flack/flack-2.0.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="flack - edit FLAC tags from command line"
+HOMEPAGE="https://sourceforge.net/projects/flack/"
+SRC_URI="http://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=app-shells/bash-3.2
+	>=media-libs/flac-1.2.1"
+
+src_install() {
+	dobin flack
+	insinto etc
+	doins flackrc
+	dodoc ChangeLog README
+}
diff --git a/media-sound/flack/metadata.xml b/media-sound/flack/metadata.xml
new file mode 100644
index 000000000000..4584a72f1a0a
--- /dev/null
+++ b/media-sound/flack/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription lang="en">
+		A menu-driven BASH script to easily tag your collection of FLAC files
+		from the command line, without the need for a GUI.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">flack</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
new file mode 100644
index 000000000000..8339216a402c
--- /dev/null
+++ b/media-sound/flacon/Manifest
@@ -0,0 +1,7 @@
+DIST flacon-2.1.1.tar.gz 337500 SHA256 9ece812c0bd68828301d745fbdddaf9ff2d9e572cc205e20d2bbcb093de98a1b SHA512 ef145685770ce4e5cb5f09b42023b5f88feed90f9444dcdb7bb30839d4ee6a4526542b0c3a5595f2b43b99759c7ff6ff4d419b88780d1394baa3654163db20ec WHIRLPOOL 15cd24fe75722aff2d5e0f8307caefa5822739aa60ae9872a23159e382eccab7895c00dfbbcb4b5fd85f8e3da2a11c8756a3f77e8c7309377445e680f6a8bbc3
+DIST flacon-3.1.1.tar.gz 431743 SHA256 ca5bd24ba61fc06a39e95b4b7fda188af437ad3eff666b55071895bde11bd15a SHA512 13b1abc2edba73e30c9a1b729650e8001a5b8de7e34fe2b599f28277c347539fb50679f8a0e608c87eb7feb1e05e26c7f71fbc3c696f0fa29ae8ae9e20e63cfd WHIRLPOOL 3cab80fe57bf4d7c98d199adbe751c18cc6ee654f90f5dcda03a02d5fd4dfdc0aa8d99b7f88c056b32a6f5f64846634f4c040c45a1c4eb878181d79e21e1cd02
+EBUILD flacon-2.1.1.ebuild 2517 SHA256 5f63054110c4dc18e74b370a14bcffc5d877e50b2193b58159bdf1778d8fd4fb SHA512 df3251b54f9fc32d3188d135e7fa3b5d00ed1ee470d810abc5483cdf07bd2cb3752395b4e2f5ca190f5f1cf4222e082c815fde26924d7b56ce5bfe20166ade87 WHIRLPOOL c7c0c250a784f37ed626c7472f4793bd2d56ef35e9641b56b71fc7d0c2a62cd8151cc40ac6d55f73f12e8d72751267966cc5c14d2d1085a21ae99bf4988a441d
+EBUILD flacon-3.1.1.ebuild 2613 SHA256 62f049ef964403578bcfd67b5c197774f9dec1c4c81924ffdb8be78cc8dd79ce SHA512 2378660d09b77152760a8f217f408fad1925e5fd1a11fb9a425229c1e12ca1e49055933b2acdbba41aa94930abb964a9b4577e279962d5cde96d8bccbec06201 WHIRLPOOL 8a23fada46ae4ef716fa1958c509fab302bc03c8995069963d43d728efea7274cb0df5d74ec7f4ed7a199eb55c0c056f76e01b39f5bb16d6f83511deef4b5ae5
+MISC ChangeLog 9899 SHA256 6fa6488e97cfe8ad6ae8de03f26cc9efd4c7569fb8979d65a24c7418667c57b3 SHA512 abbb3a533c59e9af6a2509d97169290a71d87a4dae5f8e5b5c091284034a2919b4767714c247f90f7cfaf0578c07a84d3f0632e3a960f341261b8c825453e246 WHIRLPOOL 1a06d836d651fba350ce7ecab45a38d3d05e2b07dd5f1995be3c79b8a2e809e2f0c6772b8d6cbe45e351d8a3c61e4bcdc39c815023f4aba90a77abc6e8a3b0b5
+MISC ChangeLog-2015 2651 SHA256 6145bff9c7b65b58feb72727060db55adfaa70dd69a2d915f31b4bc582b7fa05 SHA512 7534e4c6c9871bbece2a7b47b5b382c3df39bd3f3cecd693de864bd179772311ba1087ab70591b5242db1f58c095e8709f6e193ce47929d074a340d4a236d8a2 WHIRLPOOL 4ed3d74601d866994508b8fbbe272e8dd78f45be8b65b9ea11054a2cabee71d9af7a457f9f5a178a3e4f7f5e27729f7303bee314aed712ee24b79b48acab42d4
+MISC metadata.xml 505 SHA256 cf6015afc9e11d66b422a31b61e17e55f99ff680f8a0cb5f435fb4807c067edf SHA512 6979e575ee4e5230e7674fa77ece86fc27b983af03c1dfd938c3b3ca9e8f0e89f7ab2c99eaecdd1f512e70fd9d1004963669bfefa68176d40c6460272ac334dc WHIRLPOOL 4e4435f427289d3c8544ba24e54a2a87372cc27da96568885faa61d992a1826ebcd9b39086f6dc98c1db6512d434d789ea5c0df8fdbaf906f3dcce415cac542f
diff --git a/media-sound/flacon/flacon-2.1.1.ebuild b/media-sound/flacon/flacon-2.1.1.ebuild
new file mode 100644
index 000000000000..451179740b77
--- /dev/null
+++ b/media-sound/flacon/flacon-2.1.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Ignore rudimentary et, uz@Latn, zh_TW translation(s).
+PLOCALES="cs cs_CZ de es es_MX fr gl hu it ja_JP lt nb nl pl pl_PL pt_BR pt_PT ro_RO ru sr sr@latin tr uk zh_CN"
+
+inherit cmake-utils eutils gnome2-utils l10n virtualx xdg-utils
+
+DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
+HOMEPAGE="https://flacon.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="qt5 test"
+
+COMMON_DEPEND="
+	app-i18n/uchardet
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	media-sound/shntool
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+	test? (
+		media-sound/shntool
+		virtual/ffmpeg
+		!qt5? ( dev-qt/qttest:4 )
+		qt5? ( dev-qt/qttest:5 )
+	)
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Ignore rudimentary et, uz@Latn, zh_TW translation(s).
+	rm "translations/${PN}_uz@Latn.desktop" || die
+	rm "translations/${PN}"_{et,zh_TW}.ts || die
+
+	remove_locale() {
+		rm "translations/${PN}_${1}".{ts,desktop} || die
+	}
+
+	l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
+	l10n_for_each_disabled_locale_do remove_locale
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT4="$(usex !qt5)"
+		-DUSE_QT5="$(usex qt5)"
+		-DTEST_DATA_DIR="${S}/tests/data/"
+		-DBUILD_TESTS="$(usex test 'Yes')"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	virtx "${BUILD_DIR}/tests/${PN}_test"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	elog "${PN} optionally supports formats listed below."
+	elog "(List will be empty if all extra packages are installed.)"
+	elog "Please install the required packages and restart ${PN}."
+	optfeature 'FLAC input and output support' media-libs/flac
+	optfeature 'WavPack input and output support' media-sound/wavpack
+	optfeature 'APE input support' media-sound/mac
+	optfeature 'TTA input support' media-sound/ttaenc
+	optfeature 'AAC output support' media-libs/faac
+	optfeature 'MP3 output support' media-sound/lame
+	optfeature 'Vorbis output support' media-sound/vorbis-tools
+	optfeature 'MP3 Replay Gain support' media-sound/mp3gain
+	optfeature 'Vorbis Replay Gain support' media-sound/vorbisgain
+
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/flacon/flacon-3.1.1.ebuild b/media-sound/flacon/flacon-3.1.1.ebuild
new file mode 100644
index 000000000000..9b072d93b5c3
--- /dev/null
+++ b/media-sound/flacon/flacon-3.1.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Ignore rudimentary et, uz@Latn, zh_TW translation(s).
+PLOCALES="cs cs_CZ de es es_MX fr gl hu it ja_JP lt nb nl pl pl_PL pt_BR pt_PT ro_RO ru sr sr@latin tr uk zh_CN"
+# Tests require lots of disk space
+CHECKREQS_DISK_BUILD=10G
+
+inherit check-reqs cmake-utils eutils gnome2-utils l10n virtualx xdg-utils
+
+DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
+HOMEPAGE="https://flacon.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="qt5 test"
+
+RDEPEND="
+	app-i18n/uchardet
+	!qt5? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+	test? (
+		media-libs/flac
+		media-sound/mac
+		media-sound/ttaenc
+		media-sound/wavpack
+		media-sound/shntool
+		!qt5? ( dev-qt/qttest:4 )
+		qt5? ( dev-qt/qttest:5 )
+	)
+"
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Ignore rudimentary et, uz@Latn, zh_TW translation(s).
+	rm "translations/${PN}_uz@Latn.desktop" || die
+	rm "translations/${PN}"_{et,zh_TW}.ts || die
+
+	remove_locale() {
+		rm "translations/${PN}_${1}".{ts,desktop} || die
+	}
+
+	l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
+	l10n_for_each_disabled_locale_do remove_locale
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_QT4="$(usex !qt5)"
+		-DUSE_QT5="$(usex qt5)"
+		-DBUILD_TESTS="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	virtx "${BUILD_DIR}/tests/${PN}_test"
+}
+
+pkg_postinst() {
+	elog "${PN} optionally supports formats listed below."
+	elog "(List will be empty if all extra packages are installed.)"
+	elog "Please install the required packages and restart ${PN}."
+	optfeature 'FLAC input and output support' media-libs/flac
+	optfeature 'WavPack input and output support' media-sound/wavpack
+	optfeature 'APE input support' media-sound/mac
+	optfeature 'TTA input support' media-sound/ttaenc
+	optfeature 'AAC output support' media-libs/faac
+	optfeature 'MP3 output support' media-sound/lame
+	optfeature 'Vorbis output support' media-sound/vorbis-tools
+	optfeature 'MP3 Replay Gain support' media-sound/mp3gain
+	optfeature 'Vorbis Replay Gain support' media-sound/vorbisgain
+
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/flacon/metadata.xml b/media-sound/flacon/metadata.xml
new file mode 100644
index 000000000000..31d3edec7109
--- /dev/null
+++ b/media-sound/flacon/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<changelog>https://flacon.github.io/changelog/</changelog>
+		<remote-id type="github">flacon/flacon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/flake/Manifest b/media-sound/flake/Manifest
new file mode 100644
index 000000000000..4d2b711e1dbb
--- /dev/null
+++ b/media-sound/flake/Manifest
@@ -0,0 +1,5 @@
+DIST flake-0.11.tar.bz2 43319 SHA256 8dd249888005c2949cb4564f02b6badb34b2a0f408a7ec7ab01e11ceca1b7f19 SHA512 045cbe7f5af29dfdc5843df3dccfa6faf1ce816566b2f3ac928b98e14f5ee0ec15ee5024a092da4e33beb5d87c31f38c0780970811c5b96ae72683aeac332584 WHIRLPOOL 1ed1293f5db7606e3f2aa40f15fc066fdd17a85236b7ac1781f7c76c85f1c7e620d08e791836e2c07a93b4b1bd96c7b4e9392b4ae347d7c36478ec87fcc7459a
+EBUILD flake-0.11.ebuild 699 SHA256 4b7c6c23d34a78fabecdc0d122efa6a13cd2c9d353eb3e46c86c35562398fcd8 SHA512 ecdd7eae3e57760bf11e3bea3593b32573d76ba07e78358d13d807d5e151da378d78a94f099c0d7d63c05d4457a7c9b9449df6de28bb3683913578fa6c19791c WHIRLPOOL 5ec7b52fb76cff750ed46e9ab9562667c3a3db00e723c7f61c8fe89d1089369f666cd4a5434d42cf0150ca8db9c394d75dcb36d0e34a27674e115a08264be3b3
+MISC ChangeLog 2422 SHA256 ceb349e01d7d923465e557314c14678192c4164b669b2c8a84ae864cd910fcb5 SHA512 b85cf5f701b39ace961129e4f74030fca4892e1247a21847d8a567f55db14bcac17aaba24ec0db0a83095fdd4bbf32852a680a1044a7812650cf5c689249d87c WHIRLPOOL ce6b6efc0af63d9f642b1fab7fd881bdb6cd2d448f04755c40f3973eb3619b04926cf473f774d355c673cdb3af65b85f3468efec5baa6eb137e14cad7f6c17a6
+MISC ChangeLog-2015 958 SHA256 b95e0f8eb43b955e4a97ddd35f5e3f2d00797a42a0e7b0df237631e993efa749 SHA512 7ef79da8c97161166c6489cd5894df7f6ffcc5ad4f332f569f6b060d7b2c3931ce378cbccfef1cd13027917f45eff0d18e9137673fadd90d50465cc79d9944ec WHIRLPOOL 6eec8589dbb4cf97c1739780ee72882a9a44ff4fac8d538f5c09e6cb62a48a1ebdd191d237e74a72138e2a052261a015325ac22bab877372f53fdc142b30294f
+MISC metadata.xml 332 SHA256 9a316467bdecd9dd395e542448f06e194ba4dbfa0786a672d1061359499c24ad SHA512 a4ccde79f373a6fc28fa699e0ab8dcea6b2a717405dc0da2f2c02ad552e6b0d61b3c19c070e186a1803c84ac7037f39bdfb6e6d5af6eb5aff3f5f6e3b7692e53 WHIRLPOOL 84d04a029ba2be60c37a2bd88b7548fa30e864ff8e77c4728ce4ff83df191bb89b6e3f4164d0f773f8df2d346cabcb48b408f48090330b8d228fcf5bfb335fb3
diff --git a/media-sound/flake/flake-0.11.ebuild b/media-sound/flake/flake-0.11.ebuild
new file mode 100644
index 000000000000..0c3d0c8615db
--- /dev/null
+++ b/media-sound/flake/flake-0.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="An alternative to the FLAC reference encoder"
+HOMEPAGE="http://flake-enc.sourceforge.net"
+SRC_URI="mirror://sourceforge/flake-enc/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+src_compile() {
+	local myconf
+
+	if ! use debug; then
+		myconf="${myconf} --disable-debug"
+	fi
+
+	./configure --cc="$(tc-getCC)" --prefix="${D}"/usr \
+		--disable-opts --disable-strip ${myconf} || die "configure failed."
+
+	emake -j1 || die "emake failed."
+}
+
+src_install() {
+	emake install || die "emake install failed."
+	dodoc Changelog README
+}
diff --git a/media-sound/flake/metadata.xml b/media-sound/flake/metadata.xml
new file mode 100644
index 000000000000..25b01102769c
--- /dev/null
+++ b/media-sound/flake/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">flake-enc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/fluid-soundfont/Manifest b/media-sound/fluid-soundfont/Manifest
new file mode 100644
index 000000000000..8ae84efbd46e
--- /dev/null
+++ b/media-sound/fluid-soundfont/Manifest
@@ -0,0 +1,6 @@
+DIST fluid-soundfont_3.1.tar.gz 134835922 SHA256 2621acaa1c78e4abdb24bdd163230cc577e61276936d6aa6e3180582142f0343 SHA512 014394752ac50d3162c87903d9dd6b38d199ddfab10e2dea3b2a96d02ddcb876a792cc20bc0e83be5ac15eb0c7e261612eedcd792a3f0ff85a7d032a7dd24f29 WHIRLPOOL 62cf00e0d1505884294f8b0153becbc243a631a8ac2f47eee07db0b4280cee8e520f9b05de21c3103da3cb2e1c922068aa65eb4a4c598365303c661a067fe955
+DIST timidity.cfg.bz2 10667 SHA256 9607f9bd59fd5a4d258f2885bb6978f02c4a600c1ee6044978b6fd4577420f1d SHA512 def3ba456c040a010e7e5d22eed1e1674f8b50853c5771085a16eced47e9a8e429b34564218df6a4a16f697eda69365afe51a0d158b0672a66fdf1b0284c50f5 WHIRLPOOL 0c707314e58489c8c6bd8e8a372fa9985f43fee52ca4feed68eb17aa0454a5dfed090a7c7643bf2d8e28e3f904491693f6c9c93d16509aa2cd4302068188b70a
+EBUILD fluid-soundfont-3.1.ebuild 670 SHA256 7b25d69d0962afdd443838c96e28f470dfd5f97d9a532edfde60b9a993cc7a1b SHA512 b15c11a6f51d3890af3d373c9ca445bd5d5224bffe9769329798328b94c3867632c138625115864f6690199b9af2c995778d0d3b8f7dbf239b21d68301b3b648 WHIRLPOOL 3dbdaba82529228f859adbf16d72c3006a1bdbef9ac50e0478c73a49864b7bebe55129f3083dd5719b89031766fd7af1018b3944d310b2d62b77f75c6ba5d9ee
+MISC ChangeLog 3363 SHA256 da1225ab9e950d41801dadbeb42263955e5382d08491cc204a54886be84b0588 SHA512 e97acaf3c60b1f3f9774432969339b5c3e22e16e0d406db75a6c610bab0de1ff23c65402ec55f14d48bde3903488fe2bd77db6f4f0f16b7a53675137b47130d6 WHIRLPOOL 5d968ad3b86ffdb111be2752506c1bea3a0185bb0d28cd12250d0a8b8bf599ab87deb51832d71473ef633cc4f2b2576f9efd928b417ec34b99701f4d898610a8
+MISC ChangeLog-2015 874 SHA256 376687f59fb3cb5561cc14896b72a998aa9eb67d16017aa4a7b24c679254d492 SHA512 484f0a4f5bce3b0e7ee4a2a839ef3ddade5f086453c74e04ff1357aeb46fcdd55d5a52219d76e44a38353cab8a566b594141557d5f3c8643663cd093457602d7 WHIRLPOOL 8900d6b5f5f50308b41f60276823955c14bc1450dd1881f8fc522d12c053c8b6aead29a5a83065a460f2d91e858c26fb07273ed8dd10e922ba90b7e8f0fca0df
+MISC metadata.xml 244 SHA256 218c89997b706a1af5ae06826d5c44f6cd3b1271deadac69bbbe897de31b22e2 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117 WHIRLPOOL b1b2977b3b499a8169afe610ee2da26a72fa3d58f72e055fb9263c24ac0bec835e2c62685698fb6f712b7b7bbf48567adeacdf4e6eb244770a70632f64cec009
diff --git a/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild b/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
new file mode 100644
index 000000000000..dd602b835a27
--- /dev/null
+++ b/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="The Fluid R3 soundfont"
+HOMEPAGE="http://musescore.org/en/handbook/soundfont"
+SRC_URI="http://prereleases.musescore.org/soundfont/${PN}_${PV}.tar.gz
+	 timidity? ( https://dev.gentoo.org/~hwoarang/distfiles/timidity.cfg.bz2 )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="timidity"
+
+RDEPEND="timidity? ( app-eselect/eselect-timidity )"
+
+src_install() {
+	insinto /usr/share/sounds/sf2
+	doins FluidR3_GM.sf2 FluidR3_GS.sf2
+
+	dodoc README
+
+	if use timidity; then
+		insinto /usr/share/timidity/${PN}
+		doins "${WORKDIR}"/timidity.cfg
+	fi
+}
diff --git a/media-sound/fluid-soundfont/metadata.xml b/media-sound/fluid-soundfont/metadata.xml
new file mode 100644
index 000000000000..2028cee3c389
--- /dev/null
+++ b/media-sound/fluid-soundfont/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
new file mode 100644
index 000000000000..57c812745f00
--- /dev/null
+++ b/media-sound/fluidsynth/Manifest
@@ -0,0 +1,5 @@
+DIST fluidsynth-1.1.6.tar.gz 958735 SHA256 50853391d9ebeda9b4db787efb23f98b1e26b7296dd2bb5d0d96b5bccee2171c SHA512 2dcb8a8a1634273cc93c45b6e21b87ac45a023c768cffdadda0a4e611eab8d5bbea0e1ba59e5f147488054cfa6fcaf561399ae275a665c76082b8738a80778bb WHIRLPOOL c3ede7f1218b5f445cf3537ed52dd32ebdcf50c44774431323b17dda963e334f80ec255e086380007dad69b4f3338aacb22ef90c10904f57d946f4573ced869b
+EBUILD fluidsynth-1.1.6-r1.ebuild 2161 SHA256 4c42e9b268696acbc7bb1437add2ca2d5492cff16d5244224a40a49153476df2 SHA512 9949a64762e561bcb6e77e38fef18c8882898a20a0bdcfa6b95478e1a251bf22a54818ef5b63b8fea8e1a714fe435a48c7af8b701917e60dd60a9de37108c38c WHIRLPOOL 4d1bbcf5dff1c1c0441b24c9e903d71e81b90d481f4ea43916bed6c52bd7b8956596b0b6e889c98acd02a150e830f236e8a39f8d4b4e0d3e1ce6d939e1479ace
+MISC ChangeLog 2799 SHA256 2fe435b200330cf3ac0d5e7a42b5151bf22fce71e3c7240e14eec339d59f76d5 SHA512 5e6a898a0f47cba6522d76af56c6311ce94693de80cb347eb793c0bbe8e257cd06c2dbf6dfac1fc06ce9b9227ff44c670bdf026f97f3778370a9dcdfea328484 WHIRLPOOL 377fcda593facf4dec13303653334db49505960a610fa6ed5d1dd064200b759e76908bfa83d3928594d2dbb1198305aa3a0b28d5d77205e245c5a8deb10e9cf2
+MISC ChangeLog-2015 11127 SHA256 4715df3c32e51694bda12e454f51ec544e7ef57b8c4ba3dd3fae28a573713c0d SHA512 b32d935e93598f1c8e1e24014806baf3d67f2807ec039175b71ead8b4c8fbb03138e879ff1dfc1983c33b81179e107e50935b3dd6b55c0dd213ceca6c6e671db WHIRLPOOL 297b8c6d94dea1646479d6fb39f03dcdc927a0a0c502ff09fbdf4dbcfb1a46e225e77ae0f9013ca1c18f37b505e5bbbc794fa58f14d5c3ed1e15a9576d17de04
+MISC metadata.xml 333 SHA256 b5cb2f75ca91b1eb78a56d55d72c3652b018d263eb22acf716efc02986ae6f84 SHA512 016dcb0abac11ce0dedc95e5a8998b3c82f3c31c17a7d9c34baa095854c1cab7b2c0a77e091a754ed653705245473800f7356fb1f6ae7653b53582e42ca7a58d WHIRLPOOL 13559a60b2d7bf1f85b9a12844478321339b66e5ae77a7a968eb64afefc154df4416d96ea8617e472635706e47c7cf84eddc44fcc9b1081df609f169e771a89d
diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6-r1.ebuild b/media-sound/fluidsynth/fluidsynth-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..548b86383860
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-1.1.6-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
+HOMEPAGE="http://www.fluidsynth.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="alsa dbus debug examples jack ladspa lash portaudio pulseaudio readline sndfile"
+
+RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}]
+		lash? ( >=media-sound/lash-0.5.4-r2[${MULTILIB_USEDEP}] ) )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]
+		>=media-libs/ladspa-cmt-1.16-r3[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
+	readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] )
+	sndfile? ( >=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+src_configure() {
+	# autotools based build system has AC_CHECK_LIB(pthread, pthread_create) wrt
+	# bug #436762
+	append-flags -pthread
+
+	mycmakeargs=(
+		$(cmake-utils_use alsa enable-alsa)
+		$(cmake-utils_use dbus enable-dbus)
+		$(cmake-utils_use debug enable-debug)
+		$(cmake-utils_use jack enable-jack)
+		-Denable-ladcca=OFF
+		$(cmake-utils_use ladspa enable-ladspa)
+		$(cmake-utils_use sndfile enable-libsndfile)
+		$(cmake-utils_use portaudio enable-portaudio)
+		$(cmake-utils_use pulseaudio enable-pulseaudio)
+		$(cmake-utils_use readline enable-readline)
+		)
+
+	if use alsa; then
+		mycmakeargs+=( $(cmake-utils_use lash enable-lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	dodoc AUTHORS NEWS README THANKS TODO doc/*.txt
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/*.c
+	fi
+}
diff --git a/media-sound/fluidsynth/metadata.xml b/media-sound/fluidsynth/metadata.xml
new file mode 100644
index 000000000000..439f7cda7dde
--- /dev/null
+++ b/media-sound/fluidsynth/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">fluidsynth</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/fmdrv/Manifest b/media-sound/fmdrv/Manifest
new file mode 100644
index 000000000000..95cf3b778ab6
--- /dev/null
+++ b/media-sound/fmdrv/Manifest
@@ -0,0 +1,6 @@
+AUX fmdrv-1.0.7-ioperm.patch 434 SHA256 e0b94d1e5ad3ec6b4686e779bc5ee5dbd2c32e85604cb3d6ac560438ace188e7 SHA512 c092de86d3d2ec1dd403304b918b96196d4ceeb1856a1e2c21c1af5a5b71ab3cfa2a9e461de007296a74206cebc25c0f9633425b921f58d645a024bbbc2755b4 WHIRLPOOL ded13f1869c47478ec4bc775ae829a65e2eef8204229a06dd418c5e3f9b652783b685095aa6276007dbcdc30945323ad6293198c22c474078d239a6ea32b7d2c
+DIST fmdrv-1.0.7.tar.bz2 61373 SHA256 85bbb651a531e86b7aa07fa9efcb2c62344484cb3999b36539af6002188cbaa1 SHA512 d5533aee5c4c4e6a08dd2ede07c2f657edf93cf89bdb43d3453badd8dde68ec39a94820f91098192202490d59e2abda49af03737db39d2bfdd6b009a65824f1d WHIRLPOOL 8486f8ba5f61c441cae76531bb3e16962b934e0db495db3e6afc8228d38336201f1f2f5ce712a0d29363a4e77373c619b49c9f3bf26104a97d8350e5f27e9477
+EBUILD fmdrv-1.0.7.ebuild 830 SHA256 9c5ad3d6cfb0ed4b0f3f2da9dd73ba9440eddc4ac42c358fdef84ea69bd83fce SHA512 816af165e3b80fd6211ba3198f9d4284f64b6f384d49f846c8e38552403bdb551378e73c37d3b3e3526acb66be4ebc2331e4005cdc4b47dddeb1a347622cba22 WHIRLPOOL 9b73a31a15349f5d5bd09eddb45be39e9bf86aa19534158d9e1596f8ea28152e8525aa2bb75a3956d98d7e6cac6b7f345fc8ae21d308096b88c886ab158ea241
+MISC ChangeLog 2457 SHA256 9033479ef008241795687fb07e94167fe7c373f63d6354e169093f457a9c856c SHA512 2ec33acee6b628b6f6d03048e8fb4b5381c83b2c7d479c707d02f63955a7b02991f86def03b7fcf91af26376284016577c11c6f0a9c5fca10bc5d54615d9f868 WHIRLPOOL 8d9e9e4a9d4cb0c22b526e8d9983f689983c88ac2065273770a8e73af8ceb047c9bb7d8f2113c38acace106e0a9035e06cf49384e9695d0cfee38010d28d7390
+MISC ChangeLog-2015 1455 SHA256 6c4b46a148734e07ce184770cdb93c50d342dcbba725affe0ce3a74cb9ee0076 SHA512 610681c3178150c7c0b529141c493af03553844ca8b94712d81545cbb098b24f6d1d24b4b95e39d4184c0f97d6b3718d3ad346b2271723a470ff92a0863037b3 WHIRLPOOL c58bcb9a573e3c32e629446b7889819a75b31dadceff32be9ca7dc1612d5e6c337c29ebd415f2552df81101f70be96ccea3b33c713cdfac0b07f63be078e7713
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/fmdrv/files/fmdrv-1.0.7-ioperm.patch b/media-sound/fmdrv/files/fmdrv-1.0.7-ioperm.patch
new file mode 100644
index 000000000000..ef719a4ac546
--- /dev/null
+++ b/media-sound/fmdrv/files/fmdrv-1.0.7-ioperm.patch
@@ -0,0 +1,20 @@
+--- a/sysdeps.c
++++ b/sysdeps.c
+@@ -1,17 +1,7 @@
+ #include "sysdeps.h"
+ 
+ #ifdef linux
+-/* A real real big bad hack. *
+- * Never try this at home!   */
+-# define extern static
+-# if 0 /* This is required on older Linux versions, not anymore */
+-#  include <asm/io.h>
+-#  undef extern
+ #  include <sys/io.h>
+-# else
+-#  include <sys/io.h>
+-#  undef extern
+-# endif
+ # define inportb(x) inb(x)
+ # define outportb(p,x) outb(x,p)
+ #endif
diff --git a/media-sound/fmdrv/fmdrv-1.0.7.ebuild b/media-sound/fmdrv/fmdrv-1.0.7.ebuild
new file mode 100644
index 000000000000..afdccff9b4c9
--- /dev/null
+++ b/media-sound/fmdrv/fmdrv-1.0.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Console mode MIDI player with builtin userland OPL2 driver"
+HOMEPAGE="http://bisqwit.iki.fi/source/fmdrv.html"
+SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+
+LICENSE="fmdrv GPL-2" # GPL-2 only
+SLOT="0"
+KEYWORDS="x86 amd64"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ioperm.patch
+}
+
+src_configure() { :; } # it is a fake
+
+src_compile() {
+	emake fmdrv \
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin fmdrv
+	dodoc README
+	dohtml README.html
+}
+
+pkg_postinst() {
+	elog "If you want to use AdLib (FM OPL2), you need to setuid /usr/bin/fmdv."
+	elog "chmod 4711 /usr/bin/fmdrv"
+}
diff --git a/media-sound/fmdrv/metadata.xml b/media-sound/fmdrv/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/fmdrv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/fmit/Manifest b/media-sound/fmit/Manifest
new file mode 100644
index 000000000000..01920c32fdff
--- /dev/null
+++ b/media-sound/fmit/Manifest
@@ -0,0 +1,5 @@
+DIST fmit-1.0.15.tar.gz 295365 SHA256 3c819e0f0e4e04acdb8b856feff893b000cd47ccb39fb6362ca1a721b19f3fb6 SHA512 44537669391f5043efe35b53d9693f8ab6a151918583d35439c1b29feca4a707225038512c9a2de734ada9e9acb3b4b191b866038edaed9fe8d1fee09c540aac WHIRLPOOL cbb3d76ebfce83b3b9354621e02a645d391782e44c1e469c83a9aa3b615f8fd89ea4f45ce3336c424156735bfc133a07f06ff65fd103568cca7779dc25754d9f
+EBUILD fmit-1.0.15-r1.ebuild 1568 SHA256 95f0e9d4ca6f8231b45805245ee13089de0d1022bbb27a151ddcc6f478e04c81 SHA512 d98a45e4207de40ead50af4dc46f533869428312d47cf97cdfbd1edb37c6972984d05f9ff9b609d5e50b433c26e4659b79ef41b6b0652bc859b0a0bbaa6fb9e0 WHIRLPOOL bb57858015bf3f7c2d8e3180032a4e06e96e1309d4356f8d85ff741c3db092d571d4111f2560333e63fa68167cf1a9196fbddb454c20c25642c311576abe08f6
+EBUILD fmit-1.0.15.ebuild 1702 SHA256 7dc33c8d336c6ef3bf8edfa50378482c5843d1c170a791eb29c59c7505a92469 SHA512 99c1ab579fe5b3bc63129eeaa333abacdd2c2e45513c6195fc2dee2594729a5134b481650e1609b4fa6ca97d41d354816017bc25c76e41c30a0fff7ffe122696 WHIRLPOOL aea500d7acaef7ebc8c6a664de2550f639d66b86904a5b01ada790edae1b2c20061afc41ef8ffc731860b185baefeda5d1e8a85e6f6603cecca881c66b629de5
+MISC ChangeLog 1051 SHA256 973bfe49caefb66779695bf31807622768ad8eb8531450da439c536ede117c31 SHA512 cca3d84b17329117fdb06e61e04197019d467a1037da05277b55b1531d4506d1392e2fe525b650ae29ffef350e5fbbacc72427569c0a26aadd6be5bc452093eb WHIRLPOOL e8dba261f8439c6a119becd3a8b8b98c3ff7b9bc0c6c05648a8b378f3e81e2e43112822fd876fb196f6fb7b7f503167c6da2ba47b891a8d21cfedb600dc3cef7
+MISC metadata.xml 446 SHA256 49e82f015e1560620580299e4b55760ea43288d3bb4986b0b2bec95e4ab4b545 SHA512 20d68c6d23c2d5d425dbf1dbac92be80130f11de6067458b9ec36b43c0ca4b2894ebd83b6ff8e9815d4132b56c367de05a59414d0dde350ce6f35da5f65d92ef WHIRLPOOL 5f361c1542aeef760357bb7900cb39929ed05f8e7ee12408a90f76bd42c1383bcf0121cda4643389fb9d1606f658532be8d08f585c960cd1f6088454c6ad1559
diff --git a/media-sound/fmit/fmit-1.0.15-r1.ebuild b/media-sound/fmit/fmit-1.0.15-r1.ebuild
new file mode 100644
index 000000000000..d7e9c9594e38
--- /dev/null
+++ b/media-sound/fmit/fmit-1.0.15-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Free Music Instrument Tuner"
+HOMEPAGE="https://gillesdegottex.github.io/fmit"
+SRC_URI="https://github.com/gillesdegottex/fmit/archive/v${PV}.tar.gz \
+							-> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack oss portaudio"
+
+RDEPEND=">=sci-libs/fftw-3.3.4:3.0=
+	dev-qt/qtmultimedia:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsvg:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[-gles2]
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	portaudio? ( media-libs/portaudio )"
+
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+src_prepare() {
+	# Fix the path to readme file to prevent errors on start up
+	sed -i "/QFile readmefile/c\QFile readmefile \
+		(\"/usr/share/doc/${PF}/README.txt\");" \
+		src/main.cpp || die "README sed failed"
+	# Fix the PREFIX location, insert real path.
+	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
+		src/main.cpp || die "PREFIX fix sed failed"
+	# Fix the PREFIX location, insert real path.
+	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
+		src/modules/MicrotonalView.cpp || die "PREFIX fix sed failed"
+	default
+}
+
+src_configure() {
+	local config flag
+	for flag in alsa jack portaudio oss; do
+		use ${flag} && config+=" acs_${flag}"
+	done
+
+	"$(qt5_get_bindir)"/lrelease fmit.pro || die "Running lrelease failed"
+
+	eqmake5 CONFIG+="${config}" fmit.pro PREFIX="${D}"/usr \
+		PREFIXSHORTCUT="${D}"/usr DISTDIR=/usr
+}
diff --git a/media-sound/fmit/fmit-1.0.15.ebuild b/media-sound/fmit/fmit-1.0.15.ebuild
new file mode 100644
index 000000000000..57d69ae6f6ac
--- /dev/null
+++ b/media-sound/fmit/fmit-1.0.15.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qmake-utils
+
+MY_PN="v${PV}"
+
+DESCRIPTION="Free Music Instrument Tuner"
+HOMEPAGE="https://gillesdegottex.github.io/fmit"
+SRC_URI="https://github.com/gillesdegottex/fmit/archive/${MY_PN}.tar.gz \
+							-> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack oss portaudio"
+
+RDEPEND=">=sci-libs/fftw-3.3.4
+	media-libs/freeglut
+	dev-qt/qtmultimedia:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsvg:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	portaudio? ( media-libs/portaudio )"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Fix the path to readme file to prevent errors on start up
+	sed -i "/QFile readmefile/c\QFile readmefile \
+		(\"/usr/share/doc/${PF}/README.txt\");" \
+		src/main.cpp || die "README sed failed"
+	# Fix the PREFIX location, insert real path.
+	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
+		src/main.cpp || die "PREFIX fix sed failed"
+	# Fix the PREFIX location, insert real path.
+	sed -i "/QString fmitprefix/c\QString fmitprefix(STR(/usr));" \
+		src/modules/MicrotonalView.cpp || die "PREFIX fix sed failed"
+	default
+}
+
+src_configure() {
+	local config
+	for flag in alsa jack portaudio oss; do
+		use ${flag} && config+=" acs_${flag}"
+	done
+
+	"$(qt5_get_bindir)"/lrelease fmit.pro || die "Running lrelease failed"
+
+	eqmake5 CONFIG+="${config}" fmit.pro PREFIX="${D}"/usr \
+		PREFIXSHORTCUT="${D}"/usr DISTDIR=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/share/doc/"${PF}"/
+	doins README.txt
+	docompress -x /usr/share/doc/"${PF}"/
+}
diff --git a/media-sound/fmit/metadata.xml b/media-sound/fmit/metadata.xml
new file mode 100644
index 000000000000..34b1f4859d25
--- /dev/null
+++ b/media-sound/fmit/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>brendan@horan.hk</email>
+		<name>Brendan Horan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gillesdegottex/fmit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/fmtools/Manifest b/media-sound/fmtools/Manifest
new file mode 100644
index 000000000000..52fda27a58dc
--- /dev/null
+++ b/media-sound/fmtools/Manifest
@@ -0,0 +1,5 @@
+DIST fmtools-2.0.7.tar.gz 113250 SHA256 75174e07d8cde6d4a8a5d7bbaa3a3b0760a850e7f6840cb7c6246227b18f5a39 SHA512 d63790cecaad8c3724e66c11820a15654f8c11399b154412f07b931c50b2b4852fcc74df7611d3374af2ec228db21bd5be7653abe3cb42b5c00cce0ccb32fb51 WHIRLPOOL fcd4ad77dbf4045dc30414041330dd177e901b55d3291fd033391b93d75fe5caf576773888f9eca71a62ca83e0bfa3de86650c16de3bac8f11fbde666d99ccb2
+EBUILD fmtools-2.0.7.ebuild 336 SHA256 5d18afc00d9a1edd7a61d54d7bd2d10e437e808f1264cb12c3de23a0dab11a80 SHA512 4dfb61dee92a1abf20d5abfbe950a021c8e1a4adf3c315028b0b6186f60a73a0fbf1163ca3a7b0d45cf9fe0dcd40c1e462a40aba02c1eb00e0a8e32dc3b40d78 WHIRLPOOL 55606b2558811acf522af01055d1852c2728b9de575f0eb990282e3335d114d72fb7027fb26730d891f285f421d2749d3a1bab209a5e9d1a23116c6265bb7d77
+MISC ChangeLog 2430 SHA256 461fcd0b7ece86abe8b7d59fb3890b2860fec1853cbfe48a7e406621fb74784f SHA512 29d005ae608495698af8538e4afb01002d1711d7d7504f34afcaca32083759f5f3f14b5533a0f71c098ff735c7ec1660e84e72c205af0cc3f780234a4f216dbf WHIRLPOOL f69d2d78774bbfa5f76c535bcb0c6020c419d3b4f2c46c9947e7f356b283bec1b1bc1b2ebbf2c34af698933aa8241039ae105284259d795df068101e0a788761
+MISC ChangeLog-2015 2848 SHA256 146774792d9d2af4588ae6f065274d978f7b3adf75609f01233c73222306dc9f SHA512 87fbaa8cb07f77fc3736a0bea6c015bd26ec036f1d3fd48c74aff93643dcbe0d7515a37b76d530144d66606fa16d7a0500b764b0ddfd9d8445f77a456c49374c WHIRLPOOL 276caa3eda08985e67ae01b4e69b23ae58cacffa5324a39cd1805455ff104f801986b0ee1a9d24294295878ae6af16cd9f07d5ceeba1e2e497987770d581961b
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/fmtools/fmtools-2.0.7.ebuild b/media-sound/fmtools/fmtools-2.0.7.ebuild
new file mode 100644
index 000000000000..a077ce2a3970
--- /dev/null
+++ b/media-sound/fmtools/fmtools-2.0.7.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A collection of programs for controlling v4l radio card drivers"
+HOMEPAGE="http://benpfaff.org/fmtools/"
+SRC_URI="http://benpfaff.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
diff --git a/media-sound/fmtools/metadata.xml b/media-sound/fmtools/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/fmtools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/forked-daapd/Manifest b/media-sound/forked-daapd/Manifest
new file mode 100644
index 000000000000..e7943464920a
--- /dev/null
+++ b/media-sound/forked-daapd/Manifest
@@ -0,0 +1,9 @@
+AUX antlr-3.5.patch 1576 SHA256 210a2143403b2bf3b3f9b298b4624818c4e14278d0b1d1fb627f4120c73e07be SHA512 221dc595c39ea312cab8d7afb2fbc56736036b4e2bae31621b621318742abcbae9fde5c8a54540d4b1d6b2fc30a7d4accaf812b43d89ecf50f5dd3a709b0857e WHIRLPOOL cdcbbb86f1a51a9e371155b3eda1c61243c1e50be2c678e60c5f81f578f8e4f90e8796da05074b4a32e815c649205162d9430bff8a133da7407eecfe6e908b9d
+AUX daapd.confd 344 SHA256 321e76c102ad09c93c4c88d3cfc19c6c4573306b137c4d5cb1eb8973ccb03439 SHA512 b8e2d1bc61fbaa23d9b99770657fbf3af55a9e6fd39a34af4e90379f5ce883f29458dae48f424b77c3000933932b31106466714838da38e9a159d34af6cbdacc WHIRLPOOL 10715a02cfcab482f450a4a055a05239d44ecc1c98d08e176ae899fdaa37f8f6f33c2f93b630f1adac3b31648cc7c74239fac38ec849f04aa02434ceef157808
+AUX daapd.initd 583 SHA256 80cfe89cb083de05a2671141b98c303d2cd8e7f24beef123195074b8e27cd1d6 SHA512 a584cd71c5673732ac0c31fb92d156f5c480ced066d0686f957d6adf9c769ec234fe46a468077ea6b28efca132336e186fa0adc2200150e9fca11f2800aeb67a WHIRLPOOL 6769966d0a84b6b6330a852dc588d8efa8eeb4c35bd12179e1cccd5bc8e597046b6479c604003536a51048197776fea9ab9280f201a8e94c4e7d80d4dfefa4e4
+AUX forked-daapd-23.2-fix-arg-enable.patch 2272 SHA256 0b79bcc65975370cc24de2fe0d28f7d3cdbaaeae9701703907646bbd3caf6025 SHA512 48768ab213334c2324435a82cb58982100e8467001284bf589816e983982d4916198e659afad1fd7ca8e437c48971fb5ed7eeafcfa0118965d91fac839bfafe4 WHIRLPOOL 86b1aa7c702f4df83cb0303ad5ed2ae467e74636f45f19f4b7d48c1c6dceb425dcb3b4f980c126b3b15a2cb0c61e5359901185f23ce5ab00752af0a02408e5c3
+DIST forked-daapd-23.2.tar.gz 325895 SHA256 8a85dfc479cfb3aeb01f5cec7f782b9eee749121f2d8a2b30932de9fbb31d19c SHA512 11b5c6c16c0c9e20f1c196941cd09602d90b5e2ed0765e4fac25c6aeba388706bd7ede9f6c467227c245f2597466e8658f9db75073ee8b47b16f947514eb1511 WHIRLPOOL 05fd527a3ae57bb3ff3bf11b455bd926ee76d4358a569da674745a6e2b30343a35bc40cc44c90aaa10b70f496ddbf99e0975910b8ab3f759cc43929a0d19119f
+EBUILD forked-daapd-23.2-r1.ebuild 1710 SHA256 fe7d95c4a693cef36ecbe63728ea471678b2140ab14b68e05a3720c368a92eda SHA512 dadfdbf217507b5ddff5681d13d6d3f657f3229fbb85599da0ad347a0633b1e09a214241103aa00dc881303d0e6537a5515fcb93dcd0df827e599dd1cd3dc288 WHIRLPOOL 6a4824f0c66b3db5aa2eea594de8c16a15c7731c962bdd74b36a2722162dc8ee787b8da33d3e778e06c6f7aa90604a48a12406bc0f0c0333daac8323bc24e781
+MISC ChangeLog 2983 SHA256 f3e254ba2c5a81a24c6d48c773ff670e7d9ebd69f7c5ec7824975d80d4b8cfac SHA512 262d3f7e02442c464656f3fb5428979295268ec238a978e2f7ba493ef0dad7a1faebdddfbc26fc6c7a753584dbe2daf54e596fe848e1c7cc0dfec71b97eedff8 WHIRLPOOL 29de5aeb8519a997a4e0c55fc81282f8df609f4cc4dc35a2930de58b3022aa85f16e1a750987479cfcc79f7e8c285fdddfbe940b7552a4af2538419f19130db6
+MISC ChangeLog-2015 490 SHA256 9e3931dbe0bb29f0832d73885f66ea47279899869d34e5ba0fc18b6eab666511 SHA512 c89c5ae26861c7994cbec03bb59d672b3f890d2c30c080c4c85151b226b5a908cd0db116d3b5e586e56802d7b0acf6ce9ff05f990eae9972b88211da4d6634f9 WHIRLPOOL d5304b6c77e7872c63b2e561d12521d90b29822254cefcedc5f74ddcd6c137664566b9edbd844922349f2b0a2f57a4ac98a099cef2caed25a8dfd11faa5300ea
+MISC metadata.xml 793 SHA256 9638b5bb0caf27603abe8a0c42d0a8d8a3a8e06dca9c734cfa236679b319f2f9 SHA512 43ef73e58b7e999ee49ac1af5fcf1861e19debcad5cb783f3cec5e977badef997be362520932b97e404b39c5578df91b26821289733458cf1125d41572bf4d34 WHIRLPOOL 7020f1d6aa7f7becbdb138b8b88b7cdcdcb7ee961bea047df7f1c4b5ef7f75cd4868b97dc45c39d51f2b229e2d3cf740717fbff7c6ef478018883f2891943237
diff --git a/media-sound/forked-daapd/files/antlr-3.5.patch b/media-sound/forked-daapd/files/antlr-3.5.patch
new file mode 100644
index 000000000000..86461f3f0ba5
--- /dev/null
+++ b/media-sound/forked-daapd/files/antlr-3.5.patch
@@ -0,0 +1,81 @@
+From 7cf35d1e8bb8dedb710e4a60bada2739d60306d0 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Mon, 5 Oct 2015 23:10:45 +0100
+Subject: [PATCH 1/2] Allow ANTLR 3.5 to work
+
+This involves a harmless backwards-compatible adjustment to the
+grammar. I can't explain why this is necessary but this might help.
+
+http://stackoverflow.com/questions/20057063/follow-set-in-is-undefined-in-generated-parser
+---
+ src/RSP.g | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/RSP.g b/src/RSP.g
+index 435de16..6a27536 100644
+--- a/src/RSP.g
++++ b/src/RSP.g
+@@ -43,43 +43,43 @@ strcrit	:	FIELD strop STR			->	^(strop FIELD STR)
+ 	|	FIELD NOT strop STR		->	^(NOT ^(strop FIELD STR))
+ 	;
+ 
+-strop	:	EQUAL
+-	|	INCLUDES
+-	|	STARTSW
+-	|	ENDSW
++strop	:	equal=EQUAL
++	|	includes=INCLUDES
++	|	startsw=STARTSW
++	|	endsw=ENDSW
+ 	;
+ 
+ intcrit	:	FIELD intop INT			->	^(intop FIELD INT)
+ 	|	FIELD NOT intop INT		->	^(NOT ^(intop FIELD INT))
+ 	;
+ 
+-intop	:	EQUAL
+-	|	LESS
+-	|	GREATER
+-	|	LTE
+-	|	GTE
++intop	:	equal=EQUAL
++	|	less=LESS
++	|	greater=GREATER
++	|	lte=LTE
++	|	gte=GTE
+ 	;
+ 
+ datecrit:	FIELD dateop datespec		->	^(dateop FIELD datespec)
+ 	;
+ 
+-dateop	:	BEFORE
+-	|	AFTER
++dateop	:	before=BEFORE
++	|	after=AFTER
+ 	;
+ 
+ datespec:	dateref
+ 	|	INT dateintval dateop dateref	->	^(dateop dateref INT dateintval)
+ 	;
+ 
+-dateref	:	DATE
+-	|	TODAY
++dateref	:	date=DATE
++	|	today=TODAY
+ 	;
+ 
+ dateintval
+-	:	DAY
+-	|	WEEK
+-	|	MONTH
+-	|	YEAR
++	:	day=DAY
++	|	week=WEEK
++	|	month=MONTH
++	|	year=YEAR
+ 	;
+ 
+ QUOTE	:	'"';
+-- 
+2.4.3
+
diff --git a/media-sound/forked-daapd/files/daapd.confd b/media-sound/forked-daapd/files/daapd.confd
new file mode 100644
index 000000000000..8b268509861b
--- /dev/null
+++ b/media-sound/forked-daapd/files/daapd.confd
@@ -0,0 +1,11 @@
+# Set the log level (0-5)
+#LOG_LEVEL=2
+
+# Specify the log domains.  Comma-separated, choose from: config,
+# daap, db, httpd, main, mdns, misc, rsp, scan, xcode, event, remote,
+# dacp, ffmpeg, artwork, player, raop, laudio, dmap, dbperf, spotify,
+# lastfm, cache
+#LOG_DOMAINS=main,config
+
+# ffid to be broadcast in mDNS records
+#FFID=homeserver
diff --git a/media-sound/forked-daapd/files/daapd.initd b/media-sound/forked-daapd/files/daapd.initd
new file mode 100644
index 000000000000..7854bd4cc40e
--- /dev/null
+++ b/media-sound/forked-daapd/files/daapd.initd
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+
+# Override in /etc/conf.d/daapd
+LOG_LEVEL=${LOG_LEVEL:-2}
+LOG_DOMAINS=${LOG_DOMAINS:-'main,mdns,db,scan'}
+FFID=${FFID:-daapd}
+
+PIDFILE=/var/run/forked-daapd.pid
+
+depend() {
+    need avahi-dnsconfd
+}
+
+start() {
+    ebegin "Starting daapd"
+    start-stop-daemon --start forked-daapd \
+		      --pidfile "$PIDFILE" \
+		      -- \
+		      -P "$PIDFILE" \
+		      -d "$LOG_LEVEL" \
+		      -b "$FFID" \
+		      -D "$LOG_DOMAINS"
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping daapd"
+    start-stop-daemon --stop forked-daapd \
+		      --pidfile "$PIDFILE"
+    eend $?
+}
diff --git a/media-sound/forked-daapd/files/forked-daapd-23.2-fix-arg-enable.patch b/media-sound/forked-daapd/files/forked-daapd-23.2-fix-arg-enable.patch
new file mode 100644
index 000000000000..7c4297ef0e9f
--- /dev/null
+++ b/media-sound/forked-daapd/files/forked-daapd-23.2-fix-arg-enable.patch
@@ -0,0 +1,57 @@
+--- configure.ac.orig	2015-07-20 18:03:12.270584746 -0500
++++ configure.ac	2015-07-20 18:03:00.050585581 -0500
+@@ -51,25 +51,35 @@
+ AC_SYS_LARGEFILE
+ AC_TYPE_OFF_T
+ 
+-AC_ARG_ENABLE(flac, AS_HELP_STRING([--enable-flac], [extract FLAC metadata with libflac (default=no)]),
+-                      use_flac=true;
+-                      CPPFLAGS="${CPPFLAGS} -DFLAC")
+-
+-AC_ARG_ENABLE(musepack, AS_HELP_STRING([--enable-musepack], [extract Musepack metadata with taglib (default=no)]),
+-                      use_musepack=true;
+-                      CPPFLAGS="${CPPFLAGS} -DMUSEPACK")
+-
+-AC_ARG_ENABLE(itunes, AS_HELP_STRING([--enable-itunes], [enable iTunes library support (default=no)]),
+-                      use_itunes=true;
+-                      CPPFLAGS="${CPPFLAGS} -DITUNES")
+-
+-AC_ARG_ENABLE(spotify, AS_HELP_STRING([--enable-spotify], [enable Spotify library support (default=no)]),
+-                      use_spotify=true;
+-                      CPPFLAGS="${CPPFLAGS} -DSPOTIFY")
+-
+-AC_ARG_ENABLE(lastfm, AS_HELP_STRING([--enable-lastfm], [enable LastFM support (default=no)]),
+-                      use_lastfm=true;
+-                      CPPFLAGS="${CPPFLAGS} -DLASTFM")
++AC_ARG_ENABLE(flac, AS_HELP_STRING([--enable-flac], [extract FLAC metadata with libflac (default=no)]))
++AS_IF([test "x$enable_flac" = "xyes"], [
++  use_flac=true;
++  CPPFLAGS="${CPPFLAGS} -DFLAC"
++])
++
++AC_ARG_ENABLE(musepack, AS_HELP_STRING([--enable-musepack], [extract Musepack metadata with taglib (default=no)]))
++AS_IF([test "x$enable_musepack" = "xyes"], [
++  use_musepack=true;
++  CPPFLAGS="${CPPFLAGS} -DMUSEPACK"
++])
++
++AC_ARG_ENABLE(itunes, AS_HELP_STRING([--enable-itunes], [enable iTunes library support (default=no)]))
++AS_IF([test "x$enable_itunes" = "xyes"], [
++  use_itunes=true;
++  CPPFLAGS="${CPPFLAGS} -DITUNES"
++])
++
++AC_ARG_ENABLE(spotify, AS_HELP_STRING([--enable-spotify], [enable Spotify library support (default=no)]))
++AS_IF([test "x$enable_spotify" = "xyes"], [
++  use_spotify=true;
++  CPPFLAGS="${CPPFLAGS} -DSPOTIFY"
++])
++
++AC_ARG_ENABLE(lastfm, AS_HELP_STRING([--enable-lastfm], [enable LastFM support (default=no)]))
++AS_IF([test "x$enable_lastfm" = "xyes"], [
++  use_lastfm=true;
++  CPPFLAGS="${CPPFLAGS} -DLASTFM"
++])
+ 
+ case "$host" in
+ 	*-*-linux-*)
diff --git a/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild b/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
new file mode 100644
index 000000000000..291b1f091c68
--- /dev/null
+++ b/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO:
+# Add --enable-spotify when it works
+
+EAPI=5
+
+inherit autotools eutils user
+
+DESCRIPTION="A DAAP (iTunes) media server"
+HOMEPAGE="https://github.com/ejurgensen/forked-daapd"
+SRC_URI="https://github.com/ejurgensen/forked-daapd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="alsa flac itunes lastfm mpd musepack"
+
+# Note: mpd support appears to be standalone, e.g. --enable-mpd doesn't
+# result in additional linkage.
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/antlr-c:0
+	dev-libs/confuse
+	dev-libs/libevent
+	dev-libs/libgcrypt:0
+	dev-libs/libunistring
+	dev-libs/mini-xml[threads]
+	media-libs/alsa-lib
+	net-dns/avahi[dbus]
+	virtual/ffmpeg
+
+	flac? ( media-libs/flac )
+	itunes? ( app-pda/libplist )
+	lastfm? ( net-misc/curl )
+	musepack? ( media-libs/taglib )
+"
+
+DEPEND="
+	dev-java/antlr:3.5
+	${RDEPEND}
+"
+
+pkg_setup() {
+	enewuser daapd
+	enewgroup daapd
+}
+
+src_prepare() {
+	# Fixed in 23.3.
+	epatch "${FILESDIR}/${P}-fix-arg-enable.patch"
+
+	# https://github.com/ejurgensen/forked-daapd/pull/185
+	epatch "${FILESDIR}/antlr-3.5.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	ac_cv_prog_ANTLR=antlr3.5 \
+	econf \
+		--with-alsa \
+		$(use_enable flac) \
+		$(use_enable musepack) \
+		$(use_enable itunes) \
+		$(use_enable lastfm) \
+		$(use_enable mpd)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}/daapd.initd" daapd
+	newconfd "${FILESDIR}/daapd.confd" daapd
+
+	# dodir by itself fails in the likely case of /srv/music having a
+	# volume mounted already.
+	test -d /srv/music || dodir /srv/music
+
+	fowners -R daapd:daapd /var/lib/cache/forked-daapd
+}
diff --git a/media-sound/forked-daapd/metadata.xml b/media-sound/forked-daapd/metadata.xml
new file mode 100644
index 000000000000..4f9e72da3bf6
--- /dev/null
+++ b/media-sound/forked-daapd/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>stasibear@gentoo.org</email>
+		<name>Erik Mackdanz</name>
+	</maintainer>
+	<longdescription>
+		This is a much updated version of the original
+		forked-daapd 0.19 (non-gcd), a Linux/FreeBSD DAAP
+		(iTunes) media server with support for AirPlay
+		devices, Apple Remote (and compatibles), Spotify and
+		internet radio.
+	</longdescription>
+	<use>
+		<flag name="itunes">Enable support for iTunes library XML</flag>
+		<flag name="lastfm">Enable LastFM scrobbling support</flag>
+		<flag name="mpd">Enable streaming to mpd</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ejurgensen/forked-daapd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/freebirth/Manifest b/media-sound/freebirth/Manifest
new file mode 100644
index 000000000000..3d7d48fc5034
--- /dev/null
+++ b/media-sound/freebirth/Manifest
@@ -0,0 +1,7 @@
+AUX freebirth-0.3.2-gentoo-2.patch 6589 SHA256 121c85263df31ce7b276b17ad8b0cdd1bef9c2b4cbd51d5ea440234d8f093c3f SHA512 9ce3c911276b5f732c478b64e343b73aa3d0f0f805a594ba4c26e6d93eda2db2b056261a50fedbce6e27ccd3dd8889c384176c02fb78b70cc90d983696766cc4 WHIRLPOOL 32ccfe0550b9ec8ed8bdbf29ffd0e0834a56db53337d33c29f4ea635da155d349d914a28126ae1e140d1187b1159119565ac09e06ce5eb0e1304c570f48f36a2
+AUX freebirth-0.3.2-segfault.patch 519 SHA256 fb2364ac5d3bb8f642ba76790451c1efcd4b265c88d4fc86a48e2a007cd6652b SHA512 61bacbeaa5599a88f3f7a446ab2300f3a611c86e8e728b9d847322e9d8cc4b54a6580428342025322e01e0b4a1cf8a3547ce873842704a98f9167f5a3e67d0c2 WHIRLPOOL c00e2450b85d17dbcba58871e1e03a18c10cb0be17209a96b3998a712bdf702cb8158f9bc2d02c2a71421280f557cc8381b9a88c97c544c8ea89a475c20945e4
+DIST freebirth-0.3.2.tar.gz 2456900 SHA256 8cdee757be747eae337826ec9ca9244798c36f75c82f10dfd2c09facfc623f96 SHA512 a532905e687d8ebc415dea3794a4dfc4c55037123c79cc0dd2111fc74e6db1ba367e8210da75e3586c5ee4d2521a21b5cd03a5a0afcfd3a04e678834f140590a WHIRLPOOL 27272c947760559c46c30456dcec1b05fdb3e10a561c3da2542ce8f6115976deeed2a3b4a1f55e734dec134308b028900dcf3812b6176b1a56a9f3342ed3766a
+EBUILD freebirth-0.3.2-r1.ebuild 763 SHA256 749c037c07a356e8b505ec6f13599d2056b650396fd10db26cce4b4af117e220 SHA512 0f6175f17f99eb7392f99428395fd8231ef428e4e7c36dcdfbc4c59708b148798f85ae1e7e2bd4f9c7dab6a1cc28cb19bbc9d7deaf13850f214f1ad0e66e23b9 WHIRLPOOL cee5fb1dc7e2d8e14d1cc0e43d114131464f1c7aec1fc0776c1d93761087fa783ba736d8740c839cd009b7449f5d9057dd83065f13c89e0ec98a810f504abae2
+MISC ChangeLog 3193 SHA256 e0858c0bbea2cfd3e1ac30cec9df9fa2ead5f837b72562e1b83ddbc7b93d4e14 SHA512 f4dced7ad3ea8ed0a1d4115e74bb89e487f606fa4c5b17096b2c9a727feb1f6190ebeab666967021ce587da941533435f305e7eac6c3af6b41a60e0f5b6581da WHIRLPOOL 52575d9e8ce75a30037e176ac835fcdbc04f1cbc9225660fdc8264a43b8eb51232d80c1038e1d6629d66b87a7cbb4642a3916fb9d31173bfd488dd67100c2c1c
+MISC ChangeLog-2015 2417 SHA256 5b7be6938fca18cf0972bf35f43c86a7387375034572a24396693536487adeba SHA512 f16599be8e2758dd70a6155ce3112237ecf40c71e0cbf299c653f58501ee4abbf28dda2197d13a6b30961f335470e81d4d39aa5015204900d059577b711f7d6a WHIRLPOOL d77c914c4ac0c56f275c5829eecbed49b79f61cdaafb07d1fcb65b2e5e87d572ece0e172d238b064065316912aafcc07607111f798b4231921c022f604dc70bc
+MISC metadata.xml 325 SHA256 969977181bcc7f0f73dc713e28973ee638abba9c960f8f47b720c07453b85696 SHA512 633be59eb61315afe57a92345666505b9428cbb0b910ffc550803bbebed0258fd838197b69349e998ba346a1e4703b99f474db977eeef690633956176231b4a2 WHIRLPOOL 1a92fd48cb8c13b76a91824dd2ac3fd7f91b01efbefb62019699aa5c1ab5e63ae4a20f224e5274a97d72dd219cf82589ef478b09bbcc906a3b25f53183364c2b
diff --git a/media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch b/media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch
new file mode 100644
index 000000000000..52b184b04b2f
--- /dev/null
+++ b/media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch
@@ -0,0 +1,214 @@
+--- freebirth.c
++++ freebirth.c
+@@ -248,15 +248,15 @@
+   //bass_e    = env_new(1025,10000,(sample_producer *)osc_blender);
+   sl = g_slist_append(sl, bass_e);
+ 
+-  kick   = raw_wave_new("raw/kick.raw");
++  kick   = raw_wave_new("/usr/share/freebirth/raw/kick.raw");
+   sl = g_slist_append(sl, kick);
+-  snare  = raw_wave_new("raw/snare.raw");
++  snare  = raw_wave_new("/usr/share/freebirth/raw/snare.raw");
+   sl = g_slist_append(sl, snare);
+-  cl_hat = raw_wave_new("raw/cl_hat.raw");
++  cl_hat = raw_wave_new("/usr/share/freebirth/raw/cl_hat.raw");
+   sl = g_slist_append(sl, cl_hat);
+-  op_hat = raw_wave_new("raw/op_hat.raw");
++  op_hat = raw_wave_new("/usr/share/freebirth/raw/op_hat.raw");
+   sl = g_slist_append(sl, op_hat);
+-  samp_1 = raw_wave_new("raw/samp_1.raw");
++  samp_1 = raw_wave_new("/usr/share/freebirth/raw/samp_1.raw");
+   sl = g_slist_append(sl, samp_1);
+ 
+   sources = (sample_producer**)
+@@ -1087,7 +1087,7 @@
+   
+ 
+   /*effect window */
+-  effect_window = gtk_window_new (GTK_WINDOW_DIALOG);
++  effect_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+   gtk_window_set_title(GTK_WINDOW (effect_window), "Effects");
+   gtk_widget_set_style(effect_window,window_style);
+   effect_box    = gtk_vbox_new(FALSE,10);
+@@ -1109,7 +1109,7 @@
+ 
+   
+   /* sample freq window */
+-  sample_freq_window = gtk_window_new (GTK_WINDOW_DIALOG);
++  sample_freq_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+   gtk_window_set_title(GTK_WINDOW (sample_freq_window), "Sample Pitch");
+   sample_freq_box    = gtk_vbox_new(TRUE,10);
+   gtk_widget_set_style(sample_freq_window,window_style);
+--- fuse_loops.c
++++ fuse_loops.c
+@@ -122,7 +122,18 @@
+   fprintf(file, "/* generated file -- don't edit */\n");
+   fprintf(file, "#include <unistd.h>\n");
+   fprintf(file, "#include <math.h>\n");
++  fprintf(file, "#include <endian.h>\n");
+   fprintf(file, "#include \"freebirth.h\"\n");
++  fprintf(file, "/* borrowed from glib2 */\n");
++  fprintf(file, "#define SHORT_SWAP_LE_BE(val)  ((short) ( \\\n");
++  fprintf(file, "    (short) ((short) (val) >> 8) |     \\\n");
++  fprintf(file, "    (short) ((short) (val) << 8)))\n");
++  fprintf(file, "static void swap_endian(short *data, int length)\n");
++  fprintf(file, "{\n");
++  fprintf(file, "       int i;\n");
++  fprintf(file, "       for (i = 0; i < length; i += 1, data++)\n");
++  fprintf(file, "               *data = SHORT_SWAP_LE_BE(*data);\n");
++  fprintf(file, "}\n");
+   fprintf(file, "\n");
+ 
+   fprintf(file, "sample_producer *sp[%d];\n", g_list_length(order));
+@@ -172,6 +183,9 @@
+   fprintf(file, "  }\n");
+   fprintf(file, "\n");
+ 
++  fprintf(file, "#if __BYTE_ORDER == __BIG_ENDIAN\n");
++  fprintf(file, "  swap_endian(buffer, 2 * TBASS_BUFF_SIZE);\n");
++  fprintf(file, "#endif\n");
+   fprintf(file, "  write(fd, buffer, 2 * TBASS_BUFF_SIZE * sizeof(short));\n");
+   fprintf(file, "\n");
+ 
+--- gtkdial.c
++++ gtkdial.c
+@@ -75,8 +75,6 @@
+               sizeof (GtkDialClass),
+               (GtkClassInitFunc) gtk_dial_class_init,
+               (GtkObjectInitFunc) gtk_dial_init,
+-              (GtkArgSetFunc) NULL,
+-              (GtkArgGetFunc) NULL,
+             };
+ 
+             dial_type = gtk_type_unique (gtk_widget_get_type (), &dial_info);
+--- Makefile
++++ Makefile
+@@ -1,10 +1,9 @@
+ # Makefile for Freebirth 
+ #
+ 
+-CC=gcc
+-LOADLIBES=-lm $(shell gtk-config --libs)
+-CFLAGS=-g  -O6  -Wall $(shell gtk-config --cflags)
+-LDFLAGS= 
++CC?=gcc
++CFLAGS+=-Wall $(shell pkg-config --cflags gtk+-2.0)
++LIBS=-lm $(shell pkg-config --libs gtk+-2.0)
+ 
+ OFILES=\
+ oscillator.o sequencer.o envelope.o filter.o gtkdial.o mixer.o \
+@@ -22,16 +21,18 @@
+ 	-rm -f *.o freebirth fusebirth fused_loop.c Makefile.deps *~ 
+ 
+ freebirth: $(OFILES) fused_loop.o freebirth.o
++	$(CC) $(LDFLAGS) $(CFLAGS) -o freebirth $(OFILES) fused_loop.o freebirth.o $(LIBS)
+ 
+ fused_loop.c: fusebirth
+ 	./fusebirth > fused_loop.c 2>/dev/null
+ 
+ fusebirth: $(OFILES) fuse_loops.o fusebirth.o
++	$(CC) $(LDFLAGS) $(CFLAGS) -o fusebirth $(OFILES) fuse_loops.o fusebirth.o $(LIBS)
+ 
+ fusebirth.o: freebirth.c
+ 	$(CC) -c $(CFLAGS) -DFUSE_LOOPS -o fusebirth.o freebirth.c
+ 
+ Makefile.deps:
+-	gcc -MM $(CFLAGS) $(CFILES) > Makefile.deps
++	$(CC) -MM $(CFLAGS) $(CFILES) > Makefile.deps
+ 
+ include Makefile.deps
+--- raw_wave.c
++++ raw_wave.c
+@@ -21,18 +21,36 @@
+ #include "raw_wave.h"
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <math.h>
++#include <endian.h>
++
++/* borrowed from glib2 */
++#define SHORT_SWAP_LE_BE(val)  ((short) ( \
++    (short) ((short) (val) >> 8) |      \
++    (short) ((short) (val) << 8)))
++static void swap_endian(short *data, int length)
++{
++       int i;
++       for (i = 0; i < length; i += 1, data++)
++               *data = SHORT_SWAP_LE_BE(*data);
++}
+ 
+ static char *get_full_path(char *fn)
+ {
+   char *full_fn;
+   char *fb_samples;
+ 
+-  if (fn == NULL || fn[0] == '/') return fn;
+   fb_samples = getenv("FB_SAMPLES");
+   if (fb_samples == NULL) fb_samples = FB_SAMPLES;
+-  sprintf(full_fn = (char *)malloc(strlen(fb_samples) + 1 + strlen(fn) + 1),
+-	  "%s/%s", fb_samples, fn);
++  full_fn = (char *)malloc(strlen(fb_samples) + 1 + strlen(fn) + 1);
++   
++  if (fn == NULL || fn[0] == '/') { /* path is valid already */
++     sprintf(full_fn, "%s", fn); 
++  } else {
++     sprintf(full_fn, "%s/%s", fb_samples, fn); /* add path */
++  }
++   
+   return full_fn;
+ }
+ 
+@@ -76,10 +94,13 @@
+ 
+   }
+   this->length += count;
++#if __BYTE_ORDER == __BIG_ENDIAN
++  swap_endian(tmp, this->length);
++#endif
+   this->table = (sample *)malloc(sizeof(sample) * this->length);
+-  for(i = 0; i < this->length;i++)
++  for(i = 0; i < this->length;i++) {
+     this->table[i] = (sample)tmp[i];
+-  
++  }
+   fclose(in);
+   free(tmp);
+ }
+@@ -126,6 +147,7 @@
+ 	
+ 	}
+     }
++
+   return this->buffer;  
+ }
+   
+@@ -145,7 +167,7 @@
+ void raw_wave_set_sample_file(raw_wave* this, char *filename)
+ {
+   FILE *in;
+-  if (this->filename != 0) free(this->filename);
++  if (this->filename != NULL) free(this->filename);
+   this->filename = get_full_path(filename);
+   in = fopen(this->filename,"r");
+   if( in==NULL )
+@@ -243,7 +265,7 @@
+   /* set table to zero here check if it is zero in */
+   /* _fill_table */
+   out->table = 0;
+-  out->filename = 0;
++  out->filename = NULL;
+   raw_wave_set_sample_file(out, filename);
+ 
+   out->buffer   = (sample *)malloc(sizeof(sample) * TBASS_BUFF_SIZE);
+--- raw_wave.h
++++ raw_wave.h
+@@ -62,7 +62,7 @@
+ event *event_pitch_change_new(int seq_handle, double pitch);
+ 
+ // #define FB_SAMPLES "/usr/local/lib/freebirth"
+-#define FB_SAMPLES "."
++#define FB_SAMPLES "/usr/share/freebirth"
+ 
+ /*
+   Local Variables:
diff --git a/media-sound/freebirth/files/freebirth-0.3.2-segfault.patch b/media-sound/freebirth/files/freebirth-0.3.2-segfault.patch
new file mode 100644
index 000000000000..2a3a40711f1c
--- /dev/null
+++ b/media-sound/freebirth/files/freebirth-0.3.2-segfault.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/show_bug.cgi?id=320123
+
+Index: freebirth-0.3.2/oscillator.c
+===================================================================
+--- freebirth-0.3.2.orig/oscillator.c
++++ freebirth-0.3.2/oscillator.c
+@@ -237,8 +237,8 @@ event *event_freq_change_new(int seq_han
+ 
+ static sample_producer **get_children(osc *this)
+ {
+-  static sample_producer *no_kids[] = { NULL };
+-  return no_kids;
++  static sample_producer no_kids[] = {{ NULL }};
++  return &no_kids;
+ }
+ 
+ static char **get_header(osc *this)
diff --git a/media-sound/freebirth/freebirth-0.3.2-r1.ebuild b/media-sound/freebirth/freebirth-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..271853ab4567
--- /dev/null
+++ b/media-sound/freebirth/freebirth-0.3.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Free software bass synthesizer step sequencer"
+HOMEPAGE="http://freshmeat.net/releases/8834"
+SRC_URI="http://www.bitmechanic.com/projects/freebirth/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo-2.patch \
+		"${FILESDIR}"/${P}-segfault.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}/raw
+	doins raw/*.raw
+
+	dodoc CHANGES NEXT_VERSION README
+
+	doicon xpm/${PN}.xpm
+	make_desktop_entry ${PN} ${PN}
+}
diff --git a/media-sound/freebirth/metadata.xml b/media-sound/freebirth/metadata.xml
new file mode 100644
index 000000000000..a38ef435258d
--- /dev/null
+++ b/media-sound/freebirth/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="freshmeat">8834</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
new file mode 100644
index 000000000000..5ee6c430d742
--- /dev/null
+++ b/media-sound/frescobaldi/Manifest
@@ -0,0 +1,13 @@
+DIST frescobaldi-2.0.16.tar.gz 3861027 SHA256 d8e89a662da45ae6c514365a4eb6895419f8058014f5393041988a55f05eea8a SHA512 7f04b84ec73ee84094ef8c11ef546a111b3c795dff9611a0627180b6509103c7505e5799a3ad0dd8d4d54dca2596f34835dca0018f78fe55966665c5eb14f3ab WHIRLPOOL 3c1d2f9d79ab04536664176d834014d5daab73d115961913b40c247dfe142cbf95761e44043ccfd914dc6cf64eb307d29fba0cb128afd44c3c345e1cb6edcd9a
+DIST frescobaldi-2.18.1.tar.gz 4172189 SHA256 475bbb9aeed8009fdb7b0c53e4da78ce7a204b548d0af6d909b699c99e61d4c1 SHA512 cc00012f6f3d5cef44e50258093a27c4627843f41ca3724983fbd424f2da4a2911e300edd12d35082c514381b660c421fbc405fe858ff3680d2a5605a8c4bb6a WHIRLPOOL d02eda7702bf6fbcd3c94255f97f57777b105a9e13dca0acb5abe950b5344fdfe9e02f153c2f20c7492e65fdad69ef92dda6b46ded9a18d1499115a12b7ac1fd
+DIST frescobaldi-2.18.2.tar.gz 4200915 SHA256 e54a674bc4f8fad368969822829d913dc4c6de0ae2ca4e762e1f0a25b03ddafa SHA512 464599e36f045abece32db3040635a3c356d6e17e2ead61a326c0f92007da83491beb958cc6f26b583af29376a2efe7f8ff940e9774e6c7f9b190be453c951f9 WHIRLPOOL 79cab3e1927503bf93017c98d0b81941e38f66a6f114a4b8ad0aee9123065ae473d89d798303a79280f208b7f23c27d9408fa08ff79720f8dff22d75ce961394
+DIST frescobaldi-2.19.0.tar.gz 4244785 SHA256 b426bd53d54fdc4dfc16fcfbff957fdccfa319d6ac63614de81f6ada5044d3e6 SHA512 3d6d34809acc8ed8756fc89893bceda79fe0a81e717083a5e7391cf13449e5e4ed675cb9ace63ec9191a9e34f27fd3540494195f74073b872ce1b0f5b7ccdd8d WHIRLPOOL e598da0f0a2ff6813c5f5ceafdb67beeb7921136d1abf804dd0836cf857de2e5db85dbdfd7b1b45970476d75054aa8b0c7bd17f0cbe4f1551d0e5abea98045b1
+DIST frescobaldi-2.20.0.tar.gz 4478977 SHA256 c3d7faab7b21ddbab98749751a94d0a848138a800b0ae744f0ec94000b459ae4 SHA512 a875e8d574e77db5e87555aa091b4b0966e4b8df16dc1f7fbcfe100f67d9ccafdd9a26c8f4b8cea13410faaa298185c1ec0e9b5e722b3d37c32d0b573511a3e3 WHIRLPOOL 96043a2af66f40b26210a2d0ff70e0212e3ab0919a918f30754d004dbc893d23a9827d61838a84a2f29b0acf3cc6b61cb3a4a9572f3072676144b7b7c6d069ef
+EBUILD frescobaldi-2.0.16.ebuild 782 SHA256 fb1ef1920837333c17a4821f4a02d7057a4ff5a1793a005ccb15a8cd1dd631d3 SHA512 7e17705238e28170183c1c587ffc48230e9326322515fafb2b4ef7f8c04fcf6f633caa9cd80785ae3679c379dd73ffb26f950ae080d5a266031bfb1f2a5e063c WHIRLPOOL 06a9c437e79ada6a1d864aa04cbd2457df4e92344c74d5a4b6aaf7899115b3ed63d93f82b18d99e2d335edae7a5f0ca4a57c3819ead79624b94d3a93d2685e79
+EBUILD frescobaldi-2.18.1.ebuild 846 SHA256 69feada09aea6652160d17646c990b9687c846ed92cb88eff3568decf3723372 SHA512 a09d4c8d2156dfc5db083f1fde7b642efd296236b7ff993cb5112b087d3629fdcfa505481efa80c94d81f15b3aa8730514927c8dff1fc538327e52dab8910854 WHIRLPOOL 047cd4eaa29c5ade11a616f8b31121a8d1f19e50bf69ce0b0fe5e6307443c7038a3d376b920e9707ad61769cbbb68d612db58918dd698d3e36d9889aafcbf62a
+EBUILD frescobaldi-2.18.2.ebuild 848 SHA256 4f3c06e078047ae95f8600eba16137de8b879377c42ae6c07ed76e229ba5254b SHA512 fdbe180490a9ab97f0bea61ab32a8e9b028b9549076139c7ad73e8995cc917dd7d88aff62f5845158d735c9fd6e1a708035dfb2936c2796836190e736294fd5d WHIRLPOOL 3ee80268ba48d9eb83095c7cec8477e1198ef1098e058098ceb2b8f38c2933654b65b18f36f02c055095577491c1f0317f1e6decb1b9a8ba44a94992b97d3205
+EBUILD frescobaldi-2.19.0.ebuild 852 SHA256 5d06204cb991e2a4ec9b3d23042db61a7db6ba81d3c5a4abbe1924aa425c5f2f SHA512 386136b88d9049469cb2e93fc2bb4468f7def1ff776507199fc6417fbf081c86d551603f213901a399290e9b2188e896d5ec12c38bb3e8ced024d271eff02478 WHIRLPOOL 53274898b220f760a3860eafa69052f8e1d70030d0e4cc7990fb9949191f680e4ef187debf42f7f9730683b843375a05990d7c1feef7293f3197289b5afc9003
+EBUILD frescobaldi-2.20.0.ebuild 855 SHA256 63dcad0e0c7b19455b416312c367a5214f5a29e312fd8635036ff52b931d81ef SHA512 bc829bdbb726b0f1e2c5c35342e830f81e23867191cc37ed43ef06228d1a4f0a25043561af6ecd978a4e5b97c3bfc88e5bacb25de84a66f2154ce1a4ad05cf5d WHIRLPOOL 71c50868b4170d79b206b59f7019060507f9b5da2f4dd0d98a630f300d7e89873b02388136585815b6b287f39aefc4d807e66396afa821e5a50d5bf85a6a24da
+MISC ChangeLog 3116 SHA256 c15a13e1e56457d632a656ac11a91a927c791ee2aab5df70ac864b40ca945183 SHA512 e9305a4de069d152af0ce14b4f60197f8be0e8fac1c1051b7edca7f4adaa3cd7724f579a4d92e7bf4b12f0f6739f1ae454b1001ee91df3e844682c0ee053f879 WHIRLPOOL ab3db66cbbe360e6cec639176bf6298ba5dff8c1b882fe4227fdf76ba02d7f45b046c59839764435f5cbf639d6bd19a66427e2d635f165f9cca02503cdbe592e
+MISC ChangeLog-2015 4245 SHA256 d8b6f6de45ee5e7574a190403365efbf36200969a1af84d810377f1834b2cfb2 SHA512 c0a153258070800f13e33c04a1366960fc9804a56c0d303b3af1689b99a6ded115d06cf0442a9c54b60c75bd068ac2c9491352a3a4170ad1aa0ead2768ea4b13 WHIRLPOOL 8713678bc63c4621a27c07bb5964c7619ffac3ce8b5cf005c3ce2e52244ddbf868d2f388f6f77c5250f69ae3730f470caef5f8a0c73dd5c998cb59df626258bd
+MISC metadata.xml 442 SHA256 4cc43a136bc6f59b50a04a221ad03b5d8e9f68f0eebe1fdbd1d4d816f190e2fb SHA512 cf86623fdde3cd003175081ac264d109511036d6c0e09a80e7f88dde98ed52568a8412f4b32dadb75c6986dd1d59e7e83c95546aefb17ffc9e349386a94e54ef WHIRLPOOL 43876d63f0ada0bb735e316833a5d4a66b26085c1d7b848318908d16863087303eb940d1ea6f5be59010c4c3fb41f96367a2530517cc8ebfb1361cf6b0b54580
diff --git a/media-sound/frescobaldi/frescobaldi-2.0.16.ebuild b/media-sound/frescobaldi/frescobaldi-2.0.16.ebuild
new file mode 100644
index 000000000000..9fdc9d8b1475
--- /dev/null
+++ b/media-sound/frescobaldi/frescobaldi-2.0.16.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A LilyPond sheet music text editor"
+HOMEPAGE="http://www.frescobaldi.org/"
+SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="portmidi"
+
+RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
+	dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	>=media-sound/lilypond-2.14.2
+	portmidi? ( media-libs/portmidi )"
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/frescobaldi/frescobaldi-2.18.1.ebuild b/media-sound/frescobaldi/frescobaldi-2.18.1.ebuild
new file mode 100644
index 000000000000..f7d688c927a7
--- /dev/null
+++ b/media-sound/frescobaldi/frescobaldi-2.18.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A LilyPond sheet music text editor"
+HOMEPAGE="http://www.frescobaldi.org/"
+SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="portmidi"
+
+RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
+	dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	>=dev-python/python-ly-0.9[${PYTHON_USEDEP}]
+	>=media-sound/lilypond-2.14.2
+	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/frescobaldi/frescobaldi-2.18.2.ebuild b/media-sound/frescobaldi/frescobaldi-2.18.2.ebuild
new file mode 100644
index 000000000000..ab39172aade4
--- /dev/null
+++ b/media-sound/frescobaldi/frescobaldi-2.18.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A LilyPond sheet music text editor"
+HOMEPAGE="http://www.frescobaldi.org/"
+SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="portmidi"
+
+RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
+	dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	>=dev-python/python-ly-0.9.3[${PYTHON_USEDEP}]
+	>=media-sound/lilypond-2.14.2
+	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/frescobaldi/frescobaldi-2.19.0.ebuild b/media-sound/frescobaldi/frescobaldi-2.19.0.ebuild
new file mode 100644
index 000000000000..ed0e5121f4ab
--- /dev/null
+++ b/media-sound/frescobaldi/frescobaldi-2.19.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A LilyPond sheet music text editor"
+HOMEPAGE="http://www.frescobaldi.org/"
+SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="portmidi"
+
+RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
+	dev-python/PyQt4[svg,X,${PYTHON_USEDEP}]
+	>=dev-python/python-ly-0.9.4[${PYTHON_USEDEP}]
+	>=media-sound/lilypond-2.14.2
+	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/frescobaldi/frescobaldi-2.20.0.ebuild b/media-sound/frescobaldi/frescobaldi-2.20.0.ebuild
new file mode 100644
index 000000000000..4b205dbb61d3
--- /dev/null
+++ b/media-sound/frescobaldi/frescobaldi-2.20.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A LilyPond sheet music text editor"
+HOMEPAGE="http://www.frescobaldi.org/"
+SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="portmidi"
+
+RDEPEND="
+	dev-python/PyQt4[svg,X,${PYTHON_USEDEP}]
+	dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
+	>=dev-python/python-ly-0.9.4[${PYTHON_USEDEP}]
+	>=media-sound/lilypond-2.14.2
+	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/frescobaldi/metadata.xml b/media-sound/frescobaldi/metadata.xml
new file mode 100644
index 000000000000..bb0cc4ccb3ce
--- /dev/null
+++ b/media-sound/frescobaldi/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="portmidi">Enable <pkg>media-libs/portmidi</pkg> support</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">wbsoft/frescobaldi</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/galan/Manifest b/media-sound/galan/Manifest
new file mode 100644
index 000000000000..33372907ca1a
--- /dev/null
+++ b/media-sound/galan/Manifest
@@ -0,0 +1,5 @@
+DIST galan-0.3.0_beta7.tar.gz 1138937 SHA256 1dfe1a876a73870afb530f1f9ea66735d73cf26fda9c881f2a1006b1dc155a07 SHA512 86ef525785c77c068146ea2cc4992091ad623bc43fde3603b00d9e8ef4583c0ecf60d061ab47386eb67dc7ef269a4631cdeb19317f3eeebf2fb2fc82c5b825a8 WHIRLPOOL ead23c582182a18c3a184507cdcbf5273f8a366a1fde2750dd17aa53abbbee9b8ef6360a9ba9ae6f9e3a77da5a49c779fd8b0bed324f8ce343ae05ce8df2f2e7
+EBUILD galan-0.3.0_beta7.ebuild 1030 SHA256 f1ed1bcb0bf83ad95a729d68f4d257e5426e78c3a1ca5ecb5c9f329db527b3e7 SHA512 0b0931f4171c30491bb2d192c7f4f45b6075c363654222b7b646040059386444a484732e969b4ab227c27c3aab3801e5d560819c67af059b64d8a3f46f8fc148 WHIRLPOOL 03e31e78bd6a585c5578139c568004750423815dcdaeaa4510c6430f54c2bf7a30f581960b680c6c3ac0a16c4cf234bca2c51f1bfcd8126eaf6059fa3c7f76bc
+MISC ChangeLog 2436 SHA256 38a2b06b6794f2548868a1356f1d249c17432cb3e6d9697085866a41d6d4620d SHA512 751815a88c2049c06eae64191b589e836b3173d301286b64529d7ded96532a1edd361daf099582904beeccad1c1adfac34ede0985928c6a05f715148136ee1f3 WHIRLPOOL 2949c124de1818308823c06a0a86ec2fa5f31cba28115c91a33bdd921c5d4821e2801ee2a369959564563e1807cc41261df46805264ed8c8a4872b01ba374faf
+MISC ChangeLog-2015 4390 SHA256 a984b44a1d2e7536d5a4b3470783135be53a83b86fc01b896c2fa60d88b7efc5 SHA512 29ad5984d850ce830c26452d1c0d37ccd0da9d1b3c6732a08b47bb5da73be416faaba28dd7225311cf8f5e7dff4c65463ca8db312d4dc41a7e0be344b29be97a WHIRLPOOL 27803909329a5e7f45f2bbb15a14019bc300075bb9e45aaaec0c2079f6750bb14a1f786c916abd97576f931543d8fded29c252490a26412002f13f05392f642b
+MISC metadata.xml 328 SHA256 32ebe3e5bc2eed0accaf2ac889c38dc57f4a4fd7ccbe6c3dcce88cc17071a4bf SHA512 3f4ada42f2d3b5ada8158c07eaa57170369e9cae6d410d4d6c2320d5c4189712a218095375c1052f72aeebf3140581f6203d773fa2df43d0da79b7a216bb3b12 WHIRLPOOL 87f7205de6f5153d6b0c9c7f4a35d267ff37efb46d575750af7a0fa767a941050f59a694857f002872ea906af960bf868c350ed63f59110e24ccd81ee2f7905d
diff --git a/media-sound/galan/galan-0.3.0_beta7.ebuild b/media-sound/galan/galan-0.3.0_beta7.ebuild
new file mode 100644
index 000000000000..174e6f949b23
--- /dev/null
+++ b/media-sound/galan/galan-0.3.0_beta7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="gAlan - Graphical Audio Language"
+HOMEPAGE="http://galan.sourceforge.net/"
+SRC_URI="mirror://sourceforge/galan/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="vorbis alsa opengl jack"
+
+RDEPEND="x11-libs/gtk+:2
+	vorbis? ( >=media-sound/vorbis-tools-1.0 )
+	alsa? ( >=media-libs/alsa-lib-0.9.0_rc1 )
+	opengl? (
+		>=x11-libs/gtkglarea-1.99.0:2
+		virtual/glu
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.80.0 )
+	media-libs/liblrdf
+	media-libs/ladspa-sdk
+	media-libs/audiofile
+	media-libs/libsndfile
+	sci-libs/fftw:2.1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS NOTES README TODO )
+
+src_configure() {
+	# Use lrdf.pc to get -I/usr/include/raptor2 (lrdf.h -> raptor.h)
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags lrdf)
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-sound/galan/metadata.xml b/media-sound/galan/metadata.xml
new file mode 100644
index 000000000000..8fa20f159a4d
--- /dev/null
+++ b/media-sound/galan/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">galan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/gbsplay/Manifest b/media-sound/gbsplay/Manifest
new file mode 100644
index 000000000000..1ccf1685bc3d
--- /dev/null
+++ b/media-sound/gbsplay/Manifest
@@ -0,0 +1,7 @@
+AUX gbsplay-0.0.91-fix-buildsystem.patch 824 SHA256 bb8ac34b4e8a90aab838578a7e85972dedea243fb1cc932001f8d52adfbdc1cf SHA512 f794afcfa72c53382f48c7418d939f999f553f4db8a5eb2b90ccbeaaf261681bd9f016aeeae5e1245f4c4e3817bd9badaafbdaaa614042c3353f7d643d44331e WHIRLPOOL 491f532c3e1eaa3eb26e9450de43aaff0f071a1c03327680421f6a383feb680edcf7ea3c3599453d10df8a7d46fb3eda4118dbb8e72f9ede5f3564cd266e3bd8
+DIST gbsplay-0.0.91.tar.gz 61071 SHA256 1b0eeb17fe4bde5fbc473457f9a27ba60947a03833b29bf5e4da86c42f2e91c4 SHA512 94a5acd892740f2443fbc5455a190cba2aefddf3608a6f59213175bb8985d21d4f2cb4011e332756ae2bf977432e03be53014f203d7b9edc572048e2a6124f08 WHIRLPOOL 5bd33fe126732ddaaaaf134b0e4b90ae34203fb748a728b6bd33bcbf84a48407be39cb22b67b6bd8f9156db37ff14d3820b33a54a6f0ab3f1ef4fa6b7fd0fcd2
+EBUILD gbsplay-0.0.91-r1.ebuild 1121 SHA256 e61852df09c0b3190390da7c6ae07eaea9b3a0987af47ab61d9babd56d2ebed2 SHA512 7b6857e089919c0f6aea5af97a7fc901cbd7045f462ae68b18a8e3754021494190f466f6c4c8f8035ea6227ede4959648b9cc102e5569af2e624c8935504bdd2 WHIRLPOOL 0921e8620fc1c3426fe34183a6a3766dd48a5b57ca11b464e2a12f27463dde7a5bf97f5e2b775dd3b916c1d5f6e78fb724e60cc81cd4954623ca8519a551eb66
+EBUILD gbsplay-0.0.91-r2.ebuild 1145 SHA256 fceecb51317328d364d49bcd2bddcf9a2d42f5551d71c7958a245c60d5b6a8c0 SHA512 75b4add25d82e2009486d8988300964b5c44ceb231a1fdace32a096c6aac0281153cf2cb2b66a95d1c9d731559b3d276b55cd65acf334eb05b979df8b7d16457 WHIRLPOOL de7c2d24cbb8bceef92de41c4511039b92e07873be7f5bda41b30ca8ba0aeda2a6a28b6f4f36888be7037623684aaba0f2cacd05cda169697e1bc8bd31955c2c
+MISC ChangeLog 3120 SHA256 4d6f8ac27694275952b9723e6ef777ec17f8a1e9476b3640d7ee0643a440a368 SHA512 58b05d1ae7540ff2d978dc6d466947c05a0c7e1c916dfe17824831a10f22ebf3f56c90c0656ae07bec130c5dca5637646a86a2eb3e7385156c7bf23e9eaf0f17 WHIRLPOOL adde15974ed724a8b4fac1e889d2154a30d0334f917edfd1c7a728066bd77700cbc38b79e15e427258c8f4639450e22265535d4ac6907cc44c9c7a81b76f1198
+MISC ChangeLog-2015 841 SHA256 3913456f29672d9bd1c2fb68824c388fd05e2a61b4a4550ce998e65219e2e0df SHA512 13b18747cccda7a1caa7248e34569b604ed0d06af45ba8c0f5240f1dc381c2a2a4da6a4c5843be38560d515198a8c2fbd43fe834db41c0f3a09774cc65901fa4 WHIRLPOOL 99b4d2944e4dcd04e2f3d67e29e7bb4c142891435f956b5707977b1ccaf838cef322d79ac32cddc55e9f07e72ff38f4c56cca641ea27804e726686aaa929245a
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/gbsplay/files/gbsplay-0.0.91-fix-buildsystem.patch b/media-sound/gbsplay/files/gbsplay-0.0.91-fix-buildsystem.patch
new file mode 100644
index 000000000000..82089f9553a5
--- /dev/null
+++ b/media-sound/gbsplay/files/gbsplay-0.0.91-fix-buildsystem.patch
@@ -0,0 +1,32 @@
+Fix linking failure due to different GCC5 inline semantics
+https://bugs.gentoo.org/show_bug.cgi?id=571000
+
+In addition, fix QA warnings caused by passing
+an unformatted string to printf().
+
+--- gbsplay-0.0.91/Makefile
++++ gbsplay-0.0.91/Makefile
+@@ -35,7 +35,7 @@
+ 	-predboolothers \
+ 	-shiftnegative \
+ 	-shiftimplementation
+-GBSCFLAGS  := -Wall -fsigned-char -D_FORTIFY_SOURCE=2
++GBSCFLAGS  := -Wall -fsigned-char -std=gnu89
+ GBSLDFLAGS := -Wl,-O1 -lm
+ GBSPLAYLDFLAGS :=
+ 
+--- gbsplay-0.0.91/plugout.c
++++ gbsplay-0.0.91/plugout.c
+@@ -55,10 +55,10 @@
+ {
+ 	long idx;
+ 
+-	printf(_("Available output plugins:\n\n"));
++	fputs(_("Available output plugins:\n\n"), stdout);
+ 
+ 	if (plugouts[0] == NULL) {
+-		printf(_("No output plugins available.\n\n"));
++		fputs(_("No output plugins available.\n\n"), stdout);
+ 		return;
+ 	}
+ 
diff --git a/media-sound/gbsplay/gbsplay-0.0.91-r1.ebuild b/media-sound/gbsplay/gbsplay-0.0.91-r1.ebuild
new file mode 100644
index 000000000000..3b74a80e008e
--- /dev/null
+++ b/media-sound/gbsplay/gbsplay-0.0.91-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+IUSE="+alsa nas nls oss"
+PLOCALES="de en"
+
+inherit l10n toolchain-funcs
+
+DESCRIPTION="Nintendo Gameboy sound player for GBS format"
+HOMEPAGE="http://gbsplay.berlios.de"
+#SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="alsa? ( media-libs/alsa-lib:0 )
+	nas? ( media-libs/nas:0 )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext:0 )"
+
+src_configure() {
+	tc-export AR CC
+
+	# No econf, because "unknown option '--build=x86_64-pc-linux-gnu'"
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc/${PF} \
+		--without-xmmsplugin \
+		--without-test \
+		$(use_enable nls i18n) \
+		$(use_enable oss devdsp) \
+		$(use_enable alsa) \
+		$(use_enable nas) || die "Configure failed."
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" SPLINT="true"
+}
+
+remove_disabled_locale() {
+	rm -rf "${D}"/usr/share/locale/$1
+}
+
+src_install() {
+	default
+
+	l10n_for_each_disabled_locale_do remove_disabled_locale
+}
diff --git a/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild b/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild
new file mode 100644
index 000000000000..7738a213805d
--- /dev/null
+++ b/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="de en"
+inherit l10n toolchain-funcs
+
+DESCRIPTION="Nintendo Gameboy sound player for GBS format"
+HOMEPAGE="https://www.cgarbs.de/gbsplay.en.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa nas nls oss"
+
+RDEPEND="alsa? ( media-libs/alsa-lib:0 )
+	nas? ( media-libs/nas:0 )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext:0 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_configure() {
+	tc-export AR CC
+
+	# No econf, because "unknown option '--build=x86_64-pc-linux-gnu'"
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc/${PF} \
+		--without-xmmsplugin \
+		--without-test \
+		$(use_enable nls i18n) \
+		$(use_enable oss devdsp) \
+		$(use_enable alsa) \
+		$(use_enable nas) || die "Configure failed."
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" SPLINT="true"
+}
+
+remove_disabled_locale() {
+	rm -r "${D}"/usr/share/locale/$1 || die
+}
+
+src_install() {
+	default
+
+	l10n_for_each_disabled_locale_do remove_disabled_locale
+}
diff --git a/media-sound/gbsplay/metadata.xml b/media-sound/gbsplay/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/gbsplay/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
new file mode 100644
index 000000000000..c822f874fedd
--- /dev/null
+++ b/media-sound/gigedit/Manifest
@@ -0,0 +1,5 @@
+DIST gigedit-0.2.0.tar.gz 810112 SHA256 e7e73a1c896eea8483ff5d4e340054271ce41330b0dd7e15ee62369cbd63365e SHA512 084955bb851709c1c11dfb8257d4b3667fa61fcad59965de32bfe83edae3b42b1f1f4f03b5a7ec427f47f5fc2e2150b8c5c3908e5d0bb242db1163370289f912 WHIRLPOOL ab9d8dea7c467733f07d8ce3d1804820c8c0b35f8d7abcdafd332f2c41d68e5be44746ffc918bd94cda55c9ed575f1ed3f984e3f0c4d4b4f42a417e5d941ebb5
+EBUILD gigedit-0.2.0-r1.ebuild 887 SHA256 2efcc6e19c563de888626cbcd8e73c159700e0d9b40740b038326197e870c4e5 SHA512 f1d535f0104f36f4600ac90a631d8805dc0f4eb60fd0a333ef935705f2a0b8ce402dfe38a4a4bc81645805d121833435ac48c11039c9865d5d68302968307f5b WHIRLPOOL a91375c640d74858644672978bf2f5bc3eab233a82afa3c1f6e1c657161a22d284f5974e739d827359a6aeebfbe2fac1ad97c83bfe7db8a379e24e1e17e94802
+MISC ChangeLog 2786 SHA256 ac547fe7bab97062830012164e34bcbacd35a413dc4f69b5488adb084a4bcda7 SHA512 cdca916dbb4dc8b377a33061a038b775e7011149da00f614a96801083fcc94a92a63aa8eebd7fe8b08d557a254acdcff8aa987f3a47826cab1e0b9188d8e6442 WHIRLPOOL ba117fe28ca39e7c31c1ded5436cb09a70adf132bd7f03b0b204c1c120124e8d8c7c4dfa4d799125d2e4331a4e6cb64803a68f453ae21aa5c597b361c840f408
+MISC ChangeLog-2015 1103 SHA256 bf0197dbd11818a75c570adab861b9e0badbbeb0c1c75899a83df2b64569837f SHA512 38e8b663e90e4b82e838dcac6e3a30b7e5c765e57aa097279da43fa7113483e754ab193d9476bd6cb56a662c351394981f7a26c3f954cca14d9059caf5bcd5b6 WHIRLPOOL 5260367f163accfad99a1aca8bc23ea067e2c07f061b5431af08611e49a51b84ecb7c251e71259084df6da3f4a5647ae4a22f7035408a376bab1924a149c31e2
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/gigedit/gigedit-0.2.0-r1.ebuild b/media-sound/gigedit/gigedit-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..db8af2e6436c
--- /dev/null
+++ b/media-sound/gigedit/gigedit-0.2.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="An instrument editor for gig files"
+HOMEPAGE="http://www.linuxsampler.org/"
+SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	>=media-libs/libgig-3.3.0
+	>=media-libs/libsndfile-1.0.2
+	>=media-sound/linuxsampler-0.5.1"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Fix linking, bug #540674
+	sed -i -e 's/@LIBS@/@LIBS@ -lsigc-2.0/g' src/gigedit/Makefile.in
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf --disable-static
+}
+
+src_compile() {
+	# fails with parallel jobs
+	emake -j1
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/media-sound/gigedit/metadata.xml b/media-sound/gigedit/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/gigedit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/gimmix/Manifest b/media-sound/gimmix/Manifest
new file mode 100644
index 000000000000..e8edc7d4fda6
--- /dev/null
+++ b/media-sound/gimmix/Manifest
@@ -0,0 +1,8 @@
+AUX gimmix-0.5.7.1-curl-headers.patch 655 SHA256 9145f2d69580d1b0e500d84086e11db44ca53b2c4c958cd7c57407a3eec79352 SHA512 9b0665e8de4670b2dc58940215b883549bddd6d7abd26f604f334034d604689063b3347ba81651b804a430b31ff235c9b65c33ee0d3115c4e2fba2d48d3c56bb WHIRLPOOL 5f7e475aeb539ef08535dce4f1387dfa0c868c8bd7f6045820307a9cef2bcfa5e9e6fa5ae27e56238c2bbc760f4789e88f62c7f87448089ca31e5d565819da23
+AUX gimmix-0.5.7.2-format-security.patch 285 SHA256 d5a6b767d8a510cc4fbbff60655c98c6d4d6ea78051ab164bb743cc8091c793f SHA512 a5dcc28dfd454377eaae36ff904260b942dd1174c8af55f63739a9565efdd03b4e848ac297b45d5de167cd51e737e8cb5034178c9831d8b8f120af0b59cc82af WHIRLPOOL 6226d0b32b351bd6a7300c697fbbe1a7f8b4e0649e7d98a0f39a3e45226626aba1cd218c32eeb146e318d67228eb68477c284f305488470776475dc33f6ec0ac
+DIST gimmix-0.5.7.2.tar.bz2 497249 SHA256 860588d13d66631e52ee57e6b31dfbf5f1493e2be3a4649231a7cf3c8d56ee27 SHA512 1e2df9bb4ad8286d6a03d6ab41a231f1a994df5eb4e0190ace83bc5683c69c9a6ff8fae1da473be2c0c050461c9a24e2fc1e111027ea7ce21a7c12472a761b21 WHIRLPOOL ceb0f8b250189333dca10cbc4fcc86918e6924b697d37986e765fb25264127718c2a8e76b784b928b45a1d1543010ff01fd5cd242b253d021d8cbd2ad6c1291b
+EBUILD gimmix-0.5.7.2-r1.ebuild 1035 SHA256 0eb8a64d0564b0491f6317083afaf0cd77c950dd1980652a5ffc6ef82954bc6d SHA512 10d8bd8f1f7fbd172050aed9b334938f2c28a6e82ca3f3e03a8bda7ed142e620664d8ed4e285d898e376356f306a84bf2768fe779d058b5df4587154b3582ccd WHIRLPOOL f742c58d51baf8064667f7c1e61a65af5632375144f77b3f9d085ab93ebd45374440388d2f04569514b8642a213b586388f22071a9913c438c302e0ffe6cd8d4
+EBUILD gimmix-0.5.7.2.ebuild 990 SHA256 aea917446399afe47bbd070b9da44e8923d8d07d3623cb30fcf648e21172b9ed SHA512 b2c0e1b44abcba1d33ee8aad11314f732cadc6b64d91f449bde83f1818a3484a4dd8ac5a4db2f3798a19737c9d6fc5292456695b0080d296fbd00ae819d139a0 WHIRLPOOL 7f936ff2a1bda1193883e7c423bfc3119a0290877ce90173c38a88fe85fba089b44adab1a6539442d87a245d9536c7d175e7bafa003f8c029f17531113fedcf4
+MISC ChangeLog 3712 SHA256 9182d7ba156698c26624619fbea8556b004e654e04805c9d2f0cde18c7db3240 SHA512 a1109b8a98f77a5a580db09f9d44b3ca43d3dafe99b7633fa358fdf21c34ef505e6a6c9124b616a2d64cf6547d1b915a7127535b7ceb010cd49d35c22eb2a6ee WHIRLPOOL f526318360cb0bfb997f2cee82ae26db6a65560275dbc49592bb744ae02c2561cbb5a5ca15ec4523ff522ae7470c84175266a214d0a2bb1142f77118365409a1
+MISC ChangeLog-2015 4768 SHA256 cb0b2f9a405da9653c9e24bfc66f7df7fdf1d3415ac2baeefd0850737b420801 SHA512 7f566b2d9a34a2ce3ecf15f9867dceae1839807412c572765a3365880149011446bc1acb6889e0ff7d26137b298dd24baeab47660a33f14d1ef34db81b356530 WHIRLPOOL 4779d237f7633c7ef7552adf12ae4242e168bec5f05441eb31eb20946b95fec71983f84b16a581a63413458779f0c542733f9c763998641a05d5594b9b1aa337
+MISC metadata.xml 447 SHA256 fb2ba3b8da2881c9f69add8ef7b57f415fde6e139d57098c64fc274857377885 SHA512 f186c67facf87d3e06be7d5bd5b42bf144a5cc6e9f3826d870dc11814a0547ccc366a87610f92966e6c8858d7987d450dc07a89ada961212d3f05aaeade14c57 WHIRLPOOL 7a15304ed7e0c687408399f0b0a36bdad4ea3739bdd172bc3a808cec7da8489565cf9ec39b7f82e88216e4e57ffe2a12c2ff7200afd9a5c710087e46d2dc0bbe
diff --git a/media-sound/gimmix/files/gimmix-0.5.7.1-curl-headers.patch b/media-sound/gimmix/files/gimmix-0.5.7.1-curl-headers.patch
new file mode 100644
index 000000000000..990165725dc2
--- /dev/null
+++ b/media-sound/gimmix/files/gimmix-0.5.7.1-curl-headers.patch
@@ -0,0 +1,24 @@
+diff --git a/src/gimmix-covers.c b/src/gimmix-covers.c
+index f2524c4..2dc37f3 100644
+--- a/src/gimmix-covers.c
++++ b/src/gimmix-covers.c
+@@ -29,7 +29,6 @@
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <nxml.h>
+ #include <libxml/xmlreader.h>
+diff --git a/src/gimmix-lyrics.c b/src/gimmix-lyrics.c
+index ff58954..01990e2 100644
+--- a/src/gimmix-lyrics.c
++++ b/src/gimmix-lyrics.c
+@@ -30,7 +30,6 @@
+ #include <nxml.h>
+ #include <glib/gstdio.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <libxml/xmlreader.h>
+ #include "gimmix-lyrics.h"
diff --git a/media-sound/gimmix/files/gimmix-0.5.7.2-format-security.patch b/media-sound/gimmix/files/gimmix-0.5.7.2-format-security.patch
new file mode 100644
index 000000000000..ee00e64c2c73
--- /dev/null
+++ b/media-sound/gimmix/files/gimmix-0.5.7.2-format-security.patch
@@ -0,0 +1,13 @@
+diff --git a/src/gimmix-config.c b/src/gimmix-config.c
+index 3ef4e48..821a427 100644
+--- a/src/gimmix-config.c
++++ b/src/gimmix-config.c
+@@ -146,7 +146,7 @@ gimmix_config_get_proxy_string (void)
+ 		}
+ 		else
+ 		{
+-			ret = g_strdup_printf (host);
++			ret = g_strdup (host);
+ 		}
+ 	}
+ 
diff --git a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
new file mode 100644
index 000000000000..0b9ae98c4bb2
--- /dev/null
+++ b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="a graphical music player daemon (MPD) client using GTK+2"
+HOMEPAGE="https://launchpad.net/gimmix"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="cover lyrics taglib"
+
+RDEPEND=">=media-libs/libmpd-0.17
+	gnome-base/libglade
+	x11-libs/gtk+:2
+	cover? ( net-libs/libnxml net-misc/curl )
+	lyrics? ( net-libs/libnxml net-misc/curl )
+	taglib? ( >=media-libs/taglib-1.5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.7.1-curl-headers.patch \
+		"${FILESDIR}"/${P}-format-security.patch
+	sed -i -e "/^Icon/s/\.png$//" \
+		-e "/^Categories/s/Application;//" data/gimmix.desktop
+
+	# broken build system in tarball
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable cover) \
+		$(use_enable lyrics) \
+		$(use_enable taglib tageditor)
+}
diff --git a/media-sound/gimmix/gimmix-0.5.7.2.ebuild b/media-sound/gimmix/gimmix-0.5.7.2.ebuild
new file mode 100644
index 000000000000..3b84f7c10976
--- /dev/null
+++ b/media-sound/gimmix/gimmix-0.5.7.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="a graphical music player daemon (MPD) client using GTK+2"
+HOMEPAGE="https://launchpad.net/gimmix"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="cover lyrics taglib"
+
+RDEPEND=">=media-libs/libmpd-0.17
+	gnome-base/libglade
+	x11-libs/gtk+:2
+	cover? ( net-libs/libnxml net-misc/curl )
+	lyrics? ( net-libs/libnxml net-misc/curl )
+	taglib? ( >=media-libs/taglib-1.5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.7.1-curl-headers.patch
+	sed -i -e "/^Icon/s/\.png$//" \
+		-e "/^Categories/s/Application;//" data/gimmix.desktop
+
+	# broken build system in tarball
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable cover) \
+		$(use_enable lyrics) \
+		$(use_enable taglib tageditor)
+}
diff --git a/media-sound/gimmix/metadata.xml b/media-sound/gimmix/metadata.xml
new file mode 100644
index 000000000000..3ff229a3f43d
--- /dev/null
+++ b/media-sound/gimmix/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="cover">Enable cover art fetching</flag>
+		<flag name="lyrics">Enable lyric fetching</flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">gimmix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/glmix/Manifest b/media-sound/glmix/Manifest
new file mode 100644
index 000000000000..6c3bb6e769a0
--- /dev/null
+++ b/media-sound/glmix/Manifest
@@ -0,0 +1,5 @@
+DIST glmix-0.3.tar.gz 17500 SHA256 901bbd5817e9a49426c2a143c09a251b83907e2a8f621ba231c19549e90884a8 SHA512 158136d67f53834c34500ba88f9d4c8c7c6928878497bbf63db127c900b89d649ebed3baee129d597f46c955184efb9d8ff30676e0430968eb4e057fa2e4bb45 WHIRLPOOL f8fe73351f130115f4918dfda03b15daf04366aa363d1f2141e207591dddf74c7df253f47386b14a7b04e26c8a7a639eccd62ad100439f381c7acd066f3c3840
+EBUILD glmix-0.3.ebuild 836 SHA256 e8c289dc1666221c83a75fe0dc42a0b37f41069f9b3a0a995d075e6fd31b085a SHA512 3bfcbe695d33e984d0b9bd971bb4217e7b44d9e9eae1af87029c3c4182188381769b4a14563267072debcfe5d9752fa48b9ed79bef0a5cf35001fabf3d6504ee WHIRLPOOL b4c582ba9a5e7231f2a78a527138f7e9602a0defda298dda5397d5044891874c87d5d714c9b3e6cf722eceea7e784c048cc9c82df58548d6033949d2da8a9543
+MISC ChangeLog 2742 SHA256 636722f404ab2f73dab03e8041816c56a3fc168dd62968a62e5e1ac1c345a485 SHA512 71ded78a98e6655f87ed64615f281c6b9ca359ab68726666ceccf87783fe4240567a68a36776dc1f36d3979a6c9dd3ac910d0a75bb3ca68505a6936ef3f81ab9 WHIRLPOOL 2d76a56395cb31c7c746dbbc856550712a5c035e55f940ad2f426e10b9e1d5204d28380064ba540db95a70c756815e00833117d04720137c79d519ff24f9ce55
+MISC ChangeLog-2015 1662 SHA256 a85759640701f9a501d4928056b96a58a93245e72d817d9e470c4e72cc3bee5e SHA512 32b8ec3e1c0c011dd0142bd80be5b9af77dc9b73a38e8e1adc8864eee704e63404b8d6daf04fe371a06d53a739aecfd3f57f815d65f625450e531857d7b76494 WHIRLPOOL edae0b4d4e739fe89826282b99bd47b7efade191290366069e31e9ae92d855c948c90eb1366b9bd5759f0206960ec7ca0aba959bbbfe029f698ebaa3d75cf109
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/glmix/glmix-0.3.ebuild b/media-sound/glmix/glmix-0.3.ebuild
new file mode 100644
index 000000000000..fa4e7709de08
--- /dev/null
+++ b/media-sound/glmix/glmix-0.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A 3D widget for mixing up to eight JACK audio streams down to stereo"
+HOMEPAGE="http://devel.tlrmx.org/audio"
+SRC_URI="http://devel.tlrmx.org/audio/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+RDEPEND="media-sound/jack-audio-connection-kit
+	>=x11-libs/gtkglext-1
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	local libs="gtk+-2.0 gtkglext-1.0 jack pango"
+	emake CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} $(pkg-config --cflags ${libs})" \
+		LDFLAGS="-lm ${LDFLAGS} $(pkg-config --libs ${libs})" || die "emake failed."
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README TODO
+	make_desktop_entry ${PN} "GL Mixer"
+}
diff --git a/media-sound/glmix/metadata.xml b/media-sound/glmix/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/glmix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/glurp/Manifest b/media-sound/glurp/Manifest
new file mode 100644
index 000000000000..e9984dab68bc
--- /dev/null
+++ b/media-sound/glurp/Manifest
@@ -0,0 +1,6 @@
+AUX glurp.svg 2674 SHA256 a3cdac13a8246c7cf972b384e55597de57ead7fb6445e8cf9ecbe95ccdb2de5b SHA512 ffbdf0d75db4d2fbeff8f185092fa53b7859be83b14862a8a9c7795bf41aef8158cf881f5bb10c7a8bf83a2fe87f0718b86473922559cdf05016f1925525801d WHIRLPOOL 688659993779f4d5f8eb441ce23e503c0487f6779250466825a7da2cdd38cfb29452af2527189c1e27e7d19c44e761726e57bb70085881ce85213ff672d0edae
+DIST glurp-0.12.3.tar.gz 166976 SHA256 c145a58008c642ddb48db9ff9e68f1869b9d7e3a91b95885c587bb3c2085461e SHA512 cb2592b9667aa45fd7053315c284fde568bdd84953f902e53754b8ba8c1941408b5ab6904d6ca72595f28978f413141d3de988f4d325f899c1d0da93e1b2657b WHIRLPOOL cb19d4bc0d0bcff4b324d2ab9b4f940ca2155096f9da14cf32fd7d2f889bc4422c82ea491719ce749edd941e30132057162cb2a5a7807cc0ef0034cb49e3bc29
+EBUILD glurp-0.12.3.ebuild 681 SHA256 02a2a675a3907bcc0d8d5bc491a5c8a8047edd87bd51483139f2bcfaba6d4aa8 SHA512 da7134e865d28c80e1220571b23d9a5655395e42587c9d93ba3ed495738488e27d35feca6ad365f853b247bc3261b0bcdea3ab87130e9f46cde697ae0fbea141 WHIRLPOOL 434847f881e0c7c91d63eb6f875e9fc8b539d1e656d41bde9b14ffa59a6e3ff8e15563b2cb97c7430b6aa7ac3278ba3bc9d9c35e79625f43500f5f69140c96b3
+MISC ChangeLog 2555 SHA256 0797aff03d88170b3c5f2e363ee7f810e11fc8300c3a558dc355a60a56164d82 SHA512 9068229b0f7e7bca0fdfbbf9e9a2672e4c4270b1dd0db483fd9b6603cf213ed50922e6f2ff1610fef265071433905ab4b8a5d8df4f5cde553054e45425a10c78 WHIRLPOOL 42cf8821e169f0cb94c4bcf6a4bc605924881b09d7a749d48ced71eb0a2b2e608e252d45f7cdbab8335a785b46499c2a057aeeed80efc995e833caf27f4cb804
+MISC ChangeLog-2015 4292 SHA256 450bd4709f5dc6e8f5178e77130053e56b9fce69b5f5c10fb48afafc5b36344a SHA512 5d77417c78f160d025912a0fc6d0f647ee2be645d7e97e16ffd8ba17a440ff0b80855c92eb2c48ec9574dca9d3200fd6d5a4c0a8b6c535fda3b677e6b534db77 WHIRLPOOL 1d40f6411f1f61171adb1ca5c35056e602b8d4b9d7c7ee0d26122cbd6cae9a92445f532f261e4019d7387ff8c796374a77c4bc8114f8cbb9653d0612cade1674
+MISC metadata.xml 328 SHA256 a0b6daf075d720105c8a37fc6be804f000ccc1bb0a535007e3faca35f06e797d SHA512 4006072b21fda24e4f8bc12683ab69f0ccc4838fba5743659aa82a62334d11dcd21c9ae8a19caf308966d21ab0362e02bfdefa1225d8d6d19a2e87f3b6c9627e WHIRLPOOL c1c91d5fb214d736b07c8f1e82204311ca87546451a08a713a4d86327dcbc0f4f46f87ed36251ac1bd41f43898e8d8a03e08f244f02c8ecc98efca9e103cb171
diff --git a/media-sound/glurp/files/glurp.svg b/media-sound/glurp/files/glurp.svg
new file mode 100644
index 000000000000..79f5394fe950
--- /dev/null
+++ b/media-sound/glurp/files/glurp.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="glurp.svg"
+   sodipodi:docbase="/home/xaiki/src/debian/my-packages/glurp/glurp-0.11.6/debian"
+   inkscape:version="0.41"
+   sodipodi:version="0.32"
+   id="svg1322"
+   height="64px"
+   width="64px">
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     inkscape:window-y="121"
+     inkscape:window-x="434"
+     inkscape:window-height="535"
+     inkscape:window-width="640"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="32.000000"
+     inkscape:cx="31.999956"
+     inkscape:zoom="2.7500000"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
+  <metadata
+     id="metadata4">
+    <rdf:RDF
+       id="RDF5">
+      <cc:Work
+         id="Work6"
+         rdf:about="">
+        <dc:format
+           id="format7">image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"
+           id="type9" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1">
+    <path
+       sodipodi:nodetypes="ccccccccc"
+       id="path609"
+       d="M 22.575463,17.181650 L 39.361618,35.326920 C 29.224099,23.704469 3.2112374,32.642687 6.1842700,44.221680 C 10.273076,59.377152 25.498837,63.354622 40.348962,59.876376 C 56.953730,55.940893 55.752789,41.790471 47.853448,32.836405 L 30.474793,13.445868 C 26.111487,8.0256087 53.119758,32.480645 59.702487,5.4406162 C 54.107124,17.715378 35.874503,3.2617158 28.131377,1.5102833 C 20.569905,-0.37797190 13.827491,6.6724653 22.575463,17.181650 z "
+       style="font-size:12.000000;fill:#000081;fill-rule:evenodd;stroke:#000000;stroke-width:1.9294407;stroke-linecap:square;stroke-linejoin:round" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path608"
+       d="M 43.903795,40.130012 L 43.903795,63.434220 L 62.664798,52.395344 L 43.903795,40.130012 z "
+       style="font-size:12.000000;fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:1.4099344;stroke-linecap:square;stroke-linejoin:round" />
+  </g>
+</svg>
diff --git a/media-sound/glurp/glurp-0.12.3.ebuild b/media-sound/glurp/glurp-0.12.3.ebuild
new file mode 100644
index 000000000000..c0654e6cc246
--- /dev/null
+++ b/media-sound/glurp/glurp-0.12.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Glurp is a GTK2 based graphical client for the Music Player Daemon"
+HOMEPAGE="https://sourceforge.net/projects/glurp/"
+SRC_URI="mirror://sourceforge/glurp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="debug"
+
+RDEPEND="x11-libs/gtk+:2
+	>=dev-libs/glib-2.4:2
+	>=media-libs/libmpd-0.17"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog )
+
+src_configure() {
+	econf \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+	doicon "${FILESDIR}"/${PN}.svg
+	make_desktop_entry glurp Glurp glurp AudioVideo
+}
diff --git a/media-sound/glurp/metadata.xml b/media-sound/glurp/metadata.xml
new file mode 100644
index 000000000000..136eaa84846f
--- /dev/null
+++ b/media-sound/glurp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">glurp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/gmorgan/Manifest b/media-sound/gmorgan/Manifest
new file mode 100644
index 000000000000..d28ee2cd15e1
--- /dev/null
+++ b/media-sound/gmorgan/Manifest
@@ -0,0 +1,13 @@
+AUX gmorgan-0.79-gcc6.patch 1903 SHA256 1b50211eebda8b133bc002abd083d5231e97d4a912dd2a4e1a1fb814190d629e SHA512 64fe047175335d9c09de0e4a6ad9294e767500d1dd1835db1c1e434c91b28cf920d8cd7789af3c4aa92b90b9ac87e777184dbf7705872028b7a19a9ff4822eb7 WHIRLPOOL 0ceb027cd7d1101620fbc61e14359353d9a72998930cc3bef3e4d4b5f8e4662ed8d0b51b0f7dad96331a16e1950dd6d7065d69d77c5261bc15be5bc12327ae4c
+AUX gmorgan-0.79-manpages.patch 1199 SHA256 f2e77bb033fb21a5b5e514b9b204871e0f1c144e021ecd0cb889daa47b68141b SHA512 0841c0e281374489682f7c585c84ae879348d0703199216e53a4a3babecd44d6d735318c24a1c72034c21f53272a79b0c26a628660783336515095b3c5c81895 WHIRLPOOL 6e9f737ff07884011688e9985b5c6bb3662ffff346d0afcc5a8ce48ae2617af0f119087e8974aea6fa4e697bb89eaa0beca13f9eeacf56cf4a4efa41df663f3c
+AUX gmorgan-0.79-remove-dirs.patch 760 SHA256 3a23c54449fef7727c2c892ef94c7008c480a0b33294a35be1c1d710216438d3 SHA512 23300349241ea9dfa0b8a6ad9504a51c15ecf2a3dd23baed5a163888f9bb0208e96d728a41ad5f5388b6ffa5d4e691b7a7b6f92cd7f6a140d840393a473a231f WHIRLPOOL d215d32165be29504822480c3e509c0b2114d93e174b52eb446b75f8091eae1d8d35c119171f7847680d5c8b91315d9c51d8cb57fb10e7a0ba0281b9868adaf2
+AUX gmorgan-0.79-remove-gettext-version-check.patch 855 SHA256 c1689dc5724d5087b0a576d9af7cde3ba795d7afea48e743f93ac23fa35feaa6 SHA512 1119f8a6aaa20d81d6138f912fa13caaa4593519389094963503c0974a97f8b35d65ce0ad54d66efcc862ce092bca4e1f141fa5e62f0e4b579bbeabe535d6ab4 WHIRLPOOL 1a0c275c71b8f7580d04f22d2f024f3d34ad5a145da47677f126a749631dbb561ac373bb7552ba541dc9bcb081a1804d25477cff26362075fabd6ef7d7412f6a
+AUX gmorgan-0.79-remove-old-docs.patch 736 SHA256 4905cc3c53017823ac6eeac864480fb68516d6f20dae0d76e37d82e90b443b1b SHA512 55ba54cd3410fe70ad5e2d1f2d60c56e30b335bc90e730e0a9a6265c7e0cc688e5aa15f0e9109af7c61db217e39fbf245ab08a54ae46cbc52f6deda5be769108 WHIRLPOOL 725e899352560744b6b463f3e2f3031e9b4ac491073ac3381308d873ed243b8e2301fc692345ea6ec48d4e1144385577152bb9ec25471694d372a7a82e76e017
+AUX gmorgan-cflags.patch 597 SHA256 cb1e7b196bd252ab7dc8117b09603250ccbcaafaac80a5ae2e7fdc62d3ecf8b5 SHA512 d33092eb45f1716d78902045a5ce1609e6264dd95ed079c05b02c19935f4686598352aeb6007b3d4a3a77215a7663b06865771419ad319c2f583dddb57d9c1b0 WHIRLPOOL 3f6910a4165e52c088f1b9646ea88a9bf000cf9b8c3a12cfa7f885761477c289b1c28fbf313ca7bb01736b287baf84b9bcaae8053cb3223b41045d5f6fee78c8
+DIST gmorgan-0.79.tar.gz 8055701 SHA256 eccdff6d0de745f469e45220de2b41764c0e591eb894695c24ce07cc2a65b1cf SHA512 17fadbe2c8b2b4c7e18816a6f866e4406c005fda1ca3ded628c9497aa46abacd06417d68296c500a2d108e9364eae3702f990f5c1b1b1d83328ed553aa453be0 WHIRLPOOL 96a20bc79ee9a8b62ad1061995fda5542450b5e0faee9677f548d05884e13791af79617bf1ad0546028db2a1f38b7e3882b9dd4778e7a912b6ebcb02efefa7f1
+DIST gmorgan_0.39.tar.gz 1370780 SHA256 37f6c3d4b43c415e0edaf5d8acc80d7a60fb9318f684acde0eaa723f3ef58b56 SHA512 b66769382de4b2386779d55158d16167d4aba1a2e3425fc46561cfda621854004029b872810844313d64b8fea50d7cdcaa5247a02ef500f7d932deedc691bdf3 WHIRLPOOL 92453194f241cf75d19221dce97aec8a06e16dc19d7b46ab09ab51d8e4541de22b5f6ca46fc18d68e82a18dcdc5fd529f02fb044ea6e4a45f8586d8030148ea1
+EBUILD gmorgan-0.39.ebuild 951 SHA256 3290b7ebbfbe09c20dcd18b34f95dbd3424ef9fbc60ad7c9af78e26f19082ba7 SHA512 6247b536d0c90174b7b122398c803db6310344b812f254cd41d392a9a7639fb235be62e42f46ad6400c13c130e527315f1ba754a3f5b7ac76c474eb33f59b55b WHIRLPOOL 0bcad7de920ac20df832fd8f1aa0dd932d1b7ec7cd7542b8277fe91529b5d2046537e24ccc5697b4e5ca929a899c7e04b7f85557ce4b28e7094e1a685d78907e
+EBUILD gmorgan-0.79.ebuild 786 SHA256 019a5501fbc4e1a24372b7a3402b7b86a12d0479e7f1f77e6a234c4f7332220f SHA512 9be3ff5f4b71d35f1e9de4fc7551350844edcdcd5d9f728cf946b31d95007a802303a57681c8f70adfc2d923e66d8a491a82d4bdd0dcdf574b2c809ec0395f90 WHIRLPOOL ccca487cf5cbd2d8c509de4222ead277da92d56447be0ae591913e4cae25bab91ba6c15ec0d8cf6c285592efcb17855cb81c2fcbfc7ceaf39809f48555872a54
+MISC ChangeLog 2545 SHA256 c6d33ee545b9be9f95eeee6fc60d81b7020a89b41449229a909c8111f75f688c SHA512 5ea8880d1b6c9bb3a9d313b666a09610ad95261104aeb428922fa1273e04abf082cd791c235f5920f8f6b588bc972680302fc60db11c12564c66779a66524c0c WHIRLPOOL 9c6a61f106dfc8917bb132087bd1a1c260094e360b3f7c27a0a224c8f07ffe23bdfa77b6a0dc4cd9f60e6128f36f62f591cfc2ae15065912cc2d5a34d7f67f84
+MISC ChangeLog-2015 4540 SHA256 4b3a4451d0260c37a4a1791d1a9ab263aa6fbb7bf368183acf7d5b4fe351e25b SHA512 512b3c24d74de2e08e3a58cc19b12c449c2e2dd8a2be40103e542e7759632c52a954446a309b8226d94606a7053cf992fd2d830b5c4b4554794736a05d7c698d WHIRLPOOL 3cbcc74b2e918462c16240be452dc0459bb0ec7459fe813695a77e8d87a2eb83b94fd670eb104c3f28b01d4c8fc5fb1391ea887a48899de51a4d846ed1c630b4
+MISC metadata.xml 336 SHA256 90555defe0515f8ec9952c40165d83eb9f10254f9f2cf94e48096a03eb9c2bf7 SHA512 3d5245a06c576d8a4f5fdf07ddb0a6cbc9cf0f64799da9e7e58a67fdd23a5fe082d0bc557575914ec7fba42923d8503587b327ad31f270f46710084fb7cba5f8 WHIRLPOOL f54f1d82e3b322a66e4d9bb33c0b90458b00a0d92876899e29f3d7c4a5d8fd3001930f4c2fb66c8b122b24866619c64aafdbe5b1b3e3494808b2d2d72b5f6174
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-gcc6.patch b/media-sound/gmorgan/files/gmorgan-0.79-gcc6.patch
new file mode 100644
index 000000000000..2941fdf106e3
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-gcc6.patch
@@ -0,0 +1,43 @@
+From a395c47f97ae2cc7564c2af04913620767c650d3 Mon Sep 17 00:00:00 2001
+From: Peter Levine <plevine457@gmail.com>
+Date: Sat, 4 Mar 2017 14:25:40 +0200
+Subject: [PATCH] Fix build with gcc6
+
+If nls is disabled, the build defines a number of macros such as 'gettext' and 'dgettext' that would otherwise clash with symbols in /usr/include/libintl.h.  Unfortunately, the build eventually includes /usr/include/libintl.h anyway, and the symbols do clash.  Testing on gcc-5.4 and gcc-6.2 shows the macros aren't needed or used.
+---
+ src/gettext.h | 19 -------------------
+ 1 file changed, 19 deletions(-)
+
+diff --git a/src/gettext.h b/src/gettext.h
+index 8b262f4..8aea60c 100644
+--- a/src/gettext.h
++++ b/src/gettext.h
+@@ -36,25 +36,6 @@
+ #if defined(__sun)
+ # include <locale.h>
+ #endif
+-
+-/* Disabled NLS.
+-   The casts to 'const char *' serve the purpose of producing warnings
+-   for invalid uses of the value returned from these functions.
+-   On pre-ANSI systems without 'const', the config.h file is supposed to
+-   contain "#define const".  */
+-# define gettext(Msgid) ((const char *) (Msgid))
+-# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
+-# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
+-# define ngettext(Msgid1, Msgid2, N) \
+-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+-# define dngettext(Domainname, Msgid1, Msgid2, N) \
+-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+-# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+-    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+-# define textdomain(Domainname) ((const char *) (Domainname))
+-# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+-# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
+-
+ #endif
+ 
+ /* A pseudo function call that serves as a marker for the automated
+-- 
+2.12.0
+
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-manpages.patch b/media-sound/gmorgan/files/gmorgan-0.79-manpages.patch
new file mode 100644
index 000000000000..5fe8b7b3b4a5
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-manpages.patch
@@ -0,0 +1,30 @@
+From 838843654b9b8e7394da0cad37ab919817a95248 Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+Date: Sat, 4 Mar 2017 13:53:00 +0200
+Subject: [PATCH 2/3] Don't try to generate man page, Fixes sandbox issue
+
+Fixes following error:
+  make[1]: Entering directory '/var/tmp/portage/media-sound/gmorgan-0.79/work/gmorgan-0.79/man'
+  name="gmorgan a midi processor" ../src/gmorgan -o gmorgan.1
+   * ACCESS DENIED:  open_wr:      /dev/snd/seq
+   * ACCESS DENIED:  open_wr:      /dev/snd/seq
+  ALSA lib /var/tmp/portage/media-libs/alsa-lib-1.1.3/work/alsa-lib-1.1.3/src/seq/seq_hw.c:466:(snd_seq_hw_open) open /dev/snd/seq failed: Permission denied
+  ALSA lib /var/tmp/portage/media-libs/alsa-lib-1.1.3/work/alsa-lib-1.1.3/src/seq/seq_hw.c:466:(snd_seq_hw_open) open /dev/snd/seq failed: Permission denied
+make[1]: [Makefile:526: gmorgan.1] Segmentation fault (ignored)
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 6fd435d..2e739a3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = m4 src data doc man po
++SUBDIRS = m4 src data doc po
+  
+ # Find gnulib headers.
+ ACLOCAL_AMFLAGS = -I m4
+-- 
+2.12.0
+
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-remove-dirs.patch b/media-sound/gmorgan/files/gmorgan-0.79-remove-dirs.patch
new file mode 100644
index 000000000000..2183688e61aa
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-remove-dirs.patch
@@ -0,0 +1,33 @@
+From b1ca9596933eb4e9486eebadd1c4ca2254da35e1 Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+Date: Sat, 4 Mar 2017 13:54:03 +0200
+Subject: [PATCH 3/3] Remove duplicate dirs from data/Makefile.am
+
+They are already defined in SUBDIRS variable
+---
+ data/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index a73f8d7..fc9ff0c 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -15,7 +15,6 @@ FourAntiR.gmsong \
+ Four.gmsong \
+ fullkeyboard.gmos \
+ GMPresetList.txt \
+-help \
+ hhtm.gmps \
+ HowHignTheBoom.gmsong \
+ HowInsensate.gmsong \
+@@ -33,7 +32,6 @@ QuietNight.gmos \
+ README \
+ Saxaphones.gmos \
+ shearing.gmos \
+-skins \
+ sounds.gmox \
+ StyleLib.lib \
+ template.gmos \
+-- 
+2.12.0
+
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch b/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch
new file mode 100644
index 000000000000..5a076a7ba2a8
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-remove-gettext-version-check.patch
@@ -0,0 +1,26 @@
+From f9e6d4ac86b53cb3b9a8fcd95194798e7ec56e3a Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+Date: Sat, 4 Mar 2017 13:52:22 +0200
+Subject: [PATCH 1/3] Remove useless gettext version check
+
+Fixes following error:
+autopoint: *** Missing version: please specify in configure.ac through a line 'AM_GNU_GETTEXT_VERSION(x.yy.zz)' the gettext version the package is using
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ed48b6f..f6ba2af 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,7 +16,6 @@ AC_HEADER_STDC
+ AC_FUNC_SELECT_ARGTYPES
+ AC_CHECK_FUNCS([bzero memset select strdup])
+ AM_GNU_GETTEXT([external]) 
+-AM_GNU_GETTEXT_VERSION
+ LIBS="`fltk-config --use-images --ldflags` -lasound"
+ CXXFLAGS="-g `fltk-config --use-images --cxxflags`"
+ AC_CHECK_HEADERS([unistd.h])
+-- 
+2.12.0
+
diff --git a/media-sound/gmorgan/files/gmorgan-0.79-remove-old-docs.patch b/media-sound/gmorgan/files/gmorgan-0.79-remove-old-docs.patch
new file mode 100644
index 000000000000..97dec2c194da
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.79-remove-old-docs.patch
@@ -0,0 +1,30 @@
+From 5fb5ec11e284c28edc8ee651900ceaff992921ed Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+Date: Sat, 4 Mar 2017 14:18:13 +0200
+Subject: [PATCH 1/2] Remove old docs and update datadir
+
+---
+ doc/Makefile.am | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 16187f0..0c3c4a8 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,11 +1,4 @@
+-datadir = $(prefix)/share/${PACKAGE}/doc
+-data_DATA=gmorgan0.75.pdf \
+-gmorgan0.75.odt \
+-gmorgan-old-es.pdf \
+-gmorgan-old-es.sxw \
+-gmorgan-old-fr.pdf \
+-gmorgan-old-fr.sxw \
+-gmorgan-old.pdf \
+-gmorgan-old.sxw 
++datadir = $(docdir)
++data_DATA=gmorgan0.75.pdf
+ 
+ EXTRA_DIST = $(data_DATA)
+-- 
+2.12.0
+
diff --git a/media-sound/gmorgan/files/gmorgan-cflags.patch b/media-sound/gmorgan/files/gmorgan-cflags.patch
new file mode 100644
index 000000000000..83c2c01a5745
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-cflags.patch
@@ -0,0 +1,13 @@
+Index: gmorgan_0.39/configure.in
+===================================================================
+--- gmorgan_0.39.orig/configure.in
++++ gmorgan_0.39/configure.in
+@@ -15,7 +15,7 @@ AC_FUNC_SELECT_ARGTYPES
+ AC_CHECK_FUNCS([bzero memset select strdup])
+ AM_GNU_GETTEXT([external])
+ LIBS="`fltk-config --use-images --ldflags` -lasound"
+-CXXFLAGS="`fltk-config --use-images --cxxflags`"
++CXXFLAGS="${CXXFLAGS} `fltk-config --use-images --cxxflags`"
+ AC_CHECK_HEADERS([unistd.h])
+ AC_CHECK_HEADER(alsa/asoundlib.h, true, AC_MSG_ERROR([Alsa is required]))
+ AC_PATH_PROG(FLTK_CONFIG, fltk-config, no)
diff --git a/media-sound/gmorgan/gmorgan-0.39.ebuild b/media-sound/gmorgan/gmorgan-0.39.ebuild
new file mode 100644
index 000000000000..76258d47e22f
--- /dev/null
+++ b/media-sound/gmorgan/gmorgan-0.39.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils autotools
+
+MY_P=${PN}_${PV}
+DESCRIPTION="Opensource software rhythm station"
+HOMEPAGE="http://gmorgan.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gmorgan/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/alsa-lib
+	x11-libs/fltk:1"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-cflags.patch"
+
+	# Stolen from enlightenment.eclass
+	cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize"
+	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize"
+
+	einfo "Running gettextize -f --no-changelog..."
+	( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed"
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS NEWS README || die
+}
diff --git a/media-sound/gmorgan/gmorgan-0.79.ebuild b/media-sound/gmorgan/gmorgan-0.79.ebuild
new file mode 100644
index 000000000000..77d5c1384977
--- /dev/null
+++ b/media-sound/gmorgan/gmorgan-0.79.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Opensource software rhythm station"
+HOMEPAGE="http://gmorgan.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gmorgan/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="media-libs/alsa-lib
+	x11-libs/fltk:1"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-gettext-version-check.patch
+	"${FILESDIR}"/${P}-manpages.patch
+	"${FILESDIR}"/${P}-remove-dirs.patch
+	"${FILESDIR}"/${P}-remove-old-docs.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	doman man/${PN}.1
+}
diff --git a/media-sound/gmorgan/metadata.xml b/media-sound/gmorgan/metadata.xml
new file mode 100644
index 000000000000..3732aacbac32
--- /dev/null
+++ b/media-sound/gmorgan/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gmorgan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/gmpc/Manifest b/media-sound/gmpc/Manifest
new file mode 100644
index 000000000000..120b0f215ffb
--- /dev/null
+++ b/media-sound/gmpc/Manifest
@@ -0,0 +1,7 @@
+AUX gmpc-11.8.16-icons.patch 7380 SHA256 b74a973489649599b492cf19d283ce9e00990b7e22df036032ad694085f85ebf SHA512 cabee4790552b22e31873fdd0b2c786743fdb9fe3b5eb613ec85e83e27285116e6f05c1d8ac7013d9d2b17ec765876a276804c08b1ccc6d78051991c50b769d8 WHIRLPOOL 6058a30d008b5402a173d0aa4a909730c03e32920422486d19ca61fedb3615efcf243393b1485b194fd9b4f0daf8389461ffc1b7c529eb185bd943935e6504fa
+AUX gmpc-11.8.16-underlinking.patch 241 SHA256 5ee44bcafabb2bded0093efbf35fbf180752db30cd48b0c45c1322832849352d SHA512 ff1d628f0bdf4be3d0c1130762ecb0c90f2a93cbe0d31b3df25168b04a68b0292788b7c1c5c69b243a16ccfb1185d1622d5c7e1c6d390460db37156ad5f78576 WHIRLPOOL 12d844b2fc1e48c4e05b7547e121f27f3ef3c33fd02ff6cf42e0417a09d9bea397843d0478b1923813716f07d1e61fd049aadab94f9b9b789c08c1992727e1bc
+DIST gmpc-11.8.16.tar.gz 7082909 SHA256 a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c SHA512 4e5c8112edc016ac6c472b0099347a4fcd0336022e15be8d76fae449d30e533df92a4379aa98e389e624b9910ff3f528afb682f64901ea53f09e00d3d5678623 WHIRLPOOL 4703e62bf6e23b6bdbb6be19fbc7c99e0461dc19f6cdc582653cdc680340544239d5d41aa6033884e46bb277ee3c9e676f0a8fa6bf5e8051c2465b771fbd18d6
+EBUILD gmpc-11.8.16-r1.ebuild 1415 SHA256 26598a8952adb265685575878ce65b150024d384215667d4b7a76a3553b46e94 SHA512 75aa3f72fdbd9a380278f482d50cf3423d1a026197844191a1ccd98b98e3b0e70e702e0a2da27d4d3483dbe8bfced1fc616ce82c1feeeb390556eecb382b54e9 WHIRLPOOL 77bb7a45204122d4d2bf93990b5e8d305996302bd947131f432581c8e1efb74a16cd234bcd69d30539e0da0c59e6c7f75483e596ed059152184ef0d98f00e47e
+MISC ChangeLog 2943 SHA256 d9fd73f5c3ce4ff5d91f1a3b4512ddcb559a51c1aeb24238cea6cecf3764337a SHA512 2f230a988da4031dcd90712b3d4b9722b492107563743a72582f86470e1fa4d37fd519adc36c4e6f325192f85eaebaa2664f5aa0638fac3a47d8cd6cc8e5ca52 WHIRLPOOL e4b9fbb5b2ef2c21ca7538a81198daec3aac0217829ed282c141ab1ff89c599868bb1e612d32956dcb8cd0526c4cb8c047fbd178aaea566a351c4bda18ad14ea
+MISC ChangeLog-2015 11982 SHA256 c28c4206a999d9684dc53b4955dc9c3ce527c34784a550bfc8012f5fd3befd26 SHA512 df839634682316d0fa33c56b3be74c608a4e3f5dd576adca2ae402c37e07f5291b97f6609b0e3f0f47ee71456d9556eb35d781a6389fa0d84a96227aca55cffb WHIRLPOOL e2f1eb693bca52663dea4bf6e7968a512846502ceca42c24dbaea27b5207bb53a3c11f50380dcad9d376aeb305128c928cf26558d299ea390c19440e14bce3a4
+MISC metadata.xml 436 SHA256 2e90a9face4c3764028dd62f0b9e4e5f71c961de3caacf19ba94a880c924b5dc SHA512 c3c04eb47a7d3ad5eee60e3c28ce2279bdf73aa9537c351279c1a8a4efd6340dbbc74d7044edd8eac317c48a355f5a8f676b736a2447c434ff75a833af9d9a34 WHIRLPOOL 8e37c473711ff3bbf0cb46bd22146eca0246cad4a90cb479834e47ce2dd87f4e85c1f959e4447da2b060e478ded7e3b38e2967f0222c29b1bf512de0a7fa11ef
diff --git a/media-sound/gmpc/files/gmpc-11.8.16-icons.patch b/media-sound/gmpc/files/gmpc-11.8.16-icons.patch
new file mode 100644
index 000000000000..ea37effa9f74
--- /dev/null
+++ b/media-sound/gmpc/files/gmpc-11.8.16-icons.patch
@@ -0,0 +1,119 @@
+diff --git a/glade/playlist3.ui b/glade/playlist3.ui
+index fedb627..452f3ec 100644
+--- a/glade/playlist3.ui
++++ b/glade/playlist3.ui
+@@ -436,16 +436,17 @@
+                                 <child>
+                                   <object class="GtkButton" id="button_previous">
+                                     <property name="visible">True</property>
++                                    <property name="use_action_appearance">False</property>
+                                     <property name="related-action">MPDPrevious</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="receives_default">False</property>
+                                     <property name="relief">none</property>
+                                     <property name="use_action_appearance">False</property>
+                                     <child>
+-                                      <object class="GtkImage" id="image10">
++                                        <object class="GtkImage" id="button_previous_image">
+                                         <property name="visible">True</property>
+                                         <property name="stock">gtk-media-previous</property>
+-                                      </object>
++                                        </object>
+                                     </child>
+                                   </object>
+                                   <packing>
+@@ -455,18 +456,18 @@
+                                   </packing>
+                                 </child>
+                                 <child>
+-                                  <object class="GtkButton" id="top_button">
++                                  <object class="GtkButton" id="stop_button">
+                                     <property name="visible">True</property>
++                                    <property name="use_action_appearance">False</property>
+                                     <property name="related-action">MPDStop</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="receives_default">True</property>
+                                     <property name="relief">none</property>
+-                                    <property name="use_action_appearance">False</property>
+                                     <child>
+-                                      <object class="GtkImage" id="stop_button_image">
++                                        <object class="GtkImage" id="button_stop_image">
+                                         <property name="visible">True</property>
+                                         <property name="stock">gtk-media-stop</property>
+-                                      </object>
++                                        </object>
+                                     </child>
+                                   </object>
+                                   <packing>
+@@ -478,15 +479,16 @@
+                                 <child>
+                                   <object class="GtkButton" id="play_button">
+                                     <property name="visible">True</property>
++                                    <property name="use_action_appearance">False</property>
+                                     <property name="related-action">MPDPlayPause</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="receives_default">False</property>
+                                     <property name="relief">none</property>
+                                     <child>
+-                                      <object class="GtkImage" id="play_button_image">
++                                        <object class="GtkImage" id="play_button_image">
+                                         <property name="visible">True</property>
+                                         <property name="stock">gtk-media-play</property>
+-                                      </object>
++                                        </object>
+                                     </child>
+                                   </object>
+                                   <packing>
+@@ -498,13 +500,13 @@
+                                 <child>
+                                   <object class="GtkButton" id="next_button">
+                                     <property name="visible">True</property>
++                                    <property name="use_action_appearance">False</property>
+                                     <property name="related-action">MPDNext</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="receives_default">False</property>
+-                                    <property name="use_action_appearance">False</property>
+                                     <property name="relief">none</property>
+                                     <child>
+-                                      <object class="GtkImage" id="image11">
++                                      <object class="GtkImage" id="next_button_image">
+                                         <property name="visible">True</property>
+                                         <property name="stock">gtk-media-next</property>
+                                       </object>
+diff --git a/src/playlist3.c b/src/playlist3.c
+index 72b4ef7..3dac409 100644
+--- a/src/playlist3.c
++++ b/src/playlist3.c
+@@ -1632,7 +1632,8 @@ static void playlist_status_changed(MpdObj * mi, ChangedStatusType what, void *u
+                 gtk_action_set_stock_id(GTK_ACTION(gtk_builder_get_object(pl3_xml, "MPDPlayPause")), "gtk-media-pause");
+                 gtk_image_set_from_stock(GTK_IMAGE
+                     (gtk_builder_get_object
+-                    (pl3_xml, "play_button_image")), "gtk-media-pause", GTK_ICON_SIZE_BUTTON);
++                    (pl3_xml, "play_button_image")), "gtk-media-pause",
++					GTK_ICON_SIZE_MENU);
+ 
+                 /**
+                  * Update window title
+@@ -1669,8 +1670,8 @@ static void playlist_status_changed(MpdObj * mi, ChangedStatusType what, void *u
+                 gtk_action_set_stock_id(GTK_ACTION(gtk_builder_get_object(pl3_xml, "MPDPlayPause")), "gtk-media-play");
+                 gtk_image_set_from_stock(GTK_IMAGE
+                     (gtk_builder_get_object
+-                    (pl3_xml, "play_button_image")), "gtk-media-play", GTK_ICON_SIZE_BUTTON);
+-
++                    (pl3_xml, "play_button_image")), "gtk-media-play",
++					GTK_ICON_SIZE_MENU);
+                 /**
+                  * Set paused in Window string
+                  */
+@@ -1704,8 +1705,8 @@ static void playlist_status_changed(MpdObj * mi, ChangedStatusType what, void *u
+ 
+                 gtk_image_set_from_stock(GTK_IMAGE
+                     (gtk_builder_get_object
+-                    (pl3_xml, "play_button_image")), "gtk-media-play", GTK_ICON_SIZE_BUTTON);
+-
++                    (pl3_xml, "play_button_image")), "gtk-media-play",
++					GTK_ICON_SIZE_MENU);
+                 if (gmpc_profiles_get_number_of_profiles(gmpc_profiles) > 1)
+                 {
+                     gchar *id = gmpc_profiles_get_current(gmpc_profiles);
+-- 
diff --git a/media-sound/gmpc/files/gmpc-11.8.16-underlinking.patch b/media-sound/gmpc/files/gmpc-11.8.16-underlinking.patch
new file mode 100644
index 000000000000..e6cf1ef9f05d
--- /dev/null
+++ b/media-sound/gmpc/files/gmpc-11.8.16-underlinking.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 497194b..84c31f0 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -174,7 +174,8 @@ LIBS= \
+ 	@libxml2_LIBS@\
+ 	@libx11_LIBS@\
+ 	@sqlite3_LIBS@\
+-	-lz
++	-lz\
++	-lm
+ 
+ 
+ if HAVE_UNIQUE
diff --git a/media-sound/gmpc/gmpc-11.8.16-r1.ebuild b/media-sound/gmpc/gmpc-11.8.16-r1.ebuild
new file mode 100644
index 000000000000..9629d477e07a
--- /dev/null
+++ b/media-sound/gmpc/gmpc-11.8.16-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+VALA_MIN_API_VERSION=0.12
+
+inherit autotools eutils gnome2-utils vala
+
+DESCRIPTION="A GTK+2 client for the Music Player Daemon"
+HOMEPAGE="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
+SRC_URI="http://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls xspf +unique"
+
+RDEPEND="dev-db/sqlite:3
+	>=dev-libs/glib-2.16:2
+	dev-libs/libxml2:2
+	>=media-libs/libmpd-11.8
+	net-libs/libsoup:2.4
+	>=x11-libs/gtk+-2.18:2
+	x11-libs/libX11
+	x11-themes/hicolor-icon-theme
+	unique? ( dev-libs/libunique:1 )
+	xspf? ( >=media-libs/libxspf-1.2 )"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	app-text/gnome-doc-utils
+	>=dev-util/gob-2.0.17
+	virtual/pkgconfig
+	nls? ( dev-util/intltool
+		sys-devel/gettext )"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch \
+		"${FILESDIR}"/${P}-icons.patch
+	sed -i -e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac || die
+	eautoreconf
+	vala_src_prepare
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-libspiff \
+		--disable-appindicator \
+		--enable-mmkeys \
+		$(use_enable nls) \
+		$(use_enable unique) \
+		$(use_enable xspf libxspf)
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/gmpc/metadata.xml b/media-sound/gmpc/metadata.xml
new file mode 100644
index 000000000000..24b5ad9a282a
--- /dev/null
+++ b/media-sound/gmpc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+<use>
+	<flag name="unique">Enable single instance support using <pkg>dev-libs/libunique</pkg></flag>
+	<flag name="xspf">Enable support for reading and saving XSPF playlists</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/gmtp/Manifest b/media-sound/gmtp/Manifest
new file mode 100644
index 000000000000..f4698c042bad
--- /dev/null
+++ b/media-sound/gmtp/Manifest
@@ -0,0 +1,5 @@
+DIST gmtp-1.3.10.tar.gz 496912 SHA256 b21b9a8e66ae7bb09fc70ac7e317a0e32aff3917371a7241dea73c41db1dd13b SHA512 e2f5b8231e409d9ef6e512cb37199ce7771b87f61cb5bf29a86be0e3fdda22688005ae5b22f004f91a69df2f682c9eb0f1b7613e4f1a8dd3cc6fb0edb6e29fcd WHIRLPOOL 2a1e0af4656873ff777af85640d1797af2bb2b49ce4d17ad29644323994235d55273abb481a1af416929b7235a432026bbfd4123219b72cee9355f39576def2a
+EBUILD gmtp-1.3.10.ebuild 755 SHA256 df441b2527b2fe92453c1cf5f3b8ef6d7a03d1d3863da3f2842b15affb865840 SHA512 85d109eaeea3fdf24d83f87c451d3a9c8e970d131f6affc63f2f7b274aa6de036fbfe13e32e06f8f37d7b4bfac79c1b2db1f255d6fd02d54defae7a9f126c2f1 WHIRLPOOL 268b0648a5982b37cd507aa47ecae56137cc332c9c1ba293f44079d942e651528019d2493c26d322c6cf51d67900cc37cd3a5d458e4b5a9e2e0105d756ca7ff3
+MISC ChangeLog 2754 SHA256 4a59ede63a4ef8426eb9bdb753de403c618be6959b8f20afde3d14bc2a692df6 SHA512 5a1d03db6051fd30d90df28108387c883da47eda01c3817be4e1f5588f112108ee9ac093f69acfcdd61af04d50b36b5e8d2302639bee8b458eab6aeede2901ab WHIRLPOOL 222a620b2b6f8db7ad3d2f6b2e256f262e45ffc938640a155dd04a1d830fc13f8bdd56c0d733ea53eb34c888ef537402016df3186ed1bae4024ece9606dbf6a6
+MISC ChangeLog-2015 2667 SHA256 4fe99f315abf8aa514b8c0951440030a0d4439ccbbec50c9f86706f50cf46be0 SHA512 f0cf00d2f08019b59556b0d65b5c4eb10c28ca14f0abf2dab75103470b9dfc27efc60b865c72ebb83ebf4380d838fc59389db3c90cd302a79969aeb5faa6e1d5 WHIRLPOOL bffbfc2db0ff2c6ef8062df32c2fcb4c00e9f70a00ae07f080867bb4d5ce8af49988c15b6c61e147e41f6c1fc30f879ce79bea70606431d9fd359c85e25524d9
+MISC metadata.xml 506 SHA256 aada71e820a3bfc6478873a75edc44e0ffd1b01fb330bccab76a1648ef74d4b8 SHA512 ad86ce322da7b9459e597a94d03de3e3ec81d072646bf9fa98a4ad31e904f584c6a70cb82aaf7ec00feeca503818452109fc80cb9eebdff781b701ada830dac5 WHIRLPOOL 652e8ba1fba83d8d22c7534c655238d15ed287953535470687a67dc2826368bf029f0a6b4f09b9e40e479ccb687a11059c3a9f6b1d312080538a17357fb9d612
diff --git a/media-sound/gmtp/gmtp-1.3.10.ebuild b/media-sound/gmtp/gmtp-1.3.10.ebuild
new file mode 100644
index 000000000000..9f56fbc962a1
--- /dev/null
+++ b/media-sound/gmtp/gmtp-1.3.10.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit gnome2-utils
+
+DESCRIPTION="A simple MTP client for MP3 players"
+HOMEPAGE="http://gmtp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libmtp
+	media-libs/libvorbis
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf --with-gtk3
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/media-sound/gmtp/metadata.xml b/media-sound/gmtp/metadata.xml
new file mode 100644
index 000000000000..ed33917d6fc7
--- /dev/null
+++ b/media-sound/gmtp/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <longdescription lang="en">
+gMTP is a graphical frontend to libmtp. It allows to transfer files to mtp devices like mp3 players or android tablets.
+</longdescription>
+  <upstream>
+    <remote-id type="sourceforge">gmtp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/gmusicbrowser/Manifest b/media-sound/gmusicbrowser/Manifest
new file mode 100644
index 000000000000..e9c811f3f23a
--- /dev/null
+++ b/media-sound/gmusicbrowser/Manifest
@@ -0,0 +1,8 @@
+DIST gmusicbrowser-1.1.15.tar.gz 2349451 SHA256 1ec881d148ccc26bdbab66ca701fd2216e034c3b613d6e66c17ac702271c677b SHA512 9176be8f2b1b6c832099feff87a7a526efaa3c512c9b7b6d433f1a157ac1185adb05185f52f9ce1b3b41afc967c37345d216a090b472927a661747e25479cbdc WHIRLPOOL b9fa86d43a904d8adb587f8eebae9fcc3463fb7f7c04b44d14365742de9bda240dde7fd4e27df88b812418af1e0f00955afde8184600729dd8ab06aa220d689d
+DIST gmusicbrowser-1.1.15_p20160530.tar.gz 1305616 SHA256 01480178afd54356f7b0cafbbe0a6d163dc6ac0ad0f7a4d0442ebf86afe426e3 SHA512 980446a873fab39c5b880e289e2ff61df112f5336dfd19b0ac3b3b6a346ddebaaca8718f169926404f38cc518817f115a38ab210ae7f4eab05962506d70d3f3b WHIRLPOOL 1ebd172a8bdfbf92b1a11187b588374a4217da413fef34e702d9c004297c2958e666c14b95854c9af3cb79125e28c8cb09810a868db704c2968a5f459aef7e6c
+EBUILD gmusicbrowser-1.1.15-r3.ebuild 1683 SHA256 19f4de2b61e923a3e326dcb356b1818cc0c969dd08546ef4e13f1774a8b26262 SHA512 8936dcbf217f9e12b041a8197ab47c16617624ab94668f96fc22ca305f6cb3efb9ac8c14a23e2880a0917bcd5b41087ec988baa0e27f84f5f805a0e41e88639d WHIRLPOOL 934860b436fe186f0af994f20e52ce78a4249e8f9df416cff6a64c27b854d5dbc9e9b601740a0954b9be02b125274fc482ba4a7c591b0144536dffe54007cbf1
+EBUILD gmusicbrowser-1.1.15_p20160530.ebuild 1744 SHA256 d76c7183da48631cb1ae27669562cfb326e362b5501af3208ad767df3690c5eb SHA512 5a1a91e86e095ffb5c41466c27796b2e6a5158029bf57c8ce61c0f7c557bfa2bc7fc07c4009ae97d4b91964e6c4b46c6f053c358fec06210ce2d2f3e134a456b WHIRLPOOL c6fb6f29d39e10015f6311eb29e4804127922040a86eab8e2af83d13bd01a1b62baa69ee8ab6cc80668ae390efb6b10a8bbbbc625ee15b43fa7b51c8afdd4391
+EBUILD gmusicbrowser-9999.ebuild 1744 SHA256 d76c7183da48631cb1ae27669562cfb326e362b5501af3208ad767df3690c5eb SHA512 5a1a91e86e095ffb5c41466c27796b2e6a5158029bf57c8ce61c0f7c557bfa2bc7fc07c4009ae97d4b91964e6c4b46c6f053c358fec06210ce2d2f3e134a456b WHIRLPOOL c6fb6f29d39e10015f6311eb29e4804127922040a86eab8e2af83d13bd01a1b62baa69ee8ab6cc80668ae390efb6b10a8bbbbc625ee15b43fa7b51c8afdd4391
+MISC ChangeLog 4563 SHA256 4d67c5312f05d808639cbff61e628c05bbab2061e469ed1c4f7f7de1312e10f7 SHA512 8465922940884a49f44afc919dec3d0b7259039df0f460f3db8c7bec33bf9b5992c4d0cbd811749578c0bf7168966bc5df4e3961741599766db0958e36df4ba3 WHIRLPOOL f437dff40247e58002ca79932ad5de77def65fea176a27db0afa84b9f972f8215b61859a903c5dc300bf4907c227ebd0077ed409b708a5ac7d7f9cf445124a98
+MISC ChangeLog-2015 5372 SHA256 97821a5686d874575d3a9bd63830dd8d2a5875882d71a7c6336a1dd05423d1ee SHA512 5a7b89d22d2a262113e0a2d551e9fee8f81d80cdc800a7687f95536235cfdedbaaabc8a6448ef66d04fb33cacd6d893d9732e7ca90c733b569016e487ae18ba6 WHIRLPOOL 51b857086a26ce3d4998a3924134a3deb5be7c2443a83e26552cfe3ad0422c2822196ecbaee87e176c80349dae1a343d0ec77def26765acdbfef76045e3aadd3
+MISC metadata.xml 513 SHA256 25257d231df71d4f0d3bba5dd96a0d3de53835122ad05f7f7582245aa4c16cd7 SHA512 e08639e639e8262a2ae578ffaab838d1169212ad321f1e60b491465d4eedf54b2733428cc71dfaffd99bd2664d943b4fa15a113fbbb0fb60abc2eee192882173 WHIRLPOOL 4fa6d4293a53aeed8d4cdb4d54dae53aadbd3311b128e267590a03d9f613af6491170e9023f861bde8e9e42fcb7a44eee7b44867b0de6f7c9d2d0989c3b2c4ea
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild
new file mode 100644
index 000000000000..a5010ffa36b2
--- /dev/null
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fdo-mime gnome2-utils
+
+DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
+HOMEPAGE="https://gmusicbrowser.org/"
+SRC_URI="https://${PN}.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="dbus doc extras gstreamer libnotify mplayer"
+
+GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"
+MPLAYER_DEPEND="media-video/mplayer"
+MPV_DEPEND="media-video/mpv"
+OTHER_DEPEND="
+	media-sound/alsa-utils
+	media-sound/flac123
+	|| ( media-sound/mpg123 media-sound/mpg321 )
+	media-sound/vorbis-tools"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Gtk2
+	virtual/perl-MIME-Base64
+	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
+	dbus? ( dev-perl/Net-DBus )
+	gstreamer? ( ${GSTREAMER_DEPEND} )
+	mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) )
+	!gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) )
+	extras? ( dev-perl/gnome2-wnck )
+	libnotify? ( dev-perl/Gtk2-Notify )"
+DEPEND="sys-devel/gettext"
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		iconsdir="${D%/}/usr/share/icons/hicolor" \
+		install
+
+	use doc && local HTML_DOCS=( layout_doc.html )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "Gmusicbrowser supports gstreamer, mplayer, mpv and mpg123/ogg123..."
+	elog "for audio playback. Needed dependencies:"
+	elog "  Gstreamer: ${GSTREAMER_DEPEND}"
+	elog "  mplayer: ${MPLAYER_DEPEND}"
+	elog "  mpv: ${MPV_DEPEND}"
+	elog "  mpg123/ogg123...: ${OTHER_DEPEND}"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
new file mode 100644
index 000000000000..0484ba50fb50
--- /dev/null
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.15_p20160530.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils fdo-mime gnome2-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	GIT_COMMIT="853840eb9dad0b59ad2dac5d303f5929b2f09f21"
+	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+fi
+
+DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
+HOMEPAGE="https://gmusicbrowser.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="dbus doc extras gstreamer libnotify mplayer"
+
+GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"
+MPLAYER_DEPEND="media-video/mplayer"
+MPV_DEPEND="media-video/mpv"
+OTHER_DEPEND="
+	media-sound/alsa-utils
+	media-sound/flac123
+	|| ( media-sound/mpg123 media-sound/mpg321 )
+	media-sound/vorbis-tools"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Gtk2
+	virtual/perl-MIME-Base64
+	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
+	dbus? ( dev-perl/Net-DBus )
+	gstreamer? ( ${GSTREAMER_DEPEND} )
+	mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) )
+	!gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) )
+	extras? ( dev-perl/gnome2-wnck )
+	libnotify? ( dev-perl/Gtk2-Notify )"
+DEPEND="sys-devel/gettext
+	doc? ( dev-perl/Text-Markdown )"
+
+src_compile() {
+	emake MARKDOWN=$(usex doc "Markdown.pl" "echo")
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		iconsdir="${D%/}/usr/share/icons/hicolor" \
+		install
+
+	use doc && local HTML_DOCS=( layout_doc.html )
+	einstalldocs
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
new file mode 100644
index 000000000000..0484ba50fb50
--- /dev/null
+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils fdo-mime gnome2-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/squentin/${PN}.git"
+	inherit git-r3
+	SRC_URI=""
+	KEYWORDS=""
+else
+	GIT_COMMIT="853840eb9dad0b59ad2dac5d303f5929b2f09f21"
+	SRC_URI="https://github.com/squentin/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+fi
+
+DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
+HOMEPAGE="https://gmusicbrowser.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="dbus doc extras gstreamer libnotify mplayer"
+
+GSTREAMER_DEPEND="dev-perl/Glib-Object-Introspection"
+MPLAYER_DEPEND="media-video/mplayer"
+MPV_DEPEND="media-video/mpv"
+OTHER_DEPEND="
+	media-sound/alsa-utils
+	media-sound/flac123
+	|| ( media-sound/mpg123 media-sound/mpg321 )
+	media-sound/vorbis-tools"
+
+RDEPEND="dev-lang/perl
+	dev-perl/Gtk2
+	virtual/perl-MIME-Base64
+	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
+	dbus? ( dev-perl/Net-DBus )
+	gstreamer? ( ${GSTREAMER_DEPEND} )
+	mplayer? ( || ( ${MPLAYER_DEPEND} ${MPV_DEPEND} ) )
+	!gstreamer? ( !mplayer? ( ${OTHER_DEPEND} ) )
+	extras? ( dev-perl/gnome2-wnck )
+	libnotify? ( dev-perl/Gtk2-Notify )"
+DEPEND="sys-devel/gettext
+	doc? ( dev-perl/Text-Markdown )"
+
+src_compile() {
+	emake MARKDOWN=$(usex doc "Markdown.pl" "echo")
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		iconsdir="${D%/}/usr/share/icons/hicolor" \
+		install
+
+	use doc && local HTML_DOCS=( layout_doc.html )
+	einstalldocs
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/gmusicbrowser/metadata.xml b/media-sound/gmusicbrowser/metadata.xml
new file mode 100644
index 000000000000..6c2c0dcaa759
--- /dev/null
+++ b/media-sound/gmusicbrowser/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>Sergiy.Borodych@gmail.com</email>
+		<name>Sergiy Borodych</name>
+		<description>Proxied maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="extras">Install some extra deps for plugins (ex. Titlebar)</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/gnac/Manifest b/media-sound/gnac/Manifest
new file mode 100644
index 000000000000..7a594185362d
--- /dev/null
+++ b/media-sound/gnac/Manifest
@@ -0,0 +1,7 @@
+AUX gnac-0.2.4.1-cflags.patch 363 SHA256 4fc934a7cc98cdc5a7c1ac9e65d57826fed81c9f50694d1c28acae9f79bd24f6 SHA512 ec43a8925136432ae2d05cace27d98c6193babee3d5d6b6c4c86ce9494875c4d6289624cb7436af1e0467583a70afe87087d7251a81053fa83cdf5cb1959d3a5 WHIRLPOOL 541612591436b46fb94de82c76596c215affe66b168bd7186e9427cdbe1028ca372231a554fd8c98ed44ab3a90b4475aadebd0a7a2775aab0940415e9a3374de
+AUX gnac-0.2.4.1-nls.patch 316 SHA256 870431ff702d0e400c3221b3574d2e8ca4049eb13003d829d43034bfc5e059a1 SHA512 2d553fa9ca941ba8f24c83a5e18de528ea6284e5a5ddb66b472227f02425555a783f49bada25b277817cd358e7c3895b9cf76166e9c357edb732e5d1480f288a WHIRLPOOL 381d810e25c0c8bd518102e844f404d8cb36274d84e0931503b963c6a45221d15625c8c999c8fcb03075a971ffe0741c48d7e7decb57f7375da235cbc704e870
+DIST gnac-0.2.4.1.tar.bz2 929747 SHA256 8f9c4731bbc40fde57c311a2a7fabe4e3200198abfe7415c659b98a2d54869da SHA512 c474854222cc938d6ec081cdf5e8e8762e5618eca1c17dacaf8412970310ee50af2fad92501ba3b129f8756782fabd770e52656d6eead77d1a8ec0dd5f972f9b WHIRLPOOL b81588b4c13bd6920679d096b17c6af79a8d61d8b014654140451d65de150f1f295d50cd5ceb270067f45e52c358c8ff1f12511ea29486a0acd573fa0c71cb72
+EBUILD gnac-0.2.4.1.ebuild 1277 SHA256 649ad16bdd81b44adf548f49a68bbff3057a9e15d74ebbc19f5845e8611983fc SHA512 e518911ff4e0ef5fe6341071446e0c7449137c31261305f0e04db60c7f9b28ee10d180a04df2b1a527a9cc24ed06e049910a81ec6ef85fd8dc383d0600324924 WHIRLPOOL 918ee484bfe0c9e30f5c6c4d50b39c84651fef66370c7d3cc6dfbe9bd2bdbbd1b5922aa01d525e95d0d69edb1b2a37e0eb549754229a07ec62def417e16d2574
+MISC ChangeLog 2777 SHA256 e5ea3a5e721ed059cf81f27db32e99365e70b090d3295395151c311a18aefaa6 SHA512 68c2c08ddee4a54f3d6fdb74aa1859bb8ac2aec28c14b3979f1ca38e31ea003874f1e24c5509247f83f8278fe33805c9d9ed6345a4c68a13e3b8df2be517d6f0 WHIRLPOOL c02f9393b90754769855713b070a1c62504c6918ef648c0af79cbf23bc0b7bace2868922874e77486cdbebacef81a33f6ea8afb98589572a970a8389875e0170
+MISC ChangeLog-2015 519 SHA256 7776bddc6dd1ae9ab2a0122cc0d2ae20d9ec7953afcb380f2f316a5237281067 SHA512 708798c8e8e3e06eca90eb617df2dd8251ac0b7a51c685561968a6c0b888f0258b49bfb604ed0a6896efa244c59a081638c0e7e1e57a13efdc20042a5290ed80 WHIRLPOOL 355e8b2969bcace1e0d5aab5bd92b17c51652867866189bfe089cf4202ac527e17e4b096294f1d5c4cba07330848545455701529926b5e1be05e46cedabe4458
+MISC metadata.xml 327 SHA256 cdb17ec06e53ad7b809982095116d0b9dd458b1a79beb3c16916365ebe5fc486 SHA512 625a24b4c289ba16de91190300b2eb295b728642e030cf25a5c6c439f6b0cfeaff1a03f172bf83bb23f7dbea50cb839df7b041bb4d7069dc8ee8da7e3caa7601 WHIRLPOOL 032c5cfe805a5afa89467c99e52d052c58fd059789130752f419f7ea20d6f94d611d6fc1d8f43f7df29039144d11484333aa1e85486aaf0d8d01a5e65d2ea71c
diff --git a/media-sound/gnac/files/gnac-0.2.4.1-cflags.patch b/media-sound/gnac/files/gnac-0.2.4.1-cflags.patch
new file mode 100644
index 000000000000..816eadb70ef7
--- /dev/null
+++ b/media-sound/gnac/files/gnac-0.2.4.1-cflags.patch
@@ -0,0 +1,19 @@
+--- gnac-0.2.4.1/configure.ac
++++ gnac-0.2.4.1/configure.ac
+@@ -122,16 +122,6 @@
+   AC_SUBST(DISABLE_DEPRECATED)
+ fi
+ 
+-# debug support
+-AC_ARG_ENABLE([debug], [],
+-[ if test "$enableval" = "yes"; then
+-    CFLAGS="-g -ggdb -O0"
+-  else
+-    CFLAGS="-O2"
+-  fi
+-  AC_SUBST([CFLAGS])
+-  ])
+-
+ AC_SUBST([AM_CPPFLAGS])
+ AC_SUBST([AM_CFLAGS])
+ AC_SUBST([AM_LDFLAGS])
diff --git a/media-sound/gnac/files/gnac-0.2.4.1-nls.patch b/media-sound/gnac/files/gnac-0.2.4.1-nls.patch
new file mode 100644
index 000000000000..76d822f08bf9
--- /dev/null
+++ b/media-sound/gnac/files/gnac-0.2.4.1-nls.patch
@@ -0,0 +1,10 @@
+--- gnac-0.2.4.1/po/POTFILES.in
++++ gnac-0.2.4.1/po/POTFILES.in
+@@ -32,6 +32,7 @@
+ [type: gettext/xml]data/profiles/vorbis.xml.in
+ [type: gettext/xml]data/profiles/wav.xml.in
+ [type: gettext/xml]data/profiles/wavpack.xml.in
++intl/plural.c
+ libgnac/libgnac-converter.c
+ libgnac/libgnac-error.c
+ libgnac/libgnac-gst.c
diff --git a/media-sound/gnac/gnac-0.2.4.1.ebuild b/media-sound/gnac/gnac-0.2.4.1.ebuild
new file mode 100644
index 000000000000..e35ac1e872a3
--- /dev/null
+++ b/media-sound/gnac/gnac-0.2.4.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic gnome2
+
+DESCRIPTION="Audio converter for GNOME"
+HOMEPAGE="http://gnac.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnac/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LANGS=" cs da de en_GB es gl fr he hu it lt nb pt_BR pl ro ru sl sv te tr zh_CN"
+IUSE="aac flac libnotify mp3 nls wavpack ${LANGS// / linguas_}"
+
+RDEPEND="
+	x11-libs/gtk+:3
+	dev-libs/libunique:3
+	dev-libs/libxml2:2
+	libnotify? ( x11-libs/libnotify )
+	>=media-libs/gstreamer-0.10.31:0.10
+	>=media-libs/gst-plugins-base-0.10.31:0.10
+	media-plugins/gst-plugins-gio:0.10
+	media-plugins/gst-plugins-meta:0.10[flac?,mp3?,wavpack?]
+	aac? ( media-plugins/gst-plugins-faac:0.10 )
+	nls? ( virtual/libintl )
+"
+DEPEND="${RDEPEND}
+	>=app-text/gnome-doc-utils-0.17.2
+	gnome-base/gnome-common
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+PATCHES=(
+	"${FILESDIR}/${P}-cflags.patch"
+	"${FILESDIR}/${P}-nls.patch"
+)
+
+src_prepare() {
+	default
+	epatch -p1 "${PATCHES[@]}"
+
+	# fix bug 574568 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure $(use_enable nls)
+}
diff --git a/media-sound/gnac/metadata.xml b/media-sound/gnac/metadata.xml
new file mode 100644
index 000000000000..291998630e92
--- /dev/null
+++ b/media-sound/gnac/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gnac</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/gnomad/Manifest b/media-sound/gnomad/Manifest
new file mode 100644
index 000000000000..2a2c36026700
--- /dev/null
+++ b/media-sound/gnomad/Manifest
@@ -0,0 +1,5 @@
+DIST gnomad2-2.9.6.tar.gz 318431 SHA256 74d423f4df1e71933ae31eb66724bed8027d7c4ca174a0221f6a1499e3735c9a SHA512 10f025ac38089ebc4a063ac25a262d3e2f6b72336c4566877fae311a873923b55d532d210fd2ec8a29013c06c806ddacc50f042546e4aaa5cf23228d09d854a1 WHIRLPOOL e09a00f86aa46ab36326bba69dde82c00e90b2f394306a0fa57f72b8cd4f34f59dcf7517efc145224186d5e0a91c6d233a189fa6186ccac69ba6169c85c7f71e
+EBUILD gnomad-2.9.6.ebuild 783 SHA256 6c9b104a253fffa49932b5b1d1f8488008e5c66a5ec3b057493c9befa9f08829 SHA512 eb41ca131055096eaa43117a5e1075ce7a30d74f280dd14ec13cde2ec3c2cee386bea05625a0897a03ab044fc7a54fd358b831cdcd7003ddf8c9ddfe8b192fde WHIRLPOOL b2476664f941d5ba9374309ed6b9a489bb5886c90dd5123469d08ba1d13a5b0b51b320605c2840d1003eaded8e5d91632b40455b86b0178db2e393268a253a58
+MISC ChangeLog 2427 SHA256 a573a3f5a97629db8d1b2d22ac67b34f02d5a4c7ed3989a493b731950cc821e4 SHA512 1d8df1e23e8eb36f87c1c26b230a951ab3c7228c312afda4b52fd16055c2b073878322a297c3b19519d1b4516a6cda16225fb8bf790098bfbcc1951f24dac368 WHIRLPOOL d648383b2273fed03cafc27ccc6dabc8f6acbe9f1ff522a8cd173d7b0215c6f9ad6fd79ae4f341af39f8ab543caae2cc19088d2f167ed7d5ba996abf8d2febfe
+MISC ChangeLog-2015 6928 SHA256 c614f6364e732a6018e4aa5aca20648ac1283941077cec36e69b1e497ea2142e SHA512 c67504d59b7a9864e94ac72e3a9b986b7c53ba0ea488a118f60b44a1391ba2635e0267d6ebc85fa5d711c0ce766a7cb34ca06a563220c2be50ff24080a56e41a WHIRLPOOL 80311a96aa3913bbda7ba160cbafafd21ac3f4170af379e377ad65c6e1f049d856fcafd5e429f195ca5bf53c18befb0bd7c2f3c74fbb117d32bf20285dc76e1d
+MISC metadata.xml 330 SHA256 dfaa2993baa493337253b2c158524c7d2333828677bb1cecee778f80ebdc2e4b SHA512 c039363dc7f06ccc5d9652d41923ea06819f199758fa843adad78a11dc00d230b49ebe5141c16f0aa6bf92909021a859e5be187d918eaa0f93fe7f2be7725386 WHIRLPOOL ffe9a8a53a6cf24bdc05f59db3c2c989b0cf2bd6a103f9130adba49a7ff9581e06c3278e0515556fcfda0aa098289ff3e4b41e45153c3810eef4629f09c484bf
diff --git a/media-sound/gnomad/gnomad-2.9.6.ebuild b/media-sound/gnomad/gnomad-2.9.6.ebuild
new file mode 100644
index 000000000000..14e8e6ce2e86
--- /dev/null
+++ b/media-sound/gnomad/gnomad-2.9.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN=${PN}2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A GTK+ music manager and swiss army knife for the Portable Digital Entertainment (PDE) protocol"
+HOMEPAGE="http://gnomad2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="nls"
+
+RDEPEND="media-libs/libid3tag
+	media-libs/libmtp
+	media-libs/libnjb
+	media-libs/taglib
+	>=x11-libs/gtk+-2.24:2
+	virtual/libgudev:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS README TODO ) # ChangeLog and NEWS are both outdated
+
+src_configure() {
+	econf $(use_enable nls)
+}
diff --git a/media-sound/gnomad/metadata.xml b/media-sound/gnomad/metadata.xml
new file mode 100644
index 000000000000..f13622c881f6
--- /dev/null
+++ b/media-sound/gnomad/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gnomad2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
new file mode 100644
index 000000000000..95ee452ac0de
--- /dev/null
+++ b/media-sound/gnome-music/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-music-3.22.2.tar.xz 1547556 SHA256 88dc8b6a1d68f07d690ba22d251ac21ba32e7ed948aa3e9f68e9bdc6dfe9674a SHA512 5f30a943209171f19f344139b40725649a56499ad874be138d8681e0ff81fda7fe85fc1b20c3dcf7fea21dd28a0921a47fe28fe064fa1ea8d51a313ec56e7924 WHIRLPOOL 29a7d245841e4be8c91cbe696cd84822ed6993a0838541a1648cbfe4f73034171566d9618d5e240d1261a1e063ee558c70621ee9831fced7923e738466ae4af7
+DIST gnome-music-3.24.2.tar.xz 1557848 SHA256 1a72b7972cac66c7aba7a4fbcbf8df99b3df7c46f26957b3e16089550d3ef62c SHA512 a922c80f922b9231e9bbe0cbd1fd33c059c719350c250dbb24316224e3306de7576303119fc9ec303f569559c36d6b076b5ec1076b4f9221a8fb133dcd9f040e WHIRLPOOL 55c848f0bd99bfbfc2afe1037b53decd13622caf3accac00347653d8295424e28099074eee6c2ec63c3d5cda1bc3e3c54a909a9673d0750f3c25233832b3a3c5
+EBUILD gnome-music-3.22.2-r1.ebuild 1547 SHA256 a3faf04e4a7b7d1571c36b26e825853cc248c67827274a3062ae0f85afd5a8a9 SHA512 913775e5ad8c25b338003346c1349e386dad5ce068efbf4a895f861863f418171e5548f5cf87edf09795463eb0119ddd235c4dc52395d03c4d95be15751159fe WHIRLPOOL c245afba8fa6b4e8e4f1b49eed9557bf7b230dc33aee9a0c45a05a1fcd40fbb98909fec2846d4ab78065400c39678136f7c2237157ec66a97ee5530e579ef60f
+EBUILD gnome-music-3.24.2.ebuild 1558 SHA256 a46a96c42ec5f22841bbd44b5040eefdca8bc34898c3435548af97f8eeafb5dc SHA512 58b97e37908c8c1cb2537b78e45a280fa458e20ff312e392119a5cbbee61707845759b368385925852e9760b08ea1d87434ff6d770059523cacd299d5b76039f WHIRLPOOL 51b6a2b4f7d0fccdbd449b3629364e2eac75a9b0e73a60a616083fae9ee100bde97e1dde8fea5c1a752c29aa12dbe0edbc1614b09f0d87c6566ca44ad107de7a
+MISC ChangeLog 6013 SHA256 5723fc0fe16eb19bdeaba76a6251a39ad3861788f81397d7eced2ddd652ce100 SHA512 611a6d03ddce47ff2d61d528ab1d9533769b5dafcd26115eedb8502f66867cc438a1f5f0b4c8fa18960fcf91bcad47aa368dde9a025bbeca1125afdcd7e817ee WHIRLPOOL c89af19034e8094cccc39cce6bf647c8c7d71eb0ba645409172b94eaa124ec886177fc75ae9a019a3d66b1febf1d6ed43f718aab8a8a98aa0cef6327948b063f
+MISC ChangeLog-2015 4242 SHA256 46669de49727c7bb1539c0251e6f3606d53af26f9e9a812b15ff85b0b61c6e2b SHA512 387a8603f693b9a5ac38eef1e079568a6db7d3a24768fd733c6ac8824a60f8a84b7eb9abf51cced8b097db71731605520317cd2e63eb1c1fb25bab87cb82f195 WHIRLPOOL c1906635bbe6edde5bedf6e4217e1eb1eade45cfbda7f2f686f7d153a003418dadf3256a53335c00051b7038237cccb0476b3f4bc46c858081cb67b224678c73
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/media-sound/gnome-music/gnome-music-3.22.2-r1.ebuild b/media-sound/gnome-music/gnome-music-3.22.2-r1.ebuild
new file mode 100644
index 000000000000..8c6f870f32a1
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.22.2-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/tracker-1.9.0[introspection(+)]
+	>=dev-python/pygobject-3.21.1:3[cairo,${PYTHON_USEDEP}]
+	>=dev-libs/glib-2.28:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=media-libs/grilo-0.3.1:0.3[introspection]
+	media-libs/libmediaart:2.0[introspection]
+	>=x11-libs/gtk+-3.19.3:3[introspection]
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		app-misc/tracker[gstreamer]
+		app-misc/tracker[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${D}"usr/bin/gnome-music
+}
diff --git a/media-sound/gnome-music/gnome-music-3.24.2.ebuild b/media-sound/gnome-music/gnome-music-3.24.2.ebuild
new file mode 100644
index 000000000000..86d2cc46ebc1
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.24.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=app-misc/tracker-1.11.1[introspection(+)]
+	>=dev-python/pygobject-3.21.1:3[cairo,${PYTHON_USEDEP}]
+	>=dev-libs/glib-2.28:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=media-libs/grilo-0.3.2:0.3[introspection]
+	>=media-libs/libmediaart-1.9.1:2.0[introspection]
+	>=x11-libs/gtk+-3.19.3:3[introspection]
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		app-misc/tracker[gstreamer]
+		app-misc/tracker[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${D}"usr/bin/gnome-music
+}
diff --git a/media-sound/gnome-music/metadata.xml b/media-sound/gnome-music/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/media-sound/gnome-music/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
new file mode 100644
index 000000000000..f7b9a7b8e819
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -0,0 +1,7 @@
+DIST gnome-sound-recorder-3.21.92.tar.xz 450092 SHA256 41b2c2dfc6adaef0606627521b29e3063c4abb6213614cc699baa6e5f80ebee2 SHA512 60afa42367f9087e580037213f06c1eab10a4a29fcf3c90f9737e73c9d6a1dbdb990cd010d7e33021c0e25bb33ff673e35bffb74d6fbc33b82047a0516ff31be WHIRLPOOL aee014fb6e4c316d476ce6331b081cd0d82013919bef80a4a8f8da0530141efd1d0a714f99825a3e51cfb197b335d6f677b899df2d9e2980c6bcf6b1d8176e6f
+DIST gnome-sound-recorder-3.24.0.1.tar.xz 452240 SHA256 b8c6953c2eaf13c7d9c6c4e5a5c6ecfa87a160aa7bba0e40dbf7263afce54600 SHA512 00e190e8d6a1a3961122485742705da4d85ef926453ff8098718566771600690562597f012f7cd9dc61b5910b4e75cc7518e86a092f052c3fc40a96310ab3c3f WHIRLPOOL 0b853041e9e53e9a4b756fa7cac7aaef88a671bce57789e68ae25a3241873fe0d3ee24017bbee3d5a29e329ea1f33dd1233a9ca9a5a829e404d5b2ebca098aac
+EBUILD gnome-sound-recorder-3.21.92.ebuild 673 SHA256 c1b02a261e1255a89583b728fe03b1aa0f77262244c12bc2dcffe006a5756539 SHA512 33cc4fabc1c16aec885f4885c4edc377d2ad2f14a177b33e135256a9e285b5d2424a09392212744bce14fb78ea47936529260c649b24e88b9bcc7ee2861b6d28 WHIRLPOOL cbb42ad1801fd62eeabe3f26fce6237737c687a4ff4b797662c68a12c2a8b2d8893bae4f8708e3e21ed04ef1d940a27c057c0c31b1a1852fc0d82cb44b785a97
+EBUILD gnome-sound-recorder-3.24.0.1.ebuild 1085 SHA256 3533331e6473fd2a40902af55b0207995bdaa06c7f6a6c95e6ca3992fb46668b SHA512 e7782a6c286b9e88b7611d1c7cde26cfa79d4f4d681d5c9b8f85c80d58d5379b491761e8a5ad1899ebde5e9c603bc8363ad36c4fd1b9eb11451eaf0eedbf6e97 WHIRLPOOL a79d18c39a2b071121e850e130221842e7e9afd6fc47775ac30455f493937d47c49faa3eb5c1a6fea29b7f8c3a7f2563398af0ddd8e4e0b655e0bea28e28c00b
+MISC ChangeLog 4872 SHA256 fe443cb9be555f8a3dda6f1a4692c0a77d8a72390cc3a33e84e6e72d56ac7bb6 SHA512 9e45d8e3bd68a9790782965f446e77eb67e507adbfa3db72c1412d8fc1b1de8efec8792174e6e76d727fc8a0f52aef65082e803749cb1e3daf1151358dcd304b WHIRLPOOL 39389c3e176a98b86bea6f4ef869fc73b1c441ff45dda8186960eb2f3e60ddc9e94f7634abf71712e65424e73c2557bfb228958469fc99d28ccfa8ee95960361
+MISC ChangeLog-2015 439 SHA256 da4c2ed115df880c7d9062dace04719b2cfe2f34aa0723604b95e5f83a4b6e06 SHA512 456f2e7795bd04d046b435906c6f4e0a4dcbeba12e68b94f38d67a1ad275505af148a7d7a7a587d4fdd9c642e181f332fb3af6f476fea5eb02931cff1e13cfa3 WHIRLPOOL 3d7d6ea6cc6bbe1d216b9548166c0e8734b0727f0fefdf3fffc28e72ce67977fafb3acbfcd9a6c07fc49894397a8d14eeca12d088272543e0d4849258fc22161
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.21.92.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.21.92.ebuild
new file mode 100644
index 000000000000..0197fe572ed9
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.21.92.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Simple sound recorder"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# For the list of plugins, see src/audioProfile.js
+COMMON_DEPEND="
+	dev-libs/gjs
+	dev-libs/glib:2
+	>=dev-libs/gobject-introspection-1.0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+"
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.24.0.1.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.24.0.1.ebuild
new file mode 100644
index 000000000000..363941236b1f
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.24.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Simple sound recorder"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/gjs
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/gobject-introspection-1.31.6
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection,ogg]
+	media-libs/gst-plugins-bad:1.0
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-flac:1.0
+	media-plugins/gst-plugins-pulse:1.0
+
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+	# gst-inspect causes sandbox violations when a plugin needs write access to
+	# /dev/dri/card* in its init phase.
+	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
+		-i configure || die
+}
diff --git a/media-sound/gnome-sound-recorder/metadata.xml b/media-sound/gnome-sound-recorder/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/gnump3d/Manifest b/media-sound/gnump3d/Manifest
new file mode 100644
index 000000000000..f2774dee6517
--- /dev/null
+++ b/media-sound/gnump3d/Manifest
@@ -0,0 +1,8 @@
+AUX gnump3d.conf.d 159 SHA256 f78bbe10fd4b7e1fdb860a3fa99490cdb98e827ff35c1e8077da77f5bf0340f2 SHA512 33c87ac067be3ae4f3dac690e38eecf8400ac393e47cea8f6b5b1238cc41b08dfe684ee33a7bf3bcb24cd6f9a8ff3861caed12c0d9d7f0df61a757cee5910e33 WHIRLPOOL ff125b485bce96f002ba3e1e7945ccc809760abd30b5b372f4722dfef6b1b76caba80bd38802ef876eae5c4d3372ddc0335dd0f6b7ac7d043c29936d6fc802ad
+AUX gnump3d.init.d 724 SHA256 02d34af5044012f716326d5dd586c0022b433403a352aedfa5d79215b5d819e1 SHA512 86f43db016e4dd1d2cb75b68ed1a11ea7b7f9ab1d78d18d0e6cf47c3380c466251f733d7aa73ef0354c3f63b78f18b966f583ea0aa328773442270c2aa0867d0 WHIRLPOOL 11c6c205ae74f68b0e97084ba78b632d010f52d7a6b151d6d2e1ae3d562858830d85e160fca0ec585b082ced78b2c6f67773864bd3a00f1fb8308a29b7a5166b
+DIST gnump3d-3.0.tar.bz2 633215 SHA256 1ac5bd0e850b0e18ccd9d19219f5108fa84b50d8ae3825a361e8b907eab7f19c SHA512 23778604b557346e42f5cd2045cc394c7d6f7044479c74cd635dfdbbfd6835c8e3ad761d54c5cba239cc5e020b049ac11d64eb463272fc4134b7645226e2524b WHIRLPOOL ea5be9683cadb4e7b40e237b043e9c93174ae999a3d776ed96e6c039db320faa131f95aae7bcc518cd8fa5275528f9b12252c030d2847079dee2fc18c58c1827
+EBUILD gnump3d-3.0-r1.ebuild 1936 SHA256 cfbc7684476d9c1abcf1c53afd9a381a21975e0a3afc0240b821ccb73fb0ad66 SHA512 57c404546e12a11b5f4b6a378f6411d334088304122a464c9acb380a4f9022abc6cdb6764463f4511ef1008c156a2605a6d7fd3a5cd9586cd455ebfce8eab0c1 WHIRLPOOL 522e8ec8524f1f53b87e7cbe91d246c7974a3d452ef0d188588ca09c005aa61f0e0ec7e371cb2ef2a6da56a317933838a8ffce20d23eb82cdacd62c120fa77c6
+EBUILD gnump3d-3.0-r2.ebuild 2002 SHA256 5e8b02afc726fd68b334a52c6916df6eb034a7f4ed77abb4ca803d81fb96c2cf SHA512 ebf20edc87815a3e3a1209f23111b32ebab374ea36ec0d6fbd51e094dfecf8d72c70f71a1cc368ae72f602cc717c56341640a100fe32de1a80ee34606b2231ad WHIRLPOOL a59af20857395eb807bf77d47396db8cacda36a4b95003faa89d4dc09701a77736f0d8b98c79e9c6b56cb339832c159f69d5e3af50bb23d9c13b6481be93978b
+MISC ChangeLog 2977 SHA256 114a1bb35b2fa97a5875c7abe7795e1b3db3c2d89d697c81a119c813005cd816 SHA512 f6dfbfba22eae0ad73e15d626d060c96b1e534f3820af1b0c4eed29d01ab39f6641d8f7223db9f649f1211f022a4aac58ade4b36a469084264ef011659763c95 WHIRLPOOL 4a6a35be671d07c4f7ae47acb0ce4b5c46a9290936f6ca80112e6849aac65bb4417dbb87fb267df8e6ae2dc5b0e02686b66be1885fefe1dd01348461af8abb60
+MISC ChangeLog-2015 10018 SHA256 bba37eb6793b1b2c85191339f0a31a6a98c73007f9f8c59f68dd88de0cd2f864 SHA512 9aadac965f38aa03c2524b9ee636ba3f658916f281ff79f0d6c4904254513c0001ec7b067b47a982711bb100e62fcabbb1614c8c48aa73808d84091562d4988d WHIRLPOOL c048f161b8fc7d05550066a3a22131b421953048631b900ba7c592c3f342c7844d1a773fa077e6ec9754123c4751c84d45eedce358614390e80e5b23e215e398
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/gnump3d/files/gnump3d.conf.d b/media-sound/gnump3d/files/gnump3d.conf.d
new file mode 100644
index 000000000000..9fe7523c1200
--- /dev/null
+++ b/media-sound/gnump3d/files/gnump3d.conf.d
@@ -0,0 +1,5 @@
+# Set this to 0 to stop the init script from indexing your mp3s.
+# It takes the longest on the first time, but after that, it only does
+# updates.
+
+DO_INDEX=1
diff --git a/media-sound/gnump3d/files/gnump3d.init.d b/media-sound/gnump3d/files/gnump3d.init.d
new file mode 100644
index 000000000000..730fc0cdb2db
--- /dev/null
+++ b/media-sound/gnump3d/files/gnump3d.init.d
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="index"
+
+depend() {
+	need net
+	after netmount nfsmount
+}
+
+start() {
+	ebegin "Starting gnump3d"
+
+	if [ ${DO_INDEX} -eq 1 ]; then
+		ebegin "Updating index of music files (may take a while for the first time)"
+		/usr/bin/gnump3d-index
+		eend $?
+	fi
+
+	start-stop-daemon --start --quiet --exec /usr/bin/gnump3d2 --make-pidfile \
+		--pidfile /var/run/gnump3d.pid --background -- --quiet
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping gnump3d"
+	start-stop-daemon --stop --quiet --pidfile /var/run/gnump3d.pid
+	eend $?
+}
+
+index() {
+	ebegin "Indexing music files"
+	/usr/bin/gnump3d-index
+	eend $?
+}
diff --git a/media-sound/gnump3d/gnump3d-3.0-r1.ebuild b/media-sound/gnump3d/gnump3d-3.0-r1.ebuild
new file mode 100644
index 000000000000..f3791f1141e3
--- /dev/null
+++ b/media-sound/gnump3d/gnump3d-3.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils multilib user
+
+DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
+HOMEPAGE="https://www.gnu.org/software/gnump3d/"
+SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~ppc ppc64 sparc x86"
+IUSE="sox"
+
+RDEPEND="dev-lang/perl
+	sox? ( media-sound/sox )"
+DEPEND="dev-lang/perl
+	sys-apps/sed"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewuser gnump3d '' '' '' nogroup
+	LIBDIR=/usr/$(get_libdir)
+}
+
+src_compile() { :; }
+
+src_install() {
+	PERLDIR="`perl bin/getlibdir`"
+
+	insinto ${PERLDIR}/gnump3d
+	doins lib/gnump3d/*.pm
+	insinto ${PERLDIR}/gnump3d/plugins
+	doins lib/gnump3d/plugins/*.pm
+	insinto ${PERLDIR}/gnump3d/lang
+	doins lib/gnump3d/lang/*.pm
+
+	dobin bin/gnump3d2 bin/gnump3d-top bin/gnump3d-index
+	dosym /usr/bin/gnump3d2 /usr/bin/gnump3d
+	doman man/*.1
+
+	insinto /usr/share/gnump3d
+	doins -r templates/*
+
+	insinto /etc/gnump3d
+	doins etc/gnump3d.conf etc/mime.types etc/file.types
+	dosed "s,PLUGINDIR,${PERLDIR},g" /etc/gnump3d/gnump3d.conf
+	dosed 's,^user *= *\(.*\)$,user = gnump3d,g' /etc/gnump3d/gnump3d.conf
+
+	dodoc AUTHORS ChangeLog DOWNSAMPLING PLUGINS README SUPPORT TODO
+
+	newinitd "${FILESDIR}"/${PN}.init.d gnump3d
+	newconfd "${FILESDIR}"/${PN}.conf.d gnump3d
+
+	keepdir /var/log/gnump3d
+	keepdir /var/cache/gnump3d/serving
+
+	fowners gnump3d:nogroup /var/log/gnump3d /var/cache/gnump3d
+}
+
+pkg_postinst() {
+	elog "Please edit your /etc/gnump3d/gnump3d.conf before running"
+	elog "/etc/init.d/gnump3d start"
+	elog ""
+	elog "At the very least, you will need to change the root directory"
+	elog "where music is found.  By default, gnump3d will also listen"
+	elog "to any address on port 8888"
+	elog ""
+	elog "You can optionally use sox to downmix the quality of streamed"
+	elog "music in realtime for slow connections."
+}
diff --git a/media-sound/gnump3d/gnump3d-3.0-r2.ebuild b/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
new file mode 100644
index 000000000000..c0562eceec27
--- /dev/null
+++ b/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit eutils multilib user perl-module
+
+DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
+HOMEPAGE="https://www.gnu.org/software/gnump3d/"
+SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="sox"
+
+RDEPEND="sox? ( media-sound/sox )"
+DEPEND="sys-apps/sed"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewuser gnump3d '' '' '' nogroup
+	LIBDIR=/usr/$(get_libdir)
+}
+
+src_compile() { :; }
+
+src_install() {
+	perl_set_version
+
+	insinto "${VENDOR_LIB}"/gnump3d
+	doins lib/gnump3d/*.pm
+	insinto "${VENDOR_LIB}"/gnump3d/plugins
+	doins lib/gnump3d/plugins/*.pm
+	insinto "${VENDOR_LIB}"/gnump3d/lang
+	doins lib/gnump3d/lang/*.pm
+
+	dobin bin/gnump3d2 bin/gnump3d-top bin/gnump3d-index
+	dosym /usr/bin/gnump3d2 /usr/bin/gnump3d
+	doman man/*.1
+
+	insinto /usr/share/gnump3d
+	doins -r templates/*
+
+	insinto /etc/gnump3d
+	doins etc/gnump3d.conf etc/mime.types etc/file.types
+	sed -e "s,PLUGINDIR,${VENDOR_LIB},g" -i "${ED}/etc/gnump3d/gnump3d.conf" || die
+	sed -e 's,^user *= *\(.*\)$,user = gnump3d,g' -i "${ED}/etc/gnump3d/gnump3d.conf" || die
+
+	dodoc AUTHORS ChangeLog DOWNSAMPLING PLUGINS README SUPPORT TODO
+
+	newinitd "${FILESDIR}"/${PN}.init.d gnump3d
+	newconfd "${FILESDIR}"/${PN}.conf.d gnump3d
+
+	keepdir /var/log/gnump3d
+	keepdir /var/cache/gnump3d/serving
+
+	fowners gnump3d:nogroup /var/log/gnump3d /var/cache/gnump3d
+}
+
+pkg_postinst() {
+	elog "Please edit your /etc/gnump3d/gnump3d.conf before running"
+	elog "/etc/init.d/gnump3d start"
+	elog ""
+	elog "At the very least, you will need to change the root directory"
+	elog "where music is found.  By default, gnump3d will also listen"
+	elog "to any address on port 8888"
+	elog ""
+	elog "You can optionally use sox to downmix the quality of streamed"
+	elog "music in realtime for slow connections."
+}
diff --git a/media-sound/gnump3d/metadata.xml b/media-sound/gnump3d/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/gnump3d/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/gogglesmm/Manifest b/media-sound/gogglesmm/Manifest
new file mode 100644
index 000000000000..ef734d02f1a2
--- /dev/null
+++ b/media-sound/gogglesmm/Manifest
@@ -0,0 +1,4 @@
+DIST gogglesmm-1.1.9.tar.gz 1419421 SHA256 fb1d4d4d14bfedb21821a41798b9abc81c9c8b2f7e028e6f3d828b6d58059dde SHA512 54de949b37e272a2235cf2f910890590f18b12c2b3199cb87bbe393ae659a3a9b7bd47f5a5f43ce035e94b87098c07d534efee2a6c17ebabb9bbed3453126e2e WHIRLPOOL 569728f318e165759cba37725443420550247359c36d0a2ea1e0a872a7162ddeaac98fb99101520b8258f175ba55faa6cb3838e7669568e1b14eb5182f45883b
+EBUILD gogglesmm-1.1.9.ebuild 1039 SHA256 5218cd7ce5dbcfaebc34e8b42c834ee618f7595f43d2e2b706cd50fd354dece2 SHA512 d9bf89b8a005cee108630bfce7d402de87be2f8e95952ad4a42046f5fa14c71a470cadf570982d4db22c2691cd188f2eaf1e81ec94ef4a9443270a3fdabbf768 WHIRLPOOL b74863d19a2b1febff83d9e7e4aceceac5cab11f0a8b5bc31c98397c31cb06684ba79e52e010ddb6623428eaa5bec74f798fe855c4b4c3759602d06b2f236596
+MISC ChangeLog 634 SHA256 116cccc0718d20b2e814d06056af129c343dc48e29eb0d0898e250460d7a6b8c SHA512 baa274133a488d9c4d24c67d238c4dff694bf1dc5382636309accd5e4a39ab74c56b8a9afbdd842b4b36cf81f375745b273d7221c71258db48468bcf6a8e76d7 WHIRLPOOL 2538e1914aeab0dca1e8de621af5aac012c84ec2f19eeace589d02ad08960ec66ba0429ebbf70304b1b723dd19a562d0ed9c620a62dfd0853d634d40eab8dfc5
+MISC metadata.xml 520 SHA256 b8c9c3cd78827aaef1b360b891dc2a99a2aebc908b1d5c0e4ee85a26e1133ac8 SHA512 6c0291e8eb2cd7844c468793ce152c4e76992e94d13300f9afe776f708e738bc139d8a4922e12a9815b793ae53bdc2553b191ac5b7c50b1ee346c2a75f184a7c WHIRLPOOL 9de56f6e4428b67760ff122854e19b5e7dd5966b321fe7034f903ea396f37db994a0d4042027e85514dd62059b0e578e995305a86090ffb2961ef27c6fb75b57
diff --git a/media-sound/gogglesmm/gogglesmm-1.1.9.ebuild b/media-sound/gogglesmm/gogglesmm-1.1.9.ebuild
new file mode 100644
index 000000000000..1c71ae8ece56
--- /dev/null
+++ b/media-sound/gogglesmm/gogglesmm-1.1.9.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Fast and light music player"
+HOMEPAGE="http://gogglesmm.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+dbus +flac +mad +vorbis +ogg +opus +aac +pulseaudio +opengl nls"
+
+RDEPEND="x11-libs/fox:=
+		x11-libs/libSM
+		x11-libs/libICE
+		dev-db/sqlite
+		media-libs/taglib
+		dev-libs/expat
+		dev-libs/libgcrypt:=
+		dbus? ( sys-apps/dbus )
+		flac? ( media-libs/flac )
+		mad? ( media-libs/libmad )
+		vorbis? ( media-libs/libvorbis )
+		ogg? ( media-libs/libogg )
+		opus? ( media-libs/opus )
+		aac? ( media-libs/faad2 )
+		pulseaudio? ( media-sound/pulseaudio )
+		opengl? ( media-libs/libepoxy virtual/glu )"
+DEPEND="dev-util/cmake ${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DBUS="$(usex dbus)"
+		-DWITH_OPENGL="$(usex opengl)"
+		-DWITH_NLS="$(usex nls)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-sound/gogglesmm/metadata.xml b/media-sound/gogglesmm/metadata.xml
new file mode 100644
index 000000000000..43eb2ed76959
--- /dev/null
+++ b/media-sound/gogglesmm/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gogglesmm/gogglesmm</remote-id>
+	</upstream>
+	<use>
+		<flag name="opus">Enable support for opus codec</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/gom/Manifest b/media-sound/gom/Manifest
new file mode 100644
index 000000000000..857df8f3a2b8
--- /dev/null
+++ b/media-sound/gom/Manifest
@@ -0,0 +1,5 @@
+DIST gom-0.29.103.tar.gz 88269 SHA256 9ae883906f61009d404977bcb4da7a7f67df8bac7ab3be5a14c477843b206a9c SHA512 2b386aab0e1fad55e39dbd902ec50db5faac39268cd7e79c0e10d252e9633d777f43b861bcf079191e0d41a3414ccc05d70b8fddb4bff0bb54e72e0606eed28b WHIRLPOOL fd596859c8604953772e683ad84f18884395d4fe7587335af2b80b4bd2bce7aba77362d901b8c876f4964b690745fb22c26e3b8aa30400cd445700fa1c46873c
+EBUILD gom-0.29.103-r1.ebuild 786 SHA256 b090771ca238b3203d7b8ba532071fba12ac93a68fd5ec67e5937d05fdbc5cba SHA512 928dddf702e80ddb16ffba4f03b63801830fc80881b44d5b6999a4f1b29122d8c5c2d22555a9acb97144c127dc85a4e84732f167409fe773486a8154de7d648e WHIRLPOOL 737b9fa9684aa9a43ccfd4d89651826e39054fa1fdc59ab69e4537bcbaddb82f4a5b2e2be93170235e492aa4b71c1a32ef1ef5f604acb774b0e22f61bfbf2b5b
+MISC ChangeLog 2430 SHA256 780c06192de7ed64f5eb8b3346791190201bdcc072557a5c77a29b214fd52a9f SHA512 55aacfe48c13063c1d523b769025f0132af4edb4d2d3a6cfe97e5b4092dff9f95685dcc60b45868bd1602bcb16479fddf391ee77ccc36b80bd2c1f631b0e2cd7 WHIRLPOOL 38c454e490188707f8b7cb5b180beb14a1eb155e6b3c76b22119156cf81e216e0391293db05f61321d883f5dc989b2cb17e79555fe05c25f197bdba952ff1681
+MISC ChangeLog-2015 1473 SHA256 7aeb0582de8e3081c8385aa0ea7d30729dd39155fb2084578959a5503ab3670e SHA512 7ef6ecc0242bdc9ff1cb72bc4e88f479615695566cb3631b372bd49a8f3aa235f13a71c0345074871f59f9600bd489d9c4a919624e1ca60a3aaa220560a1ce62 WHIRLPOOL b5a462367157310816cff812af357e2d7303b217e84d85742fcaaf91bdab0f87bcde809e9c7ceb440c52175b3ad021dd99e6e03ef6972b0655be97fabde6d5f5
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/gom/gom-0.29.103-r1.ebuild b/media-sound/gom/gom-0.29.103-r1.ebuild
new file mode 100644
index 000000000000..6d352830c2e2
--- /dev/null
+++ b/media-sound/gom/gom-0.29.103-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="Console Mixer Program for OSS"
+HOMEPAGE="http://www.fh-worms.de/~inf222"
+SRC_URI="http://www.Fh-Worms.DE./~inf222/code/c/gom/released/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE="examples"
+
+DEPEND=">=sys-libs/ncurses-5.2"
+
+src_compile() {
+	econf
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed."
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS NEWS ChangeLog README
+
+	if use examples; then
+		docinto examples
+		dodoc README
+		docinto examples/default
+		dodoc examples/default/*
+		docinto examples/two-mixers
+		dodoc examples/two-mixers/*
+	fi
+}
diff --git a/media-sound/gom/metadata.xml b/media-sound/gom/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/gom/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/google-musicmanager/Manifest b/media-sound/google-musicmanager/Manifest
new file mode 100644
index 000000000000..11304623e050
--- /dev/null
+++ b/media-sound/google-musicmanager/Manifest
@@ -0,0 +1,12 @@
+DIST google-musicmanager-beta_1.0.129.6633-r0_amd64.deb 4040482 SHA256 79af991409d69b0759d75b90b0c754a5e1bd71ec291adc48b368ff1ac4b902bb SHA512 c3e605078ecff45804e1e7b9019ed8cadd108f7a4a6101ea197116fb0d783014cd9d74e883d88808bc841b64fc2495ad16ba2617d165415e6f1fda706e39cc34 WHIRLPOOL dbb3e23d0872dbcee4895f560b351a9dfda214d42760d808c09a6108f9281b85e13785c2efe652e7398112896c8a931032da52708192a93593a42c5e88c4d28e
+DIST google-musicmanager-beta_1.0.129.6633-r0_i386.deb 3977534 SHA256 7914e3e6e2adb2e952ebaf383db5e04727c29cfa83401007f29977f6c5ff6873 SHA512 3e7ad72477dae3ad63aaf0bc6def013049d6c0dabc7c3f063c567d9b69dbffcb75d24dd0fad21752e587629fa96bc57302cf79b17979ed281ef603df1e2c7c5e WHIRLPOOL b7635a00a5c736f13940cecfd7c98bc2fca64da89f0aca24f72aa5ee4edeba1bcebd6e2f11c758b039b01bf5313290dd0499b88eb2e2912a612bd4e2fc4c627d
+DIST google-musicmanager-beta_1.0.221.5230-r0_amd64.deb 4330938 SHA256 67e063d58508a4b8df37ea0b87c9a33e54143be3653daabe16b1276ffed21ac0 SHA512 cf093c2f8e3010432ce5fcd0614fbece0d02c082cfad1d82c39a5b7498d92f9cfc3f275c0dec8a1090841ce296169adce3353111aeb2bf5990f242be78ccc04d WHIRLPOOL 4d24fa84422ab280be018b07ab79c9ece627f4f00d2d800d3b817dc0f1cd77222505ceda0071a3ef1b8792aa73eb7c0e2bae3ec17cb4951e4e533a3ee71b3a81
+DIST google-musicmanager-beta_1.0.221.5230-r0_i386.deb 4189032 SHA256 31b48b6df317dec41ec5d3c5b6e19ea89ac6eb200d90bb28beab087dfab70c61 SHA512 276071acecc143b65dd5a14a60b7dfb1245818e6c3bb569883d1dab83841f228d6537b161446cf0bb2c115f95844da21951d94bb88e60e6494d0f5e8d0c3f19a WHIRLPOOL 6a0a38732ac301a6130d978f1b7bdcfd1b8949aa8954a47ea09c0dfc4298dfbcc029c3f6ef7ccd5a126feeedaf546e0729f79275f18496472177853ef85d931d
+DIST google-musicmanager-beta_1.0.243.1116-r0_amd64.deb 4361868 SHA256 54f97f449136e173492d36084f2c01244b84f02d6e223fb8a40661093e0bec7c SHA512 7af9d085b819be630bfa9e5f8668721c64cecd2052f4eaab4d1b15be25be2b0e442ac33a5e790c80ed68f27d4ece16d64aaef85c2bb97cf3fe24a084aec48d55 WHIRLPOOL 5a088ca30995e0231f2bed0effeb954c49435f4ee92d714b64339c6212e05c33aab8af21f6f90d5c0994cd7252ab7bf0a831d0c6ee931a51140a1b07bbddf83f
+DIST google-musicmanager-beta_1.0.243.1116-r0_i386.deb 4221330 SHA256 121a7939015e2270afa3f1c73554102e2b4f2e6a31482ff7be5e7c28dd101d3c SHA512 e579fddc34d0ae1633310e5deabc815d3e8a64bec1754c0d6ce2dd829fb7eece41e43cab862047f88469eec3190d1829e9968765ae12e4da8cd28ebe6f7688f5 WHIRLPOOL 1a9c385c9a94519fb9490eef1b6b99ba4ef48b4b52f8b06c2a6aea88e482ccb216d122da7327c905ef98d791abdce574de0f7a82f52dc037787666b6a73dc74a
+EBUILD google-musicmanager-1.0.129.6633_beta.ebuild 2542 SHA256 d311c784767be3cf3989eea9dcb21cd62e599909e231df8fa6cceb9cf44876f0 SHA512 de94f219c4b6ecb2799d5dfd0e961ae0126cc5fdb6eee695845f8b7ab60f5fecfe3059ee12f70446d01a5afbfa5e0c50ec300f7ea824cb32c5472282a512d253 WHIRLPOOL da21147bf1b8a9a360ca7bb725551f6f84bb1beebf8091299dd16864f39340d42af2c2bcac588b4113aba45d59fcd4afed862805c3af02f2ef06141b65ec9fda
+EBUILD google-musicmanager-1.0.221.5230_beta.ebuild 2470 SHA256 37c9900d4929daf148ddaba0146b518c3cfa36ed891cc9938ceda0a97845bce7 SHA512 dece17dadec894d824e8ab496be0ee63f98900f8fdbc87354bc69a05721e7941157a140bde90c991a517b4ac83857e68469a6f01623121b0894ca5b7cc814723 WHIRLPOOL 8a6fce9aba5b0556fb2a1a8e812c3d239c3e3a7699b27732853eb7280d11f57977c5336f0d1f6595f4a8dde8706fb9765420b5da31fd037f10d495550e2989c0
+EBUILD google-musicmanager-1.0.243.1116_beta.ebuild 2468 SHA256 649af5a2879e579ecf30a79874adaf80c298da1f297ef184792d1fede8c99f2c SHA512 143d626dd42045b000525799eeae328a0884859f819f98bb012c472b7016dff7d8d5696a6985e374a691c4819fc9b13985c6c69f8fdb0da4f666cb3463aab746 WHIRLPOOL dbde8b557f561e4f0fd37bd99f60cdeb1cedc0c6811976d970f6c4ceba5014de089780b2fa5368a6dba5feab85daf187b3f4e6e26ae731a57bb328665dae5b83
+MISC ChangeLog 4466 SHA256 68a443cbbf8512ac47681bf49eeaf8243e13b781ec112332bdc470d676ec590b SHA512 3a138711f5a3d9a923ee708d48502fd5d314552d037c0038ef636ce577b23b726768364fcd1fdbf0800c65a75cbaaf75ec0044ffea61aa878bd4556f3c5d8bc8 WHIRLPOOL f0a5a3958376c8ff4c8017264a4566b2427b618bf71771809d7aadabaac5e3f9699da1cd7ff3bbad8342440098c1e25edf8c83f6bdb65301577c40e1aaf035de
+MISC ChangeLog-2015 10886 SHA256 9e963222b553574946791547cbb6337b98336b8a5d8a47afd6a09dae18799ad1 SHA512 60ca4433189cbc144da367a99ac4457321c5ec83787418f8eefe23d91f0292fb395a6df76d7752423d556fb157f979808d17f15b1e76d70d93d51f6d68e0bf63 WHIRLPOOL 2da051d1a0246cf4b0815e3f734a29664590c50a188f6b4f6f5890af4fdf590335af73aa9f3d386e15f4f1691fa5fdb1ad311f5d3e1050b3c4d2fed48b5ac897
+MISC metadata.xml 355 SHA256 e4f197b65041e505e7a5bde5a364aa3b9160695c08ee06adb5fa1107d784232d SHA512 d1cb086a795f3885761aafe4a6e103a181d6fb2301b29dd0676a9c216600aef660adc567a688734916a1844a510d472d46400aea9e8a9fca6acc528d3604d6bc WHIRLPOOL e789546c6d22cda5335b0924268f7255297dcd4d486d0a602cbdad2039c050144681a8e563c561938cf84753f82e894bb20a6f4a9155ebe7bf6ebfe9d6e071d8
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.129.6633_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.129.6633_beta.ebuild
new file mode 100644
index 000000000000..77dc118a56bc
--- /dev/null
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.129.6633_beta.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils unpacker
+
+#https://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-i386/Packages
+MY_URL="https://dl.google.com/linux/musicmanager/deb/pool/main/${P:0:1}/${PN}-beta"
+MY_PKG="${PN}-beta_${PV/_beta}-r0_i386.deb"
+
+DESCRIPTION="Google Music Manager is a application for adding music to your Google Music library"
+HOMEPAGE="https://music.google.com"
+SRC_URI="x86? ( ${MY_URL}/${MY_PKG} )
+	amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )"
+
+LICENSE="Google-TOS Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB libtiff"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE="log"
+
+OBSOLETE="yes"
+[[ $OBSOLETE = yes ]] && RESTRICT="fetch strip" || RESTRICT="strip mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+	media-libs/flac
+	media-libs/libvorbis
+	net-dns/libidn
+	sys-libs/glibc
+	log? ( dev-libs/log4cxx )
+	"
+
+DEPEND="app-arch/xz-utils
+	app-admin/chrpath"
+
+INSTALL_BASE="opt/google/musicmanager"
+
+QA_TEXTRELS="${INSTALL_BASE}/libmpgdec.so.0"
+
+QA_FLAGS_IGNORED="${INSTALL_BASE}/.*"
+
+S="${WORKDIR}/${INSTALL_BASE}"
+
+pkg_nofetch() {
+	if [[ ${OBSOLETE} = yes ]]; then
+		elog "This version is no longer available from Google and the license prevents mirroring."
+		elog "This ebuild is intended for users who already downloaded it previously and have problems"
+		elog "with ${PV}+. If you can get the distfile from e.g. another computer of yours, or search"
+		use amd64 && MY_PKG="${MY_PKG/i386/amd64}"
+		elog "it with google: https://www.google.com/search?q=intitle:%22index+of%22+${MY_PKG}"
+		elog "and copy the file ${MY_PKG} to ${DISTDIR}."
+	else
+		einfo "This version is no longer available from Google."
+		einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
+		einfo "Please file a version bump bug on https://bugs.gentoo.org (search	existing bugs for ${PN} first!)."
+	fi
+}
+
+src_install() {
+	insinto "/${INSTALL_BASE}"
+	doins config.json product_logo* lang.*.qm
+
+	exeinto "/${INSTALL_BASE}"
+	chrpath -d MusicManager || die
+	doexe MusicManager google-musicmanager minidump_upload
+	#TODO unbundle this
+	doexe libaacdec.so libaudioenc.so.0 libmpgdec.so.0 libid3tag.so
+
+	dosym /"${INSTALL_BASE}"/google-musicmanager /opt/bin/google-musicmanager
+
+	local icon size
+	for icon in product_logo_*.png; do
+		size=${icon#product_logo_}
+		size=${size%.png}
+		newicon -s "${size}" "${icon}" ${PN}.png
+	done
+	domenu ${PN}.desktop
+}
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.221.5230_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.221.5230_beta.ebuild
new file mode 100644
index 000000000000..75911e316b35
--- /dev/null
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.221.5230_beta.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils unpacker
+
+#https://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-i386/Packages
+MY_URL="https://dl.google.com/linux/musicmanager/deb/pool/main/${P:0:1}/${PN}-beta"
+MY_PKG="${PN}-beta_${PV/_beta}-r0_i386.deb"
+
+DESCRIPTION="An application for adding music to your Google Music library"
+HOMEPAGE="https://music.google.com"
+SRC_URI="x86? ( ${MY_URL}/${MY_PKG} )
+	amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )"
+
+LICENSE="Google-TOS Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB libtiff"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="log"
+
+OBSOLETE="yes"
+[[ $OBSOLETE = yes ]] && RESTRICT="fetch strip" || RESTRICT="strip mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+	media-libs/flac
+	media-libs/libvorbis
+	net-dns/libidn
+	sys-libs/glibc
+	log? ( dev-libs/log4cxx )
+	"
+
+DEPEND="app-arch/xz-utils
+	app-admin/chrpath"
+
+INSTALL_BASE="opt/google/musicmanager"
+
+QA_PREBUILT="${INSTALL_BASE}/.*"
+
+S="${WORKDIR}/${INSTALL_BASE}"
+
+pkg_nofetch() {
+	if [[ ${OBSOLETE} = yes ]]; then
+		elog "This version is no longer available from Google and the license prevents mirroring."
+		elog "This ebuild is intended for users who already downloaded it previously and have problems"
+		elog "with ${PV}+. If you can get the distfile from e.g. another computer of yours, or search"
+		use amd64 && MY_PKG="${MY_PKG/i386/amd64}"
+		elog "it with google: https://www.google.com/search?q=intitle:%22index+of%22+${MY_PKG}"
+		elog "and copy the file ${MY_PKG} to ${DISTDIR}."
+	else
+		einfo "This version is no longer available from Google."
+		einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
+		einfo "Please file a version bump bug on https://bugs.gentoo.org (search	existing bugs for ${PN} first!)."
+	fi
+}
+
+src_install() {
+	insinto "/${INSTALL_BASE}"
+	doins config.json product_logo* lang.*.qm
+
+	exeinto "/${INSTALL_BASE}"
+	chrpath -d MusicManager || die
+	doexe MusicManager google-musicmanager minidump_upload
+	#TODO unbundle this
+	doexe libaacdec.so libaudioenc.so.0 libmpgdec.so.0 libid3tag.so
+
+	dosym /"${INSTALL_BASE}"/google-musicmanager /opt/bin/google-musicmanager
+
+	local icon size
+	for icon in product_logo_*.png; do
+		size=${icon#product_logo_}
+		size=${size%.png}
+		newicon -s "${size}" "${icon}" ${PN}.png
+	done
+	domenu ${PN}.desktop
+}
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.243.1116_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.243.1116_beta.ebuild
new file mode 100644
index 000000000000..58d3736b6251
--- /dev/null
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.243.1116_beta.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils unpacker
+
+#https://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-i386/Packages
+MY_URL="https://dl.google.com/linux/musicmanager/deb/pool/main/${P:0:1}/${PN}-beta"
+MY_PKG="${PN}-beta_${PV/_beta}-r0_i386.deb"
+
+DESCRIPTION="An application for adding music to your Google Music library"
+HOMEPAGE="https://music.google.com"
+SRC_URI="x86? ( ${MY_URL}/${MY_PKG} )
+	amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )"
+
+LICENSE="Google-TOS Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB libtiff"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="log"
+
+OBSOLETE="no"
+[[ $OBSOLETE = yes ]] && RESTRICT="fetch strip" || RESTRICT="strip mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+	media-libs/flac
+	media-libs/libvorbis
+	net-dns/libidn
+	sys-libs/glibc
+	log? ( dev-libs/log4cxx )
+	"
+
+DEPEND="app-arch/xz-utils
+	app-admin/chrpath"
+
+INSTALL_BASE="opt/google/musicmanager"
+
+QA_PREBUILT="${INSTALL_BASE}/*"
+
+S="${WORKDIR}/${INSTALL_BASE}"
+
+pkg_nofetch() {
+	if [[ ${OBSOLETE} = yes ]]; then
+		elog "This version is no longer available from Google and the license prevents mirroring."
+		elog "This ebuild is intended for users who already downloaded it previously and have problems"
+		elog "with ${PV}+. If you can get the distfile from e.g. another computer of yours, or search"
+		use amd64 && MY_PKG="${MY_PKG/i386/amd64}"
+		elog "it with google: https://www.google.com/search?q=intitle:%22index+of%22+${MY_PKG}"
+		elog "and copy the file ${MY_PKG} to ${DISTDIR}."
+	else
+		einfo "This version is no longer available from Google."
+		einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
+		einfo "Please file a version bump bug on https://bugs.gentoo.org (search	existing bugs for ${PN} first!)."
+	fi
+}
+
+src_install() {
+	insinto "/${INSTALL_BASE}"
+	doins config.json product_logo* lang.*.qm
+
+	exeinto "/${INSTALL_BASE}"
+	chrpath -d MusicManager || die
+	doexe MusicManager google-musicmanager minidump_upload
+	#TODO unbundle this
+	doexe libaacdec.so libaudioenc.so.0 libmpgdec.so.0 libid3tag.so
+
+	dosym /"${INSTALL_BASE}"/google-musicmanager /opt/bin/google-musicmanager
+
+	local icon size
+	for icon in product_logo_*.png; do
+		size=${icon#product_logo_}
+		size=${size%.png}
+		newicon -s "${size}" "${icon}" ${PN}.png
+	done
+	domenu ${PN}.desktop
+}
diff --git a/media-sound/google-musicmanager/metadata.xml b/media-sound/google-musicmanager/metadata.xml
new file mode 100644
index 000000000000..8b1c84134af7
--- /dev/null
+++ b/media-sound/google-musicmanager/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>junghans@gentoo.org</email>
+		<name>Christoph Junghans</name>
+	</maintainer>
+	<use>
+		<flag name="log">Enables advanced logging through <pkg>dev-libs/log4cxx</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
new file mode 100644
index 000000000000..b1dbdf27e475
--- /dev/null
+++ b/media-sound/gpodder/Manifest
@@ -0,0 +1,5 @@
+DIST gpodder-3.9.1.tar.gz 996497 SHA256 16e63f7fe3e0d2bf51eb4313d1fcf035aac65995107644ca042e8e3ced4ed70c SHA512 d32405ac1d0aa7943b58d73f806a0d28e68bce541a1947c08d9cb69a763eda311816c059019e43eb3dea6ce08fc1cb4f0bd39cc44933114e51a036cb603d3be3 WHIRLPOOL 4e292d2c34f7de4703bdb288bb5038c3ca0d4e98b8464d918098c0c18311d5a3fe0a920bcb220d4a81d03e3cbdc71dc078934b23eb14db01f1cd80ff05f68986
+EBUILD gpodder-3.9.1.ebuild 1495 SHA256 b4914169642c89be3d60b2e4c0b366f254a1f44d9c300187fc1a92099482259e SHA512 ef8fc4a57fdd5b266dbe99db91b35cb05b093b7e58083553b81150cffeda48750f5297cd2d3ca133358f2371393653e4cc0f08f406bf38d3cc9cd4268333eb72 WHIRLPOOL f70bc485ca6f53fa24a4bbb7012bc3b54f5988876a32dbfeab62b306aee38d7740fa620080dd5e7ef794687e136c9298c09aab6542504400ad6f41f3fb8d7d30
+MISC ChangeLog 3565 SHA256 6a919a41b5b023b8ec9eff080177ecffb899da25cbe5e5e4f92a5cbbbe9b6911 SHA512 de889f25301c4d7de8a7949bbb9f3283c9ef85c4383dbe63daf55fcc5ac4504152b8b4eb3bf9b3c8caee7f70af8d840791721f27a877cc6dd4e10b647f30d4db WHIRLPOOL 5bea251ce0ff9b9cf0e1e8c2a2f1e6f4edeeff2d7baf0812346975fbad4bd54f4eb0f7aa2c27efb190bfde633315868bafd7382860bb849ab2acdc47916c8ad8
+MISC ChangeLog-2015 4835 SHA256 9b89d4ed350d3f6feab1a43364bd0a0fea16d0e714e07d937a44a13965800772 SHA512 dc190da87fb4a46e30ac05dc395784a60bea17022ec1175bffac9307c6852a06b63f6ae4114d0fcd2a829cbc8c8fb65a07d039e582c79c01853998ad0c80c1da WHIRLPOOL 58c238655a85bf9b2c23109d5db88395cb105e77b6b338666938fca090e56cfd67dc9ed7d50b1a1880cb076a01834d55160e60b9f5d5360ff89e1d1f0c14a582
+MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/media-sound/gpodder/gpodder-3.9.1.ebuild b/media-sound/gpodder/gpodder-3.9.1.ebuild
new file mode 100644
index 000000000000..9f1d60ab836c
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.9.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+# Required for python_fix_shebang:
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="A free cross-platform podcast aggregator"
+HOMEPAGE="http://gpodder.org/"
+SRC_URI="http://gpodder.org/src/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus bluetooth ipod kernel_linux mtp test"
+
+#TODO: Make pygtk optional, see README
+COMMON_DEPEND="
+	>=dev-python/eyeD3-0.7
+	>=dev-python/feedparser-5.1.2
+	dev-python/html5lib
+	>=dev-python/mygpoclient-1.7
+	>=dev-python/pygtk-2.16:2
+	dbus? ( dev-python/dbus-python )
+	bluetooth? ( net-wireless/bluez )
+	ipod? ( media-libs/libgpod[python] )
+	mtp? ( >=media-libs/libmtp-1.0.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-apps/iproute2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/desktop-file-utils
+	dev-util/intltool
+	sys-apps/help2man
+	test? (
+		dev-python/minimock
+		dev-python/coverage
+	)
+"
+
+src_prepare() {
+	default
+	sed -i -e '/setup.py.*install/d' makefile || die
+	# Fix for "AttributeError: 'gPodder' object has no attribute 'toolbar'":
+	python_fix_shebang .
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	distutils-r1_src_install
+}
+
+src_test() {
+	emake releasetest
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/gpodder/metadata.xml b/media-sound/gpodder/metadata.xml
new file mode 100644
index 000000000000..39626a990be5
--- /dev/null
+++ b/media-sound/gpodder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/gqradio/Manifest b/media-sound/gqradio/Manifest
new file mode 100644
index 000000000000..b2b27d9f2f55
--- /dev/null
+++ b/media-sound/gqradio/Manifest
@@ -0,0 +1,6 @@
+AUX gqradio-1.9.2-underlinking.patch 642 SHA256 007a89279db3e907c33e8bc54bdf9929bb75236d196066ad46d77ce9f2bd403d SHA512 596dd4109ec4c1e356af0403e6195d3331102a96a14e6525874ed4044d9cae90e9a70942097fd57b70bccbcc3f3befc81e50324e8389df14bc3a6e6f093f468a WHIRLPOOL 73969be8148f7da3e2fd555ce1240c9ca8e78e7306dfef91401147ca6036ed4836b6d8a8e5fb72fe5ff3abf2974de41e1f60446e81490e6262847108ade3a5ce
+DIST gqradio-1.9.2.tar.gz 444114 SHA256 8c00b589c2faab3fdb5053f8d47abc883ee9fc44702a34bd049ebde8a1adcfef SHA512 7b749f03ff110b78a644fc6b574f5a9d9d3a6db22976c4c8871b8f5c781515d29112745df5b5a4a70e4c48ba3cc9fd4921af64de39415ac179f57a26d33a4e5a WHIRLPOOL 4589bec806e43290eb0efda1038afec69b27d9c71f517bd8c0fdae0d99477f335282b017deccac023e63f0adf46b4a12ceb11f38477983b115e179c20f351ac7
+EBUILD gqradio-1.9.2.ebuild 605 SHA256 41ac81cf019a3ce76445c0bccc9fa2edcabf26ef4ac999de31e1248b1d5f2c44 SHA512 4928f04866f9fc9b2c4ea70dcb63a33f31e237c30112581109e82a7234dcbea9c68cc95accbe0134fa925ebbf3d74d83072abca02486c5bf231d89e86a90ea49 WHIRLPOOL 572bafceed7ec9670f464c8d729b3c41a39d96878eb8c27d0d35debcb8471c78c56f03eef20adcca93ae61ee2a752885d546e907871a319581148a73131fec9b
+MISC ChangeLog 2473 SHA256 0dba984f68eb8e55b20485e18b9a7747bbfbaa563a63f8787d9128c142045497 SHA512 d0adaba64b9dd8c22ad37f34587e47bcf1533572929ea440340648cbafbdfa96749664d037c46d5bd632c55ede7d2defa724ef88aab18fc0c57ae8fc2bc382c5 WHIRLPOOL a6330b8ec9f2b27f9fceeac513c76653e2f6199b2e860073717193999468329c573393ce6d0a946d9affdfe260d5204e975207894d170da078db96a1bf8165ca
+MISC ChangeLog-2015 2421 SHA256 ea56dc29c7719924c011006dce5d2533e71d35e372d0d303a26ad925156a9d81 SHA512 6e30b0ccb68aadd5911b609894979b273006a78a6ff022b8aea93abda59eb6834db5100273f966412b89d127821f8fbc7ba06dcff0fbf22094585fb53bd64156 WHIRLPOOL 22198eca147a79bb2ef3ac84ab50b139e9ce60f9c3aba80fbfa4abb7969388d72db60058025eecedca26ea547f67fcef5e7eceb7cbf112d82c850bada6c2877b
+MISC metadata.xml 656 SHA256 89dcc65371885d1dcb4761a5662d5df633ad81f038f1dbc956a47c44c9a572db SHA512 944ed11ad30e97bc4266d63ff4b4bc17b37ee142e4ed8758cc8959fcfc18fb295afbfaba2eda07ec553b0a741eaa19ded8ac15f5e64316954fe167b9fa854cfd WHIRLPOOL 097638d216bef003408c378c64bfd250ab51d48dfcea9d3f851862b14de3545183ddd193646440daa15f6e05fc657b9748208f32584282b9983082cdad1f16f9
diff --git a/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch b/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch
new file mode 100644
index 000000000000..bcedc3e40f10
--- /dev/null
+++ b/media-sound/gqradio/files/gqradio-1.9.2-underlinking.patch
@@ -0,0 +1,19 @@
+--- configure.in
++++ configure.in
+@@ -30,6 +30,16 @@
+ AC_DEFINE_UNQUOTED(GQRADIO_SKINDIR, "$prefix/share/gqradio/skins", [Location of skins])
+ AC_DEFINE_UNQUOTED(GQRADIO_HELPDIR, "$prefix/share/doc/gqradio-$VERSION", [Location of documentation files])
+ 
++dnl Check for XInternAtom() in libX11 in order to prevent underlinking #492764
++AC_SEARCH_LIBS([XInternAtom], [X11], [], [
++	AC_MSG_ERROR([unable to find the XInternAtom() function])
++])
++
++dnl Check for rintf() in libm
++AC_SEARCH_LIBS([rintf], [m], [], [
++	AC_MSG_ERROR([unable to find the rintf() function])
++])
++
+ ALL_LINGUAS="fr"
+ GETTEXT_PACKAGE=$PACKAGE
+ AC_SUBST(GETTEXT_PACKAGE)
diff --git a/media-sound/gqradio/gqradio-1.9.2.ebuild b/media-sound/gqradio/gqradio-1.9.2.ebuild
new file mode 100644
index 000000000000..7f87210ea6e2
--- /dev/null
+++ b/media-sound/gqradio/gqradio-1.9.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="An FM radio tuner app from the people who brought you GQmpeg"
+HOMEPAGE="http://gqmpeg.sourceforge.net/radio.html"
+SRC_URI="mirror://sourceforge/gqmpeg/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.4:2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog README SKIN-SPECS TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	eautoreconf
+}
diff --git a/media-sound/gqradio/metadata.xml b/media-sound/gqradio/metadata.xml
new file mode 100644
index 000000000000..9677f71ccfff
--- /dev/null
+++ b/media-sound/gqradio/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription>
+		GQradio interfaces with radio cards through the video4linux API.
+		Stations can be tuned manually, set to presets, or auto seek can find
+		the next available frequency. The application supports theming (skins),
+		and includes a built-in skin editor. Skin formats are similar to GQmpeg.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gqmpeg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/gramofile/Manifest b/media-sound/gramofile/Manifest
new file mode 100644
index 000000000000..79838180bbb6
--- /dev/null
+++ b/media-sound/gramofile/Manifest
@@ -0,0 +1,11 @@
+AUX gramofile-1.6-strlen_and_exit.patch 1296 SHA256 e03b7cf88428b05228f377e03e36db8d8cf98952bb0e97db2820fdddc1d3efce SHA512 ec630b85aa7099968a84e73e4efa014488c10e899080e2745dacd36808502d24f965905f08b02f11dbed6230cf33f3ce63fc2593d9b0f2bb2e268b75b9a10513 WHIRLPOOL b09a7989d35713d176d0e461b235c7195a62c28b831a8d2ec1f179806f84a97e8b063097015b7c08cb3310d2fa7bd0159b1ac7bdea293c24a8952eefa533c9e1
+AUX gramofile-1.6_p9-gentoo.patch 1100 SHA256 ea00d629bb73ffb57c5c859d0fd8ac75f2aa96d160302db4f62f0d3701aee193 SHA512 bd385cf856c6463e0e04a61b0e02bc2b15fced806fa9fed6612451da99823d526dba3f077c773c14cc0b860301ba56b7a8903c5df12c6ed23b31014b60c8ee3e WHIRLPOOL 7fa55892fe03ae1f74ff828d21ea6844b601aeab4dadda29c1ea09fb8898de81df307684eaa03dcb30c5498daae9c51ee1f7554b16e11e7d1338b74455340f62
+AUX gramofile-1.6_p9-strlen_and_exit.patch 392 SHA256 d199ab63870df7d15a326701c8e43b9af3036276809f149c1c79092226792809 SHA512 266dcbce4654c31e120d97e30e56764bac9f44dd412015c602bd43d902c38eb9fd9aa47dd7fe64961a1ea28eee1bcc992ec1d83a024cb1482a2b8d9e70c55034 WHIRLPOOL 4b122b8d0b3130ced9fc54d654e1f07153080374fb0366f5ad2bafdb7a72f450d69ec9efdc3c42c3dac4b045a9f750ca16b2105e2aaaed3d87082186296b060f
+DIST gramofile_1.6-8.diff.gz 26697 SHA256 ec4f879885daf542a1cae8c9f77a5dcd37cf33ac4400159b0d5243486617cc34 SHA512 f03ab82de0aa8fca44bd5be4e64c0606c08a083ed09039728e163a2e535348c8984acd958bc6589139907101faf867e3030ff2ad09abdc8e3b292864f69e64ae WHIRLPOOL 83cce33030cf2feaa5096129c87ea51387f4856eae82359ca050cb46b91ee25e9d47ab7b37519d28086632e611b6dfeeb2a382e7a208c1e856e8f06874c622ae
+DIST gramofile_1.6-9.diff.gz 25244 SHA256 f18fba5fba9889cf8090c22643fa39e6e93011d66a75e6274311f70244d8826e SHA512 2c3b0131afcbae680432e5fc1bb753bae7c19d5bb4372808a0f86ef704800aea218e3bfe625bffe46ee3cd4a38f89a488141223d22b8f467cab45ee4a962c249 WHIRLPOOL f51ed79b6a61d728dccfd1cb61195909dbd188d16612f3680573b1463027f15d1ed4d8feced4ea9e28a719997041148679c1f796c09b51e4fe499989f27dcb49
+DIST gramofile_1.6.orig.tar.gz 108596 SHA256 d1c9fe01f3b49c8c9141c3e09c15f519dcb9ffdcaabcfa51ece0c41540ba69e2 SHA512 171a7cff4066d625b9263f5462bf3e8fba30a02b629f20f7b38031cf037eb0940cfb54b73671d10948ac3326e272b3576de785310022007e0d4dca4f164815a5 WHIRLPOOL 19c739b5c654f2180740f2d11ce567950d83431844807bc27cedc209378d4105de075946b42999019be3007ed30e0f25b23d40f4263ce6184fc480ce83d057ac
+EBUILD gramofile-1.6-r1.ebuild 1023 SHA256 016c3f4407e34ce29ab768f3cc70e70a8dd858a4606402d0911e994fc23e20bd SHA512 bbce995fc183f5ad06fc4f3eddd8cb494f0b4af852124cba710d118ece440062fa9b685c4aa1299202165397619b149213d079c0d0f6b916c0b8858842cbe178 WHIRLPOOL 6c733f0e2da4a06679234fe650b40fd8616e203db508c63a201808806a9b7af116a86a9930848384cfb041a2da4212b0ff96bdb33ddc67cbfbef714e5a871cfe
+EBUILD gramofile-1.6_p9.ebuild 1032 SHA256 068dc9a959a2571d8681388a24187e525c8c0256665961e053a472af6419cee7 SHA512 434acf8bb4d7c6dd0b657a2842ee14ffcaa42fa6b4f8a02d4128136899caa573290c444f4ea4617e835222f2f1bd596be611c8f8aeb5ba3122272a28e4637d54 WHIRLPOOL 5be4b30ad0b1fd17979d4ea63d479bd1c306d0c78c8e4b66cee971bc13acbb4ce5e72fa5ac4746c3b2ad1673d476bb4b4b6f53d684a1ffd0cd966916a6ed6ec5
+MISC ChangeLog 2631 SHA256 bcce379effaa88402f6cdfa72756cdfe236ef85b90660bec87c750f92ca2bc11 SHA512 e7d807eb222113630f02773d83510dac114c0f41c56b24538f09e5b11fb1b69260b3ee40658437415f6987b8835044796aa5cb67130bdaebb089dab54cb23ecb WHIRLPOOL 7a0c850c1c71362b9a862e8bb4fc4907a558efee56263cc8b46126112942fcb3b45e490fe9afb0e36ee0298f83e7e47f42ba3af9c2e1279dbddcfa304293df25
+MISC ChangeLog-2015 3360 SHA256 db31b995b982450b8f56401bf789de70903e92117be4bbd87c9cfbcf3444bdfb SHA512 15925421fb94a7226bf5316428ce531eb5dfc2492d326db5a0b53e399e08158292808f0307a9b00eb95ce59927ebd2c76cf78314154e275db0b24f83a967ae1e WHIRLPOOL 644c8ed6910e36326cec95e13201ffe0f3942de6554bcbb2f6ddc1349558d84f341361da1b94865fdacbc43957ba42714ebc04e136c9d999c1b6cf01b15ee0b2
+MISC metadata.xml 871 SHA256 62ff0a049d8326d81314ea2efec177d60fa2085a5fb7ef93b7a244c6b44b9def SHA512 12ff2b2a524bb2e9b3d54c4a1cb4f1739f4ff5a664a01074a1759cf34593e110ddd80f5128a2d2ed222e20f80e329cd3af231ec726665c23bc36cd25cd384b22 WHIRLPOOL d00f4ec53c606bbf52c1ec6e6fa14972ab1c07e287497a72729cd2d083a5237d0d79365ad1e3a78eaf43cd2293157ccd8c82c33f3e4ed5db7d19d46e6e9c7a83
diff --git a/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch b/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
new file mode 100644
index 000000000000..4c35dd3eb2ff
--- /dev/null
+++ b/media-sound/gramofile/files/gramofile-1.6-strlen_and_exit.patch
@@ -0,0 +1,56 @@
+--- a/bplaysrc/Makefile
++++ b/bplaysrc/Makefile
+@@ -6,13 +6,12 @@
+         ../clrscr.o ../secshms.o
+ #SRCS = bplay.c sndfunc.o shmbuf.c
+ 
+-CC = gcc
+-LDFLAGS = 
++CC ?= gcc
+ 
+ ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see ../Makefile!)
+ 
+ # For Linux (and maybe others), use these:
+-CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
++CFLAGS += -Wall -DUSEBUFFLOCK -DLP2CD -DVUMETER
+ LIBS = -lncurses
+ 
+ # For FreeBSD (and maybe others), use these:
+--- a/gramofile.c
++++ b/gramofile.c
+@@ -11,6 +11,7 @@
+ #include "splashscr.h"
+ #include <signal.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ #include <string.h>
+ #ifndef OLD_CURSES
+ #include <ncurses.h>
+--- a/Makefile
++++ b/Makefile
+@@ -14,13 +14,12 @@
+ OBJS = $(SRCS:.c=.o)
+ SHELL = /bin/sh
+ 
+-CC = gcc
+-LDFLAGS = 
++CC ?= gcc
+ 
+ ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see bplaysrc/Makefile!)
+ 
+ # For Linux (and maybe others), use these:
+-CFLAGS = -Wall -O2 -funroll-loops -DTURBO_MEDIAN -DTURBO_BUFFER
++CFLAGS += -Wall -DTURBO_MEDIAN -DTURBO_BUFFER
+ DEPS = $(OBJS) makebplay
+ LIBS = -lncurses -lrfftw -lfftw -lm
+ COPY_A = -a
+--- a/signpr_cmf3.c
++++ b/signpr_cmf3.c
+@@ -34,6 +34,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
++#include <string.h>
+ #ifndef OLD_CURSES
+ #include <ncurses.h>
+ #else
diff --git a/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch b/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch
new file mode 100644
index 000000000000..9fdbe1477233
--- /dev/null
+++ b/media-sound/gramofile/files/gramofile-1.6_p9-gentoo.patch
@@ -0,0 +1,39 @@
+--- a/Makefile
++++ b/Makefile
+@@ -14,15 +14,12 @@
+ OBJS = $(SRCS:.c=.o)
+ SHELL = /bin/sh
+ 
+-CC = gcc
+-LDFLAGS = 
+-
+ ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see bplaysrc/Makefile!)
+ 
+ # For Linux (and maybe others), use these:
+-CFLAGS = -Wall -O2 -funroll-loops -DTURBO_MEDIAN -DTURBO_BUFFER
++CFLAGS += -Wall -DTURBO_MEDIAN -DTURBO_BUFFER
+ DEPS = $(OBJS) makebplay
+-LIBS = -lncurses -lrfftw -lfftw -lm
++LIBS = $(shell ${PKG_CONFIG} --libs ncurses) -lrfftw -lfftw -lm
+ COPY_A = -a
+ 
+ # For FreeBSD (and maybe others), use these:
+--- a/bplaysrc/Makefile
++++ b/bplaysrc/Makefile
+@@ -6,14 +6,11 @@
+         ../clrscr.o ../secshms.o
+ #SRCS = bplay.c sndfunc.o shmbuf.c
+ 
+-CC = gcc
+-LDFLAGS = 
+-
+ ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see ../Makefile!)
+ 
+ # For Linux (and maybe others), use these:
+-CFLAGS = -Wall -O2 -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
+-LIBS = -lncurses
++CFLAGS += -Wall -DUSEBUFFLOCK -DLP2CD -DVUMETER # -DDEBUG
++LIBS = $(shell ${PKG_CONFIG} --libs ncurses)
+ 
+ # For FreeBSD (and maybe others), use these:
+ #CFLAGS = -Wall -O2 -DLP2CD -DVUMETER # -DDEBUG
diff --git a/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch b/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch
new file mode 100644
index 000000000000..0369914779fd
--- /dev/null
+++ b/media-sound/gramofile/files/gramofile-1.6_p9-strlen_and_exit.patch
@@ -0,0 +1,20 @@
+--- a/gramofile.c
++++ b/gramofile.c
+@@ -11,6 +11,7 @@
+ #include "splashscr.h"
+ #include <signal.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ #include <string.h>
+ #ifndef OLD_CURSES
+ #include <ncurses.h>
+--- a/signpr_cmf3.c
++++ b/signpr_cmf3.c
+@@ -33,6 +33,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
++#include <string.h>
+ #ifndef OLD_CURSES
+ #include <ncurses.h>
+ #else
diff --git a/media-sound/gramofile/gramofile-1.6-r1.ebuild b/media-sound/gramofile/gramofile-1.6-r1.ebuild
new file mode 100644
index 000000000000..bd252d4a6936
--- /dev/null
+++ b/media-sound/gramofile/gramofile-1.6-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+PATCH_LEVEL=8
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Transfer sound from gramophone records to CD"
+HOMEPAGE="http://www.opensourcepartners.nl/~costar/gramofile"
+SRC_URI="mirror://debian/pool/main/g/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/g/${PN}/${PN}_${PV}-${PATCH_LEVEL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses
+	sci-libs/fftw:2.1"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${WORKDIR}"/${PN}_${PV}-${PATCH_LEVEL}.diff
+	EPATCH_SUFFIX="dpatch" EPATCH_FORCE="yes" epatch ${P}/debian
+	epatch "${FILESDIR}"/${P}-strlen_and_exit.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin ${PN} || die "dobin failed"
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bplay_gramo brec_gramo || die "doexe failed"
+	dodoc ChangeLog README TODO *.txt
+	newdoc ${P}/debian/changelog ChangeLog.debian
+}
diff --git a/media-sound/gramofile/gramofile-1.6_p9.ebuild b/media-sound/gramofile/gramofile-1.6_p9.ebuild
new file mode 100644
index 000000000000..1ed1c4b6e0f8
--- /dev/null
+++ b/media-sound/gramofile/gramofile-1.6_p9.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Transfer sound from gramophone records to CD"
+HOMEPAGE="http://www.opensourcepartners.nl/~costar/gramofile"
+SRC_URI="
+	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}.orig.tar.gz
+	mirror://debian/pool/main/g/${PN}/${PN}_${PV/_p*}-${PV/*_p}.diff.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	sys-libs/ncurses
+	sci-libs/fftw:2.1
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+	epatch "${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch ${P/_p*}/debian/patches
+
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-strlen_and_exit.patch
+
+	tc-export CC PKG_CONFIG
+}
+
+src_install() {
+	dobin ${PN}
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bplay_gramo brec_gramo
+	dodoc ChangeLog README TODO *.txt
+	newdoc ${P/_p*}/debian/changelog ChangeLog.debian
+}
diff --git a/media-sound/gramofile/metadata.xml b/media-sound/gramofile/metadata.xml
new file mode 100644
index 000000000000..5b2e2819c938
--- /dev/null
+++ b/media-sound/gramofile/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+<longdescription lang="en">
+GramoFile is intended primarily for transferring gramophone records to CDs, but
+has many other possible uses. It can record very long .wav files with a bargraph
+signal peak-level meter, playback any part of the files, split long .wav files
+into separate tracks (with automatic track location), and process the signal
+with filters to reduce ticks and pops (multiple filters are provided, they can
+be applied in any order (multiple instances) with user-adjustable parameters).
+Track splitting and signal processing are done in the same run, and don't need
+any temporary files.
+</longdescription>
+</pkgmetadata>
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
new file mode 100644
index 000000000000..35540f54c9d6
--- /dev/null
+++ b/media-sound/grip/Manifest
@@ -0,0 +1,13 @@
+AUX grip-3.3.1-implicit-declaration.patch 673 SHA256 1ec5fdb74ccc75715befdc6415b5d180b540482b2d9c948d43af1adb5bc57509 SHA512 be7ba1b7250ebeffbb4b5e5aa64baed994441030e0af5a2937c9e26e91a718c59ba32782487e5e71df04acf3241ad6ec99d4d1302c44c4ba3abe20472fec107b WHIRLPOOL 1204cbda3a5faf34a12dc36bd52b6be2211d8c40afcb783a05da8080b3edd82a73e9ffd1c6d09b5200e67c0f791f7d8a5e681ad94a58f4cc1d512e42696a670f
+AUX grip-3.3.1-invalid-genre-size.patch 697 SHA256 cf009878ff91767e8e64a0ec3ea55bc3e0f336e2f312481fc054cf706ef1ec06 SHA512 80f0df873b4721b0d4c74e5d17a0dcf0f35988041be5f8e30c9fa73fe2e125bde83ab3d943894675a7b2a07d7ecd38a1f2c7c1edf6be81e4a37db302ae05b51f WHIRLPOOL dde6e16b439a1c6d15960c0fc014ec3d193ad624e90c967ff9c3e3a0e8c943231caabba9b5b70773746153d190cd33d68cb4f0ba6cac099a30a1fed1d9389c26
+DIST grip-3.3.1.tar.gz 812562 SHA256 d46394a1062ed066f9c633b010fd1059e63d9ed791bbb7a85bc6567cf0fd66fd SHA512 380e36cb4e58180e543e1d293d38108f4879842ed63106da875e00747e98c2c06da1e706cfaf4ff26f481bba0ca941eb1201f430de04b0f313b1307ddd7e88d3 WHIRLPOOL 7e085bf45cf1031e5dce295c8d34682937c9abe1b74119103f418e598e1b835c9ce22533e603384099512e139c15963ab31b3eb73aa088bd698281cf507bf3de
+DIST grip-3.4.3.tar.gz 740870 SHA256 34b7dd9f8c904f8f1984f691b3bfc62a68979eef62ab4e638817afedcc2fde0c SHA512 e7690cfe375de525f7dde7cc4d64ac9577f702a58bbd2cc1aa318dba58b208a8affe9e8e07078d6a16ba1340b0bd17edce1c8cf750631c8d677a3bd2679bb361 WHIRLPOOL fe1465d60cb850e0eb9bfdafe288ee66e8527b9ad41e2cf4d4dfda21a972d9bd9f1fd69d23cb8d3873109a805c4dc9d571f68e8a7f9edfd97acdb7f2837cc1bf
+DIST grip-3.5.2.tar.gz 952153 SHA256 aa67931ef3a80ef57351d487be2210b2f7030a16b41ff2f38d22ccc76d7f89b7 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421 WHIRLPOOL cc883036a3a4a2073eb9d14c53f53e26ae568be81e0f21e709031586b5b541c04d03cd251bd99eb66bfda86fdf1167a6b1838517c85b89b1fa6acb72cd94e588
+DIST grip-3.6.1.tar.gz 958967 SHA256 88a7a1193de74ce65968106a1b48b62a3171aaeabb1a5edae9d0308e901d5e28 SHA512 ebb0945833189b17d814fee9a68acf25786f83fa7d1e47523512b25c1ef9d146d5d218c8422c7b37fbb7cf63558cc093795ef4078639f8e35c9947d76d6d2fcf WHIRLPOOL a8b5cf838d205ce32ccf78df9df04f50c1095d87b0d61e44c9cfb7e661345c737173df968f5cafa2492e7a6a66b474ad00ce6a0922d41253d767cf880c61fa80
+EBUILD grip-3.3.1-r3.ebuild 1353 SHA256 86015e1490c5fd36a3de2a9171f2f0f0f894739a3b4c30164d79b0f416a5b109 SHA512 964b99dd264dda5e9309c47a998308ac4b6dc770847d14ae0d60e768ef5038ffd41ea3a0bd87cd5de1130f79d5ceaf5040588724db59516ab1a1e3acf92b9154 WHIRLPOOL 25916061d8e72838207ec09f46ce95ed543d4840746397f09670eff05e370a8f80dfb11cd897dffac88d3859466f5c2b083dbc7beb69b6e3a8279fd40bf5b4b9
+EBUILD grip-3.4.3.ebuild 1212 SHA256 434d99363847f59345702639bcc156f53b3fa9ca21cee32e74de90fc7e18a267 SHA512 2624267ef9703d4334e5319475cace62632e972b89891e3ba826f9dff147b6339458b44882cb42ca16c383f84973cf9f1b44e3e7d6ae56018c6fd83ff14bfd0a WHIRLPOOL ea7ed2366fb737e80e8446af67ae2ba8c67c60a950ddb021df1f1cec78026dbc58a36c17c826eb87ea0239a9ca8d176ba1e3a7ce0d6960661bd6c49c64a0f196
+EBUILD grip-3.5.2.ebuild 1214 SHA256 7a1dcd44a2cbf2be7cd5bfb158f2836569b220af4389119fc5956138ed079591 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92 WHIRLPOOL 15325254d92f5de6e80260e3a227b173de69288e35027518595a564bcf8f40817af4ec3f28d25837eb3ea10dd8c1e1a875fc8e5cd8aaa099c2d90394c0d1fae2
+EBUILD grip-3.6.1.ebuild 1214 SHA256 7a1dcd44a2cbf2be7cd5bfb158f2836569b220af4389119fc5956138ed079591 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92 WHIRLPOOL 15325254d92f5de6e80260e3a227b173de69288e35027518595a564bcf8f40817af4ec3f28d25837eb3ea10dd8c1e1a875fc8e5cd8aaa099c2d90394c0d1fae2
+MISC ChangeLog 2633 SHA256 3a2d77609f0964d855012b01f14fe6272301e064249e4dc3906c7fe4a3a7fccf SHA512 623ac7e82e453abc3d895ae1f48ba1f6b8819315fb3c155ed38ebf071cecf3d785a0b0e8d11d6ed1b5dbf4a79f7c651e9aedf3cba422032c271db4f5e549f5a5 WHIRLPOOL d93f9369678af73af8264be95646903113ee47b207f588b19214c77d951fc293394d2923e4e87a49d50d37a2417f69468592b2b4ad2435e16d4bee5dcfd66905
+MISC ChangeLog-2015 13917 SHA256 4510eb6f25878a135e5a5ce5136d66ba75ca4b1485c3cec881bdf7511592a738 SHA512 a8b570e3808db62c6e38472a06a1341755399c679e2e63f1ec7f84f70d1411780ea3133ea844756f7e664fd4b8f47d61979887cc0a9ef2e563d2fc17b2b1d8d7 WHIRLPOOL a1764ce5b4c703a58e06cef768377226250849c064a79fbf545feabdba8114d41bec08c23756b35abd67b18bd80865cdb4752e1218e892101ae8130817dd292b
+MISC metadata.xml 327 SHA256 81e381948643faa44f0fdf7d06768b437d9160d0b8029b4452661f6ec01c85f3 SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14 WHIRLPOOL 11a78d80f8c532b448a5be1d3aaaa4f5681bb776f74eba23099a5c2e5ae067cda5cf2df093649cd8b67d704774b0c2000fce9ac9d892c17245e00c60aafa5558
diff --git a/media-sound/grip/files/grip-3.3.1-implicit-declaration.patch b/media-sound/grip/files/grip-3.3.1-implicit-declaration.patch
new file mode 100644
index 000000000000..2319b772a9b0
--- /dev/null
+++ b/media-sound/grip/files/grip-3.3.1-implicit-declaration.patch
@@ -0,0 +1,32 @@
+--- grip-3.3.1/src/status_window.c
++++ grip-3.3.1/src/status_window.c
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <string.h>
+ #include <fcntl.h>
+ #include <vte/vte.h>
+ #include "status_window.h"
+--- grip-3.3.1/src/tray.c
++++ grip-3.3.1/src/tray.c
+@@ -20,6 +20,9 @@
+  * USA
+  */
+ 
++#include "cdplay.h"
++#include "common.h"
++#include "rip.h"
+ #include "tray.h"
+ #include "../pixmaps/rip1.xpm"
+ #include "../pixmaps/menuplay.xpm"
+--- grip-3.3.1/src/cdplay.c
++++ grip-3.3.1/src/cdplay.c
+@@ -28,6 +28,7 @@
+ #include "cddev.h"
+ #include "discedit.h"
+ #include "dialog.h"
++#include "tray.h"
+ #include "rip.h"
+ #include "grip_id3.h"
+ 
diff --git a/media-sound/grip/files/grip-3.3.1-invalid-genre-size.patch b/media-sound/grip/files/grip-3.3.1-invalid-genre-size.patch
new file mode 100644
index 000000000000..c826fc6e2e80
--- /dev/null
+++ b/media-sound/grip/files/grip-3.3.1-invalid-genre-size.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/285105
+
+--- grip-3.3.1/src/id3.c
++++ grip-3.3.1/src/id3.c
+@@ -252,8 +252,8 @@
+       
+       if ( frames[ i ] ) {
+ 	char *c_data = NULL;
+-	char gen[ 5 ] = "(   )";
+-	char trk[ 4 ] = "   ";
++	char gen[ 6 ] = "(   )"; /* max unsigned char: 255 */
++	char trk[ 3 ] = "  "; /* max CDDA tracks: 99 */
+ 	
+ 	switch( frameids[ i ] ) {
+ 	case ID3FID_TITLE:
+@@ -278,12 +278,12 @@
+ 	  
+ 	case ID3FID_CONTENTTYPE:
+ 	  c_data = gen;
+-	  sprintf( gen, "(%d)", genre ); /* XXX */
++	  snprintf( gen, 6, "(%d)", genre );
+ 	  break;
+ 	  
+ 	case ID3FID_TRACKNUM:
+ 	  c_data = trk;
+-	  sprintf( trk, "%d", tracknum ); /* XXX */
++	  snprintf( trk, 3, "%d", tracknum );
+ 	  break;
+ 	  
+ 	default:
diff --git a/media-sound/grip/grip-3.3.1-r3.ebuild b/media-sound/grip/grip-3.3.1-r3.ebuild
new file mode 100644
index 000000000000..9c72bbab7740
--- /dev/null
+++ b/media-sound/grip/grip-3.3.1-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils flag-o-matic toolchain-funcs libtool
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="nls vorbis"
+
+RDEPEND=">=x11-libs/gtk+-2.2:2
+	x11-libs/vte:0
+	media-sound/lame
+	media-sound/cdparanoia
+	>=media-libs/id3lib-3.8.3
+	>=gnome-base/libgnomeui-2.2.0
+	>=gnome-base/orbit-2
+	net-misc/curl
+	vorbis? ( media-sound/vorbis-tools )"
+# gnome-extra/yelp, see bug 416843
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-implicit-declaration.patch
+	epatch "${FILESDIR}"/${P}-invalid-genre-size.patch #285105
+	# fix include syntax for newer versions of bash
+	sed -i '/[.] conftest[.]id3/s: c: ./c:' configure || die
+	elibtoolize
+}
+
+src_configure() {
+	# Bug #69536
+	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
+
+	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nl pl_PL pt_BR ru zh_CN zh_HK zh_TW
+
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS CREDITS ChangeLog README TODO
+}
diff --git a/media-sound/grip/grip-3.4.3.ebuild b/media-sound/grip/grip-3.4.3.ebuild
new file mode 100644
index 000000000000..b28c243ba0c8
--- /dev/null
+++ b/media-sound/grip/grip-3.4.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs libtool
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="vorbis"
+
+# lame and vorbis-tools are no real RDEPENDs. But without them
+# grip cannot convert ripped files to any format. So use them as
+# a sane default.
+RDEPEND="
+	gnome-base/libgnome
+	>=gnome-base/libgnomeui-2.2.0
+	>=media-libs/id3lib-3.8.3
+	media-sound/cdparanoia
+	media-sound/lame
+	net-misc/curl
+	>=x11-libs/gtk+-2.2:2
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/vte:0
+	vorbis? ( media-sound/vorbis-tools )
+"
+# gnome-extra/yelp, see bug 416843
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
+}
+
+src_configure() {
+	# Bug #69536
+	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
+
+	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
+
+	econf
+}
diff --git a/media-sound/grip/grip-3.5.2.ebuild b/media-sound/grip/grip-3.5.2.ebuild
new file mode 100644
index 000000000000..5f7555472651
--- /dev/null
+++ b/media-sound/grip/grip-3.5.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs libtool
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="vorbis"
+
+# lame and vorbis-tools are no real RDEPENDs. But without them
+# grip cannot convert ripped files to any format. So use them as
+# a sane default.
+RDEPEND="
+	gnome-base/libgnome
+	>=gnome-base/libgnomeui-2.2.0
+	>=media-libs/id3lib-3.8.3
+	media-sound/cdparanoia
+	media-sound/lame
+	net-misc/curl
+	>=x11-libs/gtk+-2.2:2
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/vte:0
+	vorbis? ( media-sound/vorbis-tools )
+"
+# gnome-extra/yelp, see bug 416843
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
+}
+
+src_configure() {
+	# Bug #69536
+	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
+
+	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
+
+	econf
+}
diff --git a/media-sound/grip/grip-3.6.1.ebuild b/media-sound/grip/grip-3.6.1.ebuild
new file mode 100644
index 000000000000..5f7555472651
--- /dev/null
+++ b/media-sound/grip/grip-3.6.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs libtool
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="vorbis"
+
+# lame and vorbis-tools are no real RDEPENDs. But without them
+# grip cannot convert ripped files to any format. So use them as
+# a sane default.
+RDEPEND="
+	gnome-base/libgnome
+	>=gnome-base/libgnomeui-2.2.0
+	>=media-libs/id3lib-3.8.3
+	media-sound/cdparanoia
+	media-sound/lame
+	net-misc/curl
+	>=x11-libs/gtk+-2.2:2
+	x11-libs/libX11
+	x11-libs/pango
+	x11-libs/vte:0
+	vorbis? ( media-sound/vorbis-tools )
+"
+# gnome-extra/yelp, see bug 416843
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
+}
+
+src_configure() {
+	# Bug #69536
+	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
+
+	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
+
+	econf
+}
diff --git a/media-sound/grip/metadata.xml b/media-sound/grip/metadata.xml
new file mode 100644
index 000000000000..0f291d57a1e8
--- /dev/null
+++ b/media-sound/grip/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">grip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
new file mode 100644
index 000000000000..baef47ced777
--- /dev/null
+++ b/media-sound/gsm/Manifest
@@ -0,0 +1,8 @@
+AUX gsm-1.0.12-64bit.patch 591 SHA256 1204cf390608e866a7aa06099998a754afdf33095b89ea4bcd0ddeeb699bba84 SHA512 33b559da974d89487f41e24fe9fee4ac4df6383e27835f710f50deaca76c5077fc24b20fe4d306f1b8c2ca6f3e9cf99c5934796e3795354dee63061e305d4c72 WHIRLPOOL 7698633423b31af5c05f4f6ce8e23c7f09ca6385dd13d7ad9c162b9df230348755f840b4f7740db880c4a240a67b50334cad04f9bb0b1350cd48ee83dbef42ae
+AUX gsm-1.0.12-memcpy.patch 301 SHA256 3d6637db82d739c89cb4127bd28ce9d5b97cee7f27862943952d130a0fb6e9fe SHA512 922999a35a5d8f646ebe61d7b7aacadbd75848a5446462a8173e040f7d4b0748c55196c1be0653752f076a01d7eb07e5bfce3fe23b81a38f1ee9f97d61cd6200 WHIRLPOOL 15832f1206caef42be2a3427327b74b7075da4b23ed32455b78c59f400fb0b61445d1fcf48b132272a025317d914db8c8caea7fa96b4ba910a3f3b3c082a979d
+AUX gsm-1.0.13-shared.patch 3723 SHA256 806dc90827785625e73048f1aa39b8c182c55a466c07a66be8883469be72c0af SHA512 0872ddb6c93ab6f7082f4a999a39439ceaa8337bf72c0a690ebbf1561a605d2664ceec14eba81a36ab244c3cfe3f3edafe3ee76869a68aeffe6fcc3f12026957 WHIRLPOOL 16dc4a348b3f2676ad48012ce2183a5b8cdc1627b466a6aaa5d6e1cde00346fc6a74c4c0ed51f94fb50000a3802e07daa820968265651766baf052de710ba745
+DIST gsm-1.0.13.tar.gz 65318 SHA256 52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa WHIRLPOOL 0beaad0ef45f3b200d98dca208dd9d6fced10e32b7d7db74e0d60fb1009909c270817fe481e4bc42b9c3471f9fd996d44a8d5a07bae9c4187ee12007afe9ca46
+EBUILD gsm-1.0.13-r1.ebuild 1630 SHA256 f38cd9f802be3b35f92fa2214e5a5165904c9d70b2dc2d18543d8c55bc213465 SHA512 79e96349d42b7e0cd7c4fd81d1851c9dfdcad7838a0d973fc51b6ac7e263566249f68bb083b065ce22d0017662ee8f3a7b7d352c423e0ccc88f6f7a3fea7b25f WHIRLPOOL 8d56eb397b3295094895f0ead9ee44b3955632dedd8116070acc5dbb39ca832b1ae749494519cae2e4c670debd63a1477fedca3f89d45067e7021a1267f13484
+MISC ChangeLog 2523 SHA256 8a7e42251dfde4cf39d6689d556476acea73bcc42807f9affe8def0897c57d8e SHA512 0e1a8ad692ae4ca5b755b5199ee6c69baaae598f64f12d2e29ed2ddd693baee6aec1ac5cdddd1957eaa91863aa7c189365a3296878445aafff58465c3d021d67 WHIRLPOOL a3260183d438ce6272eea939b16cee2cd59be98b1d0e91e8676fc636c386d21e9424a29a9fef2fc633af1840da2f5a4335801fe2dd9d2a99ce91e23a5f210647
+MISC ChangeLog-2015 6539 SHA256 903b6645ecbb219a35d87febf4b0f8395efa18d3a7cc058db63d13145f15ed6e SHA512 0c8e4cc6e670a311812a9a4c446e8c95bd1a0dda6b4ad81652f3bf0966c413250e0651727171d04df7668f8282b99bf91797f237ac9b3469bc2f26c655a66f6e WHIRLPOOL d94bdc29d2ba7cf45bc16a44008718d62503ea88c763aa6438c3301fd180659b9f7a74a93fe1771fdcd2dbc1d5f9db08b64b802299cf884d9187c6aeaa39fa45
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/gsm/files/gsm-1.0.12-64bit.patch b/media-sound/gsm/files/gsm-1.0.12-64bit.patch
new file mode 100644
index 000000000000..bc28c5099c57
--- /dev/null
+++ b/media-sound/gsm/files/gsm-1.0.12-64bit.patch
@@ -0,0 +1,16 @@
+diff -ur gsm-1.0-pl12.orig/inc/private.h gsm-1.0-pl12/inc/private.h
+--- gsm-1.0-pl12.orig/inc/private.h	2006-04-26 22:17:01.000000000 +0300
++++ gsm-1.0-pl12/inc/private.h	2007-08-19 12:23:02.000000000 +0300
+@@ -10,10 +10,10 @@
+ #define	PRIVATE_H
+ 
+ typedef short			word;		/* 16 bit signed int	*/
+-typedef long			longword;	/* 32 bit signed int	*/
++typedef int			longword;	/* 32 bit signed int	*/
+ 
+ typedef unsigned short		uword;		/* unsigned word	*/
+-typedef unsigned long		ulongword;	/* unsigned longword	*/
++typedef unsigned int		ulongword;	/* unsigned longword	*/
+ 
+ struct gsm_state {
+ 
diff --git a/media-sound/gsm/files/gsm-1.0.12-memcpy.patch b/media-sound/gsm/files/gsm-1.0.12-memcpy.patch
new file mode 100644
index 000000000000..fc3c1ce232d9
--- /dev/null
+++ b/media-sound/gsm/files/gsm-1.0.12-memcpy.patch
@@ -0,0 +1,11 @@
+diff -ur gsm-1.0-pl12.orig/src/code.c gsm-1.0-pl12/src/code.c
+--- gsm-1.0-pl12.orig/src/code.c	2006-04-26 22:16:50.000000000 +0300
++++ gsm-1.0-pl12/src/code.c	2007-08-19 12:18:01.000000000 +0300
+@@ -8,6 +8,7 @@
+ 
+ #include	"config.h"
+ 
++#include <string.h>
+ 
+ #ifdef	HAS_STDLIB_H
+ #include	<stdlib.h>
diff --git a/media-sound/gsm/files/gsm-1.0.13-shared.patch b/media-sound/gsm/files/gsm-1.0.13-shared.patch
new file mode 100644
index 000000000000..fc99e2c30437
--- /dev/null
+++ b/media-sound/gsm/files/gsm-1.0.13-shared.patch
@@ -0,0 +1,151 @@
+diff -ur gsm-1.0-pl13.orig/Makefile gsm-1.0-pl13/Makefile
+--- gsm-1.0-pl13.orig/Makefile	2006-04-26 22:14:26.000000000 +0300
++++ gsm-1.0-pl13/Makefile	2009-09-08 14:50:02.000000000 +0300
+@@ -96,7 +96,7 @@
+ #  Other tools
+ 
+ SHELL		= /bin/sh
+-LN		= ln
++LN		= ln -s
+ BASENAME 	= basename
+ AR		= ar
+ ARFLAGS		= cr
+@@ -140,6 +140,7 @@
+ # Targets
+ 
+ LIBGSM	= $(LIB)/libgsm.a
++LIBGSMSO= $(LIB)/libgsm.so
+ 
+ TOAST	= $(BIN)/toast
+ UNTOAST	= $(BIN)/untoast
+@@ -203,24 +204,43 @@
+ 
+ # Object files
+ 
+-GSM_OBJECTS =	$(SRC)/add.o		\
+-		$(SRC)/code.o		\
+-		$(SRC)/debug.o		\
+-		$(SRC)/decode.o		\
+-		$(SRC)/long_term.o	\
+-		$(SRC)/lpc.o		\
+-		$(SRC)/preprocess.o	\
+-		$(SRC)/rpe.o		\
+-		$(SRC)/gsm_destroy.o	\
+-		$(SRC)/gsm_decode.o	\
+-		$(SRC)/gsm_encode.o	\
+-		$(SRC)/gsm_explode.o	\
+-		$(SRC)/gsm_implode.o	\
+-		$(SRC)/gsm_create.o	\
+-		$(SRC)/gsm_print.o	\
+-		$(SRC)/gsm_option.o	\
+-		$(SRC)/short_term.o	\
+-		$(SRC)/table.o
++STATIC_GSM_OBJECTS =	$(SRC)/add.o		\
++			$(SRC)/code.o		\
++			$(SRC)/debug.o		\
++			$(SRC)/decode.o		\
++			$(SRC)/long_term.o	\
++			$(SRC)/lpc.o		\
++			$(SRC)/preprocess.o	\
++			$(SRC)/rpe.o		\
++			$(SRC)/gsm_destroy.o	\
++			$(SRC)/gsm_decode.o	\
++			$(SRC)/gsm_encode.o	\
++			$(SRC)/gsm_explode.o	\
++			$(SRC)/gsm_implode.o	\
++			$(SRC)/gsm_create.o	\
++			$(SRC)/gsm_print.o	\
++			$(SRC)/gsm_option.o	\
++			$(SRC)/short_term.o	\
++			$(SRC)/table.o
++
++SHARED_GSM_OBJECTS =	$(SRC)/add.lo		\
++			$(SRC)/code.lo		\
++			$(SRC)/debug.lo		\
++			$(SRC)/decode.lo	\
++			$(SRC)/long_term.lo	\
++			$(SRC)/lpc.lo		\
++			$(SRC)/preprocess.lo	\
++			$(SRC)/rpe.lo		\
++			$(SRC)/gsm_destroy.lo	\
++			$(SRC)/gsm_decode.lo	\
++			$(SRC)/gsm_encode.lo	\
++			$(SRC)/gsm_explode.lo	\
++			$(SRC)/gsm_implode.lo	\
++			$(SRC)/gsm_create.lo	\
++			$(SRC)/gsm_print.lo	\
++			$(SRC)/gsm_option.lo	\
++			$(SRC)/short_term.lo	\
++			$(SRC)/table.lo
+ 
+ TOAST_OBJECTS =	$(SRC)/toast.o 		\
+ 		$(SRC)/toast_lin.o	\
+@@ -228,7 +248,7 @@
+ 		$(SRC)/toast_alaw.o	\
+ 		$(SRC)/toast_audio.o
+ 
+-OBJECTS =	 $(GSM_OBJECTS) $(TOAST_OBJECTS)
++OBJECTS =	$(STATIC_GSM_OBJECTS) $(SHARED_GSM_OBJECTS) $(TOAST_OBJECTS)
+ 
+ # Manuals
+ 
+@@ -277,9 +297,12 @@
+ 		$(CC) $(CFLAGS) $?
+ 		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
+ 
++%.lo: %.c
++		$(CC) $(CFLAGS) -fPIC -c $< -o $@
++
+ # Target rules
+ 
+-all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
++all:		$(LIBGSM) $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
+ 		@-echo $(ROOT): Done.
+ 
+ tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
+@@ -299,24 +322,29 @@
+ 
+ # The basic API: libgsm
+ 
+-$(LIBGSM):	$(LIB) $(GSM_OBJECTS)
++$(LIBGSMSO):	$(LIB) $(SHARED_GSM_OBJECTS)
++		$(LD) $(LFLAGS) -o $@.1.0.13 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(SHARED_GSM_OBJECTS) -lc
++		ln -fs libgsm.so.1.0.13 lib/libgsm.so.1
++		ln -fs libgsm.so.1.0.13 lib/libgsm.so
++
++$(LIBGSM):	$(LIB) $(STATIC_GSM_OBJECTS)
+ 		-rm $(RMFLAGS) $(LIBGSM)
+-		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
++		$(AR) $(ARFLAGS) $(LIBGSM) $(STATIC_GSM_OBJECTS)
+ 		$(RANLIB) $(LIBGSM)
+ 
+ 
+ # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
+ 
+ $(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
+-		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
++		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
+ 
+ $(UNTOAST):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(UNTOAST)
+-		$(LN) $(TOAST) $(UNTOAST)
++		$(LN) toast $(UNTOAST)
+ 
+ $(TCAT):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(TCAT)
+-		$(LN) $(TOAST) $(TCAT)
++		$(LN) toast $(TCAT)
+ 
+ 
+ # The local bin and lib directories
+@@ -426,7 +454,9 @@
+ 
+ clean:	semi-clean
+ 		-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add		\
+-			$(TOAST) $(TCAT) $(UNTOAST)	\
++			$(LIBGSMSO) $(LIB)/libgsm.so.1.0.13	\
++			$(LIB)libgsm.so.1			\
++			$(TOAST) $(TCAT) $(UNTOAST)		\
+ 			$(ROOT)/gsm-1.0.tar.Z
+ 
+ 
diff --git a/media-sound/gsm/gsm-1.0.13-r1.ebuild b/media-sound/gsm/gsm-1.0.13-r1.ebuild
new file mode 100644
index 000000000000..897d7f112012
--- /dev/null
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+DESCRIPTION="Lossy speech compression library and tool"
+HOMEPAGE="https://packages.qa.debian.org/libg/libgsm.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="gsm"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}-"$(replace_version_separator 2 '-pl' )"
+
+DOCS=( ChangeLog MACHINES MANIFEST README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-shared.patch \
+		"${FILESDIR}"/${PN}-1.0.12-memcpy.patch \
+		"${FILESDIR}"/${PN}-1.0.12-64bit.patch
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	# From upstream Makefile. Define this if your host multiplies
+	# floats faster than integers, e.g. on a SPARCstation.
+	use sparc && append-flags -DUSE_FLOAT_MUL -DFAST
+
+	emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1" \
+		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+multilib_src_install() {
+	dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3}
+
+	emake -j1 INSTALL_ROOT="${D}"/usr \
+		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" \
+		GSM_INSTALL_LIB="${D}"/usr/$(get_libdir) \
+		GSM_INSTALL_INC="${D}"/usr/include/gsm \
+		GSM_INSTALL_MAN="${D}"/usr/share/man/man3 \
+		TOAST_INSTALL_MAN="${D}"/usr/share/man/man1 \
+		install
+
+	dolib lib/libgsm.so*
+
+	dosym ../gsm/gsm.h /usr/include/libgsm/gsm.h
+}
diff --git a/media-sound/gsm/metadata.xml b/media-sound/gsm/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/gsm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/gst123/Manifest b/media-sound/gst123/Manifest
new file mode 100644
index 000000000000..e5153f2f22f3
--- /dev/null
+++ b/media-sound/gst123/Manifest
@@ -0,0 +1,5 @@
+DIST gst123-0.3.4.tar.bz2 123399 SHA256 cbf0741ff63d5bc335ef3ef9278d1c6edd800193ffbdd0e56ad7c902d6643d02 SHA512 7a5afddd4337b9d843949f49231b64bbc0390b97c40caa3cdac1fe0fd2a7e8a0ce01a77817735770b7a524459daa7e61e79e25c2e3e33769fd29e535d39d866f WHIRLPOOL 8a73b4677870260b8555c8162217e811d77845958ef131e7017faf4f216401c9547389e30f2574c37c2e292c0f63522f97bdcb91a31f1c50221da96e7d98909f
+EBUILD gst123-0.3.4.ebuild 571 SHA256 0bad1255962b38645d64d57f6fb4687f3969b68a313b9dff92a208f978c88423 SHA512 be34bfed4e76199c71ad4dc90c3e76ef37d95b31604b961f12b06b02d09c04a40164dee26e1b725dde9a0facf961cbb7ae68ec2366c94198a8632be997f3917a WHIRLPOOL 28112706a2f85227a9dfdd3fe3ce3ed8df17df4d555626e3542ba6665d96c4a4a7badecf05b6e21d25a996e1cb297378e22a4b7d818abf340d318418abb841a4
+MISC ChangeLog 3021 SHA256 d0961d79604e39910482caddb877073a6ccfaac520e9b11246a5bd264a904aa1 SHA512 ae2084e6dfe8ec8eac45467e92048e6efc88df8af5c290912fea1d5bf39fb43168298e453328ed2e475404d2bb29b950668fea8ff589713fc4ca7b79015d23c3 WHIRLPOOL ee413401343a058e22c7733bb636987807e4c1137608dfe16b2eb946e59ab8866fabbf24ec1e53ca89d4bf1a58784de784fa8863242f5440c70f5872979224d0
+MISC ChangeLog-2015 1139 SHA256 01bb4062693df458f2eacc0e8514507594b16ab118894c36243d4b55a7273b8a SHA512 479087e47d5dd3f90a1debf865ef2e63225375ea667a80527d4675b8dd27176f082171c711c64d1ecf648391666b755585e44ea6758c319e7b522b29dd917276 WHIRLPOOL ff4892894222f1b1bf86e5738946c3404979238df303ec11c751f345c39b73dd83aa327046ce2fb29403e5fbb8a111c5fd0a50dc80a2a7b8921d5b3bdbb64a9b
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/gst123/gst123-0.3.4.ebuild b/media-sound/gst123/gst123-0.3.4.ebuild
new file mode 100644
index 000000000000..961e5e14b285
--- /dev/null
+++ b/media-sound/gst123/gst123-0.3.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A GStreamer based command line media player"
+HOMEPAGE="http://space.twc.de/~stefan/gst123.php"
+SRC_URI="http://space.twc.de/~stefan/gst123/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+	dev-libs/glib:2
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	sys-libs/ncurses:0=
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+RDEPEND="${CDEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
diff --git a/media-sound/gst123/metadata.xml b/media-sound/gst123/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/gst123/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/gstreamripper/Manifest b/media-sound/gstreamripper/Manifest
new file mode 100644
index 000000000000..8e6f6500d2df
--- /dev/null
+++ b/media-sound/gstreamripper/Manifest
@@ -0,0 +1,5 @@
+DIST GStreamripperX-0.2.tar.gz 187186 SHA256 211d967db34e70b97d989bddf4f847f9cb9e9466430b0a2397127d28fbc37ad2 SHA512 6b4253d7b9f02bcba3e5815390bfc284e3d04f5518055d650efc61e650c6c7a8a6bcf0d86cbe56fd8b59969d77e83aab6d09c0fe12d0e77c621e91ed5ce3253c WHIRLPOOL 8233295d25bfd07424e3d2213e97150fcfbe2858cde5b7708b6829076b539315bc5fbcba0a954f3428b213e4d31c2480fbb87f64e43de850648d3f07b83f0900
+EBUILD gstreamripper-0.2.ebuild 793 SHA256 50ed8ab844660725a000504ad45c4d886d125efced341f43f2dc8c34aa40b02d SHA512 684a8bd2d7f47910b55f6dc6c083c0a1b86cc6e1de1b5fde35ace07fc99d7213173293ac8dacf4c961753468c0df9f6f4ceb644b65a65bf2bd62dca444eb2cb3 WHIRLPOOL 71b612daf4a531b9c78e1b14bb7d60c6c150c252e85f8b1a98d9bd89018b818ed964c97054711299a0627cff0b7eb3cf43ff244422056dfb4a8a0f60d5ce64f5
+MISC ChangeLog 2560 SHA256 711a4b7cdb2116c957778c4e63fe6df1ce5f62a99d1b13c5c145bebf1de97add SHA512 cace444e2a40c1604369c675399707cbc4a9eba8fd00685c30596d9ccabe9f79d5b0d3f98f894bfa35c7cd298587e5a9d0611f99376586398a306cc72f37882c WHIRLPOOL 0d4ee3455c9dcbf20b62370d5563e639f4013957d25b6ef5eaae0aaa962af02997e3a953f390fc309b812f08dcab145621decc26cb8084d0e0e8cbdbcc8ce03a
+MISC ChangeLog-2015 2094 SHA256 e513e30a21a43f0dc42dd4dbefe1a00432d9f5bb38e872adce61b525f7332200 SHA512 a27f883d33e89bb25e76a09fe31aca00d58c2f7a531e15ade00cea6ca83ffc638a3034247a3cad8c8c8f0f5d367d67f1a7b6358cf75d08de73f8b9c3942f92c0 WHIRLPOOL 99cb721e409848ba8efdf6bfcd189d530dcd7763ba8535c79f4087336b68b02af416ce60c8857b550c77925293a80d7dfa5828b3ec8bfe344a1e25c423c9aa04
+MISC metadata.xml 336 SHA256 074b83a49e330ba1b1ef723a719ce8db442335cd3ae83e36fe3b0a026e9b19d2 SHA512 62020c37a8649f01b5dafecc35d4bf614c1628e725713f36923b58956a1461ba6f83c8a64fd714b895ff759c105d9ff0069e85a41a72e2fbf5da7e01aeed8f1c WHIRLPOOL 4b2864ab899edb7e49ef3b1f52252430ce17a0bfd991d4144da764ef545f01968b14548c77f813c1162f6d0c100094549f5e3edbf739fc27dfb31fb1cd431a88
diff --git a/media-sound/gstreamripper/gstreamripper-0.2.ebuild b/media-sound/gstreamripper/gstreamripper-0.2.ebuild
new file mode 100644
index 000000000000..c418b4dad9ef
--- /dev/null
+++ b/media-sound/gstreamripper/gstreamripper-0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+MY_P=GStreamripperX-${PV}
+
+DESCRIPTION="A GTK+ toolkit based frontend for streamripper"
+HOMEPAGE="https://sourceforge.net/projects/gstreamripper/"
+SRC_URI="mirror://sourceforge/gstreamripper/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+COMMON_DEPEND="x11-libs/gtk+:2"
+RDEPEND="${COMMON_DEPEND}
+	media-sound/streamripper"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	local docdir=/usr/share/doc/${PF}
+
+	emake \
+		DESTDIR="${D}" \
+		gstreamripperxdocdir=${docdir} \
+		install || die
+
+	rm -f "${D}"/${docdir}/{COPYING,NEWS,TODO}
+
+	make_desktop_entry gstreamripperx GStreamripperX
+}
diff --git a/media-sound/gstreamripper/metadata.xml b/media-sound/gstreamripper/metadata.xml
new file mode 100644
index 000000000000..56c63be9eead
--- /dev/null
+++ b/media-sound/gstreamripper/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gstreamripper</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/gtick/Manifest b/media-sound/gtick/Manifest
new file mode 100644
index 000000000000..5e52c2f0e30b
--- /dev/null
+++ b/media-sound/gtick/Manifest
@@ -0,0 +1,5 @@
+DIST gtick-0.5.0.tar.gz 650541 SHA256 766930718d8f272b8fb45be89974db907db084e281e922e4fb7dd9d874b9d59d SHA512 916295cb4101e6b958e1a51195dcc0cc0e088f0b2a2e52afaf8becd93782277cbf9cd51ae4e0b3edbbc66994912b6f7be755632ff85a47aabb8fb87b4acb14ef WHIRLPOOL e010da2f534dff99e5160cfb1121d2e4594609559ff2586c94a4b3f18cd2c9b300797b7e5865d160b9cae5bbc83dc5330650e8ebf60cd4d37116a3610e577957
+EBUILD gtick-0.5.0.ebuild 744 SHA256 35426d916312f0538e85148f070b1e9478fbed5131895a6fdd4b4fe333b9a555 SHA512 8f9f8870ceba8aee864a22a4ab6b1885928be6cc76bbe8f55b6e249c20d7c12ac9dd4241115434ecf46f96096a3df073a92e013e5dbbc6a28989da9806bde2d1 WHIRLPOOL 42bc15edf7835ab4c67b6e8b7a1cbc4b5155872286e85a5c185f412062c934c65c9c1b14e059c821368b0805aa7c0cdf28ed22830636aa49bb625ad31ffb45c5
+MISC ChangeLog 2424 SHA256 76c9ac13d3c299c1c0b9837fd1f4ba0eede05838b5572bd5817ca39c6e8dd391 SHA512 b672edb7c0f8cabe0787f30cb54f994049ef8922bb2a46ffa2d9fe2cf6e599e8f40301f33494e1e6da56edb5d9b0e9e11c23af84571fa010bea81da0a3920ea8 WHIRLPOOL ba7a78051778a7ece748b17bfcca6183a1738a23fd5ce4fd4440a95d92a295e5ff29ca19b227d94daf3fb7de2115537f16142f651eb632d4632695223bb43cc0
+MISC ChangeLog-2015 5100 SHA256 0fec90035d8221dd4f0a1cd887459a42410f82b6608a244fae6b1df7d2d334ed SHA512 3506d75b1f27cd9dbafb1cd3f47290728f657f3702e04a9a197ec4b532ecf0811ff48856feb008603c78b921d57025ce4481c19580da6506ab978f47a4752569 WHIRLPOOL c12a31db06ab661c0862f823518be9c75c67eea757e032b9db4a3030abc2329a0aec410a5bbc9630e873bc22612095a38e06f0da271770025714c96e270aeb02
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/gtick/gtick-0.5.0.ebuild b/media-sound/gtick/gtick-0.5.0.ebuild
new file mode 100644
index 000000000000..444515a7a386
--- /dev/null
+++ b/media-sound/gtick/gtick-0.5.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="a metronome application supporting different meters and speeds ranging"
+HOMEPAGE="http://www.antcom.de/gtick"
+SRC_URI="http://www.antcom.de/gtick/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
+IUSE="nls sndfile"
+
+RDEPEND="x11-libs/gtk+:2
+	media-sound/pulseaudio
+	sndfile? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+RESTRICT="test"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with sndfile)
+}
+
+src_install() {
+	default
+	newicon src/icon48x48.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "GTick"
+}
diff --git a/media-sound/gtick/metadata.xml b/media-sound/gtick/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/gtick/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/gtkguitune/Manifest b/media-sound/gtkguitune/Manifest
new file mode 100644
index 000000000000..db4ee3eba929
--- /dev/null
+++ b/media-sound/gtkguitune/Manifest
@@ -0,0 +1,5 @@
+DIST gtkguitune-gtk2-0.8.tar.gz 660808 SHA256 be0e8a8b8085498201d3674a1a719d4841a4f79cd7bcff3e14fec83512c30849 SHA512 40f23e0661c87e3723a127fd2ceb0acc031b548809e99871611c2dd05140a8ffedbe48c52853a5ff43c7175d77de0f90e5d94d850f999aca29336e055247cf2a WHIRLPOOL 38ee13f52096624869300f7f937498c0df13eb1a2022f68c35299b84c858c88fbc20eaf8d62d332cc8ca886b305b3aba6f13af6aa6423ac83741c5189d41994b
+EBUILD gtkguitune-0.8.ebuild 778 SHA256 c67e16424450311c59491afd794e2565f09d483f8171c31d83b73a6c44eaa0a8 SHA512 0749bca3fecded5b87947e311c16fc990efaa41dd7c49cad1e46d0778438b3c72bfd6e85723fe3e01593ee59d87232148abe4510df6cf22be535c47f50419f13 WHIRLPOOL c7082d62ab7ad1c98bcf511e1a4bfe607116f2f3055c1a3bed9a4546295e1ac010b121dd7cd6fd620d8f3b2c54699adb27a69066000783d04b3dec241a7ddffd
+MISC ChangeLog 2609 SHA256 d72b7015e36c1b1f7df574bed0e7c782610af6a810731c224dd1b436975e040f SHA512 254a00a20a33c5a21ccf8213316fdf024387041287604edb5658d66676a09ca03754ab2f806b9d05ebc0c9fd85c3f3e780cc00966e35532cf4a646d11ba4c9e1 WHIRLPOOL b9601f5505f2119fa647b36bfd0891500f3c38508e6555ddb0db1e40f2884a69c6c11b39e5ec7cf00e47ab176012cbf4987fa7c0a2149d2fdc03b9573d966b00
+MISC ChangeLog-2015 2485 SHA256 6cd8c69c7064d2533877f047d02cc69dcbdd475adf23dbea44d70903d20ae373 SHA512 7303b18411a979e9e52c327d56f3ccc6e75bb5ad2e1b48ca1474f016b3e02b166af6d64a1673b650501d6b6b59e4aaf2002d0a7cb8bc007375ac2b802a31fbab WHIRLPOOL 8e7b23e2bb922bcaf5412d89a5adf51c4145d9ece27f0ad1b766b9a40f66527e4740ce30e505015c4f1705e6f09c5bdb3e949e21ad4175b2747f95964dd5fc21
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/gtkguitune/gtkguitune-0.8.ebuild b/media-sound/gtkguitune/gtkguitune-0.8.ebuild
new file mode 100644
index 000000000000..ff2d89b1b4bd
--- /dev/null
+++ b/media-sound/gtkguitune/gtkguitune-0.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic gnome2-utils
+
+DESCRIPTION="A guitar tuning program that uses Schmitt-triggering for quick feedback"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${PN}-gtk2-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-libs/libsigc++:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	append-cxxflags -std=c++11
+}
+
+src_install() {
+	default
+	make_desktop_entry ${PN} Guitune guitune_logo
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/gtkguitune/metadata.xml b/media-sound/gtkguitune/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/gtkguitune/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/gtklick/Manifest b/media-sound/gtklick/Manifest
new file mode 100644
index 000000000000..c4d8fe159711
--- /dev/null
+++ b/media-sound/gtklick/Manifest
@@ -0,0 +1,5 @@
+AUX gtklick 787 SHA256 9e0bd136bb10ee95cb665974bec8c10ebcc599713046a3828ccd8b3544abcada SHA512 3ba1e5e9507eb6827dd7649e00da69539537934714b8a3833c8fae21abd0d0d7793a0207f4ebf1f65cb6e111cb7e344b97d5cf397cf038364cffe2ee6be39d6a WHIRLPOOL 86065a5eac7c28a3d9395a880dd561e058ed83bae70ca6e40895dfcd33eb0e9adc4d7c3809904fe3c819432a9bbefd4fdba30034dd890b544576b3d410f4d97f
+DIST gtklick-0.6.4.tar.gz 35901 SHA256 7799d884126ccc818678aed79d58057f8cf3528e9f1be771c3fa5b694d9d0137 SHA512 8491650cf324005f32808036f63574b0a59659bc8e5f3efe615b83e42701f1a3bcb95825a2378b3a17b45ddb5b33c87bed9602a0492d117665d85bd35f4a4a9b WHIRLPOOL de9ceb667910a0968afbf7650942ce1947150c508b76002b5f107fe21c3cf29c5e88462e1494837838cf78502ba5f017b11a834894ba4f21d18d0cbfbf5e46b7
+EBUILD gtklick-0.6.4.ebuild 872 SHA256 54c50201425fb818bc8a446b9dbb3518a6de36a175bb9995d1aea715346c9886 SHA512 fa54eae51d62d5812b146e23a2580ae5971c313ed1704c6f00c80805c84d57cd4af2e986390ac35173a731204bf1b30e6f52e80422d97cd2d6a12110eb4b2a86 WHIRLPOOL cac4b50b2198c7edda307ad92ecd64f19028d31f7927de1b35b05889e1701d542700669b9ff423b0135cbd6de3d3df1ec9d0c69c5816fd4ebc72bb9e9a95bbe6
+MISC ChangeLog 577 SHA256 83a38eb85935e40be29ae9b0b685e1e3768f7bd6d480bb1698f128bc0e24c064 SHA512 5f956987203da3d2a7c71316f93a6fd6b49d02dde902fba5b003731c37ff3e632be10e51fdc793d8cd854d972260fc11724f517591edff647c4066ff93350f44 WHIRLPOOL f308ea4691f5b8961758536e3e9ebb69220331be8c12cc928308411145e8b4bfdf8d8241696594198e8c31cb6b04c51027c13bff5e70306798db781c4a0e7021
+MISC metadata.xml 367 SHA256 3fe025747ebd631fe31ad38b52847bf1d89e7e5d900ee359b1fbc2286e070bc8 SHA512 fa954108bf3d089d95ccdafda4daaf6ff4b13c8d5791e3aa01579d8a23050180ddca511656a5a996579b571e5a643d721984290db3b5e3584ba9c322949fcdf7 WHIRLPOOL e90c4ca28d1cde94264bf11b22ebacee8479b139627824493dbfd095fb5ee53206f3f7cd090968f20f62b9692974b8d5129678f8eb354c710b10198ee52bcf81
diff --git a/media-sound/gtklick/files/gtklick b/media-sound/gtklick/files/gtklick
new file mode 100644
index 000000000000..6a999edc0719
--- /dev/null
+++ b/media-sound/gtklick/files/gtklick
@@ -0,0 +1,23 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+#
+# gtklick
+#
+# This is a replacement for the broken runner script provided by the
+# original source. This script does not assume that the data is in some
+# folder relative to the script, but instead hardcodes the variables
+# during compiling.
+#
+# Copyright (C) 2008-2010  Dominic Sacré  <dominic.sacre@gmx.de>
+# Copyright (C) 2013  Karl Lindén  <karl.j.linden@gmail.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+from gtklick.gtklick import GTKlick
+import sys
+
+app = GTKlick(sys.argv[1:], "@sharedir@", "@localedir@")
+app.run()
diff --git a/media-sound/gtklick/gtklick-0.6.4.ebuild b/media-sound/gtklick/gtklick-0.6.4.ebuild
new file mode 100644
index 000000000000..70e74673ff23
--- /dev/null
+++ b/media-sound/gtklick/gtklick-0.6.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="A simple metronome with an easy-to-use GTK interface"
+HOMEPAGE="http://das.nasophon.de/gtklick/"
+SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
+	media-libs/pyliblo[${PYTHON_USEDEP}]
+	media-sound/klick[osc]
+	${PYTHON_DEPS}"
+
+DEPEND="${RDEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+
+	# Replace the broken default runner script with a working one.
+	sed \
+		-e "s|[@]sharedir[@]|${EPREFIX}/usr/share/${PN}|g" \
+		-e "s|[@]localedir[@]|${EPREFIX}/usr/share/locale|g" \
+		"${FILESDIR}"/${PN} > "${T}"/${PN} || die
+	python_replicate_script "${T}"/${PN}
+}
diff --git a/media-sound/gtklick/metadata.xml b/media-sound/gtklick/metadata.xml
new file mode 100644
index 000000000000..b5f0b450d001
--- /dev/null
+++ b/media-sound/gtklick/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>karl.j.linden@gmail.com</email>
+		<name>Karl Linden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest
new file mode 100644
index 000000000000..d6fa5d5c52f1
--- /dev/null
+++ b/media-sound/guayadeque/Manifest
@@ -0,0 +1,5 @@
+DIST guayadeque-0.4.5_p20170110.tar.gz 2070855 SHA256 07d160f74ad38e68bf003b9ba50349282625edbb129d5f4795bd18deac69cd80 SHA512 57215ba47574fba615b33d72f45279c3726035bea38746f7d927a39866fb3fa8a3fb1dbd13fe672c7daba16a2131fbf4b89afed6a3bf8d9a584e5112d926f518 WHIRLPOOL 487d80b9d5dff02d2e5254351505a349b665c40c0af997d75691740bb6965f3718545c427143c930b2f0cb3c4ea7c8f0ad2b2293f269a33c50e99b79a74a6f65
+EBUILD guayadeque-0.4.5_p20170110.ebuild 2163 SHA256 0c65b17406c5fe179ff9950b3a0c8b1acabe2461117ece428b80a9ad8594a4c4 SHA512 7042eed072d9ee587f69aab9e98cebd0f94a237a637c3b950de1bf1c05e18f53187aeb0919e00a98340f05804e1aeab01888f7eaf1e92ffec7603dacc749db9a WHIRLPOOL d2ac6637be120d143ee308deaa844cc1a270a27e56e34751e3bf871cf8266518cb54b9fa1ef3f05ed94c9bc4d555ff87efa1c7b871c66acd492a6a1a5ea27990
+MISC ChangeLog 3930 SHA256 095ae4445553bfbadbd107ffc030eb552ad3d8699dc8e484e962c151faca98cc SHA512 056bef7ea21f42a980707a00683b82a35bc222eb6944609495f7b72e9cc6445c0ee81c7573dbbe7f9c3d454ee2f250bef799ac4e6cf830eb99b7be3f8b6a8519 WHIRLPOOL 250cdaf53906b324fdefcc54a10878904e97bdaec86a61d7bda89edac6e26d3533818e77b141d7ef0fce97c12ab36fad03a804acb273ad9f63546e55541701dc
+MISC ChangeLog-2015 3694 SHA256 e895c2b80a9a99e793c3167bfdfa0ea37a24f069a4aa3cf32b587df10635ffea SHA512 fc7e9acd2871d37a005a801c345fef83fd00c30252c251be36b44ca8fd0f6c17ba60392949abd46e786f6f857176eefe55e6f5f78c0985a385e3af3e5c94778f WHIRLPOOL 65643ad6751ec6d458885388a5bad770fb4b7aeec2bcc03b58db7444b53798887139800d95980a450bb9d460f5aa0d68a92cdef9f0aae9434e1f89af565275bf
+MISC metadata.xml 410 SHA256 5ada93586b3ffadd62b524c0fc7b43d4be69b7f56c8bb3d14dbf29a974e2e961 SHA512 826a540e373fdbe9027eb0bf9f66a6e7fd61c1b355a5b0cdbc00e2517e3b2e1b23224e6f0bc6025553c49135f4851422ff2055a2c681c9d42fa11f2fab905f3c WHIRLPOOL ed7d8d9a28419502dbe2963e1bbf9220c2b3071421973008030aa42cb399343dbd577f570e9f19559ac7e5693c29ed50fe4181f2fe83317ddb45b2b8c8e832cc
diff --git a/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild b/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
new file mode 100644
index 000000000000..a35520325583
--- /dev/null
+++ b/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER=3.0
+
+inherit cmake-utils vcs-snapshot wxwidgets
+
+DESCRIPTION="Music management program designed for all music enthusiasts"
+HOMEPAGE="http://guayadeque.org/"
+SRC_URI="https://github.com/anonbeat/${PN}/archive/9fec4f7b85095fa2d9f8e4d39c0cf5015f7624fa.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ayatana ipod +minimal"
+
+# No test available, Making src_test fail
+RESTRICT="test"
+
+GST_DEPS="
+	media-libs/gnonlin:1.0
+	media-plugins/gst-plugins-libav:1.0
+	media-plugins/gst-plugins-libnice:1.0
+	media-plugins/gst-plugins-pulse:1.0
+	media-plugins/gst-plugins-soup:1.0
+	media-libs/gst-plugins-bad:1.0
+	media-libs/gst-plugins-ugly:1.0
+"
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-db/wxsqlite3-3.2.1
+	dev-libs/glib:2
+	media-libs/flac
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	>=media-libs/taglib-1.6.4
+	net-misc/curl
+	sys-apps/dbus
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	ayatana? ( >=dev-libs/libindicate-0.7 )
+	ipod? ( media-libs/libgpod )
+	!minimal? ( ${GST_DEPS} )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+# echo $(cat po/CMakeLists.txt | grep ADD_SUBDIRECTORY | sed 's#ADD_SUBDIRECTORY( \(\w\+\) )#\1#')
+LANGS=( bg ca_ES cs de el es fr hr hu is it ja nb nl pl pt pt_BR ru sk sr sr@latin sv th tr uk )
+for l in "${LANGS[@]}"; do
+	IUSE+=" linguas_${l}"
+done
+unset l
+
+pkg_setup() {
+	setup-wxwidgets
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# remove bundled libs
+	rm -rf src/wx/wxsql* src/wxsqlite3 || die
+
+	# comment out unused languages
+	cd po || die
+	local l
+	for l in "${LANGS[@]}"; do
+		! use linguas_${l} && cmake_comment_add_subdirectory ${l}
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_IPOD=$(usex ipod)
+		-DENABLE_LIBINDICATE=$(usex ayatana)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if use minimal; then
+		elog "If you are missing functionalities consider setting USE=-minimal"
+		elog "or install any of the following packages:"
+
+		local pkg
+		for pkg in ${GST_DEPS}; do
+			elog "\t ${pkg}"
+		done
+	fi
+}
diff --git a/media-sound/guayadeque/metadata.xml b/media-sound/guayadeque/metadata.xml
new file mode 100644
index 000000000000..a7ec7781ef07
--- /dev/null
+++ b/media-sound/guayadeque/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">guayadeque</remote-id>
+    <remote-id type="github">anonbeat/guayadeque</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/guimup/Manifest b/media-sound/guimup/Manifest
new file mode 100644
index 000000000000..178a265aa01b
--- /dev/null
+++ b/media-sound/guimup/Manifest
@@ -0,0 +1,5 @@
+DIST guimup_0.3.2_src.tar.gz 587543 SHA256 930c137be80a2cecf3053bb3c96d805dc618c84a83b17aa63e56cd69d977e49a SHA512 64f56b189e17c60432199d72e658ac2091d051d9cde7e53da7f89b96aadb006121a123bdde7ec80634c0b263e3d68ca1517592dda5a55cddf747c8ce85a535e2 WHIRLPOOL fcf188f8d55d259cf6196867634b0eed5056cadb3034d7de26bbf7075404e02b7e044eba4e4c34e3a6dd04000b25c69c080b6045a1e2dc2195e5ea83e2fc9a3a
+EBUILD guimup-0.3.2.ebuild 660 SHA256 3f8598986d85825bbdd54f4c9549101e705eac9729cce0ec61f75692c2ba554d SHA512 c893349ceaf1e6c08a03b6f350f3742d20538462337fbeca29773744070b5dd94e21a55ff717d8bd600098212459b8223c8939597f6076aa61ee73ffde447e3c WHIRLPOOL 772229fee8fa955175e963412e3afed48749ee51dd6bb7612beead85680ce9036f21c67e424b9124193f3e405ffa8fbf311e691dac7cc8b91758ba3bade15a1e
+MISC ChangeLog 2444 SHA256 8987c3a6c846beb0e3753b99ae0de3f852ddfc821c1741431a8282c33ddafebb SHA512 3f7d7b872f1333de9c6263e7bdcd7ccd69b050b712b90353024cf89fa6ef87e0394b8baabb21450d3e7a6245d659ffd36e49b883e4cee7a68c017506771ae442 WHIRLPOOL 1a4b62f197cfe61993116c11ff52e6b5640f429b46239c24c581bd1caa9e8eef3eb0a808183c662a33b4bbab3171078a10e196b4d802484ce910ccb1d31aa95b
+MISC ChangeLog-2015 461 SHA256 1580bf2480bf19b292d7783e101b3207a532508dd6e8eb928d091e95c5bc307e SHA512 fcfad157171ba668811fb64ed742f8f9363ca40126f5c31e62552456f8e37900949a6458d3d8ff992cd2bde5a5fd091fa099098cedf8b477a164800bf48fc297 WHIRLPOOL cf41dedb8867ae3eb35403b76e9650af988d0b1d309519bc6b5c08d7f035c906522fee2b8546842010424f46cba1e60b0d90e6e0ce86104db610e50f9baebadd
+MISC metadata.xml 216 SHA256 aeb96f85d2271f28c60462350aed17e901a32a67e7ea8565a7bc55248dc47fb9 SHA512 ad6f0a8e26ad46fcaef1ea708b34788c38ae8826742b89f880c68b343e03d5f30cad1bcc2218e6c77dab240654773df8c80da270be88f404005f49768e2a46a6 WHIRLPOOL 1a1539930c3f4125bf807c26303c5d29b32e767c623df72e714418c363ee2b9ef5e094f56d1beae02d436a4eb0a10f094d41459c3c2d609a03ba251686f98ccd
diff --git a/media-sound/guimup/guimup-0.3.2.ebuild b/media-sound/guimup/guimup-0.3.2.ebuild
new file mode 100644
index 000000000000..fc0433c7c556
--- /dev/null
+++ b/media-sound/guimup/guimup-0.3.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic
+
+MY_P=${P/-/_}
+
+DESCRIPTION="A client for MPD with a clean, GTK interface"
+HOMEPAGE="http://coonsden.com"
+SRC_URI="mirror://sourceforge/musicpd/${MY_P}_src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-cpp/gtkmm-3.2.0:3.0
+	dev-libs/libunique:3
+	>=media-libs/libmpdclient-2.3
+	>=net-libs/libsoup-2.36
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	append-cxxflags -std=c++11
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/usr/doc/ || die
+	make_desktop_entry guimup Guimup
+}
diff --git a/media-sound/guimup/metadata.xml b/media-sound/guimup/metadata.xml
new file mode 100644
index 000000000000..abe4ad0055bf
--- /dev/null
+++ b/media-sound/guimup/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="sourceforge">musicpd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/hearnet/Manifest b/media-sound/hearnet/Manifest
new file mode 100644
index 000000000000..a17aaa62a923
--- /dev/null
+++ b/media-sound/hearnet/Manifest
@@ -0,0 +1,5 @@
+DIST hearnet-0.0.9.tar.gz 11164 SHA256 d9e9608d96501874c9b1b9eb51aab34e9dacbc3a7290190e0c9d0aef92b8705c SHA512 2bf1f8c8edc34327f5a3ec398b025a28af17a0fa674b96ed98a532b61b2d4723f16ccaa07df3aed15806aa24552e6dac2ce4451325ab8b1e632b3ee22fcfc912 WHIRLPOOL 670fa60352b730441ec63ebcc1d34374deac62cf44a9d70a329492baf8a7418c170a0e6c18d8982ca39dc66b13f2eb9b1abe3cd4a5db473bc8489ba1ea508bc9
+EBUILD hearnet-0.0.9.ebuild 740 SHA256 c072788522e5a633e6cf472806bec094bcc49083bd53766ddc129de50c728c55 SHA512 1ac9806d65d3cfb4a08fff1b64f43ca577cdce5bbd2ad80c8cf2c08b3b9a3d494c3b837731dd7a8562e8b0e94b073997def3ac833fab50080285f4a93b2b65be WHIRLPOOL adc449121ba3311eb0d8d9c78d7ab93455f61ed65076c494e3fcedf64afd1f57c6452ea504d9ed10d50cf0077d391bc7a3a49cb07af8fac5bd5c994204b8c72c
+MISC ChangeLog 2430 SHA256 3f895c53f32200329cc29a3ad677a8119cbd2983531cc0dec54b3e4dfd87addf SHA512 6effa1374b9d8ceb4b455f99fc635b37dae7f4f6cd6421353353109ec90e5c92c5789ba1ca19a7e6d5785a911d075505da01b2935dd4a863cf21ae70e911d3dc WHIRLPOOL 7da1781c5e29c1841a17e485d9c55383a97d9c74c81268b8baff7270d30743005b901970ce0d7844ba3a3fe19ce698f0e8047bf70ddde95acf4febb609626f53
+MISC ChangeLog-2015 1930 SHA256 ebbe44b059ed5784960d2c6ee5b6165febe982ae9dfbdf9631716bc9d4d57c36 SHA512 b6d004e9b6af8635e24396bc528337f68175dc1039a2551ec6ea32a76cbf8627ee1371399638e40433f25f116472387e34451217229248c44d88dca2c9ea0b66 WHIRLPOOL 1a2cb88dbdeaf188f51c82a526a91ae154ad4d3ccc17d6034da51945645cd7b8ed42786952ddc8aa7a137c4c18a8e3af4647cf15c8f5cea29e5d86aba687816d
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/hearnet/hearnet-0.0.9.ebuild b/media-sound/hearnet/hearnet-0.0.9.ebuild
new file mode 100644
index 000000000000..1dabcf9bf99b
--- /dev/null
+++ b/media-sound/hearnet/hearnet-0.0.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="Listen to your network"
+HOMEPAGE="http://falcon.fugal.net/~fugalh/hearnet"
+SRC_URI="http://falcon.fugal.net/~fugalh/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-amd64: 0.0.2: No sound sent to jack server
+KEYWORDS="-amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="net-libs/libpcap
+	media-sound/jack-audio-connection-kit"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} ${PN}.cpp -o \
+		${PN} $(pkg-config --libs jack) -lpcap || die "build failed."
+}
+
+src_install () {
+	dosbin ${PN}
+	insinto /usr/share/${PN}
+	doins grain.*
+	dodoc AUTHORS ChangeLog README TODO
+}
diff --git a/media-sound/hearnet/metadata.xml b/media-sound/hearnet/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/hearnet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/helm/Manifest b/media-sound/helm/Manifest
new file mode 100644
index 000000000000..a3b3c7ff8e1d
--- /dev/null
+++ b/media-sound/helm/Manifest
@@ -0,0 +1,5 @@
+AUX helm-0.4.1-gcc6.patch 991 SHA256 842d40b2ecc8d328cc886a243c3e87efc2e5e2a08cfc69e59dcd6f3a03b7f4d4 SHA512 71ff5a34942badc8b95e06e2cbe3f725a98a82cec6ed25df72e44ea3e3ebd17e8d48c8c48c19f5ee9b232dc987fb2f82d621eee30d8c68ee5dea40feb10f89b2 WHIRLPOOL d46ae88728993f6d3afcc5fd87771678da1c1814b59710f42ddae226c84697f26a90f579921a3cb2d32945ac2c58590e12301394f6cc7860cb76ffcb8fe0d922
+DIST helm-0.4.1.tar.gz 10170154 SHA256 00fa6b973b3e13d574a19dc009e07cbbcb7823476ffc59cc89e6816b7a70bd72 SHA512 093abfd47a7f3e25d168df675b8a9c067a361ae1891af208c75ec4bc02d8a30cc5de4ab2433179bcbb6074c142c8ef9b4ef11b1854fdde0551fcd340dd6b8fe0 WHIRLPOOL 6d7297b2e064d24252d11b415225e081cb2033230aba013e774198b66e6ca89196691ed8db61d9baa02e7cc09497af61462f36244668a8b3469828388f3c5d49
+EBUILD helm-0.4.1-r2.ebuild 848 SHA256 fa7c0f3ce26a38f9cb4de1e0c292122aa392eae9bc2a234877711d52a93bf6f1 SHA512 252f3b5d3c1b14f2ca8f70cdb61c4670fbb524e36a6f1b951b6f2f82e25762f764233b4a83932b1a7ced1460e06ee36361daa66405ca327cb6dfc7ee166e7fc5 WHIRLPOOL 1a9b63a3e54668b0fbe93317e46c912348260073f402aa7ad1ccd0634e788af6300c5158099246f277a672d6fae760ea7c7e53957a68d89c01496d8832c3d410
+MISC ChangeLog 1693 SHA256 76532f1037322f93ae853e0b1ecb6820fd0c7a1eacab0bd80e93bdcd6f126dfd SHA512 8dacff510d6b94646ef76ef31c8be95b4662b4b2f3eeb3314394eb8a254ee83ca6ef9ea34f76d348efafedc11bade79d4003919dcd1feba944682bc76f0506c2 WHIRLPOOL f5ee69bbb03bc950787fcb042da2e707beeffde2b34f18dc420a706ec4f299ee397b95d0bdfa5cd6957fbfe550f66cfde7342c2f09f9d94487ad3b837c73da78
+MISC metadata.xml 345 SHA256 a6c3ca5c6b235c5179732ef2fea958496c41039579bd3a9187b8866ea2f628a3 SHA512 108d91618be46a32b2c316336b1a109494a19882ca250d92a0c189093ebae632729bc67cb023370ae0fc7ff5f32d5d6bd32a2d64a985f1c66c7eeed1eec12176 WHIRLPOOL 57c3f8b331dbb2347c4a575d0bc4304de6c2269905ca7f76b40bcca22d85dc60fb04b61693c0ab71a0a0ac68b0ebdf89fcb8114ad23220ed2cb9ef04823ba765
diff --git a/media-sound/helm/files/helm-0.4.1-gcc6.patch b/media-sound/helm/files/helm-0.4.1-gcc6.patch
new file mode 100644
index 000000000000..d71587296b92
--- /dev/null
+++ b/media-sound/helm/files/helm-0.4.1-gcc6.patch
@@ -0,0 +1,24 @@
+From 9a94165d8c400e45d617bf2d7cb657a477f43915 Mon Sep 17 00:00:00 2001
+From: Hodorgasm <nsane457@gmail.com>
+Date: Tue, 20 Sep 2016 17:33:14 -0400
+Subject: [PATCH] Assume there exists lround if compiling with g++ in C++11 or
+ later
+
+GCC-6 doesn't define HAVE_LROUND, but lround is valid in C++ in dialects >= c++11.
+---
+ JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c b/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c
+index 87e2321e6..512b8279c 100644
+--- a/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c
++++ b/JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/lpc_flac.c
+@@ -50,7 +50,7 @@
+ 

+ #ifndef FLAC__INTEGER_ONLY_LIBRARY

+ 

+-#if !defined(HAVE_LROUND)

++#if (!defined(__GNUC__) && !defined(HAVE_LROUND)) || __cplusplus < 201103L

+ #if defined(_MSC_VER)

+ #include <float.h>

+ #define copysign _copysign

diff --git a/media-sound/helm/helm-0.4.1-r2.ebuild b/media-sound/helm/helm-0.4.1-r2.ebuild
new file mode 100644
index 000000000000..b4af77113631
--- /dev/null
+++ b/media-sound/helm/helm-0.4.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Open source polyphonic software synthesizer with lots of modulation"
+HOMEPAGE="http://tytel.org/helm/"
+SRC_URI="https://github.com/mtytel/helm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	media-libs/lv2
+	virtual/jack
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}"
+
+DOCS="README.md"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc6.patch
+	rm patches/Synth/.DS_Store || die
+	sed -e 's|/usr/lib/|/usr/'$(get_libdir)'/|' -i Makefile || die
+	epatch_user
+}
+
+src_compile() {
+	emake PREFIX=/usr all
+}
+
+src_install() {
+	default
+	make_desktop_entry /usr/bin/helm Helm /usr/share/helm/icons/helm_icon_32_1x.png
+}
diff --git a/media-sound/helm/metadata.xml b/media-sound/helm/metadata.xml
new file mode 100644
index 000000000000..ad30917b36ef
--- /dev/null
+++ b/media-sound/helm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">mtytel/helm</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
new file mode 100644
index 000000000000..debd118ae5aa
--- /dev/null
+++ b/media-sound/herrie/Manifest
@@ -0,0 +1,9 @@
+AUX herrie-2.2-fix-buildsystem.patch 1183 SHA256 c12f0a40f79226248f184730658f63a4b30eeb0dae449fd7a4cb3809e2d54a07 SHA512 474d9ed85589e6bb6f640389d76d035e506434a7ae8ce8e11fe620e4b27cbe124edae797ed34e0e06c80b3ad594f7420103e9e73ce1d3ac9297b7982c8144738 WHIRLPOOL 2d67cdb7950174e7d939e59c0dfd4e35458816d706db55d9f9af806ff8c453f811b369468833cbc499e74b54df8e34ba22ff3d7381c8d044c5a0884b1f07055e
+AUX herrie-2.2-libxspf.patch 3025 SHA256 9f1dc0aa6676a9b64620a442294a962e99b46ddd907aea03f043c26bc7dc9809 SHA512 35122f8a0f16c54085d0c4ce8f1acf409266618116bbb94a8cae2b35c8856270a023d16d3c863ed3c1d06ea1f89a8f1d3d29e244881fb50bfed72b5ca1960192 WHIRLPOOL 90ad5045eb389f9c4d2ab8f03068e0c7892233f38a0c8beb20cebfe1407ea69a6024d1301d0dfb82aaac450d717d7798ceebebe002133b430d95d0ead3e824cc
+AUX herrie-chost_issue.patch 547 SHA256 07371e7b5feff1f2b9a1cce1875be9def54c478084f2635a30bdcc8e6333f2f2 SHA512 09b0720ab8f94fef7533d7e16d2ef086aaad3d306487bca6e2f42d0fba96642ad9672f67183bd58542c3af06af643421be66e3c0afff43f023239d4602c13150 WHIRLPOOL 55c2cb42e9b873a406162dcbae8e5f4dea08ea8ef7a9802e7559493ffbdbf19320931768e093fc65e02dae94e227bdf610e4632b9ee874b988378a4e40906371
+DIST herrie-2.2.tar.bz2 71596 SHA256 142341072920f86b6eb570b8f13bf5fd87c06cf801543dc7d1a819e39eb9fb2b SHA512 7f89100f1c3376d03ebc5e5e3caadccb063470ab623c7b207e9e6aaa01d7e1885d4234e3a50675bc1ade07f5ab52a34022f4e18c9a5b4f9537baa7318f4ab213 WHIRLPOOL 78c2847bda36ccf8504d46621a6e1b25e17dca4ee3831311e0a4b76e1109e9ad91f86176c885bc945cc875f7d1a98567851358202a8630aa098f2d4e07434067
+EBUILD herrie-2.2-r1.ebuild 1959 SHA256 a2a62e680fbec640e5af669450589b9dd6a2cc2d4e25d021a6f7726afbc0dd09 SHA512 2f52a4d295b94026a84de2f06bd3d0acf12d335bccfdcd04e2a784dac8674c7a9a7a4371074978b250bb999e432d4137d8af201b24671035142594686ba16239 WHIRLPOOL c607a13b7bf2a1c26e51e85963c904edd84d1599111694b767a92b470e013eda0a70115c39696dbcea8ef9e27be1cb595fadf759b1a99204101dcd430f7426f1
+EBUILD herrie-2.2.ebuild 2207 SHA256 615e8b7263d20667848704af05178e8107b72d9adfbaf86409bb273bffd6c7ab SHA512 7838dafa3eb1807a9f8235ebbf4b0211b12134a2841651ac4927c44c214ef295bcbcda03364d971097cbcdcdf5cda382b761dbd7bbfa98eaf2330b7ed6442ccc WHIRLPOOL 7e07648695a24e2163349cdd7e6334f59db208dfffa76aa982fcbba85003865269d096ccb08d782f65a3aa538a858deffa667f10724f808c4336229621ea2c18
+MISC ChangeLog 2931 SHA256 da10dfb83cfcf2b4e961875916156f54b7e7f58c01917154c57d6a717ff9cd0b SHA512 70c8e5a32724606c9f932067d629a9bfc2e3b940cdd65ac2b52cce2532493fcb6100fda163e16060a3bc1907fd421c5e54809b06e4966b2e1fae90e1293e91c2 WHIRLPOOL 937114c6307f68494140da15e0fdc3a0f10ae5c7e007cba71e47ee0d82e40a3d7f801d6bef7fed81465f33a8ecb800ba5fe50fe8120a834dcf0e7e597e4cbd4d
+MISC ChangeLog-2015 5862 SHA256 02c0f525ead606865b9d69033f94472f123fbc9f854f877bf127eb11dc198759 SHA512 0bfde9c2e10987779368982396c1486fcfedad684f93eddd35488a1b1627da64f2e4b047d468109a95d0e4acf07079e5b1585e473aba035349a63125c1fed4b2 WHIRLPOOL 0aa4721d70fe6e0ef5caf75886ebe70c6bdb13e5f59d5ebd7852bd9a9e01c5cc11cbd103d10377ceca4a5b48dde61ff1cd4da991da08ed86bb330187d6fc4ade
+MISC metadata.xml 1068 SHA256 8801c1b89171145c281d474bd93a39f18503b8b3b0bcd36954b56e68a9f5af70 SHA512 d7e009ac1e52214dcf7340ce4755700ff5620e4e1217b005d531f08fbe7b633aeb3b8b27c66336af5515dbce5e94bf0e600435c5f911a8abfb98ae95258d5d0e WHIRLPOOL 4bfc6f3f3a440504872a141e7fceb1795bface6f3ce09986f7fbbe56799f51e399d3244669d342da01d98f71a03b1e666c012d442ccf1ee63afa0b35e8479bed
diff --git a/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch
new file mode 100644
index 000000000000..03a2c7397da8
--- /dev/null
+++ b/media-sound/herrie/files/herrie-2.2-fix-buildsystem.patch
@@ -0,0 +1,38 @@
+Fix ncurses underlinking by using the pkg-config output instead of assuming
+-lncurses/-lncursesw to be enough. In addition, fix wrong modplug include
+directive. See also:
+https://bugs.gentoo.org/show_bug.cgi?id=573522
+
+--- herrie-2.2/configure
++++ herrie-2.2/configure
+@@ -215,7 +215,7 @@
+ 	exit 1
+ fi
+ CFLAGS_main="-DAUDIO_OUTPUT=\\\"$CFG_AO\\\" -DCONFFILE=\\\"$CONFFILE\\\""
+-LDFLAGS="$LDFLAGS -L$PREFIX/lib -l$CFG_CURSES_LIB"
++LDFLAGS="$LDFLAGS -L$PREFIX/lib `pkg-config --libs $CFG_CURSES_LIB`"
+ SRCS="audio_file audio_output_$CFG_AO config gui_browser gui_draw \
+     gui_input gui_msgbar gui_playq gui_vfslist main playq playq_party \
+     playq_xmms vfs vfs_playlist vfs_regular"
+--- herrie-2.2/src/audio_format_modplug.c
++++ herrie-2.2/src/audio_format_modplug.c
+@@ -31,7 +31,7 @@
+ #include "stdinc.h"
+ 
+ #include <sys/mman.h>
+-#include <modplug.h>
++#include <libmodplug/modplug.h>
+ 
+ #include "audio_file.h"
+ #include "audio_format.h"
+--- herrie-2.2/src/main.c
++++ herrie-2.2/src/main.c
+@@ -165,7 +165,7 @@
+ #endif /* CLOSE_STDERR */
+ 	if ((errmsg = vfs_lockup()) != NULL) {
+ 		gui_draw_init_abort();
+-		g_printerr(errmsg);
++		g_printerr("%s", errmsg);
+ 		return (1);
+ 	}
+ 
diff --git a/media-sound/herrie/files/herrie-2.2-libxspf.patch b/media-sound/herrie/files/herrie-2.2-libxspf.patch
new file mode 100644
index 000000000000..fa7cb7a4fcbb
--- /dev/null
+++ b/media-sound/herrie/files/herrie-2.2-libxspf.patch
@@ -0,0 +1,122 @@
+--- herrie-2.2/configure
++++ herrie-2.2/configure
+@@ -301,7 +301,7 @@ fi
+ if [ "$CFG_XSPF" != "" ]
+ then
+ 	CFLAGS="$CFLAGS -DBUILD_XSPF"
+-	LDFLAGS="$LDFLAGS -lspiff"
++	test_pkgconfig "libxspf" "xspf" "_vfs_xspf"
+ 	SRCS="$SRCS util vfs_xspf"
+ 	PLAYQ_DUMPFILE="autosave.xspf"
+ else
+--- herrie-2.2/src/conftest.c
++++ herrie-2.2/src/conftest.c
+@@ -56,16 +56,10 @@
+ #include <vorbis/codec.h>
+ #include <vorbis/vorbisfile.h>
+ #endif /* BUILD_VORBIS */
+-#ifdef BUILD_XSPF
+-#include <spiff/spiff_c.h>
+-#endif /* BUILD_XSPF */
+ 
+ int
+ main(int argc, char *argv[])
+ {
+-#ifdef BUILD_XSPF
+-	spiff_write(NULL, NULL, NULL);
+-#endif /* BUILD_XSPF */
+ 
+ 	return (0);
+ }
+--- herrie-2.2/src/vfs_xspf.c
++++ herrie-2.2/src/vfs_xspf.c
+@@ -30,7 +30,7 @@
+ 
+ #include "stdinc.h"
+ 
+-#include <spiff/spiff_c.h>
++#include <xspf_c.h>
+ 
+ #include "util.h"
+ #include "vfs.h"
+@@ -50,22 +50,22 @@ vfs_xspf_match(struct vfsent *ve, int isdir)
+ int
+ vfs_xspf_populate(struct vfsent *ve)
+ {
+-	struct spiff_list *slist;
+-	struct spiff_track *strack;
+-	struct spiff_mvalue *sloc;
++	struct xspf_list *slist;
++	struct xspf_track *strack;
++	struct xspf_mvalue *sloc;
+ 	char *dirname, *baseuri, *filename;
+ 	struct vfsref *vr;
+ 
+ 	baseuri = url_escape(ve->filename);
+-	slist = spiff_parse(ve->filename, baseuri);
++	slist = xspf_parse(ve->filename, baseuri);
+ 	g_free(baseuri);
+ 	if (slist == NULL)
+ 		return (-1);
+ 
+ 	dirname = g_path_get_dirname(ve->filename);
+ 
+-	SPIFF_LIST_FOREACH_TRACK(slist, strack) {
+-		SPIFF_TRACK_FOREACH_LOCATION(strack, sloc) {
++	XSPF_LIST_FOREACH_TRACK(slist, strack) {
++		XSPF_TRACK_FOREACH_LOCATION(strack, sloc) {
+ 			/* Skip file:// part */
+ 			filename = url_unescape(sloc->value);
+ 
+@@ -77,40 +77,40 @@ vfs_xspf_populate(struct vfsent *ve)
+ 	}
+ 	
+ 	g_free(dirname);
+-	spiff_free(slist);
++	xspf_free(slist);
+ 	return (0);
+ }
+ 
+ int
+ vfs_xspf_write(const struct vfslist *vl, const char *filename)
+ {
+-	struct spiff_list *list;
+-	struct spiff_track *track;
+-	struct spiff_mvalue *location;
++	struct xspf_list *list;
++	struct xspf_track *track;
++	struct xspf_mvalue *location;
+ 	char *fn, *baseuri;
+ 	struct vfsref *vr;
+ 	int ret;
+ 
+-	list = spiff_new();
++	list = xspf_new();
+ 
+ 	VFS_LIST_FOREACH_REVERSE(vl, vr) {
+ 		/* Add a new track to the beginning of the list */
+-		track = spiff_new_track_before(&list->tracks);
++		track = xspf_new_track_before(&list->tracks);
+ 
+ 		/* Make sure we don't write non-UTF-8 titles to disk */
+ 		if (g_utf8_validate(vfs_name(vr), -1, NULL))
+-			spiff_setvalue(&track->title, vfs_name(vr));
++			xspf_setvalue(&track->title, vfs_name(vr));
+ 
+-		location = spiff_new_mvalue_before(&track->locations);
++		location = xspf_new_mvalue_before(&track->locations);
+ 		fn = url_escape(vfs_filename(vr));
+-		spiff_setvalue(&location->value, fn);
++		xspf_setvalue(&location->value, fn);
+ 		g_free(fn);
+ 	}
+ 
+ 	baseuri = url_escape(filename);
+-	ret = spiff_write(list, filename, baseuri);
++	ret = xspf_write(list, filename, baseuri);
+ 	g_free(baseuri);
+-	spiff_free(list);
++	xspf_free(list);
+ 
+ 	return (ret);
+ }
diff --git a/media-sound/herrie/files/herrie-chost_issue.patch b/media-sound/herrie/files/herrie-chost_issue.patch
new file mode 100644
index 000000000000..1949972baa6a
--- /dev/null
+++ b/media-sound/herrie/files/herrie-chost_issue.patch
@@ -0,0 +1,29 @@
+This patch sets the OS variable according to the CHOST given by the environment,
+thus enabling cross-compilation.
+
+Index: herrie-1.8/configure
+===================================================================
+--- herrie-1.8.orig/configure
++++ herrie-1.8/configure
+@@ -50,6 +50,21 @@ CFG_VORBIS=yes
+ CFG_XSPF=yes
+ DOIT=@
+ 
++case "$CHOST" in
++  *-darwin*)
++	OS=Darwin
++	;;
++  *-linux*)
++	OS=Linux
++	;;
++  *-freebsd*)
++	OS=FreeBSD
++	;;
++  *-solaris*)
++	OS=SunOS
++	;;
++esac
++
+ # Operating system defaults
+ [ "$OS" != "" ] || OS=`uname`
+ case $OS in
diff --git a/media-sound/herrie/herrie-2.2-r1.ebuild b/media-sound/herrie/herrie-2.2-r1.ebuild
new file mode 100644
index 000000000000..c745c0dd24c9
--- /dev/null
+++ b/media-sound/herrie/herrie-2.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Herrie is a command line music player"
+HOMEPAGE="http://herrie.info/"
+SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
+APP_LINGUAS="ca da de es fi ga nl pl pt_BR ru sv tr vi zh_CN"
+for X in ${APP_LINGUAS}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+REQUIRED_USE="|| ( ao alsa pulseaudio oss )"
+
+RDEPEND="sys-libs/ncurses:0=[unicode?]
+	>=dev-libs/glib-2:2
+	ao? ( media-libs/libao )
+	alsa? ( media-libs/alsa-lib )
+	http? ( net-misc/curl )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad
+		media-libs/libid3tag )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( media-libs/libsndfile )
+	vorbis? ( media-libs/libvorbis )
+	xspf? ( >=media-libs/libxspf-1.2 )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-chost_issue.patch"
+	"${FILESDIR}/${P}-libxspf.patch"
+	"${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_configure() {
+	local EXTRA_CONF="verbose no_strip"
+	use ao && EXTRA_CONF="${EXTRA_CONF} ao"
+	use alsa && EXTRA_CONF="${EXTRA_CONF} alsa"
+	use http || EXTRA_CONF="${EXTRA_CONF} no_http no_scrobbler"
+	use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3"
+	use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug"
+	use nls || EXTRA_CONF="${EXTRA_CONF} no_nls"
+	use oss && EXTRA_CONF="${EXTRA_CONF} oss"
+	use pulseaudio && EXTRA_CONF="${EXTRA_CONF} pulse"
+	use sndfile || EXTRA_CONF="${EXTRA_CONF} no_sndfile"
+	use unicode || EXTRA_CONF="${EXTRA_CONF} ncurses"
+	use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis"
+	use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf"
+
+	einfo "./configure ${EXTRA_CONF}"
+	CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \
+		./configure ${EXTRA_CONF} || die "configure failed"
+}
diff --git a/media-sound/herrie/herrie-2.2.ebuild b/media-sound/herrie/herrie-2.2.ebuild
new file mode 100644
index 000000000000..8e02ca647f7f
--- /dev/null
+++ b/media-sound/herrie/herrie-2.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Herrie is a command line music player"
+HOMEPAGE="http://herrie.info/"
+SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="ao alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls"
+
+APP_LINGUAS="ca da de es fi ga nl pl pt_BR ru sv tr vi zh_CN"
+for X in ${APP_LINGUAS}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="sys-libs/ncurses[unicode?]
+	>=dev-libs/glib-2:2
+	ao? ( media-libs/libao )
+	alsa? ( media-libs/alsa-lib )
+	http? ( net-misc/curl )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad
+		media-libs/libid3tag )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( media-libs/libsndfile )
+	vorbis? ( media-libs/libvorbis )
+	xspf? ( >=media-libs/libxspf-1.2 )
+	!ao? ( !alsa? ( !pulseaudio? ( !oss? ( media-libs/alsa-lib ) ) ) )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-chost_issue.patch \
+		"${FILESDIR}"/${P}-libxspf.patch
+}
+
+src_configure() {
+	if ! use ao && ! use alsa && ! use pulseaudio && ! use oss; then
+		ewarn "No audio output selected (ao, alsa, pulseaudio, oss), defaulting to alsa."
+	fi
+
+	local EXTRA_CONF="verbose no_strip"
+	use ao && EXTRA_CONF="${EXTRA_CONF} ao"
+	use alsa && EXTRA_CONF="${EXTRA_CONF} alsa"
+	use http || EXTRA_CONF="${EXTRA_CONF} no_http no_scrobbler"
+	use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3"
+	use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug"
+	use nls || EXTRA_CONF="${EXTRA_CONF} no_nls"
+	use oss && EXTRA_CONF="${EXTRA_CONF} oss"
+	use pulseaudio && EXTRA_CONF="${EXTRA_CONF} pulse"
+	use sndfile || EXTRA_CONF="${EXTRA_CONF} no_sndfile"
+	use unicode || EXTRA_CONF="${EXTRA_CONF} ncurses"
+	use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis"
+	use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf"
+
+	einfo "./configure ${EXTRA_CONF}"
+	CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \
+		./configure ${EXTRA_CONF} || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog README
+}
diff --git a/media-sound/herrie/metadata.xml b/media-sound/herrie/metadata.xml
new file mode 100644
index 000000000000..1f60fffd9530
--- /dev/null
+++ b/media-sound/herrie/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <longdescription lang="en">
+		Herrie is a minimalistic music player that uses the command
+		line. It is written to support a variety of operating systems,
+		audio subsystems and file formats, including playlists.
+
+		Herrie has a split-screen user interface, with a playlist at
+		the top of the screen and a file browser at the bottom. When
+		tracks are added to the playlist, Herrie consumes them from the
+		top one by one. It is thus an application that allows you to
+		batch music for playback.
+
+		Herrie also has some more exotic features, including support
+		for AudioScrobbler and the ability to chroot() itself
+		into a directory.
+	</longdescription>
+  <use>
+    <flag name="http">Enable http streaming</flag>
+    <flag name="xspf">Enable support for reading and saving XSPF playlists</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/horgand/Manifest b/media-sound/horgand/Manifest
new file mode 100644
index 000000000000..b42df8c84950
--- /dev/null
+++ b/media-sound/horgand/Manifest
@@ -0,0 +1,6 @@
+AUX horgand-1.14-overflow.patch 235 SHA256 af59be3b3d0769a2f5d51bb2e895f6fa9571226fac2b299f01c2397043d0829c SHA512 d7506c99e01a3f82d3424f368764208e3bd9638c1ffe493cdc9c69a7037164ff9c3a8787fb151fa6395001bdbfd0fabcd9c46118e10b14fe4e2d542894de6807 WHIRLPOOL 16ac92e7dd0e41c4556866f3e957d4db4c4e179105381ca3f6a978e6109f2b0981f1ae019ccce0233c0097ea9617aa4468e62c62d2e3b6f0e8e2990ba8c192be
+DIST horgand-1.14.tar.gz 2531734 SHA256 836b3a8608953bb3bb37151947eb6236c557a9efde10e4bae1ecad46fc325e8e SHA512 d67a51972d2ddf3044cadfd40e298da6282c05de23faed98589602110a142728c45dd9d0f8cbc9c9a3b488a4e32d08a69ae36e7d94ea287e0880682eee066360 WHIRLPOOL 59b8462c60fddcda69973f311e81a1a810dc28415eae7b684bdb9ea6ffe9445b95ffae83f112adcfbde8118c64ea346c19808fac95934ba39607d93586e22917
+EBUILD horgand-1.14.ebuild 1017 SHA256 4ea1cdb5d31785c044061824fd1a063d95835532fe008fb792a432d6fcf56211 SHA512 18865483352d28eb58ca38219aa4eafc586f25967aad0b5cd4632a465c832408cef4eeeb1c35fd388fd69cbbfa5081ada5a087097224f0982731836a42253267 WHIRLPOOL 9b49c5d34fbf7e534a0778807426bb953920d047dc0efe5ea7603335e0f6e25192ef8b29ba3732be5b5c5e51ea53cb42996e954288db89cf6fae2af8955884af
+MISC ChangeLog 2805 SHA256 689d25552141064b4acdfbd37dd7ef5c711cef1050e26b76dd8dd7fed06619f1 SHA512 84720744d96bb8419d1bf7b05fcd83cd03e8d4c1dd2783984dfde986ec5966b20609c07b996b9fbccc208b58bbfc7e5b8ea4036fc5ff4f9f4047b1c85e18fc63 WHIRLPOOL 628f612195f738af5e5f27542b8c89a671d2cdcf69fd7765cda84030c632cc1c9a789ba48883fdb9c87f2edcea97cfd211ca836e7a541c40e2073cb6256f898e
+MISC ChangeLog-2015 3396 SHA256 a57b1dfda533acb5454516d80e25f893476b62bdd6c78419a2c1c7aac7c7f3f2 SHA512 2902439dfa76e71508ffe77c72721c7ff09a38e2c800c206f2e69b2ec1adbb8c7de6238e55d70faa780b2384bed2e1af1f218efeddd2b724d6e55263434a2fd1 WHIRLPOOL fa0c44a094f50b9a7b33ee2b59e44bad7e60c4075d5f9a74a74821bbd2301b557389f471393c5007af0ad0b23a5fc6b03c6060565faeedbc601f50b500ebbb6d
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/horgand/files/horgand-1.14-overflow.patch b/media-sound/horgand/files/horgand-1.14-overflow.patch
new file mode 100644
index 000000000000..05e359b7c8d9
--- /dev/null
+++ b/media-sound/horgand/files/horgand-1.14-overflow.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Holrgan.h b/src/Holrgan.h
+index 1b93042..f8e9209 100644
+--- a/src/Holrgan.h
++++ b/src/Holrgan.h
+@@ -398,7 +398,7 @@ struct Ch3
+ struct Ch4
+ 
+ {
+-  char Nom[10];
++  char Nom[12];
+   int type;
+   int fund;
+   int dist1;
diff --git a/media-sound/horgand/horgand-1.14.ebuild b/media-sound/horgand/horgand-1.14.ebuild
new file mode 100644
index 000000000000..11769b0c9231
--- /dev/null
+++ b/media-sound/horgand/horgand-1.14.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Opensource software organ"
+HOMEPAGE="http://horgand.berlios.de"
+#SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/fltk:1
+	x11-libs/libXpm
+	media-libs/libsndfile
+	media-libs/alsa-lib
+	media-sound/alsa-utils
+	media-sound/jack-audio-connection-kit"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-overflow.patch
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags) \
+		$(pkg-config --cflags jack) $(pkg-config --cflags sndfile)" || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README
+	doman man/${PN}.1
+	newicon src/${PN}128.xpm ${PN}.xpm
+	make_desktop_entry ${PN} Horgand ${PN}
+}
diff --git a/media-sound/horgand/metadata.xml b/media-sound/horgand/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/horgand/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
new file mode 100644
index 000000000000..0ba1dc3edf8f
--- /dev/null
+++ b/media-sound/hydrogen/Manifest
@@ -0,0 +1,8 @@
+AUX hydrogen-0.9.5-gcc47.patch 761 SHA256 c7959b7fc9080a54184badd0bfc9aed579f2d0680059f415d0a9f56afaae8833 SHA512 ff3a06fbafdce19bf04f9fb71c04ff754e22caa36148a0f5e4a56efc53ce9b9478e9f1aeacdcc037234104762d9fce208aef351c70941b044e2d83bac4131304 WHIRLPOOL 08c21cc8e17c7818bbf0c2551c03808e11c463f9ab65bda570173c42ddff631db67d00ea1b62df311f57da5a6c463a6ce0ddf328ed55331aa5f05c1e3717bac2
+AUX hydrogen-0.9.5-gcc6.patch 609 SHA256 127b87cf8e76bf5726ca1d49db7e87f6813009717bddf7f4d3c10775b28543be SHA512 0078c02e9cb2de557825cd6119ccfb6247f171ccc4a53ea93241891850c82f0924e9e0a4740764d13f1deefcb5e9469137e5d4a69c2bfceedeae8fb110deea8f WHIRLPOOL a7da027fc4f6f3df49e7071633377b9569459b634355b9e15b95df12de9a3b7c136f3757e13de6e6e34aac016c8cb5872db500cd30f45a487ea573efae7fede2
+AUX hydrogen-0.9.5-use_lrdf_pkgconfig.patch 858 SHA256 829b68fcc3f982463bbef09bbd7c1efd45b48f4e1da709c96146b05fe5c9e5a7 SHA512 251a74287370f66df9eeecd3b6c7963c2614cf6b17a56fc71dc9f99077c3267a2e79469e2993ae22d017ea7f6cc7c581455c97c125e3be73860321112a67fd31 WHIRLPOOL de87409c530f8a3ce2ef959d43e46bb6462e7310660532be83d85b94ac4ab1dac50daf355d3a301923cc0ac3c4df0e691312640dcdf270ca9d03f23744db8cd5
+DIST hydrogen-0.9.5.tar.gz 5239702 SHA256 963c73ef911ec9e7589e502d17df3b794dd027d7e99a36b5115a0bb51389d9c3 SHA512 0053f0cb301c541326b66eb416dc548561a973ade993c055e7bc2acbdf28732e627a605061c8b487644026510f5b8395946bba209ddfd19230c960e9bb619f97 WHIRLPOOL 326a6716b150103fd0f40e5277d775875083a255cbea8c34fd0392dde2642410c7830c55c1bba0f62322c2f0fc68f5ca85dfe3fd6a8231223112ad89e3709c9f
+EBUILD hydrogen-0.9.5-r1.ebuild 1816 SHA256 853d794feae3e128e9f05f5243a711d394969c13be1b7628249b116b38cab567 SHA512 0bd6ded8debf0915399c1dcc56537730d3c8a8b219262223d567f2240f3019de5675196102da55840c039ab30814ef27ec1f7b1c4313e537e07970e353956b86 WHIRLPOOL d552dcd786e750b52aa0b88a1bf7ac58fae72a91956343c30af80d9de318da565d65dbf58e1c3c9be0bd755479306a910b3abaeced2486505740e8f41894075c
+MISC ChangeLog 2520 SHA256 cdab883cd8843ad2774a07397a877244a9341fa809bc7394f105ae6a11ec9afe SHA512 16d805b8d4e527825da71fd5c78fdfed630a1170857766e1748f7f38dbd0b5d7b03c566ddc656279967ac11cea7a3041e4402c7884fd7374edd763bf88ee23b1 WHIRLPOOL 530398df96b3f5a634e6486cf0553bbe084888c977fb1fbfdd2fdcdcccf4e28eff25f765b2026477e6091ef0aa615474f825e7f8aa3b152a685142da61b4f813
+MISC ChangeLog-2015 15712 SHA256 4a073d39583cb318572e8cfe1ff65e0ac0a438a84ed17b8d4abf635fc0105a45 SHA512 e4bc639050faf8ec0af2215ba1f13681aab2b80f3d514b5f8c6902464b39d420db5f34b78829b666d596f707f55a256547981f88418e659cc69d0e8dc07b237c WHIRLPOOL 664dd770a79b0b496d3c1077cb365f19ca6a679faa162cd4e1e8510263a2083855837b6f25eb4665a3d41c6b2918e6cea2ca6126bf4e8a10132f3a842c1d48b3
+MISC metadata.xml 429 SHA256 3037e2cb2b6da492f85ce2466d948af8cd103802fb2bf1349fe2b9e442a0b1f3 SHA512 a57c6e234c6e735bc5eb4fbe19218773a0ffe3d741eafdbbc87394552173bb512c0164e23e7c919f4927a82b549b5f60bcbb55cb2396dc77f795c028e9fd6777 WHIRLPOOL 0cd7073589e27d6bdd3362f0939c3c1d1c42b64245f49294d52022e61a5350f98142ee3d97a5c085af94a77b62a3238765ef45f224ef711c10b14f0c7e66633b
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch
new file mode 100644
index 000000000000..3ea43e36e3cd
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc47.patch
@@ -0,0 +1,27 @@
+Build with gcc 4.7
+https://bugs.gentoo.org/show_bug.cgi?id=421913
+
+Index: hydrogen-0.9.5/gui/src/MainForm.cpp
+===================================================================
+--- hydrogen-0.9.5.orig/gui/src/MainForm.cpp
++++ hydrogen-0.9.5/gui/src/MainForm.cpp
+@@ -70,6 +70,7 @@ using namespace H2Core;
+ 
+ #include <memory>
+ #include <cassert>
++#include <unistd.h>
+ 
+ using namespace std;
+ using namespace H2Core;
+Index: hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp
+===================================================================
+--- hydrogen-0.9.5.orig/gui/src/SongEditor/SongEditor.cpp
++++ hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <assert.h>
++#include <unistd.h>
+ #include <algorithm>
+ #include <memory>
+ 
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
new file mode 100644
index 000000000000..586e82af22a1
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-gcc6.patch
@@ -0,0 +1,12 @@
+diff -ruN hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp
+--- hydrogen-0.9.5.orig/libs/hydrogen/src/local_file_mgr.cpp	2011-01-29 00:33:23.000000000 +0100
++++ hydrogen-0.9.5/libs/hydrogen/src/local_file_mgr.cpp	2017-09-26 20:07:31.128723252 +0200
+@@ -980,7 +980,7 @@
+ 	
+ 	std::string playlistInfoFile = patternname;
+ 	std::ifstream verify( playlistInfoFile.c_str() , std::ios::in | std::ios::binary );
+-	if ( verify == NULL ) {
++	if ( !verify ) {
+ 		//ERRORLOG( "Load Playlist: Data file " + playlistInfoFile + " not found." );
+ 		return NULL;
+ 	}
diff --git a/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch b/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch
new file mode 100644
index 000000000000..6c862eac5836
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-0.9.5-use_lrdf_pkgconfig.patch
@@ -0,0 +1,23 @@
+conf.CheckCHeader lrdf.h check fails because of missing -I/usr/include/raptor2, use pkg-config instead
+
+--- Sconstruct
++++ Sconstruct
+@@ -268,7 +268,8 @@
+ 		env.Append( LIBPATH = 'C:\Program Files\GnuWin32\lib' )
+ 		env.Append( LIBS = [ "pthread" ] )
+ 	
+-        if str(env['lrdf']) == "1": env.Append( LIBS = ["lrdf"] )
++        if str(env['lrdf']) == "1":
++		env.ParseConfig('pkg-config --cflags --libs lrdf')
+ 	if str(env['jack']) == "1": env.Append( LIBS = ["jack"])
+ 	if str(env['alsa']) == "1": env.Append( LIBS = ["asound"])
+ 	if str(env['libarchive']) == "1": env.Append( LIBS = ["archive"])
+@@ -449,7 +450,7 @@
+    Exit(1)
+ 
+ #lrdf: categorizing of ladspa effects
+-if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'):
++if str(env['lrdf']) == "1" and not conf.CheckPKG('lrdf >= 0.4.0'):
+     print 'lrdf must be installed!'
+     Exit(1)
+ 
diff --git a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..0a19547038c7
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="alsa +archive jack ladspa lash oss portaudio"
+
+RDEPEND="dev-qt/qtgui:4 dev-qt/qtcore:4
+	archive? ( app-arch/libarchive )
+	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	>=media-libs/libsndfile-1.0.18
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lash? ( media-sound/lash )
+	portaudio? ( >=media-libs/portaudio-19_pre )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/scons"
+
+src_prepare() {
+	sed -i -e '/cppflags +=/d' Sconstruct || die
+	epatch \
+		patches/portaudio.patch \
+		"${FILESDIR}"/${P}-use_lrdf_pkgconfig.patch \
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-gcc6.patch
+}
+
+src_compile() {
+	# FIXME: The -I/usr/include/raptor2 gets lost in middle of build
+	# despite -use_lrdf_pkgconfig.patch
+	use ladspa && append-flags $($(tc-getPKG_CONFIG) --cflags lrdf)
+
+	export QTDIR="/usr/$(get_libdir)"
+	local myconf='portmidi=0' #90614
+
+	use alsa || myconf+=' alsa=0'
+	use archive && myconf+=' libarchive=1'
+	use jack || myconf+=' jack=0'
+	use ladspa || myconf+=' lrdf=0'
+	use lash && myconf+=' lash=1'
+	use oss || myconf+=' oss=0'
+	use portaudio && myconf+=' portaudio=1'
+
+	scons \
+		prefix=/usr \
+		DESTDIR="${D}" \
+		optflags="${CXXFLAGS}" \
+		${myconf} || die
+}
+
+src_install() {
+	dobin hydrogen
+	insinto /usr/share/hydrogen
+	doins -r data
+	doicon data/img/gray/h2-icon.svg
+	domenu hydrogen.desktop
+	dosym /usr/share/hydrogen/data/doc /usr/share/doc/${PF}/html
+	dodoc AUTHORS ChangeLog README.txt
+}
diff --git a/media-sound/hydrogen/metadata.xml b/media-sound/hydrogen/metadata.xml
new file mode 100644
index 000000000000..3881dc28c758
--- /dev/null
+++ b/media-sound/hydrogen/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <use>
+    <flag name="archive">Use libarchive instead of libtar</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">hydrogen</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/icecream/Manifest b/media-sound/icecream/Manifest
new file mode 100644
index 000000000000..c086cf26008e
--- /dev/null
+++ b/media-sound/icecream/Manifest
@@ -0,0 +1,5 @@
+DIST icecream-1.3.tar.gz 17976 SHA256 2d687cc81990ff703ecfe595fefd8dfd1ce187b50fbd974e60d6234124e6e9ff SHA512 d239cc616d57839c8f68ad22c6ce0bc5f5ab614da104e03ab9a0b76caa74ef72f3af202cf780e5b893c4111f3f1efd813311b4cdd4f6f7f0722c2b648add5624 WHIRLPOOL 0b4a35b5ef4b116ddb27c1e6cb18402d4c2208bbf83d393dec196382fcf0711252e94d507e5464d6253063d7b2218d2639883e01bbdba7e7de16e22077545032
+EBUILD icecream-1.3.ebuild 461 SHA256 c582f3eb017551e68ff43a04db3e764e0fb84f8fae42a1950594603ed08d895b SHA512 1c99273b7c13f605deb9a7a8b9b3ac75fa76cc8d9c081370d50217dacdb697dece3133867180ece68cfdd8d86de0773a108cfe58ef339fe7366034c27ee8ca22 WHIRLPOOL cbd6ea20577e001157156379b075fe04e016c4bd916086942030ec68dc54d67083f6c73d1a9774ac7332e98d4caa83602b494f525851fa8a3382c3aeb562272d
+MISC ChangeLog 2429 SHA256 f894535e67d1e5a60c9e5f60035ca2ee3bf182f39e6db46e129c7539b3f35758 SHA512 5f794a185795f466e2c3b5da69c3ac840824a3130e8190261bb97bebb5216885fd1a1575eeb556bc05d28e73c0c0e3d90cf1525402885fcca372b945bf4991ce WHIRLPOOL b9b30d06e8e89f764a8d00ec56e6d7086a246589b6d71b0326b882e66155aa3aaf7fa9d5605793d7b1865660d6b30d5c11fa19a2960fd2013bd6a2438f1a3d55
+MISC ChangeLog-2015 1899 SHA256 624778c3cf28a6ca470d4ed696361fb6a2a8becf9f80fb85adc4232a79aa76e5 SHA512 963db9a9eb5e9183b9a5f5990608505d0e682b53a56da66c4802ab861be13681c2af46550d98aefd5a2bbbf618e7f39a87f3902b861dc0ad177fb243324a0475 WHIRLPOOL b5c3c1c32707ddc907224927bfcc84bda5220d2f05d61ae98027929c0973f499c4151be09391eb741b2a9e33722b9b4cfacd46ee5e9d05d11ecf7e0864713d81
+MISC metadata.xml 331 SHA256 b5a3f28a08b86335da3a527b83cb6b7a613de8bd1c464dc04957476c13dbb3b6 SHA512 37881b7efe81d61d47e2b397d99ced6b746c34b3834c1dc193280b8312ea7d52f45e5bc1e6f9f395a3bd05b436e90f8a3cc6944a8d571d7a37694304ba3d83cf WHIRLPOOL 84efc6a1a0a49a3c04fe5e08cedbdca56419c13aaa49c683821fd6eec1fc02cd81689575a0934fc788e3530d634261bc5034ce260d32cf7e10fbbcd1c3549013
diff --git a/media-sound/icecream/icecream-1.3.ebuild b/media-sound/icecream/icecream-1.3.ebuild
new file mode 100644
index 000000000000..6c0fabb18a23
--- /dev/null
+++ b/media-sound/icecream/icecream-1.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Extracts and records individual MP3 tracks from shoutcast streams"
+HOMEPAGE="http://icecream.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND=""
+
+src_install() {
+	dobin ${PN} || die "dobin failed"
+	doman ${PN}.1
+	dodoc Changelog
+}
diff --git a/media-sound/icecream/metadata.xml b/media-sound/icecream/metadata.xml
new file mode 100644
index 000000000000..7bb6d0d92a1a
--- /dev/null
+++ b/media-sound/icecream/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">icecream</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/id3/Manifest b/media-sound/id3/Manifest
new file mode 100644
index 000000000000..427731bd3601
--- /dev/null
+++ b/media-sound/id3/Manifest
@@ -0,0 +1,5 @@
+DIST id3_0.15.orig.tar.gz 12871 SHA256 2979c59f93ff3cfadf68d1785fbc62a21f1c296f4a44072a320f126841936c5d SHA512 b99f3608fc5494863ddf71b5d15505ea952453777090deb82ea469c1c8ed8cc794907d2fffcd4c5a0aaf6ede260103cd9e720e06244877934b22dfa88e1f2cd0 WHIRLPOOL 06591b7c6624b653c8b38bad296a974cb00b19f45a318f4484cc69e21a8929d947193308c16ccc241566e5a349255c9d54454c473e99217f59f1565481118ab0
+EBUILD id3-0.15.ebuild 628 SHA256 cea513ae5faf91c88038e3d5eec61afd36e2b1df69ff958efe9198ec27f238b2 SHA512 b367535ef641d4811bc8a3f9a1e272a7478f5611b124e1c06242059e361dba09d60c64f91170ee3e3b2cdec88882a3129ed5590f6d7b08f0629551d10a07698c WHIRLPOOL 01a0ed446464dd1f409cfe78e7e00d56637c5cc618fffb873c891c4d6d835f62b928c3153e2f128ad541e1581d26cb8110081c1f3ffa7f0beffd62a8dd7ab7e5
+MISC ChangeLog 2416 SHA256 728d58625ddf534ad56e4d40585d30f0c055f2c02d07d32e0346f9013bdf976e SHA512 cbe47b04944bd0f4bfd455d8bf85a51d9900bc8836d13d813af4efbce214bc4a600438bac9c1aa39c7a861389a80a9f5f34bbde285c031ec14b562606ba523b2 WHIRLPOOL 4d0a5a802d3422f3a77c784076d9dc6401b9432685e1e53b864174b02255108daee4ada7b85db4c964d954f6c419f2a04e5bef5972ea5672853c48564fa1ca01
+MISC ChangeLog-2015 1926 SHA256 d97f5ef9ed52b2fe8a3f7c58e7e794246ceeab60e949df61cbbe1a83ff66eeba SHA512 d720ed8ac26e9324b6209187b2e0288bb0c8c0fdbbb714133c9a31262c90dc57c05f878492e18f55427537fbb4ef49643fd742bbad6e912e2274c7917ed53b8d WHIRLPOOL c75fa440616e1fa1085490186c3fab59061e46be3d52b4ede7ba913da97d62f8eb7ce053b2ae95c019a2d84c5efa7c1d3adf9134c1273dc7d4d377628a6bf2c6
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/id3/id3-0.15.ebuild b/media-sound/id3/id3-0.15.ebuild
new file mode 100644
index 000000000000..0d2e7d2790f5
--- /dev/null
+++ b/media-sound/id3/id3-0.15.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="changes the id3 tag in an mp3 file"
+HOMEPAGE="http://lly.org/~rcw/abcde/page"
+SRC_URI="http://lly.org/~rcw/id3/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "s:-s::" Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc README
+}
diff --git a/media-sound/id3/metadata.xml b/media-sound/id3/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/id3/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/id3ed/Manifest b/media-sound/id3ed/Manifest
new file mode 100644
index 000000000000..7e7c3be84e52
--- /dev/null
+++ b/media-sound/id3ed/Manifest
@@ -0,0 +1,5 @@
+DIST id3ed-1.10.4.tar.gz 31610 SHA256 56f26dfde7b6357c5ad22644c2a379f25fce82a200264b5d4ce62f2468d8431b SHA512 c96716dd24e8fc0aafbb5f0befe1a401ff7ed13821c71470945a5251a553316d17d5eeca3df5d3bd9775d12386078ab2b88d47a7ab9e9f32cd3d209934e31d56 WHIRLPOOL 4d1348a77ca03dc9ba9dac07a365d6abe1f3703fc144b5a0977ed385242e7752cfc7031e0c83861ba6ad08ae53e5597d59d45d13bdf34ec9ed00d71fd25ab8ce
+EBUILD id3ed-1.10.4.ebuild 757 SHA256 61703a9fa3bc3b2eb00f3280c6149374437d2e98e69965c52ec40e7fd7ffc4d6 SHA512 dd8cdb3ab88f0306ab1ac6bf64e5322f7998ca56162da3b163b57519932317b33695a1898ce18fff4ff81f2a6aa44ce68fa141492f4d066745989b4b9151b41f WHIRLPOOL eff3cb30f8711c5c20a709f560675d92713cb8d4a6e2318effe19083895cdfe1f4cdf2d2bcf45484b38a7b4a34e653d8160f63c78ce0fc281aca458e92cbb14e
+MISC ChangeLog 2426 SHA256 55e86035e8c2b269d874e42c9c53aff1798cad5e5285244983bb60715b6c6bfc SHA512 179b09296f17f0d809b6f30fbf3ef8e5f4bbe69615e0ead9971caf15259fb7f85100d95fc5584b2e182dce393d18580d20dcdf65e455d88c65c4cc373eeab0c0 WHIRLPOOL f1525a7b35290047128133372b2598a1f74690aef347cd2846bd18a17016f76edfbe814540406942f4f72fc7458c4dc6feaed189fc98c35bea594f92dde89b44
+MISC ChangeLog-2015 1750 SHA256 b3820b0777e9af318427abcf62309011328e57b9f86abee4570c35cf681c9b11 SHA512 613bc83bd11dbbee31b68d9ac02846205643c07515c3dd99ff122a33a1fb4132dd61cc691b7cff3397e3a6116845855101a11d7bbf8fa0e814dc6240476fd166 WHIRLPOOL f73e6d1b05ddf0a9d22ef33176dd9cf3fdb59542c8c21e189b95a2de9b4c411350f356e0c6efd57e0b280c7278ef40cdf4b4a9fdd3461fbf52e4d8ad105dd52f
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/id3ed/id3ed-1.10.4.ebuild b/media-sound/id3ed/id3ed-1.10.4.ebuild
new file mode 100644
index 000000000000..7e8a20345820
--- /dev/null
+++ b/media-sound/id3ed/id3ed-1.10.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit toolchain-funcs
+
+DESCRIPTION="ID3 tag editor for mp3 files"
+HOMEPAGE="http://www.dakotacom.net/~donut/programs/id3ed.html"
+SRC_URI="http://www.dakotacom.net/~donut/programs/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses
+	sys-libs/readline"
+
+src_prepare() {
+	sed -i \
+		-e '/install/s:-s::' \
+		-e 's:$(CXX) $(CXXFLAGS):$(CXX) $(LDFLAGS) $(CXXFLAGS):' \
+		Makefile.in || die
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" CFLAGS="${CFLAGS} -I./" || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+	emake DESTDIR="${D}" install || die
+	dodoc README || die
+}
diff --git a/media-sound/id3ed/metadata.xml b/media-sound/id3ed/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/id3ed/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/id3ted/Manifest b/media-sound/id3ted/Manifest
new file mode 100644
index 000000000000..d3d7c36a47ad
--- /dev/null
+++ b/media-sound/id3ted/Manifest
@@ -0,0 +1,5 @@
+DIST id3ted-1.0b3.tar.gz 33023 SHA256 2a571ef96bc160e118e95441c3823870399a0a60681eb9e178bfffa651788ccd SHA512 6478ee5b6ba652687dd17828a039e8b6fc2b593285c01309c32dfcd7ec4e0e24c10288a195e9b95c47689c844f342498d5151904bd2e596de0e5ec73afa0bd7f WHIRLPOOL b864ea979d60ca8f6f9a9be544cfa81244953af9dd12354fb10bbba7f01714bed39643e70bc6268678ead0b74e04c1233787cd70650a7714ce676faa91b79bc7
+EBUILD id3ted-1.0_beta3.ebuild 508 SHA256 3b10a20b9af0d6a0808157de7b61ed903ccde4939316ad9a7000a2c3126b19eb SHA512 b1347d06e62eb32d3e72cdfad9b4f8bb682c1090be9d93d182c260b880d1baba71a431c5ea0440fa760534beda4f29000449d22e73014e95c9ef74bb03460fa2 WHIRLPOOL 8eb7de99f667890adf777bf69cd7cb651c98fccd08ae0f7eaae5ae2d4cd35648bff6d1383bb0805ba47bea99a8419b411b1c183f378b8f28827e228dc11414de
+MISC ChangeLog 3058 SHA256 217aa1f1e7ed7d0cd6df4949564b7b7defaebb47cf640f255f83aa05aa38355b SHA512 ccae0012d1658a19a4c9689d4d308eb9d2cccc47a1438341d81302105345ff862373bb09cfd30d3cd4d2ef513ba97c5eae34aa202f6ef5350b64ad0090007240 WHIRLPOOL 0eba18b7ab556e83fd5a4bb1435141f49fbef10abaf807e1315aee5a20ac427645879700c9ba3d23122986d1e45013caf31b798643f4b4af79312c7dbcc4ec46
+MISC ChangeLog-2015 678 SHA256 507677cd68a1b030ebb7acbe1dfe6c096225de5c0cb07a2106d310a094b8e4be SHA512 2a68a5c27b23ac8b6ddbcba0aa8ea23aa64775fe1b504bfa9dae0fbd1229ada1f9d11d89f3d105c11dfa865ed4c7244c16cc85d1611b89aea3d5593561865f65 WHIRLPOOL 00c70ca87ffbd757f6d5b9db488b70a0a0759b9a3382701febd8c7a802ff9f179a07c8aee6af9adc3e41b07afee2791468b2ab7b3d7a472a3e77c3f6c06e4c3d
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/id3ted/id3ted-1.0_beta3.ebuild b/media-sound/id3ted/id3ted-1.0_beta3.ebuild
new file mode 100644
index 000000000000..58bbc2725999
--- /dev/null
+++ b/media-sound/id3ted/id3ted-1.0_beta3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+MY_P=${PN}-${PV/_beta/b}
+DESCRIPTION="A Command-line ID3 Tag Editor"
+HOMEPAGE="https://muennich.github.com/id3ted/"
+SRC_URI="mirror://github/muennich/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-libs/taglib
+	sys-apps/file"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	export PREFIX="/usr"
+	tc-export CXX
+}
diff --git a/media-sound/id3ted/metadata.xml b/media-sound/id3ted/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/id3ted/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/id3tool/Manifest b/media-sound/id3tool/Manifest
new file mode 100644
index 000000000000..c06330e6ddaf
--- /dev/null
+++ b/media-sound/id3tool/Manifest
@@ -0,0 +1,5 @@
+DIST id3tool-1.2a.tar.gz 74723 SHA256 7908d66c5aabe2a53ae8019e8234f4231485d80be4b2fe72c9d04013cff1caec SHA512 518d51794f19605bb3733b0d66f55ad3106ba17826bf2791b4629a0697f92bfbe0193d4442c4e3a5eccc8200ad3c0089085167857652884922a34cbe6683b36a WHIRLPOOL e0efb9b3da99404a5beb5c01ac09ffa46e4193a12511d96ccb904732fe6da306bbf486b587a537319db0ea8a774e47858a4c9623d72a0c8aa520637ad5e0e45f
+EBUILD id3tool-1.2a.ebuild 518 SHA256 79cdecad23e95749c3d7d949dd2acf7cba2f7926057c8f48a055bddf8e849f7a SHA512 1037ffd95df5fb5610cda799754cb0d5a594f9ec8b9088067b67e1cd74b78d5b7dbda6c8b8439e405f8dc99986bb1ea717e7e2ba924a367d4fee150ab6ebe6c2 WHIRLPOOL 1977eb75e2ce404d7dfb80ebb5f4ab3e2bc36ec5514b7902fefd8cadf469a57457d108d029cc25759f126ebb9403b7ed7024067c6ce12fa33c034223371e1d11
+MISC ChangeLog 2428 SHA256 baab953edce7963cea4f7a9c5ae3ad1142f34699f414d28e3d7bab13627e6ada SHA512 2b6e7f77aab7cce2c45959fb74953579cfd5a1ad05e3be90bae634dbb842ef9024e2a151a6c33c5e23d93668cc3809f91cc1746a51147909eaeb4c2dde8a0dbe WHIRLPOOL 73581327b70064282b5055830fc6e7ece775fce8a5abecbb1389a64e5a966bbac369e5cc44c26d3f629cab6fde560a0f631fd9eb8bfc4871ab5f83999e2a257d
+MISC ChangeLog-2015 2015 SHA256 0595920aca6cd7039034e5bea1c3381c77064fbc68b86781b13571b279137e0d SHA512 152c1cf5bca1077ee5ed3eb67f8b290da707ae93e46a819036539e614539723430a82841b4c53acc666a8a33c8c9c4e17011b1751adbff71a841a3e44433f985 WHIRLPOOL 4a6265ead501c74a08cb0ca5c5a8560e51c96be5ebb1187c8729307660c9000b7d2e2a92ab0d4ac521a91d5e5c7602448475801b1fc12ea214ed8d165915d0bc
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/id3tool/id3tool-1.2a.ebuild b/media-sound/id3tool/id3tool-1.2a.ebuild
new file mode 100644
index 000000000000..6b2e6356b0f6
--- /dev/null
+++ b/media-sound/id3tool/id3tool-1.2a.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="A command line utility for easy manipulation of the ID3 tags present in MPEG Layer 3 audio files"
+HOMEPAGE="http://nekohako.xware.cx/id3tool"
+SRC_URI="http://nekohako.xware.cx/id3tool/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~arm amd64 ~ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc CHANGELOG README
+}
diff --git a/media-sound/id3tool/metadata.xml b/media-sound/id3tool/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/id3tool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/id3v2/Manifest b/media-sound/id3v2/Manifest
new file mode 100644
index 000000000000..d3bb53ff2d33
--- /dev/null
+++ b/media-sound/id3v2/Manifest
@@ -0,0 +1,5 @@
+DIST id3v2-0.1.12.tar.gz 121476 SHA256 8105fad3189dbb0e4cb381862b4fa18744233c3bbe6def6f81ff64f5101722bf SHA512 f9c74ab6ffbb50ab7ae7af64dcde78a0766bcbf71308d4c9fb480543b5790e2690ae096d6a2ecaffb01b7497a18841b5235500177cf5eaa8e668cf443abc726a WHIRLPOOL f1bea35c7ecb07c37e384c883d9040717a51a2eb493e35ec6335ec9c2b78d792e966c57165bef56f82c6f41081e342f09836e65fd389f28c3a61b09a40823827
+EBUILD id3v2-0.1.12.ebuild 574 SHA256 fd5a6249e9fb82beca92e6faadaab7e661123188070fb7efdb376642996fb442 SHA512 9e18aaf6999451310a479e0ccfa76fbcc51fc50d8c05857c5102532b36b34c33499de51c6082118df262601978b463016cccecaad577fa5e8dd473acfc4a9ee5 WHIRLPOOL da7fd172848a76f74d2001d33d629456946d3d03a8b161604e5596e5741d79806689b965e543bd5b404173e3ca3777b90bb58b778dce2707ffe724ce7ac97b95
+MISC ChangeLog 2497 SHA256 503092ab1d9eaca8d6164068af63a3bd26e33e3c47f8bab6044e31e265858e87 SHA512 639b40330863d654b0e45c3b590bcabcbbe20697e8844677a32fbf1deb8a13ab0c9950ba354c2a109c6c4030ca3c69309c02a895d28f7265d71e053d7234abda WHIRLPOOL cbd3e17b22e5ac53e1f3102585e4a3bdf2ecc73c7564423ddd7f2e97bf336b4826a14daadaa399836248babd88a1259f397e1c5c6bbdd3e3d4733f7b1b48a9ad
+MISC ChangeLog-2015 4478 SHA256 a5f4f70221e8cabcd3db3dcc2d0aba9527c5caf3462cd1948c4ee14bbb4503f1 SHA512 5967cc5f2b24896f4775e201ce220087bb31845cc987ebba383ac176223d65b66cf205ce2ad5e0f529dfe0ae765e1f66ecdac7d7ce69a1ad4b6184ad9bbcb52e WHIRLPOOL 94177e562794494fa6b9b99f63fb74102fb0a27663a315afef786b3331177169cbf3e4532a47249c297c2a66aa7bf819b6622af3e53253392a7a0e50ea565c92
+MISC metadata.xml 328 SHA256 82df3f147cd617c01ee2b01e3764c2801d84cefd04f3b1c78b87b9e5679160fd SHA512 d813858c55feb67797a7c5226debd484291e153994ebfe42a3038690c6fcc18a2b70ec0324fec1fba2a8eadb49fadeee419f279c7ea105a355eedb8178e615bd WHIRLPOOL d6239fe93cb1126038057cbbca08a5893e6987970d45b03a115814f35b685b063e1285967bb58f42170f1493a040c4d93fb0e500d455a02518d0ba0488b9e3b4
diff --git a/media-sound/id3v2/id3v2-0.1.12.ebuild b/media-sound/id3v2/id3v2-0.1.12.ebuild
new file mode 100644
index 000000000000..1231b1e3443a
--- /dev/null
+++ b/media-sound/id3v2/id3v2-0.1.12.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit toolchain-funcs
+
+DESCRIPTION="A command line editor for id3v2 tags"
+HOMEPAGE="http://id3v2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/id3v2/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="media-libs/id3lib"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	emake clean || die
+}
+
+src_configure() {
+	tc-export CC CXX
+}
+
+src_install() {
+	dobin id3v2 || die
+	doman id3v2.1 || die
+	dodoc README || die
+}
diff --git a/media-sound/id3v2/metadata.xml b/media-sound/id3v2/metadata.xml
new file mode 100644
index 000000000000..550bd829366e
--- /dev/null
+++ b/media-sound/id3v2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">id3v2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/ifp-gnome/Manifest b/media-sound/ifp-gnome/Manifest
new file mode 100644
index 000000000000..8d3aa786f7d5
--- /dev/null
+++ b/media-sound/ifp-gnome/Manifest
@@ -0,0 +1,6 @@
+AUX ifp-gnome-0.7-file-locations.patch 1664 SHA256 ba0e82e7f94ba6ed0daffb610f9f5e13e33f4e57ba8059609b389fb228b3b96e SHA512 01e3a8c956fb5c0b43513a83a87d03ac148ea91708ae842c1d1a7e9743fbb30e9f325382b1112f71420e6b21c7bb164e1e43aeefab83ddaec41bd34b9d776425 WHIRLPOOL 533047bbd6b0453a2554348998f0c93264537710877d462eb93c145018d83d26d21951d454fa74d6991e22eba17df991648554065f08ed1ad9a109fb1642d25a
+DIST ifp-gnome-0.7.tar.gz 11287 SHA256 274793f76a667e1e5ee982aa04f9eea14068cdcb1b7adeb945412ea7e16770ba SHA512 bb46ec7031d9d96ea00b9c91ab9915e8f2901830864866739d21f5cccbdbbca6e001c1ab685ca7d02f0dba7a02331299ad0268e809466a94de9f6dad98d563e4 WHIRLPOOL 927f330fbf5131d762bbbb92ebc133da2b2ab6f8bf89c01895ba73885accce73304178bbf0a4f253afcaa8e6c00f5988de6e04c0d2dac61c0a0ab5c3d60f1e2e
+EBUILD ifp-gnome-0.7-r2.ebuild 820 SHA256 629e0d73aa6cbfde8a36bbe472394f1301ad716fc902a09c7a9b568efb3c8a6a SHA512 73cf5e07bce84b14d4f5f5543f2c57d63494abd604521a671bdf1049dc8c201e56aef904be11c226d9957541ee0ff4556790e91a7abbde7d19c869856bb7a2ae WHIRLPOOL efafa8b80155484385ba5a732a89a24f250a3dc88bb9d708785788e69ad03ce08c19eff6a9c0e98edcaa9eaf447af9941945f7a569881041ea118441431d6275
+MISC ChangeLog 2477 SHA256 cc88dbad7abf7e8358953668179502f4b1a5889ad7d30ca23c1f11cb9feee882 SHA512 2e956617b61e010228f1cdbb08a1cb097997a1f92917113c8fd12578eea6faeb82ad1e4156ad680b8d9e1c42ea0f91a089fd193ca55d48c35492da39ac85cd44 WHIRLPOOL 0067780f0ca1bf33b977da796bd1508cdc8a8948f14a4fa268ff0ba3376ea98ec6915c4f6682a2904b9aa6689edb6099a2c21fa3a778b346b3731c0b7703ce92
+MISC ChangeLog-2015 697 SHA256 369b2ac3c03ec4e06be58d9f6bec4000845df406b4e016914efc628b30d41f78 SHA512 5e3f0ef1d50eaede57aca3aa16d9aa79c15c604340574a5b7dbbc62ee5b4cc35e155e89d33f436ce50cabb63ca7152ec433c12276dfb8c96c065efcd68a33be3 WHIRLPOOL e479d00a2ce86e35ada436b67136b1b58863d8d3c23775e4b468f5fbb32422f9259a9c3a45a49ab98f907a14c7be8396aec15309184e05a2e001b167e099e655
+MISC metadata.xml 332 SHA256 1d761ec5c00b7f3162f8eedb46325508b95361fa57fa6193a8be292fce07af89 SHA512 c8854bcb9f19924021dc3a7d7959b2dbae16dd62b35f6ec481bc307a660ee75e54b66aac6102cd1a7416874620d9b6a7a067e318b4c2290b2b5b8bd7c3ef40f5 WHIRLPOOL b076602cd63896dd1c19f01cc71c5145dbb4951b7d7075d2c48f317b37dba34f9834d083ff705437cbab7fb3262fefba29132e8ce76d5145545dfdd2c4bc21d6
diff --git a/media-sound/ifp-gnome/files/ifp-gnome-0.7-file-locations.patch b/media-sound/ifp-gnome/files/ifp-gnome-0.7-file-locations.patch
new file mode 100644
index 000000000000..d71dd868f62a
--- /dev/null
+++ b/media-sound/ifp-gnome/files/ifp-gnome-0.7-file-locations.patch
@@ -0,0 +1,47 @@
+--- a/ifp-gnome.py
++++ b/ifp-gnome.py
+@@ -21,7 +21,7 @@
+ 
+ class GiRiverApp:
+ 	def __init__(self):
+-		gladefile="ifp-gnome.glade"
++		gladefile="/usr/share/ifp-gnome/ifp-gnome.glade"
+ 		windowname="window1"
+ 		progresswinname="winProgress"
+ 
+@@ -46,7 +46,7 @@
+ 		self.wTree.signal_autoconnect(dic)
+ 		self.mainWindow = self.wTree.get_widget(windowname)
+ 		self.mainWindow.hide()
+-		self.mainWindow.set_icon_from_file('ifp-gnome.png')
++		self.mainWindow.set_icon_from_file('/usr/share/ifp-gnome/ifp-gnome.png')
+ 
+ 		# Progress Window
+ 		self.progressWindow = self.progTree.get_widget(progresswinname)
+@@ -55,7 +55,7 @@
+ 
+ 		
+ 		self.progressWindow.hide()
+-		self.progressWindow.set_icon_from_file('ifp-gnome.png')
++		self.progressWindow.set_icon_from_file('/usr/share/ifp-gnome/ifp-gnome.png')
+ 
+ 		# Transfer Window
+ 		self.interrupted = False
+@@ -67,7 +67,7 @@
+ 		self.verDialog.signal_autoconnect(dictt)
+ 		self.verifyWindow = self.verDialog.get_widget("winTransfer")
+ 		self.verifyWindow.hide()
+-		self.verifyWindow.set_icon_from_file('ifp-gnome.png')
++		self.verifyWindow.set_icon_from_file('/usr/share/ifp-gnome/ifp-gnome.png')
+ 
+ 		self.lblBattery = self.wTree.get_widget("lblBattery")
+ 		self.lblSpace = self.wTree.get_widget("lblSpace")
+@@ -752,7 +752,7 @@
+ 		gnome.ui.About("iFP-Gnome","0.7", "Copyright 2006 Billy Charlton",
+              "A GNOME file manager for some iRiver Flash devices",
+              ["Billy Charlton <billy@trigby.com>"],[],"",
+-             gtk.gdk.pixbuf_new_from_file("ifp-gnome.png")).show()
++             gtk.gdk.pixbuf_new_from_file("/usr/share/ifp-gnome/ifp-gnome.png")).show()
+ 
+ 
+ # MAIN ENTRY POINT ---------------------
diff --git a/media-sound/ifp-gnome/ifp-gnome-0.7-r2.ebuild b/media-sound/ifp-gnome/ifp-gnome-0.7-r2.ebuild
new file mode 100644
index 000000000000..db8d4cce2d0a
--- /dev/null
+++ b/media-sound/ifp-gnome/ifp-gnome-0.7-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Gnome front-end for file management on iRiver iFP MP3 players"
+HOMEPAGE="http://ifp-gnome.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/libgnome-python-2[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2[${PYTHON_USEDEP}]
+	>=dev-python/pyifp-0.2.2[${PYTHON_USEDEP}]"
+DEPEND=""
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-file-locations.patch
+)
+
+src_compile() {
+	python_fix_shebang ${PN}.py
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins ${PN}.{glade,png}
+	newbin ${PN}.py ${PN}
+}
diff --git a/media-sound/ifp-gnome/metadata.xml b/media-sound/ifp-gnome/metadata.xml
new file mode 100644
index 000000000000..cb60f4277b56
--- /dev/null
+++ b/media-sound/ifp-gnome/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ifp-gnome</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/imp3sh/Manifest b/media-sound/imp3sh/Manifest
new file mode 100644
index 000000000000..613d2761c50b
--- /dev/null
+++ b/media-sound/imp3sh/Manifest
@@ -0,0 +1,5 @@
+DIST imp3sh-0.2.4.tar.gz 344331 SHA256 cc174a517abdc5029f397b329cde359038ebb935a139be8667406dd6b13e5729 SHA512 a5d48413d359bef280a090aef323d9abc9400ce08da86d24194881f6305ee82ceaa5226e19f476885792e9d0cc2a75f3edd4465c6fac7222e2a6e21ef0002a1f WHIRLPOOL 7918b050b6611a2b6ec04629cb21db6de6ef003393229fd8a761184f5416039db802146baa3ff9052e93c9d3c76332bb9224d44d9123c95aff79d06accba861f
+EBUILD imp3sh-0.2.4.ebuild 729 SHA256 f1638a2638fc5f9a26fd069c387f4961d8041b231fc933447530802c078d59c9 SHA512 24b29d2b7d73b150b9c73f0c3ff260cb4c1b163d4049622c6ccc76efbcfb8e1f1675a32cb4894b4ef53a1c25544a427fe2a67e7bb5935689adb4b58635d0ca32 WHIRLPOOL 2900003f77dc560ad61779fba8fb8ffc14c62cb085f4d0caf8c05a1f9bb3b482e0566aec6bd9fc0294ec5d5151189cc11b90d1117ef0fb8fc6ef916328a7a02d
+MISC ChangeLog 2450 SHA256 e50b2b9b1ee2f07e34f09aed9baf1bb2eb27e3461b75c85ea230bea9501b4157 SHA512 ef2215497d8eda13c880de2417532d8791995b8b9e849ae616ee88b9ba42371f3f37171a7e3a8ac47751321434ab8f2aac8d1df2b979027692aefbfa2e1306b2 WHIRLPOOL d0c7b312f30a11ce6d33981808e555f4d1a0e0fc3f7f563d4efd53580e49fe6f5f4e8cf28182af5f3bdba2aef19a126bac54ecde58d4b20a30a0663282fa4ccb
+MISC ChangeLog-2015 1970 SHA256 691d565f78d315442d8f344a7c2e6a2f32fd25b573b2393aaf4b7abfc0bef41b SHA512 4d16b2bcf33e3c105073b29118e9d033bba2f83d18399f8cbab8b97ff8265e33461c285bf6a13872ff7ace17d013136cb0008cc763b0bdcbcd6f1276e69a8d63 WHIRLPOOL cd57f51c465adb5301241cdf24fbe892240d28e0d0ee1b41c7ff6d954faee521b41b93feaa44df5f5292ee8e7861f11f2fcd2cada8309a2de546be78c60d34e7
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/imp3sh/imp3sh-0.2.4.ebuild b/media-sound/imp3sh/imp3sh-0.2.4.ebuild
new file mode 100644
index 000000000000..9d0d59e2c6a0
--- /dev/null
+++ b/media-sound/imp3sh/imp3sh-0.2.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="flexible playlist manipulation shell and song player/streamer"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses
+	media-libs/libvorbis
+	media-libs/libogg
+	media-libs/libao"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	econf
+	emake CCLD=$(tc-getCXX) || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README* CHANGES web/README.imp3web web/imp3web.php EXAMPLE.imp3sh EXTERNAL.players
+	# Some docs are liner notes in the actual .c files. UHG.
+	dodoc piped-io/imp3sh*.c
+}
diff --git a/media-sound/imp3sh/metadata.xml b/media-sound/imp3sh/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/imp3sh/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/jaaa/Manifest b/media-sound/jaaa/Manifest
new file mode 100644
index 000000000000..4a818f770976
--- /dev/null
+++ b/media-sound/jaaa/Manifest
@@ -0,0 +1,12 @@
+AUX jaaa-0.4.2-makefile.patch 725 SHA256 db7cace74e1ccd26e38c9b7fc3ec906b422a9448fd4bf8b070d497a225cd3b58 SHA512 17827e9b24813288eb53ac8a50d3183a10e7f0b7908b8d2f5b2b09ccff84d93e13d4d3423d248d04941b2abdee92c2abeed3ecbeff9907ffa03dab900f85fb1e WHIRLPOOL 61d3a6513a50f48f2dcc0ce9ed0896f65c5c8ecff019efc3cc2a64c30bbe6c268e0d13e331f8a67f2ff7afb5726a76a6a78a33ef9572787fe74e8842473217c5
+AUX jaaa-0.6.0-makefile.patch 937 SHA256 3b9adcb0ae16bd0f8c227aad287da21ddd911b9a23ad183b82b7038ae572e6c4 SHA512 b1fe792967c1e34e20d991a3afbeeac46b2c4697c8622d8f929652945995f9056b1b0e3a49c64cbde5f8df7d9b7981b5ffcae44b0707367ff26003d0aa4fd84a WHIRLPOOL c55503f7849474fb0216c351741514384449e9c41774f437a292620dd9ca3127303bb3708f6b9c6ef02db59ff46edb4fd035376c77b35ca76324c142b939018e
+AUX jaaa-0.8.4-makefile.patch 649 SHA256 94ca4a0b8fbff6fbf110f0da527f0685811320dd13c16b046d19d55a9c51853e SHA512 10576c2d2266eb5d793ac322784627b55fc4c2a3f72c11e5117b035215f5df2569717e0a1c20be33b8dd63874d257a51298dbba0e5741b0f654341f5b793a442 WHIRLPOOL 800a6f6bd06a12313ab19dc5d74b17f7418cf26d923e3b3994352b8831c64ed6d492e7d81f8f5feed88470121584a5cd96072240c9e766b14c8432cdb122ef33
+DIST jaaa-0.4.2.tar.bz2 25307 SHA256 0bae72d819963c40e0a202bb08bc55a600fe7c453749601a3836bc9272cffb3a SHA512 c587a616f5ed882c238bf8fc9673d9072fc63d7e345434348427f6c0f64e134685ad3dfbb4bd6abdbc992ba33c69fb96e44be7ef36c7dfcbe7561a53ed481292 WHIRLPOOL 9f48b03fcf9b6d680ec0e74906b2f9029056c223cc8f7fd79b3ecb19631abde59ea5c286c3005091f8164ed5dfceef02b1a97cd2fe95c2b0f638c68f2717e7e2
+DIST jaaa-0.6.0.tar.bz2 25375 SHA256 2f04f403a60d202b1341a9e1aad895d4e1c2bede6b3ca1a5aee1b4f63e31661b SHA512 a93ea4c8a5fe9b1589a5c47052eb56b74164a6baaee835f11c261dd8cfa1141354d52ec71519bff93ecce9d7787138b5d12ead10f44fa3f4d0d83ecc390f3538 WHIRLPOOL cf25fa72a9985291b49e7e6a937920caf1527cff174b949efd80ea772aba4de1a63f06ed3ae302a9d5d43323a854d342cd27a10a85269cfa72679020df7d5dac
+DIST jaaa-0.8.4.tar.bz2 25282 SHA256 0134c66c0284f7b571ebab576b181139a303380764b016b950729b3533a1d44b SHA512 d83dad995d4d6919e719671e19610be9cc6b9c14d922eabc6892f3427584baaacc212b37f0466373a38f1fcc65838851c09bb2ae72d9dfdc9c52921b594cbe8d WHIRLPOOL c40e5e1799cc5f81714b2591aa0b06e1ddb300e4aa1df942e9044a2b46a67cc1739a636e808d9992e46c04c70041aa5f6049c6e0eb033a9cb1a66ba408e95d91
+EBUILD jaaa-0.4.2.ebuild 828 SHA256 5dbefb7ceb8e83f5427117e91576c8401a2edcff8c223dfb15d0ef078d08634b SHA512 8bf0eea950e5a1bd775c6ab36045217e5180452fe90c76f6d7e13213b90a842c677feb1d3f29b7682234d7589cb785fd822bd4dd4f72cead99fbb34ce6e74ba0 WHIRLPOOL 7c00d223e9baf460a5942692f6ae6e004595e7d91aef4fd82d4d5f2e192acccf7fe55887db2eeb3eef31e3651275d65c52334db71513d50ecec1b58da3a4b8c4
+EBUILD jaaa-0.6.0.ebuild 853 SHA256 f9c55800a9c6212d696dd0cd6be7d1232044ed7722b7c2639977a50e1a997d6d SHA512 5ee1a764c3599480d826e475daec4700355ac331cc8e5d540b8efc90118e6abc2348a9d320430599e3ae463f27ccba651e8591a52db9ec3bf9405a1aad63ca55 WHIRLPOOL ae58061510a61336060c059da3414dbb7bdd3be2c40378e81f93932b28ec263088edc2ff481c572ea7919e3370278da03e5841a47762edd78c3c01e9515ec435
+EBUILD jaaa-0.8.4.ebuild 888 SHA256 69307baed1bc609d2c6db7fe1820bd798130f23dcf214a821745cd88bbc92703 SHA512 0e2c397cae5be4d2f85f2a2702549c4981b7708f2abf9c1d37f12af83294b94a143368ab1ffbaf9d4cc61b322d51f43000e390c6872f844bf0f52962a1775413 WHIRLPOOL fdf82268c5c352688aaf0aca261d3219b5ca7898857d5c5715d6b022b94644d175450eaebaa364f3127d006a6e7df8cd7bde008485cef66f02cd93eddaf26b16
+MISC ChangeLog 2619 SHA256 104fc99f70b8d1229d795b76c8c78915da93fbb8b22b5f39de08b1b7ef6d7767 SHA512 71d41dea64ab6588e3fb31a0baa0bd6716499c6a9879335699981745e47f31b5719e72e3e1791c525697aeeaa29214664587ebe2a87aecd7c0ca0ef53222cafe WHIRLPOOL e1b7803bde3827905d066ab4eae6d6584068b530d1600834a22cbd59600ab7e80a25c135fde2ece249513883e920987a7b9af9276c585584adc6b4f5f3a8aea6
+MISC ChangeLog-2015 2660 SHA256 c65568f16854c8a8de3859dc2546c85df5c2291b5e9f6f5acb39ebcdc660bf18 SHA512 c05195d12fef203ca45872139b1295152992e4166ac1cb0b9953a5b583f0fbea8bd52bc41fa74095878c73f895290e4f8129e8452327ac38b3e53c7eaf750fa2 WHIRLPOOL b3e728c3dcf395add39695f82602c08ff919674fd1e1af270a1aff23c2d1e67151350df07f52875c91c1a11aee71787415a9ef5aa473df9bfd0ecde69d1aac01
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/jaaa/files/jaaa-0.4.2-makefile.patch b/media-sound/jaaa/files/jaaa-0.4.2-makefile.patch
new file mode 100644
index 000000000000..1b483c0de2d3
--- /dev/null
+++ b/media-sound/jaaa/files/jaaa-0.4.2-makefile.patch
@@ -0,0 +1,22 @@
+Index: jaaa/Makefile
+===================================================================
+--- jaaa.orig/Makefile
++++ jaaa/Makefile
+@@ -20,7 +20,7 @@ SUFFIX := $(shell uname -m | sed -e 's/^
+ LIBDIR = lib$(SUFFIX)
+ VERSION = 0.4.2
+ DISTDIR = jaaa-$(VERSION)
+-CPPFLAGS += -O3 -Wall -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
++CPPFLAGS += -Wall -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
+ #CPPFLAGS += -march=pentium4
+ 
+ LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
+@@ -31,7 +31,7 @@ JAAA_O = jaaa.o styles.o spectwin.o audi
+ 
+ 
+ jaaa:	$(JAAA_O)
+-	g++ $(LDFLAGS) -o jaaa $(JAAA_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o jaaa $(JAAA_O) $(LDLIBS)
+ 
+ 
+ install:	jaaa
diff --git a/media-sound/jaaa/files/jaaa-0.6.0-makefile.patch b/media-sound/jaaa/files/jaaa-0.6.0-makefile.patch
new file mode 100644
index 000000000000..cfbe5be6b175
--- /dev/null
+++ b/media-sound/jaaa/files/jaaa-0.6.0-makefile.patch
@@ -0,0 +1,23 @@
+Index: jaaa-0.6.0/Makefile
+===================================================================
+--- jaaa-0.6.0.orig/Makefile
++++ jaaa-0.6.0/Makefile
+@@ -24,8 +24,7 @@ SUFFIX := $(shell uname -m | sed -e 's/^
+ LIBDIR = lib$(SUFFIX)
+ VERSION = 0.6.0
+ DISTDIR = jaaa-$(VERSION)
+-CPPFLAGS += -O2 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
+-CPPFLAGS += -march=native
++CPPFLAGS += -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
+ 
+ LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
+ LDLIBS += -lclalsadrv -lclthreads -lclxclient -lpthread -lfftw3f -ljack -lasound -lpthread -lXft -lX11 -lrt
+@@ -33,7 +32,7 @@ LDLIBS += -lclalsadrv -lclthreads -lclxc
+ 
+ JAAA_O = jaaa.o styles.o spectwin.o audio.o rngen.o
+ jaaa:	$(JAAA_O)
+-	g++ $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
+ 
+ $(JAAA_O):
+ -include $(JAAA_O:%.o=%.d)
diff --git a/media-sound/jaaa/files/jaaa-0.8.4-makefile.patch b/media-sound/jaaa/files/jaaa-0.8.4-makefile.patch
new file mode 100644
index 000000000000..8cb54698d488
--- /dev/null
+++ b/media-sound/jaaa/files/jaaa-0.8.4-makefile.patch
@@ -0,0 +1,20 @@
+--- jaaa-0.8.4/source/Makefile
++++ jaaa-0.8.4/source/Makefile
+@@ -24,15 +24,14 @@
+ LIBDIR = lib$(SUFFIX)
+ VERSION = 0.8.4
+ CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
+-CXXFLAGS += -O2 -Wall -MMD -MP
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -MMD -MP
+ LDFLAGS += -L/usr/X11R6/$(LIBDIR)
+ LDLIBS += -lzita-alsa-pcmi -lclthreads -lclxclient -lpthread -lfftw3f -ljack -lasound -lpthread -lXft -lX11 -lrt
+ 
+ 
+ JAAA_O = jaaa.o styles.o spectwin.o audio.o rngen.o
+ jaaa:	$(JAAA_O)
+-	g++ $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
+ 
+ $(JAAA_O):
+ -include $(JAAA_O:%.o=%.d)
diff --git a/media-sound/jaaa/jaaa-0.4.2.ebuild b/media-sound/jaaa/jaaa-0.4.2.ebuild
new file mode 100644
index 000000000000..b1a2f3947a31
--- /dev/null
+++ b/media-sound/jaaa/jaaa-0.4.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="JACK and ALSA Audio Analyser is an audio signal generator and spectrum analyser"
+HOMEPAGE="http://www.kokkinizita.net/linuxaudio"
+SRC_URI="http://www.kokkinizita.net/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="media-sound/jack-audio-connection-kit
+	>=media-libs/libclalsadrv-1.2.1
+	>=media-libs/libclthreads-2.2.1
+	>=media-libs/libclxclient-3.3.2
+	>=sci-libs/fftw-3.0.0
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	tc-export CC CXX
+	emake || die
+}
+
+src_install() {
+	dobin jaaa || die
+	dodoc AUTHORS README
+}
diff --git a/media-sound/jaaa/jaaa-0.6.0.ebuild b/media-sound/jaaa/jaaa-0.6.0.ebuild
new file mode 100644
index 000000000000..6a3b2345d6b7
--- /dev/null
+++ b/media-sound/jaaa/jaaa-0.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="JACK and ALSA Audio Analyser is an audio signal generator and spectrum analyser"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="media-sound/jack-audio-connection-kit
+	>=media-libs/libclalsadrv-2.0.0
+	>=media-libs/libclthreads-2.2.1
+	>=media-libs/libclxclient-3.3.2
+	>=sci-libs/fftw-3.0.0
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	tc-export CC CXX
+	emake PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc AUTHORS README
+}
diff --git a/media-sound/jaaa/jaaa-0.8.4.ebuild b/media-sound/jaaa/jaaa-0.8.4.ebuild
new file mode 100644
index 000000000000..468c1cc0ebaa
--- /dev/null
+++ b/media-sound/jaaa/jaaa-0.8.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="JACK and ALSA Audio Analyser is an audio signal generator and spectrum analyser"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc"
+IUSE=""
+
+RDEPEND="media-libs/zita-alsa-pcmi
+	media-sound/jack-audio-connection-kit
+	>=media-libs/libclalsadrv-2.0.0
+	>=media-libs/libclthreads-2.2.1
+	>=media-libs/libclxclient-3.3.2
+	sci-libs/fftw:3.0=
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.8.4-makefile.patch )
+
+src_compile() {
+	tc-export CC CXX
+	emake -C source PREFIX="${EPREFIX}"/usr
+}
+
+src_install() {
+	emake -C source PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/media-sound/jaaa/metadata.xml b/media-sound/jaaa/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/jaaa/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
new file mode 100644
index 000000000000..956adf576bbc
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -0,0 +1,12 @@
+AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 SHA256 eb5e9c5b89518daf1895197f8f12e6297cddc299aa5e31cc6880c91dfb73c88b SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316 WHIRLPOOL 35b19e0ad5b42a2e00cf7039960fbd0c62403274f1f89503d1a866523a6fab3f62985ac49a2d760c885826bb44fa1f37072231945a80d11e9ee1aef6c5641aeb
+AUX jack-audio-connection-kit-freebsd.patch 496 SHA256 7834f5ec198f8e69e2ac119fc2c4ee349ed7e38d003e473fcb41257e7b605df8 SHA512 7c0cf60ddd3d07e12e036082ab10299308d1e112c6190d008a739ab0374c8ecf9e2dcb703055a58f8098e5187044e2351a1786271cecdeae23cbed72e6d68cd6 WHIRLPOOL 3d11baf0f4ebe0613c378d79efcb6b81f94c28e9070471b9a496dda5f0ba90a2eac1e789a621d7ec5d109f018a7f67b0adbd53bbce9e059f3e18b04ca4fb7cd1
+AUX jack-audio-connection-kit-sparc-cpuinfo.patch 659 SHA256 256d48109d32ce8af89042401508392fbb90c499d4cf8b056104dc1a47522fe5 SHA512 c5964413c99fb1dd20dfe52dd40f857dab1cef123b26f74500e2f5607eda870b563595d39c4e4e0684428971e7295c847253d045b2d9ba0183f358630cfa9888 WHIRLPOOL 01d88bfce0394628fab10c48a4b80f0a025b741c5785f05bd22658fd95594e472439f569a450043cf7cc53700149d0d8b785bb7adc74711474fd3f6bcbc6d66f
+DIST jack-audio-connection-kit-0.121.3.tar.gz 1083545 SHA256 b7095d3deabeecd19772b37241e89c6c79de6afd6c031ba7567513cfe51beafa SHA512 57323393d5209baefe73cc0cd9a0e818b1cfd260cf9aa36cd6ad800252e22e3ddb7fc46649c54b8e840696878147c2d06c8d39fd7300b5bb92aeb69f44ed710f WHIRLPOOL a256cfb7c3546cb06d6003313802b02812d8da9c13671be9b0341a10442cd348a8b3f7fe65e8d27cc47b4e29ded799fa6cc0efa51d81d01f342c7c8eefbc9c55
+DIST jack-audio-connection-kit-0.124.1.tar.gz 1113456 SHA256 eb42df6065576f08feeeb60cb9355dce4eb53874534ad71534d7aa31bae561d6 SHA512 9c885da516f2ca246edba94db26c851229d063f1557ea91ec76ca57d675a510d16cc4baad5adb316cf46aaaa8b8d7579b484a53b9a803b34fc9bb34c983a8fe2 WHIRLPOOL 41232400d99a72b29a75f4d781c373a7f453c704a52b0a669cab71296574881b0a99b21b86628d02db8c3d7a64bec6a259ae1ba0a4c721867e19283139cee824
+DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 SHA256 3517b5bff82139a76b2b66fe2fd9a3b34b6e594c184f95a988524c575b11d444 SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f WHIRLPOOL 3771caa41e8b813e888959b377ec99a14c6ac16ba0e9d564706666a4d3c049ac5d97787715d00b40dd309039f892fd167285f216b71a07209ebce9b98065c88b
+EBUILD jack-audio-connection-kit-0.121.3-r1.ebuild 2433 SHA256 3cf39f2a34f9a97ca5600ff30e804095941e3f61e2ff1b95c4d2a996cc035715 SHA512 e0aeef4456bcee0452c3cdff0489fa0616d350c41b0a311babfc3889a15795694dd3b68ede5a02725fbfeaad20471ee77647e714148380464c7464a09f80f0a5 WHIRLPOOL 2a8bde96e086f1c21bf57858036ae9b0158d0e4173ee0320e5c585fe624e1b1b4fe78500d3f5934edc5e051260a025991acbf95a7f560a3745df125cf7be81f2
+EBUILD jack-audio-connection-kit-0.124.1-r1.ebuild 2236 SHA256 0564f575167dd17b8a9835f263a0689135fea540bd3716eaf2639daf10dfc83b SHA512 16590aaef08b6aa3ecac4127ee773437f13fd1d549dd82ba97f2bbadc1d99a6804fe8018cf6d379f368e9ca53f8305b33608d9a82d4f6c61443de8d59b5b4d99 WHIRLPOOL 1587bc6e8d9266352976d71944e0128d2f841869125994528f076c2f97d50a500dea9615bcc7614c183c464d737fc41c2993da4c8b6d2a30d06bff6fb8fa4d98
+EBUILD jack-audio-connection-kit-0.125.0.ebuild 2208 SHA256 dded77488635339439adbb41a8535678bd44200af76acd3af513bdfe7db0a063 SHA512 daa74d4b5e7491b552fcd62f01db5c9a0cff3ae1f9807be72b664fdc5ddb2a692bb7f688d1713d0a8bde16d0d9fd2f2945f0d48de96de167bdaa09a1ee67569a WHIRLPOOL b4708a1103623eb1ed123572de41d18bfcf36e367b9ea56a1609bffd4de8af5d3eaffd239747287e67f233d1434bffa7391cb7a1d571eb4761de0af005d34cb3
+MISC ChangeLog 3590 SHA256 dbf0b325ea51bbce2f42fb488ba0e8ca02ca998cb77acf5aff7c5d48da17bfe2 SHA512 ea41d5cdcc65d0790e9ba8fce00c43fde842492f4679253bacb751dbd3fab4a6c87fbb65f76fc0880dff705b6e4d17666fb2d70eb835eb68226344cdb1301e11 WHIRLPOOL 801be96c57280320f890dc984cd11b5d7f9c3966fa8e865891efe7dcc2ed42e7b24e904ea0505771f17c8b20b6da2c38314f677e720a9b4f57a929ea06668718
+MISC ChangeLog-2015 31021 SHA256 c41d9867c910cb2caf1b3f73883663a9ea03e0078e8571f2c03c1ef023d42330 SHA512 803d6779fddedb4a340a738363b78b0150d2de43b991622c01ffefa584f9248a3c96c60560ce474b63759ccef87e8b6f768fb518f146691f50c8abc657d7e65a WHIRLPOOL 7ed64afc3e184b0d1d92e3b5aad0b21cf3fec608d8bcb05aeb18d5918b81129bd862b82b97bbc6b52f3b0383cd9b0edeb5e3b747ce03b7e562d6f521de3af708
+MISC metadata.xml 525 SHA256 baab8b45e4a077d340ea7950401328dc46b7207db7fc7291d3d62a1b248bd934 SHA512 7c51cb4ac632fa0eb529b3fb5044d50d75c66bd0f15ae36140c758e8410a58c61550104cf241000247cbd32c211f16e92f147801a5074a7d1e0cf1fd07927714 WHIRLPOOL 0cbcb7b9fb1c257be00635f82fce4c74ed7798574d066861938f69e3f979735271a0b91a7a8caad7d7d15f6ff590c7cb644c6987bd7a29c952dcff50b15ccde3
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.125.0-freebsd.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.125.0-freebsd.patch
new file mode 100644
index 000000000000..376c65a7464c
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.125.0-freebsd.patch
@@ -0,0 +1,15 @@
+Index: jack-audio-connection-kit-0.125.0/configure
+===================================================================
+--- jack-audio-connection-kit-0.125.0.orig/configure
++++ jack-audio-connection-kit-0.125.0/configure
+@@ -15795,9 +15795,7 @@ HOST_DEFAULT_TMP_DIR=/dev/shm
+ USE_MD5SUM=1
+ case "${host_os}" in
+   freebsd*)
+-    # current FreeBSD header files conflict with the OSS driver's
+-    # barrier code, this may be fixed in 5.3, stay tuned.
+-    USE_BARRIER="no"
++    TRY_POSIX_SHM=yes
+     USE_MD5SUM=0
+     ;;
+   openbsd*)
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-freebsd.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-freebsd.patch
new file mode 100644
index 000000000000..a884ac6881e1
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-freebsd.patch
@@ -0,0 +1,13 @@
+--- jack-audio-connection-kit-0.121.3/configure.old	2012-05-29 11:10:22.000000000 -0400
++++ jack-audio-connection-kit-0.121.3/configure	2012-05-29 11:10:46.000000000 -0400
+@@ -14903,7 +14903,9 @@
+   freebsd*)
+     # current FreeBSD header files conflict with the OSS driver's
+     # barrier code, this may be fixed in 5.3, stay tuned.
+-    USE_BARRIER="no"
++    # USE_BARRIER="no"
++    TRY_POSIX_SHM=yes
++    HOST_DEFAULT_TMP_DIR=/tmp
+     ;;
+   openbsd*)
+     # pthread_barrier* not implemented
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-sparc-cpuinfo.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-sparc-cpuinfo.patch
new file mode 100644
index 000000000000..8017f90ebe93
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-sparc-cpuinfo.patch
@@ -0,0 +1,17 @@
+On Linux/SPARC, /proc/cpuinfo doesn't include "Cpu0Bogo" anymore,
+use "Cpu0ClkTck" instead to determine the processor speed.
+
+linux upstream commit 8b99cfb8cc51adae7f5294c8962a026c63100959
+
+--- old/config/os/gnu-linux/time.c
++++ new/config/os/gnu-linux/time.c
+@@ -152,7 +152,8 @@
+       defined(__x86_64__)
+ 		ret = sscanf(buf, "cpu MHz         : %" SCNu64, &mhz);
+ #elif defined( __sparc__ )
+-		ret = sscanf(buf, "Cpu0Bogo        : %" SCNu64, &mhz);
++		ret = sscanf(buf, "Cpu0ClkTck	: %" PRIx16, &mhz);
++		mhz = mhz / 1000 / 1000; // hz -> mhz
+ #elif defined( __mc68000__ )
+ 		ret = sscanf(buf, "Clocking:       %" SCNu64, &mhz);
+ #elif defined( __s390__  )
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
new file mode 100644
index 000000000000..0046819ee8b8
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic eutils multilib multilib-minimal
+
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://www.jackaudio.org"
+SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd"
+IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples cpu_flags_x86_mmx oss cpu_flags_x86_sse cpudetection pam"
+
+# readline: only used for jack_transport -> useless for non native ABIs
+# libsndfile: ditto for jackrec
+RDEPEND="
+	sys-libs/readline
+	>=media-libs/libsndfile-1.0.0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
+	!media-sound/jack-cvs
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${RDEPEND}
+	alsa? ( sys-process/lsof )
+	pam? ( sys-auth/realtime-base )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-sparc-cpuinfo.patch"
+	epatch "${FILESDIR}/${PN}-freebsd.patch"
+}
+
+DOCS=( AUTHORS TODO README )
+
+multilib_src_configure() {
+	local myconf=""
+
+	# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
+	if use cpudetection && use cpu_flags_x86_3dnow && use cpu_flags_x86_mmx && use cpu_flags_x86_sse ; then
+		einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
+		myconf="${myconf} --enable-dynsimd"
+		append-flags -mmmx -msse -m3dnow -O2
+	fi
+
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable coreaudio) \
+		$(use_enable debug) \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable oss) \
+		--disable-portaudio \
+		--disable-firewire \
+		$(use_enable cpu_flags_x86_sse sse) \
+		--with-html-dir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--libdir=/usr/$(get_libdir) \
+		${myconf}
+
+	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		for i in tools man ; do
+			sed -i -e "s/ ${i}//" Makefile || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/example-clients"
+		docompress -x /usr/share/doc/${PF}/example-clients
+	fi
+}
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
new file mode 100644
index 000000000000..aad1c0fff8f3
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic eutils multilib multilib-minimal
+
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://www.jackaudio.org"
+SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
+
+# readline: only used for jack_transport -> useless for non native ABIs
+# libsndfile: ditto for jackrec
+RDEPEND="
+	sys-libs/db[${MULTILIB_USEDEP}]
+	sys-libs/readline
+	>=media-libs/libsndfile-1.0.0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
+	!media-sound/jack-cvs
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${RDEPEND}
+	alsa? ( sys-process/lsof )
+	pam? ( sys-auth/realtime-base )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-sparc-cpuinfo.patch"
+	epatch "${FILESDIR}/${PN}-freebsd.patch"
+}
+
+DOCS=( AUTHORS TODO README )
+
+multilib_src_configure() {
+	local myconf=""
+
+	# Disabling CPU Detection (dynsimd) disables optimized asm routines (3dnow
+	# or sse)
+	if use cpu_flags_x86_3dnow || use cpu_flags_x86_sse ; then
+		myconf="${myconf} --enable-dynsimd"
+	fi
+
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable coreaudio) \
+		$(use_enable debug) \
+		$(use_enable oss) \
+		--disable-portaudio \
+		--disable-firewire \
+		$(use_enable cpu_flags_x86_sse sse) \
+		--with-html-dir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--libdir=/usr/$(get_libdir) \
+		${myconf}
+
+	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		for i in tools man ; do
+			sed -i -e "s/ ${i}//" Makefile || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/example-clients"
+		docompress -x /usr/share/doc/${PF}/example-clients
+	fi
+}
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
new file mode 100644
index 000000000000..b4876415e731
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.125.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic eutils multilib multilib-minimal
+
+DESCRIPTION="A low-latency audio server"
+HOMEPAGE="http://www.jackaudio.org"
+SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd"
+IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
+
+# readline: only used for jack_transport -> useless for non native ABIs
+# libsndfile: ditto for jackrec
+RDEPEND="
+	sys-libs/db:=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=media-libs/libsndfile-1.0.0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
+	!media-sound/jack-cvs
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${RDEPEND}
+	alsa? ( sys-process/lsof )
+	pam? ( sys-auth/realtime-base )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.125.0-freebsd.patch"
+}
+
+DOCS=( AUTHORS TODO README )
+
+multilib_src_configure() {
+	local myconf=""
+
+	# Disabling CPU Detection (dynsimd) disables optimized asm routines (3dnow
+	# or sse)
+	if use cpu_flags_x86_3dnow || use cpu_flags_x86_sse ; then
+		myconf="${myconf} --enable-dynsimd"
+	fi
+
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable altivec) \
+		$(use_enable alsa) \
+		$(use_enable coreaudio) \
+		$(use_enable debug) \
+		$(use_enable oss) \
+		--disable-portaudio \
+		--disable-firewire \
+		$(use_enable cpu_flags_x86_sse sse) \
+		--with-html-dir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking \
+		--libdir=/usr/$(get_libdir) \
+		${myconf}
+
+	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		for i in tools man ; do
+			sed -i -e "s/ ${i}//" Makefile || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r "${S}/example-clients"
+		docompress -x /usr/share/doc/${PF}/example-clients
+	fi
+}
diff --git a/media-sound/jack-audio-connection-kit/metadata.xml b/media-sound/jack-audio-connection-kit/metadata.xml
new file mode 100644
index 000000000000..b01bff8f965e
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <use>
+    <flag name="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
+    <flag name="cpudetection">Enables runtime cpudetection</flag>
+	<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/jack-keyboard/Manifest b/media-sound/jack-keyboard/Manifest
new file mode 100644
index 000000000000..b16ff722aed6
--- /dev/null
+++ b/media-sound/jack-keyboard/Manifest
@@ -0,0 +1,5 @@
+DIST jack-keyboard-2.5.tar.gz 108710 SHA256 430bb859eb4396eaae7bf94b738b8ea661a63768a9798169736cf9ad147af557 SHA512 2a8b45315f25080529dc667d869ae6bd6fe70345f74a10625e6ed6a13043333e495f37c53dc49d968533c65dfb0bd0f0a6b91eaa89e890ce492cb1f3da8c8009 WHIRLPOOL 1b46a900e6bfa7bee4c50795aa9f13d8d9d0063a7d2660d4f1772f5fbd9d7cba1b526443a3220cd539f2a33269ea69a519517674aca502f419ffcc5cd7e05243
+EBUILD jack-keyboard-2.5.ebuild 641 SHA256 3a19d63a8bc4852d779c5169f01fd381a8d3a903bb3fe302946576442c0fca16 SHA512 dce4b89858e7e961be5ffa497691a4285f824516f2609287c3f9531a6932ffac1da2391b74216ac41b8a7e9acae541741796f2653eaa045e08968305d38bc25f WHIRLPOOL 422dceecb6ca044a45afd6d34f3e9da71e02e43d1630a50245734d0ca37b11ed9b46374534cdd97e922fa3375aa07748b3bb0ca2e4e7be2c2729e2cf344c85de
+MISC ChangeLog 2444 SHA256 8764c1e356949bc316fbaf8cd8a0b0da8de14bacc89dc3d9218c92bf53ff8351 SHA512 6d984c574464450275c82faa88e5dd55cd66870b8a0bd17f16a93e398ac9e7c039a0ccbf506861e6e894d56c43c9849fd3bb3e1f6ba49a672648d5e3b85dea26 WHIRLPOOL c5f0d8a23e5c14bdab7b37523fa1e3cb82592ba961fe7dc87a99b31b469e7a7a7dd3babe05cd42362c9d5c7b2c59b77a1c97a18c5b0a8e465286ea5535652bbc
+MISC ChangeLog-2015 910 SHA256 f0e29572bb327e3515bd61a833211d296d76af36e5ff369d9cb329c4f00636f0 SHA512 f3cfeca2890a8ee7c90168bc9aad99ebe65e54666cf1cb7dbfcf69dc01be903b0c6b3cfee775926b4ba0cdb0375e5b11bc1f323b4170a01f5eee6998a8c8685f WHIRLPOOL 55ce4cc6a68465ac5feffb9beadc5417206d9b8cab9954b6c3801a6876f902fff777509305a85c674e5d54940cfd3cfca95edf4e7be54a4018b3ed6674fff762
+MISC metadata.xml 669 SHA256 01bd004185c2829057dcc7c6574790048c923cf350612772932e4a3706360b74 SHA512 70b905896625bcebe0e83a807e84a47688691e02b36e99a8d45b91be944709016a98bb5df97f591ea562d65daf79d7a33de26e9760891191abf8def0d245a9b8 WHIRLPOOL 147d43c2160882368c3d50c4bc440843f2b7a0ed0cff3b15077fdea6e9a4dec947663dfe3b9adeca94069fc0507d6ca3b391e4a7ab0728d8f8607a9ade91fa62
diff --git a/media-sound/jack-keyboard/jack-keyboard-2.5.ebuild b/media-sound/jack-keyboard/jack-keyboard-2.5.ebuild
new file mode 100644
index 000000000000..206b1cc62210
--- /dev/null
+++ b/media-sound/jack-keyboard/jack-keyboard-2.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A virtual MIDI keyboard for JACK MIDI"
+HOMEPAGE="http://pin.if.uz.zgora.pl/~trasz/jack-keyboard/"
+SRC_URI="http://pin.if.uz.zgora.pl/~trasz/jack-keyboard/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="lash X"
+
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.103
+	>=x11-libs/gtk+-2.12:2
+	>=dev-libs/glib-2.2:2
+	lash? ( media-sound/lash )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-apps/sed"
+
+src_configure() {
+	econf $(use_with X x11) \
+		$(use_with lash)
+}
diff --git a/media-sound/jack-keyboard/metadata.xml b/media-sound/jack-keyboard/metadata.xml
new file mode 100644
index 000000000000..491df6cb552a
--- /dev/null
+++ b/media-sound/jack-keyboard/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+<longdescription lang="en">
+	jack-keyboard is a virtual MIDI keyboard - a program that allows you to send
+	JACK MIDI events (play ;-) using your PC keyboard. It's somewhat similar to
+	vkeybd, except it uses JACK MIDI instead of ALSA, and the keyboard mapping
+	is much better - it uses the same layout as trackers (like Impulse Tracker)
+	did, so you have two and half octaves under your fingers.
+</longdescription>
+</pkgmetadata>
diff --git a/media-sound/jack-rack/Manifest b/media-sound/jack-rack/Manifest
new file mode 100644
index 000000000000..1e87b4311616
--- /dev/null
+++ b/media-sound/jack-rack/Manifest
@@ -0,0 +1,13 @@
+AUX jack-rack-1.4.5-asneeded.patch 355 SHA256 ca73979ea8949ff0ed749f08c6bda8c1b953582a3bd54b1843fa8031f8694ddd SHA512 96b0122e47e87926f1193c803465d3941ae257cd348c3f816807dfdefd98310347185fb659207b98ecb9d36ae05c0bc75db7158f9769d8760caba2251b8193e4 WHIRLPOOL 03ae1ceed0b0f60708dfd1cb4a11c4fdb74c4840bdadd60a1aba4e63cb471fa7a55e8a341031c1f4370d7aa0d707e8f577b81e685889d99cffe507768fcde238
+AUX jack-rack-1.4.6-noalsa.patch 580 SHA256 633659edadfdcf0befc89e37f6b032464e0d7385abd4bf38c6a97199deaf1856 SHA512 5b066700ef863abfc3a308b6a784beedebf85f0fa9327e2c6515a82982ef8806bcbffb765a03c52bc779fa80ee5e7ac7fd276aa89743c235fff016270b775eb8 WHIRLPOOL f5fdf61379b47e47cbbb8b1123e10748024f3c42c5cd7bba4313a565a217312de6279d0f3c5263f7b333e6f8a5de82d10225f17f3256985a2d96ba5bdadcef1c
+AUX jack-rack-1.4.7-disable_deprecated.patch 432 SHA256 d0a011ccb163cc412adc64e9a6ab8a8897a64257db7fdfec0acdb1229bcadf8b SHA512 ce4f145a6589cf5a3fd5369f662ea56e2b53e2a77ceba6c91166b952c4fe5690207ea4394da3c6bf54ce52324cef9ee2e7b3258741ce3d4f58f97af7f8d55855 WHIRLPOOL faf23e440a6ada1a4e63a614accb5c56205965124b2221a9023de687bbfcf8ae83e8607f4bb5bb9842ad6a4c706f5a917c0ffddebf461f62e106f52cb88dcd7f
+AUX jack-rack-1.4.8_rc1-noxml.patch 492 SHA256 759a64cef74963c072ae303aad2737a6a3796ea8c09598fc46921ca72472b31a SHA512 79f1406003006ef0956ae08a53d9aefbeeb9ba97308217bd3c6610a854e4e905cd972e1431ea21dc3f938efd21120bf45b7dfc55993858d7c3e2304ffde3909d WHIRLPOOL 76b8a13691cd2acd1a624c81158ce4602226fe8e98528cbe3b3b2679d83749fc94133a98722d2f24fef2578471fd9ffed0d458121166e5dd83f3b49fe80ab300
+AUX jack-rack-1.4.8_rc1-underlinking.patch 288 SHA256 6bf5ee830469f9486b1c0f5d8e0941f49a54656d5d53a6e7fd87866bd23da9db SHA512 90c7c91c681ca6037aa4a9ae7d9491fbdd7d5a8404e580ed6cd2d1d4d1101c7dd8cea005231c63ec5384d301dbe56f966607fb714c5fecb4e2258502fbba1b10 WHIRLPOOL 5929a7103f5644318baa6636477e6621d51f47791639160cb48dca075344d2833ad5e76c6e32e2b3cb3375c73ffa203cf0f2b7d3b63ea3c43dd76beae2b82ae2
+DIST jack-rack-1.4.7.tar.gz 317474 SHA256 f0e8e1e5ebe1dbc9d89d57427f1dcb65094451ce8b7c8bf56799bf5ce4b8df64 SHA512 abfcbe2b7f5de964fc6236e0f1ed1f4c47bb03d3d018fe129e1158983d3879fcc032c56c1741448f85c7de12f345ccfba3b6271b16af96db1a3e4427f9deb810 WHIRLPOOL 8a401b1f23c56f39235972cbe06f62d7c8a1ea77af51710751e053ead238605b624dba3617fb51a6c3c87da078118e8094fc0b0c323a5fb73b7b25cd87eb57ac
+DIST jack-rack_1.4.8~rc1-1.debian.tar.gz 6742 SHA256 888bde7c981b83f095c891cffff6eb03d4ef3faf3a78f11a14ee49decb60e0ef SHA512 4e0503a0b1fa080bed0f9730929d820d173d886f4d4801016419d33729ec453f1f4e0f96fe102d83731169b91c54939663e9529516fdc09bca5d347be3e18715 WHIRLPOOL 4edcc9aa4195f36a0a8ff2b0a98c7920f5a4649e1a282c57102f4984e71c1560a2d6c89318796ed5e6431bff27abd87409ad00fdeeeba2f829353e7350fcdcb3
+DIST jack-rack_1.4.8~rc1.orig.tar.gz 122400 SHA256 a8a0dfb82df7c1c2c41edb021f851f15fb8f959ec2a9107f2b037c166febdb99 SHA512 8c7be402b6c8ad02a6ad7379d98c49a00bf5a3c70e5e5c174d786e77bf72592cf2eec6b346ce77d1dabb3787a6d028f4d02a1dd18daa5bf3daa297ac7bd7ad38 WHIRLPOOL 7bbe8895ce11265fc6fb8c12144d3ca41f4c073c8dc3cc2faf0d74f7561639f04d951994dc39b2b8c1c9f4e4b7ba8b42a0fc3bbfd347abd90e39fdb5d34873a9
+EBUILD jack-rack-1.4.7-r1.ebuild 1325 SHA256 5a36db731ac4017de2ace4edfb55544239397d5eb8d50ce9ce72b73c550b5a13 SHA512 0a49c4e96638e189e95cc26a081952fc07e163022d00074b2b7c929be0385d7d363f2f887a68f784e2629147acca45e008cc742840689887d7c9db690bb1a749 WHIRLPOOL b206fa3c807beee74f0a125292638c940c5df0cb641e286102cc4a42cc5038d10e3facfb27a5d6b82267ecccb309609dbfdaeb03dde74ad49470913e135f9ca2
+EBUILD jack-rack-1.4.8_rc1.ebuild 1645 SHA256 0baa9ec9fdb8e0dbad39c7fc3abe1aadb04fba055a2bb6941382d63ff7c1bd0c SHA512 84aa31b81be7f79fcf49db72d774c136794b0769ed44a261198e8f7a067df38db781dee0bb1968502172068eaef41b77cb740d088e977058985d6575dd809a29 WHIRLPOOL bf40134d42d82dd3c5e373bbd4f937aec5e5aa464d00204b45a0b24a76a31828f87e2d327f9f066d7fc7587e7bd463d9072ac7809417320fda62cd8321f5574e
+MISC ChangeLog 3272 SHA256 36057f34823332f3de1589e6c8b4c21a05892b561453b0680a6335cb6ac37a47 SHA512 d431216d9873943868cfb66b05af10fb89d0593271f14b25b69c987ceb525eb6b17a3bee48131ce60c2906e67addf7a14586b4c085d3e324276a920fbc94b14b WHIRLPOOL 5cbaa955c0eb18af130fa1415bc39906a51c5e90ab723ec66a8aacee68b771318d9607cd4ea818a68cfde5bbfbadacbdeceddd52cfc7cfd51ca9d0578a09c2fa
+MISC ChangeLog-2015 7049 SHA256 55ff3f9635a34cbcd332b9874108bfe237cc3223ba14144dae0fa877e6dd844d SHA512 3ac496ecdc3df7e5dc993cc8d8b771c3764ae0b4fba5eac73985aaac2432f2059ceebb14db119e13f9123aadcd4441ffa3ec27c25a310ec5d67bc34dddedf7b0 WHIRLPOOL 62c32c09f3aaf2e161d723e320fdd73f59c752e218186dd617c7a9948d6e3891d0cdccc7b62bfc1868bf5f7f56bc69bf7a040e2f0421c5e0e1ed056513bd3125
+MISC metadata.xml 338 SHA256 ab13a7999f111bbb8f3fe1ee467b6ff70f1f507288e26ec06f81310d7bd407d7 SHA512 5274213ba5e9a2710d7e0d1e11150e45d902e2ac263ef21359046afc774d7fc4b7aea86705a49a0ae39b9adfd6c4103d450ccb737defe2eee1078bf3d3819c51 WHIRLPOOL 10e04dabb54a092b258b528cee8e2706dc875bb6d6b6b4fd443eeac75dd2d8ae877f938b19b93d66bc6786449b7042486999addde52b4b7e865a29806d90bd62
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.5-asneeded.patch b/media-sound/jack-rack/files/jack-rack-1.4.5-asneeded.patch
new file mode 100644
index 000000000000..4a07049f0603
--- /dev/null
+++ b/media-sound/jack-rack/files/jack-rack-1.4.5-asneeded.patch
@@ -0,0 +1,13 @@
+Index: jack-rack-1.4.5/src/Makefile.am
+===================================================================
+--- jack-rack-1.4.5.orig/src/Makefile.am
++++ jack-rack-1.4.5/src/Makefile.am
+@@ -60,7 +60,7 @@ jack_rack_CFLAGS = \
+ 	-DGNOME_DISABLE_DEPRECATED=1
+ 
+ 
+-jack_rack_LDFLAGS = \
++jack_rack_LDADD = \
+ 	$(JACK_LIBS) \
+ 	$(GTK_LIBS) \
+ 	$(GNOMEUI_LIBS) \
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.6-noalsa.patch b/media-sound/jack-rack/files/jack-rack-1.4.6-noalsa.patch
new file mode 100644
index 000000000000..32edf9adf708
--- /dev/null
+++ b/media-sound/jack-rack/files/jack-rack-1.4.6-noalsa.patch
@@ -0,0 +1,23 @@
+This patch allows to build jack-rack with ALSA support disabled.
+See bug #135966.
+
+Index: jack-rack-1.4.6/src/plugin_slot_callbacks.c
+===================================================================
+--- jack-rack-1.4.6.orig/src/plugin_slot_callbacks.c
++++ jack-rack-1.4.6/src/plugin_slot_callbacks.c
+@@ -99,6 +99,7 @@ slot_ablise_cb (GtkWidget * button, GdkE
+ 	    
+ 	      return TRUE;
+ 	    }
++#ifdef HAVE_ALSA
+ 	  case 3:
+ 	    {
+ 	      ui_t * ui;
+@@ -119,6 +120,7 @@ slot_ablise_cb (GtkWidget * button, GdkE
+ 	    
+ 	      return TRUE;
+ 	    }
++#endif
+       }
+     }
+   
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch b/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch
new file mode 100644
index 000000000000..1ddd318235ef
--- /dev/null
+++ b/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch
@@ -0,0 +1,19 @@
+http://bugs.gentoo.org/376899
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -53,13 +53,7 @@
+ 	$(XML_CFLAGS) \
+ 	-DPKGDATADIR=\"$(pkgdatadir)\" \
+ 	-DPIXMAPDIR=\"$(pixmapdir)\" \
+-	-DDTDDIR=\"$(dtddir)\" \
+-	-DG_DISABLE_DEPRECATED=1 \
+-	-DGTK_DISABLE_DEPRECATED=1 \
+-	-DGDK_DISABLE_DEPRECATED=1 \
+-	-DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+-	-DGNOME_DISABLE_DEPRECATED=1
+-
++	-DDTDDIR=\"$(dtddir)\"
+ 
+ jack_rack_LDFLAGS = \
+ 	$(JACK_LIBS) \
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-noxml.patch b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-noxml.patch
new file mode 100644
index 000000000000..dd85001c5c77
--- /dev/null
+++ b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-noxml.patch
@@ -0,0 +1,14 @@
+Index: jack-rack-1.4.8_rc1/src/ui_callbacks.c
+===================================================================
+--- jack-rack-1.4.8_rc1.orig/src/ui_callbacks.c
++++ jack-rack-1.4.8_rc1/src/ui_callbacks.c
+@@ -669,7 +669,9 @@ jack_session_cb (gpointer data)
+ 
+   ui->js_event->command_line = strdup( cmd_buf );
+ 
++#ifdef HAVE_XML
+   if (!ui_save_file (ui, fname_buf))
++#endif
+     ui->js_event->flags = JackSessionSaveError;
+ 
+   jack_session_reply( ui->procinfo->jack_client, ui->js_event );
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch
new file mode 100644
index 000000000000..5c96c01bde57
--- /dev/null
+++ b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch
@@ -0,0 +1,13 @@
+This should be applied after Debian 02-gcc45_binutils_gold.patch which adds -ldl, but
+we need also -lm wrt http://bugs.gentoo.org/463696 for exp(), log() and logf()
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -62,6 +62,7 @@
+ 
+ 
+ LIBS = \
++	-lm \
+ 	-ldl \
+ 	$(JACK_LIBS) \
+ 	$(GTK_LIBS) \
diff --git a/media-sound/jack-rack/jack-rack-1.4.7-r1.ebuild b/media-sound/jack-rack/jack-rack-1.4.7-r1.ebuild
new file mode 100644
index 000000000000..4544e8307c21
--- /dev/null
+++ b/media-sound/jack-rack/jack-rack-1.4.7-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="JACK Rack is an effects rack for the JACK low latency audio API"
+HOMEPAGE="http://jack-rack.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jack-rack/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="alsa gnome lash nls xml"
+
+RDEPEND="x11-libs/gtk+:2
+	>=media-libs/ladspa-sdk-1.12
+	media-sound/jack-audio-connection-kit
+	alsa? ( media-libs/alsa-lib )
+	lash? ( >=media-sound/lash-0.5 )
+	gnome? ( >=gnome-base/libgnomeui-2 )
+	nls? ( virtual/libintl )
+	xml? ( dev-libs/libxml2
+		media-libs/liblrdf )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO WISHLIST )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.4.5-asneeded.patch \
+		"${FILESDIR}"/${PN}-1.4.6-noalsa.patch \
+		"${FILESDIR}"/${PN}-1.4.7-disable_deprecated.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	# Use lrdf.pc to get -I/usr/include/raptor2 (lrdf.h -> raptor.h)
+	use xml && append-cppflags $($(tc-getPKG_CONFIG) --cflags lrdf)
+
+	econf \
+		$(use_enable alsa aseq) \
+		$(use_enable gnome) \
+		$(use_enable lash) \
+		$(use_enable nls) \
+		$(use_enable xml) \
+		$(use_enable xml lrdf)
+}
diff --git a/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild b/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild
new file mode 100644
index 000000000000..7dc77e26f482
--- /dev/null
+++ b/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+MY_P=${PN}_${PV/_/\~}
+DEB_URI="mirror://debian/pool/main/j/${PN}"
+
+DESCRIPTION="JACK Rack is an effects rack for the JACK low latency audio API"
+HOMEPAGE="http://jack-rack.sourceforge.net/"
+SRC_URI="${DEB_URI}/${MY_P}.orig.tar.gz ${DEB_URI}/${MY_P}-1.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="alsa gnome lash +xml"
+
+RDEPEND=">=x11-libs/gtk+-2.12:2
+	>=media-libs/ladspa-sdk-1.12
+	media-sound/jack-audio-connection-kit
+	alsa? ( media-libs/alsa-lib )
+	lash? ( >=media-sound/lash-0.5 )
+	gnome? ( >=gnome-base/libgnomeui-2 )
+	virtual/libintl
+	xml? ( dev-libs/libxml2
+		media-libs/liblrdf )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO WISHLIST )
+
+src_unpack() {
+	unpack ${A}
+	mv ${PN}-* "${S}"
+}
+
+src_prepare() {
+	EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch "${WORKDIR}"/debian/patches
+
+	epatch \
+		"${FILESDIR}"/${PN}-1.4.6-noalsa.patch \
+		"${FILESDIR}"/${PN}-1.4.7-disable_deprecated.patch \
+		"${FILESDIR}"/${P}-noxml.patch \
+		"${FILESDIR}"/${P}-underlinking.patch
+
+	sed -i \
+		-e '/Categories/s:Application:GTK:' \
+		-e '/Icon/s:.png::' \
+		${PN}.desktop || die
+
+	eautopoint
+	eautoreconf
+}
+
+src_configure() {
+	# Use lrdf.pc to get -I/usr/include/raptor2 (lrdf.h -> raptor.h)
+	use xml && append-cppflags $($(tc-getPKG_CONFIG) --cflags lrdf)
+
+	econf \
+		$(use_enable alsa aseq) \
+		$(use_enable gnome) \
+		$(use_enable lash) \
+		$(use_enable xml) \
+		$(use_enable xml lrdf)
+}
diff --git a/media-sound/jack-rack/metadata.xml b/media-sound/jack-rack/metadata.xml
new file mode 100644
index 000000000000..e8461483bf46
--- /dev/null
+++ b/media-sound/jack-rack/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jack-rack</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/jack-smf-utils/Manifest b/media-sound/jack-smf-utils/Manifest
new file mode 100644
index 000000000000..d537d61869a7
--- /dev/null
+++ b/media-sound/jack-smf-utils/Manifest
@@ -0,0 +1,5 @@
+DIST jack-smf-utils-1.0.tar.gz 120497 SHA256 8f2a086fbb5935375590ac45310ca92f17b8d2684299b37b5366de1cbc167a71 SHA512 ee88fe4d77beadf94444ef40f2627a6aafc553e823f54bd33f2355ea553016182da714f34062f3260c5ff030e8f5ea0a6013b8584ec10e5d4d0089dc8d686b64 WHIRLPOOL ea2c66519b1628d4b4b779bc9f3f1a264f54ed00047f0f9b576df800b54db13bff1293c906f4949fbd5792ef35923dba9f397514fdefb3b94f196f758f3bd646
+EBUILD jack-smf-utils-1.0.ebuild 747 SHA256 f7c8038b9fc016d9a9fb7745c7382526580ca458ee75c69bfe16ab16bcb3d4ea SHA512 ce8affa271568c2abbef9827c58301bb6a3e3b6392416e9286a364882e6bddd7fc38284c8e780961869861ed577378f00c18901f8191acba2a21e2c1efb46693 WHIRLPOOL 0806797defcaa9a9fc68bc6abaca7937503c6c4e3409c418e3597123ab6efeb68f13a9e81e03d278b962de9dc490399666c86336bd5c49a91fd09f36a7a3ae87
+MISC ChangeLog 2447 SHA256 101243e5b570266f931a57fd8186080185e25014cd690f003000cf4d3872d219 SHA512 75dca5c1a6730de9bb850e7ea30f246ea4a920a12ece9a0e5783d0405849c18005f51e553fa9d3677a5c1493d1302451fe0df82a1c29f8ba2f3044007a70a59a WHIRLPOOL 8811a68efeff0b6475629d9338b9ebf9ba97d9278c2b808225f140fe267026364ffb08120c0494846d1a0636421955b39aca4a1d701fc663666358862b8bbc4b
+MISC ChangeLog-2015 595 SHA256 68ef8b2cad3d6e268910ffd08272928f5f82719a1472121ba3973bb8bf358460 SHA512 4bf607e01caeae72d9e8233ae10b4c04d5b53506d6bac2c17eb5d997320182995ed40ede50c51672d055cf679702ea326ab14957d4c44339f55023850770001f WHIRLPOOL b08e763416adc17989744199ad37fa74b50787b21a28f31d35add56de1bbd52190ef7012962ea3367a6abc33f8b26306abe0d37f3ee8aaa4809124dd62a2ace9
+MISC metadata.xml 764 SHA256 8b07e161df572468cc0da0a2254393c000ab4a8c01dd3ebbefb3af917d4f19bb SHA512 e12045d41a608c40304c646f70207dcbf10fcca29c81f4c774e8e4fb3517f6f10b61ee3be113122c56c52028aaeecb654a19c044f9f61a573f77d05e213b2717 WHIRLPOOL d403444b5cfe19143ae399c8cdabc8adc16c93092a7646c4360c301741201d5c7f784225f2d67434334511dfe853f37366658aa3faaacb6b4b15b0f76ce1982f
diff --git a/media-sound/jack-smf-utils/jack-smf-utils-1.0.ebuild b/media-sound/jack-smf-utils/jack-smf-utils-1.0.ebuild
new file mode 100644
index 000000000000..dbe6012bc3ff
--- /dev/null
+++ b/media-sound/jack-smf-utils/jack-smf-utils-1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Utilities for MIDI streams and files using Jack MIDI"
+HOMEPAGE="http://pin.if.uz.zgora.pl/~trasz/jack-smf-utils/"
+SRC_URI="http://pin.if.uz.zgora.pl/~trasz/jack-smf-utils/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lash readline"
+
+RDEPEND="readline? ( sys-libs/readline )
+	>=dev-libs/glib-2.2
+	>=media-sound/jack-audio-connection-kit-0.102
+	lash? ( media-sound/lash )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	econf $(use_with readline) \
+		$(use_with lash)
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS TODO
+}
diff --git a/media-sound/jack-smf-utils/metadata.xml b/media-sound/jack-smf-utils/metadata.xml
new file mode 100644
index 000000000000..77ba4a61c5dd
--- /dev/null
+++ b/media-sound/jack-smf-utils/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+<longdescription lang="en">
+	Jack-smf-utils is a set of two utilities - jack-smf-player and
+	jack-smf-recorder - whose purpose is to play and record MIDI streams from/to
+	Standard Midi Files (i.e. the files with .mid extension) using JACK MIDI.
+	There is also smfsh, "SMF shell" that is kind of interactive, command line
+	SMF files manipulation tool which started its life as a debugging aid. And
+	finally libsmf, C library for loading, writing and manipulating the contents
+	of SMF files.
+</longdescription>
+</pkgmetadata>
diff --git a/media-sound/jack/Manifest b/media-sound/jack/Manifest
new file mode 100644
index 000000000000..1760d6855f03
--- /dev/null
+++ b/media-sound/jack/Manifest
@@ -0,0 +1,8 @@
+AUX jack-3.1.1-add-cddbserver-musicbrainz.patch 403 SHA256 65b25c9f35c2d45a623c6f81a31a75173ec69d4684078cb12b4e6c3ae30786a9 SHA512 f51b287c03f3f2589aa9cebbba93ad460481e1a90f0b2e0fa72cd6cda240cae8bcf22aeb731d4d7934c438d4ddf0ed0ee51ff3bbf921d3a26dc0b51660776be3 WHIRLPOOL 3555b8961c83b3a050520a92c4a0daf9d9888aa616a4c037fbb915acea60e1a2cf1190d6eee3f581b68e47020e59f5c16f333fcd858b8669bb64adc26cee054d
+AUX jack-3.1.1-python26.patch 372 SHA256 604baede4c62f5181438b0abff576b7312a132f348baf7900bc8abd6ff6c9655 SHA512 0dd27deeba07774be22a97ac87361f77c1aefd77e4344059d599dab531d416d550f2ab6c6715235387e3f25248b0938520cc8216c85741a8120194d463204de1 WHIRLPOOL 943a8a822f5d0c999794721a7523d4e4fdf9b5a0a446b9b5587eb9a929ad3225211413cd034f156fa805c7086a19e054f7369a2d28ad001ee24ef69215d0b4df
+AUX jack-3.1.1-setup-and-cursesmodule.patch 1827 SHA256 2712535ffa0b0e84063eb5db18520762b38ad9ac2d5d38b537d9cd01094b0582 SHA512 eb2ad68ccf467495ebab9a9bbe3c5d4b84cfe6dbf167820fc89685ec02f8104046aea74d1031fa9bff10ba2755cfd1f00b044250dcef2d16b13aaf86c6db0044 WHIRLPOOL f3fd2fb1f2a9c559d410c5ebe90c27505579e923906849094d5172f5656cdc6eb89bf4adc661ffb40804e23bc22e94e485f2ffb2e4956f99cd3d7e093269ac19
+DIST jack-3.1.1.tar.gz 318119 SHA256 fef030c4ba68a747d11e04c8ec4ca545563dbef519a6b23a3ebd6bb9bcb038cc SHA512 e34bec0ae89a7619e1f446d1259be06415f57697d1b925799d00554940b4cb6cb40eba9e6e7cf9f2f9eacddbed9fe7a9a48e395530c8a701be3979162a9379d7 WHIRLPOOL b7e43e0a422cb405409eb5f411f92d611c9c5922dd84a6749e8b784a4211bf9f6659cb52302adf3e90962b602b74c08f6f7ca9ddfea3e336c278f0827fe1664a
+EBUILD jack-3.1.1-r2.ebuild 1083 SHA256 763a373e39b9040216a2d1cc0e049cc203961053a71efd6dd035a859310d41c9 SHA512 e980aea0194bbaca7e637258363e8a1c2ef481726d4d89a64125a2bc4970fe4757c5fad14c6ce600eab6cb6367f89872323dbca9c2450fee770d1d85c0521cf6 WHIRLPOOL 89db3f0f0c7f32034d6a82d8d0b687a776603b7fc4cdb1352736c33635d7a645d88bf49ede3b4a6bad5fef939b9f5db438641369d476915aacee0ed7b77d12c1
+MISC ChangeLog 2461 SHA256 c54fd789fe7df1586d5ad676ec84b69ab8bc50a696e776a07bbd1029bb79c7e0 SHA512 157dfe977e5619ca87d2a46b84537d0af71d9f15c549d6799dddea2752771fcfad5476b2c1b15956680e03d1a9c49ed265fcce4295efd89ed5f05900b594cc7f WHIRLPOOL 3fbd3336df33d1d017f3d9575f849c15cb91a5ed5c931df81feac8549c3100ac02eaaa23b4beb3a96ae3aa90e048acff6d845efc71534b159d5c8886e0d48072
+MISC ChangeLog-2015 3167 SHA256 d1246f4f378c1defa159097203f5c9a7e158487a9d2d1734f5c38fa5a2de5390 SHA512 e22ef2ac1a7cee4d6762e73bfb6c63dee2a4f122940a68db9d38e67fdaf22715c08700bab23ac34a38438ceaf187a03bcf271208f4cc5b4620654875b457346c WHIRLPOOL 8cc28c64b5acd3d08094c3a271af2c1ad814ff6591539afecf5711d46d2eb15ac87cd9ea0b7b1e6c1367c1e0a6b840475cdf56769f7fb08554600f7a0630433f
+MISC metadata.xml 481 SHA256 12f48d3b053eb40f024be961b3f0bc87014034f24109affaf63b1299ae85ce5c SHA512 da4b26c98824b1c2798f941ae95e0bcb4cdd6ef654dff4965d28b3fa8f3952a6162e028d793c9a9e9f866d74c22b3ed74cc99779efb84cd0eef5134c89dde8ac WHIRLPOOL c08f2da858778e2624aa0db50133e1b554a456631931fe75cc5f73afcb5844ac9b530391d18ed4a89129428adffd818a49c49b9b2d0b9d97ca31b0ed2d1bd97f
diff --git a/media-sound/jack/files/jack-3.1.1-add-cddbserver-musicbrainz.patch b/media-sound/jack/files/jack-3.1.1-add-cddbserver-musicbrainz.patch
new file mode 100644
index 000000000000..150c44090642
--- /dev/null
+++ b/media-sound/jack/files/jack-3.1.1-add-cddbserver-musicbrainz.patch
@@ -0,0 +1,15 @@
+--- a/jack_freedb.py
++++ b/jack_freedb.py
+@@ -46,6 +46,12 @@
+         'mail': "freedb-submit@freedb.org",
+         'my_mail': "default"
+     },
++    'musicbrainz': {
++        'host': "freedb.musicbrainz.org",
++        'id': prog_name + " " + prog_version,
++        'mail': "",
++        'my_mail': "default"
++    },
+ }
+ 
+ def interpret_db_file(all_tracks, freedb_form_file, verb, dirs = 0, warn = None):
diff --git a/media-sound/jack/files/jack-3.1.1-python26.patch b/media-sound/jack/files/jack-3.1.1-python26.patch
new file mode 100644
index 000000000000..c3e0a0c9f856
--- /dev/null
+++ b/media-sound/jack/files/jack-3.1.1-python26.patch
@@ -0,0 +1,12 @@
+--- a/jack_functions.py
++++ b/jack_functions.py
+@@ -219,9 +219,9 @@
+     ff = blocks % CDDA_BLOCKS_PER_SECOND
+     return mm, ss, ff, blocks
+
+-def starts_with(str, with):
+-    "checks whether str starts with with"
+-    return str[0:len(with)] == with
++def starts_with(str, withstr):
++    "checks whether str starts with withstr"
++    return str[0:len(withstr)] == withstr
diff --git a/media-sound/jack/files/jack-3.1.1-setup-and-cursesmodule.patch b/media-sound/jack/files/jack-3.1.1-setup-and-cursesmodule.patch
new file mode 100644
index 000000000000..d3e016289a81
--- /dev/null
+++ b/media-sound/jack/files/jack-3.1.1-setup-and-cursesmodule.patch
@@ -0,0 +1,47 @@
+--- a/jack_t_curses.py
++++ b/jack_t_curses.py
+@@ -35,11 +35,9 @@
+ try:
+     from jack_curses import endwin, resizeterm, A_REVERSE, newwin, newpad, initscr, noecho, cbreak, echo, nocbreak
+ except ImportError:
+-    warning("jack_curses module not found, trying normal curses...")
++    info("jack_curses module not found, using normal curses...")
+     try:
+-        from curses import endwin, A_REVERSE, newwin, newpad, initscr, noecho, cbreak, echo, nocbreak
+-        def resizeterm(y, x):
+-            pass
++        from curses import endwin, resizeterm, A_REVERSE, newwin, newpad, initscr, noecho, cbreak, echo, nocbreak
+     except ImportError:
+         print "curses module not found or too old, please install it (see README)"
+ 
+--- a/setup.py
++++ b/setup.py
+@@ -2,7 +2,7 @@
+
+ """Setup script for the jack module distribution."""
+
+-from distutils.core import setup, Extension
++from distutils.core import setup
+
+ setup( # Distribution meta-data
+     name = "jack",
+@@ -11,11 +11,7 @@
+     author = "Arne Zellentin",
+     author_email = "zarne@users.sf.net",
+     url = "http://www.home.unix-ag.org/arne/jack/",
+-
+-    # Description of the modules and packages in the distribution
+-    ext_modules = [ Extension('jack_cursesmodule',
+-    ['cursesmodule/jack_cursesmodule.c'], libraries=["ncurses"],
+-    extra_compile_args=["-Wno-strict-prototypes"]) ],
++    scripts=['jack'],
+
+     py_modules = [ 'jack_CDTime', 'jack_TOC', 'jack_TOCentry', 'jack_argv',
+     'jack_checkopts', 'jack_children', 'jack_config', 'jack_constants',
+@@ -26,6 +22,3 @@
+     'jack_ripstuff', 'jack_status', 'jack_t_curses', 'jack_t_dumb', 'jack_tag',
+     'jack_targets', 'jack_term', 'jack_utils', 'jack_version', 'jack_workers']
+ )
+-
+-print "If you have installed the modules, copy jack to some place in your $PATH,"
+-print "like /usr/local/bin/."
diff --git a/media-sound/jack/jack-3.1.1-r2.ebuild b/media-sound/jack/jack-3.1.1-r2.ebuild
new file mode 100644
index 000000000000..59c46f78ae98
--- /dev/null
+++ b/media-sound/jack/jack-3.1.1-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A frontend for several cd-rippers and mp3 encoders"
+HOMEPAGE="http://www.home.unix-ag.org/arne/jack/"
+SRC_URI="http://www.home.unix-ag.org/arne/jack/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/cddb-py[${PYTHON_USEDEP}]
+	dev-python/id3-py[${PYTHON_USEDEP}]
+	dev-python/pyid3lib[${PYTHON_USEDEP}]
+	dev-python/pyvorbis[${PYTHON_USEDEP}]
+	media-libs/flac
+	media-sound/lame
+	media-sound/cdparanoia"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.1-python26.patch"
+	"${FILESDIR}/${PN}-3.1.1-setup-and-cursesmodule.patch"
+	"${FILESDIR}/${PN}-3.1.1-add-cddbserver-musicbrainz.patch"
+)
+
+python_install_all() {
+	insinto /etc
+	newins example.etc.jackrc jackrc
+
+	newman jack.man jack.1
+
+	local DOCS=( README doc/ChangeLog doc/TODO )
+	local HTML_DOCS=( doc/*.{html,css,gif} )
+	distutils-r1_python_install_all
+}
diff --git a/media-sound/jack/metadata.xml b/media-sound/jack/metadata.xml
new file mode 100644
index 000000000000..e89252b7a39a
--- /dev/null
+++ b/media-sound/jack/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
new file mode 100644
index 000000000000..644345628ffd
--- /dev/null
+++ b/media-sound/jack2/Manifest
@@ -0,0 +1,6 @@
+DIST jack2-1.9.10.tar.gz 6415555 SHA256 88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d SHA512 0bee815356e9e572224e7cc484c402f38797d70257c4bc79a47552ae30a25a4600c61f712a73cbbede52cd8cb8dc144c9334e28c10e23354a11b7223ee0bb0ca WHIRLPOOL a7b4e14fb1e0490955a363fe0680558d89f80c3cdf18a840991b636518ecf55d872d91d9024770874b5d28494e2cbadc0f21ce4b73ee7873f62842fb0339b0c5
+DIST jack2-1.9.11-RC1.tar.gz 6481650 SHA256 730eee0de2136e62b358f4b65d9e30109d706d2627eb2998e43763b47b17474f SHA512 4fd7d82ab6536b8c6061023858ae5b978903608b149498818971481da75c6e9e0e7e7aef5e1343730c259f4378aebfbf25916b9736e0ad8aa19584a44f894436 WHIRLPOOL 6401f16b5ef5331602c6b3c14c709adf17f765700959d87494738960c8e1407cc894789ef8b11452ca9621a9e18e93407d81ede0846118efbb81560bbe9435e6
+EBUILD jack2-1.9.10.ebuild 2344 SHA256 fc3db265ad7ab896438fa58f943d3a890ba4fe5bb9edda6980e3d421e4efc3d3 SHA512 5a9ab02ab4e9e8cdf1bcf558b90d1d5f890548492058cb679685e700ba3c538d694e7506ccdb2f44c81d98e90c3d3caf7fe72e60b6b24cbee6664c9f4efa2ae3 WHIRLPOOL c1ea5b9e0e6864d1e0f03c63ed9c80b6314db59a19bca0a0caeb2a1218bb8bc6b77de092f4692f125febd9a662d7db8d70c160567fe261ad7d85295cc4539fe9
+EBUILD jack2-1.9.11_rc1.ebuild 2233 SHA256 23f5c067afbff0e89589b6f422db2c29f54bfa4a4e8005fa6c83635de65b74c5 SHA512 e029d81ff459bfeb080c190189f99ebedf3c87ee266eef54a1c9d8fc3bcc2b4d8bb05822c1269bbb374e6f752c7673f44f36ef4bfbaf1cde79168ebabd87a43f WHIRLPOOL 558d46cfc5b235cc32a558d6f5fc9c40cc89fef15f6999d70e1c8d94c76406d17741492aec675ded070013ac190de9ef81ec43875d2812341975e643a747b1cd
+MISC ChangeLog 474 SHA256 e4b972153d7232363276a7d71c4dc73d1e0538ea5a7762a4df8184ad0ef76ea0 SHA512 286a42423b6477db4aabb82660da9e756358f5892fcdb0be5b1e0e4e600ca89b92d11e5608e3798eb19c436e1131c124f34d9251809882306692788c57726b93 WHIRLPOOL d282fd72b31e0f1817ecb3f7c0de2db547367b01c0a052b55f2e518733fe598d65d748d353d3b6bdfe1a9abc257be50fe3fb6286f5e5426cacd020bec63e96f4
+MISC metadata.xml 679 SHA256 4b2676eab2302acb18592bdfabc4eaa9851c90be9328c0f1c2d2730cc4f9a93a SHA512 8c6fc8ce9dc151cdc8adc2092a661a76ef0fd12fc8f2c922be3e7a75215e40ed5b352f8099906ae6a883fd3a3edb674d0a6784831d2cd9b881b474cf6c419152 WHIRLPOOL 3c5039f3dfccdc85d0b1664c353cb3c4fe2db3de09e495a7fa166eb4d6777642008edbf4d3821793d287be0a5d1f4c00c7a542f9d907a3b90fe52ce32e18203d
diff --git a/media-sound/jack2/jack2-1.9.10.ebuild b/media-sound/jack2/jack2-1.9.10.ebuild
new file mode 100644
index 000000000000..e14f43d964f7
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.10.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+[[ "${PV}" = "2.9999" ]] && inherit git-r3
+inherit eutils python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://jackaudio.org/"
+
+RESTRICT="mirror"
+if [[ "${PV}" = "2.9999" ]]; then
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/jackaudio/${PN}/archive/v${PV}.tar.gz -> jack2-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa celt dbus doc opus pam"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: automagic deps: readline, samplerate, sndfile, celt, opus
+# FIXME: even though sndfile is just used for binaries, the check is flawed
+#	making the build fail if multilib libsndfile is not found.
+CDEPEND="media-libs/libsamplerate[${MULTILIB_USEDEP}]
+	media-libs/libsndfile[${MULTILIB_USEDEP}]
+	sys-libs/readline:0
+	${PYTHON_DEPS}
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+[[ "${PV}" = "2.9999" ]] || S="${WORKDIR}/jack2-${PV}"
+
+DOCS=( ChangeLog README README_NETJACK2 TODO )
+
+src_unpack() {
+	if [[ "${PV}" = "2.9999" ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local mywafconfargs=(
+		$(usex alsa --alsa "")
+		$(usex dbus --dbus --classic)
+	)
+
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+
+	if multilib_is_native_abi && use doc; then
+		doxygen || die "doxygen failed"
+	fi
+}
+
+multilib_src_install() {
+	multilib_is_native_abi && use doc && \
+		HTML_DOCS=( "${BUILD_DIR}"/html/ )
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/jack2/jack2-1.9.11_rc1.ebuild b/media-sound/jack2/jack2-1.9.11_rc1.ebuild
new file mode 100644
index 000000000000..4f0738fc56c4
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.11_rc1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+inherit eutils python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://jackaudio.org/"
+
+if [[ "${PV}" = "2.9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+	KEYWORDS=""
+else
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa celt dbus doc opus pam classic sndfile libsamplerate readline"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
+	${PYTHON_DEPS}
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( ChangeLog README README_NETJACK2 TODO )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local mywafconfargs=(
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=$(usex celt yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=no
+		--freebob=no
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
+	)
+
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+}
+
+multilib_src_install() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml
new file mode 100644
index 000000000000..5156eca67d7a
--- /dev/null
+++ b/media-sound/jack2/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <use>
+    <flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
+    <flag name="celt">Support CELT low delay audio codec (<pkg>media-libs/celt</pkg>)</flag>
+    <flag name="opus">Support <pkg>media-libs/opus</pkg></flag>
+    <flag name="classic">Enable building of jackd</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">jackaudio/jack2</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/jackbeat/Manifest b/media-sound/jackbeat/Manifest
new file mode 100644
index 000000000000..3821620a55dd
--- /dev/null
+++ b/media-sound/jackbeat/Manifest
@@ -0,0 +1,7 @@
+AUX jackbeat-0.7.6-automagic-pulse.patch 1150 SHA256 df094ccf521c549e62f2eefa142208f39bb9017b08d04474a151eb0f89a49771 SHA512 4a3dc8d634a0cdf5162be4c2d0a2809231a83a11401a14a7aff86a6090e29674a09bc76a4ab928ef2f102b1e61f014b1d5ebbd24604396f51aecf843b7e6ecf2 WHIRLPOOL 674cb3a753a5aca07dc02ab2c8963f42c2825674e64c717ab08ec5385b8b9e4bbec7427f5b072aa28692ef962e7b593e89ff0a468dde175d3b15ed27699eb24f
+AUX jackbeat-0.7.6-underlinking.patch 691 SHA256 26201ee52e2f3b87b282fac184702f7fa041c62d26027a6b4781c20eea7a7a0d SHA512 4d6ac8f6413358c15bb695a2539445bf97544a0a5628eb7be8f06e29a1cad7b77894503d1deec49ecb07814efb9a58a8cd1e06213ecaaa0927ceef5ccd8b2b8d WHIRLPOOL bf8b6099d2f5f4f1e4e0546be1e85a28ce827d97a3cd13c64e0d84b0a2dc60b372507b68f2e0021e9a4638609682b4f354017a4e92aa2ff3dc154d7386aa17bb
+DIST jackbeat-0.7.6.tar.gz 455771 SHA256 0f17d9fab398e87564da89a7e174005a3dd7e16980bb49f395a7f82c866ae6c4 SHA512 878cd545cd4d53b2e3ab6e4a8b60d81a94fba22cfaab3b694046b8d47d23ca5a87eaa31a242f76449a1ee647bc20b218563261ae37f5bfe291da2e31c63124bc WHIRLPOOL e3e47ef5c0e107f0149479ecd2bd3b9fa5595706fd577ad5cd89c40e3ef0dff18a42daec4529d254c29e79138924d5a6c1d8aae82b9305b9619c9f321614f8fe
+EBUILD jackbeat-0.7.6.ebuild 1085 SHA256 b6f033d0d5e4451e4b2469d39cd8b20680a5f7e501289067dc95eee44434fe57 SHA512 bad232a2d7bf0b88ca43cc3cd975de44b33916dcf46735f1c21fabd7b7cc7bea1b039e70f0f26d7198e48577949c8289d8f73fa2b1ab22601b897feece74b988 WHIRLPOOL 00eb76e5d46687880958a5fa2853da0c26285c02270f832a5762d4658b53ae36933fdb00cb2ba2afa7f2a32654c2be61aeb438d0dc0f937f35470f434967a86c
+MISC ChangeLog 2524 SHA256 54c593a9751e27174b319c4970d146bb0d7943fba2606ca7fbba1bb41adc79a5 SHA512 ecd235f0dd88ba17ef07e1c8549eb7aa10c9b0b02347553907504e994c209051f72c74e950f0d48631c9701d53d0ada771481ac900b952dc3a2aea3e95db8cfa WHIRLPOOL efb7bd133df1005afccb60caceccd6e222b6eb86b1311880eabc6128190e87167523fa67c4756bbdf12b0b5492325821b2edd2f25d87af83212ad664889b059d
+MISC ChangeLog-2015 1236 SHA256 50d26603212cb34402c49976c15e4c7a2ff443bc26d36d5d2ed842b6b27ae12f SHA512 d4b5129df97c218c88c9215a4e287c6e3e03a4d514d76bd765681845ee17bfb3ffbb64292de07494e98f3a88e83f573e1ed03ab91a2172a05a2390c017613022 WHIRLPOOL c40621a59b870bd08b68f395c221788e2ba3a5b3dd6bc7cf01e5f91fccb733f1872acd7376dc2e2e3c9342e2eba18a1e9de3b8ddac2680bae48c0d9ac21ea4a9
+MISC metadata.xml 255 SHA256 fc6dd027d0011f9f42d437ea0687857760a11bf2137f8822ec8692186d0bcbe3 SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 WHIRLPOOL de03966b13986c67a61f862755281e80740260a9031e5e34cbee88a3053e66f705df0f36499b154744ff447c94e19a28b8649535e08819216569e78eb4ce9a38
diff --git a/media-sound/jackbeat/files/jackbeat-0.7.6-automagic-pulse.patch b/media-sound/jackbeat/files/jackbeat-0.7.6-automagic-pulse.patch
new file mode 100644
index 000000000000..5f1aca5d3a32
--- /dev/null
+++ b/media-sound/jackbeat/files/jackbeat-0.7.6-automagic-pulse.patch
@@ -0,0 +1,36 @@
+--- jackbeat-0.7.6/configure.ac.orig
++++ jackbeat-0.7.6/configure.ac
+@@ -67,20 +67,25 @@
+ AC_SUBST(JACK_LIBS)
+ AM_CONDITIONAL(HAVE_JACK, [test "$have_jack" = "1"])
+ 
+-PKG_CHECK_MODULES(PULSE, libpulse-simple >= 0.9.10, [have_pulse=1], true)
+-AC_SUBST(PULSE_CFLAGS)
+-AC_SUBST(PULSE_LIBS)
+-if test "$have_pulse" = "1"
++AC_ARG_WITH([pulse], [AS_HELP_STRING([--without-pulse], [disable PulseAudio support])], [], [with_pulse=yes])
++
++if test "x$with_pulse" != xno
+ then
+-  AC_DEFINE(HAVE_PULSE, [1], [PulseAudio support])
++  PKG_CHECK_MODULES(PULSE, libpulse-simple >= 0.9.10, [have_pulse=1], true)
++else
++  AC_MSG_CHECKING([for PULSE])
++  AC_MSG_RESULT([disabled])
+ fi
+-AM_CONDITIONAL(HAVE_PULSE, [test "$have_pulse" = "1"])
+ 
+-if test "$have_pulse" = "" && test "$is_linux" = "1"
++if test "$have_pulse" != ""
+ then
+-  AC_MSG_WARN([Can't find libpulse, PulseAudio will not be supported])
++  AC_DEFINE(HAVE_PULSE, [1], [PulseAudio support])
+ fi
+ 
++AC_SUBST(PULSE_CFLAGS)
++AC_SUBST(PULSE_LIBS)
++AM_CONDITIONAL(HAVE_PULSE, [test "$have_pulse" = "1"])
++
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12, [have_pkg_gtk=true], true)
+ 
+ if test x$have_pkg_gtk = xtrue
diff --git a/media-sound/jackbeat/files/jackbeat-0.7.6-underlinking.patch b/media-sound/jackbeat/files/jackbeat-0.7.6-underlinking.patch
new file mode 100644
index 000000000000..878929c36693
--- /dev/null
+++ b/media-sound/jackbeat/files/jackbeat-0.7.6-underlinking.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/508988
+
+jackbeat-builder.o:builder.c:function gui_builder_connect_func: error: undefined reference to 'g_module_symbol'
+jackbeat-builder.o:builder.c:function gui_builder_connect_func: error: undefined reference to 'g_module_supported'
+jackbeat-builder.o:builder.c:function gui_builder_connect_func: error: undefined reference to 'g_module_open'
+
+--- configure.ac
++++ configure.ac
+@@ -86,7 +86,7 @@
+ AC_SUBST(PULSE_LIBS)
+ AM_CONDITIONAL(HAVE_PULSE, [test "$have_pulse" = "1"])
+ 
+-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.12, [have_pkg_gtk=true], true)
++PKG_CHECK_MODULES(GTK, gmodule-2.0 gtk+-2.0 >= 2.12, [have_pkg_gtk=true], true)
+ 
+ if test x$have_pkg_gtk = xtrue
+ then
diff --git a/media-sound/jackbeat/jackbeat-0.7.6.ebuild b/media-sound/jackbeat/jackbeat-0.7.6.ebuild
new file mode 100644
index 000000000000..eb5ed5f99dbb
--- /dev/null
+++ b/media-sound/jackbeat/jackbeat-0.7.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="An audio sequencer for Linux"
+HOMEPAGE="http://www.samalyse.com/jackbeat/"
+SRC_URI="http://www.samalyse.com/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jack pulseaudio"
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/libxml2-2.6:2
+	gnome-base/libglade:2.0
+	>=media-libs/liblo-0.22
+	>=media-libs/libsamplerate-0.1.2
+	>=media-libs/libsndfile-1.0.15
+	media-libs/alsa-lib
+	media-libs/portaudio
+	jack? ( >=media-sound/jack-audio-connection-kit-0.101 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.10 )
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.12:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-automagic-pulse.patch \
+		"${FILESDIR}"/${P}-underlinking.patch
+
+	# Don't install license file
+	sed -i -e 's:help::' pkgdata/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with jack) \
+		$(use_with pulseaudio pulse)
+}
diff --git a/media-sound/jackbeat/metadata.xml b/media-sound/jackbeat/metadata.xml
new file mode 100644
index 000000000000..f79bb67acbd9
--- /dev/null
+++ b/media-sound/jackbeat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
new file mode 100644
index 000000000000..1af1514ac570
--- /dev/null
+++ b/media-sound/jalv/Manifest
@@ -0,0 +1,6 @@
+AUX jalv-1.6.0-qt-5.7.0.patch 906 SHA256 373cea63c28d179275da656a0ab09638eeafd0dd269e11185b668c2395af5f2f SHA512 b5ddc63afc7340a0d2d14bd924c7adc1393d469031c3d1c37210e21090b1159c2fd3879e627f8c8e611452d9ade40a9fe18de9e63880bdbd2f05caf96209b163 WHIRLPOOL 2ee62871c06e519cd0486802585974b67a34da22b4e8e42c14dfb69744b9d83484e7be323332bb5a5ff25ee3e465c36b82cb3ab3c664fc8cbcb27c1fcd579038
+DIST jalv-1.6.0.tar.bz2 157726 SHA256 914625972bb2e99552a0bb0ae3b5d27f70901b92fab1f6daf8fb31d1ffbf5cf4 SHA512 70453404788846774ef88b43653379f97140301e09e8de61779683df9ee85120485bebf03c959624639dc4d8dd71ce83db2a89b14b66be17696a88d1820ac1b3 WHIRLPOOL 67cf715624a0355f1e3927fb9a9a97ea1375069b24c9445c2fecf8c11611a1d884c58ed10134784f6d093fc52181aacdbefb13314d5713ddee032287215573e4
+EBUILD jalv-1.6.0-r1.ebuild 1362 SHA256 a2f9f0a2cb04d6c7f429f56915d9b081cecdb00ec2a40b70d821b013f135b4ec SHA512 12f810c07ed4a7090cfee9dc46d1439595d5b4d9dc194547cf5d4367052ca9a4e2cc043bd062e6e6482dec11fdd17acbbc20c12f08d9c534c4514d93327bf84b WHIRLPOOL 85eac427b90c29c2357ed7f6d0feeccb8aed9dcdd99584f58a42ea797d4f8ad33b702fffe1df959fd3505aa9a8d0719059f6909eddcbe83557faac452e209180
+MISC ChangeLog 2912 SHA256 2e9e873c8acaa7d398014d313055e8dfb2d163d6638612771df93d117d32059f SHA512 c2eb731679dc68d2587ffc6732c9f221ba0d2710970f6e7a9566d382cbd0a16cd58b5252c97202a1b93b032ee35335953f4976c08ece478deaea6152723c378e WHIRLPOOL dfbbbd1fdf558d52c4bd71ded52017939d5dfe063db7b437343322168ddf94727236d79e1e8b561a62800b5a2f75b547b13983f9bc82d9235301b1f047078822
+MISC ChangeLog-2015 1273 SHA256 bfbb0dfb9135a46c1bfb1262faf8de7c63d16445792a895bbb9fb1589b55a53c SHA512 9f5e354d1518a587813a462934588ed815ce078bb622ac12bd14f1d5fc8fd87d85eb7990f4b4146836b4e27fd476d67f0d1a020ac6c2d78758026ee5382676fd WHIRLPOOL 657b1d73c4d13a3b835768ec45616d0fc37961036cd7163938aed28b3703f2716a52a779bb35abb4c65f6dc56c52e1ff5e97002af88cb0faf72352fd1dbb68ed
+MISC metadata.xml 1152 SHA256 805b70351efb25fb21883f4a0f428027c69e73f9ef468d47c884c9f3b8c1f481 SHA512 e9b1e1f84df16a830785b7020eeb35369d0c0465b82b3033cc0714f4df706b0b63a946c0dc1051d3c1a3b185e5c9563189a05482c2e1013462592d3b1150b29c WHIRLPOOL cccdfd5fb5b8277e3ca8de981cd899deff7780fc7ec10e6636bae9405594b4cf938ba441010dcdd66358f000fea4fa1764f3d337f3dfd3bd5b06758eeb5bf978
diff --git a/media-sound/jalv/files/jalv-1.6.0-qt-5.7.0.patch b/media-sound/jalv/files/jalv-1.6.0-qt-5.7.0.patch
new file mode 100644
index 000000000000..f6ca944b04c8
--- /dev/null
+++ b/media-sound/jalv/files/jalv-1.6.0-qt-5.7.0.patch
@@ -0,0 +1,31 @@
+From c32f3ca76a09c03fe9a022eb46e049e6fd5e2dbb Mon Sep 17 00:00:00 2001
+From: David Robillard <d@drobilla.net>
+Date: Sat, 7 Jan 2017 19:20:55 -0500
+Subject: Fix compilation with newer versions of Qt5
+
+
+diff --git a/wscript b/wscript
+index 24f5a2b..08df946 100644
+--- a/wscript
++++ b/wscript
+@@ -5,7 +5,7 @@ from waflib.extras import autowaf as autowaf
+ import waflib.Options as Options
+ 
+ # Version of this package (even if built as a child)
+-JALV_VERSION = '1.6.0'
++JALV_VERSION = '1.6.1'
+ 
+ # Variables for 'waf dist'
+ APPNAME = 'jalv'
+@@ -231,7 +231,7 @@ def build(bld):
+                   includes     = ['.', 'src'],
+                   lib          = ['pthread'],
+                   install_path = '${BINDIR}',
+-                  cxxflags     = ['-fPIC'])
++                  cxxflags     = ['-fPIC', '-std=c++11'])
+         autowaf.use_lib(bld, obj, libs + ' QT5')
+ 
+     # Man pages
+-- 
+cgit v0.10.2
+
diff --git a/media-sound/jalv/jalv-1.6.0-r1.ebuild b/media-sound/jalv/jalv-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..76a06677aae4
--- /dev/null
+++ b/media-sound/jalv/jalv-1.6.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 qmake-utils waf-utils
+
+DESCRIPTION="Simple but fully featured LV2 host for Jack"
+HOMEPAGE="http://drobilla.net/software/jalv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gtk gtk2 gtkmm portaudio qt5"
+
+RDEPEND=">=media-libs/lv2-1.6.0
+	>=media-libs/lilv-0.24.0
+	>=dev-libs/serd-0.14.0
+	>=dev-libs/sord-0.12.0
+	>=media-libs/suil-0.6.0
+	>=media-libs/sratom-0.6.0
+	gtk? ( >=x11-libs/gtk+-3.0.0:3 )
+	gtk2? ( >=x11-libs/gtk+-2.18.0:2 )
+	gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 )
+	portaudio? ( media-libs/portaudio )
+	!portaudio? ( virtual/jack )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.7.0.patch" )
+
+src_configure() {
+	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
+	waf-utils_src_configure \
+		"--docdir=/usr/share/doc/${PF}" \
+		--no-qt4 \
+		$(use qt5       || echo --no-qt5)       \
+		$(use gtk       || echo --no-gtk3)      \
+		$(use gtk2      || echo --no-gtk2)      \
+		$(use gtkmm     || echo --no-gtkmm)     \
+		$(use portaudio && echo --portaudio)
+}
diff --git a/media-sound/jalv/metadata.xml b/media-sound/jalv/metadata.xml
new file mode 100644
index 000000000000..de663c86a7ee
--- /dev/null
+++ b/media-sound/jalv/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+
+<longdescription lang="en">
+	Jalv is a simple but fully featured LV2 host for Jack. It runs LV2 plugins and exposes their ports as Jack ports, essentially making any LV2 plugin function as a Jack application.
+
+	Jalv is a small program which is useful, but also intended to be an appropriate test host for plugin development. It runs plugins from the command line with no user interaction, is light enough to run in valgrind, and is capable of dumping all plugin to/from UI communication in a human readable format.
+
+	To make it simple to test plugins in hosts that use different toolkits, there are several Jalv executables: jalv, jalv.gtk, jalv.gtkmm, and jalv.qt.
+</longdescription>
+
+<use>
+	<flag name="gtk2">Adds support for GTK+2 in addition to GTK+3 controlled by the gtk useflag.</flag>
+	<flag name="gtkmm"> Adds support for <pkg>dev-cpp/gtkmm</pkg>: C++ interface for GTK+2</flag>
+</use>
+
+</pkgmetadata>
diff --git a/media-sound/jamin/Manifest b/media-sound/jamin/Manifest
new file mode 100644
index 000000000000..424b15c6c087
--- /dev/null
+++ b/media-sound/jamin/Manifest
@@ -0,0 +1,8 @@
+AUX jamin-0.95.0-desktop.patch 308 SHA256 54669a185a4f3945f63979034f23e7b2823f084900a750de1793a53e77548a59 SHA512 e8a5af5ab288af1f4dceb9db09dd42a4eafc1beee14437b5b017085b597d014b76df03320c3089398f24fca9fe95dc49d4bb9ec107d7776b5102b4518d652775 WHIRLPOOL 342f4cde3268278d35ee6946b685e77d27325c759326fc0d095900a6b19bb89bd091a72dc83c2b22a38d8c6a4d21a1c7eb302b51df4cf5c20091a382ac8645fb
+AUX jamin-0.95.0-multilib-strict.patch 335 SHA256 6a8a75839055698e3149f813d6e0b4e676525e85939729bc058018aefc933774 SHA512 14adfe893d4ea18efbb3a936df34f163689a0cf734ca391d80558d92c4ef82cb944f94d962ecba25fc358e2756b252302ac648d789a850fab608216588d5ed03 WHIRLPOOL e4475ddd4aec0788e865ae32ea52d04d6ed629b9f633f1ec87e862bb590bb1a408338c42f1c4211040a98e32596c52d3623638517d06affe4b9bc3926afc4623
+DIST jamin-0.95.0.tar.gz 1007290 SHA256 762fee88682f27888e46dfb013a9ab5e798533b9b67643ff1d7760501939bb3c SHA512 c57079b65e89623ee6b3f1e71d4ce1c2d995e4a14f8decd17b5d936e99469bb85089da063358e966fdc19a6fa419698c9ca586909d85d69b0525e929a3bd2555 WHIRLPOOL 11d45876b44a1ac0fb115cfeff785f484eb3f350f91d0efccf26b6ac46f9b562b81e75f24f1f9ce1f8eab6e18c9ab6ddd49b6a16bb7136d82b319bf5498fee6e
+EBUILD jamin-0.95.0-r2.ebuild 889 SHA256 a4804de3c809722827c239835e62d039a4098b1ffc1ff8950e541ee9ec506edd SHA512 acebc8735d41e94771917b271236e88e2eca5d0dedaafa2ac42952e4c1754cdedb66c6945bf2dc04c61f2f4922cf07cb8b801ec9dacd9710a2d10c909e0b503d WHIRLPOOL a18fb8af840b976adee7b6303a8d61a41cf2d81df7f17c2a9c646aa38ce9790dc797a8c04928572d989e7898cd1e98af45de7a1b38484484ea1afbe1751c6691
+EBUILD jamin-0.95.0-r3.ebuild 888 SHA256 c92eb0bd64bdbb9e2ba3c7118c587d286a2b1748b427a492eaa228e15f46d518 SHA512 028804c0242b00576c4f587cc3e00114998418be51993c4f84058cc0c737e5fdb95b295c9f2bc6d3a1a1ecbd7bd5677a8dff9f0881a4454a4189de6314381326 WHIRLPOOL 7146a3529ab498edfbc7366b4ef40d8755f721231f019d38dd1c402a46e2fc4e13289761ff5996d6f495819a308002675279035569a55bd4bfb6afacdc704289
+MISC ChangeLog 2740 SHA256 ff9cf9ec2c1038418d363cbf004fa2629cee294fa4681045b0bf66cd3899e4d0 SHA512 f9903aeedb2f7e601378771b1d4c8745636f67cfb0ef818c6764392a01016337e83b63e588586ddb34b09a2eda84279941e0ffc31cd071e8d24fe97383254add WHIRLPOOL 4f0fd886333f0bb717725088c8f98612f07d9d21f3827e6bb75dae655ba1fb97039a42aec323a4299dd5ebd3f3dde32ee59248b92808cbcd41a57f92c0ca4fd5
+MISC ChangeLog-2015 2927 SHA256 f3f05bd2ec42c138214e27d17a048b042be97b6e6981f610d337d4209e764ebc SHA512 a5d0027b30e1b474e321adafedca3b1e4306847b1c9a4a38f840654404f87b0cb444a5156c2177da2fc009a1ede2ba19d5f70c4b8cbb5de15a4bc82d9cbeb52e WHIRLPOOL 415e78e8cea1333607c70fcabbaca4fac82a91cdd36a9562cc234558a7e19b80810e809d8a8ec3b0d4517f4a1c032ee1dadb5386069f2bba2bbd8e869adefc96
+MISC metadata.xml 334 SHA256 45db354baf3cbbeaf1fa55014aa3557695e0365aec0c2c7e688e023bfdac3626 SHA512 4b263c4fc008cbc6e415426fa782c934c55ad5d5f7d7d257ca79e414234cc5284c0edc938d138dcadb670bfbe35857a6103ac0b990f099e694c69e7ae349656a WHIRLPOOL de452d81130c6cae78dfec40a0a9b355d71717632c4ed3ce1dc0495658a724d61268dcc67d8514ae9d3e0e051dc9b315419877533a7b6b9a27cc474cbea2af63
diff --git a/media-sound/jamin/files/jamin-0.95.0-desktop.patch b/media-sound/jamin/files/jamin-0.95.0-desktop.patch
new file mode 100644
index 000000000000..87cad61a0d0c
--- /dev/null
+++ b/media-sound/jamin/files/jamin-0.95.0-desktop.patch
@@ -0,0 +1,14 @@
+--- a/data/jamin.desktop.in
++++ b/data/jamin.desktop.in
+@@ -3,9 +3,9 @@
+ _Name=JAMin
+ _GenericName=
+ _Comment=JACK Audio Mastering interface
+-Categories=Application;AudioVideo;
++Categories=AudioVideo;
+ Exec=jamin
+-Icon=jamin.svg
++Icon=jamin
+ MimeType=application/x-jamin;
+ StartupNotify=true
+ Terminal=false
diff --git a/media-sound/jamin/files/jamin-0.95.0-multilib-strict.patch b/media-sound/jamin/files/jamin-0.95.0-multilib-strict.patch
new file mode 100644
index 000000000000..e2e13ce6f452
--- /dev/null
+++ b/media-sound/jamin/files/jamin-0.95.0-multilib-strict.patch
@@ -0,0 +1,9 @@
+--- a/controller/Makefile.am
++++ b/controller/Makefile.am
+@@ -1,5 +1,5 @@
+ plugin_LTLIBRARIES = jamincont_1912.la
+-plugindir = @prefix@/lib/ladspa
++plugindir = @libdir@/ladspa
+ jamincont_1912_la_CFLAGS = @OSC_CFLAGS@ -I../src
+ jamincont_1912_la_LIBADD = @OSC_LIBS@
+ jamincont_1912_la_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
diff --git a/media-sound/jamin/jamin-0.95.0-r2.ebuild b/media-sound/jamin/jamin-0.95.0-r2.ebuild
new file mode 100644
index 000000000000..5b1cdbc5ebea
--- /dev/null
+++ b/media-sound/jamin/jamin-0.95.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface"
+HOMEPAGE="http://jamin.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="osc"
+
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.80.0
+	>=media-plugins/swh-plugins-0.4.6
+	media-libs/ladspa-sdk
+	>=sci-libs/fftw-3.0.1
+	media-libs/libsndfile
+	media-libs/alsa-lib
+	>=dev-libs/libxml2-2.5
+	>=x11-libs/gtk+-2:2
+	osc? ( >=media-libs/liblo-0.5 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-multilib-strict.patch"
+}
+
+src_configure() {
+	econf \
+		$(use_enable osc)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/media-sound/jamin/jamin-0.95.0-r3.ebuild b/media-sound/jamin/jamin-0.95.0-r3.ebuild
new file mode 100644
index 000000000000..ae0c1b7777d7
--- /dev/null
+++ b/media-sound/jamin/jamin-0.95.0-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface"
+HOMEPAGE="http://jamin.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="osc"
+
+RDEPEND="
+	>=dev-libs/libxml2-2.5
+	>=media-plugins/swh-plugins-0.4.6
+	>=media-sound/jack-audio-connection-kit-0.80.0
+	>=sci-libs/fftw-3.0.1
+	>=x11-libs/gtk+-2:2
+	media-libs/alsa-lib
+	media-libs/ladspa-sdk
+	media-libs/libsndfile
+	osc? ( >=media-libs/liblo-0.5 )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+DOCS=(
+	AUTHORS ChangeLog NEWS README TODO
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-multilib-strict.patch
+	"${FILESDIR}"/${P}-desktop.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable osc)
+}
diff --git a/media-sound/jamin/metadata.xml b/media-sound/jamin/metadata.xml
new file mode 100644
index 000000000000..2b3f906e21d0
--- /dev/null
+++ b/media-sound/jamin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jamin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/jtagger/Manifest b/media-sound/jtagger/Manifest
new file mode 100644
index 000000000000..101a800f0863
--- /dev/null
+++ b/media-sound/jtagger/Manifest
@@ -0,0 +1,5 @@
+DIST jtagger-1.0.zip 458575 SHA256 9cce80aeb2129cc04900c30f66558400aacb4c107376ef3b99dc8652e2457933 SHA512 abd6a6b2025b292520c302ca82d3e26ebf1243421749bf62406880d5566390c3dda8ec878b21dce1c5bf697c409a0b213b5243d32a5d040fe7f4d83f03a9ebcd WHIRLPOOL b059f4543944e05cfc015586a5ece2881f86a2a1d5bcd6b34ba71d7f9a9ec2fb2a2d6c3d7c8e2a6a843d5f3209ba7eb12e9f6ea491725e7e327a94ae7a3e3341
+EBUILD jtagger-1.0-r1.ebuild 1468 SHA256 57ab59b67300095e52468c7f1f28b42ae90012dcfd0228df0119fa8c43bb5bbd SHA512 18573ecce782b5a8052146bfb1fd9b26eeb3c48a89db427bdbd37cc8998ed6c4e9d50db7a5b766ee1a2decd6b271673d2312eeb0ddcf5d912d34889e42bcc37b WHIRLPOOL eb8a45d9ea95b4bd805e36340843621ad0a5ec43b3f6a458e05e69d5f3ab763d992a2a5436a4f2b3bf259c98db383297380cc903eb734c32af318e1ce2da3141
+MISC ChangeLog 2432 SHA256 46f3566baf5a0b82ff6b5ce803cefe97953cb8340d0ff75e025f7150b148f6b2 SHA512 4b057cb262d2cd9e6b4c2ca557c967af9e417ad3523ee4b798e3e007e4294ebf116858c204afad16c27f2cfcbcb5ddcf9cb6301fc9de80ac40f0c59abd587d76 WHIRLPOOL f9cfce46e97884d6a6a301ee164afb021fdf301615622f38b7b1a5f30e819e09aa11218eded108648579ce2e7ab0bac9e230d37e3781cc11d69215e83451e0b7
+MISC ChangeLog-2015 3024 SHA256 d65d6445c8d819491bcec66fc315f684d48749b6bbf557e20fc089f2f00e6d42 SHA512 14e4225f0267d6edbb987a5842b5f60903d48ebc75a7f906f21782417b094273d6d550432be757e44bf28243ad0690a2cb2b69a47a9c4a9d7427c76c4e7bfdec WHIRLPOOL 4bc77a71940ed89cabed5d476599f4d855827e5cd335919b59e47c2f92c2b7f2921d4b5e403c5d3fca2079d2b0eab3f88ed809934b4ad64f2ec8236f034831d9
+MISC metadata.xml 562 SHA256 eaeb7f4449efb4c3987c5b928057282031c892b44aeabb31de6204d395b5594b SHA512 fdec62b1f5798efb3d644d57d3d785ec97f3fba1ac54a4e9633f7b751bf3b33b80fb133ab19d63dc799907c1cc9b585c20a3fc0b8d289908999b6a8fbc18cd03 WHIRLPOOL dbc7dc218472d2486e27b879778d3228d094096d600ab482db25fb20a625b90a94f396c40fbbe5981f05ab1fc64b3e1dfe0d16122f9d1ff576aedf552844131e
diff --git a/media-sound/jtagger/jtagger-1.0-r1.ebuild b/media-sound/jtagger/jtagger-1.0-r1.ebuild
new file mode 100644
index 000000000000..9f5583040cad
--- /dev/null
+++ b/media-sound/jtagger/jtagger-1.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source test"
+
+inherit eutils java-pkg-2
+
+DESCRIPTION="Powerful MP3 tag and filename editor"
+HOMEPAGE="http://dronten.googlepages.com/jtagger"
+SRC_URI="http://dronten.googlepages.com/${PN}.zip -> ${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEP="dev-java/jlayer:0
+	>=dev-java/jid3-0.46-r1:0"
+
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	app-arch/unzip:0"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	unzip -q ${PN}.jar || die
+
+	# Fix for bug #231571 comment #2. This removes real @Override annotations but safer.
+	sed -i -e "s/@Override//g" $(find . -name "*.java") || die "failed fixing for Java 5."
+
+	rm -vr ${PN}.jar javazoom  org META-INF || die
+	find . -name '*.class' -delete || die
+}
+
+src_compile() {
+	local classpath="$(java-pkg_getjars jid3,jlayer)"
+
+	find . -name '*.java' > sources.list
+	ejavac -encoding latin1 -cp "${classpath}" @sources.list
+
+	find . -name '*.class' -o -name '*.png' > classes.list
+	touch myManifest
+	jar cmf myManifest ${PN}.jar @classes.list || die "jar failed"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	java-pkg_dolauncher jtagger --main com.googlepages.dronten.jtagger.JTagger
+
+	use source && java-pkg_dosrc com
+
+	newicon com/googlepages/dronten/jtagger/resource/jTagger.icon.png ${PN}.png
+	make_desktop_entry jtagger "jTagger MP3 tag editor"
+}
diff --git a/media-sound/jtagger/metadata.xml b/media-sound/jtagger/metadata.xml
new file mode 100644
index 000000000000..e5f1fb3bb547
--- /dev/null
+++ b/media-sound/jtagger/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription lang="en">
+		jTagger is an powerful MP3 tag and filename editor. It can update
+		tags and filenames in different batch editing modes. Basic MP3
+		playback is supported. jTagger can write tags with unicode characters
+		(optional). It is recommended that you dont use that with id3v1 tags.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/justeport/Manifest b/media-sound/justeport/Manifest
new file mode 100644
index 000000000000..fd868068e65c
--- /dev/null
+++ b/media-sound/justeport/Manifest
@@ -0,0 +1,6 @@
+AUX wrapper-script 62 SHA256 f29eb286d5f94272939af8c13b1a3facbc002620a851387dcf29474f281d2434 SHA512 039be65c23b038c65908427a5153f2ee52c0b8a21866dca039f9306c55c60c1dc6c6f59482cabebea85d2889f5cbfb5c1a5e2fe920b76a0d94e5609368bed778 WHIRLPOOL b32ea5e93339804c606e958b1232ed18e36df838c5e62bd17640b85d145ab7d4ee424997391176fe7f82a45c80a3b69b169b1e72f2e02ef7c4f9ae4db34a3bcb
+DIST JustePort-0.2.tar.gz 16181 SHA256 5576bae0da54cb1ecf384bfbafaabbd19e5933bfafb77a4dbc0b69f143381b0a SHA512 b6309b883afb27fc017a259570f458e4456b1a56798fe24f815910703a2636b27f63db53fee3f1cec19520ecfa04dd8f1db92ff48167d831f1827f1b451ad0f1 WHIRLPOOL 7a85ec5cd5bc184a2a957b796b25b44d1db5330729133c23a0ea7fb74c48bf628b123991d9f29fda92d30d7128701b5136deb5f0633d2f2831cd2ad6ec974cd5
+EBUILD justeport-0.2.ebuild 824 SHA256 d8ed00a1cb5807753369582ebcbfedabb237b4945fe395f89c3df23377918f4d SHA512 f448a4723cc13bcbdd608efa2eeb21872f9865b6d34d6ebb5257ce4a60b0afb1bea0ce30951099e9518459ce31a5b0f4c1cddb4772cb53c528229889df94da6d WHIRLPOOL 37a0ef96088217217023e88aab595c093cb5fe4acbfa215baacb92b62086696d8d3c904f6bda6c449de89993bebbd2e5a42da6e04e2ae865a2391993d956235c
+MISC ChangeLog 2455 SHA256 7a2a47a30dac6806ea11a3f4817de11a005684a47d863e911c00153f18816f27 SHA512 db07f4a04de8ce8838a11514cd25e6792a9c891daa1ee859109357fca9779c984111ad735c3f65632f31c08b779eb017540bc7390c6a304147ecf785b22f9c78 WHIRLPOOL 4451a5cf696aeef8c2619958b591693c9d41b583ae3545af77bd3dd0b82927973353a303e83839e004b02869509933beb056a104e40ffe4f182f2fc9f03a8d02
+MISC ChangeLog-2015 498 SHA256 b2c006513fecb1ce754fcf85bb8fa7bdb9698b119e6ca2b3950d2d37f333b99d SHA512 42f57a101eb2c8ca82d2cd0b71fea6283321a06904b4ba1d1d90c63d080228b8ae1b433cfece32c237b762931224617a030f43bf323462759e118614863d69bc WHIRLPOOL 2fafd31ba0492356a2b57734cad8a538ec8a148b9e815f2587145928043f45f44937001fd7259e2aeba86fe814647a63d6840e498b6bf6f424fe45222fad67a4
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/justeport/files/wrapper-script b/media-sound/justeport/files/wrapper-script
new file mode 100644
index 000000000000..29378dc6fccc
--- /dev/null
+++ b/media-sound/justeport/files/wrapper-script
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec mono /usr/LIBDIR/justeport/JustePort.exe "$@"
diff --git a/media-sound/justeport/justeport-0.2.ebuild b/media-sound/justeport/justeport-0.2.ebuild
new file mode 100644
index 000000000000..fdc938d3b47f
--- /dev/null
+++ b/media-sound/justeport/justeport-0.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit mono multilib
+
+MY_P=JustePort-${PV}
+
+DESCRIPTION="Stream audio to your AirPort Express"
+HOMEPAGE="http://nanocrew.net/software/justeport/"
+SRC_URI="http://nanocrew.net/sw/justeport/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-lang/mono"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp "${FILESDIR}"/wrapper-script .
+	sed -i -e "s:LIBDIR:$(get_libdir):" wrapper-script || die "sed failed."
+}
+
+src_compile() {
+	emake || die "emake failed."
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/justeport
+	doins *.exe || die "doins failed."
+	newbin wrapper-script justeport || die "newbin failed."
+	dodoc AUTHORS ChangeLog README THANKS
+}
diff --git a/media-sound/justeport/metadata.xml b/media-sound/justeport/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/justeport/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/k4guitune/Manifest b/media-sound/k4guitune/Manifest
new file mode 100644
index 000000000000..09b179e7feb0
--- /dev/null
+++ b/media-sound/k4guitune/Manifest
@@ -0,0 +1,6 @@
+AUX k4guitune-1.1.1-desktop_entry.patch 336 SHA256 a8662f71610192b0fb0027bba6d5fd781c2c4c2a1e15ed09bc046d2061631cf0 SHA512 3994e891f50b0d3910e06167ba689a3c0ca9150a7730927116fb1959a5e66a1a29f8fdbfa33444ae1d9b689543fc02602fd75dd5afae890c1ada1b12a4e28d13 WHIRLPOOL c534c389845784041cbf30f71922df397ba476071277c6e4ef097e1d1ae529b81bb14db600b5582a8c5b9b92b8102ccdca4347d03f5bd76295ec62ba6dfac11b
+DIST 117669-k4guitune-1.1.1.tar.gz 189593 SHA256 1fcbf28c87c3127864baae19458fdc70f96755b0ccbaddb0de2be8d0437e37a1 SHA512 c0fd70c48063530dc414a018437ac04a24e77b9da3042ef4e4adaec6f4232bb84c0dcf709bb3510e9bb871a10aa2d31418a755b95440cad7ccceca464c1b62fc WHIRLPOOL 40f2c9582ae14ee834d09de3604c69239f832c018b5aa9be28db52bac35e90c9b9deb7764e25fa8c7003630b044ab65040a92fc8dd312918e899af90d81787c2
+EBUILD k4guitune-1.1.1.ebuild 758 SHA256 ef696cac4de6726ced9ff05319450a4e7f9a1210f4e55a071e4a3f2d1b54418c SHA512 18a3d4f0a4f22a810fa6d4178df6a0b1d24396934431953261184c9808f50c330b483e27d11c5c5c0e10fb95762a9a7f4ab4c571691491ec4a0f36dc1c90f1d6 WHIRLPOOL 6fcae69e5e895e65fa59e96dd955fcebba81e201eab7ade1557bec095dbff4bf60330bf73d3fb93f129b64bf5d205d13e9b8dfe604f3e9aee0f067056ab25825
+MISC ChangeLog 2482 SHA256 42aa3ccc4cdef7f88a936a6180d52835482533177191693660434d18bb1ed1fb SHA512 82072f9315b1b7e0be0064191a8d9c04b9043b85207d1a1d60aeb27252c40547a454fcece02404e2c093d20e4b2eb3a83c6a20f2ccf02d2fa969dd0ab6f57742 WHIRLPOOL 4e0832c5a1f707ff1309772376868608b1c0decc0a0f2356499e86973b6872502eeb3cb7477837219a78d00c0ca1d9f328d7e8fc025a7c9b16b685383a1e5caf
+MISC ChangeLog-2015 1259 SHA256 68c60b7c071a3ee9351bbcab0b8971f156f82c9cb002599cdda63eb6a469d4a0 SHA512 5a9cb2272a5854fd68488682ea1085382cfe8e67ad36469c9543068b5ddc77f380b88401a353abbf76fd0ec4ca329d5447251de2e5605d67b3d70e5b284a1a26 WHIRLPOOL 3503b995375cf6fa67e39929f710fb03ce3af29dfd1df19f58a3993edd899e7c50c93989a3dfc4cb02e8f4f7324909dbeb1c63e1cd7716833058a8cf6b680d9f
+MISC metadata.xml 373 SHA256 8a2bc7f944348adebe31a98d796431de24fe703011e111546d18f30f4e0531cf SHA512 ab8d8c08257274c8752b0825c10475d902bf917818aea50e1c492963247857b743f73ea6891665143beff4c529edda1b12237c8a2c0c4705bae22081e1b98598 WHIRLPOOL cc172f06eff8dc593f670c469b0e744bed331e6598aaaa5b65cf1288189ab931409750c8fbb5f644f0823a5495e759905b6976f4d03fff0e2af924ba176348a3
diff --git a/media-sound/k4guitune/files/k4guitune-1.1.1-desktop_entry.patch b/media-sound/k4guitune/files/k4guitune-1.1.1-desktop_entry.patch
new file mode 100644
index 000000000000..34ff6501df29
--- /dev/null
+++ b/media-sound/k4guitune/files/k4guitune-1.1.1-desktop_entry.patch
@@ -0,0 +1,10 @@
+--- k4guitune.orig/src/k4guitune.desktop	2009-12-29 14:54:54.000000000 +0100
++++ k4guitune/src/k4guitune.desktop	2012-01-12 14:42:56.000000000 +0100
+@@ -7,6 +7,6 @@
+ DocPath=k4guitune/index.html
+ Categories=Qt;KDE;AudioVideo;
+ GenericName=A chromatic tumer for KDE4
+-Terminal=0
++Terminal=false
+ 
+ X-Ubuntu-Gettext-Domain=desktop_kdesdk
diff --git a/media-sound/k4guitune/k4guitune-1.1.1.ebuild b/media-sound/k4guitune/k4guitune-1.1.1.ebuild
new file mode 100644
index 000000000000..e6af74cbea54
--- /dev/null
+++ b/media-sound/k4guitune/k4guitune-1.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+QT3SUPPORT_REQUIRED="true"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="Program to tune musical instruments using your computer's mic- or line- input"
+HOMEPAGE="http://wspinell.altervista.org/k4guitune/ http://www.kde-apps.org/content/show.php/K4Guitune?content=117669"
+SRC_URI="http://www.kde-apps.org/CONTENT/content-files/117669-${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=( "${FILESDIR}/${P}-desktop_entry.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_doc=$(usex handbook)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/k4guitune/metadata.xml b/media-sound/k4guitune/metadata.xml
new file mode 100644
index 000000000000..7535b65bde63
--- /dev/null
+++ b/media-sound/k4guitune/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+<maintainer type="project">
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest
new file mode 100644
index 000000000000..7866033bde77
--- /dev/null
+++ b/media-sound/karlyriceditor/Manifest
@@ -0,0 +1,5 @@
+DIST karlyriceditor-2.2.tar.gz 280119 SHA256 9d58e692b50902deb5fea3a58f26c78954a7c8f9cddca864f86bf3d98324151a SHA512 bce3aed1402c8fff3e04940527773d2855d3d67e47b159478c53e63eaadfbb70df3f4fbefb75490cc17b750455e1359963468ce14dd504f37219e1268a213103 WHIRLPOOL d908b585f88682d7c7692d0bcaff9c73e0a1e67ae6ab429f45b5dcfd46fcc2d21a1bee8ffa221368b67a8fde12231fe87290c0f2ac27f33ea0dda6d5217a63e2
+EBUILD karlyriceditor-2.2-r1.ebuild 805 SHA256 516ca5d4eac2723b31f7f8748464540bc86f03b6c0f7b7ae5922a05d201fef9f SHA512 782dfdbaf6b698025d400cd72532e122fff71b3196fb85462a3709fa62b8a31f1ef62d9d3826debd32813e59307371ca977e99f2a218aef8d172f99db88200cf WHIRLPOOL 6ca69d86d94a83351775411427ced49635c386aa9a81d12474c1c032df8aa2ca5fb52447704eb339b438221bf42101219cd1fb8d96daf66deecb0f43f5609d4e
+MISC ChangeLog 4203 SHA256 f6089a1e0c5c0cb2c9f171eb218b1b2e727c0dfc83f631836c3f7deb10808422 SHA512 8fb000163b82e9fa4ce08df98b6378a5a98878eb8de3695c2224beaf33fc8e8bd00a8d4f6ae15579ad450659babfa680732b1436f44329c4297d0ec5c7d05193 WHIRLPOOL 2af9fce3316b80b1b51fb4ffd0091f885db01fc13d61156f28b2bd65f7b2ddb9a06a8536a3d60c6ff5b8f8942c4f913e95d9eb70c06ab115f7a5aa27eafee60e
+MISC ChangeLog-2015 1706 SHA256 604a79e78a3677d7cb871cbf3e962d929a4a77fc2d385e45e9633fa0639934f3 SHA512 bce299629815f1effff64365f7d028515eb326250a78d4358f3b86267332a6386ba8487ec7d6d3dbb757b6f66f28e3b4dfdee4fb8981103debdd931e58e1291e WHIRLPOOL e8e57d21054c47539058539661aab84b035a400a9e3f97f212f5dd38120d044661e5d3940e5b86cd87b79adb336fef6e7beab4c28f8fa619cab578d832d0d212
+MISC metadata.xml 445 SHA256 f032aa04579d50366da50a32bc1995c73aeb16bf06e2765f8b9ac8eb7fe0cbbf SHA512 8f31be93dceebe185179640ae877f83d1128f6193509d6979cecab95eb06db1ea9901be6e8334c2046c1e22c3a36c782807069665c15722c912833d4ed3cdff4 WHIRLPOOL 4d285deb875cf04864e382ca57478ff03ebe99a3d39ca47a5e9cf89de5fe2e9a6ce67805d87011d0cbb357a648d262a93042a7546d3529bb22dfb2e46318cf1e
diff --git a/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild b/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild
new file mode 100644
index 000000000000..5c711653cc51
--- /dev/null
+++ b/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils qmake-utils
+
+DESCRIPTION="Application to edit and synchronize lyrics with karaoke songs in various formats"
+HOMEPAGE="http://www.ulduzsoft.com/linux/karaoke-lyrics-editor/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	libav? ( media-video/libav:= )
+	!libav? ( media-video/ffmpeg:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	eqmake5 "${PN}.pro"
+}
+
+src_install() {
+	dodoc Changelog
+	dobin bin/${PN}
+	doicon packages/${PN}.png
+	make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
+}
diff --git a/media-sound/karlyriceditor/metadata.xml b/media-sound/karlyriceditor/metadata.xml
new file mode 100644
index 000000000000..12706d20e542
--- /dev/null
+++ b/media-sound/karlyriceditor/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">karlyriceditor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/kaudiocreator/Manifest b/media-sound/kaudiocreator/Manifest
new file mode 100644
index 000000000000..75be762777f3
--- /dev/null
+++ b/media-sound/kaudiocreator/Manifest
@@ -0,0 +1,5 @@
+DIST kaudiocreator-1.3_p20170806.tar.xz 706008 SHA256 73244d3f8cbd7ae3891994f4a67961afe8969dfe8c33d74b5757b0b35fbb3e77 SHA512 0e06092f8519e9a5a1341f828442de5eace4982723fcb466c23e771d4c42f0c67e91bbf59e6a924d0dc9f2cb8b7b04aaa1660ac97a0075ea6aae155f6a4b2533 WHIRLPOOL c23b125c3288ad0d804e65be9fb0fda0d3bfc9c526ec744d1ef46f0b29134b8e5ef4090d073ea6bef8a1c127d3957d06f68f2dbfb44db417388f16013eb50b6a
+EBUILD kaudiocreator-1.3_p20170806.ebuild 1736 SHA256 6b8985eaaa14e4c6e3ae92b9fb2b7d51a7d3c8683774b988f0138dd4caf8ff47 SHA512 d0e0243bc0a81779a42dff40b236a31daf9c3040c566d48dc696537051c616e869f5de87ddea88eaa150c610e88ea023110ab095c342a2202e688c1563e9bd5f WHIRLPOOL 038f915dc9355b24da2dbfc4d00ec96eb2fb460ab1cc12e06b59032b8eb098eb4a877d333655b0ddf5ff5c0b021a352a30e1c414713470e2d65646db76adca1c
+MISC ChangeLog 2895 SHA256 fcfa46d758782381fb3ad086ca72def3c2fc24e593fedfa788201faaec3b478a SHA512 ca9921002f55fe40c75284f01b19c50070ad39e9669560017a889e0236f12530da60c854357e8d1c936de818a773094a4c824802cece170de5b161c2bdfdcf49 WHIRLPOOL 6cfcf52ee6eb30fea9c74fee847b798cec712791bd0ba034a380bfec8de14ddacea3a784313610f1e3734403e24a65bd07b75aba5f3595628ce736352d4d11aa
+MISC ChangeLog-2015 2557 SHA256 de9e61f2cd011bf2605f585be8a0ee2f4df559f11453ef9925e6a2295cd98748 SHA512 5e9557562a17351072ecebcd54cefd3c5bbf4c7f653c5e41c0e46a4e19e129b1472ebbe954f326a72befc78efab801667cee60373ca4b831209dc49ac976de30 WHIRLPOOL a3cd7e4805bf814c9518916180f8c83ce4ea7b351188c1f78a9597e0a37f73761b38e30bceaf495fb71885e887d805bda3d4bf971f07cae15da1d97717cdfc2d
+MISC metadata.xml 355 SHA256 91441ca8b7e93ab8aa11cc46b9ad6a9113fad7f26865d31e1d1dd9a2671b883c SHA512 c755125a1f6939ebb9f280bfaed947da3b6455dd66ba1db80eda78142386c3673b44d564922a522055d64015c2e99afd80ac523fb73ad388f6eca7f8aced2760 WHIRLPOOL b0f0b9a350399304a775c27bf57409e3a41c97b7f04e770893df95ed7f8c4273598833f314eee0d922b7340ba25d139c044d54377628ad5da67dc7f9fe2d4507
diff --git a/media-sound/kaudiocreator/kaudiocreator-1.3_p20170806.ebuild b/media-sound/kaudiocreator/kaudiocreator-1.3_p20170806.ebuild
new file mode 100644
index 000000000000..8e50d973dccc
--- /dev/null
+++ b/media-sound/kaudiocreator/kaudiocreator-1.3_p20170806.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="CD ripper and audio encoder frontend based on KDE Frameworks"
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=107645"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2 FDL-1.2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	media-libs/libdiscid
+	media-libs/phonon[qt5(+)]
+	>=media-libs/taglib-1.5
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep audiocd-kio)
+	!media-sound/kaudiocreator:4
+"
+
+DOCS=( Changelog TODO )
+
+pkg_postinst() {
+	local stcnt=0
+
+	has_version media-libs/flac && stcnt=$((stcnt+1))
+	has_version media-sound/lame && stcnt=$((stcnt+1))
+	has_version media-sound/vorbis-tools && stcnt=$((stcnt+1))
+
+	if [[ ${stcnt} -lt 1 ]] ; then
+		elog "You should emerge at least one of the following packages"
+		elog "for ${PN} to do anything useful."
+	fi
+	elog "Optional runtime dependencies:"
+	elog "FLAC - media-libs/flac"
+	elog "MP3  - media-sound/lame"
+	elog "OGG  - media-sound/vorbis-tools"
+
+	kde5_pkg_postinst
+}
diff --git a/media-sound/kaudiocreator/metadata.xml b/media-sound/kaudiocreator/metadata.xml
new file mode 100644
index 000000000000..901dc7f28365
--- /dev/null
+++ b/media-sound/kaudiocreator/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/kenvy24/Manifest b/media-sound/kenvy24/Manifest
new file mode 100644
index 000000000000..e16a2db2bce2
--- /dev/null
+++ b/media-sound/kenvy24/Manifest
@@ -0,0 +1,5 @@
+DIST kenvy24-1.2-src.tgz 701921 SHA256 6482bf008adffad4360bd85c3baee3c93450553be42ed65ef333e4a74150fbad SHA512 32fbac4c1c93fbc36001b5cd09c19b179ea15ec6a303d7980cd9a153e115b4edaf12aea1b874f30d9f423d149e662974d6d9669644aba8dc153f163ced9e5044 WHIRLPOOL 8c92d6506142b38b5d01493143dce9d9f3b5c93eb6d96a6878a4474b99e111032bbbdd9070118525bb47be283788f2f2dd94cf995ac0f50ef314510f15e81dcb
+EBUILD kenvy24-1.2.ebuild 572 SHA256 cc9ee6504820ce387befbbc34e4e72255d746a0024499e89fe2c5014c292273c SHA512 c298b410f2f9ca99688f6106548cf9ccb11ca3ce2ee6652b577d11d1f0a56d5e1d23a0e24f5bc19483a26dc08fe31f398c13b11d4a9afda769cbe7d81e74979c WHIRLPOOL ce33422253da1e696d043d64a1642712959596bac522206c0387268f6e1545434565b9bcfc1fd23c5160a2e20493f8792bebf8ad844df1b36594bd113a554c60
+MISC ChangeLog 2426 SHA256 a5f4dffd07284ba3eebccc8bad902a51d442cf267bb8f66c23a328a1c639fa70 SHA512 5dbc2b88284062f20f2e82e963161b8a3c06ea52ad21db968ac19f79c0fcda0c9012c79b3b010f1fcb4e7649e1c87376ff69f97b402ec2723cada9bebfe8bbea WHIRLPOOL a234e0c438e5aa3c36918e100ac04ad58557de9976305b9b5586391e0cfd2c13fc9be176f225a9fdbd1fd3dedce9b747abf40e5927dd51b69077549ee282bfc1
+MISC ChangeLog-2015 648 SHA256 8811891e92ba7560fb0bb1f9986c3e167e4e4face1c52f0d6acb72dc64db49b8 SHA512 1b269b4bd1e31e3ffc3dcd9ed6c49fe6c89d9e69c532d349f59b0582d9bb7a95ca3b019116670e49754a519fb0704dc701b803b5ec68fe04d93c4e3ff2dbfc0b WHIRLPOOL 293543987aabbe15a50a5126069c9796be619bd2b723a85e1880e553fcb50127baf481ecade02ea3f6dd22bb29b2834a60d35f8cfbfc60f57fa26eda001cd1e0
+MISC metadata.xml 440 SHA256 c478292c76fc52f6b1f75cc0482f63499b36fe084abfa61541a9258bae5ea792 SHA512 a344f4410037118b74a16d89bd653b57cee4d859950f69c05dce6406a7c63cd41c89f06cbf4bbaf4bfaa065443b08aff18ee52a2581d2d002f3fe1b697764691 WHIRLPOOL b05930dae4f4411583555ab5a95c8d9480f2fee45d0770bebf03000dbe77f933f2cf36d93177113c3ee507d88b7bbbb42177b04ca997847d713461abf1b20922
diff --git a/media-sound/kenvy24/kenvy24-1.2.ebuild b/media-sound/kenvy24/kenvy24-1.2.ebuild
new file mode 100644
index 000000000000..9d947568ce9b
--- /dev/null
+++ b/media-sound/kenvy24/kenvy24-1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+# po/ directory is disabled in CMakeLists.txt
+# KDE_LINGUAS="es fr pl ro"
+inherit kde4-base
+
+DESCRIPTION="VIA Envy24 based sound card control utility for KDE"
+HOMEPAGE="https://sourceforge.net/projects/kenvy24/"
+SRC_URI="mirror://sourceforge/kenvy24/${P}-src.tgz"
+
+LICENSE="GPL-3"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +handbook"
+
+DEPEND="
+	media-libs/alsa-lib
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+S=${WORKDIR}/${P}-src
diff --git a/media-sound/kenvy24/metadata.xml b/media-sound/kenvy24/metadata.xml
new file mode 100644
index 000000000000..829e2a9666e1
--- /dev/null
+++ b/media-sound/kenvy24/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">kenvy24</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
new file mode 100644
index 000000000000..5ddbfe59c6dd
--- /dev/null
+++ b/media-sound/kid3/Manifest
@@ -0,0 +1,9 @@
+AUX kid3-3.3.2-libdir.patch 1506 SHA256 e3fab2ca350c40dcd11ce89a790da3675a254ddc62ababbc1965f4d4dc73a577 SHA512 b987463eb82b499af757ba2865bfe57f9f9d405eb005822d08521f89700bfcfbb1bd46f9caa8c436b6d73d0b12284db08299d5425299f5803612e7b75b6c12ec WHIRLPOOL 24d0c8954e68212bac4392957399a79296f0579715a046f76690e30fcbc26fb3642afcf053b5d0a07a8984835b02e5211f20b6f8167465b5639ad317392ea71e
+AUX kid3-3.4.4-deps.patch 1485 SHA256 3d39bf660c3a2bcdbeb4f81c864617c733388af86df347409bafbe49a84285f2 SHA512 af386071836e542e178cda38297091817943a3f754e4d14b3cca2ec628bd7c13980932e77b1f9e3c578b095d88ea2b24e89e58b6f726c6f656989fc08bc8a808 WHIRLPOOL 0892773c97bb47ec6cbb35f21daeed6fd51dc81097c4a9acd2aedbcd316cd48d25a5fd6f66721a50aaaee8c039b2bd0093b565d2474030b0ebdcb45902a94347
+DIST kid3-3.4.5.tar.gz 1376570 SHA256 0d703b0b8c2538eba1f8f540a87e13a4bf61f715ef9cd1253f18417ebb096404 SHA512 36ffb45dd6689f252021cb9cda667f28810fb1d7da77179ef6abc80031b7a0dfaa445776c8e3586000d774bc608395fff0854d867c9e1e52676409f78a515ae3 WHIRLPOOL eeb0d29b9a30685ca6bdb4064216efbea48cb35de8056c7cf60956801129455e2145842e9cd52d8a4e99a099752d70e31e09307454ac25ce2c8d4d1bbc122199
+DIST kid3-3.5.0.tar.gz 1414288 SHA256 0f1a3a003de180e58ef53c3db6f5caf07f5415cfd22ec2c57cbd9791d5a54fd6 SHA512 a70aef4c775ec8a2d760856fdda38394384d71fbfb5847ba4da2d6396a1167c740a57a5609ef99a06ca99c090de974e91a87b13344f2e123b33842c51860cf34 WHIRLPOOL ae9a2c73d5127a5d44bb32b1fac99ecc096f850004228995ff67d4528a975a463386d1906f2146d1c6683011ae57513f83623bb770acc9441a51c8733fb76c68
+EBUILD kid3-3.4.5.ebuild 2012 SHA256 5920b9445ee9d6f400e15935a044affcad60566badf38be10f54b4c89c382c39 SHA512 fd1dbbff570248c636426324150d9792caff8cbe29a2f098604ce09f810cc6c6c1b3d7fedc695f6a5a450680002333cebf37aeb814b81cdae438c24137dcb971 WHIRLPOOL 12f33ac02a17749e1bb9ee9b5437aae09b1654703b2aac6043f298c694619e4e78b9929f19d4f3b654d3e0e377c007cc7ee65124d339ed0a992cbae656622298
+EBUILD kid3-3.5.0.ebuild 2012 SHA256 3a943ea8dc44c88008ae8ebf114061ad82f2c4ad0a68c536e01ffa0f3eaad38b SHA512 c2a9f141724d8073240a76a1c9e9a7c3352bb91f62c05298de81ecc085772dcccd9b0a90fff3c7ac39992dc7ba481c60f3f633e56e5e18cbcc573b275f7a3df6 WHIRLPOOL 2f6b2740e9c0870c2dc36d7b8e51dca436124d6192afb6f83190fef2e91754d3a139514321405fbb07674b68a565289cce960c4ba9d891d4bbd1e9d6eb8c4d13
+MISC ChangeLog 7232 SHA256 a3c22ac7d7c38f1040e1ccb3f7aefde8033c530b8b6b2a36763062ddf87a9be4 SHA512 0aa84c70113e4681820c672dc03b3e2edd1c87618090366d146082603648b811ebabb0ca138c6568bc8ed26abe2e0279e71f2e9acd38c939269765ada95b7c68 WHIRLPOOL 9d86f330e1d443181fba85ba11d49cfd68e98ba6303316ddd0771dfe19365def9d13d1f1f7cf1527dc65a814d80f963c30f117f15c7039fec952dd5a686d7205
+MISC ChangeLog-2015 12280 SHA256 50bbd374682b1dbc356308a5a2882611fa32c2b0800d76030847121653fe1730 SHA512 7a8b2a9109e8ab7150217282331ffa7cee1aed4f6b7dd968d8151aa8dedf1fbff5ac5b4d6c369936104d3126369ecad410a6258c12be2f45af7abb3d6dfe4b27 WHIRLPOOL 6be2657cc843bf49bfa7ddaca41d0078844de89abffef2e6ac71de679a9a1c2bc9f3213d6ba465bce384ac663d6f475fec9d86841411ad9bfdbe2896bb48c8ab
+MISC metadata.xml 672 SHA256 6a1640a28cd926507a19d1b9119e7d6c7d51bfc5f5507c297500cb479d24bee6 SHA512 b76d1d9b77eab5a42ebb2bae4a039a0a9abc5227e37fbe3066ca04aacfaebfdbcd99b3901eba79bb8ee46a64fa58a3aaf6370eeb3706d1773e137b02de1202ed WHIRLPOOL 3ea8ab8df8c39b1c18cd216f2077d387ca7b1f4c25f9173aab1dbb87a3b5264889008843e290e08075749019e65d3afe7d25a8fc9483c1abfcc5c3db1d5cfea8
diff --git a/media-sound/kid3/files/kid3-3.3.2-libdir.patch b/media-sound/kid3/files/kid3-3.3.2-libdir.patch
new file mode 100644
index 000000000000..b54bf129693c
--- /dev/null
+++ b/media-sound/kid3/files/kid3-3.3.2-libdir.patch
@@ -0,0 +1,44 @@
+Install libraries to the correct directory.                                                                                                                                                                        
+
+Gentoo-bug: 562624
+Gentoo-bug: 570976
+Gentoo-bug: 576946
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -159,7 +159,7 @@
+   endif (BUILD_KDE_APP OR BUILD_SHARED_LIBS)
+   set(WITH_QMLDIR_DEFAULT "share/kid3/qml")
+   set(WITH_BINDIR_DEFAULT "bin")
+-  set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}/kid3")
++  set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}")
+   set(WITH_PLUGINSDIR_DEFAULT "${WITH_LIBDIR_DEFAULT}/plugins")
+ endif (APPLE)
+ 
+@@ -189,6 +189,10 @@
+   set(CMAKE_INSTALL_PREFIX_SLASH "")
+ endif (CMAKE_INSTALL_PREFIX)
+ 
++if (NOT APPLE AND NOT WIN32)
++  set(WITH_PLUGINSDIR "${WITH_LIBDIR_DEFAULT}/${QTVER}/plugins/kid3")
++endif ()
++
+ if (APPLE)
+ file(RELATIVE_PATH CFG_DATAROOTDIR "/kid3.app/Contents/MacOS" /${WITH_DATAROOTDIR})
+ file(RELATIVE_PATH CFG_DOCDIR "/kid3.app/Contents/MacOS" /${WITH_DOCDIR})
+@@ -241,6 +245,7 @@
+   find_package(Qt4 COMPONENTS ${_QT4_COMPONENTS})
+   if (Qt4_FOUND OR QT4_FOUND)
+     include (${QT_USE_FILE})
++    set(QTVER "qt4")
+     if (NOT WITH_QT4)
+       message(STATUS "Qt4 found, explicitly set WITH_QT5 or QT_QMAKE_EXECUTABLE to use a different version.")
+     endif (NOT WITH_QT4)
+@@ -276,6 +281,7 @@
+   endif (_qt5Dir)
+   if (Qt5Core_FOUND)
+     set(HAVE_QT5 1)
++    set(QTVER "qt5")
+     set(WITH_PHONON OFF)
+     set(QT_INCLUDES)
+     set(QT_DEFINITIONS)
diff --git a/media-sound/kid3/files/kid3-3.4.4-deps.patch b/media-sound/kid3/files/kid3-3.4.4-deps.patch
new file mode 100644
index 000000000000..333645d11b39
--- /dev/null
+++ b/media-sound/kid3/files/kid3-3.4.4-deps.patch
@@ -0,0 +1,40 @@
+From 2f66191a82e60a2b46ead8aa2195346084817e91 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Sun, 27 Nov 2016 20:00:37 +1100
+Subject: [PATCH] Improve KF5 dependencies.
+
+This list was compiled from a cusory include and NEEDED inspection.
+---
+ src/app/CMakeLists.txt     | 2 +-
+ src/app/kde/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
+index 516e3f9..7790fde 100644
+--- a/src/app/CMakeLists.txt
++++ b/src/app/CMakeLists.txt
+@@ -33,7 +33,7 @@ if (BUILD_KDE_APP)
+     include(KDECMakeSettings)
+     include(FeatureSummary)
+ 
+-    find_package(KF5 REQUIRED COMPONENTS KIO)
++    find_package(KF5 REQUIRED COMPONENTS Config ConfigWidgets CoreAddons WidgetsAddons XmlGui)
+ 
+     if (BUILD_SHARED_LIBS)
+       # KDECMakeSettings.cmake will overwrite our RPATH if LIB_INSTALL_DIR is
+diff --git a/src/app/kde/CMakeLists.txt b/src/app/kde/CMakeLists.txt
+index 2f2867a..8a25b43 100644
+--- a/src/app/kde/CMakeLists.txt
++++ b/src/app/kde/CMakeLists.txt
+@@ -13,7 +13,7 @@ if (HAVE_QT5)
+ 
+   add_executable(kid3 ${kde_SRCS})
+ 
+-  target_link_libraries(kid3 kid3-gui KF5::KIOFileWidgets -lstdc++)
++  target_link_libraries(kid3 kid3-gui KF5::ConfigCore KF5::ConfigGui KF5::ConfigWidgets KF5::CoreAddons KF5::WidgetsAddons KF5::XmlGui -lstdc++)
+ 
+   install(TARGETS kid3 DESTINATION ${BIN_INSTALL_DIR})
+   install(FILES ../kid3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+-- 
+2.10.2
+
diff --git a/media-sound/kid3/kid3-3.4.5.ebuild b/media-sound/kid3/kid3-3.4.5.ebuild
new file mode 100644
index 000000000000..5766131f8ebc
--- /dev/null
+++ b/media-sound/kid3/kid3-3.4.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
+inherit kde5
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="http://kid3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 x86"
+IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+COMMON_DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	sys-libs/readline:0=
+	acoustid? (
+		media-libs/chromaprint
+		virtual/ffmpeg
+	)
+	flac? (
+		media-libs/flac[cxx]
+		media-libs/libvorbis
+	)
+	kde? (
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kcoreaddons)
+		$(add_frameworks_dep kwidgetsaddons)
+		$(add_frameworks_dep kxmlgui)
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2:0 )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!media-sound/kid3:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep linguist-tools)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.2-libdir.patch"
+	"${FILESDIR}/${PN}-3.4.4-deps.patch"
+)
+
+src_prepare() {
+	# overengineered upstream build system
+	# kde5 eclass src_prepare leads to compile failure
+
+	# only enable handbook when required
+	if ! use_if_iuse handbook ; then
+		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_PHONON=OFF
+		-DWITH_QT4=OFF
+		-DWITH_QT5=ON
+		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_ID3LIB=$(usex mp3)
+		-DWITH_MP4V2=$(usex mp4)
+		-DWITH_TAGLIB=$(usex taglib)
+		-DWITH_VORBIS=$(usex vorbis)
+	)
+
+	if use kde ; then
+		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+	else
+		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+	fi
+
+	kde5_src_configure
+}
diff --git a/media-sound/kid3/kid3-3.5.0.ebuild b/media-sound/kid3/kid3-3.5.0.ebuild
new file mode 100644
index 000000000000..64def7acd3df
--- /dev/null
+++ b/media-sound/kid3/kid3-3.5.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
+inherit kde5
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="https://kid3.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="amd64 x86"
+IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+COMMON_DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtmultimedia)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	sys-libs/readline:0=
+	acoustid? (
+		media-libs/chromaprint
+		virtual/ffmpeg
+	)
+	flac? (
+		media-libs/flac[cxx]
+		media-libs/libvorbis
+	)
+	kde? (
+		$(add_frameworks_dep kconfig)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kcoreaddons)
+		$(add_frameworks_dep kwidgetsaddons)
+		$(add_frameworks_dep kxmlgui)
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2:0 )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!media-sound/kid3:4
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_qt_dep linguist-tools)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.3.2-libdir.patch"
+	"${FILESDIR}/${PN}-3.4.4-deps.patch"
+)
+
+src_prepare() {
+	# overengineered upstream build system
+	# kde5 eclass src_prepare leads to compile failure
+
+	# only enable handbook when required
+	if ! use_if_iuse handbook ; then
+		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_PHONON=OFF
+		-DWITH_QT4=OFF
+		-DWITH_QT5=ON
+		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_ID3LIB=$(usex mp3)
+		-DWITH_MP4V2=$(usex mp4)
+		-DWITH_TAGLIB=$(usex taglib)
+		-DWITH_VORBIS=$(usex vorbis)
+	)
+
+	if use kde ; then
+		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+	else
+		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+	fi
+
+	kde5_src_configure
+}
diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
new file mode 100644
index 000000000000..e7aa364bd79c
--- /dev/null
+++ b/media-sound/kid3/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="acoustid">Enable support for acoustic fingerprinting plugin using
+      (<pkg>media-libs/chromaprint</pkg>)</flag>
+  </use>
+  <upstream>
+    <bugs-to>https://sourceforge.net/tracker/?group_id=70849</bugs-to>
+    <remote-id type="sourceforge">kid3</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/klick/Manifest b/media-sound/klick/Manifest
new file mode 100644
index 000000000000..1999da16e71c
--- /dev/null
+++ b/media-sound/klick/Manifest
@@ -0,0 +1,6 @@
+AUX klick-0.12.2-gcc6.patch 1513 SHA256 e72eb623e6d1a1952522c62ed97c1e686a78877b487047970a2533eb6847b6ba SHA512 15d5fadd81f5dcb837ac4f91d62b99834fd192a508d5df9647df994b65807fc3de25eaceccad9b39535dc56abb83feb2f48109cf46d95d1ddb68a8212d096ad3 WHIRLPOOL 3e4244e398cbfbc819f609d0088b64328ac09c33926a5d2288cc483e184979065efb0385d0c2b37f94f4eb38b3db08174762842fb9a44f0faad9d60ec75b9223
+AUX klick-0.12.2-sconstruct.patch 1836 SHA256 fe5c2101c5170c7df24916909cc987bbe6fc136e8ca4fe342cabd2bcd4a265ad SHA512 0db89995a39962e91085c761cf9eb07470ab20a16dd90ae77e1e34bf912ede28aca15a8c7f7708fdfbafe3c84f3b92059aa01f160b936e20a32cd69fbc6d03c1 WHIRLPOOL 7e89aabd3b33422e9ecd0ef471d38b7902162a695ac3d95ff368cab906a22fa02015e2f86bc7d8d8c6e1fe6be9c7de4d33a55ae7f13b5f04c408d1db6408c381
+DIST klick-0.12.2.tar.gz 111801 SHA256 1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42 SHA512 e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f WHIRLPOOL 4baf1e8fad212c26568a2190af42b1d23058c780407bdd3523b03339337f1f3408f612718c29f026997d36b3aceb3cacd5cfc5ff4d4e69c9cd4edb9a72696590
+EBUILD klick-0.12.2-r1.ebuild 1028 SHA256 ac9aec5f435cf65418785f593c3a4ceb0c6bde2d6c2fdf26d8cde24e1ac5a617 SHA512 3be24a91e6279d2381d505a16642143b0f340a3269d53e2ea4b03eb85883442bf9094e778eed7cdbf1c2690749aeeb713160c1ecc42b57c8b518c46473583e7f WHIRLPOOL 166755bb0e12a3ed19ad797358dace136070f6628ec18476cfe6a9b2cb4e6bee58fee5bdad675082d044801e2eac64e3c53989771aab3b60bb06035a2f429b4f
+MISC ChangeLog 464 SHA256 8ef3c7b1c38dd989cee9b5aeaeda49e00eefa133364d9846db726571bcb0b4c3 SHA512 777fc6b4c2a28100f9cf001886d223afb508ee336b79765ee0e1358f6c904d0280c13b165922cdb87b60b9f70a6610a4d630c3d5364fd3545b51cee80003c610 WHIRLPOOL 15da3c16fbb8f48dec4c3200b4187c928dfab2905ef2be31cd8944187e858ec28d89e5b14f37c7ba20a7a8beffdf5e9144f377b5b837646d9faeb7aaed6bc9b8
+MISC metadata.xml 440 SHA256 b52ef7b4c7b7a7588bc691c62bfa2f38db478d87ea02898a3557a4189ccdff6e SHA512 fb4c25c97a06ab72f02df5554f430d058cf1178d210d793658e0665617183843bdec2711f0c0a39cd08cb6bf45677a1218927cc9a793997699da7a90b5e88d47 WHIRLPOOL 64514847511d0f1907718cfe39062404192fab2d642cecb50e5d22f03ed1605ce105b76977195a7e14d8f0d4fe3b446b02dbd8d08dd88fb2b8b297705df41874
diff --git a/media-sound/klick/files/klick-0.12.2-gcc6.patch b/media-sound/klick/files/klick-0.12.2-gcc6.patch
new file mode 100644
index 000000000000..c8c07121e497
--- /dev/null
+++ b/media-sound/klick/files/klick-0.12.2-gcc6.patch
@@ -0,0 +1,44 @@
+--- klick-0.12.2/src/metronome_map.hh.old	2016-09-21 22:17:41.364102201 -0400
++++ klick-0.12.2/src/metronome_map.hh	2016-09-21 22:28:50.611858765 -0400
+@@ -48,7 +48,7 @@
+     virtual void timebase_callback(position_t *);
+ 
+   private:
+-    static double const TICKS_PER_BEAT = 1920.0;
++    static double const TICKS_PER_BEAT;
+ 
+     // transport position
+     nframes_t _current;
+--- klick-0.12.2/src/metronome_map.cc.old	2016-09-21 22:27:01.551067088 -0400
++++ klick-0.12.2/src/metronome_map.cc	2016-09-21 22:28:49.027158380 -0400
+@@ -195,3 +195,5 @@
+         p->beats_per_minute = _pos.map_entry().tempi[n];
+     }
+ }
++
++double const MetronomeMap::TICKS_PER_BEAT = 1920.0;
+--- klick-0.12.2/src/metronome_simple.hh.old	2016-09-21 22:18:57.674628602 -0400
++++ klick-0.12.2/src/metronome_simple.hh	2016-09-21 22:29:04.307859355 -0400
+@@ -58,9 +58,9 @@
+ 
+   private:
+ 
+-    static int const MAX_TAPS = 5;
+-    static float const MAX_TAP_AGE = 3.0;
+-    static float const TAP_DIFF = 0.2;
++    static int const MAX_TAPS;
++    static float const MAX_TAP_AGE;
++    static float const TAP_DIFF;
+ 
+     float _tempo;
+     float _tempo_increment, _tempo_start, _tempo_limit;
+--- klick-0.12.2/src/metronome_simple.cc.old	2016-09-21 22:27:24.883846428 -0400
++++ klick-0.12.2/src/metronome_simple.cc	2016-09-21 22:28:46.015859632 -0400
+@@ -217,3 +217,7 @@
+ 
+     _frame += nframes;
+ }
++
++int const MetronomeSimple::MAX_TAPS = 5;
++float const MetronomeSimple::MAX_TAP_AGE = 3.0;
++float const MetronomeSimple::TAP_DIFF = 0.2;
diff --git a/media-sound/klick/files/klick-0.12.2-sconstruct.patch b/media-sound/klick/files/klick-0.12.2-sconstruct.patch
new file mode 100644
index 000000000000..c142993b1e61
--- /dev/null
+++ b/media-sound/klick/files/klick-0.12.2-sconstruct.patch
@@ -0,0 +1,57 @@
+This patch
+* replaces deprecated calls,
+* makes the build system respect toolchain,
+* avoids underlinking.
+
+--- klick-0.12.2.orig/SConstruct
++++ klick-0.12.2/SConstruct
+@@ -11,24 +11,24 @@
+     ENV = os.environ,
+ )
+ 
+-# build options
+-opts = Options('scache.conf')
+-opts.AddOptions(
+-    PathOption('PREFIX', 'install prefix', '/usr/local'),
+-    PathOption('DESTDIR', 'intermediate install prefix', '', PathOption.PathAccept),
+-    BoolOption('DEBUG', 'debug mode', False),
+-    BoolOption('OSC', 'OSC support', True),
+-    BoolOption('TERMINAL', 'terminal control support', True),
+-    BoolOption('RUBBERBAND', 'use Rubber Band for pitch shifting', False),
++# build variables
++vars = Variables('scache.conf')
++vars.AddVariables(
++    ('CXX', 'C++ compiler'),
++    ('CXXFLAGS', 'C++ compiler flags'),
++    ('LINKFLAGS', 'linker flags'),
++    PathVariable('PREFIX', 'install prefix', '/usr/local'),
++    PathVariable('DESTDIR', 'intermediate install prefix', '', PathVariable.PathAccept),
++    BoolVariable('DEBUG', 'debug mode', False),
++    BoolVariable('OSC', 'OSC support', True),
++    BoolVariable('TERMINAL', 'terminal control support', True),
++    BoolVariable('RUBBERBAND', 'use Rubber Band for pitch shifting', False),
+ )
+-opts.Update(env)
+-opts.Save('scache.conf', env)
+-Help(opts.GenerateHelpText(env))
+-
+-if env['DEBUG']:
+-    env.Append(CCFLAGS = ['-g', '-W', '-Wall'])
+-else:
+-    env.Append(CCFLAGS = ['-O2', '-W', '-Wall'])
++vars.Update(env)
++vars.Save('scache.conf', env)
++Help(vars.GenerateHelpText(env))
++
++if not env['DEBUG']:
+     env.Prepend(CPPDEFINES = 'NDEBUG')
+ 
+ # install paths
+@@ -38,6 +38,7 @@
+ env.Append(CPPDEFINES = ('DATA_DIR', '\\"%s\\"' % prefix_share))
+ 
+ # required libraries
++env.PrependUnique(LIBS = ['stdc++', 'm'])
+ env.ParseConfig(
+     'pkg-config --cflags --libs jack samplerate sndfile'
+ )
diff --git a/media-sound/klick/klick-0.12.2-r1.ebuild b/media-sound/klick/klick-0.12.2-r1.ebuild
new file mode 100644
index 000000000000..06734a9fa584
--- /dev/null
+++ b/media-sound/klick/klick-0.12.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit scons-utils toolchain-funcs
+
+DESCRIPTION="An advanced command-line based metronome for JACK"
+HOMEPAGE="http://das.nasophon.de/klick"
+SRC_URI="http://das.nasophon.de/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug osc rubberband"
+
+RDEPEND="dev-libs/boost
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	virtual/jack
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sconstruct.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+HTML_DOCS=( doc/manual.html )
+
+src_configure() {
+	MYSCONS=(
+		CXX="$(tc-getCXX)"
+		CXXFLAGS="${CXXFLAGS}"
+		LINKFLAGS="${LDFLAGS}"
+		PREFIX="${EPREFIX}/usr"
+		DESTDIR="${D}"
+		DEBUG=$(usex debug)
+		OSC=$(usex osc)
+		RUBBERBAND=$(usex rubberband)
+	)
+}
+
+src_compile() {
+	escons "${MYSCONS[@]}"
+}
+
+src_install() {
+	escons "${MYSCONS[@]}" install
+	einstalldocs
+}
diff --git a/media-sound/klick/metadata.xml b/media-sound/klick/metadata.xml
new file mode 100644
index 000000000000..3a4ad095af7c
--- /dev/null
+++ b/media-sound/klick/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>karl.j.linden@gmail.com</email>
+		<name>Karl Linden</name>
+	</maintainer>
+	<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="rubberband">Enable rubberband support</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/kmetronome/Manifest b/media-sound/kmetronome/Manifest
new file mode 100644
index 000000000000..1aedb5f7ce6b
--- /dev/null
+++ b/media-sound/kmetronome/Manifest
@@ -0,0 +1,5 @@
+DIST kmetronome-1.0.0.tar.bz2 225715 SHA256 8b8acc5af534679ae947ee4b0fd415c298aecaefcef174988ea1f211c8d56e9f SHA512 69290c56119de78a75863c8afd891fbff2d26eeb739a5e65938ba6238e522b1fb79edc6ac0264b912cb70bc3028a6245ab16cc3d22f19e30ea9a33817589f426 WHIRLPOOL 24f769381bd8bdfcffeeb3b7bc8c9bbed8f9f04e74439f1694f7bbde348c3c8c8dcfc276d51eaadc9fee04b02d40b05338cba32de67193e4738035f793a3074e
+EBUILD kmetronome-1.0.0.ebuild 781 SHA256 fe6d4976007a4a2f11ef4da6339b9e8283f483b21c25c365fca84f18faeea23a SHA512 bd6a0aa4246ae28f946c36fc21cedc4d452a54b4a60e73df8f4034752bcc1fbc895aba45f7cd3482d4c7db24a5cc7e1acbe6671d86af0862cd27a993c391ba0d WHIRLPOOL e21448955f75559620c8a55108994d0c623f8a2586423a8303982b2a96bc4dafd56a25214d1639add98b99b123b5b54a730aa608201830913b11ea58ad93e891
+MISC ChangeLog 2926 SHA256 c9c8afd9425d0d07728e64f6a5f06456dcb3be4cb657b7fcaad5ddd91d643d14 SHA512 0f4ba8a5bdbb3230c70f8f24a6609496971ea7b55e80a1aeb2365a5c243f13d9bef6c311716f37cb86e1beccc3cd802eeecd7b79a346dbcdf3b7468621d27ba9 WHIRLPOOL 55c3245626543c1ca5524b169202933c749ebdb2b5cdff8f6b8f451e238804135aa605375e950b4aee911bc173442373bbcd08b31740c2bbfc1c707875812324
+MISC ChangeLog-2015 1797 SHA256 0ca33d4419cd0d91c5b8ef45465dc183f7dcc7dc9be01989614e3add67120e8f SHA512 d66ed159ffcd36fbab3febe28aa2110f91cad016c499a9f3097ed797910043c9dbd410d534f73fa54871aaa965f03d1607293da00b2d48fd66db98346a73189f WHIRLPOOL d811fcce0918852c772db3730a5ff0e892f2b524e8efd53caeadcbddaf4d8f57b2cfcb78abd025a86eababb5103cde5a485715aec04d36ef334664fbd6683db0
+MISC metadata.xml 443 SHA256 a0260ee17a62fc2cc24ac286a0496ed72c194e86137b99096e243063d442590d SHA512 7c8104d0ad8340cea75364d5688924517c6b1f3d9ef7c71b73d8c9f6188ebc7aa22f366777a3e7395e55493a630610e674b5bd2e26f4d6a0fed13cedc4dac38b WHIRLPOOL 64dafe619bd18b6e222eaf68b262ffc3b5a0fd97968e941b4925ba8004a4d67a19813f335c2e8eced9e56446944679ed57a9e022ac156c15f94ca34614e7155f
diff --git a/media-sound/kmetronome/kmetronome-1.0.0.ebuild b/media-sound/kmetronome/kmetronome-1.0.0.ebuild
new file mode 100644
index 000000000000..6de06d8f22f8
--- /dev/null
+++ b/media-sound/kmetronome/kmetronome-1.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="MIDI based metronome using ALSA sequencer"
+HOMEPAGE="http://kmetronome.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	>=media-sound/drumstick-1.0.0
+	!media-sound/kmetronome:4
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/kmetronome/metadata.xml b/media-sound/kmetronome/metadata.xml
new file mode 100644
index 000000000000..f5ba73ce7ff9
--- /dev/null
+++ b/media-sound/kmetronome/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">kmetronome</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/kmid/Manifest b/media-sound/kmid/Manifest
new file mode 100644
index 000000000000..97eead2feb06
--- /dev/null
+++ b/media-sound/kmid/Manifest
@@ -0,0 +1,5 @@
+DIST kmid-2.4.0.tar.bz2 577246 SHA256 44c4cf65d011d38e278e8f4d8e03e17ed1cfb7c76c33916f890a1f46d17de43b SHA512 1a25ddae7133c492a6141795b3f87c49ed7c2621c97c163addc4c6328185710e65e526af7d87e0623e67eb48e3feace11da1047f7475dff8768406c219fb3ad0 WHIRLPOOL 81b7bc6f896e257201b0735592320f34e28a4f7818470243ee051750c88d8b1f35680f6adde6a06e640e0132d4c1a2894b94e2cf9ced06ae0387f6d50bf6a0a2
+EBUILD kmid-2.4.0-r1.ebuild 633 SHA256 0047fc3a8304ab1c0c6f395a452901b4f496cf250d2ac18acbfa52c18bfd66c6 SHA512 259f3ec4164a82872c90c316d586b18dd115fad6bba98a5472e6d0aaa6bfa87f5777190781d5ffec592b80e4ae185695ca22cdd90f88769a3363c6297680a47e WHIRLPOOL fc70b1199066ae4b6f4433cb876fd0668659ad6962e56eb78ef4078b7ccbd0e2a3789ab59dbfaa0bfab40842e397d779f126443b31c078637a19b5b41bd1f43c
+MISC ChangeLog 2597 SHA256 6b63e1f55b0fdb918e3d3830498430df39b149ecbea0c86628bd28d99a463691 SHA512 868462aadc3b54e4edd0cb294b3222923fc2d7eae9773c64332422a92f1c872a424a1b5884878b8050d592d5da2805ed109a64c40bd560035f08246c44bbcf1a WHIRLPOOL c3dc5d68c641cf40741a61d2e22a0613332901614843078e78b81916c680b9d19040278f2a3f1a2b7756970e670547272e8ba0a71749890efbd37fb7bfbba47b
+MISC ChangeLog-2015 2864 SHA256 086b0eb54267166207cea7533bc593f274ebccdb0a545e28d81eed875d450b4b SHA512 2ce329227f8bd77b8d431c4c5df04604a8d106ce55e005958be99a891511c40cfb654c564748e64a6f5e5aff669c7a2894ee254e6650a4a045d027ca60a71f28 WHIRLPOOL 78a9c341abf6cf88578e2e7b147cb2a2b02ade5e602357c9ba8838d7cdeb8edfe3e9c7993863dd942b0ed9456755bab24d7731a9c1de1eaafd2a0691e7ee0a56
+MISC metadata.xml 438 SHA256 7479a58a52b9676ed807d023df2524e73635d522855f53eb09c837e825e9f0cd SHA512 9d00322bbbb8c841e565d813038411a89a72038a21e81aefa199a260130e98e16219fb3275ac623a1e96ae6b5c11e0f095d2e665bb658d84342f709780d3c0f2 WHIRLPOOL 757676242005283893bf52f38fea4259451404467dd828aa9654254de729cca70a954a5c9da00091346bdc701ebc0eee6dfd49ca58903aec32a97c3cac8379f4
diff --git a/media-sound/kmid/kmid-2.4.0-r1.ebuild b/media-sound/kmid/kmid-2.4.0-r1.ebuild
new file mode 100644
index 000000000000..69e9d79e1fec
--- /dev/null
+++ b/media-sound/kmid/kmid-2.4.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="ca ca@valencia cs da de en_GB es fr gl nb nl pt pt_BR
+sr sr@ijekavian sr@ijekavianlatin sr@Latn sv tr uk zh_CN"
+inherit kde4-base
+
+DESCRIPTION="A MIDI/Karaoke player based on kdelibs"
+HOMEPAGE="https://userbase.kde.org/KMid"
+SRC_URI="mirror://sourceforge/kmid2/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+RDEPEND="
+	media-libs/alsa-lib
+	>=media-sound/drumstick-0.4
+	<media-sound/drumstick-1.0.0
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README TODO )
diff --git a/media-sound/kmid/metadata.xml b/media-sound/kmid/metadata.xml
new file mode 100644
index 000000000000..830ae65ef26e
--- /dev/null
+++ b/media-sound/kmid/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">kmid2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/kmidimon/Manifest b/media-sound/kmidimon/Manifest
new file mode 100644
index 000000000000..94d245c76561
--- /dev/null
+++ b/media-sound/kmidimon/Manifest
@@ -0,0 +1,6 @@
+AUX kmidimon-0.7.5-kdelibs-4.14.11.patch 598 SHA256 6ca98985a7af1403b0e5aa791f4fd04e30cd09424c4f874c84dfb110a51aecea SHA512 48ddd5ff0e5adb387ae59e8363bff5e764ff74864e5a36d18c9a5c7c17a688b3cb1662ca13fe46cce7bb5e4e11e43266029e7f47dece62594ab845a302a1c029 WHIRLPOOL b566f43a7805372dd8f071976fbce80254bcbe2f053668c6a44e61b92af53581866aa9c0e36e3a73b94502437f529228f49425b1753b5d27ac3e664a20d26764
+DIST kmidimon-0.7.5.tar.bz2 285207 SHA256 0f44e69eedf4ea9bac013182352e2f5a5c81a0ea8d2f6ed979432868381c460e SHA512 4ed2db2e0e1af951ad664c64f9a4ae26f9809f826de43a02188cc6051086319386fee6b061da30943709c4b05b5845b9519f72b4310b17516765ae7a51d8725a WHIRLPOOL 03a329ef722182bd22b4ab1d013cdd72fe1ab455fc6194133f9e4a5bd30d6d59283871b597f9a7dc1ccf0517556cd1387f193c6dae9c4b14dc5ebdaf9c340b78
+EBUILD kmidimon-0.7.5.ebuild 718 SHA256 5865f57b24ed0647a2e6768b82b68047dfd995c9996bcbbdecc659ad2b5747ad SHA512 362ecffa3df78750c7fa7608ec71310f2596a156e6c74a0c3a0b5d2d879f0de505d2ab80a82ef2a2a974e4e09bf6b8c774e5b9afcef61160ca47a508d169689f WHIRLPOOL 64ea5918a4004f7da65a8c841b136acc9ac5d140aa38f57e25e28d1e6d1bbe3d331c7099d4d5c35fb4e40ad6a5f39e482181ff4315559fa4da248af7360f95a8
+MISC ChangeLog 2682 SHA256 fd8ddb510fca326aa6cbfd993136bca06cf7e73a1f0d2ff6fbcda5bfc00a4b39 SHA512 40f833c9d75b2193122c1d0c6fd47fda7a5c016aec7262bc41c8001ebd19340a309a792037d84200f9df104ca4e9e06b85d849056d1579122948c34d5ef212d7 WHIRLPOOL 3c234f0362a8fc561efd8b9b742803929f9162ce7ea01e9a44b9fea3cbca664fb132b5d2fd25f5095e0e23d302602bfbf3da356c3c088c1663354abf6d9ded8e
+MISC ChangeLog-2015 1912 SHA256 9ff516dfc21a10dbd5d9da6a3f3af0ae508c65123f8fb0755c98300eadc6cf8f SHA512 a939a288b09eef45313bffb4d0256de8a540b93d604ace19ef11eec1224adac5102fc886db44863e26e5ddaa95ff97b179a5ce937490fe32399cb62e49a6a6c7 WHIRLPOOL 7c9705eb2654a2d4753494e494ade3bff71b9c2b31dd0e867cfa539b53d87cba1cef709ecd291f3be90b1e5e2f429b3e4bab9780df7808ebb67cf70297bf4bea
+MISC metadata.xml 441 SHA256 35bcf802d4d29c23b01a5268519c2a0e79de9fb9c47e0367605f3b9ca5577a1e SHA512 808a8adb5fa17e514718fe01205c460ec78922a0db62f44e72aba02920bae36cef1731067931902b1632676380d1355df1c0087c6ac345434b87f8681573af06 WHIRLPOOL 4cc1a41d064e8b046db4405039734430ff8eaab329facdfba13daea013ca4c66d2fc09784e4ab4a761efe2d0416a18a5a0760ce4e69b174587970b3e9cb251a1
diff --git a/media-sound/kmidimon/files/kmidimon-0.7.5-kdelibs-4.14.11.patch b/media-sound/kmidimon/files/kmidimon-0.7.5-kdelibs-4.14.11.patch
new file mode 100644
index 000000000000..833be9694c32
--- /dev/null
+++ b/media-sound/kmidimon/files/kmidimon-0.7.5-kdelibs-4.14.11.patch
@@ -0,0 +1,17 @@
+The uninstall target is created automatically by FindKDE4Internal. Due to
+cmake policy changes in kdelibs-4.14.11, this target name collision causes
+a build failure.
+
+https://bugs.gentoo.org/show_bug.cgi?id=559180
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -132,8 +132,6 @@
+     "${CMAKE_SOURCE_DIR}/cmake_admin/cmake_uninstall.cmake.in"
+     "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+     IMMEDIATE @ONLY)
+-ADD_CUSTOM_TARGET(uninstall
+-    "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+ 
+ ADD_CUSTOM_TARGET ( tarball
+     COMMAND mkdir -p kmidimon-${VERSION}
diff --git a/media-sound/kmidimon/kmidimon-0.7.5.ebuild b/media-sound/kmidimon/kmidimon-0.7.5.ebuild
new file mode 100644
index 000000000000..966d78670bc9
--- /dev/null
+++ b/media-sound/kmidimon/kmidimon-0.7.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KDE_LINGUAS="cs es ja"
+KDE_HANDBOOK="optional"
+QT3SUPPORT_REQUIRED="true"
+inherit kde4-base
+
+DESCRIPTION="A MIDI monitor for ALSA sequencer"
+HOMEPAGE="http://kmidimon.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+RDEPEND="
+	media-libs/alsa-lib
+	>=media-sound/drumstick-0.5
+	<media-sound/drumstick-1.0.0
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DSTATIC_DRUMSTICK=OFF
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/kmidimon/metadata.xml b/media-sound/kmidimon/metadata.xml
new file mode 100644
index 000000000000..e3a6e95b81ee
--- /dev/null
+++ b/media-sound/kmidimon/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">kmidimon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/konvertible/Manifest b/media-sound/konvertible/Manifest
new file mode 100644
index 000000000000..201c4acb88b7
--- /dev/null
+++ b/media-sound/konvertible/Manifest
@@ -0,0 +1,5 @@
+DIST 116892-konvertible-1.0.1.tar.bz2 195359 SHA256 1f44e169ae4dd643a5e1133e51f6503058be35dc2183c6a1d74a53118757f06d SHA512 025b5ae86e2f606ba13bee9f9b285770f86d093ac4e563a776d6c516b539dc99faedd7a6214585e5815fcc146beba219fa2b038d7ec717419734bf4043982a6d WHIRLPOOL db0eb7cd1adaeac8913493d5b69f03b43cce6c677d7cc2d04a8050cc2226d9b632277c82f468a444e6b7ea2744afdc5863a5998b279b466ab38b47755bfc991d
+EBUILD konvertible-1.0.1.ebuild 643 SHA256 c33a356cb2bcb228e97361e227886f659ebcee507cb74596a7f30ea477ad82e4 SHA512 852924cb6fcb9a5ad42611f09de62e5a3c665358c48e1772b7b6770ab069ba346360cd13f39740351e8f9a01f14408abfaac762a7ed0bac9c752f67730e88c95 WHIRLPOOL 429bc78e465e2843db08c4e88990a2321162582c7cc3ffda9084ad6a655440561fd57871d68da04d848003321ea8121a2b47e45450d9f8c1314a82b44e82a820
+MISC ChangeLog 2442 SHA256 de38d5fb0f025f7cad9145ce396cfd6dbb5f1ee0cebe8e7f150b48ab938e9840 SHA512 59ebfc23bec2551da401a907bcc344a49ecffb4443789677f11ed9105a1574dc10114e9c97ce075c8a53c6de1c3cec9c3dfc25aea6d9fb0ed6ccba37e1628c58 WHIRLPOOL 3fbbd5dac8fd75b9bdca2cf0434272a81c58b8c657546b976082aca106bcb38ddbd024bf5bc0869ca1ffa51fb6d422d411d2dceba0a8a592a022b091cc76873b
+MISC ChangeLog-2015 1026 SHA256 84cd4b967c93c3464fe3b3e5a79086a80f0f676beef566018bf803fae721b0a6 SHA512 64338982a4fedc3d25fd0c0aa1329663ce06771ac1fe383e95d20393d1931e698ace951a9759eb406583993eb441a654afdb8c0cfb10bcbf45745855ffcf6d19 WHIRLPOOL 6386a3824c5ebd5ba1f6a6705bb658716f98bc1fe8aea10cfd5fe82ca4bd10a7566cf7dc6f439b043eb135fbd8f5c59a84a17892932ea5483f80f99efc81a2b8
+MISC metadata.xml 355 SHA256 708257bbd1ed877159aff5a889630bc3ba175cc3e429f68828316c54f972a14c SHA512 dc2e77e932e3468a09f4f655db7446a2ed7d092d3104df04ce0b704bc56340f8827893194a9edc5109bf13e863771cfa90ec6fde38c2f233c10ceace544d8d70 WHIRLPOOL 5900a8491524fc203daa34b4ce6d593f3d703fc0855ebfdc59fa7b5017a06e9f511bbf3fb7aedc3628009e760ca507cfb255fcc8201e46664564ee19bb331c14
diff --git a/media-sound/konvertible/konvertible-1.0.1.ebuild b/media-sound/konvertible/konvertible-1.0.1.ebuild
new file mode 100644
index 000000000000..d8758d87f043
--- /dev/null
+++ b/media-sound/konvertible/konvertible-1.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="A program to convert audio formats with FFmpeg"
+HOMEPAGE="http://www.kde-apps.org/content/show.php/Konvertible?content=116892"
+SRC_URI="http://www.kde-apps.org/CONTENT/content-files/116892-${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +handbook taglib"
+
+DEPEND="taglib? ( media-libs/taglib )"
+RDEPEND="${DEPEND}
+	virtual/ffmpeg
+"
+
+DOCS=( ChangeLog README TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with taglib)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/konvertible/metadata.xml b/media-sound/konvertible/metadata.xml
new file mode 100644
index 000000000000..c1da81a779a8
--- /dev/null
+++ b/media-sound/konvertible/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+<maintainer type="project">
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/kradio/Manifest b/media-sound/kradio/Manifest
new file mode 100644
index 000000000000..2b3448231bdb
--- /dev/null
+++ b/media-sound/kradio/Manifest
@@ -0,0 +1,6 @@
+AUX kradio-4.0.7-include.patch 350 SHA256 8cf7aa9c1f59549a93a8f7c8aecbfcdd3f8947d8be63e4640ceda53aae2bbd03 SHA512 cbb20da42949d94db61903a9103c2735f2450053f4e6c29ee70e302fc8ae1e4f6deb5c689184b28fadd1b52dc78515989763d52c2e391118aa2552786da42883 WHIRLPOOL 93d832c79d6e4e2773702794b48cb544ba419cc59fa8744a6f3e6302dec6d04333c6b765cc27f820386797d4bc221ed3ec35bd17f2b54611dd78ee12f3841378
+DIST kradio4-4.0.8.tar.bz2 1694959 SHA256 b6a0354ee0d8a69700b95428cf305940d00ff67c1a3268e8fdd9852bbacc000e SHA512 5c10cd8135d5c595cc3b1de83e59dd8913edd06ec2a74a1d69afcb01ad720eac51baea1fd53328d99f307feceb5c5f98db353f9ee94581fd290b34f6de509784 WHIRLPOOL 1a9f39d869c8f0498cf9f8924f2affd9b16f92231f3fc3a76e2d622ad0e33b610eecf144bf5780893556abb7523b121bf7b0accc85833ce96adf41f2cf0a55b1
+EBUILD kradio-4.0.8.ebuild 1703 SHA256 b148fb4c17442367deb221a1e8e9e5e912014409599dd36945bbb579f1b8e104 SHA512 b423f1539bf2f2b824d616231f9703924820ac329707a8730ea2bf9970543992f67eeaf005f7a4749cf74f9d85dd782310fced35c15c7d36961fe0e7085d95a1 WHIRLPOOL 9133b8fe0737937f7c6ddd54bc2e78a037466d8699196a88bf105963e86814ecece54aab59c0c6488dc06ef6f5a87ca97c85e273d69ff48ccb85835519e2ca1b
+MISC ChangeLog 3015 SHA256 4b5e38defcd6c595ce6cd2c26684b1d6f38cf108dfb56697ad48874bf91ad35a SHA512 a38f56091fd6958d3c50185a333e3781116fea1a193249304a8a129129f710fadb6df55ee215a162e607459418da4ad8d561a39e04a193177a1b705cce988b56 WHIRLPOOL 853147150bec28a738a14a543c17a486f692e8fdf4262288641948c954c69d1a0987e1b6c8a26b5fdaa1a139c1b61f81453e4610dad9807e77682eb93c736f32
+MISC ChangeLog-2015 6103 SHA256 58e622182c93cb01260f0bb1809e8a55601c8a8728f048e74e9cffa89b166ea8 SHA512 dcf3cc87477c6bd9fa595df123427d2efc047aa566b1dbe40fc12e374062b2cad776be135bc4c06fcae8e4577ae8958090377cfd9e8eb71bcfbdbba317cba8f0 WHIRLPOOL e22ee39dd62c6aa8ade916187754b03aa47d6e20d5dafc222907117130a05593fb9ed6dd553506ca42a23c4bcb612a0d03f42b7976d7619d1a5f1cdd153c76cb
+MISC metadata.xml 325 SHA256 688ebd5bde847403b5fb2ca4b8e48ee79214eadfad12160b5434b2796c3910bc SHA512 48353d3ec8c6c43e988378ebce11a60111ca706bede832c0e9ad886181279904ba43259c136ec093428327618285d71c516be26d6f8f103dcc8e921db8ae6060 WHIRLPOOL 8dd3a029d6e9d2e0b9379b96598dfd119c8cb156d1fbde83e9bb1daee4f561809e30a37a8c7b38a00796ca32d995a233815f6df153b91b5985f92533552effb7
diff --git a/media-sound/kradio/files/kradio-4.0.7-include.patch b/media-sound/kradio/files/kradio-4.0.7-include.patch
new file mode 100644
index 000000000000..4a0d6aaf6f5d
--- /dev/null
+++ b/media-sound/kradio/files/kradio-4.0.7-include.patch
@@ -0,0 +1,15 @@
+KDE4_INCLUDES also contains Qt includes required by KDE.
+See FindKDE4Internal.cmake for more details.
+
+Fixes Gentoo bug #510500.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,7 +55,7 @@
+ )
+ 
+ INCLUDE_DIRECTORIES(
+-    ${KDE4_INCLUDE_DIR}
++    ${KDE4_INCLUDES}
+     ${QT_INCLUDE_DIR}
+     ${Boost_INCLUDE_DIRS}
+     ${CMAKE_CURRENT_BINARY_DIR}/src
diff --git a/media-sound/kradio/kradio-4.0.8.ebuild b/media-sound/kradio/kradio-4.0.8.ebuild
new file mode 100644
index 000000000000..478201045663
--- /dev/null
+++ b/media-sound/kradio/kradio-4.0.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_LINGUAS_DIR=( po convert-presets/po )
+PLUGINS=(
+	alsa-sound dbus gui-docking-menu gui-error-log gui-quickbar
+	gui-standard-display internetradio lirc mpris oss-sound radio recording shortcuts
+	soundserver streaming timecontrol timeshifter v4lradio
+)
+KDE_LINGUAS="cs de es is it pl pt pt_BR ru sk sr@latin tr uk"
+QT3SUPPORT_REQUIRED="true"
+inherit kde4-base
+
+MY_P=${PN}4-${PV/_/-}
+
+DESCRIPTION="kradio is a radio tuner application for KDE"
+HOMEPAGE="http://kradio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="alsa debug encode ffmpeg libav lirc +mp3 +vorbis v4l"
+
+DEPEND="
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? (
+		>=media-libs/libmms-0.4
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	lirc? ( app-misc/lirc )
+	mp3? ( media-sound/lame )
+	vorbis? (
+		media-libs/libvorbis
+		media-libs/libogg
+	)
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${PN}-4.0.7-include.patch" )
+
+src_prepare() {
+	local lang
+	for lang in ${KDE_LINGUAS} ; do
+		if ! use "l10n_$(kde4_lingua_to_l10n "${lang}")" ; then
+			for dir in "${KDE_LINGUAS_DIR[@]}" ; do
+				rm ${dir}/${lang}.po
+			done
+			for plugin in "${PLUGINS[@]}" ; do
+				rm plugins/${plugin}/po/${lang}.po
+			done
+		fi
+	done
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_ALSA=$(usex alsa)
+		-DWITH_FFMPEG=$(usex ffmpeg)
+		-DWITH_LIRC=$(usex lirc)
+		-DWITH_LAME=$(usex mp3)
+		-DWITH_OGG_VORBIS=$(usex vorbis)
+		-DWITH_V4L2=$(usex v4l)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/kradio/metadata.xml b/media-sound/kradio/metadata.xml
new file mode 100644
index 000000000000..8988fcbad10c
--- /dev/null
+++ b/media-sound/kradio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">kradio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/kstreamripper/Manifest b/media-sound/kstreamripper/Manifest
new file mode 100644
index 000000000000..83c018c853f8
--- /dev/null
+++ b/media-sound/kstreamripper/Manifest
@@ -0,0 +1,6 @@
+AUX kstreamripper-0.7.100-nodebuglog.patch 424 SHA256 5c2509c22e4abf4fc648d1aabdd605b77ab924dddf155600ae7fe5c9db5ff445 SHA512 83265a1d599df249e77f736f8b362c0e70b6d4091ae10d4bb09c5d4d39836612b483593e5e388037ed1b3986445fe042797cd35e074e8d3441d59df98169070d WHIRLPOOL 1ca868480c8169e91cf7ed74d07f473c5bfb7bac4b9d3a41f9754f8e7779c578683b2f7b3ede6fa98d00d57e4aa9503f75225faed70e525cb8b1d73b6e16d6e9
+DIST kstreamripper-0.7.100.tar.bz2 1019096 SHA256 7d081453034c0bd3429766118a7e18b65d0b2acc8d306993ff17df7ec647d76d SHA512 395a2238470bc40686ac29b5d0d05ec082668a23a908649d643edbe72cb3c581f74a46ad9607f98e6b8f43148e1993676e4e295578bbf9db4ee077498957aec0 WHIRLPOOL 23d47d3daa756d0c357c719c541e812d6c64a3332e78992977a8206e2aedd5c03d8b78d5d38558c087a711c4dc3acd30e249087bb8d154a1df33ea8e72969831
+EBUILD kstreamripper-0.7.100-r2.ebuild 523 SHA256 e5c45717868bd2963ac7be7e33515a163addb83920be2e1c4a5b5299e2739cc2 SHA512 f3e695349d6b6a48ffd1ab3a792898f58a3b5d8c0efc064c091393a32173df90964b8a34003e871aa3be7232eb52e73676f161c0cb88d900ff0b6e372424f078 WHIRLPOOL f01b9a66bcefabd18bd6deb88b62f9f1beff9eaa7bcd952345ce8f8c928f17f2e49ad87be123bef1d7d67de054f2567b664663791ce447c72939d7c8a1503f56
+MISC ChangeLog 2507 SHA256 d8b2dab253b2eab5832cb4ce0de884205349c03cf539c7d2fc8a08b258f09011 SHA512 f5e4fedff77e68e11f3d5f8c1c99ffade3aa7d0ee665d5cb3374603048a351280d2aa5d272897bd51f7bc3a9d34efce43f33d265678c5f24e690e54e624b022a WHIRLPOOL 3224855668792d79fbe61d826d9a7e1baea28214bb42b85045394d79cbd258031c9400885fc7bf23ca81bd2ed7fb5e55066dd50722da05df0914a316886db9ec
+MISC ChangeLog-2015 1822 SHA256 a7545b16017384978c47f76686f5797d1c83dcf0f38c14bffdd3b70a81acad79 SHA512 b4ab842bd24db986b67cc5169985d23cc57cd406b20f99ec884454e3f4d5d4b53285332958c49d35fafaa8a85f265c7caf9e4e9eb94ed2862b9eef463ccfd217 WHIRLPOOL b0656bcc68cb3fcb09acb4516680b898ec2ca73777ba72a52d0c76e8c66eb38aefd11521fa4fc1ecf57aa241b78a302d7dac85c2ee6117b47dcd84d05f6988cf
+MISC metadata.xml 446 SHA256 a58279d025ed7b5421f7336808807371fd9705dffc61f5b5cf0e5afe2d5322b9 SHA512 b1e59747aa678800ad0829ad53cbb66f109fccf716747acfb7a958f0de1acc8149fedd104df03739518f6c06fb96e44b4f00b8d405610f4dc8503c6c17fda914 WHIRLPOOL 05bb2bb3332339913240d669a25f172b336c52e95f088ebb953c15c69547cce1c251370571a39a1406d3860a76f2befe4b527b3d3e1196761e0aea89f691a096
diff --git a/media-sound/kstreamripper/files/kstreamripper-0.7.100-nodebuglog.patch b/media-sound/kstreamripper/files/kstreamripper-0.7.100-nodebuglog.patch
new file mode 100644
index 000000000000..d4b7172ec557
--- /dev/null
+++ b/media-sound/kstreamripper/files/kstreamripper-0.7.100-nodebuglog.patch
@@ -0,0 +1,11 @@
+diff -ruN kstreamripper.orig/src/version.h.cmake kstreamripper/src/version.h.cmake
+--- kstreamripper.orig/src/version.h.cmake	2011-09-07 19:54:40.000000000 +0200
++++ kstreamripper/src/version.h.cmake	2011-12-18 20:17:53.521611664 +0100
+@@ -21,6 +21,6 @@
+ 
+ /** This macro indicates that
+   * #myMessageOutput() should be included in the binary. */
+-#define CUSTOMMESSAGEHANDLER
++/* #define CUSTOMMESSAGEHANDLER */
+ 
+ #endif
diff --git a/media-sound/kstreamripper/kstreamripper-0.7.100-r2.ebuild b/media-sound/kstreamripper/kstreamripper-0.7.100-r2.ebuild
new file mode 100644
index 000000000000..a0ad271b8f0f
--- /dev/null
+++ b/media-sound/kstreamripper/kstreamripper-0.7.100-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="Program for ripping internet radios"
+HOMEPAGE="http://kstreamripper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND=""
+#>=net-libs/libproxy-0.3.1
+RDEPEND="${DEPEND}
+	media-sound/streamripper
+"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( TODO.odt )
+
+PATCHES=( "${FILESDIR}/${P}-nodebuglog.patch" )
diff --git a/media-sound/kstreamripper/metadata.xml b/media-sound/kstreamripper/metadata.xml
new file mode 100644
index 000000000000..ad97a62c2716
--- /dev/null
+++ b/media-sound/kstreamripper/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">kstreamripper</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
new file mode 100644
index 000000000000..1f40a3f27584
--- /dev/null
+++ b/media-sound/lame/Manifest
@@ -0,0 +1,10 @@
+AUX lame-3.96-ccc.patch 809 SHA256 2322bdc40007993d77a31f5c9c0edf8af550de48b1ee3a2dbb0f6acea6c27197 SHA512 3ca09cde933763a06c5ccc25ae24d0ecfe471a56358d1bdec2a157c50342f099fff8760e11528d840a68cd8d68260b0916fa4781325f526573760abf96dfb962 WHIRLPOOL dd9ecd8344ed4256a703f6f4dc4f3bb93d8865a3fa5b8f67a3a79e685387500cbcdb59ba63a804e04a977ace8ab4892288fe6fd6c7e4ffd500b260e497dd94e4
+AUX lame-3.98-gtk-path.patch 8519 SHA256 65e345a2af2547592910aaf02775b2fb091c23801a4e1bc50d2d872cc414656b SHA512 015e82755c24f7ff2b643bb1b9fc7cf400b2b48c5210253b3109c090bd852f7d2ce7a44cd1a3d117900b2d1c9e09059042077c9cef258ba1b2387bf1a11d9585 WHIRLPOOL 59354f93da9adc86a11cae0793e0491126029d227e6aa8846bf70e431e4aba9420fc13910268ac52c8f9b1e3c65813b2fe31f8afe8de64ebeeb791b1360db512
+AUX lame-3.99.5-msse.patch 557 SHA256 c0401b7d238f01e918186f42791c9224bb49e1557ed93956c2f7e1fd87e6558d SHA512 9bf5a1b0f8955aeedff6effcab7f657961ad60ce00b5f455c05ce39ad5b03c2a809ba7225a3a33b61b84a36665fafac53e35b14e0d357289e66194a4f0ef9807 WHIRLPOOL b430a88a382fcf1beca86eacb12f7cf7e13d4eeda6025c62db18f6d1985c244b50ba38af5bc0d19ead33395a14918defdc361c4595b461af94e0797df3f0cd63
+AUX lame-3.99.5-tinfo.patch 764 SHA256 559e6635c7fd2d45b499e20713c7764a7b53076f6c38e40c25bb0f7dd67eebee SHA512 4a25887c55a23f07dd2cad68699c64d8273a83648a09a209968959eb7aa405b8c2ab64e004c1c4c52f9be2cd2652a5be51683594011736963dfe0073d5569cee WHIRLPOOL 3ccf27de3507f93500eb091a26790ddbf2143e4999f6ab8aaa15e87daa1d91dfb9528aa0ec95a7d497f174e8aa89ad171df5e27a2ab9f76cc2a4de63d19b312a
+DIST lame-3.99.5-automake-2.12.patch.gz 536 SHA256 49833b952d846405fdcc8d87de55f60dda5fb2268e1b36861c53dfd39dbd275d SHA512 9d6211e257d573ced5c29c43ba5d5cc98a231b213d6e0cfc352b14776c06c9e656ed1873d5caae466afb27dfe753eeac0842c7221a8538ccecea8f4ba0f8bfe2 WHIRLPOOL 506e505cbf8659c3f67084565fc581e4dee3ba2016db3d835e3e63d9eca0d4383443e7596229f51b349c1f8c53ef42a581761d27778de4c1e5b698c85418b401
+DIST lame-3.99.5.tar.gz 1445348 SHA256 24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff SHA512 ce62d7eb9fc8c53c343374ded30f11153a296910f0be7e649197bca7412c6660aad1aa6143d56b750f866229eb492cf7bb4f682535c383fb4aa57d7077d8b4d8 WHIRLPOOL c238107bfb824c67c639875547e24b64ceeeb22125800af753ca42de129138f480574a6cfe132bc2c9cffeb39e54b6d57059be69cb41bdc164cdbf29bd95afe9
+EBUILD lame-3.99.5-r1.ebuild 2385 SHA256 f922424473a124a8da58c4b7f53b80c3481252fade01e94fa0a096977b5a7a9e SHA512 1556b27959f39d8a324922be3ce0a472803b8eab4bd47311f7e3ff7a567df3d65a654b51310597f3f7e27fec25a24715fe0fbac0a8f68c608acfeab8e29ae9bf WHIRLPOOL b0b6cd13ea1c0db9407ecb2245e6f143176dca6fab5a9fb4ad234b213624220ec27bbd13b1f3a794a46d998b10a20fa0463c37f53faa95e7c07a0b72594f22d3
+MISC ChangeLog 3967 SHA256 cba2a8250a14dfce2a88981f3d162228874e5d8dc150396f8b87d4fca7faa99a SHA512 3075cc97e089a57fe4cb8149cfe11602cf2bddafc628f26702502b71104bdc8669ca43f637053bf51bdd2343b605bda8e6567e8504a1a63d063d6004f16d95ce WHIRLPOOL 9ba9c5dcadd19974fab507ed2c906b065e97a8dd0529b37cdeab839b5906edd85e33fad0394e272791c29a280902d74a6ef510dc5ae2dda7b47e3f5d251297a5
+MISC ChangeLog-2015 23341 SHA256 d275b2762420a52827eaafcd4fea3c4c3ec52f32d0c06ec62aba48d408cf6817 SHA512 084b9e0d4ffc5eedcffe35239d1632232755f2f6604d9e6b12763f380eb06aa8886a5787143d3570f5846845a2cd91654ae2e20dfbd24faa11ca8738aaf9d931 WHIRLPOOL 951a28e8a998711e9c340f129b32ad75122bca2090d25e894d7c92cab90cca2b610baabb5ce708a755c7e6e15782c9e68bdb83df8ddeba5820c6e8729e4b75f1
+MISC metadata.xml 542 SHA256 304318f80a4776058857774e3168a33aa3affad6a656f163ae8c086bdbd62f0c SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb WHIRLPOOL e36ad27b52067332cf80f8d4d71a2ab2a03c9cb2551a1386c444f78b9721c706fc4ca4d90a93809af84f97e04396416ae13efe70241780d14d9ddbce7a6242ff
diff --git a/media-sound/lame/files/lame-3.96-ccc.patch b/media-sound/lame/files/lame-3.96-ccc.patch
new file mode 100644
index 000000000000..4d3491ae4256
--- /dev/null
+++ b/media-sound/lame/files/lame-3.96-ccc.patch
@@ -0,0 +1,21 @@
+If ccc (alpha compiler) is installed on the system, the default
+configure is broken, fix it to respect CC.  This is only
+directly broken for ARCH=alpha but would affect anybody with a
+ccc binary in their PATH.  Bug #41908  (26 Jul 2004 agriffis)
+
+--- configure.in
++++ configure.in
+@@ -915,11 +915,9 @@
+ alpha*-*-linux*)
+ 
+ ################################################################
+-#### Check if 'ccc' is in our path
++#### Check if we're using Compaq's C Compiler: 'ccc'
+ ################################################################
+-if test "`which ccc 2>/dev/null | grep -c ccc`" != "0" ; then
+-	# Compaq's C Compiler
+-	CC=ccc
++if test "`echo $CC | sed 's/.*\///'`" = ccc; then
+ 
+ ################################################################
+ #### set 'OPTIMIZATION = -arch host -tune host' 
diff --git a/media-sound/lame/files/lame-3.98-gtk-path.patch b/media-sound/lame/files/lame-3.98-gtk-path.patch
new file mode 100644
index 000000000000..a5843597485a
--- /dev/null
+++ b/media-sound/lame/files/lame-3.98-gtk-path.patch
@@ -0,0 +1,197 @@
+--- gtk.m4
++++ gtk.m4
+@@ -0,0 +1,194 @@
++# Configure paths for GTK+
++# Owen Taylor     97-11-3
++
++dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
++dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
++dnl
++AC_DEFUN(AM_PATH_GTK,
++[dnl 
++dnl Get the cflags and libraries from the gtk-config script
++dnl
++AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
++            gtk_config_prefix="$withval", gtk_config_prefix="")
++AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
++            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
++AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
++		    , enable_gtktest=yes)
++
++  for module in . $4
++  do
++      case "$module" in
++         gthread) 
++             gtk_config_args="$gtk_config_args gthread"
++         ;;
++      esac
++  done
++
++  if test x$gtk_config_exec_prefix != x ; then
++     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
++     if test x${GTK_CONFIG+set} != xset ; then
++        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
++     fi
++  fi
++  if test x$gtk_config_prefix != x ; then
++     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
++     if test x${GTK_CONFIG+set} != xset ; then
++        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
++     fi
++  fi
++
++  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
++  min_gtk_version=ifelse([$1], ,0.99.7,$1)
++  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
++  no_gtk=""
++  if test "$GTK_CONFIG" = "no" ; then
++    no_gtk=yes
++  else
++    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
++    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
++    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++    if test "x$enable_gtktest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $GTK_CFLAGS"
++      LIBS="$GTK_LIBS $LIBS"
++dnl
++dnl Now check if the installed GTK is sufficiently new. (Also sanity
++dnl checks the results of gtk-config to some extent
++dnl
++      rm -f conf.gtktest
++      AC_TRY_RUN([
++#include <gtk/gtk.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++int 
++main ()
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  system ("touch conf.gtktest");
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = g_strdup("$min_gtk_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_gtk_version");
++     exit(1);
++   }
++
++  if ((gtk_major_version != $gtk_config_major_version) ||
++      (gtk_minor_version != $gtk_config_minor_version) ||
++      (gtk_micro_version != $gtk_config_micro_version))
++    {
++      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
++             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
++             gtk_major_version, gtk_minor_version, gtk_micro_version);
++      printf ("*** was found! If gtk-config was correct, then it is best\n");
++      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
++      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++      printf("*** required on your system.\n");
++      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
++      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
++      printf("*** before re-running configure\n");
++    } 
++#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
++  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
++	   (gtk_minor_version != GTK_MINOR_VERSION) ||
++           (gtk_micro_version != GTK_MICRO_VERSION))
++    {
++      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
++	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
++      printf("*** library (version %d.%d.%d)\n",
++	     gtk_major_version, gtk_minor_version, gtk_micro_version);
++    }
++#endif /* defined (GTK_MAJOR_VERSION) ... */
++  else
++    {
++      if ((gtk_major_version > major) ||
++        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
++        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
++      {
++        return 0;
++       }
++     else
++      {
++        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
++               gtk_major_version, gtk_minor_version, gtk_micro_version);
++        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
++	       major, minor, micro);
++        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
++        printf("***\n");
++        printf("*** If you have already installed a sufficiently new version, this error\n");
++        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
++        printf("*** being found. The easiest way to fix this is to remove the old version\n");
++        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
++        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
++        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++        printf("*** so that the correct libraries are found at run-time))\n");
++      }
++    }
++  return 1;
++}
++],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++       CFLAGS="$ac_save_CFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_gtk" = x ; then
++     AC_MSG_RESULT(yes)
++     ifelse([$2], , :, [$2])     
++  else
++     AC_MSG_RESULT(no)
++     if test "$GTK_CONFIG" = "no" ; then
++       echo "*** The gtk-config script installed by GTK could not be found"
++       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
++       echo "*** your path, or set the GTK_CONFIG environment variable to the"
++       echo "*** full path to gtk-config."
++     else
++       if test -f conf.gtktest ; then
++        :
++       else
++          echo "*** Could not run GTK test program, checking why..."
++          CFLAGS="$CFLAGS $GTK_CFLAGS"
++          LIBS="$LIBS $GTK_LIBS"
++          AC_TRY_LINK([
++#include <gtk/gtk.h>
++#include <stdio.h>
++],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
++        [ echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding GTK or finding the wrong"
++          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++          echo "***"
++          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
++          echo "*** came with the system with the command"
++          echo "***"
++          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
++        [ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
++          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
++          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
++          CFLAGS="$ac_save_CFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     GTK_CFLAGS=""
++     GTK_LIBS=""
++     ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(GTK_CFLAGS)
++  AC_SUBST(GTK_LIBS)
++  rm -f conf.gtktest
++])
diff --git a/media-sound/lame/files/lame-3.99.5-msse.patch b/media-sound/lame/files/lame-3.99.5-msse.patch
new file mode 100644
index 000000000000..bf1995e179f5
--- /dev/null
+++ b/media-sound/lame/files/lame-3.99.5-msse.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/542192
+
+Description: Build xmm_quantize_sub.c with -msse
+Author: Sebastian Ramacher <sramacher@debian.org>
+Bug: https://sourceforge.net/p/lame/bugs/443/
+Bug-Debian: https://bugs.debian.org/760047
+Last-Update: 2014-08-31
+
+--- lame-3.99.5+repack1.orig/libmp3lame/vector/Makefile.am
++++ lame-3.99.5+repack1/libmp3lame/vector/Makefile.am
+@@ -20,6 +20,7 @@ xmm_sources = xmm_quantize_sub.c
+ 
+ if WITH_XMM
+ liblamevectorroutines_la_SOURCES = $(xmm_sources)
++liblamevectorroutines_la_CFLAGS = -msse
+ endif
+ 
+ noinst_HEADERS = lame_intrin.h
diff --git a/media-sound/lame/files/lame-3.99.5-tinfo.patch b/media-sound/lame/files/lame-3.99.5-tinfo.patch
new file mode 100644
index 000000000000..cb570e7880f0
--- /dev/null
+++ b/media-sound/lame/files/lame-3.99.5-tinfo.patch
@@ -0,0 +1,23 @@
+initscr is not used anywhere in lame sourcetree, check for used tgetent instead
+check for separate tinfo library optionally built out from libncurses source tree,
+like used in debian and gentoo
+- ssuominen@g.o
+
+http://bugs.gentoo.org/454322
+
+--- configure.in
++++ configure.in
+@@ -372,9 +372,10 @@
+ 
+ AC_CHECK_HEADERS(termcap.h)
+ AC_CHECK_HEADERS(ncurses/termcap.h)
+-AC_CHECK_LIB(termcap, initscr, HAVE_TERMCAP="termcap")
+-AC_CHECK_LIB(curses, initscr, HAVE_TERMCAP="curses")
+-AC_CHECK_LIB(ncurses, initscr, HAVE_TERMCAP="ncurses")
++AC_CHECK_LIB(termcap, tgetent, HAVE_TERMCAP="termcap")
++AC_CHECK_LIB(curses, tgetent, HAVE_TERMCAP="curses")
++AC_CHECK_LIB(ncurses, tgetent, HAVE_TERMCAP="ncurses")
++AC_CHECK_LIB(tinfo, tgetent, HAVE_TERMCAP="tinfo")
+ 
+ AM_ICONV
+  
diff --git a/media-sound/lame/lame-3.99.5-r1.ebuild b/media-sound/lame/lame-3.99.5-r1.ebuild
new file mode 100644
index 000000000000..52f620849bd6
--- /dev/null
+++ b/media-sound/lame/lame-3.99.5-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="LAME Ain't an MP3 Encoder"
+HOMEPAGE="http://lame.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-automake-2.12.patch.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
+
+# These deps are without MULTILIB_USEDEP and are correct since we only build
+# libmp3lame for multilib and these deps apply to the lame frontend executable.
+RDEPEND="
+	frontend? (
+		>=sys-libs/ncurses-5.7-r7:0=
+		sndfile? ( >=media-libs/libsndfile-1.0.2 )
+	)
+	abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	cpu_flags_x86_mmx? ( dev-lang/nasm )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-3.96-ccc.patch \
+		"${FILESDIR}"/${PN}-3.98-gtk-path.patch \
+		"${FILESDIR}"/${PN}-3.99.5-tinfo.patch \
+		"${FILESDIR}"/${PN}-3.99.5-msse.patch \
+		"${WORKDIR}"/${P}-automake-2.12.patch
+
+	mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm
+
+	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
+
+	use cpu_flags_x86_mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
+
+	AT_M4DIR=. eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf
+	use cpu_flags_x86_mmx && myconf+="--enable-nasm" #361879
+
+	# Only build the frontend for the default ABI.
+	if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
+		myconf+=" $(use_enable mp3rtp) $(use_enable frontend)"
+		use sndfile && myconf+=" --with-fileio=sndfile"
+	else
+		myconf+=" --disable-frontend --disable-mp3rtp"
+	fi
+
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug debug norm) \
+		--disable-mp3x \
+		--enable-dynamic-frontends \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
+}
+
+multilib_src_install_all() {
+	cd "${S}"
+	dobin misc/mlame
+
+	dodoc API ChangeLog HACKING README STYLEGUIDE TODO USAGE
+	dohtml misc/lameGUI.html Dll/LameDLLInterface.htm
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-sound/lame/metadata.xml b/media-sound/lame/metadata.xml
new file mode 100644
index 000000000000..433fd3db8ae4
--- /dev/null
+++ b/media-sound/lame/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="frontend">Build and install the 'lame' executable frontend to lame libraries.</flag>
+    <flag name="mp3rtp">Build the mp3-to-RTP streaming utility. **UNSUPPORTED**</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">lame</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/lash/Manifest b/media-sound/lash/Manifest
new file mode 100644
index 000000000000..050f82ba212f
--- /dev/null
+++ b/media-sound/lash/Manifest
@@ -0,0 +1,10 @@
+AUX lash-0.5.4-gcc47.patch 317 SHA256 625ba6b57ed1bf5973f586dc5cd005f40e07be67c5be65d58adbc0f25d8f2ca2 SHA512 a369cf98d10dcb6380fb72093fd02d6f0feec847dc4b3715bdf2dce29f4cb398a6ddf161f649470cb21407fcccfefc4ff28c66f3384eaaca3a866f8ae36a5c1a WHIRLPOOL a9f5032ee737e5b08c89f55fb07bfdc8f197d1c82da5176202df15777c91ccd09f9fdf712a8feb993281a78334c96d2d51006e34612f628f51a05b23566126cd
+AUX lash-0.5.4-glibc2.8.patch 337 SHA256 f3ae3954e6754b9d2fc43773fb1472f5e64c58188c6fff3517f11f0f75a1f546 SHA512 2391e1879a0979163f722fc97fd9950d7c91116481e80c738530510289e8a35c722d634e416ed01b2cb6aead21aea4b411be806df06cbe09cc17df9d483ab8fc WHIRLPOOL 6248b4ce37ebc235818f3a5999ae165e7c8174710166212cb5301a83479b4e8937428317cb4c933e81d9045812b54650f358430b864852a0c7e115ad186d30eb
+AUX lash-0.5.4-strcmp.patch 278 SHA256 94adfd9286f6e70e680e01154c8442d32725c0dd75c3dcf395d023422f784451 SHA512 94d1985427e3b1b2fa2b9d9c86a1d0e82bf587c86b0e4a561a91848403944b9842d962a454808c3abb37ff011ad0054d8f69aef2d5849aa54699c71402d15685 WHIRLPOOL a2a2ebbfcb46d82b8cd2b7321eaa9a2b597e5b9fd82da9b27c236681a2f71553c9b8fd5192551c4668e4c2b46852fbc742045eac7c65ac124bfdd545c323011a
+AUX lash-0.5.4-swig_version_comparison.patch 1124 SHA256 519eef6c47dfc411a6fa54bb2dbb83ca023a4850dcf944504e2f424c954ebfd8 SHA512 43e4bf0de6ee9eb5c010a317251ebc903569fe3d1b94f9c5c4c43ba1163088c5fb8df6d861d052184fd93baea61ac5c86f33a618f186cacaa74e27dd12cf0890 WHIRLPOOL 9ebe9c29b013082ee236ed9a1d5172fcfb45ee0b7cce734baa343443f392bab010ef636daf5cee2f5c8ca52fb3d025253df1f031e9f8c0c445fc276667dd65c1
+AUX lash-0.5.4-underlinking.patch 457 SHA256 55230e49518165584b2127047450a1a6e44ebf9fd41f69f57e6434fcfc49760a SHA512 09519a9b2fb2da9cd716c1460d503bba64265b26025bf987fa7a0eac2edbce5e88a59bccc2d39617c4c3ab62d4dba1e86c400922f5312c1904b1f5746f5a1fb6 WHIRLPOOL cb97537fdbf367d0843735d5763b96425ccf1a83a90ae2ea43f6357806a6f77f8d96474355d0e3b013b01ed73f8f66bd563bb88e46709f0b897c0be2d30626d0
+DIST lash-0.5.4.tar.gz 623469 SHA256 105a7da84415c4725c6bcad28e70f23aeb4534f94fc80ca262b6a2cef2226c16 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c WHIRLPOOL 404cf85b8a2e4a17b32f9c43f78ac088864ce8de7777cec30261d614d3753922985492bc0862a6b0fa18e9e2fc962696954850c4d47034bbfa54e7c5ef1fdb6b
+EBUILD lash-0.5.4-r3.ebuild 2599 SHA256 76c9e710d54c4ba92f828d1a6a98c0977a70c34d79d7fc59e2f1c4078bf1e5cc SHA512 48f86ea78b4a50ae7762b996ac8f0b52e1f2c44a4460a414ffb5cd9099b7713cf6d3460713e59783d41a2db7e5c29f62c97a71345ecb961864cb47f75565139e WHIRLPOOL 848a49041e678aee440ae1b5360f357d0a70b1578d300e1f3a6d27fbda92c5f742529ccb822512b6e7041b471819139a3116238d2a69f9b2f1b838af61b2d485
+MISC ChangeLog 2671 SHA256 29ad8ba78d667d2a71dbb8d9fb8e46d3d95e88e39a3d52c52482922ff4f2ab10 SHA512 2143440d6b6777cc6dc3aa240572e9bc0c0ab59ea304d03926867c74fa15c6d19a0546766fddb8ba3f52365f39fd6e47f2401fa358655d2450c809bde5e0e0b9 WHIRLPOOL cc24e4b6779381b3531b343059a1e0a4ea3479ec6ca3fa99e9319b36742c923976bfa8528576e1777ce824def7897b397b4f851993f297afdfab3c1dd74079c3
+MISC ChangeLog-2015 6631 SHA256 fa6eb8d362d7012bff4ce81612c4545b8e1e78531fea63f5d0572aa8564c3498 SHA512 b60ddc32ca8f8924b3f3a8e1e6adaa369b999c2ee05dc77027a5533f9af349e93dca4fe8df4afc65260a9079ae6b399fafb011f2e17efcbde8307e2dbd6da967 WHIRLPOOL a3debfb6e46340dfef5004681a5d1a9ffa6d098d05314b248b63fc41e9ce9b854e03fa54a5ee42fbb34f3d3d2a54c2ed113a97b3cde8cc5644361535149154cc
+MISC metadata.xml 255 SHA256 fc6dd027d0011f9f42d437ea0687857760a11bf2137f8822ec8692186d0bcbe3 SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 WHIRLPOOL de03966b13986c67a61f862755281e80740260a9031e5e34cbee88a3053e66f705df0f36499b154744ff447c94e19a28b8649535e08819216569e78eb4ce9a38
diff --git a/media-sound/lash/files/lash-0.5.4-gcc47.patch b/media-sound/lash/files/lash-0.5.4-gcc47.patch
new file mode 100644
index 000000000000..c1afeda71e90
--- /dev/null
+++ b/media-sound/lash/files/lash-0.5.4-gcc47.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/451668
+http://pkgs.fedoraproject.org/cgit/lash.git/tree/lash-gcc47.patch
+
+--- liblash/lash.c
++++ liblash/lash.c
+@@ -22,6 +22,7 @@
+ #include <string.h>
+ #include <strings.h>
+ #include <pthread.h>
++#include <sys/resource.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/socket.h>
diff --git a/media-sound/lash/files/lash-0.5.4-glibc2.8.patch b/media-sound/lash/files/lash-0.5.4-glibc2.8.patch
new file mode 100644
index 000000000000..56bc89af0291
--- /dev/null
+++ b/media-sound/lash/files/lash-0.5.4-glibc2.8.patch
@@ -0,0 +1,14 @@
+--- liblash/socket.c.old	2008-06-26 15:20:44.227064193 +0200
++++ liblash/socket.c	2008-06-26 15:21:18.245063129 +0200
+@@ -20,6 +20,11 @@
+ 
+ #define _POSIX_SOURCE /* addrinfo */
+ 
++#ifdef LASH_BUILD
++#define _GNU_SOURCE
++#include "config.h"
++#endif /* LASH_BUILD */
++
+ #include <stdint.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
diff --git a/media-sound/lash/files/lash-0.5.4-strcmp.patch b/media-sound/lash/files/lash-0.5.4-strcmp.patch
new file mode 100644
index 000000000000..ea9f7ee2fda3
--- /dev/null
+++ b/media-sound/lash/files/lash-0.5.4-strcmp.patch
@@ -0,0 +1,12 @@
+clients/synth/lash.c:85:2: warning: implicit declaration of function ‘strcmp’ [-Wimplicit-function-declaration]
+
+--- clients/synth/lash.c
++++ clients/synth/lash.c
+@@ -22,6 +22,7 @@
+ 
+ #include "config.h"
+ 
++#include <string.h>
+ #include <unistd.h>
+ 
+ #include <lash/lash.h>
diff --git a/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch b/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch
new file mode 100644
index 000000000000..6dcd4366da7c
--- /dev/null
+++ b/media-sound/lash/files/lash-0.5.4-swig_version_comparison.patch
@@ -0,0 +1,15 @@
+--- acinclude.m4
++++ acinclude.m4
+@@ -40,9 +40,9 @@
+                         if test -z "$available_patch" ; then
+                                 [available_patch=0]
+                         fi
+-                        if test $available_major -ne $required_major \
+-                                -o $available_minor -ne $required_minor \
+-                                -o $available_patch -lt $required_patch ; then
++                        if ! { test $available_major -gt $required_major \
++                                || test $available_major -eq $required_major -a $available_minor -ge $required_minor \
++                                || test $available_major -eq $required_major -a $available_minor -eq $required_minor -a $available_patch -ge $required_patch; } ; then
+                                 AC_MSG_WARN([SWIG version >= $1 is required.  You have $swig_version.  You should look at http://www.swig.org])
+                                 SWIG='echo "Error: SWIG version >= $1 is required.  You have '"$swig_version"'.  You should look at http://www.swig.org" ; false'
+                         else
diff --git a/media-sound/lash/files/lash-0.5.4-underlinking.patch b/media-sound/lash/files/lash-0.5.4-underlinking.patch
new file mode 100644
index 000000000000..3e52807d267f
--- /dev/null
+++ b/media-sound/lash/files/lash-0.5.4-underlinking.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/367589
+http://bugs.gentoo.org/514748
+
+--- clients/control/Makefile.am
++++ clients/control/Makefile.am
+@@ -18,6 +18,7 @@
+ 
+ lash_control_LDADD = \
+ 	$(top_builddir)/liblash/liblash.la \
+-	$(LASH_LIBS) @READLINE_LIBS@
++	$(LASH_LIBS) @READLINE_LIBS@ \
++	$(UUID_LIBS)
+ 
+ endif
+--- clients/synth/Makefile.am
++++ clients/synth/Makefile.am
+@@ -20,4 +20,5 @@
+ 	$(JACK_LIBS) \
+ 	$(ALSA_LIBS) \
+ 	$(GTK2_LIBS) \
+-	-lpthread
++	-lpthread \
++	-lm
diff --git a/media-sound/lash/lash-0.5.4-r3.ebuild b/media-sound/lash/lash-0.5.4-r3.ebuild
new file mode 100644
index 000000000000..b3bbce5b501f
--- /dev/null
+++ b/media-sound/lash/lash-0.5.4-r3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib-minimal python-single-r1
+
+DESCRIPTION="LASH Audio Session Handler"
+HOMEPAGE="http://www.nongnu.org/lash/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+IUSE="alsa debug gtk python static-libs" # doc
+
+RDEPEND="dev-libs/libxml2
+	virtual/jack
+	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib )
+	gtk? ( x11-libs/gtk+:2 )
+	python? ( ${PYTHON_DEPS} )
+	|| ( sys-libs/readline dev-libs/libedit )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-lang/swig-1.3.40 )"
+# doc? ( >=app-text/texi2html-5 )
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/texi2html/s:-number:&-sections:' \
+		docs/Makefile.am || die #422045
+
+	epatch \
+		"${FILESDIR}"/${P}-glibc2.8.patch \
+		"${FILESDIR}"/${P}-swig_version_comparison.patch \
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-underlinking.patch \
+		"${FILESDIR}"/${P}-strcmp.patch
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+multilib_src_configure() {
+	# 'no' could be '$(usex doc)' but we use the pregenerated lash-manual.html
+	export ac_cv_prog_lash_texi2html=no #422045
+
+	# --enable-pylash would disable it
+	local myconf=()
+	if ! multilib_is_native_abi || ! use python; then
+		myconf+=( --disable-pylash )
+	fi
+
+	if ! multilib_is_native_abi; then
+		# disable remaining configure checks
+		myconf+=(
+			JACK_CFLAGS=' '
+			JACK_LIBS=' '
+			XML2_CFLAGS=' '
+			XML2_LIBS=' '
+
+			vl_cv_lib_readline=no
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable alsa alsa-midi) \
+		$(multilib_native_use_enable gtk gtk2) \
+		$(multilib_native_use_enable debug) \
+		"${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -C liblash
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		# headers
+		emake -C lash DESTDIR="${D}" install
+		# library
+		emake -C liblash DESTDIR="${D}" install
+		# pkg-config
+		emake DESTDIR="${D}" install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	dohtml docs/lash-manual-html-*/lash-manual.html
+	prune_libtool_files --all # --all for _lash.la in python directory
+	use python && python_optimize
+}
diff --git a/media-sound/lash/metadata.xml b/media-sound/lash/metadata.xml
new file mode 100644
index 000000000000..f79bb67acbd9
--- /dev/null
+++ b/media-sound/lash/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/lastfm-desktop/Manifest b/media-sound/lastfm-desktop/Manifest
new file mode 100644
index 000000000000..0644e6cdad54
--- /dev/null
+++ b/media-sound/lastfm-desktop/Manifest
@@ -0,0 +1,8 @@
+AUX lastfm-desktop-2.1.36-missing-cast.patch 872 SHA256 e4fe322cf02510e7d5a458d440cff40603e124910f8891a904b87fa1f53bd04f SHA512 b06996d0c963212af7df3a0103a93cd791ef1a1fce665a986458d07dc317133337cdbf4fa841deff6b340f0a9534177aca74a3f6d2b5cf7354d11be7542f444f WHIRLPOOL 1387e8d2c9189f37aa164bd66133fdae25918fe593b4c4211b25652cc8958f28d6c4a7362aa320a42b86a389d53d1433825b2c7b20f7e27dbe0841527d77b9f7
+DIST lastfm-desktop-2.1.35.tar.gz 6789600 SHA256 2f96f0bc66c8b87dc3ca7858ef756f1ec4c84eb70eb1c411f840af51830a3075 SHA512 9eb4f750b344b788195b6800dc6fb6962449bcfc8cb2933a5065eb6f45e7d1de0463c7c091da3001a5e09dc116939aa4cf8918138bd749ba8c06c6ceca01684a WHIRLPOOL 5cc85733e8f2f08698aa0e8f124dc55a9ef00beb579e79b2569f14d6aef1ced7c149027353cff38ceaccbfddaf7b6677091b5e489fae24667cab5cb100cfeee2
+DIST lastfm-desktop-2.1.36.tar.gz 4087375 SHA256 2c33e8b8d6442da768bad3fb96e52a67ee17e3e64c5899ad81a893075635b969 SHA512 bc5b50dfa3390df878c0f97064a863b36bfa74a0eeb3130933d628f0837c2ca663b93a42a7a114311976ea44cbbc67439390385bf3e451f64b755c74db88ddb4 WHIRLPOOL 9d40ed82df3a1cd6d550561247f34b4c78c8620a10e0c16129c0c8735aaca2d6cdd90352672146ebe5e4f4096a37d19142d5c66ee60dd0184d57d5d0b1bc8dec
+EBUILD lastfm-desktop-2.1.35.ebuild 724 SHA256 4f11bee2254d1a6e6faa5064d6755ea147acc59e7dd3c0f70b3b70749c070785 SHA512 bef82cf857fcb6a0df84be85e3cfa65d287b1aea0cc598902b7e2950f443ce2393de3798c72f7809aa0ff351815952a66c5b3b6b6588a77acbc74790014eb85c WHIRLPOOL 2abd231f00240e86db08228042a8674e6ec472287170273b054e08df0bc9cd0143758b9c10ae41d0912191ef8085c7fc40f638eda2d5db81d5c20feeb8c36af6
+EBUILD lastfm-desktop-2.1.36.ebuild 757 SHA256 8b7814e4f29971a52f053f26d0b504f51b4242b81003368c0434e241829feb34 SHA512 733cf3015cf959646089679ab1527268f227bf889c8efac58e772ae19b68d2aa2f1841b1519fc3ea1ac017f60f20390e891b9f19220a701a59986a1cbe2a968d WHIRLPOOL 56e2fd283e9aed2743f5e77f8927699afa9b67e320a9abc18c4531ca63a4582d181fbe860f95ab2e24bc955b45481baaae7a240be89766db28a22ffeef8814b6
+MISC ChangeLog 3005 SHA256 8fba5b537b65ac5c4efb75fe3032e646e957b22428a1b4884cf5da9076b2945e SHA512 813f27dabf9c010e07e0e45b378130ece714389edc1c7a6219617486523fb1542fc6ffe20baa219bf5613920f04677e4774121589279ffd0df6d919d728690ea WHIRLPOOL f20c5936b58e05fc6764f0b79d9a171c52d64026a9fb9c11d5abc113ae148dd1c31f172e2aa16bc3901358922f981d98613c06b64e68144cd080efb0b5ae61d0
+MISC ChangeLog-2015 1112 SHA256 a8deb424af62d209fec5819be3cc10994b23735c5c19c9c7fee4c2ca3f7939af SHA512 a17efaec9e08a8f93cb1c2ba7dbed08fdbc03bf72da114c03c4073a2a8cce840b40054b6db2553e81bdc6a4ed0e87a1ca91fd3b5c42556794865cd124f177e71 WHIRLPOOL 0d571453fed4f2e96900f5df8e2c1b868f57b06faf2da9c510126e547e1ab78cccf582af7efcb47e46274c73b5d8a57f694ad0bec49fab4b839be24bee03e0df
+MISC metadata.xml 355 SHA256 e5ee937324faf95066a489fdb0d9f2a4280d92e8274a0317bed5192c9dc28f5d SHA512 5e2b74b4d983d672db36cc4a0aeb12b5afd08e8ff5103701c5341d6f87047dbba0fc69974f6ed8b3e6a46701a57c3ec5e65d94eaf1ebd02a2b7707e7321cbf56 WHIRLPOOL cf17785d975aec9b50e42c07aba41af3a93e620cbf228c5636b4766e33cf48db3cff60bd9202715ec7f304262953a87b321c5b03b14550dabe557ba2837b2bb4
diff --git a/media-sound/lastfm-desktop/files/lastfm-desktop-2.1.36-missing-cast.patch b/media-sound/lastfm-desktop/files/lastfm-desktop-2.1.36-missing-cast.patch
new file mode 100644
index 000000000000..12d19d36d3e9
--- /dev/null
+++ b/media-sound/lastfm-desktop/files/lastfm-desktop-2.1.36-missing-cast.patch
@@ -0,0 +1,25 @@
+From 192b979c57aa0b9a2df4f11ad4851ce4fbf5d38b Mon Sep 17 00:00:00 2001
+From: Spiek <spiek@ymail.com>
+Date: Fri, 27 Dec 2013 13:27:11 +0100
+Subject: [PATCH] Fix missing Cast
+
+---
+ app/client/Services/RadioService/RadioService.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/app/client/Services/RadioService/RadioService.cpp b/app/client/Services/RadioService/RadioService.cpp
+index 05f22c8..10094b6 100644
+--- a/app/client/Services/RadioService/RadioService.cpp
++++ b/app/client/Services/RadioService/RadioService.cpp
+@@ -307,7 +307,7 @@
+ void
+ RadioService::onPhononStateChanged( Phonon::State newstate, Phonon::State oldstate )
+ {
+-    qDebug() << oldstate << " -> " << newstate;
++    qDebug() << (int)oldstate << " -> " << (int)newstate;
+     if (m_mediaObject == 0) {
+         qDebug() << "m_mediaObject is null!";
+         return;
+-- 
+1.8.5.5
+
diff --git a/media-sound/lastfm-desktop/lastfm-desktop-2.1.35.ebuild b/media-sound/lastfm-desktop/lastfm-desktop-2.1.35.ebuild
new file mode 100644
index 000000000000..aad974604489
--- /dev/null
+++ b/media-sound/lastfm-desktop/lastfm-desktop-2.1.35.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit qt4-r2
+
+DESCRIPTION="The official Last.fm desktop application suite"
+HOMEPAGE="http://www.last.fm https://github.com/lastfm/lastfm-desktop"
+SRC_URI="https://github.com/lastfm/lastfm-desktop/archive/2.1.35.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtsql:4
+	dev-qt/qtwebkit:4
+	media-libs/libgpod
+	>=media-libs/liblastfm-1.0.6[fingerprint,qt4(+)]
+	sys-libs/zlib
+	kde-apps/phonon-kde:4"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	eqmake4 Last.fm.pro PREFIX="${EPREFIX}"/usr
+}
diff --git a/media-sound/lastfm-desktop/lastfm-desktop-2.1.36.ebuild b/media-sound/lastfm-desktop/lastfm-desktop-2.1.36.ebuild
new file mode 100644
index 000000000000..603463205e2f
--- /dev/null
+++ b/media-sound/lastfm-desktop/lastfm-desktop-2.1.36.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit qt4-r2
+
+DESCRIPTION="The official Last.fm desktop application suite"
+HOMEPAGE="http://www.last.fm https://github.com/lastfm/lastfm-desktop"
+SRC_URI="https://github.com/lastfm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtsql:4
+	dev-qt/qtwebkit:4
+	media-libs/libgpod
+	media-libs/liblastfm[fingerprint,qt4(+)]
+	sys-libs/zlib
+	kde-apps/phonon-kde:4"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-missing-cast.patch )
+
+src_configure() {
+	eqmake4 Last.fm.pro PREFIX="${EPREFIX}"/usr
+}
diff --git a/media-sound/lastfm-desktop/metadata.xml b/media-sound/lastfm-desktop/metadata.xml
new file mode 100644
index 000000000000..b1567413bb96
--- /dev/null
+++ b/media-sound/lastfm-desktop/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">lastfm/lastfm-desktop</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/lastfmplayer/Manifest b/media-sound/lastfmplayer/Manifest
new file mode 100644
index 000000000000..a379aa851c76
--- /dev/null
+++ b/media-sound/lastfmplayer/Manifest
@@ -0,0 +1,10 @@
+AUX lastfmplayer-1.5.4.27091-gcc47.patch 1059 SHA256 718bd0c5ec07b353e29647f203f0e55252039e1601b31257409e834a9d0797c1 SHA512 5850ab4951e015652635c559d8fe1688ff52f4ad4c865d6ea82584b2abc2fbe989a4a33253a8aac451dbc98ccde7d560065d39b2c87e646d5c772238dee6d03c WHIRLPOOL d049db683dbe06a2518a5f1e9d6f2bd596f5f4d4261ca7696cbe902ce69156e3fb05311c58e0b24185969f4cf9c96362c099e204c91eca518aee5c9593c8c035
+AUX lastfmplayer-1.5.4.27091-glib.h.patch 461 SHA256 c2371dc7d74bc9cf07d9663df52bb4142c7e8dd6dad9366856c97526c0649c34 SHA512 1f2b297f47fc7a18792e83dd2963386ade4cb6f86ade16a2c939132a4234be2379b7d71669482121e4a930dd737f1e6656736e42c0e4f4859fe7a84a60de3b85 WHIRLPOOL 1d2e4ed685e9f1d255dd7dfc94f42d379d5edc92f825d230dcc7fa7974d2cc74a5e6ef7b8f52ff85e94638a6442ec127d78af53663fe66d9e76dbb6e6729f533
+AUX lastfmplayer-extensions-path.patch 1507 SHA256 4ec6beecbe5de40937b148ac72bc7d52a81f7636c8ef11b1a821db6488578153 SHA512 aaaed7a58cb21b511d1b75feb21b30b907c84943f1306c14c3f66d64a197c91b26389b3f29c7b7fe3eadbbbdfd53658619188eef31d9712a1fa3b602acd31c75 WHIRLPOOL e1fe341ac365e930deae4288ae62dd43ada1093d93f999a4bb8aff8c01b72fa76a827cc0f37fbf9cf6a1662cdd652b5efdeda99ded8bf670bf6e44c4a05fac49
+DIST dbusextension-2.0.tar.bz2 11101 SHA256 db9f5040b593886a36ec409bb1e5b96f2225132207c841cc0b3c15c6242741d2 SHA512 f277a8e4452f2d80b93111ef956f54999881d44df6beaf4294a8dc9468c5f6c2660bbd34f7d363c0541e2f46078fd6ab311b6d30547f5369fe84be1045f849f8 WHIRLPOOL e2c8aef7e8112fb3959f653a53861da5ba77f57c33ea4cafe157f8e060e98362acd8220602bc2ffae7c9437526df902fd10c5c5b5f4175bcbc9c2b1bddc988e5
+DIST lastfm-1.5.4.27091+dfsg.tar.gz 1480448 SHA256 b26596f35e71c9f5b20505486cb73f34404bbef01949c166929f566a5d9d6505 SHA512 72506c942217973fc170c2f37bf3a91fbd6378e626d891913aefa6bf7fcfa96751e2fb7c048405d7f1aad18bc9121bf066afb78b1a2498172af59d03fd80493b WHIRLPOOL 8da1761606cc50a0b17f77694b1ab8ab8c26d55eb8dd8abcc10c23afd3256f802c935d499db48614379f45f72ef754e0d00b65ca59091e58a84ff355b40e8c8a
+DIST lastfm_1.5.4.27091+dfsg-2.debian.tar.gz 69004 SHA256 e5953574db35c098b0d82537d69c0e15369bd3d3a84920a7ae42948ce9d42db7 SHA512 ef4f9995681f77ff8751d1d4d28bb68f5640b54f9646c79fafc53b3d20ba155b60baca29047ebe01f01919c89d2bfb1aeee573aa2946ac382c6de984eb81f923 WHIRLPOOL 2df70e0112bec474f010785b36ce6a0575d07aaa9c38dcd27cefcabce2394fbecb8406b0674469805c9509620ddb64cb1623c602e26cd5521ead23951d2c4978
+EBUILD lastfmplayer-1.5.4.27091-r3.ebuild 4483 SHA256 0ba88d4c50a232e400bbee69a3a8a752517a2a6a892a1aa4937e10dcccab8af0 SHA512 f0be1d54d6cf313d627a84d87dd0dc9da92d344533ccfbcbc55e7167125378f51d5d487240c55b9bb182722d82fcfc3b22f93de7144e5e5ead6de117452a3b0a WHIRLPOOL fc4a51d58d3d6cff1a0c64b3513126e0275e0eb449eca591473a00a76293eb734a6c902ee19c20645e5d71f01b558612f02c98b326a618c6e4ef1983e950a3f1
+MISC ChangeLog 2805 SHA256 28c62f858364f4f86f8dd8c2990b2a6127a11ac8accf12824b1bc1388779a623 SHA512 cbdb24b95fedddd5258d0e2672ebb19a78bbb6679f8c87491c6f5a5f7e7bb353220c20ff112a0819aba3f6577ecd4b5e5d930d0e6d8a48915b6ac5ac3f5640fd WHIRLPOOL 103e303ba7ac88b3efefe771baa9fb8e6e735c8e86012676c8fc0f8010e1c109cc6c5e93192291c66fcd6f0047f3c6ca214cb6e6edebf70baf60ba89a035ab84
+MISC ChangeLog-2015 14052 SHA256 637522e963b4bc3f07ee95eee17bde0dc5ccd2244fbc0158c69e16d6caf233ba SHA512 c227e7d9b53c7b937463c540c7281b5dcb05608bb036b8f1736a12169e02483c1f68b778fd87ccbdcc8564fae7e7e9fd06d0c4f5575010bd62d4c8a01ae334b6 WHIRLPOOL 399bf1cdeafd6d1e39fb54f2412ac52d561ee01574f401f301adadaab815f274e4bbfbfccdeebb1542e9bc1fc173c5f7d0e22e63ef41bda20d1342bd05344273
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/lastfmplayer/files/lastfmplayer-1.5.4.27091-gcc47.patch b/media-sound/lastfmplayer/files/lastfmplayer-1.5.4.27091-gcc47.patch
new file mode 100644
index 000000000000..5a6009b21859
--- /dev/null
+++ b/media-sound/lastfmplayer/files/lastfmplayer-1.5.4.27091-gcc47.patch
@@ -0,0 +1,50 @@
+Description: Fix compilation with gcc 4.7
+Author: John Stamp <jstamp@users.sourceforge.net>
+http://bugs.debian.org/667236
+https://bugs.gentoo.org/show_bug.cgi?id=423221
+--- a/src/libUnicorn/UnicornCommon.cpp
++++ b/src/libUnicorn/UnicornCommon.cpp
+@@ -32,6 +32,8 @@
+ #ifdef WIN32
+     #include <windows.h>
+     #include <shlobj.h>
++#else
++    #include <unistd.h>
+ #endif
+ 
+ using namespace std;
+--- a/src/lastfmapplication.cpp
++++ b/src/lastfmapplication.cpp
+@@ -59,6 +59,8 @@
+ 
+ #ifdef WIN32
+     #include <windows.h>
++#else
++    #include <unistd.h>
+ #endif
+ 
+ #ifdef Q_WS_MAC
+--- a/src/libUnicorn/Settings.h
++++ b/src/libUnicorn/Settings.h
+@@ -105,7 +105,7 @@
+     public:
+         MyQSettings( const UserSettings* const s )
+         {
+-            beginGroup( s->username() );
++            this->beginGroup( s->username() );
+         }
+     };
+ 
+--- a/src/playerlistener.cpp
++++ b/src/playerlistener.cpp
+@@ -33,6 +33,10 @@
+ #include <iostream>

+ #include <algorithm>

+ 

++#ifdef Q_OS_UNIX

++    #include <unistd.h>

++#endif

++

+ using namespace std;

+ 

+ 

diff --git a/media-sound/lastfmplayer/files/lastfmplayer-1.5.4.27091-glib.h.patch b/media-sound/lastfmplayer/files/lastfmplayer-1.5.4.27091-glib.h.patch
new file mode 100644
index 000000000000..146fd1b361b1
--- /dev/null
+++ b/media-sound/lastfmplayer/files/lastfmplayer-1.5.4.27091-glib.h.patch
@@ -0,0 +1,16 @@
+ src/mediadevices/ipod/IpodDevice.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/mediadevices/ipod/IpodDevice.cpp b/src/mediadevices/ipod/IpodDevice.cpp
+index 3e40672..f3bad0e 100644
+--- a/src/mediadevices/ipod/IpodDevice.cpp
++++ b/src/mediadevices/ipod/IpodDevice.cpp
+@@ -35,7 +35,7 @@
+ extern "C"
+ {
+     #include <gpod/itdb.h>
+-    #include <glib/glist.h>
++    #include <glib.h>
+ }
+ 
+ #define TABLE_NAME "IpodDeviceTracks"
diff --git a/media-sound/lastfmplayer/files/lastfmplayer-extensions-path.patch b/media-sound/lastfmplayer/files/lastfmplayer-extensions-path.patch
new file mode 100644
index 000000000000..6805dd0eb7ea
--- /dev/null
+++ b/media-sound/lastfmplayer/files/lastfmplayer-extensions-path.patch
@@ -0,0 +1,44 @@
+Index: lastfm-1.5.4.27091+dfsg/definitions.pro.inc
+===================================================================
+--- lastfm-1.5.4.27091+dfsg.orig/definitions.pro.inc
++++ lastfm-1.5.4.27091+dfsg/definitions.pro.inc
+@@ -10,7 +10,7 @@ CONFIG( service ) {
+     CONFIG += plugin
+ 
+     win32: DESTDIR = $$BIN_DIR
+-    else:  DESTDIR = $$BIN_DIR/services
++    else:  DESTDIR = $$BIN_DIR/lastfm_services
+ 
+     TARGET = srv_$$TARGET
+ }
+@@ -19,7 +19,7 @@ CONFIG( extension ) {
+     CONFIG += plugin
+ 
+     win32: DESTDIR = $$BIN_DIR
+-    else:  DESTDIR = $$BIN_DIR/extensions
++    else:  DESTDIR = $$BIN_DIR/lastfm_services/extensions
+ 
+     TARGET = ext_$$TARGET
+ }
+Index: lastfm-1.5.4.27091+dfsg/src/libMoose/MooseCommon.cpp
+===================================================================
+--- lastfm-1.5.4.27091+dfsg.orig/src/libMoose/MooseCommon.cpp
++++ lastfm-1.5.4.27091+dfsg/src/libMoose/MooseCommon.cpp
+@@ -112,7 +112,7 @@ servicePath( QString name )
+         // Hack to get it working with VS2005
+         dirPath = qApp->applicationDirPath();
+     #else
+-        dirPath = qApp->applicationDirPath() + "/services";
++        dirPath = "/usr/lib/lastfm_services";
+     #endif
+ 
+     #ifndef QT_NO_DEBUG
+@@ -358,7 +358,7 @@ extensionPaths()
+     // Hack to get it working with VS2005
+     QString path = qApp->applicationDirPath();
+   #else
+-    QString path = qApp->applicationDirPath() + "/extensions";
++    QString path = "/usr/lib/lastfm_services/extensions";
+   #endif
+ 
+   #ifndef QT_NO_DEBUG
diff --git a/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild
new file mode 100644
index 000000000000..5423b1a7c3eb
--- /dev/null
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils multilib readme.gentoo toolchain-funcs qmake-utils qt4-r2
+
+MY_P="${P/lastfmplayer/lastfm}+dfsg"
+
+DESCRIPTION="A player for last.fm radio streams"
+HOMEPAGE="http://www.last.fm/help/player
+	http://www.mehercule.net/staticpages/index.php/lastfm"
+SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/lastfm-${PV}+dfsg.tar.gz
+	https://dev.gentoo.org/~hwoarang/distfiles/lastfm_${PV}+dfsg-2.debian.tar.gz
+	dbus? ( http://glue.umd.edu/~rossatok/dbusextension-2.0.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86"
+IUSE="dbus ipod"
+
+RDEPEND="dev-qt/qtgui:4
+	dev-qt/qtsql:4
+	media-libs/libsamplerate
+	sci-libs/fftw
+	media-libs/libmad
+	ipod? ( >=media-libs/libgpod-0.5.2 )
+	media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	app-arch/sharutils"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	DISABLE_AUTOFORMATTING="yes"
+	DOC_CONTENTS="To use the Last.fm player with a mozilla based browser:
+1. Install gnome-base/gconf
+2. gconftool-2 -t string -s /desktop/gnome/url-handlers/lastfm/command \"/usr/bin/lastfm %s\"
+3. gconftool-2 -s /desktop/gnome/url-handlers/lastfm/needs_terminal false -t bool
+4. gconftool-2 -t bool -s /desktop/gnome/url-handlers/lastfm/enabled true
+
+If you experience awkward fonts or widgets, try running qtconfig."
+
+	qt4-r2_src_prepare
+	# Use a different extensions path
+	epatch "${FILESDIR}"/${PN}-extensions-path.patch
+	einfo "Applying Debian patchset"
+	sed -i "/^tray-icon-size.diff/d" "${WORKDIR}"/debian/patches/series
+	cd "${S}"
+	for i in $( < "${WORKDIR}"/debian/patches/series); do
+		epatch "${WORKDIR}"/debian/patches/$i
+	done
+	if ! use ipod ; then
+		sed -i '/src\/mediadevices\/ipod/d' LastFM.pro || die "sed failed"
+	fi
+	#fix plugin search path for multilib support
+	sed -i -e "s:/usr/lib/:/usr/$(get_libdir)/:g" \
+		"${S}"/src/libMoose/MooseCommon.cpp
+	if use dbus; then
+		mv "${WORKDIR}"/dbus "${S}"/src/dbus
+		sed -i -e "/include/s:../definitions.pro.in:definitions.pro.in:" \
+			-e "/TARGET/s:dbusextension:LastFmDbusExtension:" \
+			"${S}"/src/dbus/dbusextension.pro
+	fi
+
+	# only glib.h can be included directly in >glib-2.32
+	epatch "${FILESDIR}"/${P}-glib.h.patch
+	# Gcc 4.7 definitions. Bug #423221
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+}
+
+src_configure() {
+	if use dbus; then
+		pushd "${S}"/src/dbus
+		eqmake4 dbusextension.pro
+		popd >> /dev/null
+	fi
+	qt4-r2_src_configure
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die "emake failed"
+	if use dbus; then
+		einfo "Building DBUS plugin"
+		emake -C "${S}"/src/dbus || die "failed to build dbus extension"
+	fi
+	cd i18n; "$(qt4_get_bindir)"/lrelease *.ts
+}
+
+src_install() {
+	cd "${WORKDIR}"
+	# Docs
+	dodoc "${S}"/ChangeLog.txt "${S}"/README debian/README.source
+	doman debian/lastfm.1
+
+	# Copied from debian/rules
+	insinto /usr/share
+	doins -r debian/package-files/share/icons || die "failed to install icons"
+	insinto /usr/share/lastfm/icons
+	doins "${S}"/bin/data/icons/*.png \
+		|| die "failed to install application icons"
+	insinto /usr/share/lastfm
+	doins "${S}"/bin/data/*.png || die "failed to install icons"
+	dodir /usr/$(get_libdir)/lastfm_services/
+	insinto /usr/$(get_libdir)/lastfm_services/
+	insopts -m0755
+	doins -r "${S}"/bin/lastfm_services/*.so || die "failed to install plugins"
+	if use dbus; then
+		insinto /usr/$(get_libdir)/lastfm_services/extensions/
+		insopts -m0755
+		doins "${S}"/bin/lastfm_services/extensions/*.so
+	fi
+	insinto /usr/$(get_libdir)
+	insopts -m0755
+	doins "${S}"/bin/libLastFmTools.so.1* || die "failed to install library"
+	doins "${S}"/bin/libMoose.so.1* || die "failed to install library"
+	#fix symlinks
+	cd "${D}"/usr/$(get_libdir)/
+	ln -sfn libLastFmTools.so.1.0.0 libLastFmTools.so.1
+	ln -sfn libLastFmTools.so.1.0.0 libLastFmTools.so.1.0
+	ln -sfn libMoose.so.1.0.0 libMoose.so.1
+	ln -sfn libMoose.so.1.0.0 libMoose.so.1.0
+	cd "${WORKDIR}"
+	newbin "${S}"/bin/last.fm lastfm
+	insinto /usr/share/lastfm/i18n
+	doins "${S}"/i18n/*.qm || die "failed to install translations"
+	fperms 755 /usr/bin/lastfm
+	rm -f "${D}"/usr/share/lastfm/icons/{*profile24,systray_mac}.png
+	# create desktop entry
+	doicon "${WORKDIR}"/debian/package-files/share/icons/hicolor/48x48/apps/lastfm.png
+	# Allow arguments when launching application. Bug #395277
+	make_desktop_entry lastfm "Last.fm Player" lastfm
+	sed -i -e "/^Exec/s:lastfm:& %U:" \
+		"${D}"/usr/share/applications/lastfm-${PN}.desktop || die
+
+	readme.gentoo_create_doc
+}
diff --git a/media-sound/lastfmplayer/metadata.xml b/media-sound/lastfmplayer/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/lastfmplayer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/lilycomp/Manifest b/media-sound/lilycomp/Manifest
new file mode 100644
index 000000000000..54bf12d3f246
--- /dev/null
+++ b/media-sound/lilycomp/Manifest
@@ -0,0 +1,5 @@
+DIST lilycomp.1.0.2.tar.gz 16997 SHA256 47f46adb5ea620a66d5858c50301c76b9041099121705376cd81c5b0db9e20dd SHA512 e73104d446ce154497fe6a4790f1e6ce333f945b3196da589ca87765494461351a09b604e43f9a7d5e08cebdfac22aa53886aeec8284675db08a7d377350b937 WHIRLPOOL 0ec83e1e04fb5f4ba75a12e91b1e41dc8b6249b27cd360b15764d00bd738fd86ccd32ae5633ccb8dda7190d9f1a725d232bc93ae59c71b755c9e9e74a5532160
+EBUILD lilycomp-1.0.2-r2.ebuild 697 SHA256 c9a644c16101d21d42c666821dbf3266cb5e18d89c7659655b49413a81975e70 SHA512 77a03792a3ad7f2f26da1e61cb94581a00b2b18d896a04ae65329010338e2cff5f88692a7bb85a93fe9ebda76b79529d4b27180e7b1f05af891b7181a8f4709c WHIRLPOOL b0709e082e2efb9d98bc1e2b057ae66e833aea2d050532176f33e5f4094b94b178974c46faa2ab818423c7605287783707fd152362c21ffb77527dcc3cc20adf
+MISC ChangeLog 2856 SHA256 aaa3f89a2e43b6c97544085fec889e4cf57daf67d08ab338ab40d1da40b46ed1 SHA512 669e2fff1653fde2ed41a59fb15b0adbdb6daace4aaee37ed6fbc3472079ddc175f19762ffcdc128d3447a5973e41bcab7ea85c5a597e68464b5aade7442008f WHIRLPOOL b754f3c40d93d3107be1d6a1952a86f41cfae0eb96ea76061379e25092037900546e18262fbe3ea27d4f939aa1ac919a8f2fe410258726193aa4f545bf93efae
+MISC ChangeLog-2015 1049 SHA256 ea83e218a7a506eead01605f20c6c3b07c11c585ec5a689b5e68fee9587c355c SHA512 a4d737a9dcf25744a2eccb263025b8476a5e210ce511d2c8fe73f2dfcf0b46e8df9deaf4b8d05758c0ed08e535bc85ca9d07e017e1fd079481388fefe4c6e5af WHIRLPOOL 533482b6a5a29a93a7d549d0216ab26c4bffada570390f302f8092f6bdaa1d83ab979eb766d580ad410094f062d39007facf4a1fdb5bb363df59b58a0b078b13
+MISC metadata.xml 250 SHA256 94e2a15a1640f96aa072479887fc426b7c18dbdb087df47b24f4cf499e9e013c SHA512 b7ad96184821da7f820a0f52600fd592ee901857decf4cb16a7cd4d6a77d07717f751d52813673562e38d4422c732ce384ff315d0a9ab88de83ab8ae9740330f WHIRLPOOL d87ea25bf6433eed569b2ce218516e26aba3ad010484a45cf9dd36206476a71de162a54d68fc0306a4aab877c4311a86c501173a53464f4356cf7361731d7178
diff --git a/media-sound/lilycomp/lilycomp-1.0.2-r2.ebuild b/media-sound/lilycomp/lilycomp-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..b1edca49c7f9
--- /dev/null
+++ b/media-sound/lilycomp/lilycomp-1.0.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit python-single-r1
+
+MY_P="${P/-/.}"
+
+DESCRIPTION="graphical note entry program for use with LilyPond"
+HOMEPAGE="http://lilycomp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+HTML_DOCS=( "${S}/lilycomp.html" )
+
+src_prepare() {
+	default
+	python_fix_shebang lilycomp.py
+}
+
+src_install() {
+	default
+	newbin lilycomp.py lilycomp
+}
diff --git a/media-sound/lilycomp/metadata.xml b/media-sound/lilycomp/metadata.xml
new file mode 100644
index 000000000000..2e7b268bc6c2
--- /dev/null
+++ b/media-sound/lilycomp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="sourceforge">lilycomp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
new file mode 100644
index 000000000000..33dc25656e42
--- /dev/null
+++ b/media-sound/lilypond/Manifest
@@ -0,0 +1,17 @@
+AUX 50lilypond-gentoo.el 258 SHA256 4d8d78c7f08103d0708b0f00638a66496db4b8d2e7d1243794a28ed38dd9b5a7 SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e WHIRLPOOL 36b72e9a24815b2108f258ca31533c900201333b66a66e4cc3897a60aeb02719a90c710e94c7f99f8d98375125eb86641c88f2ecded1598a43c4a2f14394bb1f
+AUX lilypond-2.17.2-tex-docs.patch 608 SHA256 ca43b5633f3ee85748d5f0f43814b144ec4e0779961a9a802d45b551694d75e0 SHA512 fe22e649e12ba1aacf05dab14b1820d636d58dce252832331577935db2c0e565b3ec6073c6bec11a05a4c1254ddd1495252e6b3e41623e290363eb124e7fa6c1 WHIRLPOOL bdf4d95c108966e144946abb31dd5acd57102db08a410b51b562e250a0676466d8208090c880f6018bed45ac3b332acd3f66e7337cd036e5b66ee72f939c9779
+AUX lilypond-2.18.2-fontforge.patch 924 SHA256 4b8facab1fcd5f3ae866e831936904c6973430a373b6a9849053f1fd8cea496b SHA512 f4a45a1ed601c114df24e9e20aa083cd30d5b77955e19cac309508af2f59c808a629bc82bc181e5325d0534d29d3fe4de53029d2db317ed447e306e11150ef7f WHIRLPOOL 974c31043042d420e8f3e0843cadd0d92ec88813483222028e301e64402a0449e61b306a0407468755b1a27d29be1da5678065660b0ebb1ad039e2aee7af022f
+DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c
+DIST lilypond-2.19.54.tar.gz 17068093 SHA256 0ee709f1e58caf13cf5abea9bb74179ba5c7a4f2dc470ec48d9aefb553e68a58 SHA512 bcf682595017e5ad9125c3c8e89c00faa3ab7f84ac92dce06ac6ea1d93f358d779f83b2391e36219ea8f76fa569c9f3c17120024cca4cf43a0facb2b24127c8b WHIRLPOOL 7ce1cc7e89c5907515f8505a1e1efe1aadf8df48c24d70a2fe39924cf9301b6c676121e6c6ceac75b76a085e5d940c6c3bb6c31e87d314dda72c68f0af1307c8
+DIST lilypond-2.19.61.tar.gz 17154903 SHA256 fc42103824cbd9e5d230ded0f73c8ecffae14998b2ad2e136914f7eab1eecb0a SHA512 870d747f6d29644824e965f4a0ff37555afbf8d8013f01965f64d4b95ca6487d15468aee27fa44036ed2d35b00f8e9bc69c22a670ad97f04ae39a16d57ea83b9 WHIRLPOOL bc690e42b2b52a5b39dea956f83558e3adb72f8027a1acb2441cd104fd5d85f2860f2a9f0c76ec882a9404ed6cbfcecd3ee4aa60d3148e79405ca9487e4de26f
+DIST lilypond-2.19.63.tar.gz 17172960 SHA256 803f3bbf87d68fbde4ea364fc62394e5907e73cecd6188bb8f12fa4f433d9b43 SHA512 58f8922e2965bb37a08472f49d88e650d2c530a29e4672b858c0d8d91dbd8a94db78668c37424ab59084cc03c7cd07e931b138374d351ecd580f23986035f106 WHIRLPOOL 926916f23237c6ea10aaae4081b00c04aa10706cf81be51d99afba2e1eb8c8638039def026a16b6cca2e0d57120e737f0f2d4809c1e12118e78a987467162749
+DIST lilypond-2.19.64.tar.gz 17174255 SHA256 9b660fe99914c54cf30b391976d6e30f7dc7683928b3bf9b3454250c86990137 SHA512 f0728496b0271c55e29871f23df53ea1be7036029c85a5ba4b88cd7c6005ff0ec880ab0992e9d99c36c7e82e83023a809f783e69f10982de3ccdd161f38ecec9 WHIRLPOOL b13d8d9fc72392653d090175ec4cba7858ed7015607e4c249454a42a4d3027f5c1799f527aab86b57eac38b36510ce5b08b7b79f3f536386c14b7f3f285ed15c
+EBUILD lilypond-2.18.2-r3.ebuild 3229 SHA256 74c52c533beb928d792f0de62147d796c777a4997bbac6f22b38ddd8f5343246 SHA512 d388d75f4694be743d1a6127984f2fc60dde1333dd23704bc2b84263a24d0a73c8875f237d1e9b887ea524fbdd9d1c22ad2bf466b00fddce0c25a66f557d7107 WHIRLPOOL afa175837e8d6a4f3a227512dc260d8a880ea6f5d289a7fe30b78559fa5a879288a9162fc625b52a0b96a1729261ec34aa1384432c3545f0875f63dad59f8b5d
+EBUILD lilypond-2.19.54.ebuild 3416 SHA256 8a80d370a94300a214d9c685d4f1ddd68c91b0b5a2a820dc0c96ef74a46f3edb SHA512 7a36abc1dc63e2d0d2a3c7a5befab55786211ec55e7c35caf5cc3a6eb456b1bd1db9fe4b66f29c2aa7f9bee15c685a08c70feccb3d06de6e19a7b3fab39b1a20 WHIRLPOOL 214fa0e3976e62d2ca3a30d6ee4146db3ecaad3033361b29408f6b1e7baf26dfa6b9b10bc21616d7e7284a3926b6ee3da5e2ff5860cd5450675c012a47f860c7
+EBUILD lilypond-2.19.61.ebuild 3423 SHA256 9efaf151a71d559e2be82de1b56251503ba310addb33f70065bb00e57f3a5197 SHA512 72295001f330d68d7a3aed4f33dcbfcdc49fae897c862da764a943ba254469935707f03d18680566aea1249771070ae6ae921e658ad3bbae3161bfa2632b8242 WHIRLPOOL 55ac626ed13d4d10a69afeb5d5029247eae65b13ac16189b6de79d8e69a39b218564e6d4dda367c90f8aa8200236777dfe116807630b561fd1bb016e7a0ccadb
+EBUILD lilypond-2.19.63.ebuild 3423 SHA256 9efaf151a71d559e2be82de1b56251503ba310addb33f70065bb00e57f3a5197 SHA512 72295001f330d68d7a3aed4f33dcbfcdc49fae897c862da764a943ba254469935707f03d18680566aea1249771070ae6ae921e658ad3bbae3161bfa2632b8242 WHIRLPOOL 55ac626ed13d4d10a69afeb5d5029247eae65b13ac16189b6de79d8e69a39b218564e6d4dda367c90f8aa8200236777dfe116807630b561fd1bb016e7a0ccadb
+EBUILD lilypond-2.19.64.ebuild 3423 SHA256 9efaf151a71d559e2be82de1b56251503ba310addb33f70065bb00e57f3a5197 SHA512 72295001f330d68d7a3aed4f33dcbfcdc49fae897c862da764a943ba254469935707f03d18680566aea1249771070ae6ae921e658ad3bbae3161bfa2632b8242 WHIRLPOOL 55ac626ed13d4d10a69afeb5d5029247eae65b13ac16189b6de79d8e69a39b218564e6d4dda367c90f8aa8200236777dfe116807630b561fd1bb016e7a0ccadb
+EBUILD lilypond-9999.ebuild 3423 SHA256 9efaf151a71d559e2be82de1b56251503ba310addb33f70065bb00e57f3a5197 SHA512 72295001f330d68d7a3aed4f33dcbfcdc49fae897c862da764a943ba254469935707f03d18680566aea1249771070ae6ae921e658ad3bbae3161bfa2632b8242 WHIRLPOOL 55ac626ed13d4d10a69afeb5d5029247eae65b13ac16189b6de79d8e69a39b218564e6d4dda367c90f8aa8200236777dfe116807630b561fd1bb016e7a0ccadb
+MISC ChangeLog 7438 SHA256 18f52e1e97192af2a6a7d3730f5e08730cccd7583f74c700ec2a852b73dad1ba SHA512 c937e2ab7f2abd1a345b252525ed22a357ffd384013481d75762be836ebb195cd574f7dd9bab4712e9a06cdea2d4c53e14dd12b999b484c3381315ab445b56cf WHIRLPOOL 069d44a032d68a5582fb7e1cb838d0702e8879f4c813bdc431617ee95204c1fca6d6dc85d706a6eda965e370204358fab50ea851babd348dab79593e5858ea20
+MISC ChangeLog-2015 30467 SHA256 5a98ac16f60f1e583472b20b8c6bf810c358d12d22df0096c5804acae8cba9a9 SHA512 feaf4ef34b76dfcd992e9fa268c32d1496f489b9005bca62484ffb9cbebd4c36c2e001e06af2234b7d727fdbbf0110a688e4f0885fe9a8cea66199b9f93a842f WHIRLPOOL 16eae14b6705c8aa022d65318bd282246a801169aee882c4772b1889968505bfb40fbc0ed9c70ca437572e83b2cc4feae5d023de9499471f489c3e9efc5bc023
+MISC metadata.xml 861 SHA256 c34dc2445ae61e1b8baba2a8cd7e74aec0646a2d16a0c145f65fadef614147e4 SHA512 d20e7dc27a7836585c7ca28cb78c073c3767a1749d16bca3989bb552d4920e949b3caf36f2227862655e61be0914602aa3af41f17a0f61246b3f305228c9b70c WHIRLPOOL 2950d874f56182ae4a17c11f4da7620f33c4d2e96a2f3c4564d106760e2de59d68c713bbc58e10232df36a9b265deb07d5ecff90766a163d200c91036cab8b53
diff --git a/media-sound/lilypond/files/50lilypond-gentoo.el b/media-sound/lilypond/files/50lilypond-gentoo.el
new file mode 100644
index 000000000000..50f62c44d28d
--- /dev/null
+++ b/media-sound/lilypond/files/50lilypond-gentoo.el
@@ -0,0 +1,7 @@
+
+;;; lilypond site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'LilyPond-mode "lilypond-mode" "LilyPond Editing Mode" t)
+(add-to-list 'auto-mode-alist '("\\.i?ly\\'" . LilyPond-mode))
+(add-hook 'LilyPond-mode-hook 'turn-on-font-lock)
diff --git a/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch b/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch
new file mode 100644
index 000000000000..9e0d7082c0d8
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.17.2-tex-docs.patch
@@ -0,0 +1,20 @@
+--- lilypond-2.17.2/GNUmakefile.in
++++ lilypond-2.17.2/GNUmakefile.in
+@@ -5,7 +5,7 @@
+ SUBDIRS = python scripts \
+ 	flower lily \
+ 	mf ly \
+-	tex ps scm \
++	ps scm \
+ 	po \
+ 	elisp vim \
+ 	input \
+@@ -14,7 +14,7 @@
+ 
+ ## this convoluted construction is necessary, since we don't know the
+ ## value of DOCUMENTATION here.
+-documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
++documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation tex)
+ 
+ SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh
+ README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP HACKING \
diff --git a/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
new file mode 100644
index 000000000000..cfd3295b3948
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.18.2-fontforge.patch
@@ -0,0 +1,29 @@
+From a832764e7300d48468a6812077b899a4beed271b Mon Sep 17 00:00:00 2001
+From: Masamichi Hosoda <trueroad@trueroad.jp>
+Date: Sat, 22 Aug 2015 21:20:17 +0900
+Subject: [PATCH] Fix fontforge version detection
+
+Newer fontforge shows git hash in `fontforge --version`.
+In that case, configure script
+might recognize it as date (version).
+---
+ aclocal.m4 | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 48d0b77..0037c58 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -42,7 +42,8 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [
+ 
+     if test -z "$_ver"; then
+         ## If empty, try date [fontforge]
+-        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 | grep '[0-9]\{6,8\}' \
++        eval _ver=\"\`("$1" --version || "$1" -V) 2>&1 \
++	    | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
+ 	    | head -n 1 \
+ 	    | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
+     fi
+-- 
+2.6.2
+
diff --git a/media-sound/lilypond/lilypond-2.18.2-r3.ebuild b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
new file mode 100644
index 000000000000..4afc18c6e1d6
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.18.2-r3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit elisp-common autotools python-single-r1 xdg-utils
+
+DESCRIPTION="GNU Music Typesetter"
+SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa x86"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+	<dev-scheme/guile-2.0:12
+	media-fonts/urw-fonts
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-libs/kpathsea
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge[png]
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+	"${FILESDIR}"/${P}-fontforge.patch
+)
+
+DOCS=( AUTHORS.txt NEWS.txt README.txt )
+
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${PATCHES[@]}"
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm po/${lang}.po || die
+	done
+
+	# respect AR
+	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+
+	# remove bundled texinfo file (fixes bug #448560)
+	rm tex/texinfo.tex || die
+
+	eapply_user
+
+	eautoreconf
+
+	xdg_environment_reset #586592
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	econf \
+		--with-ncsb-dir=/usr/share/fonts/urw-fonts \
+		--disable-documentation \
+		--disable-optimising \
+		--disable-pipe \
+		$(use_enable debug debugging) \
+		$(use_enable profile profiling)
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/lilypond-2.19.54.ebuild b/media-sound/lilypond/lilypond-2.19.54.ebuild
new file mode 100644
index 000000000000..c0d01a0d9e2b
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.54.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit elisp-common autotools python-single-r1 xdg-utils
+
+if [[ "${PV}" = "9999" ]]; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+else
+	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+	KEYWORDS="alpha ~amd64 ~arm ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+	media-fonts/tex-gyre
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	guile2? ( >=dev-scheme/guile-2:12 )
+	!guile2? (
+		>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+		<dev-scheme/guile-2.0:12
+	)
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-libs/kpathsea
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge[png]
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
+
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm po/${lang}.po || die
+	done
+
+	# respect AR
+	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+
+	# remove bundled texinfo file (fixes bug #448560)
+	rm tex/texinfo.tex || die
+
+	eautoreconf
+
+	xdg_environment_reset #586592
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	local myeconfargs+=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-documentation
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
+		$(use_enable guile2)
+		$(use_enable profile profiling)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/lilypond-2.19.61.ebuild b/media-sound/lilypond/lilypond-2.19.61.ebuild
new file mode 100644
index 000000000000..5dd683dc4186
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.61.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit elisp-common autotools python-single-r1 xdg-utils
+
+if [[ "${PV}" = "9999" ]]; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+else
+	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+	media-fonts/tex-gyre
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	guile2? ( >=dev-scheme/guile-2:12 )
+	!guile2? (
+		>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+		<dev-scheme/guile-2.0:12
+	)
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-libs/kpathsea
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge[png]
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
+
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm po/${lang}.po || die
+	done
+
+	# respect AR
+	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+
+	# remove bundled texinfo file (fixes bug #448560)
+	rm tex/texinfo.tex || die
+
+	eautoreconf
+
+	xdg_environment_reset #586592
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	local myeconfargs=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-documentation
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
+		$(use_enable guile2)
+		$(use_enable profile profiling)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/lilypond-2.19.63.ebuild b/media-sound/lilypond/lilypond-2.19.63.ebuild
new file mode 100644
index 000000000000..5dd683dc4186
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.63.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit elisp-common autotools python-single-r1 xdg-utils
+
+if [[ "${PV}" = "9999" ]]; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+else
+	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+	media-fonts/tex-gyre
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	guile2? ( >=dev-scheme/guile-2:12 )
+	!guile2? (
+		>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+		<dev-scheme/guile-2.0:12
+	)
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-libs/kpathsea
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge[png]
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
+
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm po/${lang}.po || die
+	done
+
+	# respect AR
+	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+
+	# remove bundled texinfo file (fixes bug #448560)
+	rm tex/texinfo.tex || die
+
+	eautoreconf
+
+	xdg_environment_reset #586592
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	local myeconfargs=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-documentation
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
+		$(use_enable guile2)
+		$(use_enable profile profiling)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/lilypond-2.19.64.ebuild b/media-sound/lilypond/lilypond-2.19.64.ebuild
new file mode 100644
index 000000000000..5dd683dc4186
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.64.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit elisp-common autotools python-single-r1 xdg-utils
+
+if [[ "${PV}" = "9999" ]]; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+else
+	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+	media-fonts/tex-gyre
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	guile2? ( >=dev-scheme/guile-2:12 )
+	!guile2? (
+		>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+		<dev-scheme/guile-2.0:12
+	)
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-libs/kpathsea
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge[png]
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
+
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm po/${lang}.po || die
+	done
+
+	# respect AR
+	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+
+	# remove bundled texinfo file (fixes bug #448560)
+	rm tex/texinfo.tex || die
+
+	eautoreconf
+
+	xdg_environment_reset #586592
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	local myeconfargs=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-documentation
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
+		$(use_enable guile2)
+		$(use_enable profile profiling)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
new file mode 100644
index 000000000000..5dd683dc4186
--- /dev/null
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit elisp-common autotools python-single-r1 xdg-utils
+
+if [[ "${PV}" = "9999" ]]; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+else
+	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs guile2 profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+	media-fonts/tex-gyre
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	guile2? ( >=dev-scheme/guile-2:12 )
+	!guile2? (
+		>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+		<dev-scheme/guile-2.0:12
+	)
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-libs/kpathsea
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge[png]
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
+
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm po/${lang}.po || die
+	done
+
+	# respect AR
+	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+
+	# remove bundled texinfo file (fixes bug #448560)
+	rm tex/texinfo.tex || die
+
+	eautoreconf
+
+	xdg_environment_reset #586592
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	local myeconfargs=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-documentation
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
+		$(use_enable guile2)
+		$(use_enable profile profiling)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/metadata.xml b/media-sound/lilypond/metadata.xml
new file mode 100644
index 000000000000..38d04ad7a91a
--- /dev/null
+++ b/media-sound/lilypond/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>karl.j.linden@gmail.com</email>
+		<name>Karl Linden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>scheme@gentoo.org</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+LilyPond is an automated engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files.
+	</longdescription>
+	<use>
+		<flag name="guile2">Enable experimental support for Guile 2</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/lingot/Manifest b/media-sound/lingot/Manifest
new file mode 100644
index 000000000000..0867068801e3
--- /dev/null
+++ b/media-sound/lingot/Manifest
@@ -0,0 +1,6 @@
+AUX lingot-0.9.1-clean-install.patch 391 SHA256 f568a605bb893e42b6c11fc89a6ef43531b60327efb3034aa9f51bf5e2f3968b SHA512 f8b1321e5a7ca97981779f92f33cbc2a8aa79b9d9e0b6352475ab0d150c89b3d93b6b4c92a0ae6644408ab3cbcd0879afe6a80dc9ea5b0b89a4fc492aa895da7 WHIRLPOOL efebae71e2651ccbe560c3882a79034086ffe6d235985002d65380e3eb89046eb1d5114afc9f07fe0114b6bbcb402bf6c25bb71b91d42c96cb9f5a2ca0e678b2
+DIST lingot-0.9.1.tar.gz 440043 SHA256 ec91223ab3df7c9160e6f1ededd8125e64764360caa0de39f54ef0668d56f979 SHA512 6f4745823436fe24dce8c90c5780691aebf8106380d5d56858bc641448b875feeb97b98603b5839c429d35d8d7e1221cb62c2a0e19dbb41b160b5580dfc9a55f WHIRLPOOL 86542441e6a37182b9ce80897e08ea34f1504a9e25408440f9b8bd5e6ed7bab9ee390df498cd61534f2df51bbb36792167ab0d7a0706fb2dacc9842d3c0dbad4
+EBUILD lingot-0.9.1.ebuild 843 SHA256 870902ddbeac03b853fa40e67300be1282d4765d7ee912f89ec5b0a09ec3feb1 SHA512 e749c8d6d891b0089fcd5a89ed476aa9d4e5fc732c748fa39159c15101756736bb04747336eb777f5e3ff00b76238877332f7b7d68d206668928c2edeb48c7b9 WHIRLPOOL 6c03db27cc48c869a35debd6ac31c71390611f539b24178f439b8813350dcf5c20d01a954257d8a9969e4c873d2b940a2dced7e12bb87d6f339718e22f0e533a
+MISC ChangeLog 2803 SHA256 096d9e48535caca1ed7f16c1dc45d23f3e91a2a336e3c7003192b07234aebf4c SHA512 e5a1358792a9146484d595de98a356b487c1f9aa85d0f64b8b155fbba527816ea0a08de23e36582a1374cdc8d3ddf1318743277c1a2e51bd1015e4b90bd65378 WHIRLPOOL 2fcfbbad35a1bfee9e3ee21a86391b72bd775730ca7c281497908459676f3f34ac33c3bd7efbf56fcd9d2f76b981ff8b267ab4af1a3a9c738df6a4a019d8ca7f
+MISC ChangeLog-2015 1750 SHA256 f1f9380e3d9c84000e88ec940a2843d42d0aa64cefb6069c78f7465d01f2c792 SHA512 9471c5c6fe98503e6041c82f3688af900f21aa36498592004b1fe65de8a600b704de95a0d12df40cd5e8f745b4c2a55eaf83dd09ba4fe9a358009fe5b3b78b17 WHIRLPOOL 6b4c5244e33bb3fcb8306527bd2747872b9aaa25015f4c14e1675395fcce968c3cb7192228a0c642d330b41fd3fda098ae442757addff942731a6761a4302a2c
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/lingot/files/lingot-0.9.1-clean-install.patch b/media-sound/lingot/files/lingot-0.9.1-clean-install.patch
new file mode 100644
index 000000000000..826a9fd29ce2
--- /dev/null
+++ b/media-sound/lingot/files/lingot-0.9.1-clean-install.patch
@@ -0,0 +1,23 @@
+--- lingot-0.9.1.orig/Makefile.am
++++ lingot-0.9.1/Makefile.am
+@@ -8,19 +8,11 @@
+ lingotdocdir = ${docdir}
+ lingotdoc_DATA = \
+ 	README\
+-	COPYING\
+ 	AUTHORS\
+ 	ChangeLog\
+-	INSTALL\
+ 	NEWS\
+-	TODO\
+ 	THANKS\
+-	MAINTAINERS\
+-	src/lingot-background.xpm\
+-	src/lingot-logo.xpm\
+-	intltool-extract.in\
+-	intltool-merge.in\
+-	intltool-update.in
++	MAINTAINERS
+ 
+ EXTRA_DIST = $(lingotdoc_DATA)
+ 
diff --git a/media-sound/lingot/lingot-0.9.1.ebuild b/media-sound/lingot/lingot-0.9.1.ebuild
new file mode 100644
index 000000000000..43092c2c4111
--- /dev/null
+++ b/media-sound/lingot/lingot-0.9.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="LINGOT Is Not a Guitar-Only Tuner"
+HOMEPAGE="http://www.nongnu.org/lingot"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack"
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	dev-libs/glib:2
+	gnome-base/libglade:2.0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-clean-install.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable alsa) \
+		$(use_enable jack)
+}
+
+src_install() {
+	emake DESTDIR="${D}" lingotdocdir="/usr/share/doc/${PF}" install
+}
diff --git a/media-sound/lingot/metadata.xml b/media-sound/lingot/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/lingot/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
new file mode 100644
index 000000000000..f85fb78a321f
--- /dev/null
+++ b/media-sound/linuxsampler/Manifest
@@ -0,0 +1,7 @@
+AUX linuxsampler-2.0.0-lv2-automagic.patch 727 SHA256 d4b3f56d53399054dc2f8ced7d6d776dabbf7e12b767f7d3cd1cb257db1514a9 SHA512 95f7b2bf01b293c58dc673cd40d6846d50d3a430a2874260fc268de7afe414a4970d4a443801f5d16417c14c6c16732e4bfdc58f7f997b7a3dd0bc1dc7ac8ddd WHIRLPOOL e5440950ee5098d635d93210abee237fff3966361dd287f4f17a0e024e451d75ddfeff4365dbdcae8dd99ce6f7d3f098056feafcb88434806390041712eb53af
+AUX linuxsampler-2.0.0-nptl-hardened.patch 654 SHA256 0aa6a6f0339cf0b7127a963fb020f4a70c1da5d7d89d5873bf690a9afaad807b SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594 WHIRLPOOL 00635c36b95a11ce74d8b73f0258584e25d2f1da624e3564c7d9c79c6ba92faf6075a719fa427b1c2b7ebc1df90f76bc164e251d1b345e91a6e86b6ebd77cf2c
+DIST linuxsampler-2.0.0.tar.bz2 1318939 SHA256 1943d05006d96a9fb49f74a6f38129a4585cb78cc0648885fca9f056529c5c28 SHA512 f4a57117dbec3eeb9d6d670fec76e928ef9d9e49a1a8c6bd654d6114efdc203861e7865005f06265c172e29b5e0a948eac160377dcdabc5244caed5e5ca7e441 WHIRLPOOL d8af13229d8dafd8ed68950038968d19e01a010465a91ddd54866fb626c47081931dba7dda9a073c17274c26dec9a1ec51cf30a00fe4831716354c9e9fcf4cf4
+EBUILD linuxsampler-2.0.0-r2.ebuild 1239 SHA256 3b0b1d60b7845133a509d84b3bca98fa7408ba3f4edc4b80a29dbb5693b2cc27 SHA512 a2b299f2a9484fc156bdb07d1e5144504a2464c987ad093d33aeb27664367844c006a734b5c3c1041a48a99249a09710cbcb5c82ab8f40976b175c7e21611f9c WHIRLPOOL 5eae8602d73f5e83e98a0a2b91ee9e07d357c5ff0930fbf9c759bab54d46889eb0a0ef6401b845dabad3a6cf6a35eb2fd61e1d1a816b1eec1f9de09f7e2c4ed2
+MISC ChangeLog 3787 SHA256 3e4b0f46c457f32687896ff524891767c2a98e90670d7e69574814485c121f1e SHA512 2e16ea879588a2674e68e963ea5cb07c5018ab6280f182c78ce9af8a6200f34bef7e5aa93fc60f885cc39a150908fd14dda5b320ad262afa2d19a6bb0d9bdd84 WHIRLPOOL e07826c0ec071d865e31e52d83aa05db5c1e3a7d0040e6ae5dcec3796a4443f9d57a7704594e07637a6967532e370bba16bf80496a68119dba619a3b7b6878dd
+MISC ChangeLog-2015 3382 SHA256 f6201ddeafff781186b362ea3b997a9e4f1495ba46c1bbaa58f5e9af0af5fff7 SHA512 3223c06cd8f2a2c515de87fc062a93f1fd0a9c0e9135bc23ea56268bf7b12f1f9214942ecad18a5273f9cdcffd17cf4cff459d1183bfc061057d0506145bf18c WHIRLPOOL 54831344accc2aeb68f38eb63ba3bd12aa85406c57704ff2b7c8b84accfecb43b81ed3c73aaf892c4937bc4e24c5a15c8501f93a4603cb760cd460d86cc65442
+MISC metadata.xml 334 SHA256 d2514ef60656a9c2659f7486cd5d5124dd85c863468ca7b66fc6a7f9d2142ee1 SHA512 046a72ac6899e0f8e9362a8960bd5839fbc6f915673a95698ea02a9fcf3ad2325968a036340d32f1732ec9dfdc0591c3eba8e09665399bb51d5ff0f031a33716 WHIRLPOOL d91d8d57e9b0fbe3c2209383561a8cde06cde799b1572cd193fb7724008fbf6d25ea70dbb85f60d28b700b3e6792701cd2d8f50e0d43a56e58794389d89cdac5
diff --git a/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch b/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch
new file mode 100644
index 000000000000..a5b9f8d71efa
--- /dev/null
+++ b/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch
@@ -0,0 +1,21 @@
+--- linuxsampler-2.0.0/configure.ac
++++ linuxsampler-2.0.0/configure.ac
+@@ -532,12 +532,12 @@
+ AM_CONDITIONAL(HAVE_DSSI, test $config_have_dssi = "yes")
+ 
+ # LV2
+-PKG_CHECK_MODULES(LV2, lv2 >= 1.0.0, config_have_lv2="yes", config_have_lv2="no")
+-if test "$config_have_lv2" != "yes"; then
+-    PKG_CHECK_MODULES(LV2, lv2core >= 1.0.0, config_have_lv2="yes", config_have_lv2="no")
+-fi
+-AC_SUBST(LV2_CFLAGS)
+-AC_SUBST(LV2_LIBS)
++AC_ARG_ENABLE([lv2],
++	AS_HELP_STRING([--enable-lv2], [Enable building with lv2]))
++config_have_lv2="no"
++AS_IF([test "x$enable_lv2" = "xyes"], [
++	PKG_CHECK_MODULES([LV2], [lv2 >= 1.0.0 lv2core >= 1.0.0], [config_have_lv2="yes"])
++])
+ AM_CONDITIONAL(HAVE_LV2, test $config_have_lv2 = "yes")
+ 
+ # VST
diff --git a/media-sound/linuxsampler/files/linuxsampler-2.0.0-nptl-hardened.patch b/media-sound/linuxsampler/files/linuxsampler-2.0.0-nptl-hardened.patch
new file mode 100644
index 000000000000..0c61f096c213
--- /dev/null
+++ b/media-sound/linuxsampler/files/linuxsampler-2.0.0-nptl-hardened.patch
@@ -0,0 +1,15 @@
+Fix breakage caused by undefined behaviour. Using PTHREAD_CANCEL_ASYNCHRONOUS
+is only allowed in pure functions.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=537516
+
+--- linuxsampler-2.0.0/m4/nptl_bug.m4
++++ linuxsampler-2.0.0/m4/nptl_bug.m4
+@@ -47,7 +47,7 @@
+ void* __pthread_launcher(void* p) {
+     // let the thread be killable under any circumstances
+     // (without this function call, this test always succeeds !)
+-    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
++    pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+ 
+     // this will block this 2nd thread, since we already
+     // locked this mutex by the main thread
diff --git a/media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild b/media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..5caedabd5610
--- /dev/null
+++ b/media-sound/linuxsampler/linuxsampler-2.0.0-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="LinuxSampler is a software audio sampler engine with professional grade features"
+HOMEPAGE="http://www.linuxsampler.org/"
+SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc jack lv2 sqlite static-libs"
+
+RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 )
+	>=media-libs/libgig-4.0.0
+	media-libs/alsa-lib
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	lv2? ( media-libs/lv2 )"
+PATCHES=(
+	"${FILESDIR}/${P}-nptl-hardened.patch"
+	"${FILESDIR}/${P}-lv2-automagic.patch"
+)
+
+src_prepare() {
+	default
+	# Force regeneration of the file to let it build with all bison
+	# versions, bug #556204
+	rm src/network/lscpparser.cpp || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-alsa-driver \
+		--disable-arts-driver \
+		$(use_enable jack jack-driver) \
+		$(use_enable lv2) \
+		$(use_enable sqlite instruments-db) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+	use doc && emake docs
+}
+
+src_install() {
+	default
+	use doc && dodoc -r doc/html
+	prune_libtool_files
+}
diff --git a/media-sound/linuxsampler/metadata.xml b/media-sound/linuxsampler/metadata.xml
new file mode 100644
index 000000000000..188b388f69c6
--- /dev/null
+++ b/media-sound/linuxsampler/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+      <email>sound@gentoo.org</email>
+      <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="lv2">Add support for Ladspa V2</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/litestream/Manifest b/media-sound/litestream/Manifest
new file mode 100644
index 000000000000..f2cccdd8a428
--- /dev/null
+++ b/media-sound/litestream/Manifest
@@ -0,0 +1,5 @@
+DIST litestream-1.3RC3.tar.gz 25018 SHA256 ee3edf1ea89a90f2b7f82ad09b83c25dc8ea8ca7cf0fce2aa921f897929b2bb9 SHA512 65cf43e852a35fc299d6b0e387ca67e6fc53694e8e63cd7f901544457887785780728ef064aed5f6b5bfbba09867f8a62e5d94a44d920ca44e0dbba663732c12 WHIRLPOOL 165a339724d10adffa61bcbf0c4e41f0d55fddfa70958889176c260da216066f4bfee6282ec835b72ddcad3243722cdc9b992c090f362627ec740aa834b947a9
+EBUILD litestream-1.3_rc3.ebuild 945 SHA256 ae01109d17a65919e338b6489ccda524ecf93c007e2af81a83210b5f77e16be7 SHA512 38f35c93b0f9cf89eeae0a43266658e54ec8ba61b3858d18536174ca9ac402c97041a4ce2f108e3afbd1b9b807ad25a39427407e3ac6e4f80cb6574dc5959a8b WHIRLPOOL fed21e1f7fcb087b7536e39ba9a773a2f751619b8d0d2f6928aed4dd10820b2875c68b867a9ae70e65081e9025db0822307681df8a9b5cacda2c84e134af78c3
+MISC ChangeLog 2443 SHA256 becee1622691de84f63386ef4ce3856ea852358c77265725cc50b315214e30c3 SHA512 3c285cefbcbaded8b36b97429c8fff83cb84e435933ca5de0b89017fc2864248c63788b87ef387e3226ad124e1728b03591c9a972c6e9c7623a412628f0509bb WHIRLPOOL 4dd18a48957f0b7886e5d00047968c40f746cdf94cdf348e66821173b53de4d315dd19a38114d570bc646a4136cbf78d00ece896a6757884334a603ecddb8546
+MISC ChangeLog-2015 1652 SHA256 edb892552297d12aaf036a4b6b619e2328e2109685ae47d5f02a565ececb520a SHA512 0e2bfd1d069853ef60c6bb086055679e64ea8e7d7e6636aee57744eec48ff7d546df2a29b2e353e63f84873b489cc508ef8ed208e61c9c683d893d0d31dd1c32 WHIRLPOOL f43ec97ae8e9c725c8f71113dff0a9f74480856d6b51d91cb185cd5ce8ed46816fc9dfe24ca0d8a0afaafb92335619ed87e2c24ca7e972ae2939983d235a3597
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/litestream/litestream-1.3_rc3.ebuild b/media-sound/litestream/litestream-1.3_rc3.ebuild
new file mode 100644
index 000000000000..11515fce2aa1
--- /dev/null
+++ b/media-sound/litestream/litestream-1.3_rc3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="Litstream is a lightweight and robust shoutcast-compatible streaming mp3 server"
+HOMEPAGE="http://www.litestream.org/"
+SRC_URI="http://litestream.org/litestream/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's:CFLAGS = :CFLAGS = ${OPTFLAGS} :; s:-g::' \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	append-flags "-DNO_VARARGS"
+	emake CC=$(tc-getCC) OPTFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dobin litestream literestream || die "dobin failed"
+	newbin source litestream-source
+	newbin server litestream-server
+	newbin client litestream-client
+
+	dodoc ABOUT ACKNOWLEDGEMENTS BUGS CHANGELOG CONTACT FILES MAKEITGO README
+}
diff --git a/media-sound/litestream/metadata.xml b/media-sound/litestream/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/litestream/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/lltag/Manifest b/media-sound/lltag/Manifest
new file mode 100644
index 000000000000..01d11e7ae931
--- /dev/null
+++ b/media-sound/lltag/Manifest
@@ -0,0 +1,7 @@
+DIST lltag-0.14.4.tar.bz2 48137 SHA256 5fe8d993289136395eb040ac6f1fa633cd8fd6a02a39de2db6f0ff1397ec948d SHA512 d2dbc513ce5e75a808acb7676a2513ece34322d134d52e1f5ea44f51b7c134699a0a8e368265c2594fd275873e4908a21af135c8714278954d0b45f2fc239bf7 WHIRLPOOL 62caf3b3e5fc05dd081cf4323b1b90e302306feee4a42c3a8a7e92703cbf08986f82b8f8a5d3faf4a13f69e59d4148a35b1b0c507e1284285ed6cc9893298dbb
+DIST lltag-0.14.5.tar.bz2 48035 SHA256 7a985aec809fcbeb99879a2d7fe6defe292cbea8a8a6e29e97500117d84289d6 SHA512 64d16ae1bfb920f2e10add6728bdbe261662688b5c99e4cc92ffa5d7dd5fe596c6c3ccbe61b432a4594e49003fc981b20588def9523a65ee934418afb512bedd WHIRLPOOL 1995694ea82f4b9f1c148a798c8b6980bdf8a26d826c6d6da9624a43a217fa5dd891ec81fd4cfbc63b39501ea43d8799e2f8e0632d7d20a4416a64df4a7bc222
+EBUILD lltag-0.14.4-r1.ebuild 1006 SHA256 a7daf2413480118e6629cc78fb7a5dee7abc787cbb30061d03d6a0b703aee054 SHA512 7ddfb6db5d517593d2c2bd0ce744dbacb48f6546dbf1b1b56fc65a8048d4290240e9fa56867950615a2e66926be619019a9cb219a216eddda5ae2e0201aac970 WHIRLPOOL 01bc91d4580c186194c22a536e404900ace553dc5b663d38c19474582f4bd45f09068f8c7f48599b1a733d28a74b47105bfc7c4d9860c68043037d550bf44547
+EBUILD lltag-0.14.5.ebuild 1006 SHA256 f9195219ee777f5083cd9414b81819e8c348d5462a4827ddf07c73ac66dd9a80 SHA512 730621ff84e758482e0afe16f5ffe786988140ec4593e5bbf8722e37b2c9f15d757c5bd390c13e63732d14a2be4902fd842b56e47de4a9c1bd1976f9501e5563 WHIRLPOOL b76ddd4e2242c68ce49c9b35592461071c87b85bc09f40da09a4159162085b8b94990e7f875b703e96f4219fcb41362b7eaffa79698699bd7a246b8320ef1565
+MISC ChangeLog 2587 SHA256 d306be20049b42f6fdac3887eb4d6da4d55dba5990c0aaca96af890a2e63cc9a SHA512 6949dade383af4c13c781381b71fbd6670076e869faf1fc67b1e4a14fd3f2801fd23c8f86ce52c53093a2d4b801d3902885a55405db89fc0c42571cc0327d259 WHIRLPOOL 781b6beb3400bfb69e876650ca64790cb242e50da97cc3bc4e0da5c8db813c0edf5155d2bb1c0c0dbba6a1d9c22f56fd94d5877ad9364165d1cbd5420ec08325
+MISC ChangeLog-2015 3735 SHA256 95ba666717737227ee812ad3aa4aa172f8f1d4a544a99969b4caef55db241300 SHA512 1783cd68393fbbcfbe5dd1a355f09498f6b80376fdebc3958ec8720e3e9333224843344909fbc1af58f3f8a6aa5e07c639c4a8b09665385b588d7c634c320943 WHIRLPOOL c6fa4700039c8079e33c34805fb4a745425352fb00db756343640dc3c6a561c229da7afa1b379b484d99b013df5bc999adb82e5797a97312398a8fb19ea03a08
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/lltag/lltag-0.14.4-r1.ebuild b/media-sound/lltag/lltag-0.14.4-r1.ebuild
new file mode 100644
index 000000000000..87024dd4bbb7
--- /dev/null
+++ b/media-sound/lltag/lltag-0.14.4-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit perl-module
+
+DESCRIPTION="Automatic command-line mp3/ogg/flac file tagger and renamer"
+HOMEPAGE="http://home.gna.org/lltag"
+SRC_URI="http://download.gna.org/lltag/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac mp3 ogg readline"
+
+RDEPEND="dev-perl/libwww-perl
+	mp3? ( media-sound/mp3info dev-perl/MP3-Tag )
+	ogg? ( media-sound/vorbis-tools )
+	flac? ( media-libs/flac )
+	readline? ( dev-perl/Term-ReadLine-Perl )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	mylltagopts=(
+		"DESTDIR=${D}"
+		"PREFIX=/usr"
+		"SYSCONFDIR=/etc"
+		"MANDIR=/usr/share/man"
+		"PERL_INSTALLDIRS=vendor"
+		"DOCDIR=/usr/share/doc/${PF}"
+		)
+}
+
+src_compile() {
+	emake "${mylltagopts[@]}"
+}
+
+src_install() {
+	emake "${mylltagopts[@]}" install{,-doc,-man}
+	dodoc Changes
+	perl_delete_localpod
+	# Move config to recommended location
+	mv "${D}usr/share/doc/${PF}"/config "${D}"etc/lltag/ || die
+}
diff --git a/media-sound/lltag/lltag-0.14.5.ebuild b/media-sound/lltag/lltag-0.14.5.ebuild
new file mode 100644
index 000000000000..3f3775797d97
--- /dev/null
+++ b/media-sound/lltag/lltag-0.14.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit perl-module
+
+DESCRIPTION="Automatic command-line mp3/ogg/flac file tagger and renamer"
+HOMEPAGE="http://home.gna.org/lltag"
+SRC_URI="http://download.gna.org/lltag/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac mp3 ogg readline"
+
+RDEPEND="dev-perl/libwww-perl
+	mp3? ( media-sound/mp3info dev-perl/MP3-Tag )
+	ogg? ( media-sound/vorbis-tools )
+	flac? ( media-libs/flac )
+	readline? ( dev-perl/Term-ReadLine-Perl )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	mylltagopts=(
+		"DESTDIR=${D}"
+		"PREFIX=/usr"
+		"SYSCONFDIR=/etc"
+		"MANDIR=/usr/share/man"
+		"PERL_INSTALLDIRS=vendor"
+		"DOCDIR=/usr/share/doc/${PF}"
+		)
+}
+
+src_compile() {
+	emake "${mylltagopts[@]}"
+}
+
+src_install() {
+	emake "${mylltagopts[@]}" install{,-doc,-man}
+	dodoc Changes
+	perl_delete_localpod
+	# Move config to recommended location
+	mv "${D}usr/share/doc/${PF}"/config "${D}"etc/lltag/ || die
+}
diff --git a/media-sound/lltag/metadata.xml b/media-sound/lltag/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/lltag/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
new file mode 100644
index 000000000000..83c5a5592305
--- /dev/null
+++ b/media-sound/lmms/Manifest
@@ -0,0 +1,6 @@
+DIST lmms-1.1.90.tar.gz 16580373 SHA256 007a4b7a6c7c09bd9e4262af0f03aafb8f0e4a627d88cfa80b845202f675cc4b SHA512 4e8bc4ec70c613b69ff14e463860e6f86236cb7b238529d41c4e9cc1b9642590110d1d07f87b9e2a4e139454c3a1f851f95a5eaef12e95660b50dd6ea17aa486 WHIRLPOOL 495de690f69d2e00c7d2f99e81384e189bf235aec6911f94029be984552856be3aa19f1a5f66293e97deadacc22dbd3cbbc0d2d7a42e7111484edf9d65c196fa
+EBUILD lmms-1.1.90.ebuild 2027 SHA256 b0fa4fe963aba14452a9100c2b445cc0f989ea4f287e371a0298a185248990dd SHA512 9fd56eeaf6bcbd7c28a093166e0d462e550a48eebaf64fe0f13eabefe9804d22e6836714ad76000a1a9fb3ba4da44fd707c5e9df0fafa84477b86a10b20a731c WHIRLPOOL 820620c89f0393456cb466c5465b6c018c94e3c21f7069864d095b94efab936c55fd47ef8da672d18f4d0f61ee338b73d89a8846d31bb4f4fde6e77de8fa0c4c
+EBUILD lmms-9999.ebuild 2027 SHA256 b0fa4fe963aba14452a9100c2b445cc0f989ea4f287e371a0298a185248990dd SHA512 9fd56eeaf6bcbd7c28a093166e0d462e550a48eebaf64fe0f13eabefe9804d22e6836714ad76000a1a9fb3ba4da44fd707c5e9df0fafa84477b86a10b20a731c WHIRLPOOL 820620c89f0393456cb466c5465b6c018c94e3c21f7069864d095b94efab936c55fd47ef8da672d18f4d0f61ee338b73d89a8846d31bb4f4fde6e77de8fa0c4c
+MISC ChangeLog 3860 SHA256 00246ccff05a70477c8fc617502e8ca634448724d97a4aa9ecc61ff4d0322031 SHA512 9abb20b427a20eec58ac2369e572fe12e2fb19a44584a1fdd7970eae651f985edcfc27bb9220b5906db825d99dae155955039add1a0a0dca584241ec7c06a801 WHIRLPOOL 34949e1dcceede847908f532fe1849577175d12291ed1ca5e2bd982943c6af6c9f6694cc6132dc25a820361f991088c00e12df63a52f3155188630f3382900b0
+MISC ChangeLog-2015 6018 SHA256 634fee3a377d417ba4e42f2063d9a2f02f3cd9c92e6d143d45b1997ca86307d3 SHA512 c1791c947a51442591906c5fbbcaeb097fcbb4811899769b083e58e7736b21acde417e2b2bfa2a35a91d9ac64e65d0f0f1a20537d9d5b6cd52b531be79fd306b WHIRLPOOL 229f363820f41eac61d4e75125ca4630fb747348522786eed1d17df637fc8eddf4220e4831d2c9da3d951c18a0eff8751c5ee7245ac3311b80bfffa3c2e45094
+MISC metadata.xml 1190 SHA256 ba6c36f5dc550cbe07039fc23a8d443ff77df625942126347322bd36722c0cb8 SHA512 0e167f31d86689ec76b894af2c1c425b926c8d680bb26272c3d4f783206b8d8a4f44a1a77daf8f7a9a00792f7252733d84a7b146e97c35b63c39da3dfce103f4 WHIRLPOOL 8b4e7f4c89a8dd3130c9e2b21d8b493d3de192e04c2bef8271a4a991cc264c3fe33daf803a8c1e1f6c53dac8dd36d0dea4d0a850eebb787eb2a6a2f0e6eb8d33
diff --git a/media-sound/lmms/lmms-1.1.90.ebuild b/media-sound/lmms/lmms-1.1.90.ebuild
new file mode 100644
index 000000000000..ee2e01679215
--- /dev/null
+++ b/media-sound/lmms/lmms-1.1.90.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Cross-platform music production software"
+HOMEPAGE="https://lmms.io"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/LMMS/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	>=media-libs/libsamplerate-0.1.8
+	>=media-libs/libsndfile-1.0.11
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	>=x11-libs/fltk-1.3.0_rc3:1
+	alsa? ( media-libs/alsa-lib )
+	fluidsynth? ( media-sound/fluidsynth )
+	jack? ( virtual/jack )
+	libgig? ( media-libs/libgig )
+	ogg? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? (
+		media-libs/libsdl
+		>=media-libs/sdl-sound-1.0.1
+	)
+	soundio? ( media-libs/libsoundio )
+	stk? ( media-libs/stk )
+	vst? ( || ( app-emulation/wine virtual/wine ) )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	>=dev-util/cmake-2.4.5
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/ladspa-cmt
+	media-plugins/calf
+	media-plugins/caps-plugins
+	media-plugins/swh-plugins
+	media-plugins/tap-plugins
+"
+
+DOCS=( README.md doc/AUTHORS )
+
+src_configure() {
+	local mycmakeargs+=(
+		-DUSE_WERROR=FALSE
+		-DWANT_SYSTEM_SR=TRUE
+		-DWANT_CAPS=FALSE
+		-DWANT_TAP=FALSE
+		-DWANT_SWH=FALSE
+		-DWANT_CMT=FALSE
+		-DWANT_CALF=FALSE
+		-DWANT_QT5=TRUE
+		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_JACK=$(usex jack)
+		-DWANT_GIG=$(usex libgig)
+		-DWANT_OGGVORBIS=$(usex ogg)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_SDL=$(usex sdl)
+		-DWANT_SOUNDIO=$(usex soundio)
+		-DWANT_STK=$(usex stk)
+		-DWANT_VST=$(usex vst)
+		-DWANT_SF2=$(usex fluidsynth)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
new file mode 100644
index 000000000000..ee2e01679215
--- /dev/null
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Cross-platform music production software"
+HOMEPAGE="https://lmms.io"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/LMMS/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	>=media-libs/libsamplerate-0.1.8
+	>=media-libs/libsndfile-1.0.11
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	>=x11-libs/fltk-1.3.0_rc3:1
+	alsa? ( media-libs/alsa-lib )
+	fluidsynth? ( media-sound/fluidsynth )
+	jack? ( virtual/jack )
+	libgig? ( media-libs/libgig )
+	ogg? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? (
+		media-libs/libsdl
+		>=media-libs/sdl-sound-1.0.1
+	)
+	soundio? ( media-libs/libsoundio )
+	stk? ( media-libs/stk )
+	vst? ( || ( app-emulation/wine virtual/wine ) )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	>=dev-util/cmake-2.4.5
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/ladspa-cmt
+	media-plugins/calf
+	media-plugins/caps-plugins
+	media-plugins/swh-plugins
+	media-plugins/tap-plugins
+"
+
+DOCS=( README.md doc/AUTHORS )
+
+src_configure() {
+	local mycmakeargs+=(
+		-DUSE_WERROR=FALSE
+		-DWANT_SYSTEM_SR=TRUE
+		-DWANT_CAPS=FALSE
+		-DWANT_TAP=FALSE
+		-DWANT_SWH=FALSE
+		-DWANT_CMT=FALSE
+		-DWANT_CALF=FALSE
+		-DWANT_QT5=TRUE
+		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_JACK=$(usex jack)
+		-DWANT_GIG=$(usex libgig)
+		-DWANT_OGGVORBIS=$(usex ogg)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_SDL=$(usex sdl)
+		-DWANT_SOUNDIO=$(usex soundio)
+		-DWANT_STK=$(usex stk)
+		-DWANT_VST=$(usex vst)
+		-DWANT_SF2=$(usex fluidsynth)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-sound/lmms/metadata.xml b/media-sound/lmms/metadata.xml
new file mode 100644
index 000000000000..ec9eb3d1b7f0
--- /dev/null
+++ b/media-sound/lmms/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jaquilina@eagleeyet.net</email>
+		<name>Jonathan Aquilina</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="libgig">Enables GIG player plugin.</flag>
+		<flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis plugin.</flag>
+		<flag name="soundio">Enalbes libsoundio support.</flag>
+		<flag name="stk">Enables STK Mallet plugin.</flag>
+		<flag name="vst">Enables the VeSTige plugin to run VST plugins through Wine.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">LMMS/lmms</remote-id>
+		<remote-id type="sourceforge">lmms</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/lxmusic/Manifest b/media-sound/lxmusic/Manifest
new file mode 100644
index 000000000000..b4c21ef69819
--- /dev/null
+++ b/media-sound/lxmusic/Manifest
@@ -0,0 +1,8 @@
+AUX lxmusic-0.4.4-libnotify-0.7.patch 909 SHA256 d25d338de76e488873907ee7742690fb8884c06967dce84c627367ae869af3f8 SHA512 2f7413222e8b0ed922073dcf10a33d51c5b8440fb3610f0eb4effaceaa267146baa93a5c4dd7229238611371777e5bbf5d99083c012202a438291b873fab85db WHIRLPOOL 8ed571fad28f94a0547679ca4b877adabca5cf8e16e6e09fcde74f30b0cf0bbf851392121f16064b82fa9e56e2d79419f084cbc702ffc877bdd41b4b7b54f817
+DIST lxmusic-0.4.5.tar.gz 288873 SHA256 08a508e1df800f142fef567ff9d3d0e845bfdd70e2edb796b3b7ad0e92dce064 SHA512 2467096190fd8e1d628e234e4646fbbf96683eca6244990353cade732d91487783e4462d7619d57ce4bc9b9bda9cdacd8c857abcf73c94296f9863546f95a11f WHIRLPOOL 31fca06cc38412549bcfc126c602c4cceee3b35d3a470ddb91dc75698ebaab559232a9686e07bacb949433a51791fb01f6b763365af8b3b28e588576d6d3f401
+DIST lxmusic-0.4.7.tar.xz 180300 SHA256 4933987338eb6e8c77d63b14cea5a8886146e75acbc38a21438c6c3f47bc06ba SHA512 e1e6a7e2306b24dfd5864df88db47c07656d43a1901212b1d6b6edec8addf866b31ebae46bca572e88801620016c6fab9860f5ed44d6086f24494e2eb2737216 WHIRLPOOL 43133bbae048efac3fd0684e730d4bab8902299519e55ae1978d831fedae30af2cc0db73042208f60e110fb64b357f3d6f8bd3333b22cc0715cb1f1780c84d4f
+EBUILD lxmusic-0.4.5.ebuild 514 SHA256 b51b2ee8250b93286f12b77fa65a95e81ce36f2f55f8bf20e3b338368cdc5ada SHA512 85d7cd52364a794d755ae373f9f893a8082be99d1a9943212c53e7f478c8f010100a1bf3c3db44152084ed3718946376d650cdd1a52ef893cd3f6344a88292b6 WHIRLPOOL 659beb73eb333dea1a4861e2f0393be1066f83c02fe8272196f68949535c2f91fd1adbad3368103a45f8e821d70ca2cd15361833154ec5ec120f6b68f5141da9
+EBUILD lxmusic-0.4.7.ebuild 437 SHA256 98bdab66deda6ef894d5efe7e8d7b60f782f0187bfa0abd77ff25c69bc67cc0e SHA512 f032e61061fc2101b7148d32b4c51a5f52113ac5f1d9e457d12c822015086a90350f1747de3a7ede41fc0192f241f37aeb45c9fa94a3fd873e7a784526e3c4e2 WHIRLPOOL c5473920f8fd1c35d6fbc540b9f73eca386f9248d083f28d58f34d4cddfe904fad72c5010cb4225ebc759df508e493fe496a693d1f0fb86bce82bbf3065ade1e
+MISC ChangeLog 2670 SHA256 148a73f95414151673cc4adfc8cb72424734b67a95e2bb17d9ec037763e70734 SHA512 54257448f9b69a6b3294c3f154519128ddefa86a34a19a46fb44d5c5131b61329a5790259a0b36ce32fbe34aa7998cf22edb2f02d46fb9ddc91076f9201f55c3 WHIRLPOOL 4dd95d661825219799058c3f6208cf9560aacf8c4415b10868a2cf731edf1304ba0871656fa339aeedf65b42a15986a70742d82503b4da163997f045a1019223
+MISC ChangeLog-2015 1027 SHA256 142f9a07c73cbbdad5778107aa036db0c927179b39adea4febca0496682b648b SHA512 eb056dda0bf6df7819ea9b91cfc582188c65eed9ffe40fd3f416cf772f1af4a885a0cae3d0f3d572385d06486b86a640bee98f6bf6fcb8de0313cc0fce80573f WHIRLPOOL 289904292887878f6cd6d088ff8171039146e0d352fecd2233a1d2ef4787a5c01a27352966e8b7f9b5ee11441d7eb024f1f044892cd7a4c818a1d620dea96827
+MISC metadata.xml 475 SHA256 40f0a64b4faf118a28b4be19e8330ea57f6b0a2d212029b2e846bee2909e5624 SHA512 865b540d371034b95368f62edb2f2b302b594b621bc23f4e66a50cb3d8e518c59fe4846af0379d4f0387a0d725654bdd77396e7e06810ac472d4b6c165faa5f1 WHIRLPOOL 78c4df37fcbda7d4296b5fc243d6e851b06ab3cf79f8576a991eed010f0eebf14ad23cb1c91545460e0ebf6838c861221ca245ad67d19aa0a31cca73db18bfb7
diff --git a/media-sound/lxmusic/files/lxmusic-0.4.4-libnotify-0.7.patch b/media-sound/lxmusic/files/lxmusic-0.4.4-libnotify-0.7.patch
new file mode 100644
index 000000000000..62868c909856
--- /dev/null
+++ b/media-sound/lxmusic/files/lxmusic-0.4.4-libnotify-0.7.patch
@@ -0,0 +1,32 @@
+--- src/lxmusic-notify.c
++++ src/lxmusic-notify.c
+@@ -56,12 +56,26 @@
+ 	g_return_if_fail (message != NULL);
+ 
+ 	lxmusic_clear_notify (n);
+-
+-	notify = notify_notification_new (summary, message,
+-	                                  "lxmusic", NULL);
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	notify = notify_notification_new (summary, message, "lxmusic");
++#else
++	notify = notify_notification_new (summary, message, "lxmusic", NULL);
++#endif
++#else
++	notify = notify_notification_new (summary, message, "lxmusic", NULL);
++#endif
+ 	n->notification = notify;
+ 
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++/* lazy */
++#else
++/* lazy */
++#endif
++#else
+ 	notify_notification_attach_to_status_icon (notify, n->status_icon);
++#endif
+ 	notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
+ 	notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
+ 
diff --git a/media-sound/lxmusic/lxmusic-0.4.5.ebuild b/media-sound/lxmusic/lxmusic-0.4.5.ebuild
new file mode 100644
index 000000000000..777603e2bbab
--- /dev/null
+++ b/media-sound/lxmusic/lxmusic-0.4.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="A simple GUI XMMS2 client with minimal functionality"
+HOMEPAGE="http://lxde.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	media-sound/xmms2
+	x11-libs/libnotify"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+}
diff --git a/media-sound/lxmusic/lxmusic-0.4.7.ebuild b/media-sound/lxmusic/lxmusic-0.4.7.ebuild
new file mode 100644
index 000000000000..45825d844b8f
--- /dev/null
+++ b/media-sound/lxmusic/lxmusic-0.4.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A simple GUI XMMS2 client with minimal functionality"
+HOMEPAGE="https://wiki.lxde.org/en/LXMusic"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	media-sound/xmms2
+	x11-libs/libnotify"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/media-sound/lxmusic/metadata.xml b/media-sound/lxmusic/metadata.xml
new file mode 100644
index 000000000000..c80f5eab13d7
--- /dev/null
+++ b/media-sound/lxmusic/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>lxde@gentoo.org</email>
+		<name>Gentoo LXDE Project</name>
+	</maintainer>
+	<longdescription>LXMusic is a simple GUI XMMS2 client with minimal functionality. It can do nothing more than playing music files.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">lxde</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/lyvi/Manifest b/media-sound/lyvi/Manifest
new file mode 100644
index 000000000000..b424d093bb7c
--- /dev/null
+++ b/media-sound/lyvi/Manifest
@@ -0,0 +1,5 @@
+DIST lyvi-2.0.0.tar.gz 19307 SHA256 74b1fd94807b873ba921f071d55da7359a0033a9e7398f8dc7ce378f5d200f0a SHA512 0248ceb16436be427ab38769824ce4be48998997b1997f90ddef751105e7449cff7d865e9a5895fb67c79da0eaf394baefe1a77bdc9e6c5e2b6498d64128b045 WHIRLPOOL cf73fff6fc096fe5168adb9d56593cc3e636bb679bed294bf828f0ef557ff4b7ef78534ad643f9bbdb3ad16bc221538b5a6f8e437f068084e69ecf31e620476b
+EBUILD lyvi-2.0.0.ebuild 838 SHA256 f3240b4b66a9f25093d8db1c1ba2889e379586a51c7c4da78c4d1dbce88d9d4c SHA512 4820d43681d23e2f74700a1fbc68b8fe8045305739ab0e705b016f41bc76b478bbb026a7af4fe1098cdd1dbee8ee6f8a2265274479da8be57f69931f232ef35e WHIRLPOOL 0866856088417716f5866663fb3d4a0f53a92f5574eb109a9c3050952e740d4cc1f0105b9fb36436c747a30b25c92028c70c1088a0111ed90eb4ca944e6c74e6
+MISC ChangeLog 2788 SHA256 ffed97378b83d5d9187e3f5141e102f015b094fd7ce440f02cf3242cc8a80f7a SHA512 345c6d2180813c7ac3e934afbc7eddf19bc2d4a8a9a4e37c23d762cddfe3ad391ab22efc4c3f6137631a495324d6b15f0ca55c740dd5b8408fc4fde9794f769f WHIRLPOOL 3b0166d81ba43efbb4fd624513908aa14f097c613306b1aad53d01443d22dae347c18edc0c61251e3b03f250b34c2ca74a8aa583a1f858adb4d67d68b0780c25
+MISC ChangeLog-2015 805 SHA256 d923d5c265bdeeb3051ca20544eb7e8ad0e16509a2bea16207832aa23507f200 SHA512 ac5af52c3dd5e0e73c1a95a47f75eb24392caaa3e27f755bf12d313c903b6b89654daafcdee050a243ac4cee8b487cb08a584f95db7cc21537f0a7fde8486d6a WHIRLPOOL 7c92d2e58d5d040e2dee02f1592b333a58c8d1cb21f7b327b2f052492773ddf51f81f55a235ebb36325380e270aa28afc87a154499b7837295498701fe2a56e3
+MISC metadata.xml 722 SHA256 f2f8a469648621ded3d22822b03731608fd39f3346b2e537d538e2c5b98c2581 SHA512 b7427323c5b5b7ee9696ebb90070372ed7dfbb44fba41f47581b901e90e622550503d7585166c92411fae8dcd11ad93ed14b62168c71ce42e0933a41b1617426 WHIRLPOOL 53522a948de74c45e79c77a7104afccba1943ba54bffe81117cb676df32992c146be2a05a107af5e5c6d9040030bc6b78771b57d611d35dd452e73ac00620464
diff --git a/media-sound/lyvi/lyvi-2.0.0.ebuild b/media-sound/lyvi/lyvi-2.0.0.ebuild
new file mode 100644
index 000000000000..545d85dd45fd
--- /dev/null
+++ b/media-sound/lyvi/lyvi-2.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple command-line lyrics viewer"
+HOMEPAGE="http://ok100.github.io/lyvi/"
+SRC_URI="https://github.com/ok100/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="WTFPL-2"
+KEYWORDS="amd64"
+SLOT="0"
+IUSE="mpris"
+
+RDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/plyr[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	mpris? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Remove pip dependency
+	sed -e '/require/d' --in-place setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/media-sound/lyvi/metadata.xml b/media-sound/lyvi/metadata.xml
new file mode 100644
index 000000000000..af22d20349e4
--- /dev/null
+++ b/media-sound/lyvi/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>witold.pilat@gmail.com</email>
+		<name>Witold Piłat</name>
+		<description>Proxy maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Lyvi is a lyrics, artist info and guitar tabs
+	viewer. On supported terminals, Lyvi can also show artist photos and
+	cover images.
+	</longdescription>
+	<use>
+		<flag name="mpris">Enable MPRIS support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ok100/lyvi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
new file mode 100644
index 000000000000..3ca52ff7a9c1
--- /dev/null
+++ b/media-sound/mac/Manifest
@@ -0,0 +1,10 @@
+AUX mac-3.99.4.5.7-gcc6.patch 8122 SHA256 64448b736fad268efbb1d6bd266295b72bf4dc74d84e4065ad5033ee0ee02bc2 SHA512 aa6443ab164a5b1e560026874341cd321280298438910781ed45c35bb5bc745824e8a40286dd2e1e781965a83c043a7a64f4a98e7b4a58c4eb5903f0ab4bb1c6 WHIRLPOOL f4e9d76f57d60e6763b55c6a4f9bca5523319513e7e0600994baa31fdaf49500f59a817528298b2a2e433545b212592a215b9f63195d003e6957a4a29c5d9ae6
+AUX mac-4.11.4.5.7-gcc6.patch 10119 SHA256 7c92fd2c9bdd5cfefe40124e642c1e23c72d2d3ecd181e3098cb232c6026702b SHA512 0439cb133779dd540c5cee6760dd6a8acd23434b60baaba804430883cb6d67ca37151370356e9adec3f031cb02c34d529a8f91618f0f9fca6e58e14a295c3a63 WHIRLPOOL 9d632bf378ddce35ca11a671560e29eda5c068a961f7cdade30d47af0cad3607bafe05ac4bdeec82b811d94ff8788d001604cc209b663ff4aba32cb639802d67
+AUX mac-4.11.4.5.7-output.patch 1498 SHA256 65ee185f66c821b69b3727070645a93dff2dada7d11a6feeee08088a5e54b85c SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490 WHIRLPOOL 536fd2c59cfe938c79a4bc5c53976d0edcf20f2b3003864c6cde3c1b5c06f9a5479c4dc2b8e3ea050e05d9cf7cd7dae8e0ebbf226cae3d4afe46a75fddb7eb33
+DIST mac-3.99-u4-b5-s7.tar.gz 450981 SHA256 9a735af2c56f05ee06b6e2ff719e902271299adf9e25cd3c9e4b28e8df3e30c5 SHA512 fa7ca8cec0ba6c0fb78dda6e964b17e9331184fed656a2458d0e3ac12fc375a661adfd36c142ef63111f31c6b63e8c00fe40e7babe84f0cefe5433940be628e0 WHIRLPOOL f4df5bccad06b7313348e9be734e926c1d511a2e3ca40162bc2c6a8cffb38c1455543fd7dc0a2352efa91945ae5546364085bd05888e906eb9e1c49fde7f743d
+DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 SHA256 73e28b7dbef5dfd07108b85783261a8a8bb1770917bf2877d4ab8f5c3833299a SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0 WHIRLPOOL be9b56a45c8da00d1c6008d6955a7a9d4fd86e4a893a60b6b35ea426af38900493a213944f1a77451eb942a0d7d0c42e4af3d71c889bead2bc82e5d2732fa022
+EBUILD mac-3.99.4.5.7-r1.ebuild 1147 SHA256 a244bcccea6336ec22456743596fc13fdb3e35bdf38d9d05c260e0835257826f SHA512 b96196fc64816de218a834ebcb13a931440149602b1876349241afa454c01dd24458c865abfd8158ac6a978df6d3782aafe3c89a80c2cb8557a43b637291ed63 WHIRLPOOL fd85f1c05ef73d4c5f05fe61f8d1be70be146999c12a9400d4bafdc8523534333466d5a6877c318595f580983f6058cba7a1683f6b7c5772654c34fee49cdba1
+EBUILD mac-4.11.4.5.7.ebuild 1360 SHA256 5e61e467a3f67d96c7a692b3d7920c6fc75f00a3873ac56e21e6299bc6df188c SHA512 7d9012b16fdeabeca727e2de4b940b6c487251de9b664f9ebb38dee1a2f29af13a64256fb293219198526c01d8a7264e06c811f6b6b54431e534865b2fc42eaf WHIRLPOOL 2baaf86d7a78d09296580ed8821c01ea701a8e4c278b7d266336d73086da958a3593b686511620e87800094071a11790f79d0310c591a8b4b625669dad563483
+MISC ChangeLog 2607 SHA256 7e800b9f6da6258bba61cf98bae5ed9913483ae6f22b5297e6ca4074dbfe1770 SHA512 ea0b572d838252113db29de18e71dc4e8abe866915b28188f2fa2785b1955fc285bcab8969c7864d0ee17c266cddc229f70ad18bb7239015b8906353347ae3ad WHIRLPOOL e813586ff8dfe9c32c569ddba9bc3b48436ed11ce3944e64e5cdc8e6815582baa6a56f53b702d7ed92b4416fbbfee089dcbac0ea0b3d8af5b71b93e381c6308d
+MISC ChangeLog-2015 3772 SHA256 fd6090b0e38c8da52de9d4791dc06ecd2bba3ff59da1c951083e091cd78a2a75 SHA512 c149c600fc0c475049067d65c4cf943cd9de6b56e6111526c24553da09839bc11dc36ca26e32bae270ad8584cc0363daef3455217e84fa9f330f6bd8d589431d WHIRLPOOL 51860fdd909b424fbd2b4c9006966f90c5cef0f31a8fdfc1bfbcbc347e1504bd221d513210fe1bac90f20bf5c4011b4a4eec7dc3ed0a9374a9c0f0ca9dc6fa1e
+MISC metadata.xml 373 SHA256 58b217f5db7cc0446a966a93fbc1fa8c77965a8701dcbbdb240b99db04fcaaa6 SHA512 398ca3b9a13eede72e283f90a215d1e05a518f6b3eee9d8f6a74e3eba1e1f0f501443399906f09771ef1c7441667b5e991f98d9cabd9c6b8395af334312f02a9 WHIRLPOOL 6685ff2c0896504886f9f2f374ed4d0f4a1efba3efb549780a57465ac3ac1235426c3044572acd46a12dfa24073232afa83d46ee2783453a78484e6153723808
diff --git a/media-sound/mac/files/mac-3.99.4.5.7-gcc6.patch b/media-sound/mac/files/mac-3.99.4.5.7-gcc6.patch
new file mode 100644
index 000000000000..e22d1c1f539b
--- /dev/null
+++ b/media-sound/mac/files/mac-3.99.4.5.7-gcc6.patch
@@ -0,0 +1,181 @@
+From: Peter Levine <plevine457@gmail.com>
+--- mac-3.99-u4-b5-s7/src/Shared/NoWindows.h.old	2016-09-18 21:37:56.049105791 -0400
++++ mac-3.99-u4-b5-s7/src/Shared/NoWindows.h	2016-09-18 21:55:29.666295506 -0400
+@@ -39,8 +39,8 @@
+ typedef const wchar_t *     LPCWSTR;
+ 
+ #define ZeroMemory(POINTER, BYTES) memset(POINTER, 0, BYTES);
+-#define max(a,b)    (((a) > (b)) ? (a) : (b))
+-#define min(a,b)    (((a) < (b)) ? (a) : (b))
++#define max_macro(a,b)    (((a) > (b)) ? (a) : (b))
++#define min_macro(a,b)    (((a) < (b)) ? (a) : (b))
+ 
+ #define __stdcall
+ #define CALLBACK
+--- mac-3.99-u4-b5-s7/src/Shared/CircleBuffer.cpp.old	2016-09-18 21:43:44.270495095 -0400
++++ mac-3.99-u4-b5-s7/src/Shared/CircleBuffer.cpp	2016-09-18 21:44:47.960148731 -0400
+@@ -45,7 +45,7 @@
+ 
+     if (pBuffer != NULL && nBytes > 0)
+     {
+-        int nHeadBytes = min(m_nEndCap - m_nHead, nBytes);
++        int nHeadBytes = min_macro(m_nEndCap - m_nHead, nBytes);
+         int nFrontBytes = nBytes - nHeadBytes;
+ 
+         memcpy(&pBuffer[0], &m_pBuffer[m_nHead], nHeadBytes);
+@@ -72,7 +72,7 @@
+ 
+ int CCircleBuffer::RemoveHead(int nBytes)
+ {
+-    nBytes = min(MaxGet(), nBytes);
++    nBytes = min_macro(MaxGet(), nBytes);
+     m_nHead += nBytes;
+     if (m_nHead >= m_nEndCap)
+         m_nHead -= m_nEndCap;
+@@ -81,7 +81,7 @@
+ 
+ int CCircleBuffer::RemoveTail(int nBytes)
+ {
+-    nBytes = min(MaxGet(), nBytes);
++    nBytes = min_macro(MaxGet(), nBytes);
+     m_nTail -= nBytes;
+     if (m_nTail < 0)
+         m_nTail += m_nEndCap;
+--- mac-3.99-u4-b5-s7/src/MACLib/APECompress.cpp.old	2016-09-18 21:48:40.916547811 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/APECompress.cpp	2016-09-18 21:51:43.670733601 -0400
+@@ -117,7 +117,7 @@
+             return ERROR_UNDEFINED;
+         
+         // calculate how many bytes to copy and add that much to the buffer
+-        int nBytesToProcess = min(nBytesAvailable, nBytes - nBytesDone);
++        int nBytesToProcess = min_macro(nBytesAvailable, nBytes - nBytesDone);
+         memcpy(pBuffer, &pData[nBytesDone], nBytesToProcess);
+                         
+         // unlock the buffer (fail if not successful)
+@@ -162,7 +162,7 @@
+         
+         while ((m_nBufferTail - m_nBufferHead) >= nThreshold)
+         {
+-            int nFrameBytes = min(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead);
++            int nFrameBytes = min_macro(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead);
+             
+             if (nFrameBytes == 0)
+                 break;
+--- mac-3.99-u4-b5-s7/src/MACLib/APEDecompress.cpp.old	2016-09-18 21:46:56.962072960 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/APEDecompress.cpp	2016-09-18 22:01:14.402044817 -0400
+@@ -35,8 +35,8 @@
+     m_bErrorDecodingCurrentFrame = FALSE;
+ 
+     // set the "real" start and finish blocks
+-    m_nStartBlock = (nStartBlock < 0) ? 0 : min(nStartBlock, GetInfo(APE_INFO_TOTAL_BLOCKS));
+-    m_nFinishBlock = (nFinishBlock < 0) ? GetInfo(APE_INFO_TOTAL_BLOCKS) : min(nFinishBlock, GetInfo(APE_INFO_TOTAL_BLOCKS));
++    m_nStartBlock = (nStartBlock < 0) ? 0 : min_macro(nStartBlock, GetInfo(APE_INFO_TOTAL_BLOCKS));
++    m_nFinishBlock = (nFinishBlock < 0) ? GetInfo(APE_INFO_TOTAL_BLOCKS) : min_macro(nFinishBlock, GetInfo(APE_INFO_TOTAL_BLOCKS));
+     m_bIsRanged = (m_nStartBlock != 0) || (m_nFinishBlock != GetInfo(APE_INFO_TOTAL_BLOCKS));
+ }
+ 
+@@ -85,7 +85,7 @@
+ 
+     // cap
+     int nBlocksUntilFinish = m_nFinishBlock - m_nCurrentBlock;
+-    const int nBlocksToRetrieve = min(nBlocks, nBlocksUntilFinish);
++    const int nBlocksToRetrieve = min_macro(nBlocks, nBlocksUntilFinish);
+     
+     // get the data
+     unsigned char * pOutputBuffer = (unsigned char *) pBuffer;
+@@ -99,7 +99,7 @@
+ 
+         // analyze how much to remove from the buffer
+         const int nFrameBufferBlocks = m_nFrameBufferFinishedBlocks;
+-        nBlocksThisPass = min(nBlocksLeft, nFrameBufferBlocks);
++        nBlocksThisPass = min_macro(nBlocksLeft, nFrameBufferBlocks);
+ 
+         // remove as much as possible
+         if (nBlocksThisPass > 0)
+@@ -182,7 +182,7 @@
+ 
+         int nFrameOffsetBlocks = m_nCurrentFrameBufferBlock % GetInfo(APE_INFO_BLOCKS_PER_FRAME);
+         int nFrameBlocksLeft = nFrameBlocks - nFrameOffsetBlocks;
+-        int nBlocksThisPass = min(nFrameBlocksLeft, nBlocksLeft);
++        int nBlocksThisPass = min_macro(nFrameBlocksLeft, nBlocksLeft);
+ 
+         // start the frame if we need to
+         if (nFrameOffsetBlocks == 0)
+--- mac-3.99-u4-b5-s7/src/MACLib/APESimple.cpp.old	2016-09-18 21:47:16.972925909 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/APESimple.cpp	2016-09-18 21:52:39.022779503 -0400
+@@ -193,7 +193,7 @@
+     nBytesRead = 1;
+     while ((nBytesLeft > 0) && (nBytesRead > 0))
+     {
+-        int nBytesToRead = min(16384, nBytesLeft);
++        int nBytesToRead = min_macro(16384, nBytesLeft);
+         if (pIO->Read(spBuffer, nBytesToRead, &nBytesRead) != ERROR_SUCCESS)
+             return ERROR_IO_READ;
+ 
+--- mac-3.99-u4-b5-s7/src/MACLib/APETag.cpp.old	2016-09-18 21:55:53.331533348 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/APETag.cpp	2016-09-18 21:58:21.508345586 -0400
+@@ -16,7 +16,7 @@
+     memcpy(m_spFieldNameUTF16, pFieldName, (wcslen(pFieldName) + 1) * sizeof(str_utf16));
+     
+     // data (we'll always allocate two extra bytes and memset to 0 so we're safely NULL terminated)
+-    m_nFieldValueBytes = max(nFieldBytes, 0);
++    m_nFieldValueBytes = max_macro(nFieldBytes, 0);
+     m_spFieldValue.Assign(new char [m_nFieldValueBytes + 2], TRUE);
+     memset(m_spFieldValue, 0, m_nFieldValueBytes + 2);
+     if (m_nFieldValueBytes > 0)
+--- mac-3.99-u4-b5-s7/src/MACLib/BitArray.cpp.old	2016-09-18 21:53:24.090030009 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/BitArray.cpp	2016-09-18 22:00:13.500083252 -0400
+@@ -113,7 +113,7 @@
+         m_nCurrentBitIndex = (m_nCurrentBitIndex & 31);
+         
+         // zero the rest of the memory (may not need the +1 because of frame byte alignment)
+-        memset(&m_pBitArray[1], 0, min(nBytesToWrite + 1, BIT_ARRAY_BYTES - 1));
++        memset(&m_pBitArray[1], 0, min_macro(nBytesToWrite + 1, BIT_ARRAY_BYTES - 1));
+     }
+     
+     // return a success
+@@ -247,7 +247,7 @@
+         BitArrayState.k++;
+ 
+     // figure the pivot value
+-    int nPivotValue = max(nOriginalKSum / 32, 1);
++    int nPivotValue = max_macro(nOriginalKSum / 32, 1);
+     int nOverflow = nEncode / nPivotValue;
+     int nBase = nEncode - (nOverflow * nPivotValue);
+ 
+--- mac-3.99-u4-b5-s7/src/MACLib/MACProgressHelper.cpp.old	2016-09-18 21:56:44.606337012 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/MACProgressHelper.cpp	2016-09-18 21:59:55.854310134 -0400
+@@ -35,7 +35,7 @@
+         m_nCurrentStep = nCurrentStep;
+ 
+     // figure the percentage done
+-    float fPercentageDone = float(m_nCurrentStep) / float(max(m_nTotalSteps, 1));
++    float fPercentageDone = float(m_nCurrentStep) / float(max_macro(m_nTotalSteps, 1));
+     int nPercentageDone = (int) (fPercentageDone * 1000 * 100);
+     if (nPercentageDone > 100000) nPercentageDone = 100000;
+ 
+--- mac-3.99-u4-b5-s7/src/MACLib/Prepare.cpp.old	2016-09-18 21:56:29.974394222 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/Prepare.cpp	2016-09-18 21:59:28.214726465 -0400
+@@ -177,9 +177,9 @@
+ 
+             if (LPeak == 0) { *pSpecialCodes |= SPECIAL_FRAME_LEFT_SILENCE; }
+             if (RPeak == 0) { *pSpecialCodes |= SPECIAL_FRAME_RIGHT_SILENCE; }
+-            if (max(LPeak, RPeak) > *pPeakLevel) 
++            if (max_macro(LPeak, RPeak) > *pPeakLevel) 
+             {
+-                *pPeakLevel = max(LPeak, RPeak);
++                *pPeakLevel = max_macro(LPeak, RPeak);
+             }
+ 
+             // check for pseudo-stereo files
+--- mac-3.99-u4-b5-s7/src/MACLib/UnBitArray.cpp.old	2016-09-18 21:56:16.548445898 -0400
++++ mac-3.99-u4-b5-s7/src/MACLib/UnBitArray.cpp	2016-09-18 21:58:56.148161050 -0400
+@@ -110,7 +110,7 @@
+     if (m_nVersion >= 3990)
+     {
+         // figure the pivot value
+-        int nPivotValue = max(BitArrayState.nKSum / 32, 1);
++        int nPivotValue = max_macro(BitArrayState.nKSum / 32, 1);
+         
+         // get the overflow
+         int nOverflow = 0;
diff --git a/media-sound/mac/files/mac-4.11.4.5.7-gcc6.patch b/media-sound/mac/files/mac-4.11.4.5.7-gcc6.patch
new file mode 100644
index 000000000000..60494e4f6e5c
--- /dev/null
+++ b/media-sound/mac/files/mac-4.11.4.5.7-gcc6.patch
@@ -0,0 +1,199 @@
+diff -Naur monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/APECompress.cpp monkeys-audio-4.11-u4-b5-s7/src/MACLib/APECompress.cpp
+--- monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/APECompress.cpp	2017-03-04 17:07:21.952460418 +0100
++++ monkeys-audio-4.11-u4-b5-s7/src/MACLib/APECompress.cpp	2017-03-04 17:11:58.607449387 +0100
+@@ -116,7 +116,7 @@
+             return ERROR_UNDEFINED;
+         
+         // calculate how many bytes to copy and add that much to the buffer
+-        int nBytesToProcess = min(nBytesAvailable, nBytes - nBytesDone);
++        int nBytesToProcess = min_macro(nBytesAvailable, nBytes - nBytesDone);
+         memcpy(pBuffer, &pData[nBytesDone], nBytesToProcess);
+                         
+         // unlock the buffer (fail if not successful)
+@@ -161,7 +161,7 @@
+         
+         while ((m_nBufferTail - m_nBufferHead) >= nThreshold)
+         {
+-            int nFrameBytes = min(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead);
++            int nFrameBytes = min_macro(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead);
+             
+             if (nFrameBytes == 0)
+                 break;
+diff -Naur monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/APEDecompress.cpp monkeys-audio-4.11-u4-b5-s7/src/MACLib/APEDecompress.cpp
+--- monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/APEDecompress.cpp	2017-03-04 17:07:21.952460418 +0100
++++ monkeys-audio-4.11-u4-b5-s7/src/MACLib/APEDecompress.cpp	2017-03-04 17:14:55.455442336 +0100
+@@ -36,8 +36,8 @@
+     m_nErrorDecodingCurrentFrameOutputSilenceBlocks = 0;
+ 
+     // set the "real" start and finish blocks
+-    m_nStartBlock = (nStartBlock < 0) ? 0 : min(nStartBlock, GetInfo(APE_INFO_TOTAL_BLOCKS));
+-    m_nFinishBlock = (nFinishBlock < 0) ? GetInfo(APE_INFO_TOTAL_BLOCKS) : min(nFinishBlock, GetInfo(APE_INFO_TOTAL_BLOCKS));
++    m_nStartBlock = (nStartBlock < 0) ? 0 : min_macro(nStartBlock, GetInfo(APE_INFO_TOTAL_BLOCKS));
++    m_nFinishBlock = (nFinishBlock < 0) ? GetInfo(APE_INFO_TOTAL_BLOCKS) : min_macro(nFinishBlock, GetInfo(APE_INFO_TOTAL_BLOCKS));
+     m_bIsRanged = (m_nStartBlock != 0) || (m_nFinishBlock != GetInfo(APE_INFO_TOTAL_BLOCKS));
+ }
+ 
+@@ -85,7 +85,7 @@
+ 
+     // cap
+     int nBlocksUntilFinish = m_nFinishBlock - m_nCurrentBlock;
+-    const int nBlocksToRetrieve = min(nBlocks, nBlocksUntilFinish);
++    const int nBlocksToRetrieve = min_macro(nBlocks, nBlocksUntilFinish);
+     
+     // get the data
+     unsigned char * pOutputBuffer = (unsigned char *) pBuffer;
+@@ -99,7 +99,7 @@
+ 
+         // analyze how much to remove from the buffer
+         const int nFrameBufferBlocks = m_nFrameBufferFinishedBlocks;
+-        nBlocksThisPass = min(nBlocksLeft, nFrameBufferBlocks);
++        nBlocksThisPass = min_macro(nBlocksLeft, nFrameBufferBlocks);
+ 
+         // remove as much as possible
+         if (nBlocksThisPass > 0)
+@@ -179,7 +179,7 @@
+         if (m_nErrorDecodingCurrentFrameOutputSilenceBlocks > 0)
+         {
+             // output silence
+-            int nOutputSilenceBlocks = min(m_nErrorDecodingCurrentFrameOutputSilenceBlocks, nBlocksLeft);
++            int nOutputSilenceBlocks = min_macro(m_nErrorDecodingCurrentFrameOutputSilenceBlocks, nBlocksLeft);
+             unsigned char cSilence = (GetInfo(APE_INFO_BITS_PER_SAMPLE) == 8) ? 127 : 0;
+             for (int z = 0; z < nOutputSilenceBlocks * m_nBlockAlign; z++)
+             {
+@@ -204,7 +204,7 @@
+         // analyze
+         int nFrameOffsetBlocks = m_nCurrentFrameBufferBlock % GetInfo(APE_INFO_BLOCKS_PER_FRAME);
+         int nFrameBlocksLeft = nFrameBlocks - nFrameOffsetBlocks;
+-        int nBlocksThisPass = min(nFrameBlocksLeft, nBlocksLeft);
++        int nBlocksThisPass = min_macro(nFrameBlocksLeft, nBlocksLeft);
+ 
+         // start the frame if we need to
+         if (nFrameOffsetBlocks == 0)
+diff -Naur monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/APESimple.cpp monkeys-audio-4.11-u4-b5-s7/src/MACLib/APESimple.cpp
+--- monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/APESimple.cpp	2017-03-04 17:07:21.952460418 +0100
++++ monkeys-audio-4.11-u4-b5-s7/src/MACLib/APESimple.cpp	2017-03-04 17:17:41.695435707 +0100
+@@ -251,7 +251,7 @@
+     nBytesRead = 1;
+     while ((nBytesLeft > 0) && (nBytesRead > 0))
+     {
+-        int nBytesToRead = min(16384, nBytesLeft);
++        int nBytesToRead = min_macro(16384, nBytesLeft);
+         if (pIO->Read(spBuffer, nBytesToRead, &nBytesRead) != ERROR_SUCCESS)
+             return ERROR_IO_READ;
+ 
+diff -Naur monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/APETag.cpp monkeys-audio-4.11-u4-b5-s7/src/MACLib/APETag.cpp
+--- monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/APETag.cpp	2017-03-04 17:07:21.952460418 +0100
++++ monkeys-audio-4.11-u4-b5-s7/src/MACLib/APETag.cpp	2017-03-04 17:18:15.007434379 +0100
+@@ -15,7 +15,7 @@
+     memcpy(m_spFieldNameUTF16, pFieldName, (wcslen(pFieldName) + 1) * sizeof(str_utf16));
+     
+     // data (we'll always allocate two extra bytes and memset to 0 so we're safely NULL terminated)
+-    m_nFieldValueBytes = max(nFieldBytes, 0);
++    m_nFieldValueBytes = max_macro(nFieldBytes, 0);
+     m_spFieldValue.Assign(new char [m_nFieldValueBytes + 2], TRUE);
+     memset(m_spFieldValue, 0, m_nFieldValueBytes + 2);
+     if (m_nFieldValueBytes > 0)
+diff -Naur monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/BitArray.cpp monkeys-audio-4.11-u4-b5-s7/src/MACLib/BitArray.cpp
+--- monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/BitArray.cpp	2017-03-04 17:07:21.952460418 +0100
++++ monkeys-audio-4.11-u4-b5-s7/src/MACLib/BitArray.cpp	2017-03-04 17:19:12.647432081 +0100
+@@ -113,7 +113,7 @@
+         m_nCurrentBitIndex = (m_nCurrentBitIndex & 31);
+         
+         // zero the rest of the memory (may not need the +1 because of frame byte alignment)
+-        memset(&m_pBitArray[1], 0, min(nBytesToWrite + 1, BIT_ARRAY_BYTES - 1));
++        memset(&m_pBitArray[1], 0, min_macro(nBytesToWrite + 1, BIT_ARRAY_BYTES - 1));
+     }
+     
+     // return a success
+@@ -233,7 +233,7 @@
+     nEncode = (nEncode > 0) ? nEncode * 2 - 1 : -nEncode * 2;
+ 
+     // figure the pivot value
+-    int nPivotValue = max(BitArrayState.nKSum / 32, 1);
++    int nPivotValue = max_macro(BitArrayState.nKSum / 32, 1);
+     int nOverflow = nEncode / nPivotValue;
+     int nBase = nEncode - (nOverflow * nPivotValue);
+ 
+diff -Naur monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/MACProgressHelper.cpp monkeys-audio-4.11-u4-b5-s7/src/MACLib/MACProgressHelper.cpp
+--- monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/MACProgressHelper.cpp	2017-03-04 17:07:21.952460418 +0100
++++ monkeys-audio-4.11-u4-b5-s7/src/MACLib/MACProgressHelper.cpp	2017-03-04 17:19:56.135430347 +0100
+@@ -27,7 +27,7 @@
+         m_nCurrentStep = nCurrentStep;
+ 
+     // figure the percentage done
+-    float fPercentageDone = float(m_nCurrentStep) / float(max(m_nTotalSteps, 1));
++    float fPercentageDone = float(m_nCurrentStep) / float(max_macro(m_nTotalSteps, 1));
+     int nPercentageDone = (int) (fPercentageDone * 1000 * 100);
+     if (nPercentageDone > 100000) nPercentageDone = 100000;
+ 
+diff -Naur monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/Prepare.cpp monkeys-audio-4.11-u4-b5-s7/src/MACLib/Prepare.cpp
+--- monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/Prepare.cpp	2017-03-04 17:07:21.952460418 +0100
++++ monkeys-audio-4.11-u4-b5-s7/src/MACLib/Prepare.cpp	2017-03-04 17:20:42.423428501 +0100
+@@ -176,9 +176,9 @@
+ 
+             if (LPeak == 0) { *pSpecialCodes |= SPECIAL_FRAME_LEFT_SILENCE; }
+             if (RPeak == 0) { *pSpecialCodes |= SPECIAL_FRAME_RIGHT_SILENCE; }
+-            if (max(LPeak, RPeak) > *pPeakLevel) 
++            if (max_macro(LPeak, RPeak) > *pPeakLevel) 
+             {
+-                *pPeakLevel = max(LPeak, RPeak);
++                *pPeakLevel = max_macro(LPeak, RPeak);
+             }
+ 
+             // check for pseudo-stereo files
+diff -Naur monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/UnBitArray.cpp monkeys-audio-4.11-u4-b5-s7/src/MACLib/UnBitArray.cpp
+--- monkeys-audio-4.11-u4-b5-s7_old/src/MACLib/UnBitArray.cpp	2017-03-04 17:07:21.952460418 +0100
++++ monkeys-audio-4.11-u4-b5-s7/src/MACLib/UnBitArray.cpp	2017-03-04 17:21:09.935427404 +0100
+@@ -116,7 +116,7 @@
+     if (m_nVersion >= 3990)
+     {
+         // figure the pivot value
+-        int nPivotValue = max(BitArrayState.nKSum / 32, 1);
++        int nPivotValue = max_macro(BitArrayState.nKSum / 32, 1);
+         
+         // get the overflow
+         int nOverflow = 0;
+diff -Naur monkeys-audio-4.11-u4-b5-s7_old/src/Shared/CircleBuffer.cpp monkeys-audio-4.11-u4-b5-s7/src/Shared/CircleBuffer.cpp
+--- monkeys-audio-4.11-u4-b5-s7_old/src/Shared/CircleBuffer.cpp	2017-03-04 17:07:21.951460418 +0100
++++ monkeys-audio-4.11-u4-b5-s7/src/Shared/CircleBuffer.cpp	2017-03-04 17:10:47.775452211 +0100
+@@ -45,7 +45,7 @@
+ 
+     if (pBuffer != NULL && nBytes > 0)
+     {
+-        int nHeadBytes = min(m_nEndCap - m_nHead, nBytes);
++        int nHeadBytes = min_macro(m_nEndCap - m_nHead, nBytes);
+         int nFrontBytes = nBytes - nHeadBytes;
+ 
+         memcpy(&pBuffer[0], &m_pBuffer[m_nHead], nHeadBytes);
+@@ -72,7 +72,7 @@
+ 
+ int CCircleBuffer::RemoveHead(int nBytes)
+ {
+-    nBytes = min(MaxGet(), nBytes);
++    nBytes = min_macro(MaxGet(), nBytes);
+     m_nHead += nBytes;
+     if (m_nHead >= m_nEndCap)
+         m_nHead -= m_nEndCap;
+@@ -81,7 +81,7 @@
+ 
+ int CCircleBuffer::RemoveTail(int nBytes)
+ {
+-    nBytes = min(MaxGet(), nBytes);
++    nBytes = min_macro(MaxGet(), nBytes);
+     m_nTail -= nBytes;
+     if (m_nTail < 0)
+         m_nTail += m_nEndCap;
+diff -Naur monkeys-audio-4.11-u4-b5-s7_old/src/Shared/NoWindows.h monkeys-audio-4.11-u4-b5-s7/src/Shared/NoWindows.h
+--- monkeys-audio-4.11-u4-b5-s7_old/src/Shared/NoWindows.h	2017-03-04 17:07:21.951460418 +0100
++++ monkeys-audio-4.11-u4-b5-s7/src/Shared/NoWindows.h	2017-03-04 17:07:58.376458966 +0100
+@@ -41,8 +41,8 @@
+ typedef const wchar_t *     LPCWSTR;
+ 
+ #define ZeroMemory(POINTER, BYTES) memset(POINTER, 0, BYTES);
+-#define max(a,b)    (((a) > (b)) ? (a) : (b))
+-#define min(a,b)    (((a) < (b)) ? (a) : (b))
++#define max_macro(a,b)    (((a) > (b)) ? (a) : (b))
++#define min_macro(a,b)    (((a) < (b)) ? (a) : (b))
+ 
+ #define __stdcall
+ #define CALLBACK
diff --git a/media-sound/mac/files/mac-4.11.4.5.7-output.patch b/media-sound/mac/files/mac-4.11.4.5.7-output.patch
new file mode 100644
index 000000000000..f90c2c42fdda
--- /dev/null
+++ b/media-sound/mac/files/mac-4.11.4.5.7-output.patch
@@ -0,0 +1,27 @@
+--- a/src/Console/Console.cpp
++++ b/src/Console/Console.cpp
+@@ -60,7 +60,7 @@ Displays the proper usage for MAC.exe
+ ***************************************************************************************/
+ void DisplayProperUsage(FILE * pFile) 
+ {
+-	_ftprintf(pFile, _T("Proper Usage: [EXE] [Input File] [Output File] [Mode]\n\n"));
++	_ftprintf(pFile, _T("Proper Usage: [Input File] [Output File] [Mode]\n\n"));
+ 
+ 	_ftprintf(pFile, _T("Modes: \n"));
+ 	_ftprintf(pFile, _T("    Compress (fast): '-c1000'\n"));
+@@ -76,11 +76,11 @@ void DisplayProperUsage(FILE * pFile)
+ 	_ftprintf(pFile, _T("    Convert: '-nXXXX'\n\n"));
+ 
+ 	_ftprintf(pFile, _T("Examples:\n"));
+-	_ftprintf(pFile, _T("    Compress: mac.exe \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000\n"));
+-	_ftprintf(pFile, _T("    Decompress: mac.exe \"Metallica - One.ape\" \"Metallica - One.wav\" -d\n"));
+-	_ftprintf(pFile, _T("    Verify: mac.exe \"Metallica - One.ape\" -v\n"));
++	_ftprintf(pFile, _T("    Compress: mac \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000\n"));
++	_ftprintf(pFile, _T("    Decompress: mac \"Metallica - One.ape\" \"Metallica - One.wav\" -d\n"));
++	_ftprintf(pFile, _T("    Verify: mac \"Metallica - One.ape\" -v\n"));
+ #ifdef SHNTOOL
+-	_ftprintf(pFile, _T("    Quick verify: mac.exe \"Metallica - One.ape\" -q\n"));
++	_ftprintf(pFile, _T("    Quick verify: mac \"Metallica - One.ape\" -q\n"));
+ #endif
+ 	_ftprintf(pFile, _T("    (note: int filenames must be put inside of quotations)\n"));
+ }
diff --git a/media-sound/mac/mac-3.99.4.5.7-r1.ebuild b/media-sound/mac/mac-3.99.4.5.7-r1.ebuild
new file mode 100644
index 000000000000..8c2f12d04d0a
--- /dev/null
+++ b/media-sound/mac/mac-3.99.4.5.7-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic versionator
+
+MY_PV=$(version_format_string '$1.$2-u$3-b$4')
+PATCH=s$(get_version_component_range 5)
+MY_P=${PN}-${MY_PV}-${PATCH}
+
+DESCRIPTION="Monkey's Audio Codecs"
+HOMEPAGE="http://etree.org/shnutils/shntool/"
+SRC_URI="http://etree.org/shnutils/shntool/support/formats/ape/unix/${MY_PV}-${PATCH}/${MY_P}.tar.gz"
+
+LICENSE="mac"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ~ppc64 x86"
+IUSE="cpu_flags_x86_mmx static-libs"
+
+RDEPEND=""
+DEPEND="sys-apps/sed
+	cpu_flags_x86_mmx? ( dev-lang/yasm )"
+
+S=${WORKDIR}/${MY_P}
+
+RESTRICT="mirror"
+
+src_prepare() {
+	sed -i -e 's:-O3::' configure || die
+}
+
+pkg_setup() {
+	append-cppflags -DSHNTOOL
+	use cpu_flags_x86_mmx && append-ldflags -Wl,-z,noexecstack
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_mmx assembly)
+}
+
+src_install() {
+	default
+
+	insinto /usr/include/${PN}
+	doins src/MACLib/{BitArray,UnBitArrayBase,Prepare}.h #409435
+
+	dodoc ChangeLog.shntool src/*.txt
+	dohtml src/Readme.htm
+
+	prune_libtool_files --all
+}
diff --git a/media-sound/mac/mac-4.11.4.5.7.ebuild b/media-sound/mac/mac-4.11.4.5.7.ebuild
new file mode 100644
index 000000000000..4e495bf76d57
--- /dev/null
+++ b/media-sound/mac/mac-4.11.4.5.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic versionator
+
+MY_PN=monkeys-audio
+MY_PV=$(version_format_string '$1.$2-u$3-b$4')
+PATCH=s$(get_version_component_range 5)
+MY_P=${MY_PN}_${MY_PV}-${PATCH}
+
+DESCRIPTION="Monkey's Audio Codecs"
+HOMEPAGE="http://etree.org/shnutils/shntool/ http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"
+SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.tar.gz"
+
+LICENSE="mac"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
+IUSE="cpu_flags_x86_mmx static-libs"
+
+RDEPEND=""
+DEPEND="sys-apps/sed
+	cpu_flags_x86_mmx? ( dev-lang/yasm )"
+
+S=${WORKDIR}/${MY_P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-output.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+DOCS=( AUTHORS ChangeLog NEWS TODO README src/History.txt src/Credits.txt ChangeLog.shntool )
+
+RESTRICT="mirror"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-O3::' configure || die
+}
+
+src_configure() {
+	append-cppflags -DSHNTOOL
+	use cpu_flags_x86_mmx && append-ldflags -Wl,-z,noexecstack
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_mmx assembly)
+}
+
+src_install() {
+	default
+
+	insinto /usr/include/${PN}
+	doins src/MACLib/{BitArray,UnBitArrayBase,Prepare}.h #409435
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-sound/mac/metadata.xml b/media-sound/mac/metadata.xml
new file mode 100644
index 000000000000..0943267a4afc
--- /dev/null
+++ b/media-sound/mac/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>billie@gentoo.org</email>
+    <name>Daniel Pielmeier</name>
+  </maintainer>
+<maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/madplay/Manifest b/media-sound/madplay/Manifest
new file mode 100644
index 000000000000..1a7c5a7d1aa4
--- /dev/null
+++ b/media-sound/madplay/Manifest
@@ -0,0 +1,6 @@
+AUX madplay-macos.patch 593 SHA256 36e97e96b53f17d0174e4a297333f16b7b79d4c3879fe484606de05dae07538a SHA512 d8989ed522212e984f0173dbb346ed624a2e8664a4c06d2186238018baf20c1f67d4109baa866ccb13cec6695db751be9ab6ac81466e3c786b13a89de4e066a0 WHIRLPOOL 2131a08fc33698c9546bb538d89f810f9eab4feef20d4e60cdfe3c2330206c50384f066f21da3554c3d2660a69ea485291620da64601d133d9740a3ea4f01da6
+DIST madplay-0.15.2b.tar.gz 590929 SHA256 5a79c7516ff7560dffc6a14399a389432bc619c905b13d3b73da22fa65acede0 SHA512 0e79cdf0c32f48599083ec7a0716d816e3f03254705b7225b1ea9008d53eefd48342dd687b0507f0ff15942218fc07ad1e38c4172508c27755f3e9a0e5412f34 WHIRLPOOL 04e4b5bd3bdb4ea8e62a85b0d978bfb74f27b11c9ce49fd74571e98546b96b1f342df97695d90a8939d08ecb4612e708da147f4f50df62e2313493c2907dc2fe
+EBUILD madplay-0.15.2b-r1.ebuild 868 SHA256 f69e7f476f58bb00e0de93fcec002db204d61e2fd65e38f8cd612f1456b4141f SHA512 db56558bc77af4c894a6dbce9c52680c7f4e2602a7594a56b43dce0c2fefb08a16f713b29472037ea49138d21c604231890967b6ce7a8d49200c2d2fdf58b231 WHIRLPOOL a3cd1043630fef96df31a88af94a928ffdc473ac028b21a9d99bc8ac41ce13c3aa201a699c8d9344880844db1c64f9b97c1e25fad72d168cc79dd4e8e9c710dc
+MISC ChangeLog 2468 SHA256 63a834cd18e76e038d2490d26d08499515e2dff20bbf5d40fe60b740f1574c73 SHA512 a6357816bddca9fda38e500f61ab9b9b13718d85c6754dcc7acaaec7231fc69128a6bfa6a8fe4f587494bdd01157640ad3b783babddfb8e09fae595dc378bc62 WHIRLPOOL 41179f8e8bad51b5605506eb02e26cabbe2955ce6b18fd4ea84d9242c8f4c308973c8f044593886953191a4e9d3eaa2a03b62fb09e60fe27470115b119ba317c
+MISC ChangeLog-2015 6197 SHA256 0a488e21e1ed26fcc9a8a5b26a3658b618aa6825b747c58781a96e3514f375d1 SHA512 0a959a79e2e46ff5bed80538da88fa774a5b38d13a64e1677db237eb0fca458eb5bf7528a7f67fca5f441eac25132e8de0932dfe054ed6533b813ba01a7015c3 WHIRLPOOL c146a8977a0bea27b50efe7f0eca5b153dc19b16f83baad57f695268cae388233b339a791f386c1302ef419fa8e2f97040e2514078e42e8920f8c9e680a84ea9
+MISC metadata.xml 326 SHA256 c5bff3d046dcaada983011140e6f5f93e812aa8f551320fb6b26d796d6e1032f SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9 WHIRLPOOL 2b29e508649777b666708af5ab1cdcb8e979e3bbef64646432cc34d1348ed94cca5eac226d98de90305531db4faee4c0d34bf526f370f20cdc465aaa9df44aab
diff --git a/media-sound/madplay/files/madplay-macos.patch b/media-sound/madplay/files/madplay-macos.patch
new file mode 100644
index 000000000000..4cc45774274d
--- /dev/null
+++ b/media-sound/madplay/files/madplay-macos.patch
@@ -0,0 +1,20 @@
+--- madplay-0.15.2b/audio_carbon.c.bak	2005-04-04 02:03:58.000000000 -0700
++++ madplay-0.15.2b/audio_carbon.c	2005-04-04 02:04:39.000000000 -0700
+@@ -94,7 +94,7 @@
+ }
+ 
+ static
+-int wait(struct buffer *buffer)
++int carbon_wait(struct buffer *buffer)
+ {
+   if (MPWaitOnSemaphore(buffer->semaphore, kDurationForever) != noErr) {
+     audio_error = _("MPWaitOnSemaphore() failed");
+@@ -263,7 +263,7 @@
+   /* wait for block to finish playing */
+ 
+   if (buffer->pcm_nsamples == 0) {
+-    if (wait(buffer) == -1)
++    if (carbon_wait(buffer) == -1)
+       return -1;
+ 
+     buffer->pcm_length = 0;
diff --git a/media-sound/madplay/madplay-0.15.2b-r1.ebuild b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
new file mode 100644
index 000000000000..7a464f05ec31
--- /dev/null
+++ b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools epatch epunt-cxx
+
+DESCRIPTION="The MAD audio player"
+HOMEPAGE="http://www.underbit.com/products/mad/"
+SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="alsa debug nls"
+
+RDEPEND=">=media-libs/libid3tag-0.15.1b
+	>=media-libs/libmad-0.15.1b
+	alsa? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+DOCS="CHANGES CREDITS README TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-macos.patch
+	eautoreconf #need new libtool for interix
+	epunt_cxx #74499
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable debug debugging) \
+		$(use_with alsa) \
+		--without-esd
+}
diff --git a/media-sound/madplay/metadata.xml b/media-sound/madplay/metadata.xml
new file mode 100644
index 000000000000..e929ca1abedc
--- /dev/null
+++ b/media-sound/madplay/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mad</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mangler/Manifest b/media-sound/mangler/Manifest
new file mode 100644
index 000000000000..5acab3e37c09
--- /dev/null
+++ b/media-sound/mangler/Manifest
@@ -0,0 +1,5 @@
+DIST mangler-1.2.5.tar.bz2 5390985 SHA256 baae921ac7d0708bf1f435977fa834e41e66007532a39009154835bc4677a55f SHA512 e72eb2f408ba925d10563c6821e08406007bd0b7586f9ee054a1de421a6195351140a2df9656a45389f5f568ebf44f53fb719fbf6fb113695f230dd4bad21e38 WHIRLPOOL 29364187c730dedefeb9017b01e0a426572ce47b6e98efafd2735a96aba1ea722c23b50a92bc9f675960361f703899bbac295c6359a63f54cb208e1bae8bdc52
+EBUILD mangler-1.2.5-r1.ebuild 1295 SHA256 6cc4c241d0b696f5a83e49670f4789ea8d25f8a5a00f56583b5861084d84c3df SHA512 5e6f290adefc914529f4fcff40f1ddde7a21f511632bf04185dfb28504b5f7b4d352ac2e9bc9db6dfe90ce9b61ef9f2741a4ebb92a5140c938b0417e37f779bb WHIRLPOOL bfd258266d45ffd65b5f7c0213ea8dc3cfeb92ea59d3d48f209a5880276848da78ddfcc47c7605dd2aacc44055f8749ba43682eb08ebff16a1d2c93e5c4dacc2
+MISC ChangeLog 2587 SHA256 1d90e36285cab65eb89f47421c4cb88f0d400d101e905a35dba89b5403fe7cee SHA512 581bce4caddae744eb69ac7d6bf3e78bb067340631912bb645fa4ad9c3e0f9d227d035d8321a19d77dfc4b778dc6e09eece70a785f262cf353c7cb5ec6ae1dbc WHIRLPOOL ad9cecc7fe3d37176feb2a8090f41635510c2291f4f34d719400ea293de03dc99bbc5a6d59539717160a69b784858d75ebcbdf8f5aa685c67d001801be4b679b
+MISC ChangeLog-2015 3922 SHA256 4fd635835d806247ba5be402b950f46db4abdbeab5d0aa695cb73b8eeb6ea8d5 SHA512 4b23f0bbbdf1241ea64553c345e03b7ad734e60793b8a48462f4bd139e55dc85e281f41947cd11a29b63dcd364c9a3779ca823133945e9614c01e87f828ffd13 WHIRLPOOL 6522d6558f0ef8d1793dd491f7ec3e59457bc31f758d39ad4f9d8e3bbeb165ae984dda3ec7d6d6cb70b5ca450bdaab9c75895e16fcb0979be0651c81dd12221c
+MISC metadata.xml 546 SHA256 f67db6379c7f70c42f4b5c09b77717363e1917096723a39af87a097e57a025ad SHA512 4d2adde453fd4b652d36d293e6b52341a9accd60c853394ddb83db975a644e0df775880d3ebfe8fd25a00238d9c679276f0fcffd288dd9e42de9ae3811f18b54 WHIRLPOOL f61ea421730a660f23de4bb441b4f7fa92ea02bd5fec512b557d580a4b1647882485038613d2e45c37e59bac675f6d6fd49b1de5ecc7d1757e5200fae93d7d36
diff --git a/media-sound/mangler/mangler-1.2.5-r1.ebuild b/media-sound/mangler/mangler-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..c7d120fc874c
--- /dev/null
+++ b/media-sound/mangler/mangler-1.2.5-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers"
+HOMEPAGE="http://www.mangler.org/"
+SRC_URI="http://www.mangler.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+alsa opus espeak g15 +gsm oss pulseaudio static-libs +speex +xosd"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	gnome-base/librsvg
+	>=dev-libs/dbus-glib-0.80
+	>=dev-libs/glib-2.20.1:2
+	>=x11-libs/gtk+-2.16:2
+	x11-libs/libX11
+	x11-libs/libXi
+	alsa? ( media-libs/alsa-lib )
+	opus? ( media-libs/opus )
+	espeak? ( app-accessibility/espeak )
+	g15? ( app-misc/g15daemon )
+	gsm? ( media-sound/gsm )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )
+	speex? ( >=media-libs/speex-1.2_rc1 )
+	xosd? ( x11-libs/xosd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	tc-export CC
+	append-cxxflags -std=c++11
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable gsm) \
+		$(use_enable speex) \
+		$(use_enable opus) \
+		$(use_enable xosd) \
+		$(use_enable g15) \
+		$(use_enable espeak) \
+		$(use_with pulseaudio) \
+		$(use_with alsa) \
+		$(use_with oss)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/media-sound/mangler/metadata.xml b/media-sound/mangler/metadata.xml
new file mode 100644
index 000000000000..ffc44310f0dc
--- /dev/null
+++ b/media-sound/mangler/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <use>
+    <flag name="espeak">Text to speech engine</flag>
+    <flag name="g15">Logitech g15 lcd support</flag>
+    <flag name="opus">Codec specialized for speech over the internet</flag>
+  </use>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+  </maintainer>
+<maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/marrie/Manifest b/media-sound/marrie/Manifest
new file mode 100644
index 000000000000..3f1e684c8518
--- /dev/null
+++ b/media-sound/marrie/Manifest
@@ -0,0 +1,6 @@
+DIST marrie-0.3.2.tar.gz 7626 SHA256 be65ca0f2a238ec811d778db938d98488f72a8df2d323fed0a7730f3b7e29258 SHA512 da6688e18124f2c95e2dd9846a2578fd2e6312f7e145424f50761eaabdd3c234424921f289b595e8842a9f5e3863a9ef106331c19cec42de9731d12f9584958a WHIRLPOOL 33f7b0681d6290f0eddfb1117c89283551d4299a05adfbdc4fbae5bdbccec6e00040ff22000becefce9be1930675291ade2cc1925b7234fe599d4dc5c95cc7a7
+EBUILD marrie-0.3.2-r1.ebuild 1129 SHA256 4ea0551c01609f5ab616fc8b528e60e2be1d73f40a7fcdb39830094c7a8acaf5 SHA512 c8c206d4f43fea270fa04696a6738d6fc291646d289cfeda2283e10f874bc3a706188d6c7a9f2b7c12d6ce78def5f1017cdd05bad4aef7179146cdebddd69c6b WHIRLPOOL ac97e881be37191ca12bc50436911689ce4564a6ef0a4417e06c42536345eaedaded0bfb6b6f6510c44c39e9ed3b407fbf28e6b0cd132ed96eaeca6ebb016193
+EBUILD marrie-9999.ebuild 1129 SHA256 4ea0551c01609f5ab616fc8b528e60e2be1d73f40a7fcdb39830094c7a8acaf5 SHA512 c8c206d4f43fea270fa04696a6738d6fc291646d289cfeda2283e10f874bc3a706188d6c7a9f2b7c12d6ce78def5f1017cdd05bad4aef7179146cdebddd69c6b WHIRLPOOL ac97e881be37191ca12bc50436911689ce4564a6ef0a4417e06c42536345eaedaded0bfb6b6f6510c44c39e9ed3b407fbf28e6b0cd132ed96eaeca6ebb016193
+MISC ChangeLog 2230 SHA256 215e8dc8aeb31f7ab0e255e1983454edaf9d13ca9d56a7d7e31d455b35f1745b SHA512 8f96d0d1c0434acb99202901b54afdefd91f6a452ca4938dd38842fd0a9c03fe4cc25d5526df66cd182015f4ee5e3eede155c3ab57f94db3185b42977d95c51f WHIRLPOOL a33d55a943507f59398608be80368ed1c44edbcaaba7114d6f851d6c1ca39578767623497b4b2e0180161d8d25548897bb4c25ac2bb4ba059237d435493b0dee
+MISC ChangeLog-2015 2042 SHA256 9b93c341c488ffcbf5cc6625676280b7333594d812fd1f414a56a6278c628d1e SHA512 999d3ac90af72552bca42f00f0817b41dcf23dd8b25a205ec9172cf75579f19ce584634cc95d25246cb62754cfe686a13016b22a715ef503e157fba08d021697 WHIRLPOOL 9a5adcd190292b445673c19fe4d5a54e2575e4e7791b76183f453e9c0703c70164480c7b173fa0982d37bdbc840d05d9bdc147e9b9c1900d55e68b85ecb8caa1
+MISC metadata.xml 569 SHA256 2f16ced8a50c487ee7c915ebcb926a24b07e19dc78f0a3cedc21a727f79a13bb SHA512 29d513b17b49e83d2ab52e5872f94d5a626e8d744faa876dda08932be0f06003f30153712634adbef8313c7c1e7b8d6c58912e84aaeca883b0a479033409b365 WHIRLPOOL 1e251f98265ff47d9abaf5f6371253befe2d8bd2120635c41d87233b6c9ac5ec3fbc7aaf8553ea59c83bbfe697a63238baea81da28735ccacb079c9cd34bd8a4
diff --git a/media-sound/marrie/marrie-0.3.2-r1.ebuild b/media-sound/marrie/marrie-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..c44c712b03f4
--- /dev/null
+++ b/media-sound/marrie/marrie-0.3.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+GIT_ECLASS=""
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
+fi
+
+inherit distutils-r1 ${GIT_ECLASS}
+
+DESCRIPTION="A simple podcast client that runs on the Command Line Interface"
+HOMEPAGE="https://github.com/rafaelmartins/marrie"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/setuptools
+	>=dev-python/feedparser-5.1.3"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils )"
+
+src_compile() {
+	distutils-r1_src_compile
+	if use doc; then
+		rst2html.py README.rst marrie.html || die "rst2html.py failed"
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+	if use doc; then
+		dohtml marrie.html
+	fi
+}
+
+pkg_postinst() {
+	distutils-r1_pkg_postinst
+	elog
+	elog "You'll need a media player and a file downloader."
+	elog "Recommended packages: net-misc/wget and media-video/mplayer"
+	elog
+}
diff --git a/media-sound/marrie/marrie-9999.ebuild b/media-sound/marrie/marrie-9999.ebuild
new file mode 100644
index 000000000000..c44c712b03f4
--- /dev/null
+++ b/media-sound/marrie/marrie-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+GIT_ECLASS=""
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/rafaelmartins/${PN}.git"
+fi
+
+inherit distutils-r1 ${GIT_ECLASS}
+
+DESCRIPTION="A simple podcast client that runs on the Command Line Interface"
+HOMEPAGE="https://github.com/rafaelmartins/marrie"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	dev-python/setuptools
+	>=dev-python/feedparser-5.1.3"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/docutils )"
+
+src_compile() {
+	distutils-r1_src_compile
+	if use doc; then
+		rst2html.py README.rst marrie.html || die "rst2html.py failed"
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+	if use doc; then
+		dohtml marrie.html
+	fi
+}
+
+pkg_postinst() {
+	distutils-r1_pkg_postinst
+	elog
+	elog "You'll need a media player and a file downloader."
+	elog "Recommended packages: net-misc/wget and media-video/mplayer"
+	elog
+}
diff --git a/media-sound/marrie/metadata.xml b/media-sound/marrie/metadata.xml
new file mode 100644
index 000000000000..60b6d1b485e4
--- /dev/null
+++ b/media-sound/marrie/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>rafael@rafaelmartins.eng.br</email>
+			<name>Rafael G. Martins</name>
+		</maintainer>
+		<bugs-to>mailto:rafael@rafaelmartins.eng.br</bugs-to>
+		<remote-id type="pypi">marrie</remote-id>
+		<remote-id type="github">rafaelmartins/marrie</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mcdp/Manifest b/media-sound/mcdp/Manifest
new file mode 100644
index 000000000000..093a05730c56
--- /dev/null
+++ b/media-sound/mcdp/Manifest
@@ -0,0 +1,9 @@
+AUX mcdp-0.4a-dietlibc-fix.patch 464 SHA256 01258225535f9a14d3d7ff9ce74946ae2a2e204d9181e13edaef754936a967a5 SHA512 f20c9cc828017f149e9618eb9b8c22ff6d02c48a2c71cbebf15a6a4d2010e95aaba7bc0961f947d48acda746e5d34997ea55eca62d5a66d822bb83073f105267 WHIRLPOOL 707d55e2eb9a258020dc6591e75468b8ba811facde4b6aed31394c7c435cfb47adeb97760bba3cb20a463a694aff70868467cc1bde29d4b7e3ebe6996d17fcc6
+AUX mcdp-0.4a-makefile.patch 343 SHA256 33eab4e7308e66ee10883a2931d41360a456029e134d55a9167b92ca878091e8 SHA512 b0cf13475b05ac6f11f0eedd64368db2275e461eeebcc96b3fd006869e77c79a2388753c4bc2f8b9e0b8982c6cce7ee25b9d15aa9f94f5258faab29fcd4a2ca5 WHIRLPOOL 3a26fdee02ec5f8af59999c9df02210321666990af2615ad0bbf4accb414da7ea0e52a03c3955c2422688f9b68621967a6fd55c65e0ef82dd1acbe6f533fb796
+DIST mcdp-0.4a.tar.bz2 29872 SHA256 92477cdd96bda3aae8a6ffff532845958f29700829c25cdfca25c54788a6a3d5 SHA512 7747d9743213923deaca04bcd3748014512622a757e4501c661e128e231fe418ece429aca23fdee390ffe1cbd1384039c9fccf2a7c1d93b1cf735d600787f3ac WHIRLPOOL 4b8e759cdeb739c39e7636b10cc45b212c9b641079892e39a7ccb782f770350d8451f49749931d53ddff8a7ff51e9f54a4e0115074f2fdedde23b61938a817f3
+DIST mcdp-0.4b.tar.bz2 29940 SHA256 0faa031b07299b0fb2353306a669328c877717e1bc7e274e40c3d2612e103cab SHA512 af7042794ed36c1cfdfbf8ad3299ca377942c67f3eaaf0778ef368e29288945331f753dfdd320e667f499c8229cf770dc8d6149ef6214d76b7eaceff54203b6d WHIRLPOOL c59ef479910ede5a9b5cb7498edba0dcbb287a62e95397d35a2f90c09d84a50f048da2885988930a10fc7e4b58a2de2e693f5a4b669037249570725049b77d01
+EBUILD mcdp-0.4a.ebuild 696 SHA256 3c46d77a5c432ac917f5bc419186077f10a12887a64ef12daba744cf9b3ac85c SHA512 77fad2dc53778a59883a833efd74b730d49a653b5f34e1d9bff7f050473920491f2cef48ed21e0db660788861535b1485ecf162ed0c7fc592a0139210fa9911a WHIRLPOOL 4bbc62ebad97aff84a076a6dad6a6a2f03b2f685d37ba6f46aa104a1ca4906573d660105688198883fa09988aeb0e1ce86024629e5d9d21de505d30611a3b276
+EBUILD mcdp-0.4b.ebuild 676 SHA256 635bcc470cc4d103806d1325873e66ab71c8be60802ca6f9c08caecbc97fc324 SHA512 430535ba0646b01357252823b34280dee0e611e74d745e7253cbd8a3b28de8c69a39578c104ede13ddd2d608908dd4c870dbbd5baf586f27d032fc4d62486cc5 WHIRLPOOL a3de3ef970481878b4a0743c38227998b8a0100405cc28a32806fdba55d52aad3ca707996abd4e3a0c35b2fc507c15270e241ce5874e904ad430cc388ae3a3d5
+MISC ChangeLog 2535 SHA256 2558a045c2d48deb4cd85093a443c83973e6126ee41d3d2a84ab035f0a0474f2 SHA512 58f648cb1ee384423ed499b1b7574d6a649249c3147340f416bb9ce14030382b260142e6284a3584f1e983a58621d4ce6cd9ef22e690429cb4fca122402adcae WHIRLPOOL 79b1e4031eb051033a26e15750dc78a512321f6e3c83603c7cc58c9753b58be216120d828b31f60376ebcca49d96553a93339c24d31a3994548a557d9115a326
+MISC ChangeLog-2015 2557 SHA256 c45d67a0e67b2f07ee86e312358dbb3833ea28395c5baecfd33259ba3d6069c9 SHA512 91759587268b5088158875313d0350d100b74dfd30a416e3cef7ccd7fc49783ef20d6900efb98655734fb679745ca3686d5a25a0a157f8e2e531f68259e7ee29 WHIRLPOOL d80a14366bca5c0ae03528407014ff3241d211449550b19d0f6bdd63b44e47a15270c72f348fb922a043bf4c7eeb875eb179b59e25137d02cb91dcc13e771b41
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/mcdp/files/mcdp-0.4a-dietlibc-fix.patch b/media-sound/mcdp/files/mcdp-0.4a-dietlibc-fix.patch
new file mode 100644
index 000000000000..2cad5bf3f744
--- /dev/null
+++ b/media-sound/mcdp/files/mcdp-0.4a-dietlibc-fix.patch
@@ -0,0 +1,15 @@
+diff -Naur mcdp-0.4a.orig/mcdp.h mcdp-0.4a/mcdp.h
+--- mcdp-0.4a.orig/mcdp.h	2005-12-17 21:30:56.000000000 +0900
++++ mcdp-0.4a/mcdp.h	2006-03-04 16:26:06.000000000 +0900
+@@ -27,6 +27,11 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
++/* hack to avoid re-definition of some stuff */
++#ifdef __dietlibc__
++#define _LINUX_BYTEORDER_GENERIC_H
++#endif /* __dietlibc__ */
++
+ #include "cdrom.h" /* can't be included via <linux/cdrom.h> :( */
+ #include "params.h"
+ 
diff --git a/media-sound/mcdp/files/mcdp-0.4a-makefile.patch b/media-sound/mcdp/files/mcdp-0.4a-makefile.patch
new file mode 100644
index 000000000000..33895f24f7fb
--- /dev/null
+++ b/media-sound/mcdp/files/mcdp-0.4a-makefile.patch
@@ -0,0 +1,14 @@
+Index: mcdp-0.4a/Makefile
+===================================================================
+--- mcdp-0.4a.orig/Makefile
++++ mcdp-0.4a/Makefile
+@@ -29,9 +29,7 @@ PRGS	= mcdp
+ all: $(PRGS)
+ 
+ mcdp: $(OBJS)
+-	strip -x $(S_FLAGS) $(OBJS)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
+-	strip $(S_FLAGS) mcdp
+ 
+ dep:	clean
+ 	cc -MM $(SRC) > .depend
diff --git a/media-sound/mcdp/mcdp-0.4a.ebuild b/media-sound/mcdp/mcdp-0.4a.ebuild
new file mode 100644
index 000000000000..92d3ff818c05
--- /dev/null
+++ b/media-sound/mcdp/mcdp-0.4a.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A very small console cd player"
+HOMEPAGE="http://www.mcmilk.de/projects/mcdp/"
+SRC_URI="http://www.mcmilk.de/projects/mcdp/dl/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-dietlibc-fix.patch"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dobin mcdp || die
+	doman mcdp.1 || die
+
+	cd doc
+	dodoc AUTHOR BUGS CHANGES README THANKS TODO WISHLIST profile.sh
+}
diff --git a/media-sound/mcdp/mcdp-0.4b.ebuild b/media-sound/mcdp/mcdp-0.4b.ebuild
new file mode 100644
index 000000000000..5bf75f1b2e19
--- /dev/null
+++ b/media-sound/mcdp/mcdp-0.4b.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A very small console cd player"
+HOMEPAGE="http://www.mcmilk.de/projects/mcdp/"
+SRC_URI="http://www.mcmilk.de/projects/mcdp/dl/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.4a-dietlibc-fix.patch" \
+		"${FILESDIR}/${PN}-0.4a-makefile.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin mcdp
+	doman mcdp.1
+	dodoc doc/{AUTHOR,BUGS,CHANGES,README,THANKS,TODO,WISHLIST,profile.sh}
+}
diff --git a/media-sound/mcdp/metadata.xml b/media-sound/mcdp/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/mcdp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/metadata.xml b/media-sound/metadata.xml
new file mode 100644
index 000000000000..84c7cb8e83c3
--- /dev/null
+++ b/media-sound/metadata.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The media-sound category contains sound, music and audio applications.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie media-sound enthält verschiedenste Audio-Applikationen.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría media-sound contiene aplicaciones de sonido, música y
+		audio.
+	</longdescription>
+	<longdescription lang="fr">
+		La catégorie media-sound contient des applications de son, de musique et d'audio.
+	</longdescription>
+	<longdescription lang="ja">
+		media-soundカテゴリーにはサウンドやミュージックやオーデイオの
+		アプリケーションが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De categorie media-sound bevat applicaties voor geluid en muziek.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm media-sound chứa các ứng dụng liên quan đến âm thanh, nhạc, tiếng nói.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória media-sound obsahuje aplikácie pre prácu so zvukom a hudbou.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria media-sound contiene applicazioni per suono, musica e
+		audio.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria media-sound contém aplicações de som, música e áudio.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria media-sound zawiera programy dźwiękowe i muzyczne.
+	</longdescription>
+</catmetadata>
+
diff --git a/media-sound/meterbridge/Manifest b/media-sound/meterbridge/Manifest
new file mode 100644
index 000000000000..e4c088436d35
--- /dev/null
+++ b/media-sound/meterbridge/Manifest
@@ -0,0 +1,9 @@
+AUX meterbridge-0.9.3-asneeded.patch 524 SHA256 5cc5ba501573c8ab752c118f65df88f501581c66d4324a2d1461f0594617602f SHA512 b3877c523b8c4f666fe5435882e6603abe448e53485939048b3f0ae617cae8634218aba553afdc3f97e03406c1a5a924b9a487930dfe62256f9155a26d39cba7 WHIRLPOOL d7c8d58fe7c05fba13a3cf6f5f0c07e996035d9fe98dee08e9a4de610cc2957017b44768927ec4b60ffe727349c71300a6e470ccd4a3ebd15a96ec4245757b0c
+AUX meterbridge-0.9.3-cflags.patch 483 SHA256 2f7622c45b5c5b7332231a342e32105259202ff4c5d97299d4e4fface831fc63 SHA512 4a7fe804884feb05fe2af8f0c4cf83b89324ab10e1dad834e3ebcca403223b0c29b8050cbaac3652e64c18f4d1a7b800406431974187839483dbb07f85f9af87 WHIRLPOOL f5f859f56861749cce1e933e1fc41d77dd5fb52d515329e3ef7cbb2a53e16e2d495b0d0311eed0ebabbf7e64836a34bc0380c4c88e1d8b4d2c412efca4455a9f
+AUX meterbridge-0.9.3-gcc41.patch 488 SHA256 8926e78a048235f560e11960e4d4cc8390cc761c6fab08150662dcde55bac3db SHA512 df259114e25efb486ad980b44449b8c33b3afe87a726a5c40641831810d0de30a56c671bbcc5fdbe2fec05b860a3b2ed1439947240c967f938c6771e91d5907e WHIRLPOOL 74ed969927dcb8830326185f757740ab4f74360f3e35e4cbfa16217d871068e0b539f45c2160cbd03c16bdaa0bcc103672e959fdfb12d4bf9ff3810d01ba4de6
+AUX meterbridge-0.9.3-setrgba.patch 547 SHA256 b805aa09187942f8488e3014c377863c425dcf13f4bfec5a90680b00f09ac145 SHA512 2bb8e4c26d33a0383f3867459dcc15f5d7500adbbb5cdc230d7fba1d45c9ba4f0ba46731770c5ef25f6adc8121efbef9ecd0ecdac53ed3c3ced840010e3164d4 WHIRLPOOL f54a1db9c1f4efc3a59a75f061122090b50a1ebdb2008a98226d87055527695b3b83cb6dfc26c1ec8b0e6a1605e3a887e15fb7802baabfbefbe674a2c605a5bf
+DIST meterbridge-0.9.3.tar.gz 610566 SHA256 3feef0e52d68333c97f32393aff73f2c4d963bd974c5d3f42689c6eb3e1bf668 SHA512 19c49a584ab71a4fbe4a0d3f05382ce464c3c5f3e37a6dbd42b4920a18577d66464d8e1277d32c34cf9248a945da05fda17a3ecd35e770fdd8af6e9f691ab52a WHIRLPOOL 84cf915e64f0a93c452cb8e1ae0e3852d34610daf333a7e9f804ad1dabca82a98a5659b774cbb141bd13d95dfc6e2c71deb76edc311ff823ce99d13e4654c120
+EBUILD meterbridge-0.9.3.ebuild 826 SHA256 b0fe3c42c66c789d0668861a81bb45a00f5bc8d0643b3f592bd07fe830e7e0db SHA512 1d8dc9fb3717b7bf2a03041c025dc4a747380ea0415d14edadd80bc0b9efb17b0615512d4ab09348fb38e14999864ec1235d46565253b0543825f0aac8fcb62d WHIRLPOOL cc72854622087ea286178659fc55be5c7b4060bd402096ad8177cec28685b4c8a677e4fa5b346d1200483f46c7e4c6d1227b1b364c7278fb81ce5dff2d7eae44
+MISC ChangeLog 2763 SHA256 997c5fb6bc7d8b70aba3542e439fcfddf758392b187b9f17364c0aec72a69370 SHA512 e42a1b7076689c33ad224db96504d3292aaf52aedaa0923d1c56e58213213d17efb91e4337eba1217738cc7ce4a5d5ca3b3ec6776a6d95672a18a1fdd7f01b30 WHIRLPOOL 652fc669bd7134271df1921b15658c0ce9ffd93f2695e61f8ea228e257e056e216506b197ab361579d21f2f1986e755e5bbc0badc66bd9d78d8f8dae1ede2b0d
+MISC ChangeLog-2015 3838 SHA256 471e7a5968e7487ea679d8ac713cd49a8756632d5306a8980b67f56644e120d4 SHA512 586771857c71bea0af9ec168f235025e0cc040849cbbff52fc7596b9935f354a724b30b19c6132ea7317e98cc932ed3357942f3acc2e0efcacb207cfe81c00b8 WHIRLPOOL ae027479c8a66618fde96221a9818d4305893355bc4f28515f80349135f880ec302ce773c285b6d6b3f661d205e221b8104055c1f8f02768a516adb641f97e70
+MISC metadata.xml 255 SHA256 fc6dd027d0011f9f42d437ea0687857760a11bf2137f8822ec8692186d0bcbe3 SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 WHIRLPOOL de03966b13986c67a61f862755281e80740260a9031e5e34cbee88a3053e66f705df0f36499b154744ff447c94e19a28b8649535e08819216569e78eb4ce9a38
diff --git a/media-sound/meterbridge/files/meterbridge-0.9.3-asneeded.patch b/media-sound/meterbridge/files/meterbridge-0.9.3-asneeded.patch
new file mode 100644
index 000000000000..f7e7ba0d860b
--- /dev/null
+++ b/media-sound/meterbridge/files/meterbridge-0.9.3-asneeded.patch
@@ -0,0 +1,10 @@
+Index: meterbridge-0.9.3/src/Makefile.am
+===================================================================
+--- meterbridge-0.9.3.orig/src/Makefile.am
++++ meterbridge-0.9.3/src/Makefile.am
+@@ -6,4 +6,4 @@ bin_PROGRAMS = meterbridge
+ EXTRA_DIST = *.h
+ 
+ meterbridge_SOURCES = main.c linedraw.c vu_meters.c ppm_meters.c dpm_meters.c jf_meters.c scope.c envelopes.c find_image.c gl_utils.c
+-meterbridge_LDFLAGS = -lm $(JACK_LIBS) $(SDL_LIBS) -lGL -lSDL_image
++meterbridge_LDADD = -lm $(JACK_LIBS) $(SDL_LIBS) -lGL -lSDL_image
diff --git a/media-sound/meterbridge/files/meterbridge-0.9.3-cflags.patch b/media-sound/meterbridge/files/meterbridge-0.9.3-cflags.patch
new file mode 100644
index 000000000000..a79867ad8d9c
--- /dev/null
+++ b/media-sound/meterbridge/files/meterbridge-0.9.3-cflags.patch
@@ -0,0 +1,11 @@
+Index: meterbridge-0.9.3/src/Makefile.am
+===================================================================
+--- meterbridge-0.9.3.orig/src/Makefile.am
++++ meterbridge-0.9.3/src/Makefile.am
+@@ -1,5 +1,5 @@
+ #CFLAGS = -Wall -O3 $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\"
+-CFLAGS = -Wall -g $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\"
++AM_CFLAGS = -Wall $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\"
+ 
+ bin_PROGRAMS = meterbridge
+ 
diff --git a/media-sound/meterbridge/files/meterbridge-0.9.3-gcc41.patch b/media-sound/meterbridge/files/meterbridge-0.9.3-gcc41.patch
new file mode 100644
index 000000000000..861385214a67
--- /dev/null
+++ b/media-sound/meterbridge/files/meterbridge-0.9.3-gcc41.patch
@@ -0,0 +1,13 @@
+Index: meterbridge-0.9.3/src/main.h
+===================================================================
+--- meterbridge-0.9.3.orig/src/main.h
++++ meterbridge-0.9.3/src/main.h
+@@ -10,7 +10,7 @@
+ 
+ extern SDL_Surface *screen, *background_image;
+ extern SDL_Surface *image, *meter, *meter_buf;
+-extern SDL_Rect win, buf_rect[MAX_METERS], dest[MAX_METERS];
++extern SDL_Rect win, dest[MAX_METERS];
+ 
+ extern jack_port_t *input_ports[MAX_METERS];
+ extern jack_port_t *output_ports[MAX_METERS];
diff --git a/media-sound/meterbridge/files/meterbridge-0.9.3-setrgba.patch b/media-sound/meterbridge/files/meterbridge-0.9.3-setrgba.patch
new file mode 100644
index 000000000000..52f00b3a6c5a
--- /dev/null
+++ b/media-sound/meterbridge/files/meterbridge-0.9.3-setrgba.patch
@@ -0,0 +1,11 @@
+--- meterbridge-0.9.3/src/linedraw.c.orig	2016-07-25 21:07:06.992953036 -0500
++++ meterbridge-0.9.3/src/linedraw.c	2016-07-25 21:07:24.640629427 -0500
+@@ -4,7 +4,7 @@
+ /* set a pixel on an SDL_Surface, assumes that the surface is 32bit RGBA,
+  * ordered ABGR (I think), probably wont work on bigendian systems */
+ 
+-inline void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col)
++void set_rgba(SDL_Surface *surface, Uint32 x, Uint32 y, Uint32 col)
+ {
+ 	Uint32 *bufp = (Uint32 *)surface->pixels + y*surface->pitch/4 + x;
+ 	*bufp = col;
diff --git a/media-sound/meterbridge/metadata.xml b/media-sound/meterbridge/metadata.xml
new file mode 100644
index 000000000000..f79bb67acbd9
--- /dev/null
+++ b/media-sound/meterbridge/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/meterbridge/meterbridge-0.9.3.ebuild b/media-sound/meterbridge/meterbridge-0.9.3.ebuild
new file mode 100644
index 000000000000..2b51532ddda7
--- /dev/null
+++ b/media-sound/meterbridge/meterbridge-0.9.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools
+
+DESCRIPTION="Software meterbridge for the UNIX based JACK audio system"
+HOMEPAGE="http://plugin.org.uk/meterbridge/"
+SRC_URI="http://plugin.org.uk/meterbridge/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="media-sound/jack-audio-connection-kit
+	>=media-libs/libsdl-1.2
+	>=media-libs/sdl-image-1.2.10[png]
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-setrgba.patch
+	eapply_user
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog
+}
diff --git a/media-sound/mhwaveedit/Manifest b/media-sound/mhwaveedit/Manifest
new file mode 100644
index 000000000000..1c077ad1070d
--- /dev/null
+++ b/media-sound/mhwaveedit/Manifest
@@ -0,0 +1,7 @@
+DIST mhwaveedit-1.4.22.tar.bz2 640430 SHA256 0f7a5510ac6a3aca6df2295f66d77e8fc4af9caba2f261b6778104b14ce19a3c SHA512 c44428dd4f848fda08aaff351380163697504d0ac133ab78d34817d974111719d724e985539d85c5bda23eda2fdb4fce3c1c680b5a8fa673f8d37a9d4fbcf590 WHIRLPOOL 269fd081320ecb50d6d46e5ab17814bb58fe036772a4fcef55ed2ed64e17ff0a8cb0c24d62d20a1fa2a9326c27ffddeb4637927a7cda670936676a4d37d3223b
+DIST mhwaveedit-1.4.23.tar.bz2 642042 SHA256 2352175b63092fda786ca26095b2f6ff6d257a6fcfb18401213a0c932b991904 SHA512 c8b3f1ca2c573e03bbe8e2c61c80d8bae0f9b9ec99fff0110119698f95328d1ab86eb4641d582865cd091f2955388343cbd912fd5f0b15f2a937b88cc01b974f WHIRLPOOL ebd3198ab97cb1016e4dd9374c79fe049848830afb882eca9e665676ee82e87c14c2d89c340bf4717a9ebd47b5f325c97ee349f2bbb1f697f97c15701d5275f8
+EBUILD mhwaveedit-1.4.22.ebuild 1166 SHA256 98ed7b5ca3e2df04b73a7f6d9fc809d19761c64e531df88efc5ae2721e2fa4b6 SHA512 0897bb4641e765a513497a5b66a88cff6708e7251ddf55cf7ae044e9921a0a88b3f843470612c52afe1d3134b4124880e39fc502791ff82bb2d350375783ee46 WHIRLPOOL 917999c2aed09c37b27fd1046a613a65cf95733facc9c3327c35df3b3cfb7ce47f1204d08ad62b768b1840a7ab64a8611ff81dd45c54b3650f901d49e6a98688
+EBUILD mhwaveedit-1.4.23.ebuild 1168 SHA256 276c3871022d92725c54d4a2b1371e3be458e0644efc1a4adfff22c185fac645 SHA512 9b839f5a1c919a5302bb8b9740c68495f9d20bba7aecdca6a9380803b4d78023f92a15511f05cf9a60fbb0ea599a6fbb865b1b2fb3fac2670f5b93f67bb77bc2 WHIRLPOOL 812cded87aafee8d3adb2d82ca32949916f9f881d790a5e830d1e8e695fb088887deafd0e914d79ef59f4997f7f154916014015a876a461efd1334d146cf8858
+MISC ChangeLog 2687 SHA256 804787891b6868f91aaf30ad914c8282c1836d0d71d8264074fe9c0b2e096391 SHA512 70d8df901a1314427a4d32fe11aee039ea7b2bb6bc60502d3ed017c01db73c03a38907d4f35c88e6a763463856bca9ea8061aa4190a5a214cd9a721efcab91af WHIRLPOOL 812a96c671dbd24cbc81c97545d528eba4f916b8aa0ed6f03400ed56a9e7b69b48397d4ee8cf798258aca4a47dbc45f66251375f26099fef4e88beb9da33bb03
+MISC ChangeLog-2015 7768 SHA256 49f25658257a7c34caab48c6b8307b352d54e89be0c583ea2426ac037de52196 SHA512 0bfe8f15d49b3d4a9ec88afb11455de912d8647f21b78ffbd6c2c425a3ac18d3219d07eef7d99b6b5ea037b8299cde3573e84ba3806965503ccf0bfdf0b6556e WHIRLPOOL e59e29478a270df665f424bb20177a75905616709258748138a66f4e5d52a5d8b37d252a3f8133afa90b570f2e7d47bd6297ddab815e93a942471b75960d19f4
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/mhwaveedit/metadata.xml b/media-sound/mhwaveedit/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/mhwaveedit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/mhwaveedit/mhwaveedit-1.4.22.ebuild b/media-sound/mhwaveedit/mhwaveedit-1.4.22.ebuild
new file mode 100644
index 000000000000..6b195a79c274
--- /dev/null
+++ b/media-sound/mhwaveedit/mhwaveedit-1.4.22.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="GTK+ Sound file editor (wav, and a few others.)"
+HOMEPAGE="https://gna.org/projects/mhwaveedit"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="alsa jack ladspa libsamplerate nls oss pulseaudio sdl sndfile sox"
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/pango
+	sndfile? ( >=media-libs/libsndfile-1.0.10 )
+	sdl? ( >=media-libs/libsdl-1.2.3 )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
+	libsamplerate? ( media-libs/libsamplerate )
+	ladspa? ( media-libs/ladspa-sdk )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.10 )
+	sox? ( media-sound/sox )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
+
+src_configure() {
+	econf \
+		--without-arts \
+		--without-portaudio \
+		$(use_enable nls) \
+		$(use_with sndfile libsndfile) \
+		$(use_with libsamplerate) \
+		$(use_with sdl) \
+		$(use_with alsa alsalib) \
+		$(use_with oss) \
+		$(use_with jack) \
+		$(use_with pulseaudio pulse) \
+		--without-esound
+}
diff --git a/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild b/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild
new file mode 100644
index 000000000000..4ed52f0b3b53
--- /dev/null
+++ b/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="GTK+ Sound file editor (wav, and a few others.)"
+HOMEPAGE="https://gna.org/projects/mhwaveedit"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa jack ladspa libsamplerate nls oss pulseaudio sdl sndfile sox"
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/pango
+	sndfile? ( >=media-libs/libsndfile-1.0.10 )
+	sdl? ( >=media-libs/libsdl-1.2.3 )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
+	libsamplerate? ( media-libs/libsamplerate )
+	ladspa? ( media-libs/ladspa-sdk )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.10 )
+	sox? ( media-sound/sox )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
+
+src_configure() {
+	econf \
+		--without-arts \
+		--without-portaudio \
+		$(use_enable nls) \
+		$(use_with sndfile libsndfile) \
+		$(use_with libsamplerate) \
+		$(use_with sdl) \
+		$(use_with alsa alsalib) \
+		$(use_with oss) \
+		$(use_with jack) \
+		$(use_with pulseaudio pulse) \
+		--without-esound
+}
diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest
new file mode 100644
index 000000000000..4f28d40fea74
--- /dev/null
+++ b/media-sound/mikmod/Manifest
@@ -0,0 +1,9 @@
+DIST mikmod-3.2.6.tar.gz 278754 SHA256 04544e0edb36a19fab61233dff97430969cff378a98f5989a1378320550e2673 SHA512 7a3fbbf7b0ceff92448224a7d9d58660c8f0ecdb26fe08b1b318abf2b07dd18d472467c226c72fcefd73aa9c42da813c65b236c91f5c582e41fad33b6ee96cc5 WHIRLPOOL aa66da48f4e00e5f823ae512d3005dc4c80693d2b768a43f4ca40fbaecee71cc048f3ad9d136b3df2a78f79545bec34641b85b3fd1690ab65f09068228babec8
+DIST mikmod-3.2.7.tar.gz 279228 SHA256 5f398d5a5ccee2ce331036514857ac7e13a5644267a13fb11f5a7209cf709264 SHA512 cd68f46418af4fedd6fef35c48c120cc8ddb66c0160107528ee8816228cac1732fb3f474a850317022d2161cd619e5694645c78690792fee743130d380684c4d WHIRLPOOL 9c884b333b960f40951b4a208ec1ddbf78a02b27c96c26ef165103dc1c9c9061fbe1907ba1788f3fea17d2e13f408c88f8a1109621b30db9b39f86cf0268aa3f
+DIST mikmod-3.2.8.tar.gz 279763 SHA256 dbb01bc36797ce25ffcab2b3bf625537b85b42534344e1808236ca612fbaa4cc SHA512 fbccfd31c49fc1faa159e7174fb0886dc3742ef935b596176fafeb953498ceb04475bebf9b0a948f1e2de1b11a01b130d2f11f4f034199b501ca08823a3ea620 WHIRLPOOL e04d310fffd10cb6e2a00774fda77c263e4b735fd3da971cc0f12bcce997eda4e7a5487855bc5a0d085c159d38f889f1f77d429a3dea8defece561b651fdb802
+EBUILD mikmod-3.2.6.ebuild 458 SHA256 26e07fbc87e3386872c10808acb16d477bc4e1b8909f3354ad2f60ee36bcbdb4 SHA512 c955942a4a008790f189c27bc91e8f860ca61a3193383afa1cd68d5275e6b525deabc523e83418881f52d41495e71f2a177cdc04555d0426f905db8c2aa55678 WHIRLPOOL 5b9f226c9d7c093ee23c2ce7cefbb35084c7844a9598df86ae678199b730230de7f7806bd360531e47caeee288cf063427778c132244da042f7e9505ca42c5ca
+EBUILD mikmod-3.2.7.ebuild 466 SHA256 3e3098735f75b336c5bf0d7e22c61d6a853abc239db2c3155a93f245852f3867 SHA512 60a483907d1b11029944dcadb586c3c79ebccd9a4f5946ea1fcd7c41926bcb52aa5fee61ceb0420c25640668ca8e7acf4544b132bd059edd0c40a120f9e0826f WHIRLPOOL 2320282f2f2c1150b67d5dd5db658fc9d11d4173426b068af5b3ec0ba36ac7534d89d0fab1f966bb4d72b97dccb05c30cfa0b7eef25707ebc4de5df13c738c60
+EBUILD mikmod-3.2.8.ebuild 471 SHA256 eb146f70e85a900adfdbc527d4d63a2883027f341c21880be821106a4b397db5 SHA512 5822593b62b8bca58ee42ee9e25e4db913dc61a9397bbe7319378c8d53456957c1181788ce2687edb79db352b13936ca014bfc6c83048440f39433b9ac0a930a WHIRLPOOL 47cc0192e80a8252186b7746a2686aa34dde275a72985490e73a4c0f800b30efc25bc7d3b98aa9fc7502217e5dac0c845d10a427cb0ffecc046300ac05a58d4a
+MISC ChangeLog 2863 SHA256 a9d38b69cb45a512bfc4cae163ac82818dee630d03d2e1cbc3b52647d01aa2d5 SHA512 2be3ba3d68a0e88d89cae95a452bd657a41efd26bd8ce6e929ac1bacf1ed9b07dd150ba80ef88bcf3f238f52f540e182fb990505b43bd59ffa87a849caa6db84 WHIRLPOOL ca4f7a2ac187c04b8697d9d9a1161a86b5cdaac7cdfc2e094640775c15439aa3aefac1b9bf5267b2eae25b75f281dffe0200bfe9ae92e20832e125a5dfd908fa
+MISC ChangeLog-2015 4716 SHA256 759e91af38fa6867d2de39ba2f2aa11bd1acdb598b17a385638f4ffa36e4adb9 SHA512 85d6cc3b1718ec0515b4a2da0ad57a1bce7c6ddfa04dd0bf6d3b9de5505a03a1e6f5f1b6bf38949082d808b122ef579a2311fe7f403601e37ee10cb05d4a9ab4 WHIRLPOOL f4a66ff4dbe663cadfd0c03a029dede4773801d1cae6c832ed42b4b10092048b3edc6309f60297b0364ceacac802c92f2287d213e4e0ec82da48cf2ae890fe7d
+MISC metadata.xml 329 SHA256 8885a3d3fdf081e84b8a9bb6a96ba9a0bd2c691ce1836a2f7a311717d96440d3 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55 WHIRLPOOL b4fbf79e753c1167cc942478cd4a61f1dc899421a882e6dc4501edf979855cde589a905dd9989e1613a0b5f7e8e538e23aec0171e047814e1f92400eedf64195
diff --git a/media-sound/mikmod/metadata.xml b/media-sound/mikmod/metadata.xml
new file mode 100644
index 000000000000..d8ca5118a0b8
--- /dev/null
+++ b/media-sound/mikmod/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mikmod</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mikmod/mikmod-3.2.6.ebuild b/media-sound/mikmod/mikmod-3.2.6.ebuild
new file mode 100644
index 000000000000..1c0e374a6911
--- /dev/null
+++ b/media-sound/mikmod/mikmod-3.2.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A console MOD-Player based on libmikmod"
+HOMEPAGE="http://mikmod.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ~sparc x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libmikmod-3.3
+	>=sys-libs/ncurses-5.7-r7"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README"
diff --git a/media-sound/mikmod/mikmod-3.2.7.ebuild b/media-sound/mikmod/mikmod-3.2.7.ebuild
new file mode 100644
index 000000000000..e54e61c5ec34
--- /dev/null
+++ b/media-sound/mikmod/mikmod-3.2.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A console MOD-Player based on libmikmod"
+HOMEPAGE="http://mikmod.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libmikmod-3.3
+	>=sys-libs/ncurses-5.7-r7:0="
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README"
diff --git a/media-sound/mikmod/mikmod-3.2.8.ebuild b/media-sound/mikmod/mikmod-3.2.8.ebuild
new file mode 100644
index 000000000000..3bac2834ab08
--- /dev/null
+++ b/media-sound/mikmod/mikmod-3.2.8.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A console MOD-Player based on libmikmod"
+HOMEPAGE="http://mikmod.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libmikmod-3.3
+	>=sys-libs/ncurses-5.7-r7:0="
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README"
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
new file mode 100644
index 000000000000..07c985069b90
--- /dev/null
+++ b/media-sound/milkytracker/Manifest
@@ -0,0 +1,6 @@
+AUX milkytracker-1.0.0-docdir.patch 2319 SHA256 f3442b003a367de923296ac1e24c196a6f3318b88f765c68b9999d9abba7f0c4 SHA512 f5e44258717a9b84956c29506c27e97e72cd50092ac179c328f3773f07f0573ac77aa50e4a27cea62f23b4f6318e1132fac2a0a039e3cf604efd1d595b357173 WHIRLPOOL 81832dbf67d9190ada6f5ee8dac8c4439308e3bccd85fec0428cec25042484cf975c28b258a5730c3eaf5ce759f7f7709bef6b4b1ceffbaedbd4cec3f39c98e1
+DIST milkytracker-1.0.0.tar.gz 3749140 SHA256 7fa982561c297aae7ed8223d2535c1f0a72057da01d002e8665b9223206932dc SHA512 a96e8b015a4e3b38f3ad44756fc79cb062f91ab193b7428a6abde042aa4e51c8fb45757cba0504283410d714eefffdee57d3e3bf42e7991d1f9581ab8d2ab1c4 WHIRLPOOL 859f8604b8b61cfd8467dfe5d72d68800938d1054f69c91abcb129bb8082c549d9791a94f10429aa1c7a7b3e0db097f1f5828213526af6af640ea44b9ead0a34
+EBUILD milkytracker-1.0.0.ebuild 1064 SHA256 8908c5915cf9275441e340b5d376dd91325084cde1440da0bd4d48b02b5a88e1 SHA512 d276577ede1dd9959bda135e560fdfcc1dc76170e19f6a243c2be1cdf58eec8a3245e68603053ab5ab347dff399413b759d0b04f2fdf0d4da2b6221858328c45 WHIRLPOOL f34f9850cc0e8539bc0d776e03db8742df1886a489a0db75502372b531fe29eff91190d90c51bfb6274ef59dcdf8c20c0399d5e2a39be509a45c9e10c634bbb0
+MISC ChangeLog 2499 SHA256 32da83c20a5530cf7533dbdaa9926190c526f1e239dc5958704527b02d44b567 SHA512 12569622fd4592d21ac5825ebc1e3f651c4dbcfaf88da11e9c9882445758a8b9058063f8a794b505033bf4f5b2b814edfa59b96238a4f02ce8d0d542aedf447d WHIRLPOOL 4ba8698ef9309bfb7c95a4886eec49b3dfcf43ac7eb3819e78a7842bb164b5f57243be60410f02e8f13a253b02f5a5739b5f577e80231f7ed3d1f4bc0731e76b
+MISC ChangeLog-2015 1826 SHA256 3c5964e657cbe488b50d7df33ba44ee82e7fff30120caec6bd427fb9446d5fcf SHA512 d7c1f943d8c7bb6cad45315f9000bf2f0c5666b2f11d3ba07769ae9b626cc1b745cf75813344a54e53d599c05e130fa598c997417b544876d85c6a01af6b4b68 WHIRLPOOL 2c4cbee476839c6eb44ce3fa5b0bb1b6ea60a764860b69f66edf66f88d80f944f56808f4396c5b3c683df6dd859e1e86aedfd74845aa7858e6e0fe8248d3a724
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch b/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch
new file mode 100644
index 000000000000..aeae02af2b0b
--- /dev/null
+++ b/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch
@@ -0,0 +1,71 @@
+From 56bf091a0e8c5242e160d37f2974f3e1e2525821 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sun, 7 May 2017 10:49:21 +0200
+Subject: [PATCH] Use GNUInstallDirs in order to change installation paths
+
+* This allows distro-specific modification of directories
+  to adjust to different FHS layouts.
+---
+ CMakeLists.txt                 | 5 ++++-
+ docs/CMakeLists.txt            | 2 +-
+ resources/music/CMakeLists.txt | 2 +-
+ src/tracker/CMakeLists.txt     | 2 +-
+ 4 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 996e2f0..bac54f3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,9 +19,12 @@
+ #  along with MilkyTracker.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.8.5)
+ project(MilkyTracker)
+ 
++# Adhere to GNU filesystem layout conventions
++include(GNUInstallDirs)
++
+ # Force SDL if requested
+ option(FORCESDL "Force SDL instead of native" OFF)
+ if(FORCESDL)
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 0aacc60..aca4a61 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -35,7 +35,7 @@ elseif(WIN32)
+     set(INSTALL_DEST .)
+ else()
+     list(APPEND DOCUMENTS readme_unix)
+-    set(INSTALL_DEST share/doc/${PROJECT_NAME_LOWER})
++    set(INSTALL_DEST ${CMAKE_INSTALL_DOCDIR})
+ endif()
+ 
+ install(FILES ${DOCUMENTS} DESTINATION ${INSTALL_DEST})
+diff --git a/resources/music/CMakeLists.txt b/resources/music/CMakeLists.txt
+index f918b6e..f29fcd6 100644
+--- a/resources/music/CMakeLists.txt
++++ b/resources/music/CMakeLists.txt
+@@ -24,7 +24,7 @@ file(GLOB SONGS "*.xm")
+ if(APPLE OR WIN32)
+     set(INSTALL_DEST "Example Songs")
+ else()
+-    set(INSTALL_DEST share/${PROJECT_NAME_LOWER}/songs)
++    set(INSTALL_DEST ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME_LOWER}/songs)
+ endif()
+ 
+ install(FILES ${SONGS} DESTINATION ${INSTALL_DEST})
+diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt
+index 1e4062e..b7a96a7 100644
+--- a/src/tracker/CMakeLists.txt
++++ b/src/tracker/CMakeLists.txt
+@@ -399,7 +399,7 @@ target_link_libraries(
+ if(APPLE OR WIN32)
+     set(INSTALL_DEST .)
+ else()
+-    set(INSTALL_DEST bin)
++    set(INSTALL_DEST ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+ install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_DEST})
diff --git a/media-sound/milkytracker/metadata.xml b/media-sound/milkytracker/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/milkytracker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
new file mode 100644
index 000000000000..a98d267250fa
--- /dev/null
+++ b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils vcs-snapshot
+
+DESCRIPTION="FastTracker 2 inspired music tracker"
+HOMEPAGE="http://milkytracker.titandemo.org/"
+SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack"
+
+RDEPEND="
+	dev-libs/zziplib
+	media-libs/libsdl2[X]
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0-docdir.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+		$(cmake-utils_use_find_package alsa ALSA)
+		$(cmake-utils_use_find_package jack JACK)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newicon resources/pictures/carton.png ${PN}.png
+	make_desktop_entry ${PN} MilkyTracker ${PN} \
+		"AudioVideo;Audio;Sequencer"
+}
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
new file mode 100644
index 000000000000..882f75750516
--- /dev/null
+++ b/media-sound/mixxx/Manifest
@@ -0,0 +1,23 @@
+AUX mixxx-1.10.0-cflags.patch 573 SHA256 2e37a38c7ac7fa14e495b999b9e81d9a10ea2aa36ec1f17142e3299c91d4f738 SHA512 1157161dc85314da07c47f5b42b654d5391ca3b84412f10915b5d15a9fe6cc0dbbf06f7e3156cb2f9cf21f0233ee50ae7e54cb10855332f0292b3bba915f857a WHIRLPOOL b71b3496256e8a18c6025b889ebde41caacab359115f9ed1d9866f26b150cbdb013e499841ae5ba5dd4e33797482649bef035d172a8fa27e8f1a980234a7683b
+AUX mixxx-1.10.0-docs.patch 327 SHA256 d092d360ccc533f1fa57d39577cd2fffb6089461744844ac3df3d4a0a60280bf SHA512 c785cab9ba558d5f4df04e6f89515a2056e2db84767061d0f0e1fa140fd419c384d49d78dae913e31663da4b8680a0ea966414be2c9309d4da5c2ba0dddadcc1 WHIRLPOOL 25ab693b9c64acaa8b74fc9dc9127c3b5ea91b7c6360cd1629642d53728918f2d83d4c431bf3b4ce2fc06fcaa1ac6d173a248e7d1826fc2f855da35ded1f91d4
+AUX mixxx-1.10.0-no-bzr.patch 1503 SHA256 7584acf4623f2dbbb70b675675242fe528729bf9d39c3eadff4fff87650f157c SHA512 faeedcdaa29ed6939b22ed6e60a8493c8d76f45904287667b4c7aa1b2e9acaa43810b005ad5d31eafb466e1717d18f773929ee41a9ab0e6c5c39b33fd07d8d59 WHIRLPOOL 0e3ce80f49deab8b7c13687495fccc2e0302313ef7a44e14977fecf44e7b72d22b58cc6c077848b4a9ecce6ec0350d7edc31e30fc3ffdd7268d8780703884fd9
+AUX mixxx-1.10.0-system-libs.patch 7152 SHA256 c3809896e75c6c4e5e714e75527ec5a970edca5e75124fa06bbe02fb9b08b0a1 SHA512 18d47f0a68c9cd333ebd719e58421db27df15e9babd913750907d2a725236c6a7ad90b7c2a67b6b746d14f94676e746db0f2dcce80af09c02b0d762d6eb7d2b8 WHIRLPOOL 199568040e70bac946a5f468de8f856e48be8973bb4011e14c77c5dcd59203c9664e6d14447d3d52834c1cd3e0343011aa174542ca7bfa9db4466aa7ddfa13b6
+AUX mixxx-1.11.0-no-bzr.patch 1390 SHA256 75d3394bde46bd423ca525a592a8d87f273439914f6fb041fc8e10c9ce931b1d SHA512 65f78fcb4c653b93d5ff0a308bca5ec16d0ccdd367e0ac8b15ca1d908aaee332316770cf6b11b2452b2ef8dfe44babd20fd60d58d2fca4cf794073601f6667bb WHIRLPOOL 13f129ff42a37bc5b8e8be698c217d8da853daf1ecac2eb2c14382f9b12defb831fe96cd22005552a6e4d491f7620ab515dd6e5e2a9f259c23e358fce308b919
+AUX mixxx-1.11.0-system-libs.patch 8877 SHA256 0b56ea63ecc1f5960cd3a0d163adf4f4591fc2ec8448fe50d0ed373002bb1c30 SHA512 baabba8c7c873bfe5da4230f13787133b69ee72b83328b41e7eb4ade5d81350765309ae9be8154d93aeb9e7e1f90ef0ac2d8a20153d0600d41173d876d51331f WHIRLPOOL 62683ea716b2408f8adc7b81ca385fe128b05534e0a2a4d5b0c76ea44a6920f37cd287148db1570d8ff6b0a8b7e9d0dac7e8a34a91b1cd974f92c4c1e6e3b968
+AUX mixxx-2.0.0-chromaprint-1.4.patch 1518 SHA256 dd2ee40a6dc2081f9c6592eb9f69001d85fb6fd7eb1860948f2b46c8e864e445 SHA512 31da87b64646188be144611fc6f601d58edfcf9e63b5382060f5088797c24d61ff4b48a4e80c5c3b919b7291287d3977c0f61829ddfe7a43f9fbae7db3b735c0 WHIRLPOOL 9dbcfa9fb14306d43b0294a5d4fc45a2c3644ba83b37868056e76b2c9e77822447ae0a5a8c94140f705f94e847da7a83b8ba5b8f23ba98989fd4423d6ca3bdd4
+AUX mixxx-2.0.0-docs.patch 435 SHA256 133436b8897de326be53e82ca09ce51a8fb956cd8d8c8f3e450ab7d00b50318c SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59 WHIRLPOOL 9155ef87f9958927bb046a4359a2e7a74210d01dc259df772c8bf97a23081f1fd9e39fa7cd108d90fca502bd366770ad1b656809e431ba45a287fd67289bf98a
+AUX mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch 1615 SHA256 6e0bb9063974a39384af2a4c9a55c64bd5187fe341d28d0bbff3da4a126322ae SHA512 825599d1bdfbcc673c64226bde25f2ae56b046d32139c3347cb2aae698aa27158b17609dd097ce772e62bcd58b7f711d352386069683239541f3f4160dc6d915 WHIRLPOOL 697f730c9bda3d62935b335b3cf79bbd71d2e8d379a7e839f58515b914c5a403fbcaa2b10c3f0f16bdbd9634e7d3974cbe6384f5a90926e3353c88c9d27f7281
+AUX mixxx-2.0.0-fix-formatting-of-time-durations.patch 866 SHA256 8b3da1f2ce481748926d0447ef41bea6c136e53cd146fd5f2a753250406edc00 SHA512 4850724ba1a6809a242976dcec5337b1f9c6c8c93c60c3ce5fa9cf6b6b714aa83485e58e7b97f849720da17e664c89adf33ed53d73d13d249a01700f638de3e2 WHIRLPOOL 43fb9d37735f7da3337c85974062dbe8d4afee544c8b650168bf236088c18b5229a8089b9f250ae5959bb4550e7a11c699c2ef7fdb93c645559a709d2d76e877
+AUX mixxx-2.0.0-fix-formatting-of-time-durations2.patch 5912 SHA256 8188c3019cc7eea1f4c4bae1ea55bf807461e8f78d3c9b0a8a97dc66899886f0 SHA512 c7e7480fb6880e3543ade9455cafa9ef1cfdde0af813cb54c8dc3cd98ad964dcdf7b2c4b209dac89d7654551e54dc0bd185fb00783c0f0507f0f72f21d61a599 WHIRLPOOL 1758e747abf003aa325e45bb7bd81499126a896e2034c0cdd8192623e4fd7c1d6fccbfa7b2ccd634a5396735b52e6e6e444e98b578bd6d9b6f9b3283daaf7ef3
+AUX mixxx-2.0.0-fix-missing-pointer-initialization.patch 9702 SHA256 2cd076c5c09ed5bbbececc91659ee6f70e6fcf4d61fd9be8b58f6fd9e7cc9cad SHA512 048f74fb3c0079f5935f41a4a3b5c04a691f6eaec199a8261dba119e8fa2efe15c4f8e6c24befbfadb7cf1af3db49c75ac52b3a265f52480889d4f9c9ad89eba WHIRLPOOL 4e362b72da4013b35128806515837470f788ef32daa8860318a8bb67479139bf7f1d627f79d6c14a841a527280ae0215ef8580695f2080ce30e97549a35a7cca
+AUX mixxx-2.0.0-gcc62.patch 726 SHA256 8df567f6a13479e9ab0f49c578ea05bdffd9fdbc56da09779d8de3ff28f1298c SHA512 cd0469d29ebf3b0d30154bc178b60383d52abfe5c6a34ed6de83da3ed425ed55630d0bf4159e00b7bd9ddc9822e98a9805051a29b2372f2ae952a43cced34c47 WHIRLPOOL 79b13e725572357f5818d9096dc8b9c7fc87d4b4f75c810467b8131be501e1043c1eef84fd47a7913778c340b3f6a31e25c3cc2f712d2ff4f3afc600338e0631
+AUX mixxx-2.0.0-move-definition-of-time-formatseconds-into-dot-cpp-file.patch 3113 SHA256 487e3c5b180599a480f92c58c15abe3ae3ac4b53b61c759ac98202537dbf3107 SHA512 73ea80adbc32cf8c087cd97d8c8225f1d94ea138835557dac1f8b9cd8e4415ae0f6eb4548a6581aa4a8d3bada01f7c6ad3a538d3907c233a69327f4b3d31b316 WHIRLPOOL d687ba5c3f7cb43ced241f3d98206b6237fd7e37eb52529b7f18b1567308e8748fb6ba1876168f0d68012116c9297e0e5bd73a0bd6001ed863f540c480502039
+AUX mixxx-2.0.0-rmx2-backport-controller-scripts.patch 10840 SHA256 515b8f1d16d13a299770400fb0dfdb09aeaf9dee6c03b94cb73742fd0464f755 SHA512 6ffced1c2368b1c5ad2cadf72fd21c917626318784cfcdbaf2d85ac63955ecdb96aefafd268a005962ced766cf8150b3daf409d587edab6a8b854ab6c7e812c5 WHIRLPOOL 03fb90054dcd30d0b7fb412d46c685cd49b1ed4ea029d7e4b8de56578899e47b1269102fbfc9940190babe1454cc1007653618fe2ceda507cdf27bfadc92955c
+AUX mixxx-2.0.0-sqlite3.patch 345 SHA256 751a9f68555cf01a3675af699652615a9891f1041efbd8c339d702701a175348 SHA512 18e390daf6ec7530614e7601f0695f2e42a4742d4502992b2d86d98a5c0d357c424325fd4e6fec4dad11333730afc34aaf9f3be1d3b6e4c26250e4817468345b WHIRLPOOL 5c82370ad2e35a0a3bd0b7ac1384dbaad033bee3fd9da8916625e984457a4be849a33b307cdf795a3a21dfddd020f0bd956e7cf64d71e33c96f28026eff92dad
+DIST mixxx-2.0.0-ffmpeg30.patch 714 SHA256 a5b6e8fd94ae6572efbff79529dcdb8ec2fc78a2c8fc0864d222516c8dc7b272 SHA512 60788ecab1fa92b825815fff5dfdfefe02fb097e46f7f55f318bb8a8677da42e4601cce51eaaec51988990eebb72d59346d1ec45ed76cac3c8a7f9a9d1e8cf54 WHIRLPOOL 8c780336a5f86ba8134603c1f5e3dd310006f62abe228edb2390e611f2734b0ee7c0bfe5cd91de7fab28e56809804c95fd26da6d198513fc705263e8ceca1612
+DIST mixxx-2.0.0-ffmpeg31.patch 2844 SHA256 d03109463fa1191ca07bc2be6b6503c4b57272e97064f99aae812e132737f905 SHA512 7207ad72d0ea851b1425ff7472aafe5f828ca70aad0821a1ef1eb54845527532489ac7913f6584e3af5fb53bf3459abc173fbf482f83be8a22358d28b1b5cf74 WHIRLPOOL 9284dd52c4ffe04ca7977dc4ee1b6c3a6396375a48dcb9673f39a5ceb2698021f93984d57a774b36b3dfaffa15f9ca603eeae169fa146e9951da0a587fed34dd
+DIST mixxx-2.0.0-src.tar.gz 25300881 SHA256 e1b8f33bba35046608578095ed3209967034579252d84c99e6bc03ec030f676d SHA512 8878c0f785e4c5f67724deeca61154d2587969a81d28aef8fa9d526aec8419a218ce2a7ef88d6fcf468d30fa13d31ac9a56ca9082431a35b7e4e040a7ccfbb1a WHIRLPOOL d3e4cf26846b54380f9b11eed26b90cf031a902ca82f20e71f85fb495f99179e8d783f2ba92b51d21fcc77d4779b7bcc16d8456a68e890cfe77daa57f0d3b431
+EBUILD mixxx-2.0.0-r4.ebuild 3655 SHA256 4416a460d27ac10aa35d7b24f57d7f53c339fdb2d6d94d3cb423c5a7526d3427 SHA512 f5c31c079f440b381e5f9407a97ce3738789345052f764b997361fe1af5098c3d081d6a7508631f897651be52da58a3bebb14d6e4e0c2951c4072e89015ab463 WHIRLPOOL b5e07d542d2d007fd8e49e8266554ec70092b0b3329d43c496f488c43457fbf101bbb573b51e85d1b1d30c67cb568bb9e1ecbbea9bb308437eade5db28fd797d
+MISC ChangeLog 6005 SHA256 0489d41495e44479a18688f1fa1f58f78fd794d6ea4448ad6af5edf17699bbdb SHA512 aae005f426ce3a4e808913b29bbee96d83ec8b6369692567607c555877d7085384be3cfbcce8723ca06e194c6e10180c4bcdb42ee4fbeba2918b8784f6a8047d WHIRLPOOL d5cba52ca1433cfe1abf41737e0ace192f68ab332d48e6c04801a77e9138015a7eb0cef845a2ca4c2c720dcfd3b8c02b32ff2367382c5bff5838f068d8dea368
+MISC ChangeLog-2015 2344 SHA256 f7aad21a96df5f5cb305f5b0721afd36a3b7f662888e9681011de89d097f049c SHA512 51a04ccfb376a141bc9a74346caefb33180cb70e77281850e33ce779586752b2ad50b3b238283100efae387b54f5c40d1159946e0304cb4b1d32d2b5122d6e45 WHIRLPOOL 89a6173c1f8aff226b1c9ef6b3396eb86975fe50c63d71f3718a07de95ed9523378e29e6a06bf2ee94df0afff6731eaf0f15839f4bd655df13c3bd563cd39fb5
+MISC metadata.xml 549 SHA256 7021bc46cf6acdd5fa15dfbe03aee4afd97ff5b2c7f1b4165f673d659761c95b SHA512 c89877382e9baf90038ca7c6175ef8edc3296950dc7386b00f861a90fcc3296ec4d21df665c8aa62042c1b952cd270af77b85a5959518600f43f963ffce51296 WHIRLPOOL fc44885e723d1fa6e1799b293d110ea5268d9da79136cf2358f6eff026d495c113af785ee7ee0384f4b0d4b44ef5a48741f73da9709f4dc846c1008e57a29615
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch b/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
new file mode 100644
index 000000000000..b6c8655a73a6
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.10.0-cflags.patch
@@ -0,0 +1,13 @@
+--- mixxx-1.10.0/build/depends.py
++++ mixxx-1.10.0/build/depends.py
+@@ -623,10 +555,8 @@
+         if build.toolchain_is_gnu:
+             # Default GNU Options
+             # TODO(XXX) always generate debugging info?
+-            build.env.Append(CCFLAGS = '-pipe')
+             build.env.Append(CCFLAGS = '-Wall')
+             build.env.Append(CCFLAGS = '-Wextra')
+-            build.env.Append(CCFLAGS = '-g')
+ 
+             # Check that g++ is present (yeah, SCONS is a bit dumb here)
+             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-docs.patch b/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
new file mode 100644
index 000000000000..c9205179881c
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.10.0-docs.patch
@@ -0,0 +1,10 @@
+--- mixxx-1.10.0/src/SConscript
++++ mixxx-1.10.0/src/SConscript
+@@ -219,7 +218,6 @@
+ 		env.Alias('install', keyboardmappings)
+ 		if int(flags['ladspa']):
+ 			env.Alias('install', ladspapresets)
+-		env.Alias('install', docs)
+ 		env.Alias('install', dotdesktop)
+ 		env.Alias('install', icon)
+ 		env.Alias('install', promotracks)
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
new file mode 100644
index 000000000000..40f32266bb5e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.10.0-no-bzr.patch
@@ -0,0 +1,37 @@
+--- mixxx-1.10.0/src/SConscript.env
++++ mixxx-1.10.0/src/SConscript.env
+@@ -19,21 +19,6 @@
+     print "Deleting deprecated build file: %s" % defs
+     os.remove(defs)
+ 
+-#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
+-## instead, embed BZR version into build
+-## Put version info into a file, so it doesn't force a rebuild of everything :)
+-f = open("build.h","w")
+-try:
+-    branch_name = util.get_bzr_branch_name()
+-    modified = util.get_bzr_modified() > 0
+-    # Do not emit BUILD_BRANCH on release branches.
+-    if not branch_name.startswith('release'):
+-        f.write('#define BUILD_BRANCH "%s"\n' % branch_name)
+-    f.write('#define BUILD_REV "%s%s"\n' % (util.get_bzr_revision(),
+-                                            '+' if modified else ''))
+-finally:
+-    f.close()
+-
+ #Check for dependencies if we're not doing a clean...
+ #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):
+ conf = Configure(env, custom_tests = { 'CheckForPKGConfig' : util.CheckForPKGConfig,
+--- mixxx-1.10.0/src/SConscript
++++ mixxx-1.10.0/src/SConscript
+@@ -12,8 +12,8 @@
+ from build import util
+ 
+ mixxx_version = util.get_mixxx_version()
+-branch_name = util.get_bzr_branch_name()
+-bazaar_revision = util.get_bzr_revision()
++#branch_name = util.get_bzr_branch_name()
++#bazaar_revision = util.get_bzr_revision()
+ print "WE ARE IN:", os.getcwd()
+ 
+ plugins = []
diff --git a/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch b/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
new file mode 100644
index 000000000000..d2e21f3e005b
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.10.0-system-libs.patch
@@ -0,0 +1,172 @@
+--- mixxx-1.10.0/build/depends.py
++++ mixxx-1.10.0/build/depends.py
+@@ -21,7 +21,7 @@
+ 
+     def configure(self, build, conf):
+         #Check for PortTime
+-        if not conf.CheckLib(['porttime', 'libporttime']) and \
++        if not conf.CheckLib(['porttime', 'libportmidi']) and \
+                 not conf.CheckHeader(['porttime.h']):
+             raise Exception("Did not find PortTime or its development headers.")
+         if not conf.CheckLib(['portmidi', 'libportmidi']) and \
+@@ -189,25 +189,10 @@
+ 
+ class FidLib(Dependence):
+ 
+-    def sources(self, build):
+-        symbol = None
+-        if build.platform_is_windows:
+-            if build.toolchain_is_msvs:
+-                symbol = 'T_MSVC'
+-            elif build.crosscompile:
+-                # Not sure why, but fidlib won't build with mingw32msvc and
+-                # T_MINGW
+-                symbol = 'T_LINUX'
+-            elif build.toolchain_is_gnu:
+-                symbol = 'T_MINGW'
+-        else:
+-            symbol = 'T_LINUX'
+-
+-        return [build.env.StaticObject('#lib/fidlib-0.9.9/fidlib.c',
+-                                       CPPDEFINES=symbol)]
+-
+     def configure(self, build, conf):
+-        build.env.Append(CPPPATH='#lib/fidlib-0.9.9/')
++        if not conf.CheckLib('fidlib'):
++            raise Exception('Did not find fidlib library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
+ 
+ class KissFFT(Dependence):
+ 
+@@ -226,68 +211,15 @@
+         build.env.Append(CPPPATH="#lib/replaygain")
+ 
+ class SoundTouch(Dependence):
+-    SOUNDTOUCH_PATH = 'soundtouch-1.5.0'
+ 
+     def sources(self, build):
+-        sources = ['engine/enginebufferscalest.cpp',
+-                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
+-        if build.platform_is_windows and build.toolchain_is_msvs:
+-            if build.machine_is_64bit:
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x64_win.cpp' % self.SOUNDTOUCH_PATH)
+-            elif build.machine == 'x86':
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x86_win.cpp' % self.SOUNDTOUCH_PATH)
+-            else:
+-                raise Exception("Unhandled CPU configuration for SoundTouch")
+-        elif build.toolchain_is_gnu:
+-            if build.machine == 'x86_64':
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x64_gcc.cpp' % self.SOUNDTOUCH_PATH)
+-            else:
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x86_gcc.cpp' % self.SOUNDTOUCH_PATH)
+-        else:
+-            raise Exception("Unhandled CPU configuration for SoundTouch")
+-
+-        # TODO(XXX) when we figure out a better way to represent features, fix
+-        # this.
+-        optimize = int(util.get_flags(build.env, 'optimize', 1))
+-        if build.machine_is_64bit or \
+-                (build.toolchain_is_msvs and optimize > 1) or \
+-                (build.toolchain_is_gnu and optimize > 2):
+-            sources.extend(
+-                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 ])
+-        if build.toolchain_is_msvs and not build.machine_is_64bit:
+-            sources.append('#lib/%s/3dnow_win.cpp' % self.SOUNDTOUCH_PATH)
+-        else:
+-            # TODO(XXX) the docs refer to a 3dnow_gcc, but we don't seem to have
+-            # it.
+-            pass
+-
+-        return sources
++        return ['engine/enginebufferscalest.cpp']
+ 
+     def configure(self, build, conf):
+-        if build.platform_is_windows:
+-            build.env.Append(CPPDEFINES = 'WIN%s' % build.bitwidth)
+-        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
+-
+-        # TODO(XXX) when we figure out a better way to represent features, fix
+-        # this.
+-        optimize = int(util.get_flags(build.env, 'optimize', 1))
+-        if build.machine_is_64bit or \
+-                (build.toolchain_is_msvs and optimize > 1) or \
+-                (build.toolchain_is_gnu and optimize > 2):
+-            build.env.Append(CPPDEFINES='ALLOW_X86_OPTIMIZATIONS')
++        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
++            raise Exception('Did not find SoundTouch library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
++        build.env.Append(LIBS='SoundTouch')
+ 
+ class TagLib(Dependence):
+     def configure(self, build, conf):
+--- mixxx-1.10.0/build/features.py
++++ mixxx-1.10.0/build/features.py
+@@ -665,25 +659,15 @@
+         test_env.Append(CCFLAGS = '-pthread')
+         test_env.Append(LINKFLAGS = '-pthread')
+ 
+-        test_env.Append(CPPPATH="#lib/gtest-1.5.0/include")
+-        gtest_dir = test_env.Dir("#lib/gtest-1.5.0")
+-        #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
+-        #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin'  # example, optional
+-        test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib'
+-
+-        env = test_env
+-        SCons.Export('env')
+-        env.SConscript(env.File('SConscript', gtest_dir))
+-
+-        # build and configure gmock
+-        test_env.Append(CPPPATH="#lib/gmock-1.5.0/include")
+-        gmock_dir = test_env.Dir("#lib/gmock-1.5.0")
+-        #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
+-        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib'
+-
+-        env.SConscript(env.File('SConscript', gmock_dir))
+-
+-        return []
++        if not conf.CheckLib('gtest'):
++            raise Exception('Did not find gtest library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
++        test_env.Append(LIBS='gtest')
++
++        if not conf.CheckLib('gmock'):
++            raise Exception('Did not find gmock library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
++        test_env.Append(LIBS='gmock')
+ 
+ class Shoutcast(Feature):
+     def description(self):
+--- mixxx-1.10.0/src/engine/enginefilterbutterworth8.cpp
++++ mixxx-1.10.0/src/engine/enginefilterbutterworth8.cpp
+@@ -20,7 +20,6 @@
+ #include "engine/enginefilterbutterworth8.h"

+ #include "engine/enginefilter.h"

+ #include "engine/engineobject.h"

+-#include "../lib/fidlib-0.9.9/fidlib.h"

+ 

+ /* Local Prototypes */

+ inline double _processLowpass(double *coef, double *buf, register double val);

+--- mixxx-1.10.0/src/engine/enginefilter.h
++++ mixxx-1.10.0/src/engine/enginefilter.h
+@@ -20,7 +20,7 @@
+ 
+ #define MIXXX
+ #include "engine/engineobject.h"
+-#include "../lib/fidlib-0.9.9/fidlib.h"
++#include "fidlib.h"
+ #include "defs.h"
+ 
+ enum filterType{

diff --git a/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch
new file mode 100644
index 000000000000..b89d7f92f76e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.11.0-no-bzr.patch
@@ -0,0 +1,35 @@
+--- mixxx-1.11.0/src/SConscript
++++ mixxx-1.11.0/src/SConscript
+@@ -12,8 +12,8 @@
+ from build import util, depends
+ 
+ mixxx_version = util.get_mixxx_version()
+-branch_name = util.get_bzr_branch_name()
+-bazaar_revision = util.get_bzr_revision()
++#branch_name = util.get_bzr_branch_name()
++#bazaar_revision = util.get_bzr_revision()
+ print "WE ARE IN:", os.getcwd()
+ 
+ plugins = []
+--- mixxx-1.11.0/src/SConscript.env
++++ mixxx-1.11.0/src/SConscript.env
+@@ -20,19 +20,6 @@
+     print "Deleting deprecated build file: %s" % defs
+     os.remove(defs)
+ 
+-#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
+-## instead, embed BZR version into build
+-## Put version info into a file, so it doesn't force a rebuild of everything :)
+-
+-if os.path.exists(os.path.join('..', 'build.h')):
+-    # If a build.h exists in the project root mixxx/ directory then use that
+-    # instead of writing our own. This is mostly since when we build Debian
+-    # packages we don't have any of the Bazaar metadata so we can't write one
+-    # ourselves.
+-    shutil.copy(os.path.join('..', 'build.h'), 'build.h')
+-else:
+-    util.write_build_header('build.h')
+-
+ 
+ #Check for dependencies if we're not doing a clean...
+ #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):
diff --git a/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch b/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch
new file mode 100644
index 000000000000..2f6b62c3440a
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.11.0-system-libs.patch
@@ -0,0 +1,223 @@
+--- mixxx-1.11.0/build/depends.py
++++ mixxx-1.11.0/build/depends.py
+@@ -179,8 +179,8 @@
+         # times.
+ 
+         qt_modules = [
+-            'QtCore', 'QtGui', 'QtOpenGL', 'QtXml', 'QtSvg',
+-            'QtSql', 'QtScript', 'QtXmlPatterns', 'QtNetwork'
++            'QtCore', 'QtGui', 'QtOpenGL', 'QtXml',
++            'QtSql', 'QtScript', 'QtNetwork'
+             #'QtUiTools', #'QtDesigner',
+         ]
+ 
+@@ -298,25 +298,10 @@
+ 
+ class FidLib(Dependence):
+ 
+-    def sources(self, build):
+-        symbol = None
+-        if build.platform_is_windows:
+-            if build.toolchain_is_msvs:
+-                symbol = 'T_MSVC'
+-            elif build.crosscompile:
+-                # Not sure why, but fidlib won't build with mingw32msvc and
+-                # T_MINGW
+-                symbol = 'T_LINUX'
+-            elif build.toolchain_is_gnu:
+-                symbol = 'T_MINGW'
+-        else:
+-            symbol = 'T_LINUX'
+-
+-        return [build.env.StaticObject('#lib/fidlib-0.9.10/fidlib.c',
+-                                       CPPDEFINES=symbol)]
+-
+     def configure(self, build, conf):
+-        build.env.Append(CPPPATH='#lib/fidlib-0.9.10/')
++        if not conf.CheckLib('fidlib'):
++            raise Exception('Did not find fidlib library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
+ 
+ class ReplayGain(Dependence):
+ 
+@@ -327,7 +312,6 @@
+         build.env.Append(CPPPATH="#lib/replaygain")
+ 
+ class SoundTouch(Dependence):
+-    SOUNDTOUCH_PATH = 'soundtouch-1.6.0'
+ 
+     def sse_enabled(self, build):
+         optimize = int(util.get_flags(build.env, 'optimize', 1))
+@@ -336,30 +320,7 @@
+                 (build.toolchain_is_gnu and optimize > 1))
+ 
+     def sources(self, build):
+-        sources = ['engine/enginebufferscalest.cpp',
+-                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
+-
+-        # SoundTouch CPU optimizations are only for x86
+-        # architectures. SoundTouch automatically ignores these files when it is
+-        # not being built for an architecture that supports them.
+-        cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \
+-            '#lib/%s/cpu_detect_x86_gcc.cpp'
+-        sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
+-
+-        # Check if the compiler has SSE extention enabled
+-        # Allways the case on x64 (core instructions)
+-        if self.sse_enabled(build):
+-            sources.extend(
+-                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,])
+-        return sources
++        return ['engine/enginebufferscalest.cpp']
+ 
+     def configure(self, build, conf, env=None):
+         if env is None:
+@@ -367,13 +328,10 @@
+         if build.platform_is_windows:
+             # Regardless of the bitwidth, ST checks for WIN32
+             env.Append(CPPDEFINES = 'WIN32')
+-        env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
+-
+-        # Check if the compiler has SSE extention enabled
+-        # Allways the case on x64 (core instructions)
+-        optimize = int(util.get_flags(env, 'optimize', 1))
+-        if self.sse_enabled(build):
+-            env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS')
++        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
++            raise Exception('Did not find SoundTouch library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
++        build.env.Append(LIBS='SoundTouch')
+ 
+ class TagLib(Dependence):
+     def configure(self, build, conf):
+--- mixxx-1.11.0/build/features.py
++++ mixxx-1.11.0/build/features.py
+@@ -48,7 +48,6 @@
+                 'controllers/midi/hss1394enumerator.cpp']
+ 
+ class HID(Feature):
+-    HIDAPI_INTERNAL_PATH = '#lib/hidapi-0.8.0-pre'
+     def description(self):
+         return "HID controller support"
+ 
+@@ -64,9 +63,6 @@
+     def configure(self, build, conf):
+         if not self.enabled(build):
+             return
+-        # TODO(XXX) allow external hidapi install, but for now we just use our
+-        # internal one.
+-        build.env.Append(CPPPATH=[os.path.join(self.HIDAPI_INTERNAL_PATH, 'hidapi')])
+ 
+         if build.platform_is_linux:
+             build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs')
+@@ -86,19 +82,17 @@
+ 
+         build.env.Append(CPPDEFINES = '__HID__')
+ 
++        if not conf.CheckLib('hidapi-libusb'):
++            raise Exception('Did not find HID API library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/hidapi'])
++        build.env.Append(LIBS='hidapi-libusb')
++
++
+     def sources(self, build):
+         sources = ['controllers/hid/hidcontroller.cpp',
+                    'controllers/hid/hidenumerator.cpp',
+                    'controllers/hid/hidcontrollerpresetfilehandler.cpp']
+ 
+-        if build.platform_is_windows:
+-            # Requires setupapi.lib which is included by the above check for
+-            # setupapi.
+-            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
+-        elif build.platform_is_linux:
+-            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'linux/hid-libusb.c'))
+-        elif build.platform_is_osx:
+-            sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
+         return sources
+ 
+ class Bulk(Feature):
+@@ -455,19 +449,6 @@
+ 
+         build.env.Append(CPPDEFINES = '__VAMP__')
+ 
+-        # Needed on Linux at least. Maybe needed elsewhere?
+-        if build.platform_is_linux:
+-            # Optionally link libdl and libX11. Required for some distros.
+-            conf.CheckLib(['dl', 'libdl'])
+-            conf.CheckLib(['X11', 'libX11'])
+-
+-        # FFTW3 support
+-        have_fftw3_h = conf.CheckHeader('fftw3.h')
+-        have_fftw3 = conf.CheckLib('fftw3', autoadd=False)
+-        if(have_fftw3_h and have_fftw3 and build.platform_is_linux):
+-             build.env.Append(CPPDEFINES = 'HAVE_FFTW3')
+-             build.env.ParseConfig('pkg-config fftw3 --silence-errors --cflags --libs')
+-
+     def sources(self, build):
+         sources = ['vamp/vampanalyser.cpp',
+                    'vamp/vamppluginloader.cpp',
+@@ -725,25 +706,15 @@
+         test_env.Append(CCFLAGS = '-pthread')
+         test_env.Append(LINKFLAGS = '-pthread')
+ 
+-        test_env.Append(CPPPATH="#lib/gtest-1.5.0/include")
+-        gtest_dir = test_env.Dir("#lib/gtest-1.5.0")
+-        #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
+-        #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin'  # example, optional
+-        test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib'
+-
+-        env = test_env
+-        SCons.Export('env')
+-        env.SConscript(env.File('SConscript', gtest_dir))
+-
+-        # build and configure gmock
+-        test_env.Append(CPPPATH="#lib/gmock-1.5.0/include")
+-        gmock_dir = test_env.Dir("#lib/gmock-1.5.0")
+-        #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
+-        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib'
+-
+-        env.SConscript(env.File('SConscript', gmock_dir))
+-
+-        return []
++        if not conf.CheckLib('gtest'):
++            raise Exception('Did not find gtest library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
++        test_env.Append(LIBS='gtest')
++
++        if not conf.CheckLib('gmock'):
++            raise Exception('Did not find gmock library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
++        test_env.Append(LIBS='gmock')
+ 
+ class Shoutcast(Feature):
+     def description(self):
+--- mixxx-1.11.0/src/engine/enginefilterbutterworth8.cpp
++++ mixxx-1.11.0/src/engine/enginefilterbutterworth8.cpp
+@@ -20,7 +20,7 @@
+ #include "engine/enginefilterbutterworth8.h"

+ #include "engine/enginefilter.h"

+ #include "engine/engineobject.h"

+-#include "../lib/fidlib-0.9.10/fidlib.h"

++#include <fidlib.h>

+ 

+ /* Local Prototypes */

+ inline double _processLowpass(double *coef, double *buf, register double val);

+--- mixxx-1.11.0/src/engine/enginefilter.h
++++ mixxx-1.11.0/src/engine/enginefilter.h
+@@ -20,7 +20,7 @@
+ 
+ #define MIXXX
+ #include "engine/engineobject.h"
+-#include "../lib/fidlib-0.9.10/fidlib.h"
++#include <fidlib.h>
+ #include "defs.h"
+ 
+ enum filterType{
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch b/media-sound/mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch
new file mode 100644
index 000000000000..77827f3d8d81
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-chromaprint-1.4.patch
@@ -0,0 +1,40 @@
+Backported chromaprint-1.4 API changes based on the fix suggested in:
+https://github.com/mixxxdj/mixxx/pull/1073
+
+and the work done by Charlie Gehlin in:
+https://bugs.gentoo.org/604528
+
+--- mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp
++++ mixxx-2.0.0/src/musicbrainz/chromaprinter.cpp
+@@ -25,6 +25,16 @@
+ 
+ QString ChromaPrinter::calcFingerPrint(const Mixxx::SoundSourcePointer& pSoundSource) {
+ 
++    // Type declarations of *fprint and *encoded pointers need to account for Chromaprint API version
++    // (void* -> uint32_t*) and (void* -> char*) changed in versions v1.4.0 or later -- alyptik 12/2016
++    #if (CHROMAPRINT_VERSION_MINOR > 3) || (CHROMAPRINT_VERSION_MAJOR > 1)
++	typedef uint32_t* uint32_p;
++	typedef char* char_p;
++    #else
++	typedef void* uint32_p;
++	typedef void* char_p;
++    #endif
++
+     // this is worth 2min of audio, multiply by 2 because we have 2 channels
+     // AcoustID only stores a fingerprint for the first two minutes of a song
+     // on their server so we need only a fingerprint of the first two minutes
+@@ -57,12 +67,12 @@
+     }
+     chromaprint_finish(ctx);
+ 
+-    void* fprint = NULL;
++    uint32_p fprint = NULL;
+     int size = 0;
+     int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size);
+     QByteArray fingerprint;
+     if (ret == 1) {
+-        void* encoded = NULL;
++        char_p encoded = NULL;
+         int encoded_size = 0;
+         chromaprint_encode_fingerprint(fprint, size,
+                                        CHROMAPRINT_ALGORITHM_DEFAULT,
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-docs.patch b/media-sound/mixxx/files/mixxx-2.0.0-docs.patch
new file mode 100644
index 000000000000..702ce6cd8df5
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-docs.patch
@@ -0,0 +1,10 @@
+--- mixxx-9999/src/SConscript
++++ mixxx-9999/src/SConscript
+@@ -290,7 +290,6 @@
+                 env.Alias('install', controllermappings)
+                 env.Alias('install', translations)
+                 env.Alias('install', keyboardmappings)
+-                env.Alias('install', docs)
+                 env.Alias('install', dotdesktop)
+                 env.Alias('install', icon)
+                 env.Alias('install', promotracks)
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch b/media-sound/mixxx/files/mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch
new file mode 100644
index 000000000000..04538a01e15a
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-eliminate-unnecessary-heap-allocation-of-qtime.patch
@@ -0,0 +1,55 @@
+diff -dNur a/src/analyserwaveform.cpp b/src/analyserwaveform.cpp
+--- a/src/analyserwaveform.cpp	2015-12-29 17:10:41.000000000 +0100
++++ b/src/analyserwaveform.cpp	2017-02-04 21:12:30.127952910 +0100
+@@ -1,6 +1,3 @@
+-#include <QImage>
+-#include <QtDebug>
+-#include <QTime>
+ #include <QtDebug>
+ 
+ #include "analyserwaveform.h"
+@@ -40,7 +37,6 @@
+         }
+     }
+ 
+-    m_timer = new QTime();
+     m_analysisDao = new AnalysisDao(m_database, pConfig);
+ }
+ 
+@@ -48,14 +44,13 @@
+     qDebug() << "AnalyserWaveform::~AnalyserWaveform()";
+     destroyFilters();
+     m_database.close();
+-    delete m_timer;
+     delete m_analysisDao;
+ }
+ 
+ bool AnalyserWaveform::initialise(TrackPointer tio, int sampleRate, int totalSamples) {
+     m_skipProcessing = false;
+ 
+-    m_timer->start();
++    m_timer.start();
+ 
+     if (totalSamples == 0) {
+         qWarning() << "AnalyserWaveform::initialise - no waveform/waveform summary";
+@@ -320,7 +315,7 @@
+ #endif
+ 
+     qDebug() << "Waveform generation for track" << tio->getId() << "done"
+-             << m_timer->elapsed()/1000.0 << "s";
++             << m_timer.elapsed()/1000.0 << "s";
+ }
+ 
+ void AnalyserWaveform::storeIfGreater(float* pDest, float source) {
+diff -dNur a/src/analyserwaveform.h b/src/analyserwaveform.h
+--- a/src/analyserwaveform.h	2015-12-29 17:10:41.000000000 +0100
++++ b/src/analyserwaveform.h	2017-02-04 21:12:45.367713395 +0100
+@@ -171,7 +171,7 @@
+     EngineFilterIIRBase* m_filter[FilterCount];
+     std::vector<float> m_buffers[FilterCount];
+ 
+-    QTime* m_timer;
++    QTime m_timer;
+     QSqlDatabase m_database;
+     AnalysisDao* m_analysisDao;
+ 
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations.patch b/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations.patch
new file mode 100644
index 000000000000..654c01f53b9d
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations.patch
@@ -0,0 +1,24 @@
+From 76c53b0f0a2be7b5cf85fa523f3521a5725affb2 Mon Sep 17 00:00:00 2001
+From: Uwe Klotz <uwe_klotz@web.de>
+Date: Fri, 8 Jan 2016 18:22:33 +0100
+Subject: [PATCH] Fix formatting of time durations
+
+---
+ src/util/time.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/time.h b/src/util/time.h
+index 29187ad..7b38eb4 100644
+--- a/src/util/time.h
++++ b/src/util/time.h
+@@ -75,7 +75,9 @@ class Time {
+         const int days = static_cast<int>(dSeconds) / kSecondsPerDay;
+         dSeconds -= days * kSecondsPerDay;
+ 
+-        QTime t = QTime().addMSecs(dSeconds * kMillisPerSecond);
++        // NOTE(uklotzde): Time() constructs a 'null' object, but
++        // we need 'zero' here.
++        QTime t = QTime(0, 0).addMSecs(dSeconds * kMillisPerSecond);
+ 
+         QString formatString =
+                 (days > 0 ? (QString::number(days) %
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations2.patch b/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations2.patch
new file mode 100644
index 000000000000..f8c041e4043e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-fix-formatting-of-time-durations2.patch
@@ -0,0 +1,139 @@
+diff -dNur a/src/library/basesqltablemodel.cpp b/src/library/basesqltablemodel.cpp
+--- a/src/library/basesqltablemodel.cpp	2015-12-29 17:10:41.000000000 +0100
++++ b/src/library/basesqltablemodel.cpp	2017-02-04 21:33:39.403861857 +0100
+@@ -559,7 +559,7 @@
+             if (column == fieldIndex(ColumnCache::COLUMN_LIBRARYTABLE_DURATION)) {
+                 int duration = value.toInt();
+                 if (duration > 0) {
+-                    value = Time::formatSeconds(duration, false);
++                    value = Time::formatSeconds(duration);
+                 } else {
+                     value = QString();
+                 }
+diff -dNur a/src/library/browse/browsethread.cpp b/src/library/browse/browsethread.cpp
+--- a/src/library/browse/browsethread.cpp	2015-12-29 17:10:41.000000000 +0100
++++ b/src/library/browse/browsethread.cpp	2017-02-04 21:32:23.605066421 +0100
+@@ -185,8 +185,7 @@
+         item->setData(item->text(), Qt::UserRole);
+         row_data.insert(COLUMN_COMMENT, item);
+ 
+-        QString duration = Time::formatSeconds(qVariantValue<int>(
+-                tio.getDuration()), false);
++        QString duration = Time::formatSeconds(tio.getDuration());
+         item = new QStandardItem(duration);
+         item->setToolTip(item->text());
+         item->setData(item->text(), Qt::UserRole);
+diff -dNur a/src/library/cratefeature.cpp b/src/library/cratefeature.cpp
+--- a/src/library/cratefeature.cpp	2015-12-29 17:10:41.000000000 +0100
++++ b/src/library/cratefeature.cpp	2017-02-04 21:30:54.962474898 +0100
+@@ -493,7 +493,7 @@
+             crateListTableModel.index(row, durationColumn)).toInt();
+         m_crateList.append(qMakePair(id, QString("%1 (%2) %3")
+                                      .arg(name, QString::number(count),
+-                                          Time::formatSeconds(duration, false))));
++                                          Time::formatSeconds(duration))));
+     }
+ }
+ 
+diff -dNur a/src/library/playlistfeature.cpp b/src/library/playlistfeature.cpp
+--- a/src/library/playlistfeature.cpp	2015-12-29 17:10:41.000000000 +0100
++++ b/src/library/playlistfeature.cpp	2017-02-04 21:33:06.920378091 +0100
+@@ -168,7 +168,7 @@
+             playlistTableModel.index(row, durationColumn)).toInt();
+         m_playlistList.append(qMakePair(id, QString("%1 (%2) %3")
+                                         .arg(name, QString::number(count),
+-                                             Time::formatSeconds(duration, false))));
++                                             Time::formatSeconds(duration))));
+     }
+ }
+ 
+diff -dNur a/src/trackinfoobject.cpp b/src/trackinfoobject.cpp
+--- a/src/trackinfoobject.cpp	2015-12-29 17:10:41.000000000 +0100
++++ b/src/trackinfoobject.cpp	2017-02-04 21:42:36.423323807 +0100
+@@ -293,7 +293,7 @@
+     int iDuration = m_iDuration;
+     lock.unlock();
+ 
+-    return Time::formatSeconds(iDuration, false);
++    return Time::formatSeconds(iDuration);
+ }
+ 
+ void TrackInfoObject::setLocation(const QString& location) {
+diff -dNur a/src/util/time.cpp b/src/util/time.cpp
+--- a/src/util/time.cpp	2017-02-04 21:29:44.439595305 +0100
++++ b/src/util/time.cpp	2017-02-04 21:37:54.739803100 +0100
+@@ -1,5 +1,7 @@
+ #include "util/time.h"
+ 
++#include "util/assert.h"
++
+ // static
+ LLTIMER Time::s_timer;
+ // static
+@@ -8,7 +10,7 @@
+ qint64 Time::s_testElapsed_nsecs = 0;
+ 
+ // static
+-QString Time::formatSeconds(double dSeconds, bool showCentis) {
++QString Time::formatSeconds(double dSeconds, Precision precision) {
+     if (dSeconds < 0) {
+         return "?";
+     }
+@@ -24,13 +26,14 @@
+             (days > 0 ? (QString::number(days) %
+                          QLatin1String("'d', ")) : QString()) %
+             QLatin1String(days > 0 || t.hour() > 0 ? "hh:mm:ss" : "mm:ss") %
+-            QLatin1String(showCentis ? ".zzz" : "");
++            QLatin1String(Precision::SECONDS == precision ? "" : ".zzz");
+ 
+     QString timeString = t.toString(formatString);
+ 
+     // The format string gives us milliseconds but we want
+     // centiseconds. Slice one character off.
+-    if (showCentis) {
++    if (Precision::CENTISECONDS == precision) {
++        DEBUG_ASSERT(1 <= timeString.length());
+         timeString = timeString.left(timeString.length() - 1);
+     }
+ 
+diff -dNur a/src/util/time.h b/src/util/time.h
+--- a/src/util/time.h	2017-02-04 21:29:44.439595305 +0100
++++ b/src/util/time.h	2017-02-04 21:41:01.476833822 +0100
+@@ -55,10 +55,17 @@
+         s_testElapsed_nsecs = elapsed * 1000000;
+     }
+ 
+-    // The standard way of formatting a time in seconds. Used for display of
+-    // track duration, etc. showCentis indicates whether to include
+-    // centisecond-precision or to round to the nearest second.
+-    static QString formatSeconds(double dSeconds, bool showCentis);
++    enum class Precision {
++        SECONDS,
++        CENTISECONDS,
++        MILLISECONDS
++    };
++
++    // The standard way of formatting a time in seconds. Used for display
++    // of track duration, etc.
++    static QString formatSeconds(
++            double dSeconds,
++            Precision precision = Time::Precision::SECONDS);
+ 
+   private:
+     static LLTIMER s_timer;
+diff -dNur a/src/widget/wnumberpos.cpp b/src/widget/wnumberpos.cpp
+--- a/src/widget/wnumberpos.cpp	2015-12-29 17:10:41.000000000 +0100
++++ b/src/widget/wnumberpos.cpp	2017-02-04 21:41:57.023950430 +0100
+@@ -92,10 +92,10 @@
+     QString valueString;
+     if (valueMillis >= 0) {
+         valueString = m_skinText % Time::formatSeconds(
+-                valueMillis / Time::kMillisPerSecond, true);
++                valueMillis / Time::kMillisPerSecond, Time::Precision::MILLISECONDS);
+     } else {
+         valueString = m_skinText % QLatin1String("-") % Time::formatSeconds(
+-                -valueMillis / Time::kMillisPerSecond, true);
++                -valueMillis / Time::kMillisPerSecond, Time::Precision::CENTISECONDS);
+     }
+     setText(valueString);
+ }
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-fix-missing-pointer-initialization.patch b/media-sound/mixxx/files/mixxx-2.0.0-fix-missing-pointer-initialization.patch
new file mode 100644
index 000000000000..3364995ce4f5
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-fix-missing-pointer-initialization.patch
@@ -0,0 +1,271 @@
+diff -dNur a/src/analyserwaveform.cpp b/src/analyserwaveform.cpp
+--- a/src/analyserwaveform.cpp	2017-02-04 21:14:33.266016824 +0100
++++ b/src/analyserwaveform.cpp	2017-02-04 21:19:09.205671982 +0100
+@@ -11,8 +11,8 @@
+ 
+ AnalyserWaveform::AnalyserWaveform(ConfigObject<ConfigValue>* pConfig) :
+         m_skipProcessing(false),
+-        m_waveformData(NULL),
+-        m_waveformSummaryData(NULL),
++        m_waveformData(nullptr),
++        m_waveformSummaryData(nullptr),
+         m_stride(0, 0),
+         m_currentStride(0),
+         m_currentSummaryStride(0) {
+@@ -37,14 +37,13 @@
+         }
+     }
+ 
+-    m_analysisDao = new AnalysisDao(m_database, pConfig);
++    m_pAnalysisDao = std::make_unique<AnalysisDao>(m_database, pConfig);
+ }
+ 
+ AnalyserWaveform::~AnalyserWaveform() {
+     qDebug() << "AnalyserWaveform::~AnalyserWaveform()";
+     destroyFilters();
+     m_database.close();
+-    delete m_analysisDao;
+ }
+ 
+ bool AnalyserWaveform::initialise(TrackPointer tio, int sampleRate, int totalSamples) {
+@@ -115,7 +114,7 @@
+ 
+     if (trackId != -1 && (missingWaveform || missingWavesummary)) {
+         QList<AnalysisDao::AnalysisInfo> analyses =
+-                m_analysisDao->getAnalysesForTrack(trackId);
++                m_pAnalysisDao->getAnalysesForTrack(trackId);
+ 
+         QListIterator<AnalysisDao::AnalysisInfo> it(analyses);
+         while (it.hasNext()) {
+@@ -130,7 +129,7 @@
+                     missingWaveform = false;
+                 } else if (vc != WaveformFactory::VC_KEEP) {
+                     // remove all other Analysis except that one we should keep
+-                    m_analysisDao->deleteAnalysis(analysis.analysisId);
++                    m_pAnalysisDao->deleteAnalysis(analysis.analysisId);
+                 }
+             } if (analysis.type == AnalysisDao::TYPE_WAVESUMMARY) {
+                 vc = WaveformFactory::waveformSummaryVersionToVersionClass(analysis.version);
+@@ -140,7 +139,7 @@
+                     missingWavesummary = false;
+                 } else if (vc != WaveformFactory::VC_KEEP) {
+                     // remove all other Analysis except that one we should keep
+-                    m_analysisDao->deleteAnalysis(analysis.analysisId);
++                    m_pAnalysisDao->deleteAnalysis(analysis.analysisId);
+                 }
+             }
+         }
+@@ -273,13 +272,13 @@
+     tio->setWaveform(ConstWaveformPointer());
+     // Since clear() could delete the waveform, clear our pointer to the
+     // waveform's vector data first.
+-    m_waveformData = NULL;
++    m_waveformData = nullptr;
+     m_waveform.clear();
+ 
+     tio->setWaveformSummary(ConstWaveformPointer());
+     // Since clear() could delete the waveform, clear our pointer to the
+     // waveform's vector data first.
+-    m_waveformSummaryData = NULL;
++    m_waveformSummaryData = nullptr;
+     m_waveformSummary.clear();
+ }
+ 
+@@ -295,7 +294,7 @@
+         m_waveform->setDescription(WaveformFactory::currentWaveformDescription());
+         // Since clear() could delete the waveform, clear our pointer to the
+         // waveform's vector data first.
+-        m_waveformData = NULL;
++        m_waveformData = nullptr;
+         m_waveform.clear();
+     }
+ 
+@@ -306,7 +305,7 @@
+         m_waveformSummary->setDescription(WaveformFactory::currentWaveformSummaryDescription());
+         // Since clear() could delete the waveform, clear our pointer to the
+         // waveform's vector data first.
+-        m_waveformSummaryData = NULL;
++        m_waveformSummaryData = nullptr;
+         m_waveformSummary.clear();
+     }
+ 
+diff -dNur a/src/analyserwaveform.h b/src/analyserwaveform.h
+--- a/src/analyserwaveform.h	2017-02-04 21:14:33.266016824 +0100
++++ b/src/analyserwaveform.h	2017-02-04 21:20:17.308598419 +0100
+@@ -4,12 +4,14 @@
+ #include <QTime>
+ #include <QImage>
+ #include <QSqlDatabase>
++
+ #include <limits>
+ 
+ #include "configobject.h"
+ #include "analyser.h"
+ #include "waveform/waveform.h"
+ #include "util/math.h"
++#include "util/memory.h"
+ 
+ //NOTS vrince some test to segment sound, to apply color in the waveform
+ //#define TEST_HEAT_MAP
+@@ -173,7 +175,7 @@
+ 
+     QTime m_timer;
+     QSqlDatabase m_database;
+-    AnalysisDao* m_analysisDao;
++    std::unique_ptr<AnalysisDao> m_pAnalysisDao;
+ 
+ #ifdef TEST_HEAT_MAP
+     QImage* test_heatMap;
+diff -dNur a/src/util/memory.h b/src/util/memory.h
+--- a/src/util/memory.h	1970-01-01 01:00:00.000000000 +0100
++++ b/src/util/memory.h	2017-02-04 22:19:41.846922929 +0100
+@@ -0,0 +1,149 @@
++// Taken from https://github.com/bstreiff/cppbits
++// Thank you Brandon Streiff!
++
++// Implementation of C++14's make_unique for C++11 compilers.
++//
++// This has been tested with:
++// - MSVC 11.0 (Visual Studio 2012)
++// - gcc 4.6.3
++// - Xcode 4.4 (with clang "4.0")
++//
++// It is based off an implementation proposed by Stephan T. Lavavej for
++// inclusion in the C++14 standard:
++//    http://isocpp.org/files/papers/N3656.txt
++// Where appropriate, it borrows the use of MSVC's _VARIADIC_EXPAND_0X macro
++// machinery to compensate for lack of variadic templates.
++//
++// This file injects make_unique into the std namespace, which I acknowledge is
++// technically forbidden ([C++11: 17.6.4.2.2.1/1]), but is necessary in order
++// to have syntax compatibility with C++14.
++//
++// I perform compiler version checking for MSVC, gcc, and clang to ensure that
++// we don't add make_unique if it is already there (instead, we include
++// <memory> to get the compiler-provided one). You can override the compiler
++// version checking by defining the symbol COMPILER_SUPPORTS_MAKE_UNIQUE.
++//
++//
++// ===============================================================================
++// This file is released into the public domain. See LICENCE for more information.
++// ===============================================================================
++
++#ifndef MIXXX_UTIL_MEMORY_H
++#define MIXXX_UTIL_MEMORY_H
++
++// If user hasn't specified COMPILER_SUPPORTS_MAKE_UNIQUE then try to figure out
++// based on compiler version if std::make_unique is provided.
++#if !defined(COMPILER_SUPPORTS_MAKE_UNIQUE)
++   // Compiling with -std=c++11 sets __cplusplus=201103L and disables
++   // std::make_unique() from C++14! We need to take this into account.
++   #define CPLUSPLUS_SUPPORTS_MAKE_UNIQUE (__cplusplus > 201103L)
++   #if defined(_MSC_VER)
++      // std::make_unique was added in MSVC 12.0
++      #if _MSC_VER >= 1800 // MSVC 12.0 (Visual Studio 2013)
++         #define COMPILER_SUPPORTS_MAKE_UNIQUE
++      #endif
++   #elif defined(__clang__)
++      // std::make_unique was added in clang 3.4, but not until Xcode 6.
++      // Annoyingly, Apple makes the clang version defines match the version
++      // of Xcode, not the version of clang.
++      #define CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
++      #if defined(__APPLE__) && CLANG_VERSION >= 60000 && CPLUSPLUS_SUPPORTS_MAKE_UNIQUE
++         #define COMPILER_SUPPORTS_MAKE_UNIQUE
++      #elif !defined(__APPLE__) && CLANG_VERSION >= 30400 && CPLUSPLUS_SUPPORTS_MAKE_UNIQUE
++         #define COMPILER_SUPPORTS_MAKE_UNIQUE
++      #endif
++   #elif defined(__GNUC__)
++      // std::make_unique was added in gcc 4.9
++      #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
++      #if GCC_VERSION >= 40900 && CPLUSPLUS_SUPPORTS_MAKE_UNIQUE
++         #define COMPILER_SUPPORTS_MAKE_UNIQUE
++      #endif
++   #endif
++#endif
++
++#if defined(COMPILER_SUPPORTS_MAKE_UNIQUE)
++
++// If the compiler supports std::make_unique, then pull in <memory> to get it.
++#include <memory>
++
++#else
++
++// Otherwise, the compiler doesn't provide it, so implement it ourselves.
++
++#include <cstddef>
++#include <memory>
++#include <type_traits>
++#include <utility>
++
++namespace std {
++
++template<class _Ty> struct _Unique_if {
++   typedef unique_ptr<_Ty> _Single_object;
++};
++
++template<class _Ty> struct _Unique_if<_Ty[]> {
++   typedef unique_ptr<_Ty[]> _Unknown_bound;
++};
++
++template<class _Ty, size_t N> struct _Unique_if<_Ty[N]> {
++   typedef void _Known_bound;
++};
++
++//
++// template< class T, class... Args >
++// unique_ptr<T> make_unique( Args&&... args);
++//
++
++#if defined(_MSC_VER) && (_MSC_VER < 1800)
++
++// Macro machinery because MSVC 11.0 doesn't support variadic templates.
++// The _VARIADIC_EXPAND_0X stuff is defined in <xstddef>
++#define _MAKE_UNIQUE( \
++   TEMPLATE_LIST, PADDING_LIST, LIST, COMMA, X1, X2, X3, X4) \
++   template<class _Ty COMMA LIST(_CLASS_TYPE)> inline \
++      typename _Unique_if<_Ty>::_Single_object make_unique(LIST(_TYPE_REFREF_ARG)) \
++   { \
++      return unique_ptr<_Ty>(new _Ty(LIST(_FORWARD_ARG))); \
++   } \
++
++_VARIADIC_EXPAND_0X(_MAKE_UNIQUE, , , , )
++#undef _MAKE_UNIQUE
++
++#else // not MSVC 11.0 or earlier
++
++template<class _Ty, class... Args>
++   typename _Unique_if<_Ty>::_Single_object
++   make_unique(Args&&... args) {
++      return unique_ptr<_Ty>(new _Ty(std::forward<Args>(args)...));
++   }
++
++#endif
++
++// template< class T >
++// unique_ptr<T> make_unique( std::size_t size );
++
++template<class _Ty>
++   typename _Unique_if<_Ty>::_Unknown_bound
++   make_unique(size_t n) {
++      typedef typename remove_extent<_Ty>::type U;
++      return unique_ptr<_Ty>(new U[n]());
++   }
++
++// template< class T, class... Args >
++// /* unspecified */ make_unique( Args&&... args ) = delete;
++
++// MSVC 11.0 doesn't support deleted functions, so the best we can do
++// is simply not define the function.
++#if !(defined(_MSC_VER) && (_MSC_VER < 1800))
++
++template<class T, class... Args>
++   typename _Unique_if<T>::_Known_bound
++   make_unique(Args&&...) = delete;
++
++#endif
++
++} // namespace std
++
++#endif // !COMPILER_SUPPORTS_MAKE_UNIQUE
++
++#endif /* MIXXX_UTIL_MEMORY_H */
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-gcc62.patch b/media-sound/mixxx/files/mixxx-2.0.0-gcc62.patch
new file mode 100644
index 000000000000..c19c914b330e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-gcc62.patch
@@ -0,0 +1,24 @@
+--- a/src/util/math.h	2015-12-29 17:10:41.000000000 +0100
++++ b/src/util/math.h	2016-09-25 12:54:18.345291146 +0200
+@@ -3,8 +3,20 @@
+ 
+ // Causes MSVC to define M_PI and friends.
+ // http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx
++// Our SConscript defines this but check anyway.
++#ifdef __WINDOWS__
++#ifndef _USE_MATH_DEFINES
+ #define _USE_MATH_DEFINES
+-#include <cmath>
++#endif
++#endif
++
++#include <math.h>
++#include <cmath> 
++// Note: Because of our fpclassify hack, we actualy need to inlude both, 
++// the c and the c++ version of the math header.  
++// From GCC 6.1.1 math.h depends on cmath, which failes to compile if included 
++// after our fpclassify hack 
++
+ #include <algorithm>
+ 
+ #include "util/assert.h"
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-move-definition-of-time-formatseconds-into-dot-cpp-file.patch b/media-sound/mixxx/files/mixxx-2.0.0-move-definition-of-time-formatseconds-into-dot-cpp-file.patch
new file mode 100644
index 000000000000..9a95a5d675ec
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-move-definition-of-time-formatseconds-into-dot-cpp-file.patch
@@ -0,0 +1,88 @@
+From c2af9e6eeb469718b9aa069b90a719fac80dd0d9 Mon Sep 17 00:00:00 2001
+From: Uwe Klotz <uwe_klotz@web.de>
+Date: Fri, 8 Jan 2016 19:25:58 +0100
+Subject: [PATCH] Move definition of Time::formatSeconds() into .cpp file
+
+---
+ src/util/time.cpp | 30 ++++++++++++++++++++++++++++++
+ src/util/time.h   | 29 +----------------------------
+ 2 files changed, 31 insertions(+), 28 deletions(-)
+
+diff --git a/src/util/time.cpp b/src/util/time.cpp
+index 998fa73..d8a122b 100644
+--- a/src/util/time.cpp
++++ b/src/util/time.cpp
+@@ -6,3 +6,33 @@ LLTIMER Time::s_timer;
+ bool Time::s_testMode = false;
+ // static
+ qint64 Time::s_testElapsed_nsecs = 0;
++
++// static
++QString Time::formatSeconds(double dSeconds, bool showCentis) {
++    if (dSeconds < 0) {
++        return "?";
++    }
++
++    const int days = static_cast<int>(dSeconds) / kSecondsPerDay;
++    dSeconds -= days * kSecondsPerDay;
++
++    // NOTE(uklotzde): Time() constructs a 'null' object, but
++    // we need 'zero' here.
++    QTime t = QTime(0, 0).addMSecs(dSeconds * kMillisPerSecond);
++
++    QString formatString =
++            (days > 0 ? (QString::number(days) %
++                         QLatin1String("'d', ")) : QString()) %
++            QLatin1String(days > 0 || t.hour() > 0 ? "hh:mm:ss" : "mm:ss") %
++            QLatin1String(showCentis ? ".zzz" : "");
++
++    QString timeString = t.toString(formatString);
++
++    // The format string gives us milliseconds but we want
++    // centiseconds. Slice one character off.
++    if (showCentis) {
++        timeString = timeString.left(timeString.length() - 1);
++    }
++
++    return timeString;
++}
+diff --git a/src/util/time.h b/src/util/time.h
+index 7b38eb4..b4e2c2d 100644
+--- a/src/util/time.h
++++ b/src/util/time.h
+@@ -67,34 +67,7 @@ class Time {
+     // The standard way of formatting a time in seconds. Used for display of
+     // track duration, etc. showCentis indicates whether to include
+     // centisecond-precision or to round to the nearest second.
+-    static QString formatSeconds(double dSeconds, bool showCentis) {
+-        if (dSeconds < 0) {
+-            return "?";
+-        }
+-
+-        const int days = static_cast<int>(dSeconds) / kSecondsPerDay;
+-        dSeconds -= days * kSecondsPerDay;
+-
+-        // NOTE(uklotzde): Time() constructs a 'null' object, but
+-        // we need 'zero' here.
+-        QTime t = QTime(0, 0).addMSecs(dSeconds * kMillisPerSecond);
+-
+-        QString formatString =
+-                (days > 0 ? (QString::number(days) %
+-                             QLatin1String("'d', ")) : QString()) %
+-                QLatin1String(days > 0 || t.hour() > 0 ? "hh:mm:ss" : "mm:ss") %
+-                QLatin1String(showCentis ? ".zzz" : "");
+-
+-        QString timeString = t.toString(formatString);
+-
+-        // The format string gives us milliseconds but we want
+-        // centiseconds. Slice one character off.
+-        if (showCentis) {
+-            timeString = timeString.left(timeString.length() - 1);
+-        }
+-
+-        return timeString;
+-    }
++    static QString formatSeconds(double dSeconds, bool showCentis);
+ 
+   private:
+     static LLTIMER s_timer;
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-rmx2-backport-controller-scripts.patch b/media-sound/mixxx/files/mixxx-2.0.0-rmx2-backport-controller-scripts.patch
new file mode 100644
index 000000000000..a82f27166abc
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-rmx2-backport-controller-scripts.patch
@@ -0,0 +1,280 @@
+diff -dNur a/res/controllers/Hercules-DJ-Console-RMX-2-scripts.js b/res/controllers/Hercules-DJ-Console-RMX-2-scripts.js
+--- a/res/controllers/Hercules-DJ-Console-RMX-2-scripts.js	2015-12-29 17:10:41.000000000 +0100
++++ b/res/controllers/Hercules-DJ-Console-RMX-2-scripts.js	2017-02-04 22:01:01.629506434 +0100
+@@ -1,128 +1,159 @@
+-/*╔══:::Made Lovingly By Circuitfry:::═════════════════════════════════╗
+-  ║     Hercules DJConsole RMX 2 Mapping Scripts v. 0.1.3              ║
+-  ╚════════════════════════════════════════════════════════════════════╝
+-  * Version 0.1.0: Basic Midi Wizard Mapping
+-  * Version 0.1.1: Partially-Functional platters (version 1).
+-  * Version 0.1.2: Functional platters (version 1)
+-  * Version 0.1.3: Functional EQ Kill/Pitch Bending buttons
+-                   Functional Looping/Sample/Effect pads
+-                   Bugfix: Source 2 Gain knob doesn't load tracks.
+-                   Overhaul: MIDI Scripting file.
+-    Worklog: Need to implement Microphone/Source1/Source2 input.
+-  * Note 1: [DEP] Means the command is meant for Mixxx v1.10.x + below.
+-  * Note 2: [FUT] Means the command is meant for Mixxx v1.11.x + above.
+-*/
+-function DJCRMX2(){}
+-DJCRMX2.scratching = [];
++/* ╔══:::Made Lovingly By Circuitfry:::═════════════════════════════════╗
++ * ║     Hercules DJConsole RMX 2 Mapping Scripts                       ║
++ * ╚════════════════════════════════════════════════════════════════════╝
++ */
+ 
+-/*  [ Function init ] - Version 0.1.3
+-  * Initiates some global variables and assigns an ID. Required.
+-*/
+-DJCRMX2.init = function(id){	
+- DJCRMX2.id = id;
+- DJCRMX2.scratching[1]=false;
+- DJCRMX2.scratching[2]=false;
+- engine.setValue("[Microphone]","enabled",0);
+- engine.setValue("[Microphone]","talkover",0);
++function DJCRMX2() {}
++DJCRMX2.decks = [];
++
++/* [ Function init ]
++ * Initiates some global variables and assigns an ID. Required.
++ */
++DJCRMX2.init = function (id) {
++    DJCRMX2.id = id;
++    DJCRMX2.decks[1] = new DJCRMX2.Deck(1);
++    DJCRMX2.decks[2] = new DJCRMX2.Deck(2);
++    engine.setValue("[Microphone]", "enabled", 0);
++    engine.setValue("[Microphone]", "talkover", 0);
+ }
+ 
+-/*  [ Function wheelPress ] - Version 0.1.2
+-  * Detects whether a jog wheel is pressed or not and sets a specific
+-  * variable on and off accordingly.
+-*/
+-DJCRMX2.wheelPress = function (channel, control, value, status, group){
+- if (status == 0x90) // If status #144 is active (2 possibilities)
+- {
+-  if (value == 0x7F) // And the jog wheel is pressed down:
+-  {  /*  engine.scratchEnable(int,int,float,float,float,bool);
+-       * [ int deck ]              Which track/platter is playing?
+-       * [ int intervalsPerRev ]   # of MIDI signals sent in 1 spin.
+-       * [ float rpm ]             Imaginary vinyl rotation speed.
+-       * [ float alpha ]           Just a fine-tuning variable.
+-       * [ float beta ]            Just a fine-tuning variable.
+-       * [ bool ramp ]             As far as I know, nothing...
+-     */
+-      var alpha = 1.0/8;
+-      var beta = alpha/32;
+-      if(group=="[Channel1]")
+-      {
+-       engine.scratchEnable(1, 250, 50, alpha, beta);
+-       DJCRMX2.scratching[1] = true; //[DEP]
+-	  }
+-	  if(group=="[Channel2]")
+-	  {
+-	   engine.scratchEnable(2, 250, 50, alpha, beta);
+-	   DJCRMX2.scratching[2] = true; //[DEP]
+-	  }
+-      
+-  }
+-  if (value == 0x00 ) // If the jog wheel is released:
+-  {
+-   if(group=="[Channel1]")
+-   {
+-    DJCRMX2.scratching[1] = false; // <- v1.10.x and below
+-    engine.scratchDisable(1);
+-   }
+-   if(group=="[Channel2]")
+-   {
+-    DJCRMX2.scratching[2] = false; // <- v1.10.x and below
+-   engine.scratchDisable(2);
+-   }
+-  }
+- }
+- else //Default setting where button is not held down.
+- {
+-  DJCRMX2.scratching[1] = false;  // Only for v1.10.x and below
+-  DJCRMX2.scratching[2] = false;  // Only for v1.10.x and below
+-  engine.scratchDisable(1);
+-  engine.scratchDisable(2);
+- }
+- return;
++////////////////////////////////////////////////////////////////////////
++// Decks                                                              //
++////////////////////////////////////////////////////////////////////////
++
++DJCRMX2.Deck = function(number) {
++    this.number = number;
++    this.group = "[Channel" + this.number + "]";
++    this.scratchTimer = 0;
++};
++
++DJCRMX2.Deck.prototype.wheelPress = function (value) {
++    if (this.scratchTimer != 0) {
++        // The wheel was touched again, reset the timer.
++        engine.stopTimer(this.scratchTimer);
++        this.scratchTimer = 0;
++    }
++    if (value == 0x7F) {
++        // And the jog wheel is pressed down:
++
++         /*  engine.scratchEnable(int,int,float,float,float,bool);
++         * [ int deck ]              Which track/platter is playing?
++         * [ int intervalsPerRev ]   # of MIDI signals sent in 1 spin.
++         * [ float rpm ]             Imaginary vinyl rotation speed.
++         * [ float alpha ]           Just a fine-tuning variable.
++         * [ float beta ]            Just a fine-tuning variable.
++         * [ bool ramp ]             As far as I know, nothing...
++         */
++
++         var alpha = 1.0 / 8;
++         var beta = alpha / 32;
++         engine.scratchEnable(this.number, 256, 33 + 1/3, alpha, beta);
++    } else {
++        // The wheel touch sensor can be overly sensitive, so don't release scratch mode right away.
++        // Depending on how fast the platter was moving, lengthen the time we'll wait.
++        var scratchRate = Math.abs(engine.getValue(this.group, "scratch2"));
++        var inertiaTime = Math.pow(1.8, scratchRate) * 50;
++        if (inertiaTime < 100) {
++            // Just do it now.
++            this.finishWheelPress();
++        } else {         
++            this.scratchTimer = engine.beginTimer(
++                    100, "DJCRMX2.decks[" + this.number + "].finishWheelPress()", true);
++        }
++    }
++}
++
++DJCRMX2.Deck.prototype.finishWheelPress = function() {
++    this.scratchTimer = 0;
++    var play = engine.getValue(this.group, "play");
++    if (play != 0) {
++        // If we are playing, just hand off to the engine.
++        engine.scratchDisable(this.number, true);
++    } else {
++        // If things are paused, there will be a non-smooth handoff between scratching and jogging.
++        // Instead, keep scratch on until the platter is not moving.
++        var scratchRate = Math.abs(engine.getValue(this.group, "scratch2"));
++        if (scratchRate < 0.01) {
++            // The platter is basically stopped, now we can disable scratch and hand off to jogging.
++            engine.scratchDisable(this.number, false);
++        } else {
++            // Check again soon.
++            this.scratchTimer = engine.beginTimer(
++                    100, "DJCRMX2.decks[" + this.number + "].finishWheelPress()", true);
++        }
++    }
++};
++
++
++/* [ Function wheelTurn ]
++ * Pays attention to the current deck, checks scratching, affects the
++ * song accordingly.
++ */
++DJCRMX2.Deck.prototype.wheelTurn = function (value) {
++    var newValue = 0;
++    // Spinning backwards = 127 or less (less meaning faster)
++    // Spinning forwards  = 1 or more (more meaning faster)
++    if (value - 64 > 0) {
++        newValue = value - 128;
++    } else {
++        newValue = value;
++    }
++    
++    if (engine.isScratching(this.number)) {
++        engine.scratchTick(this.number, newValue);
++    } else {
++        engine.setValue(this.group, "jog", newValue);
++    }   
+ }
++
++/*  [ Function wheelPress ]
++ * Detects whether a jog wheel is pressed or not and sets a specific
++ * variable on and off accordingly.
++ */
++DJCRMX2.wheelPress = function (channel, control, value, status, group) {
++    var deck = 0;     
++    if (group == "[Channel1]") {
++        deck = 1;
++    } else  if (group == "[Channel2]") {
++        deck = 2;
++    } else {
++        return; 
++    }
++    DJCRMX2.decks[deck].wheelPress(value);
++}
++
+  
+-/*  [ Function wheelTurn ] - Version 0.1.2
+-  * Pays attention to the current deck, checks scratching, affects the
+-  * song accordingly.
+-*/
+-DJCRMX2.wheelTurn = function (channel, control, value, status, group){
+- var newValue=0;
+- // Spinning backwards = 127 or less (less meaning faster)
+- // Spinning forwards  = 1 or more (more meaning faster)
+- if (value-64 > 0) newValue = (value-128);
+- else newValue=value;
+- //if (!engine.isScratching(DJCRMX2.currentDeck)) // [FUT]
+- if(group=="[Channel1]")
+- {
+-  if(DJCRMX2.scratching[1]==true) {engine.scratchTick(1,newValue);return;}
+- }
+- else if(group=="[Channel2]")
+- {
+-  if(DJCRMX2.scratching[2]==true) {engine.scratchTick(2,newValue);return;}
+- }
+- engine.setValue(group, "jog", newValue);
+- return;
++/* [ Function wheelTurn ]
++ * Pays attention to the current deck, checks scratching, affects the
++ * song accordingly.
++ */
++DJCRMX2.wheelTurn = function (channel, control, value, status, group) {
++    var deck = 0;     
++    if (group == "[Channel1]") {
++        deck = 1;
++    } else  if (group == "[Channel2]") {
++        deck = 2;
++    } else {
++        return; 
++    }
++    DJCRMX2.decks[deck].wheelTurn(value);
+ }
+ 
+-DJCRMX2.micSwitch = function (channel, control, value, status) //???
++DJCRMX2.micSwitch = function (channel, control, value, status)
+ {
+- if(status == 0x90 && control == 0x48 && value == 0x7F)
+- {
+-  engine.setValue("[Microphone]","enabled",1);
+-  engine.setValue("[Microphone]","talkover",1);
+- }
+- if(status == 0x90 && control == 0x48 && value == 0x00)
+- {
+-  engine.setValue("[Microphone]","enabled",0);
+-  engine.setValue("[Microphone]","talkover",0);
+- }
++    if (status == 0x90 && control == 0x48 && value == 0x7F) {
++        engine.setValue("[Microphone]","enabled",1);
++        engine.setValue("[Microphone]","talkover",1);
++    } else if (status == 0x90 && control == 0x48 && value == 0x00) {
++        engine.setValue("[Microphone]","enabled",0);
++        engine.setValue("[Microphone]","talkover",0);
++    }
+ }
+ 
+-/*  [ Function shutdown ] - Version 0.1.3
+-  * Sets variables down for shutoff.
+-*/
+-DJCRMX2.shutdown = function(id){
+- DJCRMX2.scratching[1]=false;
+- DJCRMX2.scratching[2]=false;
+- engine.setValue("[Microphone]","enabled",0);
+- engine.setValue("[Microphone]","talkover",0);
++/* [ Function shutdown ] - Version 0.1.3
++ * Sets variables down for shutoff.
++ */
++DJCRMX2.shutdown = function (id) {
++    engine.setValue("[Microphone]", "enabled", 0);
++    engine.setValue("[Microphone]", "talkover", 0);
+ }
diff --git a/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch b/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch
new file mode 100644
index 000000000000..a8cb15e63c65
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.0.0-sqlite3.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/622776
+
+--- mixxx-2.0.0/src/library/trackcollection.h
++++ mixxx-2.0.0/src/library/trackcollection.h
+@@ -34,8 +34,7 @@
+ #include "library/dao/libraryhashdao.h"
+ 
+ #ifdef __SQLITE3__
+-typedef struct sqlite3_context sqlite3_context;
+-typedef struct Mem sqlite3_value;
++#include <sqlite3.h>
+ #endif
+ 
+ class TrackInfoObject;
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
new file mode 100644
index 000000000000..4627d1b0b257
--- /dev/null
+++ b/media-sound/mixxx/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="hid">Enable HID controller support</flag>
+		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mixxx</remote-id>
+		<remote-id type="github">mixxxdj/mixxx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mixxx/mixxx-2.0.0-r4.ebuild b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
new file mode 100644
index 000000000000..d8a4bb179981
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.0.0-r4.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic scons-utils toolchain-funcs
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+SRC_URI="https://downloads.${PN}.org/${P}/${P}-src.tar.gz"
+
+# Upstream patches
+SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/51d95ba58d99309f439cb7e2d1285cfb33aa0f63.patch -> ${PN}-2.0.0-ffmpeg30.patch"
+SRC_URI+=" https://github.com/mixxxdj/mixxx/commit/869e07067b15e09bf7ef886a8772afdfb79cbc3c.patch -> ${PN}-2.0.0-ffmpeg31.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="aac debug doc ffmpeg hid mp3 mp4 shout wavpack"
+
+# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
+# got fixed
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/protobuf:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	virtual/libusb:1
+	virtual/opengl
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+
+	"${DISTDIR}"/${P}-ffmpeg30.patch
+	"${DISTDIR}"/${P}-ffmpeg31.patch
+
+	"${FILESDIR}"/${P}-chromaprint-1.4.patch #604528
+	"${FILESDIR}"/${P}-gcc62.patch #595090
+
+	"${FILESDIR}"/${PN}-2.0.0-sqlite3.patch #622776
+
+	# The following patches were taken from sunny-overlay (bug #608430)
+	"${FILESDIR}"/${P}-fix-formatting-of-time-durations.patch
+	"${FILESDIR}"/${P}-eliminate-unnecessary-heap-allocation-of-qtime.patch
+	"${FILESDIR}"/${P}-fix-missing-pointer-initialization.patch
+	"${FILESDIR}"/${P}-move-definition-of-time-formatseconds-into-dot-cpp-file.patch
+	"${FILESDIR}"/${P}-fix-formatting-of-time-durations2.patch
+	"${FILESDIR}"/${P}-rmx2-backport-controller-scripts.patch
+)
+
+src_prepare() {
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	default
+}
+
+src_configure() {
+	local myoptimize=0
+
+	# Required for >=qt-5.7.0 (bug #590690)
+	append-cxxflags -std=c++11
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #591968
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		if [[ ${i} = native ]] ; then
+			myoptimize="native"
+			break
+		fi
+	done
+
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
+		faad="$(usex aac 1 0)"
+		ffmpeg="$(usex ffmpeg 1 0)"
+		hid="$(usex hid 1 0)"
+		hifieq=1
+		m4a="$(usex mp4 1 0)"
+		mad="$(usex mp3 1 0)"
+		optimize="${myoptimize}"
+		qdebug="$(usex debug 1 0)"
+		qt5=1
+		shoutcast="$(usex shout 1 0)"
+		vinylcontrol=1
+		wv="$(usex wavpack 1 0)"
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
+		install_root="${ED}"/usr install
+
+	dodoc README Mixxx-Manual.pdf
+}
diff --git a/media-sound/mmix/Manifest b/media-sound/mmix/Manifest
new file mode 100644
index 000000000000..911515cdee75
--- /dev/null
+++ b/media-sound/mmix/Manifest
@@ -0,0 +1,5 @@
+DIST mmix-0.3.tar.bz2 23628 SHA256 089071e8440ae8715340e5757714176ab2b14c1918339f9c22d91745ad0ca9d6 SHA512 ba4036ede59fab8c769ea5e92ddbe076e6644b833acfc4e893c7ad5547161ce837fe6c94ee977b5684a62cf1f2889d54531112c395c2d5076b76f0d9b24261da WHIRLPOOL e2c5ea649e1b476d8f595cc006d4369a006d2c3e51d7a2fd523940eaee3f9060fc95cd8f6c79c7783ac8dedcd2e8dbd4b664a91714ea174edc8ae810a230fcd4
+EBUILD mmix-0.3.ebuild 634 SHA256 cfc465857f67262dd4771eb4a44c606afb504acf6749399a90e51ef946720721 SHA512 ce7bb45089b1073d5d5ab32a580588f67c8f9505b6ca4cc4f25d7d8713a17360e33d8f76032d774253506fe847367372ff0e465314898a9ac17759e2b14e776c WHIRLPOOL 5857e46f8e857431ed48cc5b5f99672924d47236150a32d9235d56d5ec8146b1fabaf2d4ae46a7d292180d5c019a3a50f49a8c87b8e25904de610076768aff1f
+MISC ChangeLog 2417 SHA256 b93f1fcecb0b680eb8779ad8dba7d94a1fbd6583e8ff1f2693cc146e1cf7cf15 SHA512 8fd0f297536215b181d9059ac2b1c27de2a247a4bf0d75693e700f72e4d7d15503e6a3853e34a06cd8e69cb89d4267c33879b2ad1f5cef82b02e60d0fab34d8b WHIRLPOOL 20422cad0e5c43e519d5811a39541c30bdd93b9f8721c1dc3f6ff2b32a62a49592f81c1954e75d30a092c99043b0a6ac5fcd14159ecd4573e98cc9550c0000d2
+MISC ChangeLog-2015 324 SHA256 c5af50567d731db60f424fea176866142c547d2166b4b5e68492aa11e47b1393 SHA512 d53122809115125e658ac6926de30a1905ed447986b0d5767450afbb13390e73417856362427d347023eb2aa33d072550f27d150eb76d2d461d980bb45a21ae6 WHIRLPOOL 30d5ef3f9f76a6eb2674ff71cee104d2a3f62f85802b85c0a330363444eb6f320662a1138cf5adf80db0cc8b5fc58673571b528413341408ba0f1662fd022419
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/mmix/metadata.xml b/media-sound/mmix/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/mmix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/mmix/mmix-0.3.ebuild b/media-sound/mmix/mmix-0.3.ebuild
new file mode 100644
index 000000000000..2cc43e45fe41
--- /dev/null
+++ b/media-sound/mmix/mmix-0.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="A soundcard mixer for the OSS driver"
+HOMEPAGE="http://www.mcmilk.de/projects/mmix/"
+SRC_URI="http://www.mcmilk.de/projects/${PN}/dl/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/os-headers"
+
+src_prepare() {
+	sed -i -e '/strip/d' Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman doc/${PN}.1
+	dodoc doc/{AUTHORS,CHANGES,FAQ,README}
+}
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
new file mode 100644
index 000000000000..91ec60c669c9
--- /dev/null
+++ b/media-sound/moc/Manifest
@@ -0,0 +1,7 @@
+DIST moc-2.5.2.tar.bz2 602728 SHA256 f3a68115602a4788b7cfa9bbe9397a9d5e24c68cb61a57695d1c2c3ecf49db08 SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f WHIRLPOOL b6db2de356107ac9e46605d70834ff34c49ff17fe4307caadf613b0618f905f4fd2aaf9e67852f319c2e97a4e9173c876b6fd8aa83bcbbdae9e54557d384adff
+DIST moc-2.6-alpha3.tar.xz 496676 SHA256 a27b8888984cf8dbcd758584961529ddf48c237caa9b40b67423fbfbb88323b1 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf WHIRLPOOL 749603a4e582bceef4b41b1d68513b84bbdab1e566fd41c12b9d5d8b2e14b8bca9be70aae3f20ef389eb7801785aeac4f486b676c3aefa25b92329a0387a84dc
+EBUILD moc-2.5.2.ebuild 2150 SHA256 34f10e21b4cff94359cd1e6062f9eb753282359156ac31c20a6967096bd0c50c SHA512 8fbec8b83319e7b6c6f719ff9cf27cae859b0dcde115bb50ddcbf62aef90d12f533211f59ec548a39270b6817300b0fa27b611d7ec133204e0384a97509bb18c WHIRLPOOL ca3c76c3a903bd980ff7bd622e920844f486588a53bdc4ea2dd2c96f794a8bfd353cdf00c3d9e2ecb4c956c30edf41c4f4dc37c3c22a9eaf1f859dd9ed36466a
+EBUILD moc-2.6_alpha3.ebuild 2272 SHA256 4c56852e953c3e23e14d929b4e06a8e74d1a575b57d6099d3ab376df3bdc5bc6 SHA512 87e8d9e59ba0de11fb9a2ab04b016e07082faa3fb79451cb577e70ee7e016d8827cf04286cdfb993c6e8f095426f02f1984c6c109c58ba5a65b538cab393104e WHIRLPOOL 3f48fac69583eb7d5188328c0cb98742ec16a851c742c575426cf85b01cd02587c723f085ee2253ab6a7734c235f5024d7945356cf9afb22f8fd5f95aaf25181
+MISC ChangeLog 4278 SHA256 7559bb6d90630a7067f789ef1ccad2c7bdfcf83e6ddd7078b1033fae8390a155 SHA512 42ca79fb821dfa228c16c59e96d8c141448403f04c7984e651f63453d4a58d29c19ff1e127f14dfe789fcb14d11440162629bdbc32212aa344f898c4b059a253 WHIRLPOOL 61d0fbbe3c6a1f90c29f1a63d6306af746beb8491f906568af868b735a3d41dc96fb8b782a138accc46b7bead82dd459be38187cf79b472fc897864948b80365
+MISC ChangeLog-2015 17543 SHA256 8f38d93215d44c34e1a630eb6b46ec02e114f843daf3fba2b47283dbf5922d3d SHA512 7f15d87e35ee71d6cdf291db3264faade6d1a46b999c5d885be42b3ae856eb210afa53aeb979a408ccda7326a8bdc7b53c348f52c3f3a1ef7983c9efed07484d WHIRLPOOL 78b3eb36e8e4671ad925a5ae9eed4958c6366f93e10eb29910c02bb5fb6095f06c9826b0885e2ef3c8c67bf03c59df6a333f8fb11b48ad5b90fbaf20d35d4f71
+MISC metadata.xml 596 SHA256 51fd767f2552357344616cbe509d28f1dc6852fa202fb1ec425ee80dcc878ad0 SHA512 f2ca529805ed93256100396a8ee414ba1098097eb4a8379144d52fbdf02d98a05c399cb1be861c64eb712bd5160f3286c30e73875dce05ce2e974f7123b40699 WHIRLPOOL 160042440588f431a6e5f0032d293102c869ae9f317ae09598d24609f56bcd530b6f85b614d72a8e26631f8f9e990220efbdbb0d7fefa7bd5a0cce0c8b22cf04
diff --git a/media-sound/moc/metadata.xml b/media-sound/moc/metadata.xml
new file mode 100644
index 000000000000..67fb1868a11d
--- /dev/null
+++ b/media-sound/moc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="cache">Enable tags caching support</flag>
+		<flag name="magic">Use libmagic to determine mimetypes</flag>
+		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
+		<flag name="tremor">Build vorbis support using an integer implementation
+			of the vorbis library (<pkg>media-libs/tremor</pkg>)</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/moc/moc-2.5.2.ebuild b/media-sound/moc/moc-2.5.2.ebuild
new file mode 100644
index 000000000000..4be8c1b12f9a
--- /dev/null
+++ b/media-sound/moc/moc-2.5.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${P/_/-}
+DESCRIPTION="Music On Console - ncurses interface for playing audio files"
+HOMEPAGE="http://moc.daper.net"
+SRC_URI="http://ftp.daper.net/pub/soft/moc/stable/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
+	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
+
+RDEPEND=">=dev-libs/libltdl-2:0
+	sys-libs/ncurses:0=[unicode?]
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	cache? ( >=sys-libs/db-4:= )
+	curl? ( net-misc/curl )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? ( media-libs/flac )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag )
+	magic? ( sys-apps/file )
+	modplug? ( media-libs/libmodplug )
+	musepack? ( media-sound/musepack-tools media-libs/taglib )
+	sid? ( >=media-libs/libsidplay-2 )
+	sndfile? ( media-libs/libsndfile )
+	speex? ( media-libs/speex )
+	timidity? ( media-libs/libtimidity media-sound/timidity++ )
+	vorbis? (
+		media-libs/libogg
+		tremor? ( media-libs/tremor )
+		!tremor? ( media-libs/libvorbis )
+	)
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local myconf=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable debug)
+		$(use_enable cache)
+		$(use_with oss)
+		$(use_with alsa)
+		$(use_with jack)
+		$(use_with magic)
+		$(use_with unicode ncursesw)
+		$(use_with libsamplerate samplerate)
+		$(use_with aac)
+		$(use_with ffmpeg)
+		$(use_with flac)
+		$(use_with modplug)
+		$(use_with mad mp3)
+		--without-rcc
+		$(use_with musepack)
+		$(use_with sid sidplay2)
+		$(use_with sndfile)
+		$(use_with speex)
+		$(use_with timidity)
+		$(use_with vorbis vorbis $(usex tremor tremor ""))
+		$(use_with wavpack)
+		$(use_with curl)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
diff --git a/media-sound/moc/moc-2.6_alpha3.ebuild b/media-sound/moc/moc-2.6_alpha3.ebuild
new file mode 100644
index 000000000000..d68ba88aa230
--- /dev/null
+++ b/media-sound/moc/moc-2.6_alpha3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${PN}-${PV/_/-}
+DESCRIPTION="Music On Console - ncurses interface for playing audio files"
+HOMEPAGE="http://moc.daper.net"
+SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
+	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
+
+RDEPEND="
+	>=dev-libs/libltdl-2:0
+	dev-libs/popt
+	sys-libs/ncurses:0=[unicode?]
+	aac? ( media-libs/faad2 )
+	alsa? ( >=media-libs/alsa-lib-1.0.11 )
+	cache? ( >=sys-libs/db-4.1:= )
+	curl? ( >=net-misc/curl-7.15.1 )
+	ffmpeg? ( >=virtual/ffmpeg-9 )
+	flac? ( >=media-libs/flac-1.1.3 )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.4 )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.0 )
+	mad? (
+		media-libs/libmad
+		sys-libs/zlib
+		media-libs/libid3tag
+	)
+	magic? ( sys-apps/file )
+	modplug? ( >=media-libs/libmodplug-0.7 )
+	musepack? (
+		media-sound/musepack-tools
+		>=media-libs/taglib-1.5
+	)
+	sid? ( >=media-libs/libsidplay-2.1.1 )
+	sndfile? ( >=media-libs/libsndfile-1.0.0 )
+	speex? ( >=media-libs/speex-1.0.0 )
+	timidity? (
+		>=media-libs/libtimidity-0.1.0
+		media-sound/timidity++
+	)
+	vorbis? (
+		>=media-libs/libogg-1.0
+		tremor? ( media-libs/tremor )
+		!tremor? ( >=media-libs/libvorbis-1.0 )
+	)
+	wavpack? ( >=media-sound/wavpack-4.31 )
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local myconf=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		--without-rcc
+		$(use_enable debug)
+		$(use_enable cache)
+		$(use_with oss)
+		$(use_with alsa)
+		$(use_with jack)
+		$(use_with magic)
+		$(use_with unicode ncursesw)
+		$(use_with libsamplerate samplerate)
+		$(use_with aac)
+		$(use_with ffmpeg)
+		$(use_with flac)
+		$(use_with modplug)
+		$(use_with mad mp3)
+		$(use_with musepack)
+		$(use_with sid sidplay2)
+		$(use_with sndfile)
+		$(use_with speex)
+		$(use_with timidity)
+		$(use_with vorbis vorbis $(usex tremor tremor ""))
+		$(use_with wavpack)
+		$(use_with curl)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-sound/modplugtools/Manifest b/media-sound/modplugtools/Manifest
new file mode 100644
index 000000000000..dee0e3b1ec21
--- /dev/null
+++ b/media-sound/modplugtools/Manifest
@@ -0,0 +1,7 @@
+DIST modplugtools-0.5.1.tar.gz 337382 SHA256 72731c640a6f97ff6511ab982934486c1a8ae995c8a723ce4aa6b8f08b4ca067 SHA512 58e2bfda90630bc0a4762fdde4afc48865a921beea41419a0f57e7a2e4120579d4a1bf734b1c7925b27fa3fe83a665a35a3e4a22a30c0035854e9fe35f6fd759 WHIRLPOOL ea72a42b84b843e222c4ff325b8bb4999c40f4c7f77bb53abcd6bfa57c97f4e57f045707f06e564d972644eb77e6951cbbc08b0db6df179b84ca1a29d5c88f7b
+DIST modplugtools-0.5.3.tar.gz 342603 SHA256 0122d44ea0513b928cf9d463acc886d08a2664579aa96ddeeb270d5c81193a4e SHA512 82f3787dfd6188c722d2b2dac315ee40f46795704769575695d7d71cd504b88e0e2dc39bc2d9d803dd84473b86d09019be9aa6c5dc713c72bcfa6ca1c1340e9d WHIRLPOOL 2280f654ca9fa733a0a1c602a9cf21643724968fbf6e93fb88cca1248dfe4541154f6ef9e592da7098f2e664f6d593642a3620e0f52d64fe314bc56a7f8f1aa9
+EBUILD modplugtools-0.5.1.ebuild 580 SHA256 d04aab4abff18d084f235df64d80cce469af63502d35c00c55ea438ff8e5f230 SHA512 5ec4dc4be11c585400a88a7accb22026d7d953fd2b2fb757ee33b33e014c430da93bb40da7e0eaaddda8da74c8adf706a57a3661bbe4aebc434201ef369a66e8 WHIRLPOOL 723128d301435ff266b6e0ff29369d87aa7bd015ec9399584aac7d7559e001eab5744520702d6fd78e0cfdaf3981219d8cddf9763139398e80e8c112573ff256
+EBUILD modplugtools-0.5.3.ebuild 582 SHA256 e1427c094a3c2edcf9bd8a73a0096e44605f92445906611073d884c4ae67c2f8 SHA512 1a414cd6f2b8f66b93a1c62ad712942f47bc381fa5f0c3b8c27b812f3dc2b6962b97ee01bd8ba06ebbca2fbfd059c649fe24dd38f1f092fc9ef04198ecc668c2 WHIRLPOOL 8b4cb4d3ef499180b903ca96c00894370235bd2c741c793aca542044cd7757dfedc90566afa8392880f57e26294c321ee9720b41782e65719a77a4546db522b4
+MISC ChangeLog 2507 SHA256 8dfffafd21918f2e14a528b84eaf3d3ca50e7aa612f1972c117f0dbba5f9771c SHA512 4eacd3b9f14dbf5fb68343aa330401deacbc2d66c41d4f718b158d00156519a01a4c0af0a3aa4e1299594a55c958d421868f70a0de3a8e3781585d6678326df3 WHIRLPOOL b7bd9284ce4c48ab3c34fdd88f2170be8278025cce23d3fce09bd256f2d5ff0c21e1631836b632f6be364544ca81782bbd045b9def7466ae6159320fabb3ea7e
+MISC ChangeLog-2015 1073 SHA256 12593e3af140aceb3fdc79b7c9e4dc76dfea4be090601bc8643d1e9bc5263b1d SHA512 f468e5f767447d7738ab39c88dfefa2beb2afac25098cb01915360caf34a9b4acf82f8cee850eb0d72e2d27f48f43b62258629166ee6572909e00fd1c2cf32a5 WHIRLPOOL 4340b54c9837033e75dbccb04302420dff024f9e18b29323feb1745c4aeb8aaf5d4d09a79761c36e4079201a01944c4c02579800138392a7673c78f2253f4adb
+MISC metadata.xml 335 SHA256 8eab6b86cb7ec3f4a688e3051254d4274bdfff6630ab01d1bd1639ca0362f243 SHA512 ff5cc9078858678f75ede9fed227b75f852d2caa6471dc1af1ea6827d30895bd59a7f4a7bb3414625d86af528fe2ca358debcc77887d34bfa51ddff618569d33 WHIRLPOOL a8c5e572c78a3ec65bfa206403e084189b00da171037bc4eb41ece6586e88665e2d5ff77ad9d688331dc6212d7efa7d5597a8c2bcb5bebf1392913ef121972c8
diff --git a/media-sound/modplugtools/metadata.xml b/media-sound/modplugtools/metadata.xml
new file mode 100644
index 000000000000..fb6210026670
--- /dev/null
+++ b/media-sound/modplugtools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">modplug-xmms</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/modplugtools/modplugtools-0.5.1.ebuild b/media-sound/modplugtools/modplugtools-0.5.1.ebuild
new file mode 100644
index 000000000000..df70b05c35e3
--- /dev/null
+++ b/media-sound/modplugtools/modplugtools-0.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+DESCRIPTION="libmodplug based module players modplug123 and modplugplay"
+HOMEPAGE="http://modplug-xmms.sourceforge.net/"
+SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libao-0.8.0
+	>=media-libs/libmodplug-0.8.8.1
+	!media-sound/modplugplay"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/media-sound/modplugtools/modplugtools-0.5.3.ebuild b/media-sound/modplugtools/modplugtools-0.5.3.ebuild
new file mode 100644
index 000000000000..ec6a84193ef0
--- /dev/null
+++ b/media-sound/modplugtools/modplugtools-0.5.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+DESCRIPTION="libmodplug based module players modplug123 and modplugplay"
+HOMEPAGE="http://modplug-xmms.sourceforge.net/"
+SRC_URI="mirror://sourceforge/modplug-xmms/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libao-0.8.0
+	>=media-libs/libmodplug-0.8.8.1
+	!media-sound/modplugplay"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/media-sound/moodbar/Manifest b/media-sound/moodbar/Manifest
new file mode 100644
index 000000000000..f931a68f4f34
--- /dev/null
+++ b/media-sound/moodbar/Manifest
@@ -0,0 +1,6 @@
+AUX moodbar-0.1.2-gthread_init.patch 597 SHA256 b5f73f4cf26e97d33ce38fa4457c5021d6463d4bcfaed0826f9ac09b85c042a6 SHA512 b4f606d32c3a6d20669515648a4da7762590e90cc267a97fe978b7ccdbea34a209b76eb0e62d1c19a902ebc0f307c73b62f44ffd6d056f3fbb7996173de365dc WHIRLPOOL 12cd066b76cb1fb40a9e3dae95ed5143aae0afaeaf841e192767cca8eadece687e8e5a64b3d074152c1a29d606d3a5d52ca025d14a670c7cb6b8d48b3b6c2f97
+DIST moodbar-0.1.2.tar.gz 327715 SHA256 3d53627c3d979636e98bbe1e745ed79e98f1238148ba4f8379819f9083b3d9c4 SHA512 52616c870eedd643198792e398807205dd257ecc092dfd4b909a98c77b8f4d986bbfe9694fcc5653b07253f88e175f185b1cf3b397af2089eefd2625a13b70f3 WHIRLPOOL c6f258ed05cad5789a2e9287731d272d2389b957f3876eb7538f3e7b6d6c2cad12c2466323ead622e227d096c45e47ad960d221a1987d58aaed4e652d0c00bd0
+EBUILD moodbar-0.1.2.ebuild 715 SHA256 0bdf949cc5ed539cdbe9962acce1dd78953514dabb4ad297d48dc82739b01394 SHA512 33f856a57b7191f48ab0276db79adff9472c9efa43720c0ec5521a43adede4f7e4c7604c14c440e3ee0ad68662941541c66d9ade425fc359585dc8f078e283ff WHIRLPOOL c53641e8778dedde1bfb66595deedf03c50a879019d4087e130b20279d0a94e70cca689c98a473a5e867fcb97647e40d68cc92fa651c5158598abff9c917db4f
+MISC ChangeLog 2643 SHA256 6b2ddbae2c96d507335050456a00658ef7fcb3c6e8b7d9705d8ffa9f01cceece SHA512 8ca4dcd5f85c9a963747c346081f3562283ff24cebd7c87d25001eaa842a400bae45d266ff6f2d1340a6a978141b834e83b3dda6cf837cac67566974a77fceef WHIRLPOOL bed7c908bf753a8b1e9896de60e1c7a6157335666feee224d7540cbaa3d021d997187f4afd6e9763307c84133f5bea0358f09cd56008480aa15fc5de286d243f
+MISC ChangeLog-2015 1556 SHA256 1f98b4d9a094c85f2bbe6ee214a77892cfe9735cec7bc62d1dcccf368ec2adce SHA512 38b1288c08c51ff84d6dde1466160c6c392e07a7550b38c72e88571d20c4908daebfc532a0f4c744bab53fc3e93c8553a75ddf01c2ceb3c732b53a5489bfb34e WHIRLPOOL 674bac63f1d253935f5218b6c79372cf3aa91a8119cb80065efd720efd800932457962f13b62e199b3d23f2941f7647036d939349fbeb6aa87100baba8fd33fa
+MISC metadata.xml 362 SHA256 aacebbe349b87e9e2a1fac0fda8862adfbab4aa2636edef9a8dda86d36b5e0b6 SHA512 5f32dceddf22f0816a38959dfe7302a5bf9039d339a36e5e8c18824a131db432ea14377a8613309a5c424f5b767a96571d6b21a0bc9ae2e33ab31428f4e1b23c WHIRLPOOL aba33eda0e6befc2c8af13eeb6b30facd63efbc51a76e76a871001aeb411e9cde460c8330455d22c1bdb4fe9a39b077141479cf2a86bb6f422b22674df475109
diff --git a/media-sound/moodbar/files/moodbar-0.1.2-gthread_init.patch b/media-sound/moodbar/files/moodbar-0.1.2-gthread_init.patch
new file mode 100644
index 000000000000..028be99dc502
--- /dev/null
+++ b/media-sound/moodbar/files/moodbar-0.1.2-gthread_init.patch
@@ -0,0 +1,13 @@
+diff -ur moodbar-0.1.2.orig/analyzer/main.c moodbar-0.1.2/analyzer/main.c
+--- moodbar-0.1.2.orig/analyzer/main.c	2006-10-12 08:43:30.000000000 +0300
++++ moodbar-0.1.2/analyzer/main.c	2009-05-09 14:14:08.000000000 +0300
+@@ -262,6 +262,9 @@
+   GOptionContext *ctx;
+   GError *err = NULL;
+ 
++  // must be called before any other glib function is called
++  if (!g_thread_supported ()) g_thread_init(NULL);
++
+   ctx = g_option_context_new ("[INFILE] - Run moodbar analyzer");
+   g_option_context_add_group (ctx, gst_init_get_option_group ());
+   g_option_context_add_main_entries (ctx, entries, NULL);
diff --git a/media-sound/moodbar/metadata.xml b/media-sound/moodbar/metadata.xml
new file mode 100644
index 000000000000..7b55da445128
--- /dev/null
+++ b/media-sound/moodbar/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/moodbar/moodbar-0.1.2.ebuild b/media-sound/moodbar/moodbar-0.1.2.ebuild
new file mode 100644
index 000000000000..5fcc8bafef63
--- /dev/null
+++ b/media-sound/moodbar/moodbar-0.1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="The moodbar tool and gstreamer plugin for Amarok"
+HOMEPAGE="https://userbase.kde.org/Amarok/Manual/Various/Moodbar"
+SRC_URI="http://pwsp.net/~qbob/moodbar-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="mp3 ogg vorbis flac"
+
+RDEPEND="media-libs/gst-plugins-base:0.10
+	media-libs/gst-plugins-good:0.10
+	media-plugins/gst-plugins-meta:0.10
+	sci-libs/fftw:3.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gthread_init.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/media-sound/moosic/Manifest b/media-sound/moosic/Manifest
new file mode 100644
index 000000000000..6256136ad769
--- /dev/null
+++ b/media-sound/moosic/Manifest
@@ -0,0 +1,5 @@
+DIST moosic-1.5.6.tar.gz 165916 SHA256 bdb04e7f26b7ff1f5266fe24ed11fb47f3bd5c2723ef0548fcf13bef3219db69 SHA512 06cf060dbcadd793bd045c378d2993636f875a4ccd320258ecbaa36bfd0341870e10f362380006ce3e6a9d9180e272bec6c216947ab80c39f04c7aecb8e80da3 WHIRLPOOL 06bf94fd030bec44092ec2bd20826e6412c1871039ea473da980d9f50576cb5438b04db446b80d4cb8b65cf6757d923114297852ae4789072ce97317cb023805
+EBUILD moosic-1.5.6-r1.ebuild 881 SHA256 c1a67329cb8fd6a2e4c006dbc230738fe31f5fd435f987364a5f82a02f561fcf SHA512 58aca81c95812bdabc662af7b0bd9ded4f0c84fd6c63bb96ef22c96ec09fb6ae9292b161dda1a9d3ac33faacdb3c82ee6fc3f7ac0d42f60953ed4a0cc830d6ef WHIRLPOOL 864f463b10dedda18ae1c24ae1df221bac978f92941c76d0576eccfbd5d76fcb8290125dc9af5870b882a7eb058903035bf024169b9ce9c7a37d67e67f6ff07d
+MISC ChangeLog 2433 SHA256 da107671fb30f8a450d96819ae4126088810890e3267ce1ea0f5ac929258571d SHA512 29f88102185871bc8d9e642fee69bc1e2708415ff5a4f17fda01433ae4b9acc9cb41ee3a8f5bc79d1638da91e3d5d03d8f287b375e60ea80ed5836c2eb682571 WHIRLPOOL 53888002a99fd19be11434034c158472a13b604b76ef9f9c443b682ed4e4be35d8374593b9f9d1a1161f4b44141f3787161ca58e889c5a5894b9474ae2919e54
+MISC ChangeLog-2015 3505 SHA256 31130307839bd8caf97af77fbcc8942cfe56a691e69799bdc7ccd55aaa521e7a SHA512 6a6032f2073bcae954b1a75b9aa29ef0e2c21337a63eead4ad8fe6c533538be99934b2e57b5c4a9c6388e0168e3f9baf47e436c5757824f37fbe9bd740f796e6 WHIRLPOOL e51303227265e705d886c6c7615043caa07a6977429b300d9cb25d8849b7ef34a92e64698f17a981ff266c61e602bed15351dca9975154c0802037aac537dec2
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/moosic/metadata.xml b/media-sound/moosic/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/moosic/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/moosic/moosic-1.5.6-r1.ebuild b/media-sound/moosic/moosic-1.5.6-r1.ebuild
new file mode 100644
index 000000000000..854d843be91c
--- /dev/null
+++ b/media-sound/moosic/moosic-1.5.6-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Music player that focuses on easy playlist management"
+HOMEPAGE="http://www.nanoo.org/~daniel/moosic"
+SRC_URI="http://www.nanoo.org/~daniel/${PN}/${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i -e 's:distutils.core:setuptools:' setup.py || die "sed failed"
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/*.html )
+
+	distutils-r1_python_install_all
+
+	rm -rf "${D}"/usr/share/doc/${PN}
+	newbashcomp examples/completion ${PN}
+	dodoc doc/{Moosic_API.txt,moosic_hackers.txt,Todo}
+	dodoc examples/server_config
+}
diff --git a/media-sound/mp32ogg/Manifest b/media-sound/mp32ogg/Manifest
new file mode 100644
index 000000000000..c5d687243412
--- /dev/null
+++ b/media-sound/mp32ogg/Manifest
@@ -0,0 +1,9 @@
+AUX mp32ogg-0.11-r4-mpg321.patch 781 SHA256 44a427512c0eb67dae0a6c4e36f11b86308938a302a0757d7e6e9d095033801b SHA512 d4c93206c424358859dfd0e5474e8b9990458c239ab2f4b3fdf873c5808bdd278fb05355bd7e6c50b8ae40be26ff65b90efa83e19a18df8e84c0de7181fbb8fd WHIRLPOOL 98d226e7009647ed65250a621aa673c34962672beb2d7b3b139252a087772f507a979b39656ac9f67f3a7e094cd6b6deeab63dde08f3abbacdf68ae8c5bdca31
+AUX mp32ogg-0.11-r4-quality.patch 2749 SHA256 2370a356974dfdbf2f11be99cc417be574f6b86a2bc1bc605f2b25bc82c9c4ea SHA512 70ff58791c8704eb78016364f86669576c7101c4d4d34cd0a46e2c3abfaadffc817ae40f1192cc1b295a131d72da72cb1eedfff4032798b033b3e0ad656b0c44 WHIRLPOOL d79200660e3a6f7e578f6fc835a50bfb699db9f48b04c56fd35dce1e7761af37e6c6e0deb6c8c1027c33f715de39b08318d1671ef1eb23532a5124cb9206b6f1
+AUX mp32ogg-0.11-r5-german_umlaut.patch 1858 SHA256 741e9bc34c193dfdb561e2f905cec282da84590c99ff262f04e440e48f6d3dc2 SHA512 aef750075b8af19c1a88c0c78bf55653f91af815aa3ff723a6bb3a2961996f1ff65f29cc5d2f7027371a2b91e5dce6088a6c8582f5dafd8b6346ba129e770b8d WHIRLPOOL f6a4f5f275dcc2077d129fefbc03a1f9a5d2bea30d1a0dd5874727b0916efc4eab1332a1e3ea9b9e0513c92860cb53fc10cc086bb4c08a1581f4bf6af7733148
+AUX mp32ogg-0.11-r6-force-filename-stringification.patch 370 SHA256 5a50042db60277e3eb20dd7ea6b3ae356e994f464f02b58ef6cbc0f2e96ac63c SHA512 494d44a6265422270cad2cb81f99809760f1816584b6657e4e9c0d3a500ad6ee9d989277815ecaab613ee03a9d6571b7db06bca6430dcad208015ebbc27f6303 WHIRLPOOL e0c177b07aec03b048d666bf76d643704c824ad52ddaf3ed26b714513b019f7ee847082b19dd9a102072e7f0c5e5d75cccee98e250455fb1f1bfb8ff7bd160d4
+DIST mp32ogg 9216 SHA256 66d6276944e54e1ba15a4fc29b098baa9d1e5fcd29c57f1d77cd16c87ca302ce SHA512 342c3e0430d203fed8f793fb14fa532210cac616a0f48d243c9a14477d048bf9da3dbab5712cdf24cff2d98c6a5bc1edb43080f4ee05672fcf8f3e07fa667bd1 WHIRLPOOL 897e01749efa66ab666aa8796598df13abc4df33c947e0b82ac2c3d44103dbc9514a492cfc54f52d17cfa8a993aa3126a569fd402e475b4a24a051b162c4de77
+EBUILD mp32ogg-0.11-r6.ebuild 802 SHA256 29669925999b9a6ae633fe2defe6fca7ff3ceb3df4d15ee3aecbfa131a09b895 SHA512 2c88ab384fd4ebc4d6b4f625c4f80fe3876953d859dd748f23eb2da0d3503974ce757a866f5c13cc056b745730a8590edd2733e693e256d505d2fb25d4e0d749 WHIRLPOOL a08389f40580d6c30e2f0f69766c34a58a297f0172d7173cda696d0a429a8710302ddf765b4c96414edc4876bd584f2733d1b46aa8b127d9aa6c23f83f7cb056
+MISC ChangeLog 2620 SHA256 22652461c6baa9b26f0c8d3ff20bfb7f6fe28b22173c964a7e2611f21b7ceb64 SHA512 1237de4b7c4569077bb563ae407441ecc998a0901ea8918bb1ecf7ce100387d8707775328a53e8195c5a55616badd1721c9e8a5e81e41db24a6063dd9d0e8ea3 WHIRLPOOL b71a3efe43162bf6ebc5d23234c2d55d47d9f1cd2dcb8cb9b0a2232dd0c53c84e2c84152150e6092cfd22d22de828b4b5afdc9318def14c957ff8c1abe8ba8dc
+MISC ChangeLog-2015 3281 SHA256 fd40a45493575d65639ab818a685e0c315e96d7cde38aadc22b757c30eb11328 SHA512 ec659b07738cb636842865f550920cb1f8aeda902c1423f2ba8a92ac9795ea67cbe14e71d88865b1ef1bdfa66741132e76861f17e3f64ec1ed81078be3362eab WHIRLPOOL 2ad5a68ed710b822f0ade03af2b73eb6c9a104b618ccefb843673fd91f967310eae9c8395743b5b55108893b75e240bf7d7f768b0e940c7c9a64da86803213f8
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
new file mode 100644
index 000000000000..b617584f94de
--- /dev/null
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-mpg321.patch
@@ -0,0 +1,32 @@
+--- mp32ogg.orig	2004-02-03 01:09:20.000000000 -0800
++++ mp32ogg	2004-02-03 01:25:01.000000000 -0800
+@@ -6,6 +6,9 @@
+ # <http://www.opensource.org/licenses/artistic-license.html>
+ 
+ # ChangeLog
++# 0.11-gentoo
++#     * Jeremy Huddleston <eradicator@gentoo.org>:
++#       Added support for mpg321
+ #
+ # 0.11
+ #     * Have output reflect change in license (doh)
+@@ -79,7 +82,7 @@
+ # 0.1
+ #     First Release
+ 
+-$version = "v0.11";
++$version = "v0.11-gentoo";
+ 
+ use MP3::Info;
+ use File::Find ();
+@@ -93,6 +96,10 @@
+ $ogginfo = "/usr/bin/ogginfo";
+ $mpg123  = "/usr/bin/mpg123";
+ 
++if(! -x $mpg123) {
++	$mpg123 = "/usr/bin/mpg321";
++}
++
+ print "mp32ogg $version\n";
+ print "(c) 2000-2002 Nathan Walp\n";
+ print "Released without warranty under the terms of the Artistic License\n\n";
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
new file mode 100644
index 000000000000..38fad9bc9abc
--- /dev/null
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r4-quality.patch
@@ -0,0 +1,98 @@
+--- mp32ogg.orig	2005-01-01 15:32:32.138906448 +0000
++++ mp32ogg	2005-01-01 15:52:33.061338488 +0000
+@@ -9,6 +9,8 @@
+ # 0.11-gentoo
+ #     * Jeremy Huddleston <eradicator@gentoo.org>:
+ #       Added support for mpg321
++#     * --quality option support (from Debian 0.11-r3 release)
++#     * Non-zero exit code on failure (from Debian 0.11-r3 release)
+ #
+ # 0.11
+ #     * Have output reflect change in license (doh)
+@@ -104,8 +106,10 @@
+ print "(c) 2000-2002 Nathan Walp\n";
+ print "Released without warranty under the terms of the Artistic License\n\n";
+ 
++my $userquality=-2.0;
+ 
+ GetOptions("help|?",\&showhelp,
++		"quality=f" => \$userquality,
+ 		"delete", 
+ 		"rename=s", 
+ 		"lowercase",
+@@ -116,6 +120,8 @@
+ sub showhelp() {
+ 	print "Usage: $0 [options] dir1 dir2 file1 file2 ...\n\n";
+ 	print "Options:\n";
++	print "--quality=[-1..10]       Set Ogg/Vorbis quality level\n";
++	print "                         Defaults to bitrate of original .mp3\n";
+ 	print "--delete                 Delete files after converting\n";
+ 	print "--rename=format          Instead of simply replacing the .mp3 with\n";
+ 	print "                         .ogg for the output file, produce output \n";
+@@ -174,20 +180,26 @@
+ 	}
+ 
+ 	$mp3bitrate = $fileinfo->{BITRATE};
+-	if($mp3bitrate ne "") {
+-	   if($mp3bitrate > 256) {
+-	      $quality = 8;
+-	   } elsif($mp3bitrate > 192) {
+-	      $quality = 7;
+-	   } elsif($mp3bitrate > 128) {
+-	      $quality = 6;
+-	   } else {
+-	      $quality = 5;
+-	   }
++	if (($userquality < -1) || ($userquality > 10)) {
++	    # Set quality adjacent to mp3 bitrate
++	    if($mp3bitrate ne "") {
++		if($mp3bitrate > 256) {
++		    $quality = 8;
++		} elsif($mp3bitrate > 192) {
++		    $quality = 7;
++		} elsif($mp3bitrate > 128) {
++		    $quality = 6;
++		} else {
++		    $quality = 5;
++		}
++	    }
+ 	} else {
+ 	   $quality = 5;
+ 	   print "MP3::Info didn't report the bitrate... weird. Corrupt MP3 file? Bug?\n";
++	   # User defined quality
++	   $quality = $userquality;
+ 	}
++
+ 	if($filename eq "" ||
+ 		((/\%a/) && $info->{ARTIST} eq "") ||
+ 		((/\%t/) && $info->{TITLE} eq "") ||
+@@ -276,19 +288,19 @@
+ 	      {
+ 		 warn "Conversion failed ($oggoutputfile truncated).\n";
+ 		 close CHECK;
+-		 return;
++		 exit 1;
+ 	      }
+ 	      elsif($_ eq "header_integrity=fail\n")
+ 	      {
+ 		 warn "Conversion failed ($oggoutputfile header integrity check failed).\n";
+ 		 close CHECK;
+-		 return;
++		 exit 1;
+ 	      }
+ 	      elsif($_ eq "stream_integrity=fail\n")
+ 	      {
+ 		 warn "Conversion failed ($oggoutputfile header integrity check failed).\n";
+ 		 close CHECK;
+-		 return;
++		 exit 1;
+ 	      }
+ 	   }
+ 	   close CHECK;
+@@ -300,5 +312,6 @@
+ 	}
+ 	else {
+ 	   warn "Conversion failed ($oggenc returned $result).\n";
++	   exit 1
+ 	}
+ }
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
new file mode 100644
index 000000000000..20361f1b9835
--- /dev/null
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r5-german_umlaut.patch
@@ -0,0 +1,66 @@
+--- mp32ogg_old	2008-01-29 10:45:06.000000000 +0100
++++ mp32ogg	2008-01-29 10:44:34.000000000 +0100
+@@ -6,6 +6,10 @@
+ # <http://www.opensource.org/licenses/artistic-license.html>
+ 
+ # ChangeLog
++# 0.11-gentoo-r2
++#     * Mathias Hablützel <mhk@mathiashabluetzel.ch>:
++#       Support for german umlaut
++#
+ # 0.11-gentoo
+ #     * Jeremy Huddleston <eradicator@gentoo.org>:
+ #       Added support for mpg321
+@@ -82,13 +86,18 @@
+ # 0.1
+ #     First Release
+ 
+-$version = "v0.11-gentoo";
++$version = "v0.11-gentoo-r2";
+ 
+ use MP3::Info;
+ use File::Find ();
+ use File::Basename;
+ use Getopt::Long;
+ use String::ShellQuote;
++use Encode;
++use POSIX qw/setlocale LC_CTYPE/;
++use I18N::Langinfo qw/langinfo CODESET/;
++
++setlocale(LC_CTYPE, '');
+ 
+ use_winamp_genres();
+ 
+@@ -111,6 +120,7 @@
+ 		"lowercase",
+ 		"no-replace",
+ 		"verbose",
++              "preserve-timestamp",
+ 		"<>", \&checkfile);
+ 
+ sub showhelp() {
+@@ -123,7 +133,7 @@
+ 	print "                         and %l with artist, title, and album name\n";
+ 	print "                         for the track\n";
+ 	print "--lowercase              Force lowercase filenames when using --rename\n";
+-	print "--verbose		Verbose output\n";
++	print "--verbose                Verbose output\n";
+ 	print "--help                   Display this help message\n";
+ 	exit;
+ 
+@@ -160,6 +170,15 @@
+ 
+ 	$info = get_mp3tag($mp3file);
+ 	$fileinfo = get_mp3info($mp3file);
++	# Sanity checking: Is this file really an MP3 file?
++	die "Could not determine MP3 version, aborting" if ($fileinfo->{VERSION}=="");
++
++        # get_mp3info returns magical Perl UTF-8 strings, but this script
++        # really wants to deal with plain old sequences-of-octets, so encode
++        # those strings.
++        for $key (keys %$info) {
++            $info->{$key} = encode(langinfo(CODESET), $info->{$key});
++        }
+ 
+ 	$_ = $filename;
+ 
diff --git a/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch b/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
new file mode 100644
index 000000000000..65f7a83454fa
--- /dev/null
+++ b/media-sound/mp32ogg/files/mp32ogg-0.11-r6-force-filename-stringification.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/328953
+http://qa.mandriva.com/53477
+
+--- mp32ogg
++++ mp32ogg
+@@ -167,7 +167,9 @@
+ }
+ 
+ sub ConvertFile() {
+-	my $mp3file = shift(@_);
++    # force arg stringfication to get actual filename, not getopt::long
++    # callback
++	my $mp3file = "" . shift(@_);
+ 	my $delete = $opt_delete;
+ 	my $filename = $opt_rename;
+ 	my $lowercase = $opt_lowercase;
diff --git a/media-sound/mp32ogg/metadata.xml b/media-sound/mp32ogg/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/mp32ogg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
new file mode 100644
index 000000000000..72c5e39e14aa
--- /dev/null
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="A perl script to convert MP3 files to Ogg Vorbis files"
+HOMEPAGE="http://faceprint.com/code/"
+SRC_URI="ftp://ftp.faceprint.com/pub/software/scripts/mp32ogg"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-sound/mpg123
+	dev-perl/MP3-Info
+	dev-perl/String-ShellQuote
+	media-sound/vorbis-tools"
+DEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp -f "${DISTDIR}"/${PN} "${WORKDIR}" || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-r4-mpg321.patch \
+		"${FILESDIR}"/${P}-r4-quality.patch \
+		"${FILESDIR}"/${P}-r5-german_umlaut.patch \
+		"${FILESDIR}"/${P}-r6-force-filename-stringification.patch
+}
+
+src_install() {
+	dobin mp32ogg || die
+}
diff --git a/media-sound/mp3_check/Manifest b/media-sound/mp3_check/Manifest
new file mode 100644
index 000000000000..969d35e07b0b
--- /dev/null
+++ b/media-sound/mp3_check/Manifest
@@ -0,0 +1,7 @@
+AUX mp3_check-1.98-makefile.patch 605 SHA256 3176916608374310f7eeb11528d89cc02404b0010adecbee669e192fc9f0db93 SHA512 53b1541b6644f32a03fb13c412badc2ecda775d605a3cb6aba6f97ca0d3dfe2fba80fc9e64f544a53ef55382afcc38eeb33dca837a997f3802155f38bdd0a447 WHIRLPOOL 5529c13e8ecf17b29a5ad49741ca2242b95043352e33f0be8394ab1bd0443dbf9d1612fe8329702cd980e094f5a1dc1a3118f6243a21cf81b11fdb33861ea11f
+DIST mp3_check-1.98.tar.gz 83098 SHA256 bd63a63789f808d0632ad9e9b9448b8bf24f258629ec9195663ecce5fe889461 SHA512 65eac5498ea3d4a63e0ab23c769a0baa233ddc863c907e934b691b1e8eb2a68da8a3bd7c6bd1b53d30d06330ab84d615c397753bb30257b0aac404e4b18ea4a3 WHIRLPOOL 4fd849bdd4e32fbc7a1bc024b5db47aba8928a8f609708592ffe4fb61ef5d54c89d319727578535fcdb84b9005a34781473403c30ed12ec9eadcf0ef723d8a24
+EBUILD mp3_check-1.98-r1.ebuild 661 SHA256 504c4741fa2ac5fccbd18607372ec749ad153122a491c702632fddc954e04089 SHA512 7f9cb85c353ad11ebfb3d13fb03703345f66cca04c757e19caf08161713b59132e615158924465da83aaa04c559fc1604d140d5e76918e85cf1f1e28390254bc WHIRLPOOL 32defc1880ab79af32df17fbe500d573eb13b1b70b25ea86d69b8de2759ea8dba98279d333fce36ca385d96d054f9bf2562939e07740499d4e8ce4d7496bda6c
+EBUILD mp3_check-1.98.ebuild 615 SHA256 69d0e8a7b6bc08e65ee9563fdc1bb49cf7806a5378bb0fe904079a89c4db1cca SHA512 e58ffa203884ca0e71d1de02a8ee1c13878290d50e43dec90ee33c5ddecef0eb9973b288db847e60c6d20f7d11e67b667c083d52d055a9045c841cf3e1f63706 WHIRLPOOL aa37b32496c63f535c4fdfe777bd86889b7edc5e3d7c389bcb53a5257d9c2d40673886a88fb3c2bf4a58ac2d39267980c87b25e4b7973beb1893718f789ddb37
+MISC ChangeLog 2585 SHA256 fb07b77501aadf493f7cb650758eb0f458ed471f6e282a732fb75269304f4ec6 SHA512 d552a7a21a6f74d9cb95feae3b2bad51cec462658fdc95edfbddfcc4bfabfb7c93cf817b84cd92ec54f3930982229c32c45cb01bf903b90515927b4fef778b76 WHIRLPOOL f71bba26b840827fa5afc64f45ec1efda3da4b7b46b8da816024f00979f4efa7a0f32466d42d54896c5272c3ba5991ff94b0066477245967586dcea9bd4cff55
+MISC ChangeLog-2015 1389 SHA256 c4251244605ef5a9216b9e38c9bd89b085882aa169183fbb50f5d14f4b95389c SHA512 e6403f9ff760b58ad8a4d3e64f7a562e1cca3e86e468eba361f22a565f61b9335727b3d93bcc203b3391ef524b458596b078ebc6131a855a69b88b65c18ad0f4 WHIRLPOOL ce418ae4226f45eea0167b5905505b2f49e24fe2fa0309fe543c9889cef0cb3eeda1cb6a95dd6ec938fbe1920c9b5d4133cbfda7c1ad4d818bcfe8b193011329
+MISC metadata.xml 393 SHA256 233f7da6ac8768acb1edae2e8f0edf87b4a5a5dc0c9d221b1aa80d8b7e1ebb27 SHA512 1d249854ee7bae0e2b8f6c8de7539cb7a4593c76c35e4e938b578f0b866d8d9ef712fbf0f113a0d5370dfa28dfc760b668769a50f17333cf58bd38d4d66a8b22 WHIRLPOOL 972409cddd49a4b2823ed5651da6ae724f18897664ccf43bad88fd7a54bef32b6526c9df272945015da2bd9832c8cc0497a032221a556a2c02642539e324781c
diff --git a/media-sound/mp3_check/files/mp3_check-1.98-makefile.patch b/media-sound/mp3_check/files/mp3_check-1.98-makefile.patch
new file mode 100644
index 000000000000..906ad468f0fa
--- /dev/null
+++ b/media-sound/mp3_check/files/mp3_check-1.98-makefile.patch
@@ -0,0 +1,23 @@
+Index: mp3_check-1.98/Makefile
+===================================================================
+--- mp3_check-1.98.orig/Makefile
++++ mp3_check-1.98/Makefile
+@@ -2,7 +2,7 @@
+ 
+ CC ?= gcc
+ LOCALBASE ?= /usr/local
+-CFLAGS += -Wall -Werror
++#CFLAGS += -Wall -Werror
+ OPT_FLAGS = -L${LOCALBASE}/lib 
+ OBJS = 	mp3_check.o \
+ 	mp3_check_misc.o
+@@ -16,8 +16,7 @@ norm: 	$(OBJS) 
+ 	$(CC) -g $(CFLAGS) $(OBJS) -o mp3_check
+ 
+ trim: 	$(OBJS)
+-	$(CC) $(CFLAGS) $(OPT_FLAGS) $(OBJS) -o mp3_check
+-	strip mp3_check
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OPT_FLAGS) $(OBJS) -o mp3_check
+ 	cat MILESTONE.INTRO
+ 
+ install: all
diff --git a/media-sound/mp3_check/metadata.xml b/media-sound/mp3_check/metadata.xml
new file mode 100644
index 000000000000..dcd2c2b8c0a9
--- /dev/null
+++ b/media-sound/mp3_check/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://sourceforge.net/p/mp3check/bugs/</bugs-to>
+		<remote-id type="sourceforge">mp3check</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3_check/mp3_check-1.98-r1.ebuild b/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
new file mode 100644
index 000000000000..e8590af4cc96
--- /dev/null
+++ b/media-sound/mp3_check/mp3_check-1.98-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="MP3 consistency checker"
+HOMEPAGE="https://sourceforge.net/projects/mp3check/"
+SRC_URI="mirror://sourceforge/mp3check/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
+DOCS=(
+	"README"
+	"TODO"
+	"MILESTONE"
+	"MILESTONE.INTRO"
+	"GOALS"
+	"FOR_TESTING"
+	"THANKYOU"
+	"NOTES"
+	"MY_NOTES"
+	"WISHLIST"
+)
+
+src_install() {
+	# Use dobin because Makefile doesn't support DESTDIR
+	# https://sourceforge.net/p/mp3check/bugs/8/
+	dobin mp3_check
+	einstalldocs
+}
diff --git a/media-sound/mp3_check/mp3_check-1.98.ebuild b/media-sound/mp3_check/mp3_check-1.98.ebuild
new file mode 100644
index 000000000000..91b33d36c5e0
--- /dev/null
+++ b/media-sound/mp3_check/mp3_check-1.98.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="MP3 consistency checker"
+HOMEPAGE="https://sourceforge.net/projects/mp3check/"
+SRC_URI="mirror://sourceforge/mp3check/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install () {
+	dobin mp3_check || die "dobin failed"
+	dodoc WISHLIST TODO THANKYOU README *NOTES FOR_TESTING GOALS MILESTONE*
+}
diff --git a/media-sound/mp3asm/Manifest b/media-sound/mp3asm/Manifest
new file mode 100644
index 000000000000..ec3ea30b3c76
--- /dev/null
+++ b/media-sound/mp3asm/Manifest
@@ -0,0 +1,5 @@
+DIST mp3asm-0.1.3-1.tar.bz2 46530 SHA256 14d67f040e99eb33369e3f7b136d60eca45c59b946ce58a6af9fb4954a87adc7 SHA512 c22fa3a041940fa7826d3f5ea18dd42807ca9c7d87a56c9ae10cd96606e53d17d8e6259be75a77d1101d6cda033e8b48e2dd2303e91fdca338af19ef3522fb83 WHIRLPOOL 46b2a05d35f793fd44bbc8af0569d82247028f8f927c6224f1e6b493fe29f15ea3620a82d9d13047cd2c378758f5353084ad9d1eed9b6fb2def42b2ad7d402f1
+EBUILD mp3asm-0.1.3-r2.ebuild 684 SHA256 f65298e8fa9396f178025bb1d50f2949be4d1ca6841b089544e4642b8ac6a288 SHA512 12843257920d91bb16c90061f60c28fbf6e848ba979d1bf3a48368559e54304dc848aa2680611cfeb58ea1cfee46bc2f9072610c7ef42bc4a5311da3aa481991 WHIRLPOOL 0b3cd80e8896bd2263ff1eff8c4df94f3af3611f6c998aee974abd06444753db2765b9e5f85d00d4d5a7527b7db4d9342c5da24a5c15545d8f61a2cbbb9e6345
+MISC ChangeLog 2547 SHA256 1c34783f0fffa909c4618f84cd7eec5a5ec315eecd039ce1e043e71298b9a815 SHA512 3b1fbb71cf67a2eedaaaa0589d7111ccdebe16a34ddd74964f351b6ca40fafc01e35878694202422be8b4a5e34246d3d10405415c1fdbd3683df6f0d1ef16e5b WHIRLPOOL 8a11b7eee3f32adfe94df2e4d02d09713988a3dcc7e52346e9eda7165466d39b37701c85db9c6489a594c1046dd884078e89191859bfe89f440c88f67eab7c3f
+MISC ChangeLog-2015 1882 SHA256 ddf9182c85b8d8210a87a513a440db65ab043b8e4a27b4fcc13bb9eeb0f920c3 SHA512 4fa7cd6bf119902abef535e087d2988bd1edadb8a444914ddc4f8665ded27f8e53abca5b3dfacdf42c3d0cc6538c4662d0e4191fda7a83e3a00f5bbd029f02c3 WHIRLPOOL 73f671d23021678bcc58e602913900e34c7f2b406c95306cb89cdca23a94bc2e5733b41fe3535cf471ce12ee6b29f1a8f5b5aad3a1189827131368accf9f749b
+MISC metadata.xml 329 SHA256 7dcf89bf62f01468251d5ae241f8d9c3d4d3c8f85f480b6c574207d875dc134a SHA512 abbfd0fe24ced7e49baded7270f11e905e466e0a0c859001bf09f0b3a1e6501e463a2547577c398d1eeb6b47c1bc91ab73c3c89308963f753d8795a8f58490a7 WHIRLPOOL 8f7210a87a4d3033eb7b76c6343a1c46990953e8fa9c4b18ea8abb882f0fe92fa86fd214394baddead95d6dc3233fedda7bf0540bdafc980d83d89b8fbb61026
diff --git a/media-sound/mp3asm/metadata.xml b/media-sound/mp3asm/metadata.xml
new file mode 100644
index 000000000000..572aedf45610
--- /dev/null
+++ b/media-sound/mp3asm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mp3asm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
new file mode 100644
index 000000000000..8548f778919c
--- /dev/null
+++ b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+MY_PV="${PV}-1"  # Patchlevel
+
+DESCRIPTION="A command line tool to clean and edit mp3 files"
+HOMEPAGE="https://sourceforge.net/projects/mp3asm/"
+SRC_URI="mirror://sourceforge/mp3asm/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND=""
+
+# the author uses weird numbering...
+S="${WORKDIR}/mp3asm-0.1"
+
+src_compile() {
+	econf || die "econf failed"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin src/mp3asm || die "install failed"
+	dodoc Changelog README
+}
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
new file mode 100644
index 000000000000..7706dfc4d252
--- /dev/null
+++ b/media-sound/mp3blaster/Manifest
@@ -0,0 +1,11 @@
+AUX mp3blaster-3.2.5-fix-build-system.patch 2785 SHA256 b8318c80c4d54e838dc4aba1116d1cc31514f54dd2e6a48262df0fc696d6b41a SHA512 307796e8967b942f1b8133c271eb2a4a24ac9ce3ef2d3ed144197d615ba801198b4af115439f4306c5b84c5c3b7b4025475ed1dbae992d2731f646636ce8df8f WHIRLPOOL dd059aad6df1da82d8bd3dd82d906ec42c34613703941a9278c02cff61ba2a8fbdad94b8d8eaac46b674b1deca54ef6a9261cbb4b7ef1d5ae05bf8614956e22e
+AUX mp3blaster-3.2.5-fix-c++14.patch 1206 SHA256 27e6a194539c25ce5f41e9cfa4bb07cafc059fe6610de576ebcb75c4ce4c743d SHA512 cf0fe93ad0e6a75a58a855aae87222de923709a775552138ad95754ced9812a62c3a1cdc4d7091e1b727c0425cec40d223a9533ad4a735efed24d5a62db4e8e4 WHIRLPOOL 7ae4faa050aca0eb619cb5e3233c7506ba08fa570c5627b8cf82bc77f53e8100c2bf3d474e978fb7cd221b935b03e0383793c8d5f95448822a651c393953b4c1
+DIST mp3blaster-3.2.5.tar.gz 329407 SHA256 129115742c77362cc3508eb7782702cfb44af2463a5453e8d19ea68abccedc29 SHA512 53f623340b7a8e4be6cd973474fd5f23c623b6d1c667478dc0d4c7a1ef5758f4bbc09d9d0698d1539d8d1c3ef45301b447f3ed74f68586070a07a7f9fa8c353e WHIRLPOOL 96cdc3b6436dec282a5836c00e2151dd04f218175fdd2451fcfd45f70bced05dea0c8915cf1a817d24a9961fc8ab3d9c5b568a5ae67e23e2b1915604b2d7806e
+DIST mp3blaster-3.2.6.tar.gz 354019 SHA256 43d9f656367d16aaac163f93dc323e9843c3dd565401567edef3e1e72b9e1ee0 SHA512 eb977eb46b86449c6d433b1740aa08580e5b8f3d55d82d6f2623cd5fd103d73b7df127fb9ac650a21da61ad4948eb569a812e15d9adc9424d491fa625e198e0d WHIRLPOOL d617d9cf9dccd01cda71f31806ad9b5f4a02d94df29befb3d37408e9831c8883c8501050d453f242fe27066b6af47d0fb68242070217f781ca03cb19b3afbe2a
+DIST mp3blaster_3.2.5-3.debian.tar.gz 11000 SHA256 e4d424aeccde6ccd219270f4e4f0bf8f70b97e13075447b6d6d069110ed092c9 SHA512 1d899c85c2a2e1326fac0f87c61ead82273a08c672aeab0929479d9aa10c6ae703bb63c1a6aec14c8f5b6a139089fa5228cf09db72ea5b114efb60a196bd4788 WHIRLPOOL 9c1c99d5a4f4e5060a9eae4e681f0df841d6932f34a12102a82d2e1f795d4db41fd3f15d6aa6a34d04d42259d73ba67f775b24a51df30779d4f4466ded40f69f
+EBUILD mp3blaster-3.2.5-r1.ebuild 1637 SHA256 ef44b4b9dd428cc53e9f97456d3b30fe4048b300a07b3275b879bb72451c21ac SHA512 70a0f736b34b33819ae3a28b8e17dd7445c6b3a8ba0b05f35880d10d34d9649e4bfd664079022b0af0ee4eba3c1ca9a2ea1107931936506b3b16f68120a2113a WHIRLPOOL a7dc77f1f5ac46d12acebde2b62c857799c85f1aac98f49e49d984b09e17c0b0e4936a0025b14da7585597b0273292890cbb174aaee5437be8de056fec456bc8
+EBUILD mp3blaster-3.2.5-r2.ebuild 1643 SHA256 a62615c04e0ce4381be324e1bcf812c13d42dabb7f3fe85ae4ab8fce899f2745 SHA512 52587b78745e4253c6d43a42238dfcab79c0807dde7feab13ea3cb01900b07213dbd6eef020aa35de891db05381afd9c64abeba3954bdad0845496ea24628471 WHIRLPOOL 1e599d300365ee9011fd46bbf0fc3ac9df9449bae645bca0c6d924433d51657fc5c465a915552672ff32d4b84030efd1cf79f736f1fde229da0e65e4f580fc1f
+EBUILD mp3blaster-3.2.6.ebuild 1571 SHA256 a9fc5dfe6fa0eaed802d9d7c310539792e40873858051fb3c04f4ef6a546ec3d SHA512 1dc8938a83d81f41916e625fd3842935b8db68ae8961e5db42b33e92adde571d3b845313c578338486c9bb6b1bf2354f060580b24fc690fca098e90eb6c8b615 WHIRLPOOL 5d0157edaa30bb7fe6cb134ec1f1c1b0ee7569f75f10e21769d269b2fd24478a2b9b72393ad4939e460964b9d822885367b59086da915db02d5e889c7bc2844a
+MISC ChangeLog 2665 SHA256 74403c3822735e7a0a2ca825f1395423e3b2c886a7c0ad40a42ecaa90eda7975 SHA512 b48a91ee8781e052c9f406e3ddfab14a4a11cd80a1db99670ae2c03d394bccfd9c7b7204f382b8e52a7cb95dbd6578ee723bc668616be16ceac581b8b269f31d WHIRLPOOL 9db8f4d90e0254be27ee84dc372c250961f94d73ce605ce2fc8dfe80568e7f9efedfe604b7a6ff73eaa5591cc32ce4ff0e49b3856492143f04ec00f53bff5797
+MISC ChangeLog-2015 8308 SHA256 e3a3ad043d654e2c03a08cd5454c4fa6dc183a2aceaeb4e93de4b4c88e20b4dc SHA512 5623907d9824e694eeaaf2910c0f3c837745f53b2f751573978ae0d2aa33d32eb320a616c4f9166f35cb64ed44f8c231f74be51986d14d8effe2c98ccf3486cc WHIRLPOOL 0b5c91f15838d06a565e26d57a3923962c67fbfd2989814f6120ec98230f03c97b71ffe296df2cfe12b8fceb426687aca3707f922ab640c94b30d06d36097e79
+MISC metadata.xml 432 SHA256 694e6b73b6c12ad1b7c2a5069a43b7c0f393d3b099ca89fca181a3bd44850846 SHA512 e59462dc17d0e050f0876eb74334ddb5c980900a8b4268c281f92e30545a7cf7a3589dc1961640cba9a01d3ce01ec210904dd7033e42d9b3d237740f6820f375 WHIRLPOOL f968017b9a88a08d1dcce5e049814cfd6331d9f885f21f3d248f862592e9cce664b646871ae8ee161997880f0a09c1f6bf94a3dde747fdb0cf1b69cc25411784
diff --git a/media-sound/mp3blaster/files/mp3blaster-3.2.5-fix-build-system.patch b/media-sound/mp3blaster/files/mp3blaster-3.2.5-fix-build-system.patch
new file mode 100644
index 000000000000..6e6b86fcf04c
--- /dev/null
+++ b/media-sound/mp3blaster/files/mp3blaster-3.2.5-fix-build-system.patch
@@ -0,0 +1,94 @@
+Fix broken handling of ncurses by relying on pkg-config
+instead of broken detection.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=559210
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,7 @@
+ 	CXXFLAGS="-O2 -Wall -W -fno-strength-reduce"
+ fi
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+@@ -17,6 +17,7 @@
+ AC_PROG_LN_S
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+@@ -26,7 +27,7 @@
+ AC_PROG_GCC_TRADITIONAL
+ AC_CHECK_FUNCS(strdup strstr)
+ 
+-AC_LANG_CPLUSPLUS
++AC_PROG_CXX
+ 
+ #For FreeBSD, look in /usr/local/(lib,include) first, since ncurses4
+ #must be installed as an add-on on these systems in /usr/local
+@@ -233,55 +234,12 @@
+ REQ_CURSES=1
+ 
+ if test "$WANT_CURSES" = "1" ; then
+-	AC_CHECK_LIB(curses,main,HAVE_LIBCURSES=1)
+-	AC_CHECK_LIB(ncurses,main,HAVE_LIBNCURSES=1)
+-	AC_CHECK_HEADER(curses.h,HAVE_CURSES_H=1,HAVE_CURSES_H=0)
+-	AC_CHECK_HEADER(ncurses/ncurses.h,HAVE_NCURSES_NCURSES_H=1)
+-	AC_CHECK_HEADER(ncurses/curses.h,HAVE_NCURSES_CURSES_H=1)
+-	AC_CHECK_HEADER(ncurses.h,HAVE_NCURSES_H=1)
+-
+-	if test "$FORCECURSES" = "1" ; then
+-		if test "$HAVE_LIBCURSES" = 0 -o "$HAVE_CURSES_H" = 0; then
+-			AC_MSG_ERROR([you forced using curses instead of ncurses, but lib/include cannot be found])
+-		fi
+-		AC_DEFINE_UNQUOTED(NCURSES_HEADER, [<curses.h>],
+-			[Which headerfile to include for ncurses support])
+-		NCURSES_LIBS="-lcurses"
+-		AC_SUBST(NCURSES_LIBS)
+-	else
+-		HAVE_CURSES="yes"
+-		if test "$HAVE_LIBNCURSES" = 1 ; then
+-			NCURSES_LIBS="-lncurses"
+-		elif test "$HAVE_LIBCURSES" = 1 ; then
+-			NCURSES_LIBS="-lcurses"
+-		else
+-			HAVE_CURSES="no"
+-		fi
+-
+-		#header(s) found?
+-		HAVE_CURSES_HEADER=1
+-		if test "$HAVE_NCURSES_NCURSES_H" = "1" ; then
+-			NCURSES_HEADER="<ncurses/ncurses.h>"
+-		elif test "$HAVE_NCURSES_CURSES_H" = "1" ; then
+-			NCURSES_HEADER="<ncurses/curses.h>"
+-		elif test "$HAVE_NCURSES_H" = "1" ; then
+-			NCURSES_HEADER="<ncurses.h>"
+-		elif test "$HAVE_CURSES_H" = "1" ; then
+-			NCURSES_HEADER="<curses.h>"
+-		else
+-			HAVE_CURSES_HEADER=0
+-		fi
+-
+-		if test "$HAVE_CURSES_HEADER" = "0" ; then HAVE_CURSES="no" ; fi
+-
+-		if test "$HAVE_CURSES" = "yes" ; then
+-			AC_SUBST(NCURSES_LIBS)
+-			AC_DEFINE_UNQUOTED(NCURSES_HEADER, $NCURSES_HEADER,
+-				[Which headerfile to include for ncurses support])
+-		elif test "$REQ_CURSES" = "1" ; then
+-			AC_MSG_ERROR([could not find (n)curses libs or includes, which are required])
+-		fi
+-	fi #FORCECURSES
++	PKG_CHECK_MODULES([NCURSES], [ncurses])
++	HAVE_CURSES="yes"
++	HAVE_CURSES_HEADER=1
++	NCURSES_HEADER="<ncurses.h>"
++	AC_DEFINE_UNQUOTED(NCURSES_HEADER, $NCURSES_HEADER,
++		[Which headerfile to include for ncurses support])
+ fi
+ 
+ #Sound output devices.
diff --git a/media-sound/mp3blaster/files/mp3blaster-3.2.5-fix-c++14.patch b/media-sound/mp3blaster/files/mp3blaster-3.2.5-fix-c++14.patch
new file mode 100644
index 000000000000..bf732e7b1161
--- /dev/null
+++ b/media-sound/mp3blaster/files/mp3blaster-3.2.5-fix-c++14.patch
@@ -0,0 +1,39 @@
+Fix -Wnarrowing failures in C++14 mode
+See also: https://bugs.gentoo.org/show_bug.cgi?id=600158
+
+--- a/mpegsound/huffmantable.cc
++++ b/mpegsound/huffmantable.cc
+@@ -550,11 +550,11 @@
+ 
+ const HUFFMANCODETABLE Mpegtoraw::ht[HTN]=
+ {
+-  { 0, 0-1, 0-1, 0,  0, htd33},
++  { 0, (unsigned int)0-1, (unsigned int)0-1, 0,  0, htd33},
+   { 1, 2-1, 2-1, 0,  7,htd01},
+   { 2, 3-1, 3-1, 0, 17,htd02},
+   { 3, 3-1, 3-1, 0, 17,htd03},
+-  { 4, 0-1, 0-1, 0,  0, htd33},
++  { 4, (unsigned int)0-1, (unsigned int)0-1, 0,  0, htd33},
+   { 5, 4-1, 4-1, 0, 31,htd05},
+   { 6, 4-1, 4-1, 0, 31,htd06},
+   { 7, 6-1, 6-1, 0, 71,htd07},
+@@ -564,7 +564,7 @@
+   {11, 8-1, 8-1, 0,127,htd11},
+   {12, 8-1, 8-1, 0,127,htd12},
+   {13,16-1,16-1, 0,511,htd13},
+-  {14, 0-1, 0-1, 0,  0, htd33},
++  {14, (unsigned int)0-1, (unsigned int)0-1, 0,  0, htd33},
+   {15,16-1,16-1, 0,511,htd15},
+   {16,16-1,16-1, 1,511,htd16},
+   {17,16-1,16-1, 2,511,htd16},
+--- a/nmixer/nmixer.h
++++ b/nmixer/nmixer.h
+@@ -26,7 +26,7 @@
+ 
+ #define MIXER_DEVICE "/dev/mixer"
+ #define MYMIN(x, y) ((x) < (y) ? (x) : (y))
+-#define MYVERSION "<<NMixer "VERSION">>"
++#define MYVERSION "<<NMixer " VERSION ">>"
+ 
+ #define BOTH_CHANNELS 0x11
+ #define RIGHT_CHANNEL 0x10
diff --git a/media-sound/mp3blaster/metadata.xml b/media-sound/mp3blaster/metadata.xml
new file mode 100644
index 000000000000..f404c281e876
--- /dev/null
+++ b/media-sound/mp3blaster/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">mp3blaster</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..72aa2ae0f695
--- /dev/null
+++ b/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Text console based program for playing audio files"
+HOMEPAGE="http://mp3blaster.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/m/${PN}/${PN}_${PV}-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="lirc oss sdl sid vorbis"
+
+RDEPEND=">=sys-libs/ncurses-5.7-r7
+	lirc? ( app-misc/lirc )
+	sdl? ( media-libs/libsdl )
+	sid? ( =media-libs/libsidplay-1* )
+	vorbis? ( >=media-libs/libvorbis-1 )"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	oss? ( virtual/os-headers )"
+
+REQUIRED_USE="|| ( oss sdl )"
+
+DOCS="AUTHORS BUGS ChangeLog CREDITS FAQ NEWS README TODO"
+
+src_prepare() {
+	EPATCH_SOURCE=${WORKDIR}/debian/patches EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
+	# file collision with media-sound/splay
+	sed -i -e 's:splay.1:splay_mp3blaster.1:' Makefile.in || die
+	mv -vf splay{,_mp3blaster}.1 || die
+}
+
+src_configure() {
+	# libpth and newthreads support are both broken
+	econf \
+		--disable-newthreads \
+		--without-pth \
+		--without-nas \
+		$(use_with lirc) \
+		$(use_with vorbis oggvorbis) \
+		$(use_with sid sidplay) \
+		--without-esd \
+		$(use_with sdl) \
+		$(use_with oss)
+}
+
+src_install() {
+	default
+
+	doman "${WORKDIR}"/debian/manpages/mp3tag.1
+
+	# relocate everything except commands.txt because it's used by src/main.cc
+	mv -vf "${ED}"usr/share/${PN}/{charmap,sample.*} "${ED}"usr/share/doc/${PF} || die
+
+	# file collision with media-sound/splay
+	mv -vf "${ED}"usr/bin/splay{,_mp3blaster} || die
+}
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.5-r2.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.5-r2.ebuild
new file mode 100644
index 000000000000..d4545c71cb49
--- /dev/null
+++ b/media-sound/mp3blaster/mp3blaster-3.2.5-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Text console based program for playing audio files"
+HOMEPAGE="http://mp3blaster.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/m/${PN}/${PN}_${PV}-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="lirc oss +sdl sid vorbis"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	lirc? ( app-misc/lirc )
+	sdl? ( media-libs/libsdl )
+	sid? ( media-libs/libsidplay:1 )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	oss? ( virtual/os-headers )"
+
+REQUIRED_USE="|| ( oss sdl )"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches
+	"${FILESDIR}"/${PN}-3.2.5-fix-c++14.patch
+	"${FILESDIR}"/${PN}-3.2.5-fix-build-system.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# file collision with media-sound/splay
+	sed -i -e 's:splay.1:splay_mp3blaster.1:' Makefile.in || die
+	mv -vf splay{,_mp3blaster}.1 || die
+}
+
+src_configure() {
+	# libpth and newthreads support are both broken
+	econf \
+		--disable-newthreads \
+		--without-pth \
+		--without-nas \
+		$(use_with lirc) \
+		$(use_with vorbis oggvorbis) \
+		$(use_with sid sidplay) \
+		--without-esd \
+		$(use_with sdl) \
+		$(use_with oss)
+}
+
+src_install() {
+	default
+
+	doman "${WORKDIR}"/debian/manpages/mp3tag.1
+
+	# relocate everything except commands.txt because it's used by src/main.cc
+	mv -vf "${ED%/}"/usr/share/{${PN}/{charmap,sample.*},doc/${PF}} || die
+
+	# file collision with media-sound/splay
+	mv -vf "${ED%/}"/usr/bin/splay{,_mp3blaster} || die
+}
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
new file mode 100644
index 000000000000..fcd21a9f975e
--- /dev/null
+++ b/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Text console based program for playing audio files"
+HOMEPAGE="http://www.mp3blaster.org/ http://mp3blaster.sourceforge.net/ https://github.com/stragulus/mp3blaster"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="lirc oss +sdl sid vorbis"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	lirc? ( app-misc/lirc )
+	sdl? ( media-libs/libsdl )
+	sid? ( media-libs/libsidplay:1 )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	oss? ( virtual/os-headers )"
+
+REQUIRED_USE="|| ( oss sdl )"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.5-fix-c++14.patch
+	"${FILESDIR}"/${PN}-3.2.5-fix-build-system.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# file collision with media-sound/splay
+	sed -i -e 's:splay.1:splay_mp3blaster.1:' Makefile.in || die
+	mv -vf splay{,_mp3blaster}.1 || die
+}
+
+src_configure() {
+	# libpth and newthreads support are both broken
+	econf \
+		--disable-newthreads \
+		--without-pth \
+		--without-nas \
+		$(use_with lirc) \
+		$(use_with vorbis oggvorbis) \
+		$(use_with sid sidplay) \
+		--without-esd \
+		$(use_with sdl) \
+		$(use_with oss)
+}
+
+src_install() {
+	default
+
+	# relocate everything except commands.txt because it's used by src/main.cc
+	mv -vf "${ED%/}"/usr/share/{${PN}/{charmap,sample.*},doc/${PF}} || die
+
+	# file collision with media-sound/splay
+	mv -vf "${ED%/}"/usr/bin/splay{,_mp3blaster} || die
+}
diff --git a/media-sound/mp3c/Manifest b/media-sound/mp3c/Manifest
new file mode 100644
index 000000000000..8cbce79514f0
--- /dev/null
+++ b/media-sound/mp3c/Manifest
@@ -0,0 +1,6 @@
+AUX mp3c-buffer.patch 340 SHA256 fb239af488685ec2b7224c7bb1e5d4bd20c782d333649f2e13099dc8259ae44a SHA512 2f109b9307c9ddd8012f7f7e4ac967889e6aba4886f59aca1d785c0c24fbf3231174bb3dce41aa0f362115b98c0c9921f7d87676f467cf75267026bb23cf03c8 WHIRLPOOL 255f6a325ca2c40dc241a011831682a39b7ffe029d3977cf4bd49e710b42707b0778999296951bcfe0afecd1f07e769468a94061cab7e2df109720b88efe18d4
+DIST mp3c-0.31.tar.bz2 351015 SHA256 5a98855ff180e5c3a7805866c04e50204dd2336784b1bc7a24445fa984e878bb SHA512 6c30573c2df86a019c0832b0f0dc83587af5f866ad29b84ac4f57cc61de03708363644d0b3ccc144fce12cb6209357eb1d5dad4e90d70a420f083f0ea4c36c7f WHIRLPOOL 808f30b299b032cc3b5d4bfdc2101913141d5a5cf6771ce5fc52419e5ad295fe707002d97b85ce640e08dd1e8c62c0efdfbeab99eb729755f7ebb837d0504907
+EBUILD mp3c-0.31-r1.ebuild 893 SHA256 4035549a891f904661d9ccb742b848a0ee17944e824cb698cf12a50c8e8c4319 SHA512 b38ba97b01cb5f2c7f1fd2bb2440eae8aa48076854542a89cdd5590fc57ea4c7965222aa048b010385c12bf658a54936f762fbc9662075c6dd1310a220ae9dd9 WHIRLPOOL 54e64a822b474f11c1963dfca74b99b02538e0df35c1313075850837f6a098310712111b01fbc89826dbaf4fed9bf5c241140be5d75c546b61df9660562c6f53
+MISC ChangeLog 2451 SHA256 f3f31b78b7805950fec83e4285e9774afa04f373173851e1a217b64612478caa SHA512 5fd73fc1e3a2c3635e2c54935cd657f74b8ac3b6d9eea5156fb3701c1e202cc2141633aa6cada3e68b94d8207730a02c9720b42c8ed6e7c97ff71b65c4a44ff6 WHIRLPOOL af3705a9f6c626d86f9a04e1ee6dccef00f5c5f9899ec87cc9fabea54f6486ed2fea0b9bafee1739d7dae595463653c25d4041d2f76fb5e4a3bf863423376434
+MISC ChangeLog-2015 2962 SHA256 1a5e88ff6b5a3a7665329883bbce6267ba85ffd7afa5f2d37a8c076e61055395 SHA512 bf916b78ca1f489a03cf62ac3f34e0c27a2675c5c2b9dac2bf7788be76b8f26f0c5ee698424e2b2157a96f0b591134ccebf2011d2ddf8ad657a9fb71b881e8e6 WHIRLPOOL 9fcbeb00091f16040cd82fdcdcc10b3701bda38490d27391b146cbdb39b8b0d3139277a5de0ae0fe5763914a125cdd2b4d4dded4df1e3c89dc2b44ba0e59565f
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/mp3c/files/mp3c-buffer.patch b/media-sound/mp3c/files/mp3c-buffer.patch
new file mode 100644
index 000000000000..8dc79c84b1de
--- /dev/null
+++ b/media-sound/mp3c/files/mp3c-buffer.patch
@@ -0,0 +1,11 @@
+--- mp3c-0.31/src/options.c.old	2006-11-10 08:24:15.000000000 +0100
++++ mp3c-0.31/src/options.c	2006-11-10 08:24:27.000000000 +0100
+@@ -1117,7 +1117,7 @@
+   field_select_typ *new, *anchor;
+   song_typ song_chg_fields, *song_curr;
+   char *pointer;
+-  char mini_str[35];
++  char mini_str[200];
+   int i;
+   BOOL use_old;
+   BOOL loaded_def;
diff --git a/media-sound/mp3c/metadata.xml b/media-sound/mp3c/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/mp3c/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/mp3c/mp3c-0.31-r1.ebuild b/media-sound/mp3c/mp3c-0.31-r1.ebuild
new file mode 100644
index 000000000000..67ebc8281acc
--- /dev/null
+++ b/media-sound/mp3c/mp3c-0.31-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+IUSE="mp3 vorbis"
+
+DESCRIPTION="console based mp3 ripper, with cddb support"
+HOMEPAGE="http://wspse.de/WSPse/Linux-MP3c.php3"
+SRC_URI="ftp://ftp.wspse.de/pub/linux/wspse/${P}.tar.bz2"
+
+RDEPEND="mp3? ( media-sound/lame
+	>=media-sound/mp3info-0.8.4-r1 )
+	virtual/cdrtools
+	vorbis? ( media-sound/vorbis-tools )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc x86"
+
+LANGS="de es it pl pt"
+
+for X in ${LANGS}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-buffer.patch"
+}
+
+src_compile() {
+	econf $(use_enable vorbis oggdefaults) || die "econf failed !"
+	emake || die "emake failed!"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS *README BUGS CDDB_HOWTO ChangeLog FAQ NEWS OTHERS TODO
+}
diff --git a/media-sound/mp3cat/Manifest b/media-sound/mp3cat/Manifest
new file mode 100644
index 000000000000..4c3650af4fdd
--- /dev/null
+++ b/media-sound/mp3cat/Manifest
@@ -0,0 +1,5 @@
+DIST mp3cat-0.4.tar.gz 14956 SHA256 fd2b0d58018f5117bd1e22298c899bef5e6af61a0c540186d16d2bf516d6849a SHA512 a72bbbd296bb07a7e7fc084a494b2676c012cf3a4c71ace7eea52892f6f478769c5b6140fcd8dbfa245d537335a484fd8c5db15edd83a0146821d48e24862492 WHIRLPOOL 578b34557b11eabc94e42f8a78c03ad99866354b1ec2c63bfe635b0475f402a7ea23956e433d911a94dbb0f419e14cb959b6263e74da5396b5fe58fcad51c3fa
+EBUILD mp3cat-0.4.ebuild 584 SHA256 73414c7c8e3f811544ec8506fd2b8b78c3dec067d61d2edaacbf629f6be59ce9 SHA512 2f6709748f503d1038556119f1a21cdec8e2373ae36ceee2eb50f0c74c2aedddb499042eb440e23154cd8c26d570b8883d9e98cef53baeded8e8bc7e46a695cf WHIRLPOOL 5dc987bc35220eea908d741e16b45f41577609fe64c11c000ebe2f4037cba71cc3ba6ed691c933200ee2a5cf35b6d1f30e3647dcbb4b2af0abdf856c36507457
+MISC ChangeLog 2423 SHA256 55c5fb3c5efe891fb1bcd88c19375a196403e4f53a27f1ab10ce23f09bbbc315 SHA512 a2b1a783e71cd72a558bed3e5f2428c4cdc0eb455a9f12650fe82d42c373fcd65dbe532941205c3b24791bfb7f3cadb08e4faf0637b48756c4641b02f08fd32e WHIRLPOOL f1bda73d50dc57c6cf1bd4b59886cfe99c0d167e4ed22dabea4b28114d2280c26231b992190be0a99feb8b3999d4b1ce60f0a44986a9107d944c661a2f116fab
+MISC ChangeLog-2015 961 SHA256 9262671da81b185afa192077a697f2fa36e086ce9b14bc276fcc9335f0759479 SHA512 8bbd011ea5faff5104b5681c29dee49f2f8677c4bb0e29f99518ed8058882dbc5b96395fcbb0e4df57667772b6ad14ba87b11295926ad64f09ffebfb0e10d54a WHIRLPOOL e0091ca1f4a4b2f39cc1173862141988d92cd31b15f64e49838319430cdd62bb0fa135571ac76befded28891a9e778d272375212183147d5dba63706d125ca01
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/mp3cat/metadata.xml b/media-sound/mp3cat/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/mp3cat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/mp3cat/mp3cat-0.4.ebuild b/media-sound/mp3cat/mp3cat-0.4.ebuild
new file mode 100644
index 000000000000..fb9d33d02c97
--- /dev/null
+++ b/media-sound/mp3cat/mp3cat-0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="mp3cat reads and writes MP3 files"
+HOMEPAGE="http://tomclegg.net/mp3cat"
+SRC_URI="http://tomclegg.net/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+src_prepare() {
+	sed -i -e 's:cc -o:${CC} ${CFLAGS} ${LDFLAGS} -o:' \
+		Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin mp3cat mp3log mp3log-conf mp3dirclean mp3http mp3stream-conf
+}
diff --git a/media-sound/mp3check/Manifest b/media-sound/mp3check/Manifest
new file mode 100644
index 000000000000..5b95a53a08b4
--- /dev/null
+++ b/media-sound/mp3check/Manifest
@@ -0,0 +1,7 @@
+DIST mp3check-0.8.4.tgz 71396 SHA256 952f271aab86adf89e2391503bf46a6ddbd838b7bd1ea19756d004f143dbfaa9 SHA512 383633e673ae124a7beccb4dc9fd4caeaedbddd7939284a7737f1d0f230424b24f1a967ad1d380800d4345e7bbf6f7796cdd9a9816251180e25723a2e24903b5 WHIRLPOOL 57a3f5507ec67abbc316527169d9ef133c31c60bc957dd48fa2c1cf4e53582c03c31ec6d09fbb14686355244c1e3145c87942d49220273e5c1e25df1d9456b1b
+DIST mp3check-0.8.7.tgz 71629 SHA256 27d976ad8495671e9b9ce3c02e70cb834d962b6fdf1a7d437bb0e85454acdd0e SHA512 5b5c9bde0cc7fd9dc02de53e4ccc3e403001547c06121be57f8f693b9224302d24f0c84f928b329b0f69c67dd4fb51fa3b60368f57a9446476d8344417bd09fd WHIRLPOOL f3d12ed391fb3a520899f228363b418ceb8e36f7bd9b3609f672baecd174ad04500af788e6c25e31aa7a6c14adcfd5ffcb8662e33cca06c6a5e13801f5d7c08f
+EBUILD mp3check-0.8.4.ebuild 549 SHA256 7a51238edae97965db2c8748c28e13c430d0a478f3e647862276a1a3b3ddbfb3 SHA512 e208519149247b01b282fcbca17475315d3ae491fd075bb0988630db24b090f0abdf452bce4417f0c0774e2368118ffcfc3e403ac30df9fedcc65a822cff7ac2 WHIRLPOOL e3d4b639302053d470849dd053918091994cc22971689fb1c8c2302d5c76a93446db0ce0c926559e2b3e8970c29943e9cf6b741057a54a1cd14ca62fa7291667
+EBUILD mp3check-0.8.7.ebuild 749 SHA256 4e489e62e99ecf58410d085a1ef46400232d1f0f462425f30723295ee7dded22 SHA512 4948fe0313a7a932fb3716411e09b7a5838d53feff15a1e107ae12efdb4e09dde448518a3ae8e906d609a5e6b75c88b17864b09ffc7c91db16c38df2db684be1 WHIRLPOOL 787af98876d87b044e89c2edb4bd727dd98ad9230dd75c4632da04f6a46949898d91c86ab8f9318c893251733fe269a1afb2c90ea9bae3eea2de3b779b5e4e82
+MISC ChangeLog 2807 SHA256 4408da6ae770dfa49caec38e3104874a944f7447f7c72ff79fe4436e31c314f6 SHA512 81bd97857382998ff89f0a9beb84fde2f74f48dadeb6cd1c19d49af6251190066f2f77fdfc972d26ffceab97a085c151d90e33d8cc5481f82cd5863e904241f1 WHIRLPOOL 83b1e52a26fb7c2b79a591bb53362519c28b0b3904e3a9d599f2b5f1639309e9ddce49e6a489c729c9a7a4d1f9f1522f6449f035d8c715ddc0abb813137ecbf9
+MISC ChangeLog-2015 2847 SHA256 14c941c0bdb00272b556aad8a6286cbfadc625d3fbc654906bb08cbb568b5004 SHA512 180b883d29153b424d71bdd7a1edf250bbc9d3843dfc2346d87da5c8f0591cc80fbe7715862591fb957a26be02c368b7ae2593c9baaf3a1a5c09b9c1b6a8fe55 WHIRLPOOL b9dd80dcee9dd4095ee9492cae1bc91d7f283f5a6946ffc69f52a6591d96098742af1cc1c4020eb186ffde6c6cb2e75c4d8d0d7cad46789f0da59f5ee40a799f
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/mp3check/metadata.xml b/media-sound/mp3check/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/mp3check/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/mp3check/mp3check-0.8.4.ebuild b/media-sound/mp3check/mp3check-0.8.4.ebuild
new file mode 100644
index 000000000000..98d0ca55455c
--- /dev/null
+++ b/media-sound/mp3check/mp3check-0.8.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit toolchain-funcs
+
+DESCRIPTION="Checks mp3 files for consistency and prints several errors and warnings"
+HOMEPAGE="http://jo.ath.cx/soft/mp3check/index.html"
+SRC_URI="http://jo.ath.cx/soft/mp3check/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+src_prepare() {
+	sed -i -e "/^WARN/s/-g//" Makefile || die
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" OPT="${CXXFLAGS}"
+}
+
+src_install() {
+	dobin mp3check
+}
diff --git a/media-sound/mp3check/mp3check-0.8.7.ebuild b/media-sound/mp3check/mp3check-0.8.7.ebuild
new file mode 100644
index 000000000000..ee78058978c7
--- /dev/null
+++ b/media-sound/mp3check/mp3check-0.8.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Checks mp3 files for consistency and prints several errors and warnings"
+HOMEPAGE="https://code.google.com/p/mp3check/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+src_prepare() {
+	sed -i -e '/^WARN/s:-g::' Makefile || die
+}
+
+src_configure() {
+	# tfiletools.h:59:50: warning: dereferencing type-punned pointer will break
+	# strict-aliasing rules [-Wstrict-aliasing]
+	append-cxxflags -fno-strict-aliasing
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" OPT="${CXXFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman *.1
+}
diff --git a/media-sound/mp3diags/Manifest b/media-sound/mp3diags/Manifest
new file mode 100644
index 000000000000..d86860a20071
--- /dev/null
+++ b/media-sound/mp3diags/Manifest
@@ -0,0 +1,5 @@
+DIST MP3Diags-1.2.03.tar.gz 1230173 SHA256 8dce26781123150eb920acd1a1217601c55c8366f72b4cccd62bba53c3a73f53 SHA512 0f7a5d300a3366a2b5ed3da78e1b1bf892618e19e6ea0de444cffea0926d8370f8309fae4fececcea4bf494b1b4b51ec6c382dbb7e46d8286c7580da18675fcf WHIRLPOOL ff010e2db7259b399f62d98a67d78fc073a5117da345160cd1f25a7cca607d52498445bcad7bfe98f66228e2da071a34df213665ebaf6e0894d1f0436ce3e405
+EBUILD mp3diags-1.2.03-r1.ebuild 976 SHA256 09c61164c8f40a52498a12479b3763a15d0929ebca39e124e10d924966a7ca39 SHA512 df66f959a95f4e6d3eab27c9427853e5276fd2cb91463eb9871dd22d3507bf8d274c0147635782e4ef91e186d32b291187b5e9e2ebb419f2f8748d594a213df0 WHIRLPOOL 1953782c283fe212bea403935b3b86103a1df07c8de1c34fc338180d00712130ab6948bde023945790131adbf2707ca95e0ff18756a0577631b529aed90cfbff
+MISC ChangeLog 3818 SHA256 b4dd03297dde2973da92d4cc4ae83635781338b2e78dec0f7d9e2e105bb7242e SHA512 8b7c8d6cc089a4acda84e60a3ee72025bd1b86ea64112804df2e763f6c0192fe9e41f818e37fbc0a7580f0ad33fef45cdc3e437b9b7b66b04b216782766495ed WHIRLPOOL e6ff72ae71b3563f716ee0b19e841cc837eb013ea2436160ae095038a29f96c0a42c23a81cb315267f416807aa22ca3397c8cbe4f3b9ff09aaecd70b4615b174
+MISC ChangeLog-2015 3309 SHA256 676c114c91178c6dce03b1338adb6904f261efcf4c5807c20bc4745b1689c8d2 SHA512 37d854a46c7c23d153a4ba7eaf5846bf7f233a46e14ee95b1e00ee448de7a5cc4d44444fd7dab900d4145004b14105812e25c68939d39503f721022cc1f8c56f WHIRLPOOL 33d957b05895ce17a1a62a3cc466032230a74b715a55a8bdbf86e9b1a9282916630670a9f913647759c4e0878cd15b99d6e46d3cff6dd79d0f1c1684cc0be79b
+MISC metadata.xml 325 SHA256 edaf5acf811445fc08f9477381c3307973d795f1e3e530bd0d00d3167831bb81 SHA512 d95070978fa178f56a68e1f84591437e268b82bc3fd9d749232da9f1f2b3ab294e91a53162c3df10ea1da06c2c4ea1e9c1b3de112d87d79e60a6077ca1c57211 WHIRLPOOL b0cf1fcc0d1caf51466930820444925d39701c5bb00a9cfe74935d9fdf68a032125103be7bc257ecf0d68e1cea170005d12fe834512c3cbfc70318521b978380
diff --git a/media-sound/mp3diags/metadata.xml b/media-sound/mp3diags/metadata.xml
new file mode 100644
index 000000000000..15326088a6ed
--- /dev/null
+++ b/media-sound/mp3diags/metadata.xml
@@ -0,0 +1,11 @@
+<?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
new file mode 100644
index 000000000000..d9c81af3d443
--- /dev/null
+++ b/media-sound/mp3diags/mp3diags-1.2.03-r1.ebuild
@@ -0,0 +1,58 @@
+# 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/mp3gain/Manifest b/media-sound/mp3gain/Manifest
new file mode 100644
index 000000000000..4bdf459c586d
--- /dev/null
+++ b/media-sound/mp3gain/Manifest
@@ -0,0 +1,5 @@
+DIST mp3gain-1_5_2-src.zip 129435 SHA256 dbadc7a41a8a3b87d3a21a1989701cfe72d2090c3ead02b0b396a19a8acf6fca SHA512 1a7ac51bf0108c1f6fbd610c513bf7fd2c64d340a2ba23dc9fa5c3b896b279474f31f2d60318f409576e39f7643dd585d3e159e2a4db4553f7c9cc3761b7f388 WHIRLPOOL 4a0584c52090100e9f9fe2c53ac6614965976f1ada9134212734966199a6c116ce2e304ed54ec240c489c293928daf664f109d003d29c5c79c1e3b4a6ee08403
+EBUILD mp3gain-1.5.2.ebuild 728 SHA256 9ef288655549cceea584683ac4a7a830afca220ec221acd8bf0ebdd0a9faf284 SHA512 99741719ade948434a37842839586b51b72634fea2cf642162be076f1042ba03b031b6a3148889ee073e8fdea88e7fc7ec8d6b5e93918203f00e61c193bf9841 WHIRLPOOL 9079fc46cf727f86bffa69040c0bf9f82512e36657906b79eb7b7e6cacb92f73ae7652a72e4d18f919fb8f5d25bce4484bc284b16310e5ae858812903bc7e4d2
+MISC ChangeLog 2649 SHA256 c2eede7b1e0a088e8a12ae331884026fa1f84b4e15e5e08e0c4d3676deeeb68a SHA512 58742f16710b89e7d1b737ffaa9b5253ab7c61fc1cb004582ba6772439c7e61da77400664536d17331c2d2429983483645f09105446d83ac313a0c39e157e668 WHIRLPOOL a461d84e296ce1e6c5c10996cb1d64dcc0d8599677a7a60b9fb2844be5a180ed1f35f126a8f09ae742638828f7fa7279fff05ade0ceb6064e648529fd0f0b926
+MISC ChangeLog-2015 6247 SHA256 405b3035414c0812a4cb2f9e7f0fb5b95b353104a577ae696f0a7c7d7cf311c6 SHA512 dcf6b2c8b8c3662fca60a25f0a2c0f3f49c0b4db2eb7d9d912df96eb687638e39a86628eadad85ca8719ab591fb1474e5c21c0cce9dc65df5f7f9d52cafcbf1e WHIRLPOOL 31476a345e6ccec29ee16f79800db21cc26b49d2ee237ca5464d9be5013a8982c0a2b23e9b2ba37dc8e6e948875f3d6fb50bca8991c4781b2adb735b212aae2f
+MISC metadata.xml 452 SHA256 69ecdaf4211e7c8ec0abef6e2ef6d116413049f2fb50c33aa633e3571af18c1e SHA512 8ab00c2369fea3ed2ae75f5d04939ac81f4f227236215556157c3616ce1d72636c94af0988f06c995a08dd95c3774635c5d954e6992a077c20c7472be907a119 WHIRLPOOL 7462917a5f872134720a4208a9aeb6c9f3baa45ab57fe4a3ce9941c32b566d69aa4b3c91f85a1076ef7f8da9cf2602b39b35a7d748990a8ef8cfcfc172448732
diff --git a/media-sound/mp3gain/metadata.xml b/media-sound/mp3gain/metadata.xml
new file mode 100644
index 000000000000..fd6447570dcf
--- /dev/null
+++ b/media-sound/mp3gain/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">mp3gain</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3gain/mp3gain-1.5.2.ebuild b/media-sound/mp3gain/mp3gain-1.5.2.ebuild
new file mode 100644
index 000000000000..f97e02d40f50
--- /dev/null
+++ b/media-sound/mp3gain/mp3gain-1.5.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit toolchain-funcs
+
+MY_P=${P//./_}
+
+DESCRIPTION="A program to analyze and adjust MP3 files to same volume"
+HOMEPAGE="http://mp3gain.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	sed -i \
+		-e 's:CFLAGS= -Wall -O2:CFLAGS+= -Wall:' \
+		-e 's:$(CC) -o:$(CC) $(LDFLAGS) -o:' \
+		Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dobin mp3gain || die
+}
diff --git a/media-sound/mp3info/Manifest b/media-sound/mp3info/Manifest
new file mode 100644
index 000000000000..ea07dc023399
--- /dev/null
+++ b/media-sound/mp3info/Manifest
@@ -0,0 +1,7 @@
+AUX mp3info-0.8.5a-ldflags.patch 466 SHA256 7e6af5b2b33528d5d71d7b6f8ce1c392f3e6a083e6faafe25b6d421f221c97d8 SHA512 868b62dd4565e1f59a057bb4af06ba6618ba320f1a28104b936ae889ca851c344c3a221afedcb309bf11287079c86f44d5f92b6cfcdd8a6ef2e4a72508ed052c WHIRLPOOL 168b26b7e2a792fb71642d9aa4e4a742cd06e681f30d24b42f6fbb1dfec3dfee53d6bedb26aaf686e2a8cf8942fc3c689d00fcdc8aea9826c28c2118bf7e6d01
+AUX mp3info-0.8.5a-tinfo.patch 195 SHA256 a62a4ea1a9af42e6df7e23ef96ca76094840448a138ee38a132ffa79226b28f6 SHA512 3e2deb03559afa3029c673a7c9bb165c6c3419b19a629f9b55e20f96e49b8132c2d454274a8f5c64e20330c148351c4ef51e92164d230124b9d3a6d90d2b2653 WHIRLPOOL 302b6fb6000ffcb8326df7a0b692f776dc50ea086719fb63c9212d59f87d66b8071e684d504358e1d1fcbf66a688984a89917b6ff6df4fcb4cb2ba5049fd145c
+DIST mp3info-0.8.5a.tgz 127482 SHA256 0438ac68e9f04947fb14ca5573d27c62454cb9db3a93b7f1d2c226cd3e0b4e10 SHA512 30e0ef62deaa090fc115317f6c372f408077dfceed7e05faa6744b8516291e38d21f1742732f6532585f0c3d8c705d8c7026c2bed84c97e1f497d433637affd2 WHIRLPOOL a34f8328993523c5ca0c32f637c726546a83e8340d6ba58fdc157b23faa8fe9ee22783398764689df3c704383b7b3b92c5a3e95208de78a21b61a881b52a70d9
+EBUILD mp3info-0.8.5a.ebuild 901 SHA256 3893b7b4ab87f5a9fd873f5066b2896b450a0c42aa2e794c85190657d20e2605 SHA512 3ea667a13f1b618a7370686b9d2b0e184a3a87677d45c6fe541a25a45bdabcb206f89e244d6fa16b78bff9166dd6588afc702a961d3247714f784edd9fb9abd6 WHIRLPOOL 5d689bfe8c0f3d8e100e39c622f51dc91280e47c23dfbb03d19b3a79e1680eeb909c0059f17087cae641ad97c6281a07e66185e1a3e3b783bcbeb338bc9e9cb3
+MISC ChangeLog 2506 SHA256 9a7b29fcfcf756f93cbd596789ca38daef43ce960d2c13eb282bbc97df7c6060 SHA512 b85b227eb123dd336ce8dc50ab3dafc3ac35cdca005c86cf9297fc0054437fd6b64cc2fa33962dd102a49c316da243bdb896728b6c32d95b76a69a07190319fc WHIRLPOOL 9039b42e65ab5e5690c0c119af0cbe6a38abcf5c2d5468f66872bd4b865d4bd5d4c5ee6c2d4e77cebceffbfb8a0b0ff3afdd321128a046507832eeab85ee02ac
+MISC ChangeLog-2015 3942 SHA256 be4513e51cf3668983c485f85e9b918dddb37cba74cb9b114c9ba4666ed51482 SHA512 c524e9b08f4ff4ec0cb960614e54207edaa9de691c8de4d6960298b67e6f72d74d2bc122523a977fd616333c78f84461f0056aaf2f18339da491cdfa1cce2ff3 WHIRLPOOL b9205b90de89c2f0774f6a3c2b387f040148dbb2a021468b4713e7379197a707998e27fe23ca02949d48d093995f8024e522534230d3070cc3da1d76064aa674
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch b/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch
new file mode 100644
index 000000000000..4881b91eb29f
--- /dev/null
+++ b/media-sound/mp3info/files/mp3info-0.8.5a-ldflags.patch
@@ -0,0 +1,15 @@
+--- a/Makefile
++++ b/Makefile
+@@ -52,10 +52,10 @@
+ doc: mp3info.txt
+ 
+ mp3info: $(OBJS)
+-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ gmp3info: $(XSRC) $(XOBJ) 
+-	$(CC) $(XSRC) $(CFLAGS) -o $@ $(XOBJ) `pkg-config --cflags --libs gtk+-2.0`
++	$(CC) $(XSRC) $(CFLAGS) $(LDFLAGS) -o $@ $(XOBJ) `pkg-config --cflags --libs gtk+-2.0`
+ 
+ mp3info.txt: mp3info.1
+ 	groff -t -e -mandoc -Tascii mp3info.1 | col -bx > mp3info.txt
diff --git a/media-sound/mp3info/files/mp3info-0.8.5a-tinfo.patch b/media-sound/mp3info/files/mp3info-0.8.5a-tinfo.patch
new file mode 100644
index 000000000000..475292144ee7
--- /dev/null
+++ b/media-sound/mp3info/files/mp3info-0.8.5a-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -43,7 +43,7 @@
+ INSTALL = /usr/bin/install -c
+ STRIP = strip
+ 
+-LIBS = -lncurses
++LIBS = $(shell ${PKG_CONFIG} --libs ncurses)
+ CC = gcc
+ CFLAGS = -g -O2 -Wall
+ 
diff --git a/media-sound/mp3info/metadata.xml b/media-sound/mp3info/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/mp3info/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/mp3info/mp3info-0.8.5a.ebuild b/media-sound/mp3info/mp3info-0.8.5a.ebuild
new file mode 100644
index 000000000000..4c08e635a2bc
--- /dev/null
+++ b/media-sound/mp3info/mp3info-0.8.5a.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An MP3 technical info viewer and ID3 1.x tag editor"
+HOMEPAGE="http://ibiblio.org/mp3info/"
+SRC_URI="http://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="gtk"
+
+RDEPEND="
+	gtk? ( >=x11-libs/gtk+-2.6.10:2 )
+	sys-libs/ncurses
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-tinfo.patch
+	tc-export PKG_CONFIG
+}
+
+src_compile() {
+	emake mp3info $(usex gtk gmp3info '') CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin mp3info $(usex gtk gmp3info '')
+
+	dodoc ChangeLog README
+	doman mp3info.1
+}
diff --git a/media-sound/mp3report/Manifest b/media-sound/mp3report/Manifest
new file mode 100644
index 000000000000..8814285c04de
--- /dev/null
+++ b/media-sound/mp3report/Manifest
@@ -0,0 +1,5 @@
+DIST mp3report-1.0.2.tar.gz 37396 SHA256 f1448ba692f3320442e57b217af9b37f52d18e753c6ce5cee991db33ed57bad5 SHA512 ef103adef263cf48fd67c8bc888fc81d43d298b29c9e4abea06d500a74fd78aa30cff63b943c8706ab97196c8cae42df5f71412e9da5c51d029413fdc172106d WHIRLPOOL 62166d7b73bdeea24ddc6359cbb7a9a96b07c8566abf6ff261c6c28f14dd36f2e48b60128d7e7a925c0378fd69056c6f62a7d93c8174fccec2102632a9ff99c8
+EBUILD mp3report-1.0.2.ebuild 682 SHA256 54980dbeb7cdc78d8eb36d201a6bf7d1d90021631d71043bb20d0486b00efa9e SHA512 6956e5a73943342184db5d2fc98e6638cff25907ac4fb2b9d3997208fefeea13abc8260601a6311a32599b6d8a660fe37529c8ad20036ab8a9f6709c571a9134 WHIRLPOOL ae13efe63a6b3264b762686d7fc44137a787c3b54daa9f550d0751d03afd1f9b875c6837d27f09c1d13f8cf3476cbd4d45e81b70b25d35776d31ae7983dc6468
+MISC ChangeLog 2436 SHA256 ec9036e70e1857dbbe0c4a88a2b76679eea6e4608c2f29fd8d3afc85e8ab093e SHA512 72c6521f1fb66d8cde4f1ba3e8f73006be45371e8ab61a946ad21634caa8c01ac5409f080dc7164069afdffd8207c3a11164602270b06d493b2d811112c48b01 WHIRLPOOL c07452fc20347e9bc064421c22df83938a8e3349bc9a9855c749c5c5ec7cba13b8e5ce805bf1236d945f4c55fb19fb819a2673ad8ae75d0e24769e45164e0a4e
+MISC ChangeLog-2015 826 SHA256 226ae521cae02331405a5214022ab008e34772fa735e1b1b4644e507016d3c71 SHA512 7da85a170f55d43b39ac6012b3ab1534e3f11e8135dafcbd121134976927fd2b7738a13347c4c6c1c062560fdbbfab6928defa674893d93a96b186035853937a WHIRLPOOL 5578ebe5cc07f9cedc727ab7c603abd52ea1edea0985ba93fe80a9201f3ec3eaae8906df6a9139a3623de9470acc8d17b679489675674fecdd270f9fdb9d1679
+MISC metadata.xml 332 SHA256 f5b748e2f3f5d7fac35b665400ad158847a6c1d3b175378e2ab269140f665d34 SHA512 efc0b1ead5d2d8613013fdc09c0f32f3e78e248ea04630757b2b6d7f642c803276f07dd33fc5bd84fbdead29f3e9ffc4214a6581ea00a3b44d4071d38a3e8975 WHIRLPOOL 466fb23639b8d9665a80ab3d05b3f06636f62ecadf9f6cf6f3ff02da811f27973d0bf40954bf4dd5d5dd016908645534b898457470d5a18c886b22d81dc19266
diff --git a/media-sound/mp3report/metadata.xml b/media-sound/mp3report/metadata.xml
new file mode 100644
index 000000000000..d3d7fdc0b573
--- /dev/null
+++ b/media-sound/mp3report/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mp3report</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3report/mp3report-1.0.2.ebuild b/media-sound/mp3report/mp3report-1.0.2.ebuild
new file mode 100644
index 000000000000..6e034fde4548
--- /dev/null
+++ b/media-sound/mp3report/mp3report-1.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Perl script to create an HTML report of MP3 files in a directory"
+HOMEPAGE="http://mp3report.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PF}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8.6
+	dev-perl/MP3-Info"
+
+src_install() {
+	dodir /usr/share/mp3report
+	insinto /usr/share/mp3report
+	doins extended-template.html default-template.html
+	dodoc documentation.* ChangeLog README TODO
+	newbin mp3report.pl mp3report
+	doman *.1
+}
+
+pkg_postinst() {
+	elog "You can find templates in /usr/share/mp3report"
+}
diff --git a/media-sound/mp3splt-gtk/Manifest b/media-sound/mp3splt-gtk/Manifest
new file mode 100644
index 000000000000..a90166111a10
--- /dev/null
+++ b/media-sound/mp3splt-gtk/Manifest
@@ -0,0 +1,6 @@
+DIST mp3splt-gtk-0.9.2.tar.gz 1070580 SHA256 2084cc942b5d1aa6ff74848a41d05cb37876cbc74dfdc341ceb424c763887650 SHA512 e837cbc0759cd6535fc466099a170d066ab72b4854f8546f524261fe660887f5d2add60d9fa1e19d68d811004c682a324b5bcba86aa8cb89ae1ad2bc2f9b1d9d WHIRLPOOL fbf430cb2ca087d2ebc9b1d98a2f9b693c14a84bc3714bf7968c75d9d9430099c84f8f884485c71b41cb9a70ba531ec80e9131e19342d033f89d4c14f7c6c15c
+EBUILD mp3splt-gtk-0.9.2-r1.ebuild 1146 SHA256 77caa704b8d4299cff1460a79197b60065a0b1a23818cb7b09257b10bdebc112 SHA512 f2046acc088a9447096b48ee27a8705b8037dcd69e2f76592158203ea51a6626cb3da119cf1b113f4689e6b59b439e6ec73d7730e029a55eaa4240b4156b9011 WHIRLPOOL e00e555938b4736a7096bbd9aacc02206859abdf93ee925d6309f2cce195ecd73108d4494abf88254e5ebed11c519b376fcafd408690634fea84a0a9daa1c58c
+EBUILD mp3splt-gtk-0.9.2.ebuild 1334 SHA256 612488bc9b786b229b915eca7623e33866b22174f4622af8342ca2b0df309497 SHA512 7741a72ee7bb2180953b9e85f558a537ab1c80fa0f1e582a7f0354178bc71222905705b7be62e9c364fd7f45b8549034292afd3ffd8639f8748d41da6119a3da WHIRLPOOL 362d32ff4cea604fde65734dbd69f5095b530da5e9ed863e117d23ac3a109e2f51d4909545618faeeff4eb10c496f66ef3740157a81ceeef75d7bf0c204e0c15
+MISC ChangeLog 4609 SHA256 3ac35d45600d8493e2473c70106e07987b6e79c8a0f97f5ee36f3102cfde4f7a SHA512 d97076067c7d3c9873f7bad2c91c632d4eb9946b48924d1a72649a93ac9fb8a88d9a12af23073012174bbfcac9544c1871a2637748b8a249ceea575244c0905d WHIRLPOOL 824ea8e3c15284cd1c40c57f23ec9fd1088a14c05a1551203ef59746d295c3072987148e571a70d0b95ba210e3d16e7657fab882f56ca54962e6cd7e21550035
+MISC ChangeLog-2015 6248 SHA256 7abc48468088f7610f5135281d298ae451003a8c4c2a21cc7f21d6aed4ed4b83 SHA512 89483853f57276c715ac2ff0ff3fa52a63692363828924b134963ba85dc018ccb3b5a57e3bd8386a480a04b31d3fb5441e7a5f31af73b67b9b498490338f3705 WHIRLPOOL 49508811f8ae42a38d27f433f1dbbd00837818cfb4c38240f74d403d9d32e62bafa2d58f2f410cb76064e5148be9045ead721f61a0fc7f612c61437fe8911d8b
+MISC metadata.xml 426 SHA256 1da339fbb73ac85e449fe63e754649fdf63cf3d753859e4f06e3f93aa9531468 SHA512 bdb4ccec57ed706d1bec69d42ae6dc1f4c5aa59155cb671df061632155d8aacceb83ec3e1c66702176d4be5a462a31d30153e32696bcf28dc6a9b2eb137f9de9 WHIRLPOOL da0ac3ea539b352684d0b431f16485a07e8125dc6ee2cf76491cbbe1167be641afbaa9e732bbda58058ca647a2253e413de775c23edd158d04a9c1ea3e10463f
diff --git a/media-sound/mp3splt-gtk/metadata.xml b/media-sound/mp3splt-gtk/metadata.xml
new file mode 100644
index 000000000000..19ed72cab9b7
--- /dev/null
+++ b/media-sound/mp3splt-gtk/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="audacious">Include <pkg>media-sound/audacious</pkg> support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mp3splt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..771bf3e83a70
--- /dev/null
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit versionator autotools multilib
+
+DESCRIPTION="a GTK+ based utility to split mp3 and ogg files without decoding"
+HOMEPAGE="http://mp3splt.sourceforge.net"
+SRC_URI="mirror://sourceforge/mp3splt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc x86"
+IUSE="audacious doc gstreamer nls"
+
+RDEPEND="
+	~media-libs/libmp3splt-0.9.2
+	x11-libs/gtk+:3
+	audacious? ( >=media-sound/audacious-3.0 )
+	!audacious? ( dev-libs/dbus-glib )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-plugins/gst-plugins-meta:1.0[mp3] )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	default
+
+	if use audacious; then
+		sed -i \
+			-e 's:@AUDACIOUS_LIBS@:-laudclient &:' \
+			src/Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	use nls || myconf+=" --disable-nls"
+	use audacious || myconf+=" --disable-audacious"
+	use gstreamer || myconf+=" --disable-gstreamer"
+
+	econf \
+		--disable-gnome \
+		$(use_enable doc doxygen_doc) \
+		--disable-cutter \
+		${myconf}
+}
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2.ebuild
new file mode 100644
index 000000000000..c6495c8a8305
--- /dev/null
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils versionator autotools multilib
+
+DESCRIPTION="a GTK+ based utility to split mp3 and ogg files without decoding"
+HOMEPAGE="http://mp3splt.sourceforge.net"
+SRC_URI="mirror://sourceforge/mp3splt/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc x86"
+IUSE="audacious doc gnome gstreamer nls"
+
+RDEPEND="~media-libs/libmp3splt-0.9.2
+	x11-libs/gtk+:3
+	audacious? ( >=media-sound/audacious-3.0 )
+	!audacious? ( dev-libs/dbus-glib )
+	gstreamer? ( media-libs/gstreamer:1.0
+		media-plugins/gst-plugins-meta:1.0[mp3] )
+	gnome? ( gnome-base/libgnomeui )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	gnome? ( app-text/gnome-doc-utils app-text/rarian )
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	if use audacious; then
+		sed -i \
+			-e 's:@AUDACIOUS_LIBS@:-laudclient &:' \
+			src/Makefile.am || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	use nls || myconf+=" --disable-nls"
+	use audacious || myconf+=" --disable-audacious"
+	use gstreamer || myconf+=" --disable-gstreamer"
+
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable gnome) \
+		$(use_enable doc doxygen_doc) \
+		--disable-cutter \
+		${myconf}
+}
+
+src_install() {
+	default
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-sound/mp3splt/Manifest b/media-sound/mp3splt/Manifest
new file mode 100644
index 000000000000..7fb72064d4a4
--- /dev/null
+++ b/media-sound/mp3splt/Manifest
@@ -0,0 +1,7 @@
+DIST mp3splt-2.6.1a.tar.gz 260476 SHA256 9cd24b7483bbca7bf4a1c306fbf2afc2bb111defd0d88e9d87f642c1b519bb50 SHA512 5c0f6a56e09c0b33f83360bc4ea5d4c9398fa6ec9bc39e7e9ab34b0ff19e46ddacbbc69ff51953ee399f1a172f2d634c57c256abdfe51def593e5f981490cc17 WHIRLPOOL a511c8627afcce86ec290c76628520b0f520c94445ee13bf8ad1c47ab344c485035ab9061f2bfa6522a4a19cbb232dc131f27b1b80f2b6ee2843b2c7f6de9b43
+DIST mp3splt-2.6.2.tar.gz 260901 SHA256 3ec32b10ddd8bb11af987b8cd1c76382c48d265d0ffda53041d9aceb1f103baa SHA512 c1cbdc905d4f19e8e20afeadf02a2967049d86e69613312c8855e03afc5b190a569ac63f970171384853961cbe6bf248fae47e5116c4fe9deb7a0787f299918b WHIRLPOOL aa79c18f6da4c0f319721da55132d7b4b9420d08eb5c1230156a585d46ee5e276372ef5cd18f4a94fe12921a4a63ca7338b23739d13154f2f9c11dd6e29ebc34
+EBUILD mp3splt-2.6.1a.ebuild 701 SHA256 42b4daeb91ab27ee025081fd363638c30e47e274083d5941c2bebcd381a3dbb5 SHA512 70cfd32c331223d21c33693d7b77018781b2a86dd7875cb80935a1868e95c0c474efa0dd5e315cf0ce0fbe7c0634508ceec653765824442d273de3088207605f WHIRLPOOL 1ab88e862b6d544e149c2166f7df5030285499c26817b4ffc3cfc3c28edffda1860e8618fd50ee56b37729cf03630f382260c32892c2ed3568f731251dcd447d
+EBUILD mp3splt-2.6.2.ebuild 705 SHA256 3313e8ae0048792a92e877a3e5c5e775a75480586503a7c5297ef3797822b8ca SHA512 9ef39ce7e877c2ab1c922da341001cf9ddffbb3b401422d6def03d465e18f7e139b51fc9b0d4e4373c219e8945fa3d16e2a4d9407d536bf0bb1dd71d055664ce WHIRLPOOL 5519925d8e1966641c79cb5dedab99e524ca2591874328ed4b41e7168ca60fa0db393f1d0328ea51c1089cd60d03d5fa8f40bb2782ca4028999ea462efc12106
+MISC ChangeLog 2698 SHA256 9a06ee29f44ada9c4f52c1a5aef15bbcd643a0c5f610990274d087248efd17d1 SHA512 5ed483df63ad2ced7f5f77185c106097bccd94a3b3bc6144aa6c363e61f0b8d202299a5dd3030051471a2c0db66c98bc246d65c6df92ff0852a6000dcc249cfb WHIRLPOOL 75270d916a6f248057810c76587b66736d8122c83ec1dbb8ded905995273cf762de6b4b3e920eeeadbea5a4871ec6c381961bed7f1c3a93182c9f311d61755c2
+MISC ChangeLog-2015 8434 SHA256 c0953bdd2f67ea4472440bccc6f38cebc62061335c674121c6f4c230f8ddc211 SHA512 0dfefc1effc98b098b91e662f3bf3a0f2ebc11e319cc8c3f824104a287a1a4adb3527f879ed0aa5a6867e33f3695b4bc1edd26959d50617898aa533572f6ec41 WHIRLPOOL 8a215a27547b3eb037468424a0cf59925e29c23c6337fda9b63bab9d51c0b84e6d04e413e2ba362bf713616e8986912c9d558f32b0b5f24d65411e8295c96fd2
+MISC metadata.xml 330 SHA256 8ec318cff411bd931bfefff353c168e2aa4122c54de3e727e6d301c52263e090 SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38 WHIRLPOOL a3db60c5bfeb372d31563d182abfcde5addd2a077955b52fe08f9b2b867e24afc32805aafd36bd186ce96ca025c9c9ffabf838b9cdb01908d820a1f5e6612d17
diff --git a/media-sound/mp3splt/metadata.xml b/media-sound/mp3splt/metadata.xml
new file mode 100644
index 000000000000..fa7e71f336a3
--- /dev/null
+++ b/media-sound/mp3splt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mp3splt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3splt/mp3splt-2.6.1a.ebuild b/media-sound/mp3splt/mp3splt-2.6.1a.ebuild
new file mode 100644
index 000000000000..f562912f62d4
--- /dev/null
+++ b/media-sound/mp3splt/mp3splt-2.6.1a.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit multilib
+
+DESCRIPTION="a command line utility to split mp3 and ogg files without decoding"
+HOMEPAGE="http://mp3splt.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
+IUSE="flac"
+
+RDEPEND="~media-libs/libmp3splt-0.9.1a[flac?]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_configure() {
+	econf \
+		--enable-oggsplt_symlink \
+		$(use_enable flac flacsplt_symlink) \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	default
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/media-sound/mp3splt/mp3splt-2.6.2.ebuild b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
new file mode 100644
index 000000000000..58e3c10e0a20
--- /dev/null
+++ b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="a command line utility to split mp3 and ogg files without decoding"
+HOMEPAGE="http://mp3splt.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="flac"
+
+RDEPEND="~media-libs/libmp3splt-0.9.2[flac?]"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+src_configure() {
+	econf \
+		--enable-oggsplt_symlink \
+		$(use_enable flac flacsplt_symlink) \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	default
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/media-sound/mp3unicode/Manifest b/media-sound/mp3unicode/Manifest
new file mode 100644
index 000000000000..0389f852307f
--- /dev/null
+++ b/media-sound/mp3unicode/Manifest
@@ -0,0 +1,5 @@
+DIST mp3unicode-1.2.1.tar.bz2 101593 SHA256 375b432ce784407e74fceb055d115bf83b1bd04a83b95256171e1a36e00cfe07 SHA512 b1ca820d1ecf6b5e0e59a8267c0cc6af5f8218191885b9a538a53b4f112f77510b3c5da81ce1e0a98d60c19b621965cea7e8e5c7b6c035054ea362fc02ed64b2 WHIRLPOOL f387cbe4472e18bd31b3ea4237f6e380f0462a988f42990df3f137c022e30fd4dd7b8d5ba08a5548d505dde3f3910e010d8f8b66d252834ebbbd67b8522a6ba8
+EBUILD mp3unicode-1.2.1.ebuild 452 SHA256 6a5c066455d396930b48c12c445da705fe3f85451f523c09f8ad9a92e58914a1 SHA512 f2fe3eea558bfec7fb61c2504a4cd24cee4b8b38202f1a820ec26e44c60c8011f332ad2fd0901469b8f24657692338c9baf0859cafa14b45b852fdd89d3b8a1b WHIRLPOOL e37c1b6b98dd6b8947ff49b44d08b02b7ca61069858ad06149049bcd264a16345d2c1dcbf68125ed660aceeda4d41afb424fc24cc06206d49c620e603fe74747
+MISC ChangeLog 3131 SHA256 858a5ce3fbcfc102e1a0e89cf53fec119f1253d47e176e1cd67f3e2115d7ccab SHA512 bb5ede5f1cfb9f4481cfb0f994aab4e1a705652d7a556ecfee3f08d5052e07c3713736c7373cf8202d090c765784c176def6c6e3cc75385cee1a25f9505e37a0 WHIRLPOOL 80dd8d21215b9526cf3f59fda02de035ac43a5491da4d91ec9af65718bcc6c7d9200da221fb24af97eaf1e10fc8fb4d9d972f52e691800d0c52c32327f899405
+MISC ChangeLog-2015 1170 SHA256 e4f9efa8d3e4e19746e49796189b861880cf5c36508683844cf136c084b25b5a SHA512 1507c594388a8556ff2c9d852e5fe2a51e47a58c225a6ef71d3144d2957e6ccae46109d797d38322c9e2ba6e8bb4305887940c7d284907337edb5bf745be9588 WHIRLPOOL 9dbcd64adb4df90b3b5a08e73750cc95cf268a4deec732e81c07e26e19f3ae7f9dc0c596bcf57bdf7b095ee4cb67d322b05d0eec7935abd2f60cebfcbd52bc12
+MISC metadata.xml 390 SHA256 5e394e60a0c03bba014436f9942d77f0943123de4f6714142d1e09038447c5b3 SHA512 fef55e6cfa51b0b23ba81e8df46ca4b694e0279b70d2ac07986ebf4622c61af5aa59dce9d8fbddf339f0dd66bef61e3ca34513a2061d6754cdd5d0c382e90dc1 WHIRLPOOL b89e749616b31f27d69626002aeb2291913c460d130f9eff09f69449ff77930c03c8c2508cc4fc72269d0430d5e261de85cf7e74b855b52e475ac8fb506cdc58
diff --git a/media-sound/mp3unicode/metadata.xml b/media-sound/mp3unicode/metadata.xml
new file mode 100644
index 000000000000..1027a2ef2e39
--- /dev/null
+++ b/media-sound/mp3unicode/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">alonbl/mp3unicode</remote-id>
+		<remote-id type="sourceforge">mp3unicode</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild b/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild
new file mode 100644
index 000000000000..9ed7b7a972bb
--- /dev/null
+++ b/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Commandline utility to convert ID3 tags in mp3 files between different encodings"
+HOMEPAGE="http://mp3unicode.sourceforge.net"
+SRC_URI="https://github.com/alonbl/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/taglib-1.4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/media-sound/mp3val/Manifest b/media-sound/mp3val/Manifest
new file mode 100644
index 000000000000..f098a1865bad
--- /dev/null
+++ b/media-sound/mp3val/Manifest
@@ -0,0 +1,4 @@
+AUX mp3val-0.1.8-open.patch 477 SHA256 7ffae27b28a152c8cab66cd206e2066c2ec3f73835670a19975e3c1609e9cb14 SHA512 cbb11127ddecf808b41948220937078c96c87410b29676037ebb0187705f1c2f53d48c87924f9feb138ac33546d389f233940b6251d58bfc9975df7557a2aa22 WHIRLPOOL c26835ae9ce3f89edb575824f7fb15282946b6a5254e11700d1da5e2cccbf15800d58d8ace90db9817508fefef2ed0f51cd1bb21475f9c874f66298673027683
+DIST mp3val-0.1.8-src.tar.gz 21406 SHA256 95a16efe3c352bb31d23d68ee5cb8bb8ebd9868d3dcf0d84c96864f80c31c39f SHA512 62371453be53840fb0f0d87c9fcf9cbd6f5c8ae107e529f0cb6b8190ef9e7ebf564bb080c9d0a6adc3b5450673e70b5f4343dee82c1e6400750935cccebc2604 WHIRLPOOL fbcbb641c3ccccfc13ca20c4584161f5c0e0fc85aacfdc48435f9882e61f7fb780b3ddd8622cf5a423f2e0c9474a778802d36557e933422d8f9c2362ed72f956
+EBUILD mp3val-0.1.8.ebuild 658 SHA256 d82fc8ae3cd532c33d1b0d922705f404930a971640283748299ec88d48ef4306 SHA512 cb456c94947d4094f38a52e6eda4db07303e9faa5bbf238f4ec4594697b086c8d91be82ee440d266404cd116ba59ed66f956eddb32a47e8ff8ef23fde1b58602 WHIRLPOOL eea34f52b18d418dc9c1f9cb6b592b00f7ca535d31514a756819e4a59042a1ce06d225446af4b1053d1507742c5017d74eea1cc26101946b21d6c92cdc3402c9
+MISC metadata.xml 356 SHA256 21473766f0d689fcf378f83a5536a2807afce6c8aedd5823922442c88d978926 SHA512 57d04beb9754d651fc336dbc8bafb21a8d8bbe169e40049a730865e3655518b94e886f940865765e2ac5da1c3ddd284eff01904a8e4c80e405b8f32c5aa285e6 WHIRLPOOL e55c23177dae84422efebfc161236ef7c2fd53185274c8650796cd39374bff3f1a26ce0acdce8eb5b6ef250bc9e52efc58b05d055fd89566ffc04c8ab34532f1
diff --git a/media-sound/mp3val/files/mp3val-0.1.8-open.patch b/media-sound/mp3val/files/mp3val-0.1.8-open.patch
new file mode 100644
index 000000000000..2b844c1fac1e
--- /dev/null
+++ b/media-sound/mp3val/files/mp3val-0.1.8-open.patch
@@ -0,0 +1,11 @@
+--- mp3val-0.1.8-src/crossapi.cpp.orig	2010-05-03 10:45:53.000000000 -0700
++++ mp3val-0.1.8-src/crossapi.cpp	2017-02-19 23:38:21.000000000 -0000
+@@ -241,7 +241,7 @@
+ //Moving failed due to different logical drives of source and destination. Let's copy:
+ 	id=open(szOldName,O_RDONLY);
+ 	if(id==-1) return 0;
+-	od=open(szNewName,O_WRONLY|O_CREAT|O_TRUNC);
++	od=open(szNewName, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+ 	if(od==-1) {
+ 		close(id);
+ 		return 0;
diff --git a/media-sound/mp3val/metadata.xml b/media-sound/mp3val/metadata.xml
new file mode 100644
index 000000000000..9883d35b70f1
--- /dev/null
+++ b/media-sound/mp3val/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>robbat2@gentoo.org</email>
+        <name>Robin H. Johnson</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="sourceforge">mp3val</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3val/mp3val-0.1.8.ebuild b/media-sound/mp3val/mp3val-0.1.8.ebuild
new file mode 100644
index 000000000000..ed2f5fc906a3
--- /dev/null
+++ b/media-sound/mp3val/mp3val-0.1.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Validate and fix MPEG audio files"
+HOMEPAGE="http://mp3val.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mp3val/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+PATCHES=(
+	"${FILESDIR}/${P}-open.patch"
+)
+
+src_prepare() {
+	edos2unix "${S}"/{*.{cpp,h},Makefile*}
+	chmod a-x "${S}"/*
+	sed -i -e '/^C.*FLAGS.*=/d' "${S}"/Makefile.linux
+	default
+}
+
+src_compile() {
+	emake -f Makefile.linux
+}
+
+src_install() {
+	dobin mp3val
+	dohtml manual.html
+	dodoc changelog.txt
+}
diff --git a/media-sound/mp3wrap/Manifest b/media-sound/mp3wrap/Manifest
new file mode 100644
index 000000000000..525818b24431
--- /dev/null
+++ b/media-sound/mp3wrap/Manifest
@@ -0,0 +1,5 @@
+DIST mp3wrap-0.5-src.tar.gz 113008 SHA256 1b4644f6b7099dcab88b08521d59d6f730fa211b5faf1f88bd03bf61fedc04e7 SHA512 2dc7a72a12b9245956000443a51cd5341e1d48795b629f6277f9dd26ac9b3ab2511a119478a10daa9516cb2526073956af42f83410aff1e4eae0c972fdd8b0f1 WHIRLPOOL 65d8576831df9eff5f24e24ed93751a91414cc703e4fadd5bd7ffd94bc3d20a3f9f392e5db46262e151e214be27e67b7e473748592d51bb782a4bb88a9813d00
+EBUILD mp3wrap-0.5.ebuild 525 SHA256 a4dcacdc49fe886ced3eeb8c1e9eee494eff2599aa910262ac2f28786f92e4f0 SHA512 81938e1a0641fbdae37fc5bf628515ce39d656bd6051b15f4dcd805be9540455c5b7221cd4a15f5914b721fa834550d2f27c51fd21456099208e9b19affc49d4 WHIRLPOOL d70425c9cba7aa0868e68cbec037be509cdc28bc33376476a53b45daebdda76d7db5550e4c06f20bce40a752d2bbee6038b9a3af62c5a57577eda7cc0f533eaa
+MISC ChangeLog 2426 SHA256 8fe2fa1fbf783fe5cfd39e33e1be6cef3199ad3403ef6307829e2a554cc02733 SHA512 9bd9fe2959eae432de2829ecd85b90c8996320ae13f3484ed4bea249acd162e75a0807ce61c86d430f6768c2434aa1fa48609e258fb370d2ba7d6dbfd9acd106 WHIRLPOOL a7fb6afb596720cb8b1073e5a64bc1c7b3fdd708183bd562b521e2d9f056585f8b0244fb81d0bdf81c8fdbbdb1b39ebfeaedb210903787d774506445f4566981
+MISC ChangeLog-2015 1159 SHA256 75dcd63bbc572583213a89992105efec7c9741378f824ec666c7ffa7aae3f267 SHA512 cb00a1e80527a71d2bdaefb2badc604c33087c76ff9dc50dbdd34c22f2d54063512a842f6f27702126c0d4971b0d652f0d317bbc76f2c146c0d511f6dd66c436 WHIRLPOOL f93d5f07383599e9e686eaea8cb68dded51aed27f30b094fe14ba0ef4993071b287fe288501ea66c6f314456c97f54779f09211ba37cb420e66822b084a9cca4
+MISC metadata.xml 330 SHA256 a334db36506b19bffb03d7ea61ae324b7fa9cc6739867fa8c4273b273b511442 SHA512 d84e915ded7ed432ab25c7b62afd23832913a55fea4079d818916bc79d49404d59ec4172c97789259b0dc7333f7631855578c9fdc57ac92815a77dbe7b0ccc8f WHIRLPOOL f35faaca0f366bcaaaa99641ec962aaf1270dabe271d9f6f0b7e2b91eea9d15990bdab9ebb05c80f512fdbce0f8b53fc5b503437896b3bbff0bd8c973dfef540
diff --git a/media-sound/mp3wrap/metadata.xml b/media-sound/mp3wrap/metadata.xml
new file mode 100644
index 000000000000..42b0671c0758
--- /dev/null
+++ b/media-sound/mp3wrap/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mp3wrap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3wrap/mp3wrap-0.5.ebuild b/media-sound/mp3wrap/mp3wrap-0.5.ebuild
new file mode 100644
index 000000000000..516a48b8e296
--- /dev/null
+++ b/media-sound/mp3wrap/mp3wrap-0.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Command-line utility that wraps quickly two or more mp3 files in one single large playable mp3"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+HOMEPAGE="http://mp3wrap.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+src_install() {
+	dobin mp3wrap || die "dobin failed"
+	doman mp3wrap.1
+	dodoc AUTHORS ChangeLog README
+	dohtml doc/*.html
+}
diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
new file mode 100644
index 000000000000..359b11dc8be6
--- /dev/null
+++ b/media-sound/mpc/Manifest
@@ -0,0 +1,7 @@
+DIST mpc-0.27.tar.xz 113596 SHA256 45a2be0a6dea65ed43f631294c24e74b83c8ee66d1ba6ab47d0744ddb1e62064 SHA512 f73550004697c6d4ae44f25c82a9e4477fa878accb8725f58b74b2785c02b175a35e675c5484c58766e9032fe19beabd35a64c57cd1afd81478619d2f51916d4 WHIRLPOOL c1b881b812f88656aa2e865f31acd90f654e099db4e63ec65feb6976baeb17825251e827eb22589cd1efe26d265e725f7f2b0bad918cffe0d001f81d0880c792
+DIST mpc-0.28.tar.xz 109172 SHA256 a4337d06c85dc81a638821d30fce8a137a58d13d510be34a11c1cce95cabc547 SHA512 1d0c96c3c7cee2eac2d3cf25f09d74b5807b8ea56ff7dfc033b8fa690fd4d42de726a641e4f2552550d8a1c1b2840575aec5c595166ca5ae5776fcc93c8fb7cf WHIRLPOOL 28687b8b9f8948ac5b00f4aa313fb6d6908c10993602c03b431557f969d11d41b3be62550fd3832478551b83ef2cf399fc96dbc85d8337814990fa699b3078ef
+EBUILD mpc-0.27.ebuild 774 SHA256 4c30fb592b53bc20e222103d704a4f2ff170bdb49c766150c15e3858ca6ecbb1 SHA512 b4b324f241ffdfc289cb5713edc9f659eb6eed13b339c23fb54955b5bfda0894f052a4af5fc21ea828b914e18d06f6c95227fbd986ac40a115c00caa34dc1557 WHIRLPOOL 7fa753ceeff29dfa211763cd40dcd7f7487fed8e58f2f541c86d4f94303dd28f5a620561016fd85865f4a24e5f8423784903e98a88d40a6509694dd41635e99f
+EBUILD mpc-0.28.ebuild 777 SHA256 8f31a92529e04c12a9ac89bee70eaf6977ed458e0fc546e28b2a914aa1691ab0 SHA512 1a4f3c5d3e9ad024c55b3009be36d4e7db8a901a01c855e8c7f3a325cebbe3a4025a9b75eb502bee21d176c1584f30104a8e9409f57ced33448f5a637da70274 WHIRLPOOL aca0a645560bd4b21096bbeedeeeb409b48186f6d3a4af3b3788723153d129ce5f8cbc2ee60e9e7aa663a9f35a8e72a04e43ca81c0f37b53608b2a76257d76c7
+MISC ChangeLog 4198 SHA256 3f6a3b6593bab93d8cf4f30785777c72a0e6b402ee881b58151466d6e2e07202 SHA512 6d302328577b298ebaec3ea964c388846dc3c40902cbfa61a86c9e097c633eb778d41adb18271b694c7961b7b2a45837b8b685dd422d81e5646b720f9696858f WHIRLPOOL 70fa77e6d34833a4c0757b0cee0883e9dadd3509a7c4952a55f1ccad3acfebee25ab21b65fb338088544e1f7240fbefcbed1ba74c236b72f2006734f8114d275
+MISC ChangeLog-2015 12861 SHA256 99cc6b788f8984ff72da410bf9018bdb3ac85f58855ef1c75696a06e81424c9b SHA512 7c257bace21c446080b801f88078196029350b8d9faf030c6607d3c707fbcd22a3299bbafdd743e68ea8ef977d6dc163468a66372b88e55048ecde4433d83791 WHIRLPOOL 3556eafb04635b5767a3b44e2163721dcfb6eec840bc73f3a1d42dab2af94771bc886c8618c5fe7c43f14a645f7ac50dbefdaf6b5befcde95c63735f0097a98e
+MISC metadata.xml 252 SHA256 81ed912876eb6ea6a338066f32cd414a51fc989c6b8c741ac70fd70f6ec24128 SHA512 8e302ca809c5fd04740c71e5d9e53786edbe46c487fcff77625a027b7922c099a4d187e853ad76965567e1d5a201ac98c6f3cef9ffe7e285b6dfde0c6df0cbdb WHIRLPOOL 7d3063812a57f32b4b3765caa283aae3595ef3b800d78277cdbfb5d9f05d6aee0246bb0da516a9254cd9bfa665d375e1c5a5171cb4f097ae9161570b1386a95d
diff --git a/media-sound/mpc/metadata.xml b/media-sound/mpc/metadata.xml
new file mode 100644
index 000000000000..9785ddfc347b
--- /dev/null
+++ b/media-sound/mpc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/mpc/mpc-0.27.ebuild b/media-sound/mpc/mpc-0.27.ebuild
new file mode 100644
index 000000000000..81b1517d9708
--- /dev/null
+++ b/media-sound/mpc/mpc-0.27.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1
+
+DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
+IUSE="iconv"
+
+RDEPEND=">=media-libs/libmpdclient-2.2
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README doc/mpd-m3u-handler.sh doc/mppledit
+	doc/mpd-pls-handler.sh )
+
+src_configure() {
+	econf $(use_enable iconv) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	newbashcomp doc/mpc-completion.bash ${PN}
+}
diff --git a/media-sound/mpc/mpc-0.28.ebuild b/media-sound/mpc/mpc-0.28.ebuild
new file mode 100644
index 000000000000..8d7901c0887d
--- /dev/null
+++ b/media-sound/mpc/mpc-0.28.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1
+
+DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
+IUSE="iconv"
+
+RDEPEND=">=media-libs/libmpdclient-2.9
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README doc/mpd-m3u-handler.sh doc/mppledit doc/mpd-pls-handler.sh )
+
+src_configure() {
+	econf \
+		$(use_enable iconv) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	newbashcomp doc/mpc-completion.bash ${PN}
+}
diff --git a/media-sound/mpck/Manifest b/media-sound/mpck/Manifest
new file mode 100644
index 000000000000..b335b6ea6cce
--- /dev/null
+++ b/media-sound/mpck/Manifest
@@ -0,0 +1,5 @@
+DIST checkmate-0.15.tar.gz 198526 SHA256 7bf49e3c5bcdcac66211a08a18f87dde636417cf28bb5a00730d4dda2a0ee8c7 SHA512 a1d8de736528cd7e0d0c07fd48eddde907aa17cc49841815454d43d64258443dbf0e903696bb11231c35240e0ba8fbde67921edbc5045ea21698ea4fa2f5a6e6 WHIRLPOOL 0075915a43f324687c764007192f5ca02acaaba8b48e0292ce47dd4af03c4452966ea23b966c76219c729f1ec7b0ec36c0d974628ee66339c437dd24bf3bccb1
+EBUILD mpck-0.15.ebuild 474 SHA256 6ff19b0a3739fdcc90ea0f61ed2f666e53c204edbb2252372a0bfdd735f5fe87 SHA512 ea799df8c28c81931df9ff1da7b76dc33d45ef8c978c89842c322dd5665ed47b1a468d5e465a3182f4520a66a7d6723982808df80760f84035f073f6c613b9c7 WHIRLPOOL 757e1f3e4c9e7570b0101c8af8c0fbfa41aaa5669bbc4fb325b78e2a4c754ef896b7d8a96ab42a58574bd387f46001a2343daf4eaa4e129c75e3917c350a2989
+MISC ChangeLog 2419 SHA256 2a588f79f8beab28c799322d40d567adc9494e5afe7d913c9c3203e4db7f8719 SHA512 4bc59a68418bf426a6f1a6fce03897d623f0e81c148371f288133f2b31494426ea04584070c69bc2f6f264258efe0d7ed37d64d08d4ae8a5b6b52d44e9a26805 WHIRLPOOL 0e7599f7d4de5f6e9fd4ec6d811266a6f1feb34d53384cfa1447484f9a44c05f60a603aa88f784af04c826ee870ba49746148142e4f2891590b05161bc2ec227
+MISC ChangeLog-2015 1060 SHA256 5d32300bb616fa5525b7c1c93c4fdaba86c1d78b51c1aa40dc4310b7826b012d SHA512 68e5c5177a4cdb4c56697b446c6e9a30711c773bb0971d4da8d2896b4427a83b4fed50946ee0dedb1bda7c7f640601d52d7d98e6864bb0ff67db60b4e911b1a9 WHIRLPOOL f625925ca16c996e9d609c60db2a1cde4fcdaa2febbffbf25f2843a2d8d4b9cd7930b48e4aeb05010bc93ac0b10801fa3725d41b17eec6e068d0b01935274b97
+MISC metadata.xml 355 SHA256 ceed92d1de72254dcf6fb32245c46038597455a2b7028671b8bbf4a39b8fd95a SHA512 67f7562f4f2882838136fa69cfc0927da31bc1f75b0e3226ffc8ae1ae0bb6997160b7de36294bf757b566a79e8937e1aafd74fd59e5978a4ef847fb1e4e876be WHIRLPOOL 6b20cffd636ab8cd6750469b27ae4996f46092ae2f0cd8d247d0ac32f959278e1dc3d45fa3e788cb91d8f445234f76bee31a531f2e7254e8fe24c8f7baba3f9e
diff --git a/media-sound/mpck/metadata.xml b/media-sound/mpck/metadata.xml
new file mode 100644
index 000000000000..5f92e8882156
--- /dev/null
+++ b/media-sound/mpck/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>chainsaw@gentoo.org</email>
+  <name>Tony Vroon</name>
+</maintainer>
+<maintainer type="project">
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/mpck/mpck-0.15.ebuild b/media-sound/mpck/mpck-0.15.ebuild
new file mode 100644
index 000000000000..ad97d4039528
--- /dev/null
+++ b/media-sound/mpck/mpck-0.15.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+MY_P=checkmate-${PV}
+
+DESCRIPTION="Checks MP3s for errors"
+HOMEPAGE="http://mpck.linuxonly.nl/"
+SRC_URI="http://checkmate.linuxonly.nl/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ABOUT_FIXING AUTHORS ChangeLog HISTORY README
+}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
new file mode 100644
index 000000000000..f2a204a86b3f
--- /dev/null
+++ b/media-sound/mpd/Manifest
@@ -0,0 +1,24 @@
+AUX mpd-0.18.conf.patch 2969 SHA256 a8eb3e339513d6284f6be0a63f9676e44d768fc77d40ebe9f3073dd3171f0fae SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5 WHIRLPOOL 58f4a56426f66cd3337aafbfd6612bfc850fa022d13a150ff7f923e48f5d225c376ff751dab0ac5c6753320c060f04fc53a88e64b5ae3238499d3ce563df7654
+AUX mpd-0.20.4.init 690 SHA256 7bef9d2025b627cec085c0c67f7dccdd47b69434ebed9ad0337f0cf31e9febe4 SHA512 d4c60d7b5b6e4067439be96aaa9d8d6f7bd7607ad42a618b04af94815cdbe900e06f11c6897f96cab623d6859d681feb11fa02f36fdce4841ed59c88ef86666f WHIRLPOOL 1ee35ee5dd2adf3df15343c6b82d004d6dcbae8f53b0238e88f333998e632ce66f4ff038dffe7fea13b85771da77deeb4906dccd832e24394b99015f6dcf9ed1
+AUX mpd-0.20.4.logrotate 79 SHA256 4c732b3129f7747f0f2becc7498319aabd1784ad358d1e2e2083b8777078aa62 SHA512 b4616307eb4b06e42a53120bb37276ea19cb1b3096094214062835f71093a1d196bc515b6b6f1e23dbd83a49151565807071959408c4f1078d95925660d3b324 WHIRLPOOL 9f542501a536a0baa16c3f0af028d6e52fab4e9758da762114f8aa29f32e5d10f38fa1d7bb75a812e56b41451136bb13cf05f0c7559be4b08cab6503747498c9
+AUX mpd-0.9.15-systemd.patch 3056 SHA256 6acef4297941a7d146897465f2dcc9b88e4b3a632e50167177e8105249522c4a SHA512 c9f8b909121f6f3b08ca4bf37ae744aa1468a306e8671681babac228aa5d4b528d094214e2596a862d0b685d01a448b6fd6b8170d6990e10f387f1e498c9dd3b WHIRLPOOL dd1290608de22ad342cc879a7ea316932c4233875d434aa49ee82c7b4e602c3a3bfc5a3c63b71b30338fa9109f4a8d8cb2a276b0b0797b8ef0f4f646bcae0d9a
+AUX mpd.logrotate 199 SHA256 e1cbf1c8c77e32789c4dc55bb7761d17c5708a5cb9b9753a7517c15de98696cb SHA512 c55ef8f0e691ef0b358e5dc81a206328de4ccef449959fd7e6f9e95e07cbbee7446639278ebe6f4517063c9a6169e07bca0109958dc722a2caea1503693410ae WHIRLPOOL 85737af75673b8bb7492373bcc02d21205400b2db67340128dffe9fc7a41e98150562730bb8d2b7d94c9dc91dd11dc15c554db75af782b57634dd056a36339ce
+AUX mpd2.init 727 SHA256 6ca354f8b8c4b0e8595f7dbda1058fd471a6b538469ea10e7caf8e7f263f621a SHA512 be2b52b3b69dcfb34e7753dce908c4f3c5b2d2e768c9177dbf06d72be487ccb2f2b58c292c0e19c5c6faf83bcabd1acb8fc6f1214b2de030b005b7759566892a WHIRLPOOL c1cb941224c1e7c23fdc722b898f416a4625bf05e9c1cf4d38e8f06ca3b9c45babb37a8cc516bab5185b5206e2839cf67e0334f37a820367d8178d638770621f
+DIST mpd-0.19.19.tar.xz 707356 SHA256 bc856cda4136403446d53d11576f86990b61d1fe4668f6008e9eae47450d4e1d SHA512 949bfab2aa5dffb4089ce2023accc934648091d36768f8e4c75f62b4038e21db1e2ef3bb07a0f1cf6a91d0532cac8e7146be948d84dc4d7cdc5b252b7d815b64 WHIRLPOOL 1b2c68d998a26de41bca25cbeab0c6478406c831ac4322162d2c258622224137a1a2dcd88b690ee1869c7f2652201fd534ee773a6e51f6e61bdb5926783f4d75
+DIST mpd-0.19.21.tar.xz 708512 SHA256 8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730 SHA512 a65690012a74def273ffb4e87465d8f3f7f2ce6f6e9117e35aa0891cd638f904df0ef4c4923c39e9a0c3e1d93d09aab713979adf5c191b54fa7e8b5b81abd232 WHIRLPOOL 397bc2158591137ab8a30e3377458dcef0ea600e218723831977ea7ec9f5b14ae1221b2b7456daa9e249b3aa95c61f7a1f0742656ace42c837e28892dd3d7604
+DIST mpd-0.20.10.tar.xz 778828 SHA256 52fbc1125cdba41ba999add2820d45f3ce7cf493006bb04d8f0b2937204d3121 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c WHIRLPOOL f0e2ab6b76848c88f57e13b16258c9d4810e9642f54c3f8d3378fedf484b97ed62c4afad6f217235de4e282d0b2ff99ffc40eac19774b72c1a2291f4f7e54e21
+DIST mpd-0.20.4.tar.xz 770132 SHA256 712b25351c12616630c580204e1c3dcba3ae2993a56cff1c346c87e334d69728 SHA512 d0c01ae6a3fd59e5ccdc24225bd9bb9e63620f1a395d317573499cc045de81f2abd803ca87eb1b2ca1d26d25167aaa6f5523e96f9512619272b857190efa0a72 WHIRLPOOL 9446b7096c6d2eb41a9421ad8e58e7a70a66e7abb381e75edabf0718c0098646e82ca16d7157e6c453836825eb03a2eca09ff7f80e95918718e42da85ae30c9e
+DIST mpd-0.20.6.tar.xz 772140 SHA256 f4055e1189e5cc00e83706b2e0b5ead924ced0303e073d7802ee9f9a8eba4b47 SHA512 3377e095eaf8cd3ae14e4218fd85d1bcd79d29899ad4c61f5cd2a0b714c5e8aa22aa3b8bd54477195b93ddd44b8e82f8c6428c8f36174c98cba631554224dcfe WHIRLPOOL e3509fb61bed5e766d17ed66178d049bd13b3b088046e7c4d2400d5aebc2d82936ef60297e99db6b386bd474c40caecc3c6d5fd6f703810f3438dce8febfe41f
+DIST mpd-0.20.8.tar.xz 773128 SHA256 7d177f29663c4a0997413401e52bbf11d2bb472773bbcf9294f839c4b8751e35 SHA512 063feafae7137ea5b61498132b4fcc2e04e23bb9d6fa849a0c6d90c40ecc0a841617dec0f53021bfc5add559b59388d20ef211e1bc88fcaca46b5ecbf1bb8960 WHIRLPOOL 2dcc30e9eebdb466486cf6aff93796b2837ede92c5a01f20643ba64af86b9583b1702ac578653d897be3a9cfee2bb5b817584804a2d5192b31920dcdd7a47d62
+DIST mpd-0.20.9.tar.xz 773404 SHA256 cd77a2869e32354b004cc6b34fcb0bee56114caa2d9ed862aaa8071441e34eb7 SHA512 3b29fed4146ca09e3b5866aeea280ca3fb412d182a940da6c1418525e251385fdb18bb58ea99754ad5ba3704a3e2033ff2ef54c392117af7c0be30b78708a2e7 WHIRLPOOL 31fb2302c1165f53848145f6725020ed41aa446653f7132730fbe755d7e19e30266bcbcd61c9cdf6c603db4d34afe64814a887f539e9116ccc2c89054825e1e7
+EBUILD mpd-0.19.19.ebuild 7647 SHA256 55c9daa1f5cd33b4c44f8b15ce829f8a4d7dfe5bcc75bca63bfd7d7d065f51b3 SHA512 8c69f7db31ae45d0531dfd4f98984bbd88c70118ffa9188ae6be2152105accadedacf7219883700ed1f40e9c32a02f37dcb1d2c809ff452223241606f7d86169 WHIRLPOOL 7f8e580ca4efb3b811f49b1e517d8b756710ff2373504bc8094f36ca2167c292a868ec1c2663f535216bf4c2fcad93ea7ccea468c095283ff8ec8d40afe67fe2
+EBUILD mpd-0.19.21-r1.ebuild 7541 SHA256 771618362478efef1b7188eb1e91765a118fa44b553a316a70002f2859b06e13 SHA512 0df1083f07267d02a593bc696ee594a839cfac5513c21ed3ad5a36d927e80d11fe4c8192630ccd413afe9f818dac2a3b3278ca070c53a4cbb85905932818f0b6 WHIRLPOOL a9ec6faba5ed5647427f1850041c1fb0bc4eaf2acdd06d30fd5b81ec14f9902a0aedeaa0d3e76d231f6ab5d3335d139ab1239a54189aa455d7e6d23ad7252ec6
+EBUILD mpd-0.19.21.ebuild 7661 SHA256 a8233595991e67cf0baf648bb62dd76cfeafc2174858cb07b968024c64ac57d6 SHA512 41fb613f3f8b2cf1926ce6682103e389c126e4fa05845a0a7a0bd723a8fa188da6230fa84ab19851b02a8bbc469616016228509b6f50c508364cdfe9e55409eb WHIRLPOOL 510358706cfb353149a2e61812bd5cfec1c60746b6b6e5da4cd944f53506fdc685cd022805968df5a11266ffd6de62f806829329f70f17d1e67f8711c657ad5b
+EBUILD mpd-0.20.10.ebuild 7198 SHA256 fa2219d68e983e2fe9cd96f85d761ad30c54d3568bfe21d45d605fb0c31c03cf SHA512 05a65009c7de5795c939687881e21b43901528f3b45698181fea4c44ef36bd9998d6284ed445bfcc5eee8664f319d61363391d229db7673de4fcd5d75b0a98f4 WHIRLPOOL cabcfd7c09477be9530a99e9e7c5041b112be26b025e07c145c12667332cdf709fb9accc178057d63f730c28d7abc36d8ade22c07e022dfcbd2eca82a387f020
+EBUILD mpd-0.20.4.ebuild 7572 SHA256 9b0aa673e0a2a8c4f4780908440153529370ba8ef11aa44d467ce4228cb20332 SHA512 9b641695c28ecd914491275b4e837ad0c681b16f79c3cb898c323c4aa9d944e55576ff91339e759dfc59545452efd6d5dc283a60a81600158f57f3fdeefebc8a WHIRLPOOL f592c0f232fd35f3d8ee65346522ad6b790a9076f65234320aa218dcfe68a6a7c142f68bdda23a74ffb280b565bc35ecce4d56f3d44989045a1963dbcfd2d2a2
+EBUILD mpd-0.20.6.ebuild 7212 SHA256 cd6f578adcbc133459514d50a0f3563a6aefc1f8133c1919aa3193b761d5fb51 SHA512 5616b50c1bd4c3e279ba20ca8fbe8c9bdb6556c796f1940047bb21fdd635cd0fa1e9ef62abbd83ae75499fccc9fcdb34cb6300c3f901a135505480d677982640 WHIRLPOOL f98250a93612cff802ba1c5a55799401a12b5a44d5f6297eac01ae50a0c8aeeee59bf1bbdb83666210124bbb204706503ff7b59a82073eb32c72c065b54e8d37
+EBUILD mpd-0.20.8.ebuild 7214 SHA256 949cc46846acabc7a0680bbc910a0b218fc5c6c1f6e9f0c2fecfe8677f1e0646 SHA512 2a73288afaa5fceeacb38efe9584e1e5c7ac30c5d230b751d333b8d9e22ea88c77e5996f51180863613087ae043e874ba544490418c7e7bda0b79230df01ef23 WHIRLPOOL 52026762bbf5f522b1b0783f9def8ef6daf6c465c520e8a442ae6e0dd9a0c0019ab318be98636a9e07f9f505bebb30f72fac3ae3ebdf794e0559695d45557f81
+EBUILD mpd-0.20.9.ebuild 7214 SHA256 949cc46846acabc7a0680bbc910a0b218fc5c6c1f6e9f0c2fecfe8677f1e0646 SHA512 2a73288afaa5fceeacb38efe9584e1e5c7ac30c5d230b751d333b8d9e22ea88c77e5996f51180863613087ae043e874ba544490418c7e7bda0b79230df01ef23 WHIRLPOOL 52026762bbf5f522b1b0783f9def8ef6daf6c465c520e8a442ae6e0dd9a0c0019ab318be98636a9e07f9f505bebb30f72fac3ae3ebdf794e0559695d45557f81
+MISC ChangeLog 8307 SHA256 e536c58df3121af0b941fa5f9cac97cd937f31f4088ff9c2dd710b1d9f40a7b1 SHA512 6433b30c05877ece08fa9e4e37559903262c98af9bfe7eba5c7612f0841eb0daa39594cedffd785b92d904760abbcfa2db276be89400bacc122c954e71302039 WHIRLPOOL c0800c2916349f99f7802622919dc8a440a2a29352660ded70cd788fabad3874f07032154c65d084df6ccf69b9200b246b1f373795d43da49b9833cdc18cf630
+MISC ChangeLog-2015 53813 SHA256 3bfde23e96541dbd8c1494fb4dbcd82d529cdc4f937e3dae20394275559d6588 SHA512 3ac4683ab616c9b1b0f61e7c393267faf0091031481ed1c759d60860a6d895586f57536dc67138a1502a14350f76738fb68e4cba9780e89f45ea4faa1350d358 WHIRLPOOL 073fc7946e7c80cc1de5f8e5b1df67df70639903f3b1d2c7500fb34e31c1cf36d6649c70f2f819fba886ff0a06b197f9fd775ef4c551bfc64b51ebd7179830e1
+MISC metadata.xml 2426 SHA256 09b47c4cd017f2beaa6235827fd72a18c587355494d5e03339b7da1a6993cf52 SHA512 d14e3facfa691178ebb911cd117c9f2f6e5b8a634c8682e521ff006efd7b705549ae2468decae533056ec1b6eb4c06d0fb81b644d20c464ad650e298f74892bf WHIRLPOOL b1892f305a7db7da57cb7fd0ff8ad40802bcb21b4ea08da0ee1d57dfb86c7c3e989b7d1a7d729a6008d4ef0abfc87a6d7e7b712ebc6966779ce687f9c1883d43
diff --git a/media-sound/mpd/files/mpd-0.18.conf.patch b/media-sound/mpd/files/mpd-0.18.conf.patch
new file mode 100644
index 000000000000..d71056f7cd0d
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.18.conf.patch
@@ -0,0 +1,78 @@
+diff --git a/doc/mpdconf.dist b/doc/mpdconf.dist
+index 470a5c9..9f595a6 100644
+--- a/doc/mpdconf.dist
++++ b/doc/mpdconf.dist
+@@ -10,14 +10,14 @@
+ # be disabled and audio files will only be accepted over ipc socket (using
+ # file:// protocol) or streaming files over an accepted protocol.
+ #
+-#music_directory		"~/music"
++music_directory			"/var/lib/mpd/music"
+ #
+ # This setting sets the MPD internal playlist directory. The purpose of this
+ # directory is storage for playlists created by MPD. The server will use 
+ # playlist files not created by the server but only if they are in the MPD
+ # format. This setting defaults to playlist saving being disabled.
+ #
+-#playlist_directory		"~/.mpd/playlists"
++playlist_directory		"/var/lib/mpd/playlists"
+ #
+ # This setting sets the location of the MPD database. This file is used to
+ # load the database at server start up and store the database while the 
+@@ -25,7 +25,7 @@
+ # MPD to accept files over ipc socket (using file:// protocol) or streaming
+ # files over an accepted protocol.
+ #
+-#db_file			"~/.mpd/database"
++db_file			"/var/lib/mpd/database"
+ # 
+ # These settings are the locations for the daemon log files for the daemon.
+ # These logs are great for troubleshooting, depending on your log_level
+@@ -34,20 +34,20 @@
+ # The special value "syslog" makes MPD use the local syslog daemon. This
+ # setting defaults to logging to syslog, otherwise logging is disabled.
+ #
+-#log_file			"~/.mpd/log"
++log_file			"/var/lib/mpd/log"
+ #
+ # This setting sets the location of the file which stores the process ID
+-# for use of mpd --kill and some init scripts. This setting is disabled by
+-# default and the pid file will not be stored.
++# for use of mpd --kill and some init scripts. This setting is required when
++# using the Gentoo init script.
+ #
+-#pid_file			"~/.mpd/pid"
++pid_file			"/var/lib/mpd/pid"
+ #
+ # This setting sets the location of the file which contains information about
+ # most variables to get MPD back into the same general shape it was in before
+ # it was brought down. This setting is disabled by default and the server 
+ # state will be reset on server start up.
+ #
+-#state_file			"~/.mpd/state"
++state_file			"/var/lib/mpd/state"
+ #
+ # The location of the sticker database.  This is a database which
+ # manages dynamic information attached to songs.
+@@ -64,7 +64,7 @@
+ # initialization. This setting is disabled by default and MPD is run as the
+ # current user.
+ #
+-#user				"nobody"
++user				"mpd"
+ #
+ # This setting specifies the group that MPD will run as. If not specified
+ # primary group of user specified with "user" setting will be used (if set).
+@@ -78,10 +78,10 @@
+ # This setting can deny access to control of the daemon.
+ #
+ # For network
+-#bind_to_address		"any"
++bind_to_address		"localhost"
+ #
+ # And for Unix Socket
+-#bind_to_address		"~/.mpd/socket"
++bind_to_address		"/var/lib/mpd/socket"
+ #
+ # This setting is the TCP port that is desired for the daemon to get assigned
+ # to.
diff --git a/media-sound/mpd/files/mpd-0.20.4.init b/media-sound/mpd/files/mpd-0.20.4.init
new file mode 100644
index 000000000000..3eb0bc2bcb82
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.20.4.init
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: CFGFILE=${CFGFILE:=/etc/mpd.conf}
+
+depend() {
+	need localmount
+	use net netmount nfsmount alsasound esound pulseaudio
+	config ${CFGFILE}
+}
+
+get_config() {
+	x=$1
+	test -e ${CFGFILE} || return 1
+	sed -n \
+	  -e '/^[ \t]*'${x}'/{s:^[ \t]*'${x}'[ \t]\+"\?\([^#"]\+\)[^"]*"\?$:\1: ; p }' \
+	  ${CFGFILE}
+}
+
+extra_started_commands='reload'
+command=/usr/bin/mpd
+command_args=${opts:=${CFGFILE}}
+required_files=${CFGFILE}
+pidfile=$(get_config pid_file)
+description="Music Player Daemon"
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	kill -HUP `cat ${pidfile}`
+	eend $?
+}
diff --git a/media-sound/mpd/files/mpd-0.20.4.logrotate b/media-sound/mpd/files/mpd-0.20.4.logrotate
new file mode 100644
index 000000000000..ff47d1098cf1
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.20.4.logrotate
@@ -0,0 +1,6 @@
+/var/lib/mpd/log {
+	missingok
+	postrotate
+	/etc/init.d/mpd reload
+	endscript
+}
diff --git a/media-sound/mpd/files/mpd-0.9.15-systemd.patch b/media-sound/mpd/files/mpd-0.9.15-systemd.patch
new file mode 100644
index 000000000000..cd03ebe16855
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.9.15-systemd.patch
@@ -0,0 +1,106 @@
+Description: transition to libsystemd from deprecated libsystemd-daemon
+ systemd 209 merged the various libsystemd-* libraries into a single
+ libsystemd.so, so we check for that instead and rename the configure
+ option, define, etc accordingly.
+Author: Florian Schlichting <fsfs@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779762
+Forwarded: not-needed (solved in a less invasive and backward-compatible way upstream)
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -572,10 +572,10 @@
+ MPD_DEPENDS([enable_sqlite], [enable_glib],
+ 	[Cannot use --enable-sqlite with --disable-glib])
+ 
+-AC_ARG_ENABLE(systemd-daemon,
+-	AS_HELP_STRING([--enable-systemd-daemon],
+-		[use the systemd daemon library (default=auto)]),,
+-	[enable_systemd_daemon=$linux_auto])
++AC_ARG_ENABLE(systemd,
++	AS_HELP_STRING([--enable-systemd],
++		[use the systemd library (default=auto)]),,
++	[enable_systemd=$linux_auto])
+ 
+ AC_ARG_ENABLE(tcp,
+ 	AS_HELP_STRING([--disable-tcp],
+@@ -762,11 +762,11 @@
+ 	AC_MSG_ERROR([No client interfaces configured!])
+ fi
+ 
+-MPD_AUTO_PKG(systemd_daemon, SYSTEMD_DAEMON, libsystemd-daemon,
+-	[systemd activation], [libsystemd-daemon not found])
+-AM_CONDITIONAL(ENABLE_SYSTEMD_DAEMON, test x$enable_systemd_daemon = xyes)
+-if test x$enable_systemd_daemon = xyes; then
+-	AC_DEFINE([ENABLE_SYSTEMD_DAEMON], 1, [Define to use the systemd daemon library])
++MPD_AUTO_PKG(systemd, SYSTEMD, libsystemd,
++	[systemd activation], [libsystemd not found])
++AM_CONDITIONAL(ENABLE_SYSTEMD, test x$enable_systemd = xyes)
++if test x$enable_systemd = xyes; then
++	AC_DEFINE([ENABLE_SYSTEMD], 1, [Define to use the systemd library])
+ fi
+ 
+ dnl ---------------------------------------------------------------------------
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -58,7 +58,7 @@
+ 	$(ICU_LDADD) \
+ 	libutil.a \
+ 	$(FS_LIBS) \
+-	$(SYSTEMD_DAEMON_LIBS) \
++	$(SYSTEMD_LIBS) \
+ 	$(GLIB_LIBS)
+ 
+ src_mpd_SOURCES = \
+--- a/config.h.in
++++ b/config.h.in
+@@ -75,8 +75,8 @@
+ /* Define to enable sqlite database support */
+ #undef ENABLE_SQLITE
+ 
+-/* Define to use the systemd daemon library */
+-#undef ENABLE_SYSTEMD_DAEMON
++/* Define to use the systemd library */
++#undef ENABLE_SYSTEMD
+ 
+ /* Define to enable the TwoLAME encoder plugin */
+ #undef ENABLE_TWOLAME_ENCODER
+--- a/src/Listen.cxx
++++ b/src/Listen.cxx
+@@ -32,7 +32,7 @@
+ #include <string.h>
+ #include <assert.h>
+ 
+-#ifdef ENABLE_SYSTEMD_DAEMON
++#ifdef ENABLE_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
+ 
+@@ -77,7 +77,7 @@
+ 	}
+ }
+ 
+-#ifdef ENABLE_SYSTEMD_DAEMON
++#ifdef ENABLE_SYSTEMD
+ 
+ static bool
+ listen_systemd_activation(Error &error_r)
+@@ -109,7 +109,7 @@
+ 
+ 	listen_socket = new ClientListener(loop, partition);
+ 
+-#ifdef ENABLE_SYSTEMD_DAEMON
++#ifdef ENABLE_SYSTEMD
+ 	if (listen_systemd_activation(error))
+ 		return true;
+ 
+--- a/doc/user.xml
++++ b/doc/user.xml
+@@ -110,7 +110,7 @@
+   libupnp-dev \
+   libavahi-client-dev \
+   libsqlite3-dev \
+-  libsystemd-daemon-dev libwrap0-dev \
++  libsystemd-dev libwrap0-dev \
+   libcppunit-dev xmlto \
+   libboost-dev \
+   libglib2.0-dev libicu-dev
diff --git a/media-sound/mpd/files/mpd.logrotate b/media-sound/mpd/files/mpd.logrotate
new file mode 100644
index 000000000000..c913c1facc43
--- /dev/null
+++ b/media-sound/mpd/files/mpd.logrotate
@@ -0,0 +1,7 @@
+/var/lib/mpd/log {
+	missingok
+	postrotate
+	[ -f /var/run/mpd.pid ] && cat /var/run/mpd.pid | xargs /bin/kill -HUP
+	[ -f /var/lib/mpd/pid ] && cat /var/lib/mpd/pid | xargs /bin/kill -HUP
+	endscript
+}
diff --git a/media-sound/mpd/files/mpd2.init b/media-sound/mpd/files/mpd2.init
new file mode 100644
index 000000000000..ae5a2cce0ebc
--- /dev/null
+++ b/media-sound/mpd/files/mpd2.init
@@ -0,0 +1,36 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+	use net netmount nfsmount alsasound esound pulseaudio
+}
+
+checkconfig() {
+	if ! [ -f /etc/mpd.conf ]; then
+		eerror "Configuration file /etc/mpd.conf does not exist."
+		return 1
+	fi
+
+	if ! grep -q '^\s*pid_file' /etc/mpd.conf; then
+		eerror "Invalid configuration: pid_file needs to be set."
+		return 1
+	fi
+
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting Music Player Daemon"
+	start-stop-daemon --start --quiet --exec /usr/bin/mpd -- /etc/mpd.conf 2>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Music Player Daemon"
+	/usr/bin/mpd --kill
+	eend $?
+}
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
new file mode 100644
index 000000000000..a824cdeb5ff0
--- /dev/null
+++ b/media-sound/mpd/metadata.xml
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hwoarang@gentoo.org</email>
+    <name>Markos Chandras</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="adplug">Enable the AdPlug decoder plugin</flag>
+    <flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
+    <flag name="curl">Support for web stream listening</flag>
+    <flag name="eventfd">Use the eventfd function in MPD's event loop</flag>
+    <flag name="faad">Use external faad library for AAC decoding</flag>
+    <flag name="fifo">Support writing audio to a FIFO</flag>
+    <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (discouraged)</flag>
+    <flag name="glib">Enable GLib usage</flag>
+    <flag name="gme">Enables support for <pkg>media-libs/game-music-emu</pkg> for playing various video game music formats.</flag>
+    <flag name="id3tag">Support for ID3 tags</flag>
+    <flag name="inotify">Use the Linux kernel inotify subsystem to notice changes to mpd music library</flag>
+    <flag name="lame">Support for MP3 streaming via Icecast2</flag>
+    <flag name="libmpdclient">Enable support for remote mpd databases</flag>
+    <flag name="libsoxr">Enable the libsoxr resampler</flag>
+    <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
+    <flag name="network">Enables network streaming support</flag>
+    <flag name="nfs">Enable support for the Network File System</flag>
+    <flag name="opus">Enable Opus codec support</flag>
+    <flag name="pipe">Support writing audio to a pipe</flag>
+    <flag name="recorder">Enables output plugin for recording radio streams</flag>
+    <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
+    <flag name="signalfd">Use the signalfd function in MPD's event loop</flag>
+    <flag name="soundcloud">Build plugin to access soundcloud</flag>
+    <flag name="systemd">Enable support for systemd socket activation</flag>
+    <flag name="twolame">Support twolame MPEG-2 encoding</flag>
+    <flag name="wildmidi">Enable MIDI support via wildmidi</flag>
+    <flag name="zip">Support for ZIP files</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">MusicPlayerDaemon/MPD</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/mpd/mpd-0.19.19.ebuild b/media-sound/mpd/mpd-0.19.19.ebuild
new file mode 100644
index 000000000000..6802c56a0465
--- /dev/null
+++ b/media-sound/mpd/mpd-0.19.19.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic linux-info multilib systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
+	+fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack
+	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
+	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
+	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
+	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	ao? ( glib )
+	gme? ( glib )
+	jack? ( glib )
+	network? ( || ( ${ENCODER_PLUGINS} )
+		glib )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	sid? ( glib )
+	soundcloud? ( glib )
+	sqlite? ( glib )
+	opus? ( ogg )
+	upnp? ( expat )
+	vorbis? ( glib )
+	wavpack? ( glib )"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	adplug? ( media-libs/adplug )
+	alsa? ( media-sound/alsa-utils
+		media-libs/alsa-lib )
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio-paranoia )
+	curl? ( net-misc/curl )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	glib? ( dev-libs/glib:2 )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? ( dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
+	nfs? ( net-fs/libnfs )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) )
+	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2 )
+	libsoxr? ( media-libs/soxr )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	upnp? ( net-libs/libupnp )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+	"${FILESDIR}"/${PN}-0.9.15-systemd.patch # bug 584742
+)
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local mpdconf="--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
+		--disable-solaris-output --enable-tcp --enable-un --disable-werror
+		--docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	if use network; then
+		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output $(use_enable lame lame-encoder)
+			$(use_enable twolame twolame-encoder)
+			$(use_enable audiofile wave-encoder)"
+	else
+		mpdconf+=" --disable-shout --disable-vorbis-encoder
+			--disable-httpd-output --disable-lame-encoder
+			--disable-twolame-encoder --disable-wave-encoder"
+	fi
+
+	if use samba || use upnp; then
+		mpdconf+=" --enable-neighbor-plugins"
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	econf \
+		$(use_enable eventfd)		\
+		$(use_enable signalfd)		\
+		$(use_enable libmpdclient)	\
+		$(use_enable expat)			\
+		$(use_enable upnp)			\
+		$(use_enable adplug)		\
+		$(use_enable alsa)			\
+		$(use_enable ao)			\
+		$(use_enable audiofile)		\
+		$(use_enable zlib)			\
+		$(use_enable bzip2)			\
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable curl)			\
+		$(use_enable samba smbclient) \
+		$(use_enable nfs)			\
+		$(use_enable debug)			\
+		$(use_enable ffmpeg)		\
+		$(use_enable fifo)			\
+		$(use_enable flac)			\
+		$(use_enable fluidsynth)	\
+		$(use_enable gme)			\
+		$(use_enable id3tag id3)	\
+		$(use_enable inotify)		\
+		$(use_enable ipv6)			\
+		$(use_enable cdio iso9660)	\
+		$(use_enable jack)			\
+		$(use_enable soundcloud)	\
+		$(use_enable tcpd libwrap)	\
+		$(use_enable libsamplerate lsr) \
+		$(use_enable libsoxr soxr)	\
+		$(use_enable mad)			\
+		$(use_enable mikmod)		\
+		$(use_enable mms)			\
+		$(use_enable modplug)		\
+		$(use_enable musepack mpc)	\
+		$(use_enable mpg123)		\
+		$(use_enable openal)		\
+		$(use_enable opus)			\
+		$(use_enable oss)			\
+		$(use_enable pipe pipe-output) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable recorder recorder-output) \
+		$(use_enable sid sidplay)	\
+		$(use_enable sndfile sndfile) \
+		$(use_enable sqlite)		\
+		$(use_enable systemd) \
+		$(use_enable vorbis)		\
+		$(use_enable wavpack)		\
+		$(use_enable wildmidi)		\
+		$(use_enable zip zzip)		\
+		$(use_enable icu)			\
+		$(use_enable glib)			\
+		$(use_enable faad aac)		\
+		$(use_with zeroconf zeroconf avahi) \
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
+		${mpdconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/${PN}2.init ${PN}
+
+	systemd_newuserunit systemd/${PN}.service ${PN}.service
+	sed -i '/WantedBy=/c WantedBy=default.target' \
+		"${ED}"/usr/lib/systemd/user/mpd.service || die "sed failed"
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	use prefix || diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpd/mpd-0.19.21-r1.ebuild b/media-sound/mpd/mpd-0.19.21-r1.ebuild
new file mode 100644
index 000000000000..95bd8d46b86a
--- /dev/null
+++ b/media-sound/mpd/mpd-0.19.21-r1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic linux-info multilib systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
+	+fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack
+	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
+	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
+	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
+	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	ao? ( glib )
+	gme? ( glib )
+	jack? ( glib )
+	network? ( || ( ${ENCODER_PLUGINS} )
+		glib )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	sid? ( glib )
+	soundcloud? ( glib )
+	sqlite? ( glib )
+	opus? ( ogg )
+	upnp? ( expat )
+	vorbis? ( glib )
+	wavpack? ( glib )"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	adplug? ( media-libs/adplug )
+	alsa? ( media-sound/alsa-utils
+		media-libs/alsa-lib )
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio-paranoia )
+	curl? ( net-misc/curl )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	glib? ( dev-libs/glib:2 )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? ( dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
+	nfs? ( net-fs/libnfs )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) )
+	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2 )
+	libsoxr? ( media-libs/soxr )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	upnp? ( net-libs/libupnp )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+	"${FILESDIR}"/${PN}-0.9.15-systemd.patch # bug 584742
+)
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local mpdconf="--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
+		--disable-solaris-output --enable-tcp --enable-un --disable-werror
+		--docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	if use network; then
+		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output $(use_enable lame lame-encoder)
+			$(use_enable twolame twolame-encoder)
+			$(use_enable audiofile wave-encoder)"
+	else
+		mpdconf+=" --disable-shout --disable-vorbis-encoder
+			--disable-httpd-output --disable-lame-encoder
+			--disable-twolame-encoder --disable-wave-encoder"
+	fi
+
+	if use samba || use upnp; then
+		mpdconf+=" --enable-neighbor-plugins"
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	econf \
+		$(use_enable eventfd)		\
+		$(use_enable signalfd)		\
+		$(use_enable libmpdclient)	\
+		$(use_enable expat)			\
+		$(use_enable upnp)			\
+		$(use_enable adplug)		\
+		$(use_enable alsa)			\
+		$(use_enable ao)			\
+		$(use_enable audiofile)		\
+		$(use_enable zlib)			\
+		$(use_enable bzip2)			\
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable curl)			\
+		$(use_enable samba smbclient) \
+		$(use_enable nfs)			\
+		$(use_enable debug)			\
+		$(use_enable ffmpeg)		\
+		$(use_enable fifo)			\
+		$(use_enable flac)			\
+		$(use_enable fluidsynth)	\
+		$(use_enable gme)			\
+		$(use_enable id3tag id3)	\
+		$(use_enable inotify)		\
+		$(use_enable ipv6)			\
+		$(use_enable cdio iso9660)	\
+		$(use_enable jack)			\
+		$(use_enable soundcloud)	\
+		$(use_enable tcpd libwrap)	\
+		$(use_enable libsamplerate lsr) \
+		$(use_enable libsoxr soxr)	\
+		$(use_enable mad)			\
+		$(use_enable mikmod)		\
+		$(use_enable mms)			\
+		$(use_enable modplug)		\
+		$(use_enable musepack mpc)	\
+		$(use_enable mpg123)		\
+		$(use_enable openal)		\
+		$(use_enable opus)			\
+		$(use_enable oss)			\
+		$(use_enable pipe pipe-output) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable recorder recorder-output) \
+		$(use_enable sid sidplay)	\
+		$(use_enable sndfile sndfile) \
+		$(use_enable sqlite)		\
+		$(use_enable systemd) \
+		$(use_enable vorbis)		\
+		$(use_enable wavpack)		\
+		$(use_enable wildmidi)		\
+		$(use_enable zip zzip)		\
+		$(use_enable icu)			\
+		$(use_enable glib)			\
+		$(use_enable faad aac)		\
+		$(use_with zeroconf zeroconf avahi) \
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
+		--with-systemduserunitdir=$(systemd_get_userunitdir) \
+		${mpdconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/${PN}2.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	use prefix || diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpd/mpd-0.19.21.ebuild b/media-sound/mpd/mpd-0.19.21.ebuild
new file mode 100644
index 000000000000..0d1a80bd0ea4
--- /dev/null
+++ b/media-sound/mpd/mpd-0.19.21.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic linux-info multilib systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
+	+fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack
+	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
+	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
+	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
+	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	ao? ( glib )
+	gme? ( glib )
+	jack? ( glib )
+	network? ( || ( ${ENCODER_PLUGINS} )
+		glib )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	sid? ( glib )
+	soundcloud? ( glib )
+	sqlite? ( glib )
+	opus? ( ogg )
+	upnp? ( expat )
+	vorbis? ( glib )
+	wavpack? ( glib )"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	adplug? ( media-libs/adplug )
+	alsa? ( media-sound/alsa-utils
+		media-libs/alsa-lib )
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio-paranoia )
+	curl? ( net-misc/curl )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	glib? ( dev-libs/glib:2 )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? ( dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
+	nfs? ( net-fs/libnfs )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) )
+	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2 )
+	libsoxr? ( media-libs/soxr )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	upnp? ( net-libs/libupnp )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+	"${FILESDIR}"/${PN}-0.9.15-systemd.patch # bug 584742
+)
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local mpdconf="--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
+		--disable-solaris-output --enable-tcp --enable-un --disable-werror
+		--docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	if use network; then
+		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output $(use_enable lame lame-encoder)
+			$(use_enable twolame twolame-encoder)
+			$(use_enable audiofile wave-encoder)"
+	else
+		mpdconf+=" --disable-shout --disable-vorbis-encoder
+			--disable-httpd-output --disable-lame-encoder
+			--disable-twolame-encoder --disable-wave-encoder"
+	fi
+
+	if use samba || use upnp; then
+		mpdconf+=" --enable-neighbor-plugins"
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	econf \
+		$(use_enable eventfd)		\
+		$(use_enable signalfd)		\
+		$(use_enable libmpdclient)	\
+		$(use_enable expat)			\
+		$(use_enable upnp)			\
+		$(use_enable adplug)		\
+		$(use_enable alsa)			\
+		$(use_enable ao)			\
+		$(use_enable audiofile)		\
+		$(use_enable zlib)			\
+		$(use_enable bzip2)			\
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable curl)			\
+		$(use_enable samba smbclient) \
+		$(use_enable nfs)			\
+		$(use_enable debug)			\
+		$(use_enable ffmpeg)		\
+		$(use_enable fifo)			\
+		$(use_enable flac)			\
+		$(use_enable fluidsynth)	\
+		$(use_enable gme)			\
+		$(use_enable id3tag id3)	\
+		$(use_enable inotify)		\
+		$(use_enable ipv6)			\
+		$(use_enable cdio iso9660)	\
+		$(use_enable jack)			\
+		$(use_enable soundcloud)	\
+		$(use_enable tcpd libwrap)	\
+		$(use_enable libsamplerate lsr) \
+		$(use_enable libsoxr soxr)	\
+		$(use_enable mad)			\
+		$(use_enable mikmod)		\
+		$(use_enable mms)			\
+		$(use_enable modplug)		\
+		$(use_enable musepack mpc)	\
+		$(use_enable mpg123)		\
+		$(use_enable openal)		\
+		$(use_enable opus)			\
+		$(use_enable oss)			\
+		$(use_enable pipe pipe-output) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable recorder recorder-output) \
+		$(use_enable sid sidplay)	\
+		$(use_enable sndfile sndfile) \
+		$(use_enable sqlite)		\
+		$(use_enable systemd) \
+		$(use_enable vorbis)		\
+		$(use_enable wavpack)		\
+		$(use_enable wildmidi)		\
+		$(use_enable zip zzip)		\
+		$(use_enable icu)			\
+		$(use_enable glib)			\
+		$(use_enable faad aac)		\
+		$(use_with zeroconf zeroconf avahi) \
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
+		${mpdconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/${PN}2.init ${PN}
+
+	systemd_newuserunit systemd/system/${PN}.service ${PN}.service
+	sed -i '/WantedBy=/c WantedBy=default.target' \
+		"${ED}"/usr/lib/systemd/user/mpd.service || die "sed failed"
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	use prefix || diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpd/mpd-0.20.10.ebuild b/media-sound/mpd/mpd-0.20.10.ebuild
new file mode 100644
index 000000000000..7e3851e85edd
--- /dev/null
+++ b/media-sound/mpd/mpd-0.20.10.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic linux-info systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
+	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
+	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
+	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
+	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
+	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	opus? ( ogg )
+	upnp? ( expat )
+"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	adplug? ( media-libs/adplug )
+	alsa? (
+		media-sound/alsa-utils
+		media-libs/alsa-lib
+	)
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio-paranoia )
+	curl? ( net-misc/curl )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? ( dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	network? (
+		>=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) )
+	)
+	nfs? ( net-fs/libnfs )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-4.0.25 )
+	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	libsoxr? ( media-libs/soxr )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	upnp? ( net-libs/libupnp:= )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
+		--disable-solaris-output --enable-tcp --enable-un --disable-werror
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+	)
+
+	if use network; then
+		myeconfargs+=(
+			--enable-shout
+			$(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output
+			$(use_enable lame lame-encoder)
+			$(use_enable twolame twolame-encoder)
+			$(use_enable audiofile wave-encoder)
+		)
+	else
+		myeconfargs+=(
+			--disable-shout
+			--disable-vorbis-encoder
+			--disable-httpd-output
+			--disable-lame-encoder
+			--disable-twolame-encoder
+			--disable-wave-encoder
+		)
+	fi
+
+	if use samba || use upnp; then
+		myeconfargs+=( --enable-neighbor-plugins )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	myeconfargs+=(
+		$(use_enable eventfd)
+		$(use_enable signalfd)
+		$(use_enable libmpdclient)
+		$(use_enable expat)
+		$(use_enable upnp)
+		$(use_enable adplug)
+		$(use_enable alsa)
+		$(use_enable ao)
+		$(use_enable audiofile)
+		$(use_enable zlib)
+		$(use_enable bzip2)
+		$(use_enable cdio cdio-paranoia)
+		$(use_enable curl)
+		$(use_enable samba smbclient)
+		$(use_enable nfs)
+		$(use_enable debug)
+		$(use_enable ffmpeg)
+		$(use_enable fifo)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable gme)
+		$(use_enable id3tag id3)
+		$(use_enable inotify)
+		$(use_enable ipv6)
+		$(use_enable cdio iso9660)
+		$(use_enable jack)
+		$(use_enable soundcloud)
+		$(use_enable tcpd libwrap)
+		$(use_enable libsamplerate lsr)
+		$(use_enable libsoxr soxr)
+		$(use_enable mad)
+		$(use_enable mikmod)
+		$(use_enable mms)
+		$(use_enable modplug)
+		$(use_enable musepack mpc)
+		$(use_enable mpg123)
+		$(use_enable openal)
+		$(use_enable opus)
+		$(use_enable oss)
+		$(use_enable pipe pipe-output)
+		$(use_enable pulseaudio pulse)
+		$(use_enable recorder recorder-output)
+		$(use_enable sid sidplay)
+		$(use_enable sndfile sndfile)
+		$(use_enable sqlite)
+		$(use_enable systemd systemd_daemon)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
+		$(use_enable wildmidi)
+		$(use_enable zip zzip)
+		$(use_enable icu)
+		$(use_enable faad aac)
+		$(use_with zeroconf zeroconf avahi)
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.20.4.logrotate ${PN}
+
+	use prefix || diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpd/mpd-0.20.4.ebuild b/media-sound/mpd/mpd-0.20.4.ebuild
new file mode 100644
index 000000000000..3cb6b50f5acb
--- /dev/null
+++ b/media-sound/mpd/mpd-0.20.4.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic linux-info multilib systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
+	+fifo +ffmpeg flac fluidsynth +glib gme +icu +id3tag +inotify +ipv6 jack
+	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
+	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
+	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
+	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	ao? ( glib )
+	gme? ( glib )
+	jack? ( glib )
+	network? ( || ( ${ENCODER_PLUGINS} )
+		glib )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	sid? ( glib )
+	soundcloud? ( glib )
+	sqlite? ( glib )
+	opus? ( ogg )
+	upnp? ( expat )
+	vorbis? ( glib )
+	wavpack? ( glib )"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	adplug? ( media-libs/adplug )
+	alsa? ( media-sound/alsa-utils
+		media-libs/alsa-lib )
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio-paranoia )
+	curl? ( net-misc/curl )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	glib? ( dev-libs/glib:2 )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? ( dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( >=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) ) )
+	nfs? ( net-fs/libnfs )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( || ( <net-fs/samba-4.0.25[smbclient] >=net-fs/samba-4.0.25 ) )
+	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2 )
+	libsoxr? ( media-libs/soxr )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	upnp? ( net-libs/libupnp )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+	#"${FILESDIR}"/${PN}-0.9.15-systemd.patch # bug 584742, merged upstream
+)
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local mpdconf="--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
+		--disable-solaris-output --enable-tcp --enable-un --disable-werror
+		--docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	if use network; then
+		mpdconf+=" --enable-shout $(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output $(use_enable lame lame-encoder)
+			$(use_enable twolame twolame-encoder)
+			$(use_enable audiofile wave-encoder)"
+	else
+		mpdconf+=" --disable-shout --disable-vorbis-encoder
+			--disable-httpd-output --disable-lame-encoder
+			--disable-twolame-encoder --disable-wave-encoder"
+	fi
+
+	if use samba || use upnp; then
+		mpdconf+=" --enable-neighbor-plugins"
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	econf \
+		$(use_enable eventfd)		\
+		$(use_enable signalfd)		\
+		$(use_enable libmpdclient)	\
+		$(use_enable expat)			\
+		$(use_enable upnp)			\
+		$(use_enable adplug)		\
+		$(use_enable alsa)			\
+		$(use_enable ao)			\
+		$(use_enable audiofile)		\
+		$(use_enable zlib)			\
+		$(use_enable bzip2)			\
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable curl)			\
+		$(use_enable samba smbclient) \
+		$(use_enable nfs)			\
+		$(use_enable debug)			\
+		$(use_enable ffmpeg)		\
+		$(use_enable fifo)			\
+		$(use_enable flac)			\
+		$(use_enable fluidsynth)	\
+		$(use_enable gme)			\
+		$(use_enable id3tag id3)	\
+		$(use_enable inotify)		\
+		$(use_enable ipv6)			\
+		$(use_enable cdio iso9660)	\
+		$(use_enable jack)			\
+		$(use_enable soundcloud)	\
+		$(use_enable tcpd libwrap)	\
+		$(use_enable libsamplerate lsr) \
+		$(use_enable libsoxr soxr)	\
+		$(use_enable mad)			\
+		$(use_enable mikmod)		\
+		$(use_enable mms)			\
+		$(use_enable modplug)		\
+		$(use_enable musepack mpc)	\
+		$(use_enable mpg123)		\
+		$(use_enable openal)		\
+		$(use_enable opus)			\
+		$(use_enable oss)			\
+		$(use_enable pipe pipe-output) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable recorder recorder-output) \
+		$(use_enable sid sidplay)	\
+		$(use_enable sndfile sndfile) \
+		$(use_enable sqlite)		\
+		$(use_enable systemd) \
+		$(use_enable vorbis)		\
+		$(use_enable wavpack)		\
+		$(use_enable wildmidi)		\
+		$(use_enable zip zzip)		\
+		$(use_enable icu)			\
+		$(use_enable glib)			\
+		$(use_enable faad aac)		\
+		$(use_with zeroconf zeroconf avahi) \
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir) \
+		--with-systemduserunitdir=$(systemd_get_userunitdir) \
+		${mpdconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.20.4.logrotate ${PN}
+
+	use prefix || diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpd/mpd-0.20.6.ebuild b/media-sound/mpd/mpd-0.20.6.ebuild
new file mode 100644
index 000000000000..a608f71a691c
--- /dev/null
+++ b/media-sound/mpd/mpd-0.20.6.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic linux-info multilib systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
+	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
+	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
+	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
+	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
+	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	opus? ( ogg )
+	upnp? ( expat )
+"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	adplug? ( media-libs/adplug )
+	alsa? (
+		media-sound/alsa-utils
+		media-libs/alsa-lib
+	)
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio-paranoia )
+	curl? ( net-misc/curl )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? ( dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	network? (
+		>=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) )
+	)
+	nfs? ( net-fs/libnfs )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-4.0.25 )
+	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	libsoxr? ( media-libs/soxr )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	upnp? ( net-libs/libupnp )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
+		--disable-solaris-output --enable-tcp --enable-un --disable-werror
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+	)
+
+	if use network; then
+		myeconfargs+=(
+			--enable-shout
+			$(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output
+			$(use_enable lame lame-encoder)
+			$(use_enable twolame twolame-encoder)
+			$(use_enable audiofile wave-encoder)
+		)
+	else
+		myeconfargs+=(
+			--disable-shout
+			--disable-vorbis-encoder
+			--disable-httpd-output
+			--disable-lame-encoder
+			--disable-twolame-encoder
+			--disable-wave-encoder
+		)
+	fi
+
+	if use samba || use upnp; then
+		myeconfargs+=( --enable-neighbor-plugins )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	myeconfargs+=(
+		$(use_enable eventfd)
+		$(use_enable signalfd)
+		$(use_enable libmpdclient)
+		$(use_enable expat)
+		$(use_enable upnp)
+		$(use_enable adplug)
+		$(use_enable alsa)
+		$(use_enable ao)
+		$(use_enable audiofile)
+		$(use_enable zlib)
+		$(use_enable bzip2)
+		$(use_enable cdio cdio-paranoia)
+		$(use_enable curl)
+		$(use_enable samba smbclient)
+		$(use_enable nfs)
+		$(use_enable debug)
+		$(use_enable ffmpeg)
+		$(use_enable fifo)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable gme)
+		$(use_enable id3tag id3)
+		$(use_enable inotify)
+		$(use_enable ipv6)
+		$(use_enable cdio iso9660)
+		$(use_enable jack)
+		$(use_enable soundcloud)
+		$(use_enable tcpd libwrap)
+		$(use_enable libsamplerate lsr)
+		$(use_enable libsoxr soxr)
+		$(use_enable mad)
+		$(use_enable mikmod)
+		$(use_enable mms)
+		$(use_enable modplug)
+		$(use_enable musepack mpc)
+		$(use_enable mpg123)
+		$(use_enable openal)
+		$(use_enable opus)
+		$(use_enable oss)
+		$(use_enable pipe pipe-output)
+		$(use_enable pulseaudio pulse)
+		$(use_enable recorder recorder-output)
+		$(use_enable sid sidplay)
+		$(use_enable sndfile sndfile)
+		$(use_enable sqlite)
+		$(use_enable systemd systemd_daemon)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
+		$(use_enable wildmidi)
+		$(use_enable zip zzip)
+		$(use_enable icu)
+		$(use_enable faad aac)
+		$(use_with zeroconf zeroconf avahi)
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.20.4.logrotate ${PN}
+
+	use prefix || diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpd/mpd-0.20.8.ebuild b/media-sound/mpd/mpd-0.20.8.ebuild
new file mode 100644
index 000000000000..0b190a1feb8b
--- /dev/null
+++ b/media-sound/mpd/mpd-0.20.8.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic linux-info multilib systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
+	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
+	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
+	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
+	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
+	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	opus? ( ogg )
+	upnp? ( expat )
+"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	adplug? ( media-libs/adplug )
+	alsa? (
+		media-sound/alsa-utils
+		media-libs/alsa-lib
+	)
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio-paranoia )
+	curl? ( net-misc/curl )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? ( dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	network? (
+		>=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) )
+	)
+	nfs? ( net-fs/libnfs )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-4.0.25 )
+	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	libsoxr? ( media-libs/soxr )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	upnp? ( net-libs/libupnp:= )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
+		--disable-solaris-output --enable-tcp --enable-un --disable-werror
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+	)
+
+	if use network; then
+		myeconfargs+=(
+			--enable-shout
+			$(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output
+			$(use_enable lame lame-encoder)
+			$(use_enable twolame twolame-encoder)
+			$(use_enable audiofile wave-encoder)
+		)
+	else
+		myeconfargs+=(
+			--disable-shout
+			--disable-vorbis-encoder
+			--disable-httpd-output
+			--disable-lame-encoder
+			--disable-twolame-encoder
+			--disable-wave-encoder
+		)
+	fi
+
+	if use samba || use upnp; then
+		myeconfargs+=( --enable-neighbor-plugins )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	myeconfargs+=(
+		$(use_enable eventfd)
+		$(use_enable signalfd)
+		$(use_enable libmpdclient)
+		$(use_enable expat)
+		$(use_enable upnp)
+		$(use_enable adplug)
+		$(use_enable alsa)
+		$(use_enable ao)
+		$(use_enable audiofile)
+		$(use_enable zlib)
+		$(use_enable bzip2)
+		$(use_enable cdio cdio-paranoia)
+		$(use_enable curl)
+		$(use_enable samba smbclient)
+		$(use_enable nfs)
+		$(use_enable debug)
+		$(use_enable ffmpeg)
+		$(use_enable fifo)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable gme)
+		$(use_enable id3tag id3)
+		$(use_enable inotify)
+		$(use_enable ipv6)
+		$(use_enable cdio iso9660)
+		$(use_enable jack)
+		$(use_enable soundcloud)
+		$(use_enable tcpd libwrap)
+		$(use_enable libsamplerate lsr)
+		$(use_enable libsoxr soxr)
+		$(use_enable mad)
+		$(use_enable mikmod)
+		$(use_enable mms)
+		$(use_enable modplug)
+		$(use_enable musepack mpc)
+		$(use_enable mpg123)
+		$(use_enable openal)
+		$(use_enable opus)
+		$(use_enable oss)
+		$(use_enable pipe pipe-output)
+		$(use_enable pulseaudio pulse)
+		$(use_enable recorder recorder-output)
+		$(use_enable sid sidplay)
+		$(use_enable sndfile sndfile)
+		$(use_enable sqlite)
+		$(use_enable systemd systemd_daemon)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
+		$(use_enable wildmidi)
+		$(use_enable zip zzip)
+		$(use_enable icu)
+		$(use_enable faad aac)
+		$(use_with zeroconf zeroconf avahi)
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.20.4.logrotate ${PN}
+
+	use prefix || diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpd/mpd-0.20.9.ebuild b/media-sound/mpd/mpd-0.20.9.ebuild
new file mode 100644
index 000000000000..0b190a1feb8b
--- /dev/null
+++ b/media-sound/mpd/mpd-0.20.9.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic linux-info multilib systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
+	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
+	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
+	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
+	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
+	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	opus? ( ogg )
+	upnp? ( expat )
+"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	adplug? ( media-libs/adplug )
+	alsa? (
+		media-sound/alsa-utils
+		media-libs/alsa-lib
+	)
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio-paranoia )
+	curl? ( net-misc/curl )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? ( dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( >=media-sound/mpg123-1.12.2 )
+	musepack? ( media-sound/musepack-tools )
+	network? (
+		>=media-libs/libshout-2
+		!lame? ( !vorbis? ( media-libs/libvorbis ) )
+	)
+	nfs? ( net-fs/libnfs )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-4.0.25 )
+	sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	libsoxr? ( media-libs/soxr )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	upnp? ( net-libs/libupnp:= )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	use network || ewarn "Icecast and Shoutcast streaming needs networking."
+	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
+
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
+		--disable-solaris-output --enable-tcp --enable-un --disable-werror
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+	)
+
+	if use network; then
+		myeconfargs+=(
+			--enable-shout
+			$(use_enable vorbis vorbis-encoder)
+			--enable-httpd-output
+			$(use_enable lame lame-encoder)
+			$(use_enable twolame twolame-encoder)
+			$(use_enable audiofile wave-encoder)
+		)
+	else
+		myeconfargs+=(
+			--disable-shout
+			--disable-vorbis-encoder
+			--disable-httpd-output
+			--disable-lame-encoder
+			--disable-twolame-encoder
+			--disable-wave-encoder
+		)
+	fi
+
+	if use samba || use upnp; then
+		myeconfargs+=( --enable-neighbor-plugins )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	myeconfargs+=(
+		$(use_enable eventfd)
+		$(use_enable signalfd)
+		$(use_enable libmpdclient)
+		$(use_enable expat)
+		$(use_enable upnp)
+		$(use_enable adplug)
+		$(use_enable alsa)
+		$(use_enable ao)
+		$(use_enable audiofile)
+		$(use_enable zlib)
+		$(use_enable bzip2)
+		$(use_enable cdio cdio-paranoia)
+		$(use_enable curl)
+		$(use_enable samba smbclient)
+		$(use_enable nfs)
+		$(use_enable debug)
+		$(use_enable ffmpeg)
+		$(use_enable fifo)
+		$(use_enable flac)
+		$(use_enable fluidsynth)
+		$(use_enable gme)
+		$(use_enable id3tag id3)
+		$(use_enable inotify)
+		$(use_enable ipv6)
+		$(use_enable cdio iso9660)
+		$(use_enable jack)
+		$(use_enable soundcloud)
+		$(use_enable tcpd libwrap)
+		$(use_enable libsamplerate lsr)
+		$(use_enable libsoxr soxr)
+		$(use_enable mad)
+		$(use_enable mikmod)
+		$(use_enable mms)
+		$(use_enable modplug)
+		$(use_enable musepack mpc)
+		$(use_enable mpg123)
+		$(use_enable openal)
+		$(use_enable opus)
+		$(use_enable oss)
+		$(use_enable pipe pipe-output)
+		$(use_enable pulseaudio pulse)
+		$(use_enable recorder recorder-output)
+		$(use_enable sid sidplay)
+		$(use_enable sndfile sndfile)
+		$(use_enable sqlite)
+		$(use_enable systemd systemd_daemon)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
+		$(use_enable wildmidi)
+		$(use_enable zip zzip)
+		$(use_enable icu)
+		$(use_enable faad aac)
+		$(use_with zeroconf zeroconf avahi)
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.20.4.logrotate ${PN}
+
+	use prefix || diropts -m0755 -o mpd -g audio
+	dodir /var/lib/mpd
+	keepdir /var/lib/mpd
+	dodir /var/lib/mpd/music
+	keepdir /var/lib/mpd/music
+	dodir /var/lib/mpd/playlists
+	keepdir /var/lib/mpd/playlists
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpdas/Manifest b/media-sound/mpdas/Manifest
new file mode 100644
index 000000000000..5893ce114b82
--- /dev/null
+++ b/media-sound/mpdas/Manifest
@@ -0,0 +1,10 @@
+AUX mpdas.init 429 SHA256 de0171a02016a4e1e0f673112fce440ccff8b93e4cd9b3eaebfb2f1cacc90671 SHA512 0d2f7393abe0119cbb43dfaaa7593eff03456e8aa188eb879692108ced01b1980812e8336479e2ee94594537b77f2a9267e34c9a274d1a815bde77e2b3b8f8fc WHIRLPOOL 05b8da85a5259dfc1249565b64538e1617750532a27edea95b1140111384a5a6dd75dce449c7630e1300793a3c03667effbd0a334ee9db6b97e1e48173bcaa3e
+DIST mpdas-0.4.0.tar.gz 15113 SHA256 7b30a9cde19175bddb6b898a78d225242330dbceaca4932f87c5a016141af650 SHA512 0e5643cc2c690b05477b64e8f1761332d53e17809d61ec5ec17ab41f4f0b7b2d6b4013d3b946d3289f02f470b4afef1df8206bd0fab61345cd8431bb2c66742f WHIRLPOOL ca4c13d6d6d75d64d5b43571c22968924510f7302c2bc44264c923dedfcbe010241684262b4befdbc6689fbb17b72aff7ea2a47115664c2e9f0388070d1a27ae
+DIST mpdas-0.4.1.tar.gz 15117 SHA256 f790be8e85c0d1324d7346b5b0fa3713db8db7fd4ea304c5c8d2921bf3855014 SHA512 746ca106f76cbd24fc8460b9c2a7debcb5faf49e65e5307adb1bdf530dab8f99b2e0118ce1324e5bf2af1d08465c3a6f015675dcfb7d1b6d799e228e8ecffd64 WHIRLPOOL c7323f061e976d4a4cc9989f3d643fa1e60fa41cf576723a28d8d7e0f3d5745f97f3da982b8a97ccde7aa64c08c047276b37a2630adf91429178a4f3ff65e418
+DIST mpdas-0.4.2.tar.gz 15695 SHA256 8ebdd0518cbdb033fc0578c9ea894d4670de1d67bf2541418cb5f7ac1210db6f SHA512 cebd3c027002ac5283834edf3a1338b449c4a78261690cb5d25c57f767f1b0b81ff8ca5c64d79d6aecf5e86ba0c7b63a51131f6cc9031f2922e92eeddcada353 WHIRLPOOL 666dadad91961f1d1c205e1f3581570d2aad642ca3a11d0d55d02a4f634254df6c7f7fef266e75557b40b49f70e0ee3b3f7a0a9cb621d54dca9b2c3bb9bc3db6
+EBUILD mpdas-0.4.0-r1.ebuild 713 SHA256 d614057526aaa83f32c94f99c01b45febe566d15c1e7b7003b834fd57e6aef9e SHA512 6ff9c4c330e1a0cd2da0082469f2c4e194e9861a252f6733c427cb62c85b5e3d8ffd63528439296817614e0f7c9c3e4ee6341106823a5718fedc22f88f82f49c WHIRLPOOL a2caf0846e7fc476888ac42c6649f5b234f6876d0f50d2ad2a54c5dc0281937b00a47932a99898180a84156648f109e07534ebb2fcb1f73336b27dce9b87b5c0
+EBUILD mpdas-0.4.1.ebuild 715 SHA256 2c9268dd62052feb169873e8cdcc072e5974eb48fda479637eb81d9bd3c103fc SHA512 79b9bc6753ae2d6a19c07b72ea4d2848b4d34a5e94033c28b8c7aa75e32145903d715c70da3e7ac2c24095e5d43a8ef60b8ce12f764cb20ed7853ca8cc02b7af WHIRLPOOL 4225456fd7c173f41c605cda71f47df98f9e624ec050f080486fbff22d141b7395773cef95771985e1e1966806ba9d472bb61393ba303dd994ee37f7f0c6cddc
+EBUILD mpdas-0.4.2.ebuild 778 SHA256 f52dfceab0142dcb72acbebdf377e5ff912d5fc337e2e0e15fcc7eb99d9bd6eb SHA512 f562d8c3cfb343cbb032849e158c890f920727b7c25116dcdfc17de0695e934cbf05cbf8113a472a9a27fb911d28f4a3a9383f12e5ba9bf3ab32f774897c6ccb WHIRLPOOL 2f73c5176e199918a315574b5dff788c04c701434c243e4286d57abd1f91447e8b75038c36427e2e9b01ce8349e639a4ef29b5532ae32ad8c557ca676d529531
+MISC ChangeLog 4095 SHA256 4157895f445b60530f50691426fdebc96aaf7da699e476c5ac18938bda6ced9c SHA512 6a34b99f17b503e33b85847377d03a06d269843cf751437b08a1f526bd44e66b64ca763adb198a13eaeb08ec91e28f3180a0d130668fd2b0c32d0a28b979cf76 WHIRLPOOL ab2d366f57941f39a18367bea02b6dac1584b8a13f653f09c0c12340e4fb3b5b61d91df13fc442d1507e8901a15cd9728f8d8b97170e7d2ed540e7ff978d5dbc
+MISC ChangeLog-2015 2927 SHA256 e9094b245f85ece0b5ed13bb88ccd3f4dbe177f7f771b93b57907e0227b5e249 SHA512 bbb60939661833637f604851b2ab258a63f0c0ef53fad8dc4011b3c14012ccf9af6598ae8f152b795eb86a653a5eed59ca4902b7080750cae150184a2a6f7022 WHIRLPOOL b33d4ef58d2d1d9a94f03f2c28c98cb247e5fc1789169d36518847f63c44a61f82bddfec318696cd3cf5a3d23c15522492500e7ac25b2afdd129f85f791307f5
+MISC metadata.xml 255 SHA256 fba28ae8638c4e70e71ed13160d8e84ac8b2c3411986b413bf7c7a46d1ae1f8b SHA512 01c6975548c91a866643b9606aded004372568c8f3e30abaf683f9f77221d15c7b3f304103ef8aeaad415326ab3e9e2bca6b71a1ff39f2835dc680e112e75687 WHIRLPOOL 7546e14d91853a393461c968f55f2336d4672f170e46a2800a3abcd33054967e6e7419ac4943dea131c88165b94fa338d2db6b47399b689129b2bd45cd747729
diff --git a/media-sound/mpdas/files/mpdas.init b/media-sound/mpdas/files/mpdas.init
new file mode 100644
index 000000000000..bcb2367665b2
--- /dev/null
+++ b/media-sound/mpdas/files/mpdas.init
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net mpd
+}
+
+start() {
+	ebegin "Starting mpdas"
+	start-stop-daemon --background --start --exec /usr/bin/mpdas \
+		--make-pidfile --pidfile /run/mpdas.pid
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping mpdas"
+	start-stop-daemon --stop --exec /usr/bin/mpdas \
+		--pidfile /run/mpdas.pid
+	eend $?
+}
diff --git a/media-sound/mpdas/metadata.xml b/media-sound/mpdas/metadata.xml
new file mode 100644
index 000000000000..61852ad99397
--- /dev/null
+++ b/media-sound/mpdas/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  	<email>sound@gentoo.org</email>
+  	<name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/mpdas/mpdas-0.4.0-r1.ebuild b/media-sound/mpdas/mpdas-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..99e9d70a110f
--- /dev/null
+++ b/media-sound/mpdas/mpdas-0.4.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="An AudioScrobbler client for MPD written in C++"
+HOMEPAGE="http://50hz.ws/mpdas/"
+SRC_URI="http://50hz.ws/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-libs/libmpdclient
+	net-misc/curl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	tc-export CXX
+	emake CONFIG="/etc"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	dodoc mpdasrc.example README
+}
+
+pkg_postinst() {
+	elog "For further configuration help consult the README in"
+	elog "${EPREFIX}/usr/share/doc/${PF}"
+}
diff --git a/media-sound/mpdas/mpdas-0.4.1.ebuild b/media-sound/mpdas/mpdas-0.4.1.ebuild
new file mode 100644
index 000000000000..02431e9668fa
--- /dev/null
+++ b/media-sound/mpdas/mpdas-0.4.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="An AudioScrobbler client for MPD written in C++"
+HOMEPAGE="http://50hz.ws/mpdas/"
+SRC_URI="http://50hz.ws/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libmpdclient
+	net-misc/curl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	tc-export CXX
+	emake CONFIG="/etc"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	dodoc mpdasrc.example README
+}
+
+pkg_postinst() {
+	elog "For further configuration help consult the README in"
+	elog "${EPREFIX}/usr/share/doc/${PF}"
+}
diff --git a/media-sound/mpdas/mpdas-0.4.2.ebuild b/media-sound/mpdas/mpdas-0.4.2.ebuild
new file mode 100644
index 000000000000..65382e379dd7
--- /dev/null
+++ b/media-sound/mpdas/mpdas-0.4.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="An AudioScrobbler client for MPD written in C++"
+HOMEPAGE="http://50hz.ws/mpdas/"
+SRC_URI="http://50hz.ws/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libmpdclient
+	net-misc/curl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e 's/@//' Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export CXX
+	emake CONFIG="/etc"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+	dodoc mpdasrc.example README
+}
+
+pkg_postinst() {
+	elog "For further configuration help consult the README in"
+	elog "${EPREFIX}/usr/share/doc/${PF}"
+}
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
new file mode 100644
index 000000000000..021f02fcc1e8
--- /dev/null
+++ b/media-sound/mpdscribble/Manifest
@@ -0,0 +1,7 @@
+AUX mpdscribble.rc 475 SHA256 d24e970f1da57b391c0bc8efa79b7cadfc5af08c05c73d05f42330a8408fa4fa SHA512 b82d3e5678aba145a5c8d172ebf74960d164e3e934426cc755948d795743bb07158f502705d40c1730a40b6a6d73e84c5792419adaf6ab83ec7c33756f0abb43 WHIRLPOOL 086ca6b51de3abe16a18ab491943ff10e9126904f6e44981542e1a8b63ff77709137af2858776140678115164d53bd385ebd6bf9528e47dd0c840bfe3591eda3
+DIST mpdscribble-0.22.tar.bz2 116981 SHA256 1cde2b5f8c70f0e3e6f059d01bf0b0f2eac2b29fbcd14b01a8a5103e603feb41 SHA512 bedd93392a4d5a0609dcaf7aefeeff3851f3084da8c34a4fc1f8fde51c2ba10b8370ac52cc8d55f0c9a96fffed975827a0935087c2c51880b7bfef8d79182dc8 WHIRLPOOL 55c9129ad4c6ffd3a63529dbc69852730675dfca736d74ff29e7e28259a6f30dd07456181ad0774d26e2fbba213de32e0d4fee70ec930de69978ba7aae9a5cf3
+EBUILD mpdscribble-0.22.ebuild 727 SHA256 807a54d1062269dae8cd47c9fc6ef4d1bf7231a6841e1846aca5478445f66af0 SHA512 651a12cfb02bc5e0747610636d046dbf471a5e38c345af9df1356f9d4270114f65759d1f7988bb8000ef82caab884e88f29b2c6ed985839c174ad200ee51997c WHIRLPOOL 218711505d527992551dd0d3345edd414f018d9b450c3e559a3d7139131fbca34377bf6ccb12d05c2abe28ee80e9234caefb0546e0973e44dea28504418cfe82
+EBUILD mpdscribble-9999.ebuild 759 SHA256 e5d154b7f71b4c91a8defb6b05fc1994743e42149feea6406acfeb3a016d67fa SHA512 017433dabcf0084b1f8a76c83210cea918561a5ec82c09832fe80b14bf7149b6eae00a4450365c5c4aa24d76bccb56b72fdff83e9853f9ca867247d7dc0c8ceb WHIRLPOOL dff1df6f35e7838d885fde2a57c03c6ccf4ae3492aa46edd1bfab144f0f3d3c846f83c525b9018b80d8ea2bc05e5e2db898782df026e61109235cfbd74e2eec7
+MISC ChangeLog 3103 SHA256 824d86e0962e33194adc18a53d79e39897503eded02023b6b9d44fb3205c3238 SHA512 5d2015ba732f074b9846261e081269ec6964b1f715071d6bcff6c53fa44c18de7e45aa5669a824580b2347f5412530523fd8d1ca73ff4ff771df71fca7a0db8e WHIRLPOOL e1393a74771392ff7e800bc154d909fb8870ea12d6785703e7cec817f992c537d4871924b26683e5f95d100d7480754ad48ad8cf2cf638ec60842ed83b2c2e93
+MISC ChangeLog-2015 7621 SHA256 218b8549b4b8224d62f6c9b764edfed95206d909adf7ad9006a676b30b9531ca SHA512 cfcc9e59a1b3f4be4d874d9bd0d52f40843fd55f603fb22db960ce8afdd1659a05e586b2e6eaf3ea3870425a095f7adda8e8f8223fd48ddf525ba2113b5b5541 WHIRLPOOL e71b91be2c3ebd922b8d87ca99a3efcd96c3c4caa7364d88162128d224503b4284cf0bc422c3e047d28ad3b6e4cf4f20f479a177d4b2bd6992d9292ee7478146
+MISC metadata.xml 783 SHA256 1dfb3f0dc4b6627d740fa5711a0b33b4d9d1c4e79aac161d265c6061d71a8c56 SHA512 e6ec23af50371a4e1e1b8ef904ea89a71c5ad2fd52b96bf23a1b9c1625fcddc72cf2c398a908cb7a6f07649630b2dc5ccc8fa8aaa57fcbb6d395ef270f478a44 WHIRLPOOL f08289d12c011b7b639f51455a9e8e5ec010000d19b2b1cf70c8607d8f674fc11b4a14baaccb65272e92154b95f6efe1173eb9f50608d42309ea9747008d8a0c
diff --git a/media-sound/mpdscribble/files/mpdscribble.rc b/media-sound/mpdscribble/files/mpdscribble.rc
new file mode 100644
index 000000000000..ac8a41e68fec
--- /dev/null
+++ b/media-sound/mpdscribble/files/mpdscribble.rc
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+	use mpd
+}
+
+start () {
+	
+	ebegin "Starting Music Player Daemon Audioscrobbler client"
+	start-stop-daemon --start --exec /usr/bin/mpdscribble -- --pidfile /var/run/mpdscribble.pid
+	eend $?
+}
+
+stop () {
+	ebegin "Stopping Music Player Daemon Audioscrobbler client"
+	start-stop-daemon --stop --quiet -p /var/run/mpdscribble.pid --exec /usr/bin/mpdscribble || eerror "mpdscribble is not running"
+	rm -f /var/run/mpdscribble.pid
+	eend $?
+}
diff --git a/media-sound/mpdscribble/metadata.xml b/media-sound/mpdscribble/metadata.xml
new file mode 100644
index 000000000000..591f1b938aae
--- /dev/null
+++ b/media-sound/mpdscribble/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription lang="en">
+		A client for the Music Player Daemon that sends information to
+		Audioscrobbler -- a website (www.last.fm) displaying what various people
+		listen to.  This information is then used to show friends, generate
+		recommended listening information, listen to a radio station with a
+		playlist tailored to the user's taste, and to show interesting
+		statistics about your listening habits.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">MusicPlayerDaemon/mpdscribble</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mpdscribble/mpdscribble-0.22.ebuild b/media-sound/mpdscribble/mpdscribble-0.22.ebuild
new file mode 100644
index 000000000000..ac6c4ddf73ea
--- /dev/null
+++ b/media-sound/mpdscribble/mpdscribble-0.22.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="An MPD client that submits information to Audioscrobbler"
+HOMEPAGE="https://www.musicpd.org/clients/mpdscribble/"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc x86"
+IUSE="+curl"
+
+RDEPEND="dev-libs/glib
+	media-libs/libmpdclient
+	curl? ( net-misc/curl )
+	!curl? ( net-libs/libsoup:2.4 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--with-http-client=$(usex curl curl soup)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
+	dodir /var/cache/mpdscribble
+}
diff --git a/media-sound/mpdscribble/mpdscribble-9999.ebuild b/media-sound/mpdscribble/mpdscribble-9999.ebuild
new file mode 100644
index 000000000000..81294c5dbbe7
--- /dev/null
+++ b/media-sound/mpdscribble/mpdscribble-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit git-r3 autotools
+
+DESCRIPTION="An MPD client that submits information to Audioscrobbler"
+HOMEPAGE="https://www.musicpd.org/clients/mpdscribble/"
+EGIT_REPO_URI="https://github.com/MusicPlayerDaemon/mpdscribble.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="+curl"
+
+RDEPEND="dev-libs/glib
+	media-libs/libmpdclient
+	curl? ( net-misc/curl )
+	!curl? ( net-libs/libsoup:2.4 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-http-client=$(usex curl curl soup)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
+	dodir /var/cache/mpdscribble
+}
diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest
new file mode 100644
index 000000000000..7b23f06f0445
--- /dev/null
+++ b/media-sound/mpfc/Manifest
@@ -0,0 +1,14 @@
+AUX mpfc-1.3.7-INT_MAX.patch 499 SHA256 41e60b73155317bab5d70e5dacc5bb1ac888bf37858ee193238cd6fd8319a44c SHA512 29ab9d5f5f2198011bac008f05bbc870191246721896ed8f30c112b46e4dd7be1bc61afa457f907ff98e4bb2da7bdc610448af7e75d0d3570b142bffb51d1911 WHIRLPOOL 6ce0bf99fec3d74700916eb96ca2e1352f13d1913d500b17d7b5b914af485ef1108f0ed897f1adfba354da57005d0afd6074d0a9767448feda8ef13b4aff8ee7
+AUX mpfc-1.3.7-asneeded.patch 1236 SHA256 123231c565ba381dfc46e6bda60b9feb42f88a888555bc8f8dad5af6564ffb0b SHA512 7455fe7d8c6549669af94357fa4275152ffd63638b04bf327219cb76afedd4d687d10371720508b76a006437b7207b7653ea18400f662fbe8afae3a4158bc52e WHIRLPOOL bfd82c74501a5bbaf88cbb6ee036311edbc62ee6a988860fb2efb11a661b2f55d5f6c20fe13b2c1c655e2f05bb4ce0033fdb972a144f91104bd02a0ea520aa67
+AUX mpfc-1.3.7-libdir.patch 4081 SHA256 c2fb48ac91b0aa8e7d3f36c422ae05f85825f39c3a2c86c47c9cff600353c0d8 SHA512 97245e787dd1521cf82c33e7da0842ad2cc46737b9b624d76cdb45c2e4b2ae4f2f38afe64b11142e7330abec69dcf0aa2d3b4af2e523ef03a94ab061b3018673 WHIRLPOOL 9ddbf1c4f2150fc8f36ce0c83730db3381cbe3aab63cb92c8ffc0fee6c28916c9174cb87c43729b28b35c34dda4c9e299718431a3ba65ba6f1dd8e62ef2d3349
+AUX mpfc-1.3.7-mathlib.patch 705 SHA256 2a5ef7a7008ab2e5c19af3e84080f6e4aa2c662dc3c6b4d12a8d30bb5c163aef SHA512 7bbe651309b8424eaa525b49f6da90ebae89dfca38dca075e9f40f9606bf51955942ecf9c958ea9183ac84a91bbe4c3249e733707578e67abc4673e298dbb8aa WHIRLPOOL 317626d270aac774f2bb629ab580ed152c54af30167c9b4efdb85792752f63912126acd8924bfe2df06158fcbf95366f753f0af85339464d14549de68b2deb36
+AUX mpfc-1.3.8.1-fix-underlinking.patch 960 SHA256 73815f3aff12516a65ca0a0aaa59a074201c47328e0a4f279fb7afe43f0dc4b9 SHA512 117c49a7893c95b8b7e592aba76afd4f05f076b88db303a4fcb0efdaad351008bd91d88d06f278586920907c54801df49c7101c8dc2e41475038244cefd6a480 WHIRLPOOL d6fe9ddaa656047cc0158fe257f8a6850b7fc2e10e4a4513a61842a13a2e7dd1b3a2f15c09e10205f7ceb2a8625a385e233a983c4e96b8008d3f8c9e40224b72
+AUX mpfc-1.3.8.1-qa-implicit-declarations.patch 4938 SHA256 db388c2f00575f81ca40ab1f8da93ee9f465e692338000307d2ad6c912dd1f18 SHA512 afd61c08964b237124316a7cad4cecef29d8c269c6e2d0c645d81272167e9f7de2b3c1ef33e2877e1b5f2c0a4021bf2e548a04976142c22e889a6cf769807233 WHIRLPOOL 39672af3729fe2d79bfcd66d2c8c88a096466e365927acf4d77875e4117398ff402dd78aa518bb16d54adaf3c43cea937008b918a0b5f3a2571b1a1d407cbe43
+AUX mpfc-gcc4.patch 475 SHA256 779863f55a7c29f85072d395ff614c57be957bb1e4295442eca8d89cc0a5946f SHA512 25369112b269b1bd4022a3d48c154fe59f7bc02a69ae78e274ae3325df4e6462d1e7f6a3784dd4786d3950d80fadb643bcb7084e980a23c801bf6db3b7af5271 WHIRLPOOL 8ed812043934eaa9c29b7fde9cc92c3ba89a18152fe821d3b79cb9135c0893ab03dbf6146cbdd402f814e99625d3f34ae1e59078261971c91b8d865a2fa7a610
+DIST mpfc-1.3.7.tar.gz 869364 SHA256 256ec3a9ebe3296e614b937d3e9044ba11d27c863f723fc939beb82daf54ec8d SHA512 bef536c639a4d2422d0e04ca9aa6c18cee28e4936349ec796a4a25dd069fe0a7996c0d32b18b29b25f5acfa11e4fd4fe78becfe447d6726574bc320041fdf3d6 WHIRLPOOL 7803324f3496350369960a30185086994885a3a5282fd0fd152845f7c7ba77a7d6bc7ce4fccf10131ff44f2773eb13b5d74741b842dbf774cd03766f6ced7699
+DIST mpfc-1.3.8.1.tar.gz 1042027 SHA256 e8a498ba390bd4ad91d4a36a84d676bcdd9525264ed34548df1d94118abc1116 SHA512 071e12ea784a8610aa6621f5afa1c6ba1e2a3ffe0deac8175b8b43b4446f0c54ff049fd8321aff7551766fe4561a974e39bbf93e30b353b25e27673ea9584573 WHIRLPOOL f4cf742e460205e45fb5ac741613a2fd2288fef1a9758e78555c32ce7358ec1a55be5a04e2a286015ffce733bddabca7b9e34993402ad158a1d5848c1cbc1209
+EBUILD mpfc-1.3.7-r1.ebuild 1218 SHA256 942e3edc60d198bb360587421dc7c1fd70558fbf0f8e4d3306ed2281df4db80a SHA512 ccb9d1ea5dd52c4579a21f5a427ee3179a49d93a318982409a2c081f734976c76111b2600c87896ab0b42f1adc3e8d1e734d134f1aa959cce4acec9dc9bc48fa WHIRLPOOL 49f03a11b0ad330a0faf5c7b1104b6b9fcaded8e1f5fbb4c3b24eea28a4c5f390ad2a04a50d2acaf58ff4bfd9cce473b17cf6cedcb5107fa9d928a8cc9ff7b3f
+EBUILD mpfc-1.3.8.1-r2.ebuild 1139 SHA256 cd7cb98685dd92dde1539f0b0337935ddfe2c5874af0b01e4726d52f327a71ef SHA512 fb0ac917518d6bda5a7b6bc4ab3e96a82bb0540ce2b402b1b75f48f91832d9a24f36e3f9146ae05602197e4d88a2e493374c68516e2d2c6a476e27df89fb800d WHIRLPOOL 90b0ff55f02388cb94fe2180a8bfe6545fcc2635d4193e07cc40f56f61a80dbee69d7cc236fed31984f3e5e050f95278eea9ab97fcc5c5a9cf700ed1c328aec0
+MISC ChangeLog 3165 SHA256 b4fcc4d82d8f7ade3d43a865db8eeff313d51ed566c3e51a29d112e2641b51aa SHA512 0fe565958e6447ba4db14ab06c09de4a5e6fc575e0a0f577fa380d838e36e1689f380b5c5756b4f73d771837586854a9cd9b91d5c6efe885d5175d98b737acf1 WHIRLPOOL e2d11f5c3bdb9c95a0fe53b3818284da219bda0f9e7ecbc1fb0a3fd3c5035575a47681c04bbbc1b9ae8a35818bdc4d1ed800d8b848655ba919265a44eb42967a
+MISC ChangeLog-2015 4330 SHA256 2385e19dc8dbd8493e59971cdd60a94feb3ef76e3c870d5ae2ced12c9f63dc69 SHA512 e523998868e3bb6fd2fa6e30610aa93f2e2ef411b63db55ce768b5264a074d4f0924048bae8c2d01b7e3eb123fbecaf37198145f8086afab4b777af89886d05f WHIRLPOOL f0b90dcae773690749d7513a23dd4f47fa4a8f7e15d65ce55a6e0d523de92f285e14d7de6d704bd4da19e18bbad9e60cd4122a57d6aba4391f6a53b0770863c0
+MISC metadata.xml 413 SHA256 452572494f12f9e7c746f24641b4dbdfc27eaf2669451a69a617d9cae65732b7 SHA512 fd972a9e503642f833b6c08bfc662bec020bb9e88959e433e6c20ef582c2b05edd248d2b652cf2b884097fae888ab29413b41efa731399cffb261a10e6435b3a WHIRLPOOL 053452f76c7cd21dffacc5ed1d6dc74bf027dbdce2e1bb6e91fea302a42374017a6f4156f0f4343f43a35f22a21b7e14a40b6f19e0cd150fcc36b6b16b875188
diff --git a/media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch b/media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch
new file mode 100644
index 000000000000..8bca2f380366
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch
@@ -0,0 +1,20 @@
+--- plugins/input/audiocd/audiocd.c
++++ plugins/input/audiocd/audiocd.c
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <limits.h> /* cdrom.h and INT_MAX */
+ #include <linux/cdrom.h>
+ #include <errno.h>
+ #include <string.h>
+--- plugins/input/audiocd/audiocd.h
++++ plugins/input/audiocd/audiocd.h
+@@ -23,6 +23,7 @@
+ #ifndef __SG_MPFC_AUDIOCD_H__
+ #define __SG_MPFC_AUDIOCD_H__
+ 
++#include <limits.h> /* cdrom.h and INT_MAX */
+ #include <linux/cdrom.h>
+ #include "types.h"
+ #include "logger.h"
diff --git a/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch b/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch
new file mode 100644
index 000000000000..d681e8784f74
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch
@@ -0,0 +1,26 @@
+Index: mpfc-1.3.7/libmpfc/Makefile.am
+===================================================================
+--- mpfc-1.3.7.orig/libmpfc/Makefile.am
++++ mpfc-1.3.7/libmpfc/Makefile.am
+@@ -18,6 +18,6 @@ libmpfc_la_SOURCES = cfg.c charset.c fil
+ 					 song_info.c string.c vfs.c logger.c cfg_rcfile.c \
+ 					 plugin.c plugin_general.c command.c \
+ 					 $(libmpfchdr_HEADERS)
+-libmpfc_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ 
++libmpfc_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ @DL_LIBS@
+ INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
+ localedir = $(datadir)/locale
+Index: mpfc-1.3.7/src/Makefile.am
+===================================================================
+--- mpfc-1.3.7.orig/src/Makefile.am
++++ mpfc-1.3.7/src/Makefile.am
+@@ -13,6 +13,7 @@ localedir = $(datadir)/locale
+ DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" \
+ 	   -DSYSCONFDIR=\"$(sysconfdir)\" @DEFS@
+ INCLUDES = -I$(top_builddir)/libmpfcwnd/
+-mpfc_LDADD = @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@ \
++mpfc_LDADD =  \
+ 			 $(top_builddir)/libmpfc/libmpfc.la \
+-			 $(top_builddir)/libmpfcwnd/libmpfcwnd.la
++			 $(top_builddir)/libmpfcwnd/libmpfcwnd.la \
++                         @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@
diff --git a/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch b/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch
new file mode 100644
index 000000000000..52a318463154
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch
@@ -0,0 +1,113 @@
+Index: mpfc-1.3.7/libmpfc/Makefile.am
+===================================================================
+--- mpfc-1.3.7.orig/libmpfc/Makefile.am
++++ mpfc-1.3.7/libmpfc/Makefile.am
+@@ -1,7 +1,5 @@
+ lib_LTLIBRARIES = libmpfc.la
+ 
+-libdir = $(prefix)/lib/
+-
+ libmpfchdrdir = $(prefix)/include/mpfc
+ libmpfchdr_HEADERS = ../mpfc-config.h ../src/types.h ../src/cfg.h \
+ 					 ../src/charset.h \
+Index: mpfc-1.3.7/libmpfcwnd/Makefile.am
+===================================================================
+--- mpfc-1.3.7.orig/libmpfcwnd/Makefile.am
++++ mpfc-1.3.7/libmpfcwnd/Makefile.am
+@@ -1,5 +1,4 @@
+ lib_LTLIBRARIES = libmpfcwnd.la
+-libdir = $(prefix)/lib/
+ libmpfcwndhdrdir = $(prefix)/include/mpfc/libmpfcwnd
+ libmpfcwndhdr_HEADERS = wnd.h wnd_print.h wnd_msg.h wnd_kbd.h \
+ 						wnd_def_handlers.h wnd_root.h wnd_mouse.h wnd_types.h \
+Index: mpfc-1.3.7/plugins/input/audiocd/Makefile.am
+===================================================================
+--- mpfc-1.3.7.orig/plugins/input/audiocd/Makefile.am
++++ mpfc-1.3.7/plugins/input/audiocd/Makefile.am
+@@ -1,6 +1,6 @@
+-lib_LTLIBRARIES = libaudiocd.la
++plugin_LTLIBRARIES = libaudiocd.la
+ 
+-libdir = $(prefix)/lib/mpfc/input
++plugindir = $(libdir)/mpfc/input
+ 
+ libaudiocd_la_SOURCES = audiocd.c audiocd.h cddb.c cddb.h
+ libaudiocd_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@
+Index: mpfc-1.3.7/plugins/input/mp3/Makefile.am
+===================================================================
+--- mpfc-1.3.7.orig/plugins/input/mp3/Makefile.am
++++ mpfc-1.3.7/plugins/input/mp3/Makefile.am
+@@ -1,6 +1,6 @@
+-lib_LTLIBRARIES = libmp3.la
++plugin_LTLIBRARIES = libmp3.la
+ 
+-libdir = $(prefix)/lib/mpfc/input
++plugindir = $(libdir)/mpfc/input
+ 
+ libmp3_la_SOURCES = mp3.c mp3.h 
+ INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
+Index: mpfc-1.3.7/plugins/input/ogg/Makefile.am
+===================================================================
+--- mpfc-1.3.7.orig/plugins/input/ogg/Makefile.am
++++ mpfc-1.3.7/plugins/input/ogg/Makefile.am
+@@ -1,6 +1,6 @@
+-lib_LTLIBRARIES = libogg_vorbis.la
++plugin_LTLIBRARIES = libogg_vorbis.la
+ 
+-libdir = $(prefix)/lib/mpfc/input
++plugindir = $(libdir)/mpfc/input
+ 
+ libogg_vorbis_la_SOURCES = ogg.c vcedit.c vcedit.h
+ INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
+Index: mpfc-1.3.7/plugins/input/wav/Makefile.am
+===================================================================
+--- mpfc-1.3.7.orig/plugins/input/wav/Makefile.am
++++ mpfc-1.3.7/plugins/input/wav/Makefile.am
+@@ -1,6 +1,6 @@
+-lib_LTLIBRARIES = libwav.la
++plugin_LTLIBRARIES = libwav.la
+ 
+-libdir = $(prefix)/lib/mpfc/input
++plugindir = $(libdir)/mpfc/input
+ 
+ libwav_la_SOURCES = wav.c wav.h
+ libwav_la_LIBADD = @COMMON_LIBS@
+Index: mpfc-1.3.7/plugins/output/alsa/Makefile.am
+===================================================================
+--- mpfc-1.3.7.orig/plugins/output/alsa/Makefile.am
++++ mpfc-1.3.7/plugins/output/alsa/Makefile.am
+@@ -1,6 +1,6 @@
+-lib_LTLIBRARIES = libalsa.la
++plugin_LTLIBRARIES = libalsa.la
+ 
+-libdir = $(prefix)/lib/mpfc/output
++plugindir = $(libdir)/mpfc/output
+ 
+ libalsa_la_SOURCES = alsa.c
+ INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd
+Index: mpfc-1.3.7/plugins/output/disk_writer/Makefile.am
+===================================================================
+--- mpfc-1.3.7.orig/plugins/output/disk_writer/Makefile.am
++++ mpfc-1.3.7/plugins/output/disk_writer/Makefile.am
+@@ -1,6 +1,6 @@
+-lib_LTLIBRARIES = libdisk_writer.la
++plugin_LTLIBRARIES = libdisk_writer.la
+ 
+-libdir = $(prefix)/lib/mpfc/output
++plugindir = $(libdir)/mpfc/output
+ 
+ libdisk_writer_la_SOURCES = writer.c
+ libdisk_writer_la_LIBADD = @COMMON_LIBS@
+Index: mpfc-1.3.7/plugins/output/oss/Makefile.am
+===================================================================
+--- mpfc-1.3.7.orig/plugins/output/oss/Makefile.am
++++ mpfc-1.3.7/plugins/output/oss/Makefile.am
+@@ -1,6 +1,6 @@
+-lib_LTLIBRARIES = liboss.la
++plugin_LTLIBRARIES = liboss.la
+ 
+-libdir = $(prefix)/lib/mpfc/output
++plugindir = $(libdir)/mpfc/output
+ 
+ liboss_la_SOURCES = oss.c
+ liboss_la_LIBADD = @COMMON_LIBS@
diff --git a/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch b/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch
new file mode 100644
index 000000000000..09471407398b
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch
@@ -0,0 +1,20 @@
+Index: mpfc-1.3.7/configure.in
+===================================================================
+--- mpfc-1.3.7.orig/configure.in
++++ mpfc-1.3.7/configure.in
+@@ -66,7 +66,6 @@ LIBS=$LIBS_save
+ AC_ARG_ENABLE(mp3, 
+ [	--disable-mp3		Disable mp3 input plugin [default=enabled]],,
+ 		enable_mp3="yes")
+-if test "x$enable_mp3" = xyes; then
+ 	# Check for math lib
+ 	LIBS_save=$LIBS
+ 	AC_CHECK_HEADERS([math.h],,[AC_MSG_ERROR(*** Can't find math header ***)])
+@@ -75,6 +74,7 @@ if test "x$enable_mp3" = xyes; then
+ 	AC_SUBST(MATH_LIBS)
+ 	LIBS=$LIBS_save
+ 
++if test "x$enable_mp3" = xyes; then
+ 	# Check for libmad
+ 	LIBS_save=$LIBS
+ 	AC_CHECK_HEADERS([mad.h],,[AC_MSG_ERROR(*** Can't find libmad header ***)])
diff --git a/media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch b/media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch
new file mode 100644
index 000000000000..0fb96ae1ff00
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch
@@ -0,0 +1,32 @@
+Fix libm (and ncurses) underlinking issues.
+https://bugs.gentoo.org/show_bug.cgi?id=529490
+
+--- mpfc-1.3.8.1/configure.ac
++++ mpfc-1.3.8.1/configure.ac
+@@ -13,13 +13,13 @@
+ COMMON_LIBS=""
+ AC_SUBST(COMMON_LIBS)
+ 
++dnl Check for libm for rintf()
++AC_SEARCH_LIBS([rintf], [m], [], [
++	AC_MSG_ERROR([unable to find the rintf() function])
++])
++
+ # Check for ncurses
+-LIBS_save=$LIBS
+-AC_CHECK_HEADERS([curses.h],,[AC_MSG_ERROR(*** Can't find curses.h ***)])
+-AC_CHECK_LIB(ncursesw, waddch,,[AC_MSG_ERROR(*** Can't find ncurses library ***)])
+-CURSES_LIBS="-lncursesw"
+-AC_SUBST(CURSES_LIBS)
+-LIBS=$LIBS_save
++PKG_CHECK_MODULES([CURSES], [ncursesw])
+ 
+ # Check for pthread
+ LIBS_save=$LIBS
+--- mpfc-1.3.8.1/libmpfcwnd/Makefile.am
++++ mpfc-1.3.8.1/libmpfcwnd/Makefile.am
+@@ -1,3 +1,4 @@
++AM_CPPFLAGS = @CURSES_CFLAGS@
+ lib_LTLIBRARIES = libmpfcwnd.la
+ libmpfcwndhdrdir = $(includedir)/mpfc/libmpfcwnd
+ libmpfcwndhdr_HEADERS = wnd.h wnd_print.h wnd_msg.h wnd_kbd.h \
diff --git a/media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch b/media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch
new file mode 100644
index 000000000000..31958582e90d
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch
@@ -0,0 +1,193 @@
+Fix QA warnings caused by implicit declarations, such as
+
+* QA Notice: Package triggers severe warnings which indicate that it
+*            may exhibit random runtime failures.
+* wnd.c:1081:4: warning: implicit declaration of function ‘add_wch’ [-Wimplicit-function-declaration]
+
+--- mpfc-1.3.8.1/libmpfc/file_http.c
++++ mpfc-1.3.8.1/libmpfc/file_http.c
+@@ -35,6 +35,7 @@
+ #include "file.h"
+ #include "file_http.h"
+ #include "mystring.h"
++#include "util.h"
+ 
+ /* Get file data */
+ #define FHTTP_GET_DATA(data, file) \
+--- mpfc-1.3.8.1/libmpfc/id3.c
++++ mpfc-1.3.8.1/libmpfc/id3.c
+@@ -26,6 +26,7 @@
+ #include <unicode/ucnv.h>
+ #include "types.h"
+ #include "myid3.h"
++#include "util.h"
+ 
+ /* Create a new empty tag */
+ id3_tag_t *id3_new( void )
+--- mpfc-1.3.8.1/libmpfc/logger.c
++++ mpfc-1.3.8.1/libmpfc/logger.c
+@@ -28,6 +28,8 @@
+ #include "cfg.h"
+ #include "logger.h"
+ 
++int logger_get_level( logger_t *log );
++
+ /* Initialize logger */
+ logger_t *logger_new( cfg_node_t *cfg_list, char *file_name )
+ {
+--- mpfc-1.3.8.1/libmpfcwnd/wnd.h
++++ mpfc-1.3.8.1/libmpfcwnd/wnd.h
+@@ -23,7 +23,6 @@
+ #ifndef __SG_MPFC_WND_H__
+ #define __SG_MPFC_WND_H__
+ 
+-#define _XOPEN_SOURCE_EXTENDED
+ #include <curses.h>
+ #include "types.h"
+ #include "cfg.h"
+--- mpfc-1.3.8.1/libmpfcwnd/wnd.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd.c
+@@ -29,6 +29,8 @@
+ #include "logger.h"
+ #include "wnd.h"
+ #include "wnd_root.h"
++#include "util.h"
++#include <curses.h>
+ 
+ /* Initialize window system and create root window */
+ wnd_t *wnd_init( cfg_node_t *cfg_list, logger_t *log )
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_combobox.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_combobox.c
+@@ -28,6 +28,8 @@
+ #include "wnd_dlgitem.h"
+ #include "wnd_editbox.h"
+ #include "wnd_hbox.h"
++#include "wnd_label.h"
++#include "util.h"
+ 
+ /* Create a new combo box */
+ combo_t *combo_new( wnd_t *parent, char *id, char *text, char letter, 
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_filebox.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_filebox.c
+@@ -24,7 +24,6 @@
+ #include <fnmatch.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#define __USE_GNU
+ #include <string.h>
+ #include <unistd.h>
+ #include "types.h"
+@@ -33,6 +32,8 @@
+ #include "wnd_editbox.h"
+ #include "wnd_filebox.h"
+ #include "wnd_hbox.h"
++#include "wnd_label.h"
++#include "util.h"
+ 
+ /* Create a new file box */
+ filebox_t *filebox_new( wnd_t *parent, char *id, char *text, char letter,
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_mouse.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_mouse.c
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include "wnd.h"
++#include "util.h"
+ 
+ /* Initialize mouse */
+ wnd_mouse_data_t *wnd_mouse_init( wnd_global_data_t *global )
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_print.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_print.c
+@@ -32,6 +32,7 @@
+ #include "types.h"
+ #include "wnd.h"
+ #include "wnd_print.h"
++#include "util.h"
+ 
+ /* Move cursor to a specified position */
+ void wnd_move( wnd_t *wnd, wnd_move_style_t style, int x, int y )
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_repval.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_repval.c
+@@ -25,6 +25,7 @@
+ #include "wnd_dialog.h"
+ #include "wnd_editbox.h"
+ #include "wnd_repval.h"
++#include "wnd_label.h"
+ 
+ /* Create a repeat value dialog */
+ dialog_t *wnd_repval_new( wnd_t *parent, void *on_ok, int dig )
+--- mpfc-1.3.8.1/src/browser.c
++++ mpfc-1.3.8.1/src/browser.c
+@@ -24,6 +24,7 @@
+ #include <glob.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <fnmatch.h>
+ #include "types.h"
+ #include "browser.h"
+ #include "help_screen.h"
+--- mpfc-1.3.8.1/src/info_rw_thread.c
++++ mpfc-1.3.8.1/src/info_rw_thread.c
+@@ -27,6 +27,7 @@
+ #include "info_rw_thread.h"
+ #include "player.h"
+ #include "song.h"
++#include "util.h"
+ 
+ /* Thread queue */
+ irw_queue_t *irw_head, *irw_tail;
+--- mpfc-1.3.8.1/src/player.c
++++ mpfc-1.3.8.1/src/player.c
+@@ -35,6 +35,7 @@
+ #include "command.h"
+ #include "eqwnd.h"
+ #include "file.h"
++#include "genp.h"
+ #include "help_screen.h"
+ #include "logger.h"
+ #include "logger_view.h"
+@@ -57,8 +58,13 @@
+ #include "wnd_listbox.h"
+ #include "wnd_multiview_dialog.h"
+ #include "wnd_radio.h"
++#include "wnd_repval.h"
+ #include "wnd_root.h"
+ #include "xconvert.h"
++#include "info_rw_thread.h"
++
++void pmng_hook( pmng_t *pmng, char *hook );
++void outp_set_mixer_type( out_plugin_t *p, plugin_mixer_type_t type );
+ 
+ /*****
+  *
+--- mpfc-1.3.8.1/src/plist.c
++++ mpfc-1.3.8.1/src/plist.c
+@@ -36,6 +36,7 @@
+ #include "util.h"
+ #include "undo.h"
+ #include "wnd.h"
++#include "info_rw_thread.h"
+ 
+ extern void pmng_hook( pmng_t *pmng, char *hook );
+ 
+--- mpfc-1.3.8.1/src/util.h
++++ mpfc-1.3.8.1/src/util.h
+@@ -26,6 +26,8 @@
+ #include <stdio.h>
+ #include "types.h"
+ 
++int mbslen( char *str );
++
+ /* Write message to log file */
+ void util_log( char *format, ... );
+ 
+--- mpfc-1.3.8.1/src/vfs.h
++++ mpfc-1.3.8.1/src/vfs.h
+@@ -36,6 +36,7 @@
+ } vfs_t;
+ 
+ /* Check that input plugin uses VFS */
++dword inp_get_flags( in_plugin_t *p );
+ #define VFS_INP_HAS(inp)	(inp_get_flags(inp) & INP_VFS)
+ 
+ /* Get logger object */
diff --git a/media-sound/mpfc/files/mpfc-gcc4.patch b/media-sound/mpfc/files/mpfc-gcc4.patch
new file mode 100644
index 000000000000..5cb1efb6834b
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-gcc4.patch
@@ -0,0 +1,13 @@
+--- mpfc-1.3.7/plugins/input/audiocd/audiocd.c.old	2006-11-05 21:13:25.000000000 +0100
++++ mpfc-1.3.7/plugins/input/audiocd/audiocd.c	2006-11-05 21:13:35.000000000 +0100
+@@ -60,8 +60,8 @@
+ /* Tracks information array */
+ struct acd_trk_info_t acd_tracks_info[ACD_MAX_TRACKS];
+ int acd_num_tracks = 0;
+-static int acd_cur_track = -1;
+-static bool_t acd_info_read = FALSE;
++int acd_cur_track = -1;
++bool_t acd_info_read = FALSE;
+ 
+ /* Current time */
+ static int acd_time = 0;
diff --git a/media-sound/mpfc/metadata.xml b/media-sound/mpfc/metadata.xml
new file mode 100644
index 000000000000..0a33c89e6992
--- /dev/null
+++ b/media-sound/mpfc/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="wav">Enable wav audio codec support</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">mpfc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/mpfc/mpfc-1.3.7-r1.ebuild b/media-sound/mpfc/mpfc-1.3.7-r1.ebuild
new file mode 100644
index 000000000000..9dc80425d13e
--- /dev/null
+++ b/media-sound/mpfc/mpfc-1.3.7-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="Music Player For Console"
+HOMEPAGE="http://mpfc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="alsa gpm mad vorbis oss wav cdda nls"
+
+RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	mad? ( media-libs/libmad )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i \
+		-e 's:../src/file.h ../src/file.h:../src/file.h:' \
+		libmpfc/Makefile.am || die #335449
+
+	epatch "${FILESDIR}"/${P}-libdir.patch \
+		"${FILESDIR}"/${PN}-gcc4.patch \
+		"${FILESDIR}"/${P}-mathlib.patch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-INT_MAX.patch
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable alsa) \
+		$(use_enable gpm) \
+		$(use_enable mad mp3) \
+		$(use_enable vorbis ogg) \
+		$(use_enable oss) \
+		$(use_enable wav) \
+		$(use_enable cdda audiocd) \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	insinto /etc
+	doins mpfcrc || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
new file mode 100644
index 000000000000..45a4bd4c4cbb
--- /dev/null
+++ b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="Music Player For Console"
+HOMEPAGE="http://mpfc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa cdda flac gpm mad nls oss static-libs vorbis wav"
+
+RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
+	flac? ( media-libs/flac )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	mad? ( media-libs/libmad )
+	vorbis? ( media-libs/libvorbis )
+	sys-libs/ncurses:0=[unicode]
+	dev-libs/icu:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-underlinking.patch"
+	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable alsa) \
+		$(use_enable cdda audiocd) \
+		$(use_enable flac) \
+		$(use_enable gpm) \
+		$(use_enable mad mp3) \
+		$(use_enable nls) \
+		$(use_enable oss) \
+		$(use_enable static-libs static) \
+		$(use_enable vorbis ogg) \
+		$(use_enable wav)
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins mpfcrc
+
+	prune_libtool_files --all
+}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
new file mode 100644
index 000000000000..d438f2efa11e
--- /dev/null
+++ b/media-sound/mpg123/Manifest
@@ -0,0 +1,11 @@
+DIST mpg123-1.24.0.tar.bz2 912049 SHA256 55fb169a7711938f5df0497d1ffe28419fbef50011dc01d00b216379e6a2256c SHA512 e7c0d7a103daf496e75a6aa6aca861cfc0ad391f242335990c2360305e567039d24ca3b37a35f79b75749055e255f4692b8b43d2fec332b119223b00e12b0cb7 WHIRLPOOL 3d1c882c4c2c0cf8fc575be3a65f9c9d61a1549f75abeb983c2bafef3c303507bdc494594060bc732096c3d7fb96c372d2554a698a46a19c1c6e5f48e5e61771
+DIST mpg123-1.25.2.tar.bz2 918024 SHA256 5314b0fb8ad291bfc79ff4c5c321b971916819a65233ec065434358fcf8aee38 SHA512 1b063a7a497d6f643b43a0e0db0e1a8951bf110cabf8f3dc63d7ed1b8e47ef4a42649622a5e4efb582479beacd7d3872b4f061716a5f6970b3f5bed7ef4f3fe9 WHIRLPOOL e8d6e74b857cac86e77651339d3491088ac5024aae149bbcc691a28bb8cda46395ab8f4505d2ff7eb6ba3311c97db1baa64c686ed508adb0ba3c91cd2faf1e32
+DIST mpg123-1.25.6.tar.bz2 919169 SHA256 0f0458c9b87799bc2c9bf9455279cc4d305e245db43b51a39ef27afe025c5a8e SHA512 0b129c38c19462f7fbe3f56ea2b856222f8a1a3ba76ef8109ca759c9a9c668432cc0ec76059f9a7a3c37228ce615e4c628c7de3b1663073302cc7c8fc93f249c WHIRLPOOL 413c69c90de4387ee0def0cc7be394f4d01025b0d06c76d5802b3f8c87ea063ddda8ad8d620d84becc7eed98157df8e4e36c9b6d1bce4320715f66e5c4d52db5
+DIST mpg123-1.25.7.tar.bz2 920705 SHA256 31b15ebcf26111b874732e07c8e60de5053ee555eea15fb70c657a4f9f0344f3 SHA512 4e0972149ce4f792cc361d96d638551eb5184942465e69713202d0830a0a54b33e3effe2e460683b996024772edba5e0be341048b9d0c73dace557c640d4414e WHIRLPOOL b5c95cf1da06e06c3059282e79a57cf9e07137862a01348b11a719f42dcd77533c45237a1ed641f6417b29ae2b852655d1d23f2373220b5ef99aed6fa57e2941
+EBUILD mpg123-1.24.0.ebuild 3022 SHA256 707f9c9143cf2d6a58ae71ebb65add748fb06d8be93be735f87d56c95b36beb0 SHA512 6354bcbb2befae65a3433cad75d7e1b0a12cc8ed6e93f8eef5ca6bb59074edbca483e34e077355be12f0d70efd6e73ab9521c0118c5ac0dc1a64e363c80bf7b4 WHIRLPOOL f1e9be81ba4d9cce3e5ca8c77f371eb00ac781e5848d18e0899690b1316c1923b74745c7415111ca6f9d395a4fc1c78913a6ec80d29bede7674846d6f26ba57a
+EBUILD mpg123-1.25.2.ebuild 3031 SHA256 287add04bb5b848767138c4d41e09468f44d16dea8e5a8623cdd4f930c1e18ab SHA512 5433917edc9840fec5221a8b69269448675e24b36acc5cc97539053bbfd1dfa1d911c8316daf337e409370d2c25aa39416f86a87076c1624730dd96549150ff4 WHIRLPOOL 7d55045cf407c319887dbf26a1afd6793cb459ddc9983ccbe9acf75056f6c56ae72eb5ce03cf18349ba1b6c685871a0fb5a45b02de9c66db24d0be0386efe139
+EBUILD mpg123-1.25.6.ebuild 3038 SHA256 18119c639868adfbf66d68386b5fc5ab240d6dd3e1f84e34540800a8ba81635e SHA512 b3ad391ea62ffed0fe08538b9631d3a927d3c028dd4d9ce41e20c3ee1d09e9b204225fcb1dc1e66d8b4fadbac8b9f0433c8a17b5ebcf27285f271750b4496441 WHIRLPOOL be01bfdf7621edca8162b40f6fbfb1ae4739485e224c0cee85e4b7f716163c1680fff9e3082109f75a45ff742575655bb4bdc9da23caf33bb85e1f82bf4234d8
+EBUILD mpg123-1.25.7.ebuild 3038 SHA256 18119c639868adfbf66d68386b5fc5ab240d6dd3e1f84e34540800a8ba81635e SHA512 b3ad391ea62ffed0fe08538b9631d3a927d3c028dd4d9ce41e20c3ee1d09e9b204225fcb1dc1e66d8b4fadbac8b9f0433c8a17b5ebcf27285f271750b4496441 WHIRLPOOL be01bfdf7621edca8162b40f6fbfb1ae4739485e224c0cee85e4b7f716163c1680fff9e3082109f75a45ff742575655bb4bdc9da23caf33bb85e1f82bf4234d8
+MISC ChangeLog 7069 SHA256 78b99c669a6ab6805e51567b0152b8600d201c9ea43f0aa2d76639b6669887cd SHA512 607b16770e5a835725991cf1e9046b22c0ee83f40cbacfc0f62e203f7e1db043fddfc52eee9a4977c0876b1b5b5c52cdea4e3d2d4a9e1ee0032ee24dfcdfff6e WHIRLPOOL ec3be4f6dc13773dc03a8bfe6d0f9ee3c40f4dedc2d7644b14b1ebd0dcbcfd0039611b06d5ced389ab395b85464e3735cbd27410e0d4dbc92252617d416a9cd3
+MISC ChangeLog-2015 43285 SHA256 0b49de609f234bd5f9bc052cd06c3586fc103e1cd6629b6fc314b03f96a5174f SHA512 803af43862eaaf7cf696255bf78c568080c5506c3ff42d85606acddc3fc0d70f174bf3760bf40cd96e2a3c28d3126d99a9c1266ed510184ef30c2fc7d747af30 WHIRLPOOL c2ac239fe9540a463a6d6832613cf142376acf4d078f0609918397fe0a5545e7eec00176e9628db22e7aea4b459a41057da000643564c96cff7bad621c33065f
+MISC metadata.xml 525 SHA256 8f3bd14f8c41f21d6c397a7a2f2a7f32d2927b808187b48ecebbcaba6b52eed8 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7 WHIRLPOOL 25b27fb06caeb3a09d54a20aafcf6f268668b112e2363bb4c9c9cc6c48cb85b0b2259f55baf2851687baa82226686f0c7a9cc01cdd44206ccfeb4b0acee5a302
diff --git a/media-sound/mpg123/metadata.xml b/media-sound/mpg123/metadata.xml
new file mode 100644
index 000000000000..dcbfeaa686c6
--- /dev/null
+++ b/media-sound/mpg123/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <maintainer>
+      <email>thomas-forum@orgis.org</email>
+      <name>Thomas Orgis</name>
+    </maintainer>
+  </upstream>
+  <use>
+    <flag name="int-quality">Use rounding instead of fast truncation for integer output, where possible</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/mpg123/mpg123-1.24.0.ebuild b/media-sound/mpg123/mpg123-1.24.0.ebuild
new file mode 100644
index 000000000000..f62e3efaa530
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.24.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="app-eselect/eselect-mpg123
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+pkg_setup() {
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+}
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	if $(multilib_is_native_abi) ; then
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		_cpu=generic_fpu
+	elif use x86-macos ; then
+		# ASM doesn't work quite as expected with the Darwin linker
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=""
+	multilib_is_native_abi || myconf="${myconf} --disable-modules"
+
+	ECONF_SOURCE="${S}" econf \
+		--with-optimization=0 \
+		--with-audio="${_audio}" \
+		--with-default-audio=${_output} \
+		--with-cpu=${_cpu} \
+		--enable-network \
+		$(use_enable ipv6) \
+		--enable-int-quality=$(usex int-quality) \
+		${myconf}
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/mpg123/mpg123-1.25.2.ebuild b/media-sound/mpg123/mpg123-1.25.2.ebuild
new file mode 100644
index 000000000000..91211777edd8
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.25.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="app-eselect/eselect-mpg123
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+pkg_setup() {
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+}
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	if $(multilib_is_native_abi) ; then
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		_cpu=generic_fpu
+	elif use x86-macos ; then
+		# ASM doesn't work quite as expected with the Darwin linker
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=""
+	multilib_is_native_abi || myconf="${myconf} --disable-modules"
+
+	ECONF_SOURCE="${S}" econf \
+		--with-optimization=0 \
+		--with-audio="${_audio}" \
+		--with-default-audio=${_output} \
+		--with-cpu=${_cpu} \
+		--enable-network \
+		$(use_enable ipv6) \
+		--enable-int-quality=$(usex int-quality) \
+		${myconf}
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/mpg123/mpg123-1.25.6.ebuild b/media-sound/mpg123/mpg123-1.25.6.ebuild
new file mode 100644
index 000000000000..34770e816b60
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.25.6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="app-eselect/eselect-mpg123
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+pkg_setup() {
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+}
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	if $(multilib_is_native_abi) ; then
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		_cpu=generic_fpu
+	elif use x86-macos ; then
+		# ASM doesn't work quite as expected with the Darwin linker
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=""
+	multilib_is_native_abi || myconf="${myconf} --disable-modules"
+
+	ECONF_SOURCE="${S}" econf \
+		--with-optimization=0 \
+		--with-audio="${_audio}" \
+		--with-default-audio=${_output} \
+		--with-cpu=${_cpu} \
+		--enable-network \
+		$(use_enable ipv6) \
+		--enable-int-quality=$(usex int-quality) \
+		${myconf}
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/mpg123/mpg123-1.25.7.ebuild b/media-sound/mpg123/mpg123-1.25.7.ebuild
new file mode 100644
index 000000000000..34770e816b60
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.25.7.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="app-eselect/eselect-mpg123
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r9
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+pkg_setup() {
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+}
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	if $(multilib_is_native_abi) ; then
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		_cpu=generic_fpu
+	elif use x86-macos ; then
+		# ASM doesn't work quite as expected with the Darwin linker
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=""
+	multilib_is_native_abi || myconf="${myconf} --disable-modules"
+
+	ECONF_SOURCE="${S}" econf \
+		--with-optimization=0 \
+		--with-audio="${_audio}" \
+		--with-default-audio=${_output} \
+		--with-cpu=${_cpu} \
+		--enable-network \
+		$(use_enable ipv6) \
+		--enable-int-quality=$(usex int-quality) \
+		${myconf}
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/mpg321/Manifest b/media-sound/mpg321/Manifest
new file mode 100644
index 000000000000..c580172a8906
--- /dev/null
+++ b/media-sound/mpg321/Manifest
@@ -0,0 +1,9 @@
+AUX mpg321-0.2.12-check-for-lround.patch 670 SHA256 dff04950c7d68b48728378a4fd84dbfe7befa7853a36b18df2edfc24df939638 SHA512 391a98bdf102d3016e98005ddc84b6b303e1fd5653ddcaa13cda0b09b84952bee99f3ebbb6ad763a21965c47692a7011e167b7f990cea760ecf88dbaa34de3a2 WHIRLPOOL 9b0f95ecd9fcb9a19d5ee05c8d74f58830431eb8ea3b485dd8880628f69e4eac07c536b5fe32ef7e73f870afa418c821a831954697836493efb1e9d6351845e1
+AUX mpg321-0.3.2-format-security.patch 1188 SHA256 e6dd3a92b1d563e2301e3a1544a23201bd614206ef1616548233c08214147a33 SHA512 2296934348c898704558f2dac9b7cbd90126d58804df834540688d0c3b35231f488aed036cec200464309cddc2c1adf43759ce87e99d5c370527c552b8e59089 WHIRLPOOL 70b7f00468d2577e741ca78bfd3e1b7451287644e28752d33a5daf7b3ea9926a692dbd7d6be4801d8fe9560e5a0708d1be2eb6e3aca243bfd4394f03ae1b110e
+DIST mpg321-0.3.1.tar.gz 151104 SHA256 0b9c23d75a89236ade9830e0319d7e799efea9f6af262d6defda962037d65579 SHA512 77a7b975f2d31f670eb786ccb9601820945e60b19a188e7337bd2ff0237c7ee47970c27adf78cf633d4a561e89b06de3eacf9f2ec11373abcdcb75c322f19eee WHIRLPOOL 81ee33186d25fdadc288cb09cfa9a124531ac1fbe8e7c10cf748b5960f12de46d536ff7bde9fbb98979d57939fe10ad87179c193bf350dd4932731276eb330bf
+DIST mpg321-0.3.2.tar.gz 151139 SHA256 056fcc03e3f5c5021ec74bb5053d32c4a3b89b4086478dcf81adae650eac284e SHA512 f1bead2c11e4cde0f1a87e1b2e3d216ef80c9a5dd8b219841961688d44a5fc63a54b7af07359766fde0b2712ddc5d0a90b20149c3228cb2d70e830e15c8ab234 WHIRLPOOL 01db416053b2ee883aa31b98251b276a368a339f4a645cf30a066ae498eab2811be09349d04301c30393c1e9ba5804758c71db67526ca79121a24ffb47528ebb
+EBUILD mpg321-0.3.1-r1.ebuild 1061 SHA256 a11153d4d7d7fe2f0099ffc3a79adf87c4d46bb5c4dfd65c05b00d36520b3ccf SHA512 7b9efa755badf7d998f557ad567be698b3233d8d3af050c7b5e68aa8e0946c528cdec456c1cf7684d9b873da2a9bc2657957042d8c47db67f087be0c373ee90d WHIRLPOOL 211e5976d857b1bb753c297ad1732657b4f6fc5b292a04068528f9376b483450f7b72ccc08dc6090f02065287c66b40121a7e07853b315e1a54cd50197bbb704
+EBUILD mpg321-0.3.2.ebuild 1189 SHA256 8a224a4475a8607755b205c21032a758492a927c4d0ff273d7e97017ee5393a6 SHA512 e14146237c6f354cba6c686973d43662696bd71cbbb05418d5a4406db2716d7729f52221faa873084374ca6109a62a5dfd86539f09464c955dc372b2abdbec48 WHIRLPOOL 4d551b7a60a0f40b915f528326d613b6911001677f5814ff1e63a378aaaaa98641089f1e6d7add29ef3d6f55f268da37363abe5e687719e1f6b6748b6609abe9
+MISC ChangeLog 3792 SHA256 0ef92b4ca53bd5d1069140fe13e5e1115c48ca7c7f99a82d6d8de480842a45da SHA512 447fa1a8b2c6173b63319a4969185b3742d85501ed3057dd59d6468ad667baf3e3d10a945bd11b040414800c4f05f0a1027ea95052cee71d88d8193b36d84e91 WHIRLPOOL 6816488be20c0998e0fea35a1d7a3360731e5f7f3639cd27508e619f35883e519df257a4dbedc29bb708ed29fb67d5efcaba51422794421414097cc0b759f454
+MISC ChangeLog-2015 12148 SHA256 99c67c12f763088dd6ab56685d77d0004cbfd0f55b285637e812fadc34958c54 SHA512 68cb2ac762492f2f6a66fd3496c84ebdffbe8fd11c6dda26ec7bfc3b0e97b01bbf8a313dbfaaf4c74c1b07b1d66688ab3225a250f5d4ecc46618c80dc63deb6b WHIRLPOOL f704dfa433677015d29874cb0886b677f6ad2e9f1806411afaf47b9d8e8716d4284c8db663d392d6ad40109f32e4aac8ce721a4791265397b0606d63b7301077
+MISC metadata.xml 329 SHA256 4e06cf94f4374a9b04e347b11abc1d357e44db78662766ed4f152186be3ee55f SHA512 7f66ba87cde258577f41f82b9056b613d1da1741a3dbefe2185562549cf53050d5073b24f07f2b7de25f06b55cdde55653cb8de03d97806a2c47224b8e100764 WHIRLPOOL 860f4525894eab2bb5dcfbebcc7856be8bd5d1fe8beb3a6820805d5540223ecee1818dff158d8ad21d882f6ce0cc2641b43332e9254c357436f69a278dce4f9b
diff --git a/media-sound/mpg321/files/mpg321-0.2.12-check-for-lround.patch b/media-sound/mpg321/files/mpg321-0.2.12-check-for-lround.patch
new file mode 100644
index 000000000000..ca52f7241167
--- /dev/null
+++ b/media-sound/mpg321/files/mpg321-0.2.12-check-for-lround.patch
@@ -0,0 +1,16 @@
+diff -ur mpg321-0.2.12-1.orig//configure.ac mpg321-0.2.12-1/configure.ac
+--- mpg321-0.2.12-1.orig//configure.ac	2010-07-03 07:46:40.000000000 -0400
++++ mpg321-0.2.12-1/configure.ac	2011-08-20 19:50:32.143229893 -0400
+@@ -75,6 +75,12 @@
+ 
+ AC_CHECK_FUNCS([gethostbyname memset munmap socket strchr strdup strerror strrchr strstr gettimeofday select getenv putenv setenv unsetenv strcasecmp])
+ 
++dnl Check if math library is needed.
++AC_CHECK_FUNC(lround)
++if test "$ac_cv_func_lround" = no; then
++  AC_CHECK_LIB(m, lround)
++fi
++
+ AC_ARG_ENABLE(mpg123_symlink,
+ [  --enable-mpg123-symlink Enable symlink of mpg123 to mpg321 [[default=yes]] ],
+ ,enable_mpg123_symlink=yes)
diff --git a/media-sound/mpg321/files/mpg321-0.3.2-format-security.patch b/media-sound/mpg321/files/mpg321-0.3.2-format-security.patch
new file mode 100644
index 000000000000..732ca2c60225
--- /dev/null
+++ b/media-sound/mpg321/files/mpg321-0.3.2-format-security.patch
@@ -0,0 +1,38 @@
+--- /var/tmp/portage/media-sound/mpg321-0.3.2/work/mpg321-0.3.2-orig/mpg321.c	2012-03-25 14:27:49.000000000 +0200
++++ /tmp/mpg321.c	2015-08-12 23:34:20.395331151 +0200
+@@ -183,7 +183,7 @@
+ 				else{
+ #endif					
+ 					if(!(options.opt & MPG321_ENABLE_BUFFER))
+-						fprintf(stderr,"Volume: %ld%%      \r",volume);
++						fprintf(stderr,"Volume: %d%%      \r",volume);
+ #ifdef HAVE_ALSA
+ 				}
+ #endif
+@@ -233,7 +233,7 @@
+ 				else{
+ #endif
+ 					if(!(options.opt & MPG321_ENABLE_BUFFER))
+-						fprintf(stderr,"Volume: %ld%%      \r",volume);
++						fprintf(stderr,"Volume: %d%%      \r",volume);
+ #ifdef HAVE_ALSA
+ 				}
+ #endif
+@@ -447,7 +447,7 @@
+         {
+             if(!names[i])
+             {
+-                printf(emptystring);
++                printf("%s", emptystring);
+             }
+             
+             else
+@@ -465,7 +465,7 @@
+         for (i=0; i<=5; i++)    {
+             fprintf (stderr, "%s", info_id3[i].name);
+             if (!names[i])  {
+-                fprintf (stderr, emptystring);
++                fprintf (stderr, "%s", emptystring);
+             }   else    {
+                 fprintf (stderr, "%s", names[i]);
+                 free (names[i]);
diff --git a/media-sound/mpg321/metadata.xml b/media-sound/mpg321/metadata.xml
new file mode 100644
index 000000000000..9f7b457900b6
--- /dev/null
+++ b/media-sound/mpg321/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mpg321</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mpg321/mpg321-0.3.1-r1.ebuild b/media-sound/mpg321/mpg321-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..30b7149702f7
--- /dev/null
+++ b/media-sound/mpg321/mpg321-0.3.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://mpg321.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6"
+
+RDEPEND="app-eselect/eselect-mpg123
+	>=media-libs/libao-1
+	media-libs/libid3tag
+	media-libs/libmad
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}-orig
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.12-check-for-lround.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-mpg123-symlink \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS BUGS HACKING README* THANKS TODO # NEWS and ChangeLog are dead
+	mv "${ED}"/usr/bin/mpg321{,-mpg123}
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/mpg321/mpg321-0.3.2.ebuild b/media-sound/mpg321/mpg321-0.3.2.ebuild
new file mode 100644
index 000000000000..00ba08fb4df8
--- /dev/null
+++ b/media-sound/mpg321/mpg321-0.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://mpg321.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.orig.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="alsa ipv6"
+
+RDEPEND="app-eselect/eselect-mpg123
+	>=media-libs/libao-1
+	media-libs/libid3tag
+	media-libs/libmad
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}-orig
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.12-check-for-lround.patch \
+		"${FILESDIR}"/${P}-format-security.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-mpg123-symlink \
+		$(use_enable ipv6) \
+		$(use_enable alsa)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS BUGS HACKING README* THANKS TODO # NEWS and ChangeLog are dead
+	mv "${ED}"/usr/bin/mpg321{,-mpg123}
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/mplay/Manifest b/media-sound/mplay/Manifest
new file mode 100644
index 000000000000..4a04e3b9f95f
--- /dev/null
+++ b/media-sound/mplay/Manifest
@@ -0,0 +1,5 @@
+DIST mplay-0.80.tar.gz 565002 SHA256 72fce8aaa866cc42eb3f0d5425857a38aba4264cab4f66b7b08790565837a714 SHA512 5791e6ae60fcf63c7bd5c3dcac84c2cc11649c0ee009fc20bfb43871023d85622e4ea879ad740656a807354f0fb7329948094cd5866e3110cfd233b08e30a9b2 WHIRLPOOL 93412fe66677910e46eadb4f6f77504cc4bd40a6eafb9df73135b454233e3280157011072d7abf6e9da7c78d41a26986df4e06ade5059b4d0b3ca818136db824
+EBUILD mplay-0.80.ebuild 942 SHA256 a6701a9f721809c44d8326e33d0a43e23e0961d02f668d1e2bc64a4bebf8bbbb SHA512 8925cbde273669e6f280dc6911f38c436459dbe13d83dc19aa01058071d79670f3a9230fb58cafdc9eaf0785803d3bf21c16d003d31838ef0ce9b51e3ad2277e WHIRLPOOL 84f63c42bac6d6ac02d1fdf47e6f79faf6e9633ee22890f4fe56cc9aec9822f893a4b3aa39560b6f8e5bc13d261603de7d3cf2aafc9ec0c9fb66ef86b7fe25a9
+MISC ChangeLog 2422 SHA256 fdaba69060362fc320da17126135746ed91c6e552a72f771893e0105bf81bfc1 SHA512 6228a779366099283403a62fbfa6f45ea8976af7efbe1f1cea2fd83ba55570cf25e638e717c1eac102e129f74fd457fb91a490ca5c285275c49233573b009abf WHIRLPOOL 25fe5434639d608e582d6d8b2659c8e24a3b5947dc1429571ad11beb0c0bfc6513f01e9b8102e5e9975452b85516233cebb1f05bbf36d815e17692da56bf618b
+MISC ChangeLog-2015 2230 SHA256 63d5b2d3ffe9f7fc12b95ab189b9cf7c11cd12941f3493e57e4e37dadf1f1574 SHA512 95aeaf010e619a3eb9bf50d22fc8282272ac6ca0a966e4cba4f961969b95b58e813a8597a3c051e1af183b68c9016d28e41975a5906fd21c5117ffda1dd46b79 WHIRLPOOL c26a12d4d01221fa943da8c7fbf037165ec4ca2ef088864bac229e1145470b6d22e76ec1fbd2eaec8b56947fe0a706771b49307c62ff55b2329a1375790a488a
+MISC metadata.xml 328 SHA256 c4e6573ed477bc0d0b50c5c2e6cb9c2cdf2bd218003bda95d21a0c8a976a5836 SHA512 284a37a8fc22008a3b753d169fca69017bd548eb8f09ca25b55dbaf771d9e0c434bf0698d78d38fd716063b9b264aa66ae74972f757682d59acc9578b5b89a20 WHIRLPOOL 247bb6d1d692bbdc969bba33fe008aaa7090a2686972cccc5a060fd86f471fed6e9a3d4ad98c465acf7efc6f5738c2981f71ccb010a41a5fe8792a17155dcf52
diff --git a/media-sound/mplay/metadata.xml b/media-sound/mplay/metadata.xml
new file mode 100644
index 000000000000..8f3a9b367fac
--- /dev/null
+++ b/media-sound/mplay/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mplay</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mplay/mplay-0.80.ebuild b/media-sound/mplay/mplay-0.80.ebuild
new file mode 100644
index 000000000000..6d59d5e9d42a
--- /dev/null
+++ b/media-sound/mplay/mplay-0.80.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="A Curses front-end for mplayer"
+HOMEPAGE="http://mplay.sourceforge.net"
+SRC_URI="mirror://sourceforge/mplay/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	>=dev-perl/MP3-Info-1.11
+	dev-perl/Audio-Mixer
+	dev-perl/Ogg-Vorbis-Header-PurePerl
+	>=virtual/perl-Time-HiRes-1.56
+	>=dev-perl/TermReadKey-2.21
+	dev-perl/Video-Info
+	media-video/mplayer"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i 's:/usr/local:/usr:g' mplay || die "Unable fix the /usr/local path issues."
+}
+
+src_install() {
+	dobin mplay || die
+	dodoc README || die
+
+	cd "${S}"/help
+	insinto /usr/share/mplay
+	doins help_en help_de mplayconf || die
+	doman mplay.1
+}
+
+pkg_postinst() {
+	elog "Please note, gnome terminal does not like this program"
+	elog "too much.  xterm,kterm, and konsole can use it ok."
+}
diff --git a/media-sound/mps-youtube/Manifest b/media-sound/mps-youtube/Manifest
new file mode 100644
index 000000000000..59c2fb1b41f9
--- /dev/null
+++ b/media-sound/mps-youtube/Manifest
@@ -0,0 +1,5 @@
+DIST mps-youtube-0.2.7.1.tar.gz 78128 SHA256 e3df5dc80f39941cb38f5678d1cc397a37a6dc5577e487b24fbf66fffe2afd03 SHA512 760bd6ef6c04606e6e70e4d7f985482c5d5f1f33481a69398d20c2518ae7a1b0371501e31b6d0bcb46e702c53d8b2311e4556700c7d2ae4011006ffe9582de9b WHIRLPOOL e18d80a9accb8309724d7f9df486b20c4c5f8bd44502a392d4d3835c55e2446a992a9fddb8eeb62836cd16185dc823299527150d79209c6501db42741f4fa121
+EBUILD mps-youtube-0.2.7.1.ebuild 595 SHA256 4810a4507da9fa531820644993b1ae2ac114094cb3fffc7400a5e3769344a703 SHA512 943e533d9c73d2973d13d16b996eac6202ed7133d65475451fa586f0c9fc870483f03d87d09eac74c35e5aadb8b920ea26bacb82dff4eeaa957a4c1353d4abc7 WHIRLPOOL 3ff3c94cae8cc0b9f631530dc044d1eff1f964e593ea21ee6b239b0248c528bec221a60c4960bef0a9d84ac286b007c4d9fecd38f32de505a0e08c780697297a
+EBUILD mps-youtube-9999.ebuild 718 SHA256 78e8054dab18038d0746e0f0f0c11c2b0ff4ad073cd7d162678185953e5f42a1 SHA512 588eb771d1cabe9fa622987e87ed7e9a088eb29916d8fe99e6ca61f52b1e533cd49f9c1b8a4894bda852f9d7f1e031dd6de0275c9cbc7709b9a0ea571ce261bb WHIRLPOOL 6874f1fb0427709f72c0eac4c16de0e9b27273a29a2f7365f996bda1fc8f0ab30e2fddf702d96dc9a1ad944661ff3f84c5a5714332afa7915d142191893baec2
+MISC ChangeLog 426 SHA256 6ef247cb390e6333de17c5cd1aaa36b9f89a761bad7f24555989a4455933ed01 SHA512 e93af17a80b624dc00fd3714ea8456b7121c652cf5349fe962b2b72ba9d5ae2760c537b5e8fc02fa6d592f62b691b46968aad9faacd7a9651b28e9f14a4e2619 WHIRLPOOL 06167fa070c196478e6fbdd28bda3f299ff0f692132bb67734ab8a3ad919183a1d0eb1b390b7d4ab19ab5679f965c05881e3771e739796fba0d8b1b76b7894dc
+MISC metadata.xml 390 SHA256 84952e845b03afc1ecc1489e8b7454e48cf779ec7ac4f36d473c00ab1cf06444 SHA512 22e8eee2d28b36f19350ef791ff5a5d705da83b4dafb9b0e959b5cfe4ea6cb5f4e4a47c29eda531e189a253f7d26d58f1be127896cfc2d4fa08bd4e142c61e70 WHIRLPOOL 29881b8704297e0bd2126f3a3544bd67bede9baf7eb394ee5c0b1a07d74f25b293b99adc65d766574e87a661d7400f7463a86f63dce2cbffd70901756584570f
diff --git a/media-sound/mps-youtube/metadata.xml b/media-sound/mps-youtube/metadata.xml
new file mode 100644
index 000000000000..2705b7dbbe4a
--- /dev/null
+++ b/media-sound/mps-youtube/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mps-youtube</remote-id>
+		<remote-id type="github">mps-youtube/mps-youtube</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
new file mode 100644
index 000000000000..e729cd979b07
--- /dev/null
+++ b/media-sound/mps-youtube/mps-youtube-0.2.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Terminal-based YouTube player and downloader"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.python.org/pypi/mps-youtube"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/pafy[${PYTHON_USEDEP}]
+	virtual/ffmpeg
+	|| ( media-video/mplayer media-video/mpv )"
diff --git a/media-sound/mps-youtube/mps-youtube-9999.ebuild b/media-sound/mps-youtube/mps-youtube-9999.ebuild
new file mode 100644
index 000000000000..b79a2339dbb1
--- /dev/null
+++ b/media-sound/mps-youtube/mps-youtube-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/mps-youtube/mps-youtube.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Terminal-based YouTube player and downloader"
+HOMEPAGE="https://github.com/mps-youtube/mps-youtube https://pypi.python.org/pypi/mps-youtube"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/pafy[${PYTHON_USEDEP}]
+	virtual/ffmpeg
+	|| ( media-video/mplayer media-video/mpv )"
diff --git a/media-sound/mserv/Manifest b/media-sound/mserv/Manifest
new file mode 100644
index 000000000000..b90cb8dddc1d
--- /dev/null
+++ b/media-sound/mserv/Manifest
@@ -0,0 +1,12 @@
+AUX mserv-0.35-acl 52 SHA256 6d72095bd3d88f924e155e62cc8155a575339a2d1b7d8b1035786c2fd1160d20 SHA512 2fbe26f0ccbe9d0ccc815d3430989fa7c38cb976289419c46fb7980e386258cd5ddb52214b4b0a11333bb6cbc8a2e29386efbba455839acbe844ad9b2371b2dc WHIRLPOOL a5957a2f7f13de25166870b8dd934c5e1bfdf65717b67e21de54da994acec4f209af297d1c6f59c1b3173d25f52480a7467ced4e351d3bb5a0e3617fb8821b2a
+AUX mserv-0.35-confd 230 SHA256 4c49734c89f53585fc83592229d6a3a2de40207f7ed2ebfb2ca19500d53b3435 SHA512 99e7f18d8a31a6636dd2c9517e9d0329698f4fa960b416c8ad23b30236bb36442fac3d0b870d938ea1229602b2116c081319dd1fe96a425da011cdd2effe5ead WHIRLPOOL 926bd0f50641f1984fd942d6d7025dded427d3a39fb5976b275906b04b8c3feea7862de7a2ebab6a04855adb3bb2c2225ceec2ffe16efd2fa27583286e02b82a
+AUX mserv-0.35-config 1515 SHA256 c41b3f651798a79da23f2f512c129103ae4b511bbd32c2ba012ab674e03de2f5 SHA512 a0593e3c99057ad0ea2f774405c010652b25484fa7d4352348d6188cd1fc330687a6e20b7cfb06e836f0f84e878398e4042fe30a93b28b836a4d4dba89b25ea3 WHIRLPOOL 1105441e91ce7894c4ddd525ccb78f00a1e8c06e460ed878502a9c022b4ae3df5089d3ecf656d7eb6256cd230db6475e9a2deea87dfdf428c9b16e303d31227b
+AUX mserv-0.35-initd 464 SHA256 e93e2964d900aaa0306b9c891a9cb3a43ded3b35cd189b680bd1774f0aa9f774 SHA512 4a6d95ea43a585372b4e0a6c80673a6d849a09a3649b706b0413ee6182ee10b891d0af32c423e524b845657226fec7b792ec3f1fc6c59c016417dce96610be98 WHIRLPOOL 2c06c4be978488b2aece20c220afb73dc531da5270b6cc24e47254a5edb6c89b38b24e129d58cd20f7e647e7f9718cc7fc59039ca97b3aaafe5385cac0f6949a
+AUX mserv-0.35-mservplay.patch 430 SHA256 b23e16ffd2bcd0924ee3b7f6b12ce932ded7f638956870c992584effa467ad60 SHA512 5cdda97f70608899229ec595edfed5eb163f1abed2fb50e169c970c954b3adf85b7433789958ff4d4a66e877724a9623d056244e6642a07c989c0111b9fc060d WHIRLPOOL 5142a2950024dfe12ab0f72f7b8d0f770641ddc8382a980dd77c63e93afdb00399347bdd9e0a29b0dd4f25946a284b47947e35da1c63a745c45d52e161269b0d
+AUX mserv-0.35-paths.patch 2673 SHA256 26f8acf367eb9da7bcfddbea2238120804b4ea9e020d3a94a04b51b92fd253d7 SHA512 4534aa9a5bd1ae36ec08c53cf5e37e35e2dada8986130065610a89b0d42be60a05d04ce521007f0a55975e042b2cb8f431df2060e7d9f8469ed70254c56c130d WHIRLPOOL 6ff862d5dfc11cfdc2b8466f8958cc2255b30e2fa82461dbfe47dc99473d5e451ab5f332a9f683db037e197bc42602b5cad94e49c3bc48ad6cc9143ef56a57fb
+AUX mserv-0.35-webacl 39 SHA256 3f84ac32ee5eca5b13565a915ba736620f788a7cb031dbf8741b44d99551faa8 SHA512 e0d6a549265bb4e5568ec4cfa2fd003799002e6772f6a8e966510e0f7c7c6f1b2d16cec8ef9961207bf7c4db6973ff954261bd3d89ad2fab47f5b5c183d3f452 WHIRLPOOL 54b39bae8aeb57ea8c66a199435c143c51efe40c8b3661c8e2714d7e532aff7c14ae13d0738e6f7bf06d91963fd8cd89136a722a5320471f7e328da3de005b2c
+DIST mserv-0.35.tar.gz 280299 SHA256 7072ffbea66fd17e1ee0ab81de57eac612cbcb25587931602db85536158dd442 SHA512 a79340fc6ea02cf14dd0c223cf0d9feb5805b9e88d3dc1f4c854edbd9b8fe98c60b89c10555aa4214e153b17452c088dfde7700a5357a2c1a43c22af5d44255f WHIRLPOOL 1064b88b5d90370d61ae8e540cdd3b1899d20645edcb595e7f695dcd9eb450f10fb1ab85b25192b0d401d8be9f46a6cef2155cc31e5c8de0eb7980669a007c87
+EBUILD mserv-0.35-r1.ebuild 2659 SHA256 fa9d58c6b83a126fbe7a2f47a3a3b8240d372f2f6a0c97c499202c0d48db1205 SHA512 2a279cba5a0acf457ded9e0f9fa8cc9179e9d0c2d153fa3f29f15dfc29cc36da6ac82956886d61acd0c7157f441fcd79c758ace1eb7304d0e353e5fd223a6375 WHIRLPOOL a61e05640821ab1344a4adbba6078ef2b2b2cda82db988162ab934ee5882ceb08cd5239eb817516fb4864163bb5f857e0f3d3a9407d05816693c4085cab986b7
+MISC ChangeLog 2756 SHA256 05dd2a1498f625bfa82142ef58f0405cc0b876959675aabd29b9c7eb0fcc3cb7 SHA512 de8a336fa4d844aeff363baa2d0717ea8803c48dfd1453d70c6cef3e47e5e9f1db770be7a41792c841698fd3eb6b3b296d5a82590995a8fa23905fae40b43ecd WHIRLPOOL bda84c656373649fad27b772603d1e6dd7bc743d008516e2fef8d3d219c343083305ada4fb457bd3d282620ad432cbf590928ea717ad9994153c748eccff921c
+MISC ChangeLog-2015 3372 SHA256 d2c4320758b51b163e02e3db04f447faddb29940726a84d2695f6e46cb42c199 SHA512 2a68cf514dd9b7b126db13c04c5c5078aabea9fce224213c440d7f4bc0e542471b2b3d962507c231084d9c110c14b1c2b57f0d170449f58834a3e86c70d3bd0a WHIRLPOOL 657a9afd42ce35a67f5a547f4b6509bf6d3872051bd3776a1711b9e69dde694f720e6a5a7a8fba08ce917a8d71725277e70e18f6d2627bf2893ebd7b0614d376
+MISC metadata.xml 328 SHA256 c6c85ab0793ea457b8b0178b144d14eb62591a1acd9624d1e01c1b117d50023b SHA512 56f37df3967c0d5572bd5811d03b2d0304a90aeb59f4e994dd21adb63b36eec8301cf4b4e1a1e9de81a2a29ac59a8fe33136a8d1a878385f77ec9b72325d91c0 WHIRLPOOL 8ae5e6ae7d8069f9b3731236eccf5b1c5790be3c37a10df4738cc954c7d197aba9b7c7f90e797eb02705371716550238d66876a11e41126af2cbb79c06c9488d
diff --git a/media-sound/mserv/files/mserv-0.35-acl b/media-sound/mserv/files/mserv-0.35-acl
new file mode 100644
index 000000000000..201913ef2177
--- /dev/null
+++ b/media-sound/mserv/files/mserv-0.35-acl
@@ -0,0 +1,2 @@
+root:a16aKMw/UDpfc:MASTER
+guest:ax/jGzB/YyIVk:GUEST
diff --git a/media-sound/mserv/files/mserv-0.35-confd b/media-sound/mserv/files/mserv-0.35-confd
new file mode 100644
index 000000000000..5d4feef5e05b
--- /dev/null
+++ b/media-sound/mserv/files/mserv-0.35-confd
@@ -0,0 +1,7 @@
+# Set the port mserv listens on.  By default, this is 4444, but
+# Maya's document server uses this port also.
+#
+# If you change it here, make sure you change it in:
+# /var/www/localhost/cgi-bin/mserv/mserv.cgi as well.
+
+PORT=4444
diff --git a/media-sound/mserv/files/mserv-0.35-config b/media-sound/mserv/files/mserv-0.35-config
new file mode 100644
index 000000000000..95afad8522d6
--- /dev/null
+++ b/media-sound/mserv/files/mserv-0.35-config
@@ -0,0 +1,49 @@
+# Mserv configuration file for 0.33 and later
+
+# File locations, / at start is absolute, otherwise relative to mserv root
+path_acl=/etc/mserv/acl
+path_webacl=/etc/mserv/webacl
+path_logfile=/var/log/mserv.log
+path_tracks=/usr/local/share/tracks
+path_trackinfo=/var/lib/mserv/trackinfo
+path_playout=/var/spool/mserv/player.out
+path_idea=idea
+path_mixer=/dev/mixer
+path_language=/usr/share/english.lang
+
+# Define player invokation methods
+# mservplay is our special wrapper, the first parameter is a 'nice' level
+# play is part of sox
+prog_mpg123=/usr/bin/mpg123 -b 1024
+prog_freeamp=/usr/bin/freeamp -ui mpg123
+prog_mservplay=/usr/bin/mservplay 0 mpg123 -b 1024
+prog_play=/usr/bin/play
+prog_ogg123=/usr/bin/ogg123
+
+# Set players for each file extension we want to support, unknown extensions
+# are ignored by mserv
+player_mp3=prog_mpg123
+player_wav=prog_play
+player_au=prog_play
+player_ogg=prog_ogg
+
+# Set default random mode, either on or off.  You must still tell mserv to
+# start playing (PLAY).
+random=off
+
+# Set whether or not you would like play to start as soon as mserv has loaded.
+play=off
+
+# Set default random factor, 0.5 is completely random, 0.6 is less random
+# and takes into account your ratings, 0.4 plays your worst tunes. 0.99 max.
+factor=0.60
+
+# Set default filter, leave blank for off.  Example: "!classical" to
+# not play classical genre, or "year>=1980&year<1990" to only play
+# 80's songs.
+filter=
+
+# Set gap between songs, in seconds.  0 to start the next song as quick as
+# possible.
+gap=1
+
diff --git a/media-sound/mserv/files/mserv-0.35-initd b/media-sound/mserv/files/mserv-0.35-initd
new file mode 100644
index 000000000000..86a5a4049562
--- /dev/null
+++ b/media-sound/mserv/files/mserv-0.35-initd
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+	after apache
+	after apache2
+}
+
+start() {
+	ebegin "Starting Mserv"
+	start-stop-daemon --start -o -b --chuid mserv --exec /usr/bin/mserv -- \
+		-r /var/spool/mserv -c /etc/mserv/config -p ${PORT}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Mserv"
+	start-stop-daemon --stop -o -q --exec /usr/bin/mserv
+	eend $?
+}
diff --git a/media-sound/mserv/files/mserv-0.35-mservplay.patch b/media-sound/mserv/files/mserv-0.35-mservplay.patch
new file mode 100644
index 000000000000..45beafe68551
--- /dev/null
+++ b/media-sound/mserv/files/mserv-0.35-mservplay.patch
@@ -0,0 +1,11 @@
+--- mserv-0.35.orig/support/mservplay.c	2003-08-28 20:10:17.000000000 -0700
++++ mserv-0.35/support/mservplay.c	2003-08-29 15:16:13.000000000 -0700
+@@ -43,7 +43,7 @@
+     fprintf(stderr, "%s: setuid: %s\n", argv[0], strerror(errno));
+     exit(1);
+   }
+-  if (stricmp(argv[2], "mpg123")) {
++  if (strcasecmp(argv[2], "mpg123")) {
+     fprintf(stderr, "%s: Unrecognised player type, must be 'mpg123'",
+ 	    argv[0]);
+     exit(1);
diff --git a/media-sound/mserv/files/mserv-0.35-paths.patch b/media-sound/mserv/files/mserv-0.35-paths.patch
new file mode 100644
index 000000000000..dca7560ddcb7
--- /dev/null
+++ b/media-sound/mserv/files/mserv-0.35-paths.patch
@@ -0,0 +1,74 @@
+--- mserv-0.35.orig/mserv/defconf.c	2003-08-28 20:10:17.000000000 -0700
++++ mserv-0.35/mserv/defconf.c	2003-08-28 23:04:14.000000000 -0700
+@@ -16,11 +16,11 @@
+ # Define player invokation methods\n\
+ # mservplay is our special wrapper, the first parameter is a 'nice' level\n\
+ # play is part of sox\n\
+-prog_mpg123=/usr/local/bin/mpg123 -b 1024\n\
+-prog_freeamp=/usr/local/bin/freeamp -ui mpg123\n\
+-prog_mservplay=/usr/local/bin/mservplay 0 mpg123 -b 1024\n\
+-prog_play=/usr/local/bin/play\n\
+-prog_ogg123=/usr/local/bin/ogg123\n\
++prog_mpg123=/usr/bin/mpg123 -b 1024\n\
++prog_freeamp=/usr/bin/freeamp -ui mpg123\n\
++prog_mservplay=/usr/bin/mservplay 0 mpg123 -b 1024\n\
++prog_play=/usr/bin/play\n\
++prog_ogg123=/usr/bin/ogg123\n\
+ \n\
+ # Set players for each file extension we want to support, unknown extensions\n\
+ # are ignored by mserv\n\
+--- mserv-0.35.orig/webclient/index.html	2003-08-28 20:10:17.000000000 -0700
++++ mserv-0.35/webclient/index.html	2003-08-29 17:02:10.000000000 -0700
+@@ -9,7 +9,7 @@
+ <tr><td>
+ <center>
+ <table>
+-<form method=post action="main.cgi">
++<form method=post action="/cgi-bin/mserv/main.cgi">
+ <tr>
+   <td>User</td>
+   <td><input type=text name=user size=10 maxsize=10></td>
+@@ -23,6 +23,6 @@
+ </center>
+ </td></tr>
+ </table>
+-<p><a href="main.cgi">GUEST ACCESS</a></p>
++<p><a href="/cgi-bin/mserv/main.cgi">GUEST ACCESS</a></p>
+ </center>
+ </html>
+--- mserv-0.35.orig/webclient/margin.cgi	2003-08-28 20:10:17.000000000 -0700
++++ mserv-0.35/webclient/margin.cgi	2003-08-30 16:14:27.000000000 -0700
+@@ -15,11 +15,11 @@
+ <head>
+   <title>Mserv web interface - margin</title>
+ </head>
+-<body bgcolor="#ffffff" background="back.gif">
++<body bgcolor="#ffffff" background="/mserv/back.gif">
+ <p align=center><center>
+ <table>
+ <tr><td>
+-<p align=center><img src="mserv7.gif" alt="Mserv"></p>
++<p align=center><img src="/mserv/mserv7.gif" alt="Mserv"></p>
+ <p><font size="2"><a target=main href="mserv.cgi?user=$user&pass=$pass&page=status">Status</a>
+ <br><a target=main href="mserv.cgi?user=$user&pass=$pass&page=albums">Albums</a>
+ <br><a target=main href="mserv.cgi?user=$user&pass=$pass&page=queue">Queue</a>
+--- mserv-0.35.orig/webclient/mserv.cgi	2003-08-28 20:10:17.000000000 -0700
++++ mserv-0.35/webclient/mserv.cgi	2003-08-30 16:14:47.000000000 -0700
+@@ -3,7 +3,7 @@
+ $guestuser = 'guest';
+ $guestpass = 'guest';
+ $host = 'localhost:4444';
+-$mservcmd = '/usr/local/bin/mservcmd';
++$mservcmd = '/usr/bin/mservcmd';
+ 
+ use POSIX;
+ use CGI;
+@@ -34,7 +34,7 @@
+ <head>
+   <title>Mserv</title>
+ </head>
+-<body bgcolor="#ffffff" background="back.gif">
++<body bgcolor="#ffffff" background="/mserv/back.gif">
+ EOF
+ 
+ if ($page eq 'status') {
diff --git a/media-sound/mserv/files/mserv-0.35-webacl b/media-sound/mserv/files/mserv-0.35-webacl
new file mode 100644
index 000000000000..9e438c085d5c
--- /dev/null
+++ b/media-sound/mserv/files/mserv-0.35-webacl
@@ -0,0 +1,2 @@
+root:a16aKMw/UDpfc
+guest:ax/jGzB/YyIVk
diff --git a/media-sound/mserv/metadata.xml b/media-sound/mserv/metadata.xml
new file mode 100644
index 000000000000..f90a8229753f
--- /dev/null
+++ b/media-sound/mserv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mserv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mserv/mserv-0.35-r1.ebuild b/media-sound/mserv/mserv-0.35-r1.ebuild
new file mode 100644
index 000000000000..414bc4fc39ed
--- /dev/null
+++ b/media-sound/mserv/mserv-0.35-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit depend.apache webapp eutils toolchain-funcs user
+
+DESCRIPTION="Jukebox-style music server"
+HOMEPAGE="http://www.mserv.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="mserv"
+
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE="vorbis"
+
+WEBAPP_MANUAL_SLOT="yes"
+SLOT="0"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	media-sound/mpg123
+	media-sound/sox
+	vorbis? ( media-sound/vorbis-tools )"
+DEPEND=""
+
+need_apache
+
+pkg_setup() {
+	webapp_pkg_setup
+	enewgroup mserv
+	enewuser mserv -1 -1 /dev/null mserv,audio
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Adjust paths to match Gentoo
+	epatch "${FILESDIR}"/${P}-paths.patch
+	# Mservplay uses stricmp - should be strcasecmp
+	epatch "${FILESDIR}"/${P}-mservplay.patch
+}
+
+src_compile() {
+	econf
+	emake || die "emake failed"
+
+	# Optional suid wrapper
+	cd "${S}"/support
+	$(tc-getCC) -I.. -I../mserv ${CFLAGS} ${LDFLAGS} mservplay.c -o mservplay || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dobin support/mservedit support/mservripcd support/mservplay
+	dodoc AUTHORS ChangeLog docs/quick-start.txt
+
+	# Web client
+	dodir ${MY_CGIBINDIR}/${PN}
+	cp webclient/*.cgi "${D}"/${MY_CGIBINDIR}/${PN}
+	cp webclient/*.gif webclient/index.html "${D}"/${MY_HTDOCSDIR}
+
+	webapp_src_install
+
+	# Configuration files
+	insopts -o mserv -g mserv -m0644
+	insinto /etc/mserv
+	fowners mserv:mserv /etc/mserv
+	newins "${FILESDIR}"/${P}-config config
+	newins "${FILESDIR}"/${P}-webacl webacl
+	newins "${FILESDIR}"/${P}-acl acl
+	insinto ${MY_HOSTROOTDIR}/${PN}
+	fowners mserv:mserv ${MY_HOSTROOTDIR}/${PN}
+	newins "${FILESDIR}"/${P}-config config
+	newins "${FILESDIR}"/${P}-webacl webacl
+	newins "${FILESDIR}"/${P}-acl acl
+	fperms 0600 ${MY_HOSTROOTDIR}/${PN}/acl
+
+	newinitd "${FILESDIR}"/${P}-initd ${PN}
+	newconfd "${FILESDIR}"/${P}-confd ${PN}
+
+	# Log file
+	dodir /var/log
+	touch "${D}"var/log/mserv.log
+	fowners mserv:mserv /var/log/mserv.log
+
+	# Track and album info
+	keepdir /var/lib/mserv/trackinfo
+	fowners mserv:mserv /var/lib/mserv/trackinfo
+
+	# Current track output
+	dodir /var/spool/mserv
+	touch "${D}"var/spool/mserv/player.out
+	fowners mserv:mserv /var/spool/mserv /var/spool/mserv/player.out
+}
+
+pkg_postinst() {
+	elog
+	elog "The wrapper program 'mservplay' is disabled for"
+	elog "security reasons.  If you wish to use mservplay"
+	elog "to pass a 'nice' value to mpg123, you must make"
+	elog "/usr/bin/mservplay suid root."
+	ewarn
+	ewarn "Please edit /etc/mserv/config and set path_tracks"
+	ewarn "to the location of your music files."
+	webapp_pkg_postinst
+}
diff --git a/media-sound/mt-daapd/Manifest b/media-sound/mt-daapd/Manifest
new file mode 100644
index 000000000000..93d8c9da12cb
--- /dev/null
+++ b/media-sound/mt-daapd/Manifest
@@ -0,0 +1,11 @@
+AUX mt-daapd-0.2.3-sparc.patch 927 SHA256 fda7219e9cca646520debb1a1f853ea8144e6c3db7c04004cddeeb173df9645b SHA512 8f263a1a1905f9dde592dc321dc0a2ef5c4a8d9ae1e80eb7d9f04810fadca3cce38628282a0c7c27b4745a3fbce46893d834bf315013a1d5c200d64218371cce WHIRLPOOL 9b969c097b02c17ac75a327004a8188558b9469bd0adc540d39402537cb9a003a005dd031c5acca86b7190a70a3c2cdcf973a920180e3e994cdc8fd29a01151c
+AUX mt-daapd-0.2.4.1-libsorder.patch 5361 SHA256 b1895b9487279347bf488b40c26dcf8473edbd8abd61519fc7ee08181a15d78e SHA512 6333215ff44c4df2e87664b4262c733b1aa9334a0659ffc7deb1cdfe694eded6387f74fe30bb5709d38a9309b928d97c156a3ec4d165c7c3446eb428413403a9 WHIRLPOOL 468fffba83e1fc8afdfc74eff8e6a94ef7d16d34e81f3fedcb64dd1860c917104f100f89d273a329759b38443dcbd080d5a730a9ba5b1ec353583d22408f985e
+AUX mt-daapd-0.2.4.1-pidfile.patch 1908 SHA256 da3d9e7283886eadd0e8e31a5058d307ee693ca3207bafc5d6b6315fe2217659 SHA512 8dbf79b4ebe890a398b1b14b7a85d2f40fbffd8c0cabc21ee6271ca4f1c062f580fc113a8628eecff091d31fd6af54d3c408dacaa2e7433d191f31f26ad54dad WHIRLPOOL 9ffde0ff4df0848d39f2cff594301106f20337d7ff0626897215914c49c2287a98c2d0e2afd0a96ebaa65668f393fe2ae729c57260aecb7cb07c886bdb1ea669
+AUX mt-daapd-0.2.4.2-maintainer-mode.patch 405 SHA256 6b25f3b9fc395f86fec5e57a84557840d3ec03ebf510c95171d7554c23b20988 SHA512 a7fcabca95370395ba344c4f8273def2a401889e112bbe6163db324f72639a073be4406f1b812ae67d2a99fb8159c2296ee1b9a4f18a8492dcdeea0e3b4e52c7 WHIRLPOOL ca9fd586f5b68675f88a42bb8e0a15fd2e86fa82ab46784fa0d6f51a712e332ec928ce1c33d264526b8b8cc05fc51106227dde2b87c95af3aed798a3a20cf4fa
+AUX mt-daapd-0.2.4.2-oggvorbis.patch 663 SHA256 22fae7111000eb4e0d638d2d09deb006db0723f033895530c70ffcdc5f320160 SHA512 0ec74b9cdf4fde912944c95f148fc0f232249c978954e4a4ed052ca60c7ec4cfb7ae88f791bf2d8b895ce69bbd6580bfbd5e88439e09ce33a3e32de34dd47533 WHIRLPOOL 4f9af543ba296da0bf305a87967c617c1c7bccdf2f10e35fb7e22a596abe1de64e6cbcbec38ce1fa7d988bf89f91184e2dbb903887395f289c12804f1e7bd850
+AUX mt-daapd.init.2 1238 SHA256 19496ff49a64ecfb392601f3f08f31c59dabc28c3f3346fc5aa0cc1deaa2c629 SHA512 8e4649a8fcc1d3de94c872644ff0bee62cb32efc5e5f1bb2c25c1ad42e2b675524f76417b0ccff30f0574fda126b4316c512508bbe7283973ee1020d84e95df7 WHIRLPOOL ea464b97a1104923e105d332002dd0e2b60520905e6c1ce5d565a899489b2439a566e8d597a15c859e79f9507d9517867efaced278098f33484de25098b5bfee
+DIST mt-daapd-0.2.4.2.tar.gz 436513 SHA256 50d89f77bdc3fd0ca408d52cabff528224fcc7319acc3b9456db0e3164a3b6cf SHA512 1a944f31cc63355d33c7fd821d4509b8b69805ae29aa23f1307bf7602f6a62beba1f5ab5f4005387177f17c5fdf8db91b338f010b4be4ab0cd783dc72c6df60f WHIRLPOOL f33fa892ff44da38fab7a1ec60e14acf363997b6b660334cf0e2cd9e78a971c9e9f52556c58927b2520b7d0b8f7ddd4df65067a182f07067b1dbb2519b9769bc
+EBUILD mt-daapd-0.2.4.2.ebuild 1913 SHA256 a6b62607476464fcbf7a296739c022b1b0bdb4ee2a0dc55bec679bbb6f600b9b SHA512 41fda1f05096e9bc11f7a6d53e5f7b06de9b2fe9f72001090a2ca915be58f0548bb52cb49793f19d686ca8951b0aa3606c8df448b3fdaf4a61896a2ed4dfcf73 WHIRLPOOL 7a3f457523c41af110183289a7f9be1902654907e752316ac153f12de983404ed5ef646877dc365f2473190955610ab0ed4853ef69a4069698701845f3a4f363
+MISC ChangeLog 2928 SHA256 6b0891d184ea802cf5d421cceb2d82044a3b69656da04ea8abdc8142f53b4b3c SHA512 8935e8c563fe6e890834a66e78df1a1b4712c253be26d67c8f29752e6468a736aa56d59907c0f7498fd85ac94959c5cf2cc57e5341053681630d86f9b94666af WHIRLPOOL 56c7b75dbccfd7e312f7ae19d0d55d33917bacbb72442a4be14f280a965e0c957ab0b23ef68596f7f9bb08f36754490b785d81de99fe0bb9c3c0fbf11972729b
+MISC ChangeLog-2015 12760 SHA256 b31dc09f1faee98170f2b12bd72163ea0021b899d5515ecef0288fdeafc35659 SHA512 cd903850f158440aa4511e464c71a30348805d1775bafc41e00956f3b45f2d66e413e57d0ee1c44611187aba7c712549a7447ab59f9f6a8b827ffeef9d93e677 WHIRLPOOL 62dd7d7ffe94f59538c2b422aca898c955268b33ed7e58e362aa85a282715382b7d4c3905adfe8c96dab24cab31df45647b441a91ef076e79ee5a6982d67a0ab
+MISC metadata.xml 331 SHA256 370af381fb61cfe50fce8c5e40f457d8f3602046078b581119e826dd584ca6af SHA512 75a2feebcc5b6226a059c79d8519bbf79de8ff4025c43389a39cb287ff220176e99f2fa2abdcdb371ebf9d988cc8bea4ca018ed347c98e9aedfc4ef7cbead941 WHIRLPOOL 21e6521fe5356189e5e14bd4d31d504187da16480dc4030aa6c075714ee7d2c7bc85e080ab881be372d10ba114023afdf5ff19780aa5468300cda886b9b8725a
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch
new file mode 100644
index 000000000000..482b25c13779
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.3-sparc.patch
@@ -0,0 +1,20 @@
+diff -Nura mt-daapd-0.2.3/src/mp3-scanner.c mt-daapd-0.2.3.sparc/src/mp3-scanner.c
+--- mt-daapd-0.2.3/src/mp3-scanner.c	2005-02-05 18:22:47.000000000 -0300
++++ mt-daapd-0.2.3.sparc/src/mp3-scanner.c	2006-01-03 16:39:50.000000000 -0300
+@@ -1663,14 +1663,14 @@
+     /* now check for an XING header */
+     if(strncasecmp((char*)&buffer[index+fi.xing_offset+4],"XING",4) == 0) {
+ 	DPRINTF(E_DBG,L_SCAN,"Found Xing header\n");
+-	xing_flags=*((int*)&buffer[index+fi.xing_offset+4+4]);
++	memcpy (&xing_flags, &buffer[index+fi.xing_offset+4+4], sizeof(int));
+ 	xing_flags=ntohs(xing_flags);
+ 
+ 	DPRINTF(E_DBG,L_SCAN,"Xing Flags: %02X\n",xing_flags);
+ 
+ 	if(xing_flags & 0x1) {
+ 	    /* Frames field is valid... */
+-	    fi.number_of_frames=*((int*)&buffer[index+fi.xing_offset+4+8]);
++	    memcpy (&fi.number_of_frames, &buffer[index+fi.xing_offset+4+8], sizeof(int));
+ 	    fi.number_of_frames=ntohs(fi.number_of_frames);
+ 	}
+     }
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
new file mode 100644
index 000000000000..a4c5a176ada4
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
@@ -0,0 +1,140 @@
+diff -ur mt-daapd-0.2.4.1.orig/configure.in mt-daapd-0.2.4.1/configure.in
+--- mt-daapd-0.2.4.1.orig/configure.in	2007-10-22 02:50:24.000000000 +0300
++++ mt-daapd-0.2.4.1/configure.in	2007-10-28 23:31:43.000000000 +0200
+@@ -20,8 +20,9 @@
+ CPPFLAGS="${CPPFLAGS} -g"
+ 
+ dnl fix freebsd's broken (?) libpthread
+-AC_CHECK_LIB(c_r,pthread_creat,LDFLAGS="${LDFLAGS} -lc_r", [
+-  AC_CHECK_LIB(pthread,pthread_create,LDFLAGS="${LDFLAGS} -lpthread") ])
++AC_CHECK_LIB(c_r,pthread_creat,THREAD_LIBS="-lc_r", [
++  AC_CHECK_LIB(pthread,pthread_create,THREAD_LIBS="-lpthread") ])
++AC_SUBST(THREAD_LIBS)
+ 
+ AC_ARG_ENABLE(debug,[  --enable-debug          Enable debugging features],
+ 		       CPPFLAGS="${CPPFLAGS} -Wall")
+@@ -35,26 +36,29 @@
+ 		      esac ])
+ 
+ AC_ARG_ENABLE(efence,[  --enable-efence         Enable electric fence],
+-			LDFLAGS="${LDFLAGS} -lefence")
++			EFENCE_LIBS="-lefence")
++AC_SUBST(EFENCE_LIBS)
+ AC_ARG_ENABLE(nslu2,[  --enable-nslu2          Build for NSLU2/uNSLUng], 
+ 		       CFLAGS="${CFLAGS} -DNSLU2")
+ 
+ AC_ARG_ENABLE(howl,[  --enable-howl       Use howl 0.9.2 or later],
+ 		      [ case "${enableval}" in
+-                        yes) rend_howl=true; rend_posix=false; rend_avahi=false; LDFLAGS="${LDFLAGS} -lhowl";
++                        yes) rend_howl=true; rend_posix=false; rend_avahi=false; HOWL_LIBS="-lhowl";
+ 			CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";;
+ 		        no)  rend_howl=false;;
+ 		        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-howl);;
+ 		      esac ])
++AC_SUBST(HOWL_LIBS)
+ 
+ AC_ARG_ENABLE(avahi,[  --enable-avahi          Use avahi 0.6 or later],
+ 		      [ case "${enableval}" in
+                         yes) PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ]);
+-			rend_avahi=true; rend_howl=false; rend_posix=false; LDFLAGS="${LDFLAGS} $AVAHI_LIBS";
++			rend_avahi=true; rend_howl=false; rend_posix=false;
+ 			CPPFLAGS="${CPPFLAGS} $AVAHI_CFLAGS -DWITH_AVAHI";;
+ 		        no)  rend_avahi=false;;
+ 		        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-avahi);;
+ 		      esac ])
++AC_SUBST(AVAHI_LIBS)
+ 
+ AC_ARG_ENABLE(oggvorbis,[  --enable-oggvorbis      Enable Ogg/Vorbis support],
+                            use_oggvorbis=true;
+@@ -82,7 +86,7 @@
+ 	CPPFLAGS="$CPPFLAGS -DNOT_HAVE_SA_LEN -D_XPG4_2"
+ 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME"
+ 	CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+-	LDFLAGS="$LDFLAGS -lnsl -lsocket";;	
++	EXTRA_LIBS="$EXTRA_LIBS -lnsl -lsocket";;
+ *freebsd*)
+ 	CPPFLAGS="$CPPFLAGS -DFREEBSD";;
+ *linux*)
+@@ -98,6 +102,8 @@
+ 	AM_CONDITIONAL(COND_REND_POSIX,false);;
+ esac
+ 
++AC_SUBST(EXTRA_LIBS)
++
+ dnl Checks for libraries.
+ AC_ARG_WITH(static-libs,
+ 	[--with-static-libs[[=DIR]]            use static libs in DIR],[
+@@ -154,12 +160,13 @@
+ AC_CHECK_LIB(gdbm,gdbm_open,echo "Have gdbm", echo "Must have gdbm";exit)
+ 
+ if test "$STATIC_LIBS" != "no"; then
+-  LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libgdbm.a"
++  GDBM_LIBS="${STATIC_LIBS}/libgdbm.a"
+   echo "Adding static libgdbm"
+ else
+-  LDFLAGS="${LDFLAGS} -lgdbm"
++  GDBM_LIBS="-lgdbm"
+   echo "Adding dynamic libgdbm"
+ fi
++AC_SUBST(GDBM_LIBS)
+ 
+ AC_CHECK_HEADERS(id3tag.h,, [
+  AC_MSG_ERROR([id3tag.h not found... try --with-id3tag=dir])])
+@@ -170,12 +177,14 @@
+ AC_CHECK_LIB(id3tag,id3_file_open,echo "Have id3tag",echo "Must have libid3tag";exit)
+ 
+ if test "$STATIC_LIBS" != "no"; then
+-  LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libid3tag.a -lz"
++  ID3_LIBS="${STATIC_LIBS}/libid3tag.a -lz"
+   echo "Adding static libid3tag"
+ else
+-  LDFLAGS="${LDFLAGS} -lid3tag -lz"
++  ID3_LIBS="-lid3tag -lz"
+   echo "Adding dynamic libid3tag"
+ fi
++AC_SUBST([ID3_LIBS])
++
+ CFLAGS=$oldcflags
+ 
+ if test x$use_oggvorbis = xtrue; then
+@@ -184,22 +193,23 @@
+   AC_CHECK_LIB(ogg,ogg_sync_init,echo "Have ogg",echo "Must have libogg for Ogg/Vorbis support";exit)
+ 
+   if test x"$STATIC_LIBS" != x"no"; then
+-    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libogg.a"
++    OGG_LIBS="${STATIC_LIBS}/libogg.a"
+     echo "Adding static libogg"
+   else
+-    LDFLAGS="${LDFLAGS} -logg"
++    OGG_LIBS="-logg"
+     echo "Adding dynamic libogg"
+   fi
++  AC_SUBST(OGG_LIBS)
+ 
+   AC_CHECK_HEADERS(vorbis/codec.h,, [
+    AC_MSG_ERROR([vorbis/codec.h not found... Must have libvorbis installed for Ogg/Vorbis support])])
+   AC_CHECK_LIB(vorbis,vorbis_info_init,echo "Have vorbis",echo "Must have libvorbis for Ogg/Vorbis support";exit)
+ 
+   if test x"$STATIC_LIBS" != x"no"; then
+-    LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libvorbis.a"
++    OGG_LIBS="${OGG_LIBS} ${STATIC_LIBS}/libvorbis.a"
+     echo "Adding static libvorbis"
+   else
+-    LDFLAGS="${LDFLAGS} -lvorbis"
++    OGG_LIBS="${OGG_LIBS} -lvorbis"
+     echo "Adding dynamic libvorbis"
+   fi
+ fi
+diff -ur mt-daapd-0.2.4.1.orig/src/Makefile.am mt-daapd-0.2.4.1/src/Makefile.am
+--- mt-daapd-0.2.4.1.orig/src/Makefile.am	2007-10-22 03:32:27.000000000 +0300
++++ mt-daapd-0.2.4.1/src/Makefile.am	2007-10-28 23:31:33.000000000 +0200
+@@ -34,6 +34,9 @@
+ 	redblack.c redblack.h dynamic-art.c dynamic-art.h query.c query.h \
+ 	$(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(OGGVORBISSRC) $(ARENDSRC)
+ 
++mt_daapd_LDADD = $(GDBM_LIBS) $(ID3_LIBS) $(OGG_LIBS) $(THREAD_LIBS) \
++	$(EFENCE_LIBS) $(HOWL_LIBS) $(AVAHI_LIBS) $(EXTRA_LIBS)
++
+ EXTRA_DIST = mDNS.c mDNSClientAPI.h mDNSDebug.h mDNSPosix.c \
+ 	mDNSUNP.c mDNSPlatformFunctions.h mDNSPosix.h mDNSUNP.h \
+ 	rend-howl.c rend-posix.c rend-osx.c db-memory.c \
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
new file mode 100644
index 000000000000..5976316e5bf2
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
@@ -0,0 +1,50 @@
+diff -ur mt-daapd-0.2.4.1.orig/src/main.c mt-daapd-0.2.4.1/src/main.c
+--- mt-daapd-0.2.4.1.orig/src/main.c	2007-10-22 02:27:57.000000000 +0300
++++ mt-daapd-0.2.4.1/src/main.c	2007-10-28 23:54:29.000000000 +0200
+@@ -551,6 +551,7 @@
+     printf("  -m             Disable mDNS\n");
+     printf("  -c <file>      Use configfile specified\n");
+     printf("  -p             Parse playlist file\n");
++    printf("  -P <file>      Write the PID to specified file\n");
+     printf("  -f             Run in foreground\n");
+     printf("  -y             Yes, go ahead and run as non-root user\n");
+     printf("\n\n");
+@@ -708,6 +709,7 @@
+ int main(int argc, char *argv[]) {
+     int option;
+     char *configfile=DEFAULT_CONFIGFILE;
++    char *pidfile=PIDFILE;
+     WSCONFIG ws_config;
+     WSHANDLE server;
+     int parseonly=0;
+@@ -726,7 +728,7 @@
+     config.use_mdns=1;
+     err_debuglevel=1;
+ 
+-    while((option=getopt(argc,argv,"D:d:c:mpfry")) != -1) {
++    while((option=getopt(argc,argv,"D:d:c:mpP:fry")) != -1) {
+         switch(option) {
+         case 'd':
+             err_debuglevel=atoi(optarg);
+@@ -754,6 +756,10 @@
+             foreground=1;
+             break;
+ 
++        case 'P':
++            pidfile=optarg;
++            break;
++
+         case 'r':
+             reload=1;
+             break;
+@@ -803,8 +809,8 @@
+ 
+     /* open the pidfile, so it can be written once we detach */
+     if((!foreground) && (!force_non_root)) {
+-        if(-1 == (pid_fd = open(PIDFILE,O_CREAT | O_WRONLY | O_TRUNC, 0644)))
+-            DPRINTF(E_FATAL,L_MAIN,"Error opening pidfile (%s): %s\n",PIDFILE,strerror(errno));
++        if(-1 == (pid_fd = open(pidfile,O_CREAT | O_WRONLY | O_TRUNC, 0644)))
++            DPRINTF(E_FATAL,L_MAIN,"Error opening pidfile (%s): %s\n",pidfile,strerror(errno));
+ 
+         if(0 == (pid_fp = fdopen(pid_fd, "w")))
+             DPRINTF(E_FATAL,L_MAIN,"fdopen: %s\n",strerror(errno));
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch
new file mode 100644
index 000000000000..a81483db6a11
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-maintainer-mode.patch
@@ -0,0 +1,15 @@
+--- configure.in.orig	2008-07-06 23:57:08.000000000 +0200
++++ configure.in	2008-07-06 23:57:46.000000000 +0200
+@@ -17,10 +17,12 @@
+ rend_posix=true
+ 
+ STATIC_LIBS=no
+ CPPFLAGS="${CPPFLAGS} -g"
+ 
++AM_MAINTAINER_MODE
++
+ dnl fix freebsd's broken (?) libpthread
+ AC_CHECK_LIB(c_r,pthread_creat,THREAD_LIBS="-lc_r", [
+   AC_CHECK_LIB(pthread,pthread_create,THREAD_LIBS="-lpthread") ])
+ AC_SUBST(THREAD_LIBS)
+ 
diff --git a/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch
new file mode 100644
index 000000000000..714f34142ac2
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-0.2.4.2-oggvorbis.patch
@@ -0,0 +1,18 @@
+--- configure.in.orig	2009-03-11 08:15:14.000000000 -0500
++++ configure.in	2009-03-11 08:25:36.000000000 -0500
+@@ -63,9 +63,14 @@
+ AC_SUBST(AVAHI_LIBS)
+ 
+ AC_ARG_ENABLE(oggvorbis,[  --enable-oggvorbis      Enable Ogg/Vorbis support],
++			[ case "${enableval}" in
++			  yes)
+                            use_oggvorbis=true;
+ #                           LDFLAGS="${LDFLAGS} -logg -lvorbis";
+-                           CPPFLAGS="${CPPFLAGS} -DOGGVORBIS")
++                           CPPFLAGS="${CPPFLAGS} -DOGGVORBIS"
++			   esac
++			 ]
++			   )
+ 
+ AM_CONDITIONAL(COND_REND_HOWL, test x$rend_howl = xtrue)
+ AM_CONDITIONAL(COND_REND_AVAHI, test x$rend_avahi = xtrue)
diff --git a/media-sound/mt-daapd/files/mt-daapd.init.2 b/media-sound/mt-daapd/files/mt-daapd.init.2
new file mode 100644
index 000000000000..eacc6ea7b7e1
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd.init.2
@@ -0,0 +1,45 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Somehow based on init.d file shipped with mt-daapd itself.
+#
+# You can run multiple copies of this service just symlinking them to
+# mt-daapd.<name>, then it will load /etc/mt-daapd.d/<name>.conf as config
+# file.
+# Remember to give them different logs and cache directories.
+#
+# The main instance (with no <name>) uses /etc/mt-daapd.conf
+
+# Check for OpenRC/Baselayout 2 -- see bug #230917
+if [ -f /lib/librc.so -o -f /etc/init.d/sysfs -o -f /lib/rc/version ]; then
+	myservice=$RC_SVCNAME
+fi
+
+CONF="${myservice##*.}"
+if [ -n ${CONF} -a ${myservice} != "mt-daapd" ]; then
+	PIDFILE="/var/run/mt-daapd.${CONF}.pid"
+	CONFFILE="/etc/mt-daapd.d/${CONF}.conf"
+else
+	PIDFILE="/var/run/mt-daapd.pid"
+	CONFFILE="/etc/mt-daapd.conf"
+fi
+
+depend() {
+	need net
+	#USEHOWL need mDNSResponderPosix
+}
+
+start() {
+	ebegin "Starting mt-daapd DAAP server"
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
+		--exec /usr/sbin/mt-daapd -- -P ${PIDFILE} -c ${CONFFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping mt-daapd DAAP server"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE} --signal 2
+	eend $?
+
+	rm -f ${PIDFILE}
+}
diff --git a/media-sound/mt-daapd/metadata.xml b/media-sound/mt-daapd/metadata.xml
new file mode 100644
index 000000000000..a7b87586932a
--- /dev/null
+++ b/media-sound/mt-daapd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mt-daapd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
new file mode 100644
index 000000000000..a36e59993f8e
--- /dev/null
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="A multi-threaded implementation of Apple's DAAP server"
+HOMEPAGE="http://www.mt-daapd.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ~mips ppc sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="vorbis"
+
+RDEPEND="media-libs/libid3tag
+	sys-libs/gdbm
+	net-dns/avahi[dbus]
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	cp "${FILESDIR}"/${PN}.init.2 initd
+
+	sed -i -e 's:#USEHOWL need mDNSResponderPosix:need avahi-daemon:' initd
+
+	epatch "${FILESDIR}"/${PN}-0.2.3-sparc.patch \
+		"${FILESDIR}"/${PN}-0.2.4.1-libsorder.patch \
+		"${FILESDIR}"/${PN}-0.2.4.1-pidfile.patch \
+		"${FILESDIR}"/${P}-maintainer-mode.patch \
+		"${FILESDIR}"/${P}-oggvorbis.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable vorbis oggvorbis) \
+		--disable-maintainer-mode \
+		--enable-avahi \
+		--disable-mdns
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	insinto /etc
+	newins contrib/mt-daapd.conf mt-daapd.conf.example
+	doins contrib/mt-daapd.playlist
+
+	newinitd initd ${PN}
+
+	keepdir /var/cache/mt-daapd /etc/mt-daapd.d
+	dodoc AUTHORS ChangeLog CREDITS NEWS README TODO
+}
+
+pkg_postinst() {
+	einfo
+	elog "You have to configure your mt-daapd.conf following"
+	elog "/etc/mt-daapd.conf.example file."
+	einfo
+
+	if use vorbis; then
+		einfo
+		elog "You need to edit you extensions list in /etc/mt-daapd.conf"
+		elog "if you want your mt-daapd to serve ogg files."
+		einfo
+	fi
+
+	einfo
+	elog "If you want to start more than one ${PN} service, symlink"
+	elog "/etc/init.d/${PN} to /etc/init.d/${PN}.<name>, and it will"
+	elog "load the data from /etc/${PN}.d/<name>.conf."
+	elog "Make sure that you have different cache directories for them."
+	einfo
+}
diff --git a/media-sound/multimux/Manifest b/media-sound/multimux/Manifest
new file mode 100644
index 000000000000..b4e8c769d6d7
--- /dev/null
+++ b/media-sound/multimux/Manifest
@@ -0,0 +1,6 @@
+AUX multimux-0.2.4-makefiles.patch 379 SHA256 f279877d70f0e9a76da339aa622f618976bec037f1d0ab82c04b323c3db37a12 SHA512 fbb7b685f580700afe4659a60cc0499cf4eb578c91ac7ffc6154d3761e4ada4905ec29f51220cbc1e425fe474c4b55e4bf0952412f256eb9a4802faa4e8f6f72 WHIRLPOOL ad9a96ba11355928253d6840d332c458036207e28e2cae47e2aac038384afed0b608fea3c8fbc95fb99a7433e57520b4b5c6744ed9209119a7c8e6cb2010e243
+DIST multimux-0.2.5.2.tgz 16855 SHA256 78217012abf7944729bd8e4c471323349f26cc9b77b6afbd99170e04af7d53cb SHA512 6f27a154de2f5265457b390a5ef315fa32fbe4764460cef6ec861eb71df25c9d314ee59f2fbc1e15b44839ad0c7b642fa4213f0e7142cff3a715567964364c0a WHIRLPOOL 96aa2b60ba2c5eb33bac1ddf8917e400158e2303c92dae42367fac4a369b0b2148059ddb8a851bce1273302b928f1d35bd0fc8a4899c7c5ef3a2dd88ca93a65b
+EBUILD multimux-0.2.5.2.ebuild 718 SHA256 42bf7553db1b110e36297088c49d7b09d74fb79102a137a4bb8b8c7d6fa03ee9 SHA512 43486724321bf9e1f3f782c39d1ab964cd51ae3e22359ec8feea21ab1485e262dc6df9b62b2c7bc0126821615553fcb730d716b2ba1f8b2b42aa65de74a19e84 WHIRLPOOL e1bb7f4cb40e1b9b1d4f8e423415473e247aa5fb38a42a428b6f537e19265cdf34b2814033238b607341e7998d7dc0749dacfe2a554b706ea05b1cb4fb82e815
+MISC ChangeLog 2478 SHA256 197e1d311651167d1291c5d73a0e2801036f4763442181c06cc4ac17101720eb SHA512 c69588286eb2a51c9af07c4bdbb0ceaab9fe144d302ea1e66859570034424e7873e71eaf2d5e97de4bddc1a59694b66d729dde28e7ef6efac99af887d7ee642a WHIRLPOOL c7b1dee13b2deadda06fea9160248d618dd5d85087d976939ae841b00e8ab51fed02e6d6100f76deb3a46d27b58175a1088ac5906754aa117c72fffa583f6065
+MISC ChangeLog-2015 2385 SHA256 aa2bdd25e129be8d145cefdc3806ab534cc44be943536bac6e32be55e0ee15d2 SHA512 aa0e606f2ac495df665c588aaa34fbb1e12ef70d17141b06beddaaa7959d88d87ae53ede03f1df30244ac9e92e89c1f4f47186b619683f609de12206731b5e57 WHIRLPOOL 5ba8ca0e4e33c402ea2103fd362391c509ae535b63a8590d74b61fae8dab36c6b04fed703c7fe0830991faa02a806226aac13fb27392005178638443c4929a93
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/multimux/files/multimux-0.2.4-makefiles.patch b/media-sound/multimux/files/multimux-0.2.4-makefiles.patch
new file mode 100644
index 000000000000..61ab8b8b395c
--- /dev/null
+++ b/media-sound/multimux/files/multimux-0.2.4-makefiles.patch
@@ -0,0 +1,13 @@
+Index: multimux-0.2.4/Makefile
+===================================================================
+--- multimux-0.2.4.orig/Makefile
++++ multimux-0.2.4/Makefile
+@@ -17,7 +17,7 @@ multimux.o
+ all:
+ 	$(CC) $(CFLAGS) -c $(SRC1)
+ 
+-	$(CC) -o multimux   $(OBJECT1) $(LIBRARY)
++	$(CC) $(LDFLAGS) -o multimux   $(OBJECT1) $(LIBRARY)
+ 
+ # DEPENDENCIES
+ multimux.o : multimux.c multimux.h
diff --git a/media-sound/multimux/metadata.xml b/media-sound/multimux/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/multimux/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/multimux/multimux-0.2.5.2.ebuild b/media-sound/multimux/multimux-0.2.5.2.ebuild
new file mode 100644
index 000000000000..c375db4aa371
--- /dev/null
+++ b/media-sound/multimux/multimux-0.2.5.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs flag-o-matic
+
+IUSE=""
+
+DESCRIPTION="combines up to 8 audio mono wave ch. into one big multi ch. wave file"
+HOMEPAGE="http://panteltje.com/panteltje/dvd/"
+SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.2.4-makefiles.patch"
+}
+
+src_compile() {
+	append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE	-D_LARGEFILE64_SOURCE
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin multimux
+	dodoc CHANGES README
+}
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
new file mode 100644
index 000000000000..b6bd74735c3d
--- /dev/null
+++ b/media-sound/mumble/Manifest
@@ -0,0 +1,10 @@
+AUX mumble-1.2.4-speech-dispatcher.patch 1289 SHA256 d9443303de024e2efb4c0969121f46b2ebbc45351ab5ab52181ac291aa7a4265 SHA512 32b83ba846fbda3529c222df2cf6fa0f615dabdd7e211051119fb9ed53bdc3e8e11aaa1b132bbdfcedffd72b1e19666aaf083799f7ebbbf60f536a9f9a0c6a2a WHIRLPOOL a1696342523dca02ea2c136239e9dbcc6066d4de7cbf195b4a288459b2886e93abb893ff85fad11e4afd21702ad8775002e9487a5068c315fa0b2a0269a07ee5
+DIST mumble-1.2.17.tar.gz 3207840 SHA256 1c3601efdac611c8833d508054698ee9d8917b4e5fffb7fff8baec0bd6c8cb9c SHA512 03cb0a2048d42bd480741e0580cb4bf6961d607d6cf9b620434aea87ac0cd7cdbfae33863b71821ac8b931300df490ae5436f3c8098d6a5f37dd1eab0fb34dbe WHIRLPOOL 1c2b2eccad4abf825393aebecc691e535254cd8df16f9ebfc1fe282bf15d36af83f4cca559eba6a38c27ba58045cb09ca309e7be300e5ccd9f46cf0be47dd82c
+DIST mumble-1.2.18.tar.gz 3210749 SHA256 e0f7acc82691b9090e5d10a23ff4a7ceb9affe429b8f5221a9766129dc6f55aa SHA512 bd8b10cb34733d566fd6aae2410e8fe5f098efe5c5b106f569112d4e5205d8a045d43a0adc02a7a9d3e16b15e3515d908784596f293a7e2972fba20830161074 WHIRLPOOL f3d254db7557f5cb3d90f6f9da98f6e820a82dff072aab18e44ac19092653f36e245f746b02e0d9ee9eff0652a5c6a63919ca3ffba7e0b512204d5c7da0116d8
+DIST mumble-1.2.19.tar.gz 3210865 SHA256 f047fb707ad93948b0bc913ec0a89cd5480d87e840c4ff2519608fc8a2dac0e8 SHA512 f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4 WHIRLPOOL 6cf6ab5768946dea78d96dbc7bab0875ecfdee5fb7282f3752a8573f95fabc50c0c38712f79920883b3593ec0be62895c62045ee45b44cb4327a719a98a15990
+EBUILD mumble-1.2.17.ebuild 3022 SHA256 1b21520b85baff0645ffc6da72f92acb08f70ed89644c40e9a440149e7ce805b SHA512 a5358d0a9399921d3e4f98ab7e71434930eafae9206c313126b4ee4d9940c484b16758a1b5af8136216e1b37cf80ccdb3831dda537c13ceb940293c1dde50a43 WHIRLPOOL 838618e4a2f7178dde2c6b2a13780da0b5572b0bfe2784c3ec49c57c038c50218db499323aee16e0b89995c0b19909790cbf3ed91da268db19fa2b92ca6ba8b2
+EBUILD mumble-1.2.18.ebuild 3090 SHA256 5864662f3b2d2e3647d5723a0b18d05154f1847c80b16d3eba5180a209e6ad7d SHA512 9af5be4611e433d3ce47a27193a07fd505115a10f6e0d18fa6af70aa628ec6413c7f6177d3de15bec34f5581b84c8d3a19c335ab307409f43c90d2fa4d67609c WHIRLPOOL 7589d2e0b71db88ad9ced4065b38c6ef455b4328290c5cbcc13d207dddc626fe90c88cd08d35c9b39b57b8741d69796739a6e8e2b088990b0be08be6e89a0ba5
+EBUILD mumble-1.2.19.ebuild 3097 SHA256 fc9b23f525e313cc881602493c2dad994068c8bb9c6fa8fe828791f8f2cb3d70 SHA512 91578730ee10a51dfee3033c57289ed396ea94d5d0dce2e6cd03143b3552c45ac2787b3f850f76fdf08156d82cda498becbde9fd9afc4db4c171df4c707ced6d WHIRLPOOL b3494954c14020264ae855da118f91185c923a3da683340fd0c2d591213666da51d949dcdeb459e6d35fcbf89556797c2ecd3a61f866bb3d10c1cb10614a4cfc
+MISC ChangeLog 7510 SHA256 8cceeec9c9cdb77147616e7fe8c691cbc134f0ca8cf12b366aa3402c7983ce2f SHA512 07e967ebce171d4ac576399cb8b4363ec4b43b4e7bb1b8919c5dcaba63b66113c8e6422e37cf47b96077024b6fc19f2a47efddd6def3d15b142129fb27ec8038 WHIRLPOOL 03dde90f6b15f0f166b733582dad29c6b05c40ff499715446af8f8fdda5ca62b2c9ca5d74adac2c627f724b9fa9b21d7b09cf37340877f6351953f793223d0d9
+MISC ChangeLog-2015 9261 SHA256 286a0a7ae11db8c9647d6b7e881ebd6fae8890d9ca1e22f3e594c3fcf33d738c SHA512 04222e89743bc722bc65c9b47c6d3d0afa53bcc28961eddc0fcff9032ae10ec748fbad3d52071636f1a783e86a76677d565210cbae7a28ac31f1ab13688ef4cf WHIRLPOOL ad319ea3f2be80609019dea520fcba6166afe0b258c26642711579365d6fca1d93221b303eeee72b235e09b9134155647a51a96e1f358b2c9c597e3a4dd78734
+MISC metadata.xml 666 SHA256 6f982f7d4c44637364d2cd80417499b06c40a3f4ef2dd54ed3dcbe97ee04c084 SHA512 c9cd557297af63d195a20c1b913758ea6c4433373f55561b1dc06fc3053a949495e2a19542b43affb0c799e4ff9747410cd0a260568e9365a529aa6943910fb9 WHIRLPOOL 6471d3abcfacfca331f84bbbd423dd6eaa70ed1c41229001d96766176aec79da6aaaf07ff25c63e4264f92b2c022dc9c34c349ab29232eb5ff9457e315afdd8e
diff --git a/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch b/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch
new file mode 100644
index 000000000000..3a2c21675a56
--- /dev/null
+++ b/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch
@@ -0,0 +1,49 @@
+From 22d18212acec9e97231a13a6dc02a0c451df9b89 Mon Sep 17 00:00:00 2001
+From: Mikkel Krautz <mikkel@krautz.dk>
+Date: Thu, 6 Jun 2013 22:17:31 +0200
+Subject: [PATCH] mumble.pro: add speech-dispatcher 0.8 compatibiltiy.
+
+Based on initial patch by Timo Gurr <timo.gurr@gmail.com>
+---
+ src/mumble/TextToSpeech_unix.cpp | 6 +++++-
+ src/mumble/mumble.pro            | 7 ++++++-
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/mumble/TextToSpeech_unix.cpp b/src/mumble/TextToSpeech_unix.cpp
+index d0fbb82..6443c07 100644
+--- a/src/mumble/TextToSpeech_unix.cpp
++++ b/src/mumble/TextToSpeech_unix.cpp
+@@ -33,7 +33,11 @@
+ #include "TextToSpeech.h"
+ 
+ #ifdef USE_SPEECHD
+-#include <libspeechd.h>
++# ifdef USE_SPEECHD_PKGCONFIG
++#  include <speech-dispatcher/libspeechd.h>
++# else
++#  include <libspeechd.h>
++# endif
+ #endif
+ 
+ #include "Global.h"
+diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
+index 04f5a36..ff3c02f 100644
+--- a/src/mumble/mumble.pro
++++ b/src/mumble/mumble.pro
+@@ -279,7 +279,12 @@ dbus {
+ 
+ speechd {
+ 	DEFINES *= USE_SPEECHD
+-	LIBS *= -lspeechd
++	system(pkg-config --atleast-version=0.8 speech-dispatcher) {
++		DEFINES *= USE_SPEECHD_PKGCONFIG
++		PKGCONFIG *= speech-dispatcher
++	} else {
++		LIBS *= -lspeechd
++	}
+ }
+ 
+ directsound {
+-- 
+1.8.1.6
+
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
new file mode 100644
index 000000000000..e455ad4ea643
--- /dev/null
+++ b/media-sound/mumble/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<longdescription lang="en">
+Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.
+	</longdescription>
+	<use>
+		<flag name="g15">Enable support for the Logitech G15 LCD (and compatible devices).</flag>
+		<flag name="speech">Enable text-to-speech support in Mumble.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mumble</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mumble/mumble-1.2.17.ebuild b/media-sound/mumble/mumble-1.2.17.ebuild
new file mode 100644
index 000000000000..f111557926a1
--- /dev/null
+++ b/media-sound/mumble/mumble-1.2.17.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib qmake-utils
+
+MY_P="${PN}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf"
+
+RDEPEND=">=dev-libs/boost-1.41.0
+	!libressl? ( >=dev-libs/openssl-1.0.0b:0 )
+	libressl? ( dev-libs/libressl )
+	>=dev-libs/protobuf-2.2.0:=
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=media-libs/opus-1.0.1
+	>=media-libs/speex-1.2_rc1
+	sys-apps/lsb-release
+	x11-libs/libX11
+	x11-libs/libXi
+	dev-qt/qtcore:4[ssl]
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qtsql:4[sqlite]
+	dev-qt/qtsvg:4
+	dev-qt/qtxmlpatterns:4
+	x11-proto/inputproto
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:4 )
+	g15? ( app-misc/g15daemon )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( app-accessibility/speech-dispatcher )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local conf_add
+
+	if has_version '<=sys-devel/gcc-4.2'; then
+		conf_add="${conf_add} no-pch"
+	else
+		use pch || conf_add="${conf_add} no-pch"
+	fi
+
+	use alsa || conf_add="${conf_add} no-alsa"
+	use dbus || conf_add="${conf_add} no-dbus"
+	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+	use g15 || conf_add="${conf_add} no-g15"
+	use oss || conf_add="${conf_add} no-oss"
+	use portaudio || conf_add="${conf_add} no-portaudio"
+	use pulseaudio || conf_add="${conf_add} no-pulseaudio"
+	use speech || conf_add="${conf_add} no-speechd"
+	use zeroconf || conf_add="${conf_add} no-bonjour"
+
+	eqmake4 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add} \
+			bundled-celt \
+			no-bundled-opus \
+			no-bundled-speex \
+			no-embed-qt-translations \
+			no-server \
+			no-update" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+src_install() {
+	newdoc README.Linux README
+	dodoc CHANGES
+
+	local dir
+	if use debug; then
+		dir=debug
+	else
+		dir=release
+	fi
+
+	dobin "${dir}"/mumble
+	dobin scripts/mumble-overlay
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol
+
+	domenu scripts/mumble.desktop
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins icons/mumble.svg
+
+	doman man/mumble-overlay.1
+	doman man/mumble.1
+
+	insopts -o root -g root -m 0755
+	insinto "/usr/$(get_libdir)/mumble"
+	doins "${dir}"/libmumble.so.${PV}
+	dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
+	doins "${dir}"/libcelt0.so.0.{7,11}.0
+	doins "${dir}"/plugins/lib*.so*
+}
+
+pkg_postinst() {
+	echo
+	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}
diff --git a/media-sound/mumble/mumble-1.2.18.ebuild b/media-sound/mumble/mumble-1.2.18.ebuild
new file mode 100644
index 000000000000..b27c4b19f7b0
--- /dev/null
+++ b/media-sound/mumble/mumble-1.2.18.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib qmake-utils
+
+MY_P="${PN}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf"
+
+RDEPEND=">=dev-libs/boost-1.41.0
+	!libressl? ( >=dev-libs/openssl-1.0.0b:0 )
+	libressl? ( dev-libs/libressl )
+	>=dev-libs/protobuf-2.2.0:=
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=media-libs/opus-1.0.1
+	|| (
+		(
+			>=media-libs/speex-1.2.0
+			media-libs/speexdsp
+		)
+		<media-libs/speex-1.2.0
+	)
+	sys-apps/lsb-release
+	x11-libs/libX11
+	x11-libs/libXi
+	dev-qt/qtcore:4[ssl]
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qtsql:4[sqlite]
+	dev-qt/qtsvg:4
+	dev-qt/qtxmlpatterns:4
+	x11-proto/inputproto
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:4 )
+	g15? ( app-misc/g15daemon )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( app-accessibility/speech-dispatcher )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local conf_add
+
+	if has_version '<=sys-devel/gcc-4.2'; then
+		conf_add="${conf_add} no-pch"
+	else
+		use pch || conf_add="${conf_add} no-pch"
+	fi
+
+	use alsa || conf_add="${conf_add} no-alsa"
+	use dbus || conf_add="${conf_add} no-dbus"
+	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+	use g15 || conf_add="${conf_add} no-g15"
+	use oss || conf_add="${conf_add} no-oss"
+	use portaudio || conf_add="${conf_add} no-portaudio"
+	use pulseaudio || conf_add="${conf_add} no-pulseaudio"
+	use speech || conf_add="${conf_add} no-speechd"
+	use zeroconf || conf_add="${conf_add} no-bonjour"
+
+	eqmake4 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add} \
+			bundled-celt \
+			no-bundled-opus \
+			no-bundled-speex \
+			no-embed-qt-translations \
+			no-server \
+			no-update" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+src_install() {
+	newdoc README.Linux README
+	dodoc CHANGES
+
+	local dir
+	if use debug; then
+		dir=debug
+	else
+		dir=release
+	fi
+
+	dobin "${dir}"/mumble
+	dobin scripts/mumble-overlay
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol
+
+	domenu scripts/mumble.desktop
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins icons/mumble.svg
+
+	doman man/mumble-overlay.1
+	doman man/mumble.1
+
+	insopts -o root -g root -m 0755
+	insinto "/usr/$(get_libdir)/mumble"
+	doins "${dir}"/libmumble.so.${PV}
+	dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
+	doins "${dir}"/libcelt0.so.0.{7,11}.0
+	doins "${dir}"/plugins/lib*.so*
+}
+
+pkg_postinst() {
+	echo
+	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}
diff --git a/media-sound/mumble/mumble-1.2.19.ebuild b/media-sound/mumble/mumble-1.2.19.ebuild
new file mode 100644
index 000000000000..52c0b1ed4388
--- /dev/null
+++ b/media-sound/mumble/mumble-1.2.19.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib qmake-utils
+
+MY_P="${PN}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf"
+
+RDEPEND=">=dev-libs/boost-1.41.0
+	!libressl? ( >=dev-libs/openssl-1.0.0b:0 )
+	libressl? ( dev-libs/libressl )
+	>=dev-libs/protobuf-2.2.0:=
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=media-libs/opus-1.0.1
+	|| (
+		(
+			>=media-libs/speex-1.2.0
+			media-libs/speexdsp
+		)
+		<media-libs/speex-1.2.0
+	)
+	sys-apps/lsb-release
+	x11-libs/libX11
+	x11-libs/libXi
+	dev-qt/qtcore:4[ssl]
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qtsql:4[sqlite]
+	dev-qt/qtsvg:4
+	dev-qt/qtxmlpatterns:4
+	x11-proto/inputproto
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:4 )
+	g15? ( app-misc/g15daemon )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( app-accessibility/speech-dispatcher )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local conf_add
+
+	if has_version '<=sys-devel/gcc-4.2'; then
+		conf_add="${conf_add} no-pch"
+	else
+		use pch || conf_add="${conf_add} no-pch"
+	fi
+
+	use alsa || conf_add="${conf_add} no-alsa"
+	use dbus || conf_add="${conf_add} no-dbus"
+	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+	use g15 || conf_add="${conf_add} no-g15"
+	use oss || conf_add="${conf_add} no-oss"
+	use portaudio || conf_add="${conf_add} no-portaudio"
+	use pulseaudio || conf_add="${conf_add} no-pulseaudio"
+	use speech || conf_add="${conf_add} no-speechd"
+	use zeroconf || conf_add="${conf_add} no-bonjour"
+
+	eqmake4 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add} \
+			bundled-celt \
+			no-bundled-opus \
+			no-bundled-speex \
+			no-embed-qt-translations \
+			no-server \
+			no-update" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+src_install() {
+	newdoc README.Linux README
+	dodoc CHANGES
+
+	local dir
+	if use debug; then
+		dir=debug
+	else
+		dir=release
+	fi
+
+	dobin "${dir}"/mumble
+	dobin scripts/mumble-overlay
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol
+
+	domenu scripts/mumble.desktop
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins icons/mumble.svg
+
+	doman man/mumble-overlay.1
+	doman man/mumble.1
+
+	insopts -o root -g root -m 0755
+	insinto "/usr/$(get_libdir)/mumble"
+	doins "${dir}"/libmumble.so.${PV}
+	dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
+	doins "${dir}"/libcelt0.so.0.{7,11}.0
+	doins "${dir}"/plugins/lib*.so*
+}
+
+pkg_postinst() {
+	echo
+	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}
diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
new file mode 100644
index 000000000000..c6be6d30e68f
--- /dev/null
+++ b/media-sound/mup/Manifest
@@ -0,0 +1,7 @@
+AUX mup-5.6-fltk-fixes.patch 811 SHA256 929e95bf539270a37cbd1aaa62970294b94ac875a4ecd65747c8420010bf8a41 SHA512 a63e6ce5a5a91430a9a2f602e8eb14852a66b64bf696fc3eafd3b7c4ee298320116692febcbef0fb4985f1c0a8cc16f4675902c953cc950ca8e614f3adc9d5f8 WHIRLPOOL 5eaa16f85b89c443217cd6b4a9e19e728124a886c09c0d6945abe01070fe0178195602ee262cf8bfce72efcda4640c08dd41637804bcc09e05c5ac4b8bdf4d48
+AUX mup-5.7-Makefile.patch 10945 SHA256 ea4c65ed5f6a0cdaa51790ff53b0e983d4fdbe504ef57815ba77cfbea03fd4a9 SHA512 6e87882f8e6fe1e625caf5fe500a551829d5b2bcf7b01af48347afa0c8335d1236da0221dbe21930521190d77df7e5b5dfe719bc7158e46c6fcbfc0bc6bea5c6 WHIRLPOOL e61493ff2babb026b2d4bcaf25ac1597ab96fd3cfafaefbceec3b161c9c67064c4590c06a493f334df3a2a37df0e744d93ea1d42f5c4ef776d7168bef7e7cf05
+DIST mup57src.tar.gz 2178380 SHA256 9fada398942c34dda38a33e7c86b29023dc83443419d8f0ab57326b6db3cce3a SHA512 19085f15ce2654f23349e304599f920ca601735b2430e7b4b54927a861c598cd9227a273b4444a1582d491c1e3dbaaf7f12001e4fade57191e10c0f7815ac629 WHIRLPOOL 1588b63cfce677d9bae6e68439a14835a3aa350d07746d4ecec65abd4d1420df8f3fa32ffbdf5ae6d30048299b128a7940e3f07e1bb8535ff92901b412775ba3
+EBUILD mup-5.7.ebuild 951 SHA256 73a72bd7731bcfb2f4aed563d9790bba58feeca8def4abde778be566e651545b SHA512 442ec73345c0b38c5d9190c1cb5daa1605f8b2899888fcdb4781ab2a9d5fcb19f9852d0815fe08418a48a2137c0c53bca110a522ca659e965b17f34c1708e538 WHIRLPOOL ca2fec02ad854d6d2a730c89e707e538e9f1e70c4ba85690d213dcd66750a327f08355f04e6d2910920be5c326648f90ccb699998b10e5ebb03dd5308a486435
+MISC ChangeLog 2544 SHA256 9a2462cb6b07d13fd2b46594e70cfe4767223c790d65bf054fbae7ff90fb5448 SHA512 a3bf7f65f99b1d5cdf0ef95ed1db3e399e588a5f31ece517145dc5fe419ac1e900b88d357b39a932f2570c94b21adc5d282139c6cb86e2636415f26221140280 WHIRLPOOL 278944b1507756133157f80d2911a654a810f33bcf40e2e4f8e256ec8f18878f5585cd0da20752023b941871cd3a370e749f5c925463b40aeb7a277c329767e3
+MISC ChangeLog-2015 5049 SHA256 4916172d84f71027433bd881108fd7c3c1aba5485f2f13540286cd9aa5471813 SHA512 aeeace67382ed11aa164a9412f3c5b2045c500c236ef66cb3b96dfc2a551cc510a3487163e3e0be720c69d8f90ae2ed401152f465a190f4410b7ab6d294460e0 WHIRLPOOL b547e97f6a7834055efe52835f8e7e8f2990fac10c951856c2204cfdb7c6a0dce80e4ff9e16d864e0204117952d0710b5417f1ca8323080e2e572ace1abe16c0
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/mup/files/mup-5.6-fltk-fixes.patch b/media-sound/mup/files/mup-5.6-fltk-fixes.patch
new file mode 100644
index 000000000000..e4429c3679bf
--- /dev/null
+++ b/media-sound/mup/files/mup-5.6-fltk-fixes.patch
@@ -0,0 +1,23 @@
+--- mup-5.6.orig/mupmate/Config.C
++++ mup-5.6/mupmate/Config.C
+@@ -264,7 +264,7 @@
+ //-----------------------------------------------------------------
+ 
+ // List of standard FLTK fonts, and info to map name to menu entry.
+-static struct Font {
++static struct FlFont {
+ 	const char * name;
+ 	Fl_Font	value;
+ 	int menu_offset;
+--- mup-5.6.orig/mupmate/Edit.C
++++ mup-5.6/mupmate/Edit.C
+@@ -201,8 +201,7 @@
+ 	// a previous Replace/Find Next
+ 	int start, end, isRect, rectStart, rectEnd;
+ 	bool at_pattern = false;
+-	if (editor_p->buffer()->highlight_position(&start, &end, &isRect,
+-						&rectStart, &rectEnd)) {
++	if (editor_p->buffer()->highlight_position(&start, &end)) {
+ 		int place = editor_p->insert_position();
+ 		if (place == end && (end - start == pattern_p->size())) {
+ 			if (casematch_p->value()) {
diff --git a/media-sound/mup/files/mup-5.7-Makefile.patch b/media-sound/mup/files/mup-5.7-Makefile.patch
new file mode 100644
index 000000000000..a36a0042ca24
--- /dev/null
+++ b/media-sound/mup/files/mup-5.7-Makefile.patch
@@ -0,0 +1,405 @@
+--- mup-5.7.orig/makefile
++++ mup-5.7/makefile
+@@ -1,252 +0,0 @@
+-
+-# Makefile for Mup (and auxiliary programs mupdisp, mkmupfnt, and mupmate).
+-# This is not an optimal makefile; instead it tries to be very simple,
+-# and easy to understand, so it can be easily modified, if needed.
+-
+-# On most Linux/Unix type systems, just doing
+-#	make install
+-# as root will probably work.
+-# (You really only need to be root to copy the products into
+-# the system directories. If you change PREFIX
+-# to point to some other writeable area, you wouldn't need to be root.)
+-# For Apple Mac OX X, see the notes for what to change (CFLAGS and X_LIBS)
+-# If you only want the Mup program itself, you can do
+-#	make mup/mup
+-# The other programs are optional:
+-# - mupdisp runs Mup and then runs GhostScript on the result.
+-#   You can run Mup directly, and use gv, GSview, ghostview or any other
+-#   PostScript viewer on the Mup output, as an alternative to mupdisp.
+-# - mkmupfnt is only needed if you want to use fonts beyond the basic
+-#   standard PostScript fonts.
+-# - mupmate is a graphical user interface front end for Mup.
+-#   It is not needed if you intend to only use Mup via command line interface.
+-
+-# The mupdisp and mupmate programs require X libraries and headers (www.x.org).
+-# The mupmate program requires FLTK libraries and headers (www.fltk.org).
+-
+-# If you want mupdisp to support Linux console mode, make sure you have
+-# the svgalib package installed, then find the two commented-out lines below
+-# related to Linux console support, and uncomment them.
+-
+-# If you are building on a system that does not support make,
+-# you can look at what this makefile does for how to build.
+-# Mup itself is generally easy to build.
+-# You just go to the mup directory and run your C compiler on
+-# all the .c files in directory, and link with the math library,
+-# Typically this is done using a command something like:
+-#	cc *.c -lm
+-# For more information on building Mup, see:
+-#	http://www.arkkra.com/doc/dosbld.html
+-#	http://www.arkkra.com/doc/otherbld.html
+-#	http://www.arkkra.com/doc/unixbld.html
+-
+-# Lines you might conceivably want to change have comments by them,
+-# explaining how you might want to change them.
+-# Any line without any comment by it is very unlikely to ever need changing.
+-
+-#-----------------------------------------------------------------------
+-
+-# These define where to put the Mup products.
+-# You could change this to /usr/local or your own space if you like.
+-PREFIX = /usr
+-BINDIR = $(PREFIX)/bin
+-MANDIR = $(PREFIX)/man/man1
+-DOCDIR = $(PREFIX)/share/doc/packages/mup
+-
+-# This is the name of your C compiler.
+-# cc would be another common choice.
+-CCOMPILER = gcc
+-
+-# This is the name of your C++ compiler.
+-# CC would be another common choice.
+-CPPCOMPILER = g++
+-
+-# -O option turns on optimization for most C compilers.
+-# You can add other options, if you like, as appropriate for your C compiler.
+-# Another common addition would be -g to get debugging information.
+-# For Mac OS X, you should probably add
+-#	-Dunix
+-# and if you want universal binaries, add
+-#	-arch i386 -arch ppc
+-# and if you want backward compatibility to older versions, add something like
+-#	-mmacosx-version-min=10.1
+-# Or in other words:
+-# CFLAGS = -O -Dunix -arch i386 -arch ppc -mmacosx-version-min=10.1
+-CFLAGS = -O
+-
+-# You can change this if your X libraries and headers are somewhere else
+-# (like /usr/X11R6).
+-X_LOCATION = /usr/X11
+-
+-# If you installed fltk somewhere other than $(X_LOCATION)/lib
+-# set this to find them, as in
+-# FLTK_LIB_LOCATION = -L/usr/local/lib
+-FLTK_LIB_LOCATION =
+-
+-# The X libraries to link with Mupmate.
+-X_LIBS = -lXext -lX11 -lXpm
+-# On Mac OS X replace that with
+-# X_LIBS = -framework Carbon
+-
+-# The FLTK header files are under $(FLTK_INCLUDE)/FL
+-FLTK_INCLUDE = $(X_LOCATION)/include
+-
+-# You can use fltk_jpeg or jpeg library, whichever you have
+-JPEGLIB = fltk_jpeg
+-
+-# You can use fltk_png or png library, whichever you have
+-PNGLIB = fltk_png
+-
+-# You can use fltk_z or z library, whichever you have
+-ZLIB = fltk_z
+-
+-#-----------------------------------------------------------------------
+-
+-MUP_SRC =  \
+-	mup/abshorz.c \
+-	mup/absvert.c \
+-	mup/assign.c \
+-	mup/beaming.c \
+-	mup/beamstem.c \
+-	mup/brac.c \
+-	mup/charinfo.c \
+-	mup/check.c \
+-	mup/debug.c \
+-	mup/errors.c \
+-	mup/font.c \
+-	mup/fontdata.c \
+-	mup/globals.c \
+-	mup/grpsyl.c \
+-	mup/ifgram.c \
+-	mup/lex.c \
+-	mup/locvar.c \
+-	mup/lyrics.c \
+-	mup/macros.c \
+-	mup/main.c \
+-	mup/mainlist.c \
+-	mup/map.c \
+-	mup/midi.c \
+-	mup/midiutil.c \
+-	mup/mkchords.c \
+-	mup/musfont.c \
+-	mup/nxtstrch.c \
+-	mup/parstssv.c \
+-	mup/parstuff.c \
+-	mup/phrase.c \
+-	mup/plutils.c \
+-	mup/print.c \
+-	mup/prntdata.c \
+-	mup/prntmisc.c \
+-	mup/prnttab.c \
+-	mup/prolog.c \
+-	mup/range.c \
+-	mup/rational.c \
+-	mup/relvert.c \
+-	mup/restsyl.c \
+-	mup/roll.c \
+-	mup/setgrps.c \
+-	mup/setnotes.c \
+-	mup/ssv.c \
+-	mup/stuff.c \
+-	mup/symtbl.c \
+-	mup/tie.c \
+-	mup/trantab.c \
+-	mup/trnspose.c \
+-	mup/undrscre.c \
+-	mup/utils.c \
+-	mup/ytab.c
+-
+-MUP_HDRS = \
+-	mup/defines.h \
+-	mup/extchar.h \
+-	mup/globals.h \
+-	mup/muschar.h \
+-	mup/rational.h \
+-	mup/ssvused.h \
+-	mup/structs.h \
+-	mup/ytab.h
+-
+-MUPDISP_SRC = \
+-	mupdisp/at386.c \
+-	mupdisp/do_cmd.c \
+-	mupdisp/dos.c \
+-	mupdisp/genfile.c \
+-	mupdisp/init.c \
+-	mupdisp/linvga.c \
+-	mupdisp/mupdisp.c \
+-	mupdisp/xterm.c
+-
+-MUPDISP_HDRS = mupdisp/dispttyp.h mupdisp/mupdisp.h
+-
+-MUPDISP_BITMAPS = mupdisp/help.bm mupdisp/waitmsg.bm
+-
+-MKMUPFNT_SRC = mkmupfnt/mkmupfnt.c
+-
+-MUPMATE_SRC = \
+-	mupmate/Config.C \
+-	mupmate/Edit.C \
+-	mupmate/File.C \
+-	mupmate/Help.C \
+-	mupmate/Main.C \
+-	mupmate/Preferences.C \
+-	mupmate/Run.C \
+-	mupmate/utils.C \
+-	mupmate/license.C \
+-	mupmate/regform.C \
+-	mupmate/template.C
+-
+-MUPMATE_HDRS = \
+-	mup/defines.h \
+-	mupmate/Config.H \
+-	mupmate/Edit.H \
+-	mupmate/File.H \
+-	mupmate/Help.H \
+-	mupmate/Main.H \
+-	mupmate/Preferences.H \
+-	mupmate/Run.H \
+-	mupmate/utils.H \
+-	mupmate/globals.H \
+-	mupmate/resource.h
+-
+-MUPMATE_OTHER_FILES = \
+-	mupmate/mup32.xpm
+-#---------------------------------------------------------------
+-
+-all: mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate
+-
+-mup/mup: $(MUP_HDRS) $(MUP_SRC)
+-	$(CCOMPILER) $(CFLAGS) -o $@ $(MUP_SRC) -lm
+-
+-mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
+-	$(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
+-	# For Linux console mode support, comment out the previous line
+-	# and uncomment the following line
+-	# $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ $(MUPDISP_SRC) -lvga -lX11 -lm
+-
+-mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
+-	$(CCOMPILER) $(CFLAGS) -o $@ $(MKMUPFNT_SRC)
+-
+-mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
+-	$(CPPCOMPILER) $(CFLAGS) -o $@ $(MUPMATE_SRC) \
+-	-I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
+-	$(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
+-	-l$(JPEGLIB) -l$(PNGLIB) -l$(ZLIB) -lm
+-
+-install:	all
+-	mkdir -p $(BINDIR) $(MANDIR) $(DOCDIR)/uguide
+-	cp mup/mup $(BINDIR)/mup
+-	cp mkmupfnt/mkmupfnt $(BINDIR)/mkmupfnt
+-	cp mupdisp/mupdisp $(BINDIR)/mupdisp
+-	# For Linux console mode support, uncomment the following line
+-	# chown root $(BINDIR)/mupdisp ; chmod 4755 $(BINDIR)/mupdisp
+-	cp mupmate/mupmate $(BINDIR)/mupmate
+-	cp mupprnt $(BINDIR)/mupprnt
+-	cp docs/*.1 $(MANDIR)
+-	cp docs/README* docs/*.txt docs/*.ps docs/*.mup $(DOCDIR)
+-	cp docs/uguide/* $(DOCDIR)/uguide
+-
+-clean:
+-	rm -f mup/*.o mupdisp/*.o mkmupfnt/*.o mupmate/*.o
+-
+-clobber:	clean
+-	rm -f mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate
+--- mup-5.7.orig/Makefile
++++ mup-5.7/Makefile
+@@ -0,0 +1,147 @@
++PREFIX = /usr
++BINDIR = $(PREFIX)/bin
++MANDIR = $(PREFIX)/share/man/man1
++CC = gcc
++CXX = g++
++CFLAGS = -O2 -pipe
++CXXFLAGS = -O2 -pipe
++X_LOCATION = /usr
++FLTK_LIB_LOCATION = -L/usr/lib/fltk-1
++X_LIBS = -lXext -lX11 -lXpm
++FLTK_INCLUDE = $(X_LOCATION)/include/fltk-1
++JPEGLIB = jpeg
++PNGLIB = png
++ZLIB = z
++
++MUP_SRC =  \
++	mup/abshorz.c \
++	mup/absvert.c \
++	mup/assign.c \
++	mup/beaming.c \
++	mup/beamstem.c \
++	mup/brac.c \
++	mup/charinfo.c \
++	mup/check.c \
++	mup/debug.c \
++	mup/errors.c \
++	mup/font.c \
++	mup/fontdata.c \
++	mup/globals.c \
++	mup/grpsyl.c \
++	mup/ifgram.c \
++	mup/lex.c \
++	mup/locvar.c \
++	mup/lyrics.c \
++	mup/macros.c \
++	mup/main.c \
++	mup/mainlist.c \
++	mup/map.c \
++	mup/midi.c \
++	mup/midiutil.c \
++	mup/mkchords.c \
++	mup/musfont.c \
++	mup/nxtstrch.c \
++	mup/parstssv.c \
++	mup/parstuff.c \
++	mup/phrase.c \
++	mup/plutils.c \
++	mup/print.c \
++	mup/prntdata.c \
++	mup/prntmisc.c \
++	mup/prnttab.c \
++	mup/prolog.c \
++	mup/range.c \
++	mup/rational.c \
++	mup/relvert.c \
++	mup/restsyl.c \
++	mup/roll.c \
++	mup/setgrps.c \
++	mup/setnotes.c \
++	mup/ssv.c \
++	mup/stuff.c \
++	mup/symtbl.c \
++	mup/tie.c \
++	mup/trantab.c \
++	mup/trnspose.c \
++	mup/undrscre.c \
++	mup/utils.c \
++	mup/ytab.c
++
++MUP_HDRS = \
++	mup/defines.h \
++	mup/extchar.h \
++	mup/globals.h \
++	mup/muschar.h \
++	mup/rational.h \
++	mup/ssvused.h \
++	mup/structs.h \
++	mup/ytab.h
++
++MUPDISP_SRC = \
++	mupdisp/at386.c \
++	mupdisp/do_cmd.c \
++	mupdisp/dos.c \
++	mupdisp/genfile.c \
++	mupdisp/init.c \
++	mupdisp/linvga.c \
++	mupdisp/mupdisp.c \
++	mupdisp/xterm.c
++
++MUPDISP_HDRS = mupdisp/dispttyp.h mupdisp/mupdisp.h
++MUPDISP_BITMAPS = mupdisp/help.bm mupdisp/waitmsg.bm
++MKMUPFNT_SRC = mkmupfnt/mkmupfnt.c
++
++MUPMATE_SRC = \
++	mupmate/Config.C \
++	mupmate/Edit.C \
++	mupmate/File.C \
++	mupmate/Help.C \
++	mupmate/Main.C \
++	mupmate/Preferences.C \
++	mupmate/Run.C \
++	mupmate/utils.C \
++	mupmate/license.C \
++	mupmate/regform.C \
++	mupmate/template.C
++
++MUPMATE_HDRS = \
++	mup/defines.h \
++	mupmate/Config.H \
++	mupmate/Edit.H \
++	mupmate/File.H \
++	mupmate/Help.H \
++	mupmate/Main.H \
++	mupmate/Preferences.H \
++	mupmate/Run.H \
++	mupmate/utils.H \
++	mupmate/globals.H \
++	mupmate/resource.h
++
++MUPMATE_OTHER_FILES = \
++	mupmate/mup32.xpm
++
++all: mup/mup mupdisp/mupdisp mkmupfnt/mkmupfnt mupmate/mupmate
++
++mup/mup: $(MUP_HDRS) $(MUP_SRC)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MUP_SRC) -lm
++
++mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
++	$(CC) $(CFLAGS) $(LDFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
++
++mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MKMUPFNT_SRC)
++
++mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \
++	-I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
++	$(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
++	-l$(JPEGLIB) -l$(PNGLIB) -l$(ZLIB) -lm
++
++install:	all
++	mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)
++	cp mup/mup $(DESTDIR)$(BINDIR)/mup
++	cp mkmupfnt/mkmupfnt $(DESTDIR)$(BINDIR)/mkmupfnt
++	cp mupdisp/mupdisp $(DESTDIR)$(BINDIR)/mupdisp
++	cp mupmate/mupmate $(DESTDIR)$(BINDIR)/mupmate
++	cp mupprnt $(DESTDIR)$(BINDIR)/mupprnt
++	cp docs/*.1 $(DESTDIR)$(MANDIR)
diff --git a/media-sound/mup/metadata.xml b/media-sound/mup/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/mup/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/mup/mup-5.7.ebuild b/media-sound/mup/mup-5.7.ebuild
new file mode 100644
index 000000000000..0624047a5fe2
--- /dev/null
+++ b/media-sound/mup/mup-5.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Program for printing music scores"
+HOMEPAGE="http://www.arkkra.com/"
+SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz"
+
+LICENSE="Arkkra"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/fltk:1
+	x11-libs/libXpm
+	virtual/jpeg
+	media-libs/libpng"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${PN}-5.6-fltk-fixes.patch
+	sed -i -e "s:/lib:/$(get_libdir):g" Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" \
+		CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc docs/{*.txt,README0}
+	dohtml docs/{*.html,uguide/*}
+	docinto sample
+	dodoc docs/{*.mup,*.ps}
+}
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
new file mode 100644
index 000000000000..faf0e6cb6a30
--- /dev/null
+++ b/media-sound/murmur/Manifest
@@ -0,0 +1,16 @@
+AUX murmur-1.2.17-ice-3.6.3-compat.patch 847 SHA256 4309bfe25131520a210fa3c6e27593e622a761a75cce8d94395987bf37955c92 SHA512 26e6c03ae9b34f7533239f5ebc99c2f99611538e7bbbe1126b955ea033c97f1c936704b8d323f0ea57489183f416d5d956f65e30e9260eae9d68acb610e9b234 WHIRLPOOL 293e314968edecba83b5554d1d8bedf11d36e34d31fd36ad0e920f07565ba766bf449c1dd51c4b3c3a84a8e0d093c53083091e17fa01afe31bde9f97cd8d0ec1
+AUX murmur.confd 172 SHA256 977f20ce3ac9e15643bc6cff0eafd1281e9ca082a5fb715e60c38b4d4b51c2ef SHA512 4a05e2a640abf3f7a74c63b47ab87774718ad4e86f985c5308a2ba3167d816abedd9c35b07b8572f7789309ba91fa37bc0c1938493cc8d78844ecdeed7bd4171 WHIRLPOOL 98afc6713870f1a3ac872b0ee0b58a2d1e13103d9928d08f5fe7a873c5bcf6624f733e8bbee8c72537b9838a398a1bd091771f230d6b8daf58ae93edb4a0704b
+AUX murmur.initd-r1 503 SHA256 666024589dd070aae4c61191bcdd979edc400d3912f0d58e7aa2e6a3368da16f SHA512 e841a8bc275cea5fe7306566977a15388dfea1fc70ca681c9f222f762aa5a08e42c40240c34eeaff8af2ca427a2acb2a37cd553752eed5ac842ab1c80a74e66c WHIRLPOOL 7956998ceb95f7341374cda76248cc0bba34ee6115e6c824eb8f5841da4a76fdb3896254f3f9e035b379cf73451c2a3744b40c407c7e340f8e9f25ef9737970e
+AUX murmur.logrotate 127 SHA256 203d1f0c159d1c8ed06aac13c7a2cf20d67f36cb4ad043f54d90bef3b9de62c6 SHA512 89f105c11da6da67d5e84faac2124840e0c447df492a80b71c277a2e3c9197d747bc31de0a26c80b79384838f1e0a20811fe1ffa66c74f3192eec1164f3f1911 WHIRLPOOL d2ffc6cbfe1c89a48cf71f70fd7de0f838e952fda0700c556101035d9a58e6e3a12eb22caf66d61134570d8cd46cdd73fb7e910c655325ba2062bec6fc4537c0
+AUX murmurd-dbus.service 297 SHA256 61bc276f72ee63820b8d6d382b83880e77c9acb84f7fc01e96c032b5eb32f24e SHA512 e81031efa7cc2736748d5a5fdd001e28cf81430cf25f9f83b9aa8b94714dc787842e76c17c00e3b7a26192d8b4932f1e14bfdde207ee89680f2a696d4f9990a6 WHIRLPOOL 0a7e14cedd24ad43d28f31864777bef7a138d4510e9424efefd5790569700eda834922871049c34671854ecf4d8792e109f7f4c2bac562becdf77ec554adf5ca
+AUX murmurd-dbus.tmpfiles 33 SHA256 8565abe407f4e05a28b985a0288c0c4a5bee2654b543f6eeb31564fccaca60c0 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410 WHIRLPOOL 418aa9fdac86627883b3c05f53b4043e14901a1457a20fe5f67037b283814f6264d9e8bd6d5ff0db9a6a761708d321af13f554e8382612d823944c3d125786f0
+AUX murmurd-no-dbus.service 222 SHA256 6be9e5648ce854ec78ed016ef8a4d49ae36eca9907585eee1034e0c8072d8e32 SHA512 d58c04dde0286b07a494c99fff8b94cdf1c47f6fcacbb5552445b7e19421f2a9862186e7309886590bc33ae3c64c0c840a9a93c55b35ca600b7a8f9ec53dbab2 WHIRLPOOL 306f5e7afaac5cb5a3f8053ffa7d01b7ef3905ef078e602048f709a0892541654ea3232ed844d2c255e661fc4c4e3864690455ee0d04b53dc1657b9f07c14860
+DIST mumble-1.2.17.tar.gz 3207840 SHA256 1c3601efdac611c8833d508054698ee9d8917b4e5fffb7fff8baec0bd6c8cb9c SHA512 03cb0a2048d42bd480741e0580cb4bf6961d607d6cf9b620434aea87ac0cd7cdbfae33863b71821ac8b931300df490ae5436f3c8098d6a5f37dd1eab0fb34dbe WHIRLPOOL 1c2b2eccad4abf825393aebecc691e535254cd8df16f9ebfc1fe282bf15d36af83f4cca559eba6a38c27ba58045cb09ca309e7be300e5ccd9f46cf0be47dd82c
+DIST mumble-1.2.18.tar.gz 3210749 SHA256 e0f7acc82691b9090e5d10a23ff4a7ceb9affe429b8f5221a9766129dc6f55aa SHA512 bd8b10cb34733d566fd6aae2410e8fe5f098efe5c5b106f569112d4e5205d8a045d43a0adc02a7a9d3e16b15e3515d908784596f293a7e2972fba20830161074 WHIRLPOOL f3d254db7557f5cb3d90f6f9da98f6e820a82dff072aab18e44ac19092653f36e245f746b02e0d9ee9eff0652a5c6a63919ca3ffba7e0b512204d5c7da0116d8
+DIST mumble-1.2.19.tar.gz 3210865 SHA256 f047fb707ad93948b0bc913ec0a89cd5480d87e840c4ff2519608fc8a2dac0e8 SHA512 f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4 WHIRLPOOL 6cf6ab5768946dea78d96dbc7bab0875ecfdee5fb7282f3752a8573f95fabc50c0c38712f79920883b3593ec0be62895c62045ee45b44cb4327a719a98a15990
+EBUILD murmur-1.2.17.ebuild 3049 SHA256 216c27afcff18003663f6df519397b9a1d123bc59b11e563fc8a926bed2f33df SHA512 6db076184403d984ca57148666ef927db41ffe1c288755095c90ddd52bc3293e9cb81e764992634733d0a1e1cb9d730357f4e26bd5aa115003c71efb3ea60483 WHIRLPOOL 7a6a2934452b696d15bbd729b226e35f5e6417810a2f79be8355312b9f3cefc9979e0e0e895806171637ee323e1a104e423b0511345f3ea7271130d1adfde035
+EBUILD murmur-1.2.18.ebuild 3059 SHA256 7de76abd05d708a6b1d83f948019df97fd87287dbddda963de916c4c3c45ae0b SHA512 8ca29caa896b059994bbc576a52dcb568467e9f4d6d81d07ce1160f31ce566ff11beb00fcf7614669456443bc841a1b14aa31182b2032445c8944c4384bf82a1 WHIRLPOOL 87501522a9953284717785688990f4f137a4439af395268870f383bd0d79cdcac34f09536f82f05b517982d3b862375cbe11c0af81a1b48750e7006253816f6f
+EBUILD murmur-1.2.19.ebuild 3064 SHA256 868884a8fec13ffa13fa124375c467078dca8a7ef4aab0917821f9389a8321ef SHA512 21fb60bdaed26ddac67429dde614abf8f8b2cda5e6974c3165fef6d472cb05f539f4ebf4de7c159823fd03ae2336f1d7caf379b71547107dad6c7a782eb9c4ac WHIRLPOOL 7021b315f95dade42a199ba5e5781978b70927e04e6e99b94f798c10ddee72fad95a8e22ea3e1568c6698b31aca78114f359a64e45c7f346172f2bdbe70e9a52
+MISC ChangeLog 8029 SHA256 5e7045d8f443fc3e16ddd00c1f501652a551e3dc678b9e6acf54e8897d737c64 SHA512 83fcd6c29256b74598c4290c9e2d8bdc38de73816ad25726a1fd9abb792ac59c56e8f29a430b67f837e032a3f4c90a46a7a30a811d8d9413488d3a6ca0bce439 WHIRLPOOL a7cedca8af1375072edaba191df8bc706e707b02b271425f161d3b8c2ae3e0b40b7223fb9c78450c404d1dd1ca97ec76ce4bc2c0fbada97bc4d33116f6209844
+MISC ChangeLog-2015 10026 SHA256 ac7aab098c13867ac2c4c78b0697631a99030819efb5920ff8d326f1eea6efa1 SHA512 b1ac824f96142509949f7b1862c9bfa886d7442c2be705afd007a7638952f5b109b73dddf11e5eff41c3d6fd60628285d98448cc0f2c5664000a01f39e2692d6 WHIRLPOOL 60daa358e1c41c0cd537dd6ea2ff3c7319b98c0a1e09b74fee428aef8d1b87183157459b0675c65f30c7e1b873dd92f4d28604f2d46679efff26b80bed9369e5
+MISC metadata.xml 597 SHA256 79e1af1a6b4c28dc64ebb7bf843697c432e49fbdea91bf8d5138ec6eabd4010d SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb WHIRLPOOL b9df24c75e5975ab9ea85e0eed7aee08977980e201b4aef589e55270fe9ee89bf2d5c2e1dac1d48036866de117d31da7b01f40ebf67ba53814108474350f039e
diff --git a/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch b/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch
new file mode 100644
index 000000000000..a8ad91e44939
--- /dev/null
+++ b/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch
@@ -0,0 +1,11 @@
+--- mumble-1.2.17/src/murmur/murmur.pro	2016-09-24 14:37:47.000000000 +0200
++++ mumble-1.2.17.new/src/murmur/murmur.pro	2016-10-21 13:52:31.470049513 +0200
+@@ -74,7 +74,7 @@
+ 	win32 {
+ 		slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" ${QMAKE_FILE_NAME}
+ 	} else {
+-		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ ${QMAKE_FILE_NAME}
++		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.5.1/slice/ -I/usr/share/Ice-3.6.3/slice/ ${QMAKE_FILE_NAME}
+ 	}
+ 	slice.input = SLICEFILES
+ 	slice.CONFIG *= no_link explicit_dependencies
diff --git a/media-sound/murmur/files/murmur.confd b/media-sound/murmur/files/murmur.confd
new file mode 100644
index 000000000000..36367c51136b
--- /dev/null
+++ b/media-sound/murmur/files/murmur.confd
@@ -0,0 +1,9 @@
+# where to look for the config file
+MURMUR_CONF=/etc/murmur/murmur.ini
+
+# run as this user
+MURMUR_USER=murmur
+
+# HOME directory of MURMUR_USER
+MURMUR_HOME=/var/lib/murmur
+
diff --git a/media-sound/murmur/files/murmur.initd-r1 b/media-sound/murmur/files/murmur.initd-r1
new file mode 100644
index 000000000000..43ffb3a0a648
--- /dev/null
+++ b/media-sound/murmur/files/murmur.initd-r1
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+
+pidfile="/run/murmur/murmur.pid"
+command="/usr/bin/murmurd"
+command_args="-ini \"${MURMUR_CONF}\""
+start_stop_daemon_args="-u \"${MURMUR_USER}\" --env HOME=\"${MURMUR_HOME}\" --wait 20"
+extra_started_commands="reload"
+
+depend() {
+	need localmount net
+	use dbus logger
+	after bootmisc mysql
+}
+
+start_pre() {
+	checkpath -d -o ${MURMUR_USER} ${pidfile%/*}
+}
+
+reload() {
+	ebegin "Reloading Murmur"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}" \
+		--exec ${command}
+	eend $?
+}
+
diff --git a/media-sound/murmur/files/murmur.logrotate b/media-sound/murmur/files/murmur.logrotate
new file mode 100644
index 000000000000..c6ca48bbfb57
--- /dev/null
+++ b/media-sound/murmur/files/murmur.logrotate
@@ -0,0 +1,8 @@
+/var/log/murmur/*.log {
+	missingok
+	notifempty
+	sharedscripts
+	postrotate
+		/etc/init.d/murmur reload > /dev/null
+	endscript
+}
diff --git a/media-sound/murmur/files/murmurd-dbus.service b/media-sound/murmur/files/murmurd-dbus.service
new file mode 100644
index 000000000000..46fe5327d4ac
--- /dev/null
+++ b/media-sound/murmur/files/murmurd-dbus.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Murmurd - VoIP Server (for Mumble)
+After=network.target mysql.service
+
+[Service]
+User=murmur
+Group=murmur
+Type=dbus
+BusName=net.sourceforge.mumble.murmur
+PIDFile=/run/murmur/murmur.pid
+ExecStart=/usr/bin/murmurd -ini /etc/murmur/murmur.ini
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-sound/murmur/files/murmurd-dbus.tmpfiles b/media-sound/murmur/files/murmurd-dbus.tmpfiles
new file mode 100644
index 000000000000..70963d0a575b
--- /dev/null
+++ b/media-sound/murmur/files/murmurd-dbus.tmpfiles
@@ -0,0 +1 @@
+d /run/murmur 0755 murmur murmur
diff --git a/media-sound/murmur/files/murmurd-no-dbus.service b/media-sound/murmur/files/murmurd-no-dbus.service
new file mode 100644
index 000000000000..8631de20aaa4
--- /dev/null
+++ b/media-sound/murmur/files/murmurd-no-dbus.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Murmurd - VoIP Server (for Mumble)
+After=network.target mysql.service
+
+[Service]
+User=murmur
+Group=murmur
+ExecStart=/usr/bin/murmurd -fg -ini /etc/murmur/murmur.ini
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-sound/murmur/metadata.xml b/media-sound/murmur/metadata.xml
new file mode 100644
index 000000000000..c0b4be832f31
--- /dev/null
+++ b/media-sound/murmur/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<longdescription lang="en">
+Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.
+	</longdescription>
+	<use>
+		<flag name="ice">Use <pkg>dev-libs/Ice</pkg> to enable remote control capabilities.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mumble</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/murmur/murmur-1.2.17.ebuild b/media-sound/murmur/murmur-1.2.17.ebuild
new file mode 100644
index 000000000000..caddfe2abb1a
--- /dev/null
+++ b/media-sound/murmur/murmur-1.2.17.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils qmake-utils systemd user readme.gentoo-r1
+
+MY_P="mumble-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 x86"
+IUSE="+dbus debug +ice pch zeroconf"
+
+RDEPEND=">=dev-libs/openssl-1.0.0b:0=
+	>=dev-libs/protobuf-2.2.0:=
+	sys-apps/lsb-release
+	>=sys-libs/libcap-2.15
+	dev-qt/qtcore:4[ssl]
+	|| ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
+	dev-qt/qtxmlpatterns:4
+	dbus? ( dev-qt/qtdbus:4 )
+	ice? ( dev-libs/Ice:= )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-ice-3.6.3-compat.patch
+)
+
+DOC_CONTENTS="
+	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
+	Please execute:\n
+	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
+	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
+	to set the build-in 'SuperUser' password before starting murmur.
+	Please restart dbus before starting murmur, or else dbus
+	registration will fail.
+"
+
+pkg_setup() {
+	enewgroup murmur
+	enewuser murmur -1 -1 /var/lib/murmur murmur
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:mumble-server:murmur:g' \
+		-e 's:/var/run:/run:g' \
+		-i "${S}"/scripts/murmur.{conf,ini.system} || die
+}
+
+src_configure() {
+	local conf_add
+
+	use dbus || conf_add="${conf_add} no-dbus"
+	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+	use ice || conf_add="${conf_add} no-ice"
+	use pch || conf_add="${conf_add} no-pch"
+	use zeroconf || conf_add="${conf_add} no-bonjour"
+
+	eqmake4 main.pro -recursive \
+		CONFIG+="${conf_add} no-client"
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	docinto scripts
+	dodoc scripts/*.php scripts/*.pl
+
+	local dir
+	if use debug; then
+		dir=debug
+	else
+		dir=release
+	fi
+
+	dobin "${dir}"/murmurd
+
+	insinto /etc/murmur/
+	newins scripts/murmur.ini.system murmur.ini
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/murmur.logrotate murmur
+
+	insinto /etc/dbus-1/system.d/
+	doins scripts/murmur.conf
+
+	insinto /usr/share/murmur/
+	doins src/murmur/Murmur.ice
+
+	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
+	newconfd "${FILESDIR}"/murmur.confd murmur
+
+	if use dbus; then
+		systemd_newunit "${FILESDIR}"/murmurd-dbus.service "${PN}".service
+		systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+	else
+		systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service "${PN}".service
+	fi
+
+	keepdir /var/lib/murmur /var/log/murmur
+	fowners -R murmur /var/lib/murmur /var/log/murmur
+	fperms 750 /var/lib/murmur /var/log/murmur
+
+	# Fix permissions on config file as it might contain passwords.
+	# (bug #559362)
+	fowners root:murmur /etc/murmur/murmur.ini
+	fperms 640 /etc/murmur/murmur.ini
+
+	doman man/murmurd.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/murmur/murmur-1.2.18.ebuild b/media-sound/murmur/murmur-1.2.18.ebuild
new file mode 100644
index 000000000000..63197d8730ce
--- /dev/null
+++ b/media-sound/murmur/murmur-1.2.18.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils qmake-utils systemd user readme.gentoo-r1
+
+MY_P="mumble-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="+dbus debug +ice pch zeroconf"
+
+RDEPEND=">=dev-libs/openssl-1.0.0b:0=
+	>=dev-libs/protobuf-2.2.0:=
+	sys-apps/lsb-release
+	>=sys-libs/libcap-2.15
+	dev-qt/qtcore:4[ssl]
+	|| ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
+	dev-qt/qtxmlpatterns:4
+	dbus? ( dev-qt/qtdbus:4 )
+	ice? ( dev-libs/Ice:= )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.17-ice-3.6.3-compat.patch
+)
+
+DOC_CONTENTS="
+	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
+	Please execute:\n
+	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
+	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
+	to set the build-in 'SuperUser' password before starting murmur.
+	Please restart dbus before starting murmur, or else dbus
+	registration will fail.
+"
+
+pkg_setup() {
+	enewgroup murmur
+	enewuser murmur -1 -1 /var/lib/murmur murmur
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:mumble-server:murmur:g' \
+		-e 's:/var/run:/run:g' \
+		-i "${S}"/scripts/murmur.{conf,ini.system} || die
+}
+
+src_configure() {
+	local conf_add
+
+	use dbus || conf_add="${conf_add} no-dbus"
+	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+	use ice || conf_add="${conf_add} no-ice"
+	use pch || conf_add="${conf_add} no-pch"
+	use zeroconf || conf_add="${conf_add} no-bonjour"
+
+	eqmake4 main.pro -recursive \
+		CONFIG+="${conf_add} no-client"
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	docinto scripts
+	dodoc scripts/*.php scripts/*.pl
+
+	local dir
+	if use debug; then
+		dir=debug
+	else
+		dir=release
+	fi
+
+	dobin "${dir}"/murmurd
+
+	insinto /etc/murmur/
+	newins scripts/murmur.ini.system murmur.ini
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/murmur.logrotate murmur
+
+	insinto /etc/dbus-1/system.d/
+	doins scripts/murmur.conf
+
+	insinto /usr/share/murmur/
+	doins src/murmur/Murmur.ice
+
+	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
+	newconfd "${FILESDIR}"/murmur.confd murmur
+
+	if use dbus; then
+		systemd_newunit "${FILESDIR}"/murmurd-dbus.service "${PN}".service
+		systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+	else
+		systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service "${PN}".service
+	fi
+
+	keepdir /var/lib/murmur /var/log/murmur
+	fowners -R murmur /var/lib/murmur /var/log/murmur
+	fperms 750 /var/lib/murmur /var/log/murmur
+
+	# Fix permissions on config file as it might contain passwords.
+	# (bug #559362)
+	fowners root:murmur /etc/murmur/murmur.ini
+	fperms 640 /etc/murmur/murmur.ini
+
+	doman man/murmurd.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/murmur/murmur-1.2.19.ebuild b/media-sound/murmur/murmur-1.2.19.ebuild
new file mode 100644
index 000000000000..3ee8728d366d
--- /dev/null
+++ b/media-sound/murmur/murmur-1.2.19.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils qmake-utils systemd user readme.gentoo-r1
+
+MY_P="mumble-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+IUSE="+dbus debug +ice pch zeroconf"
+
+RDEPEND=">=dev-libs/openssl-1.0.0b:0=
+	>=dev-libs/protobuf-2.2.0:=
+	sys-apps/lsb-release
+	>=sys-libs/libcap-2.15
+	dev-qt/qtcore:4[ssl]
+	|| ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
+	dev-qt/qtxmlpatterns:4
+	dbus? ( dev-qt/qtdbus:4 )
+	ice? ( dev-libs/Ice:= )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.17-ice-3.6.3-compat.patch
+)
+
+DOC_CONTENTS="
+	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
+	Please execute:\n
+	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
+	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
+	to set the build-in 'SuperUser' password before starting murmur.
+	Please restart dbus before starting murmur, or else dbus
+	registration will fail.
+"
+
+pkg_setup() {
+	enewgroup murmur
+	enewuser murmur -1 -1 /var/lib/murmur murmur
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:mumble-server:murmur:g' \
+		-e 's:/var/run:/run:g' \
+		-i "${S}"/scripts/murmur.{conf,ini.system} || die
+}
+
+src_configure() {
+	local conf_add
+
+	use dbus || conf_add="${conf_add} no-dbus"
+	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+	use ice || conf_add="${conf_add} no-ice"
+	use pch || conf_add="${conf_add} no-pch"
+	use zeroconf || conf_add="${conf_add} no-bonjour"
+
+	eqmake4 main.pro -recursive \
+		CONFIG+="${conf_add} no-client"
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	docinto scripts
+	dodoc scripts/*.php scripts/*.pl
+
+	local dir
+	if use debug; then
+		dir=debug
+	else
+		dir=release
+	fi
+
+	dobin "${dir}"/murmurd
+
+	insinto /etc/murmur/
+	newins scripts/murmur.ini.system murmur.ini
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/murmur.logrotate murmur
+
+	insinto /etc/dbus-1/system.d/
+	doins scripts/murmur.conf
+
+	insinto /usr/share/murmur/
+	doins src/murmur/Murmur.ice
+
+	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
+	newconfd "${FILESDIR}"/murmur.confd murmur
+
+	if use dbus; then
+		systemd_newunit "${FILESDIR}"/murmurd-dbus.service "${PN}".service
+		systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+	else
+		systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service "${PN}".service
+	fi
+
+	keepdir /var/lib/murmur /var/log/murmur
+	fowners -R murmur /var/lib/murmur /var/log/murmur
+	fperms 750 /var/lib/murmur /var/log/murmur
+
+	# Fix permissions on config file as it might contain passwords.
+	# (bug #559362)
+	fowners root:murmur /etc/murmur/murmur.ini
+	fperms 640 /etc/murmur/murmur.ini
+
+	doman man/murmurd.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/muse/Manifest b/media-sound/muse/Manifest
new file mode 100644
index 000000000000..c344f8b7d2f5
--- /dev/null
+++ b/media-sound/muse/Manifest
@@ -0,0 +1,6 @@
+AUX muse-0.9.2_p20161002-fix-build-system.patch 2589 SHA256 767031959b9ee7c02f975361363acc1f2960cd1762db389f3125e7519ea75545 SHA512 c0711f1e265721e7395605282d69d0c7d620c46a5fef05a9afdd2ca82c115ef67c442d8a92411902881ac4c632beb85dba9ed5f8dc16f87c7004dc3e378330c4 WHIRLPOOL ea5143e7422932dfa0fc2ff1d63b9fee96deb7801f5c2b5ec86d296a0b1e2304ad6162922596ac6d991d36f8439d37809562b18544643855a5f28cd7a57b3d2d
+DIST muse-0.9.2_p20161002.tar.gz 996253 SHA256 a43b4ae25c9cf76bf9d4c8328179b0ca3178a0ae1c7b1b070b6fc50277179804 SHA512 7d5b35c64b1ccae14330bb35ba0e32661f6f7445055e1854c7e5e530a7645405da03836e919b6151872f254c754d99d045b9c80938148454f521d3d117332208 WHIRLPOOL 661bb81118d16875aacfac6db1ca6adeb1b9eb4373462b50ed6ae31c56a7e9d210b0376b4b0fcef804badb57d238c8c2f19ff388cdda182cccb41dd946dd52b9
+EBUILD muse-0.9.2_p20161002.ebuild 1082 SHA256 4998458df0b8884167fa20770a98497ef81594bd420033b2d77f0e5909fd454c SHA512 74cf464d463a617835b9c809de2194e6543395a245443f8971f9e6539497cd36520184504184371199ff4549d39b183feef56dde97afeef262904e85270c50d7 WHIRLPOOL 206d5c1a3dfe619b1f60ce548c708e108e6fa1bc93d99daaeecbee28dd7f8d7442a212184757da30ba3c0e81ba4a8f83a812da977775160ce9a3f0d141972482
+MISC ChangeLog 2962 SHA256 d4eda8318cfe8c10008244c8036cd6ae97d3940a8baafb64f6aad36096c49377 SHA512 b2c0108e791abe3627dc8f01a9240d36ad94d7be018f911ee2a148fa014dfdcc6d179c378360d34e9e004bb4f1a93ce566c965d7e9a848af229b6cf0ad49f748 WHIRLPOOL a7ed675ceae73dac5391649cd1445e45006355f48bdc331e80382ac7a11cd246725247871385df4e73ffb0954eb2c235eafe2fc26ad87173f724800b0b5c01bc
+MISC ChangeLog-2015 3374 SHA256 ba1df2c9c6bba05ff434ab465eb585126fd204a291a5c3d37fff21e9eff782c2 SHA512 ad6972ec5e31e83cc4d021c3ee9f20e80adcb6a68e5e6f16a791eaa43a944eabdc46198b7c9be04d018ed9a22e15af27b100b3a28dce8c751d85b3b1dd425bf4 WHIRLPOOL 40219c8f96ae6f8761b9168c1426f3fffd0c7545792d1f98f9d817bb1a3d4f78e081fb921141e1c5816eaa33617e2cab46790d32c8e2b0edc90885d758df4946
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch b/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch
new file mode 100644
index 000000000000..7ca30e6da689
--- /dev/null
+++ b/media-sound/muse/files/muse-0.9.2_p20161002-fix-build-system.patch
@@ -0,0 +1,95 @@
+Fix build system to properly install files and prevent underlinking.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@
+ 
+ AC_CANONICAL_HOST
+ 
+-AC_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_SRCDIR([src/muse.cpp])
+ 
+ dnl ==============================================================
+@@ -56,7 +56,7 @@
+ 
+ 
+ #GLOBAL_CFLAGS="-O4 -D_REENTRANT -fomit-frame-pointer -march=${host_cpu} -ffast-math -malign-double -funroll-loops -pipe"
+-GLOBAL_CFLAGS="-pipe -D_REENTRANT -Wall"
++GLOBAL_CFLAGS="-D_REENTRANT -Wall"
+ 
+ 
+ dnl ==============================================================
+@@ -178,19 +178,12 @@
+ # this is really libcdk's configuration, needs to be reviewed if correct
+ # see src/ncursesgui/libcdk
+ if test x$want_ncurses_gui = xyes; then
+-  AC_CHECK_LIB(termcap, waddstr,
+-               [have_termcap=yes], [have_termcap=no])
+-
+-  AC_CHECK_LIB(ncurses, start_color,
+-               AC_DEFINE([HAVE_START_COLOR], 1, [Have start_color]))
+-
+-  AC_CHECK_LIB(ncurses, initscr,
+-               [have_ncurses=yes], [have_ncurses=no])
+-
+-  AC_CHECK_HEADERS([ncurses.h],
+-                   [have_ncurses_h=yes], [have_ncurses_h=no])
+-
+-  AC_CHECK_FUNC(XCursesExit, AC_DEFINE(HAVE_XCURSES, 1, [Build with xcurses]))
++  PKG_CHECK_MODULES([NCURSES], [ncurses], [
++    AC_DEFINE([HAVE_START_COLOR], 1, [Have start_color])
++    have_ncurses=yes
++    have_ncurses_h=yes
++    have_termcap=yes
++  ])
+ 
+   if test x$have_ncurses_h = xyes; then
+     AC_DEFINE([GUI_RUBIK], 1, [Have ncurses GUI])
+@@ -326,8 +319,13 @@
+ 
+ 
+ dnl documentation
+-AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])
+-AM_CONDITIONAL(BUILD_DOC, [test -n "$DOXYGEN"])
++AC_ARG_ENABLE([doc],
++  AS_HELP_STRING([--enable-doc], [Enable building documentation using doxygen]))
++AS_IF([test "x$enable_doc" = "xyes"], [
++  dnl Enable doc building
++  AC_CHECK_PROG([DOXYGEN], [doxygen], [doxygen])
++])
++AM_CONDITIONAL(BUILD_DOC, [test "x$enable_doc" = "xyes"])
+ 
+ 
+ dnl ==============================================================
+@@ -402,6 +400,7 @@
+ 
+ AC_CONFIG_FILES([
+ Makefile
++src/ncursesgui/libcdk/Makefile
+ doc/muse.doxygen
+ ])
+ AC_OUTPUT
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,9 +4,6 @@
+ 
+ SUBDIRS = $(LIBCDKDIR)
+ 
+-dist_docs_DATA = README COPYING AUTHORS NEWS KNOWN-BUGS ChangeLog TODO USAGE
+-docsdir = ${prefix}/share/doc/${PACKAGE}
+-
+ dist_man_MANS = doc/muse.1
+ 
+ ACLOCAL_AMFLAGS = -I m4
+@@ -71,7 +68,9 @@
+   $(SAMPLERATE_LIBS) \
+   $(SHOUT_LIBS) \
+   $(SNDFILE_LIBS) \
+-  $(VORBIS_LIBS)
++  $(VORBIS_LIBS) \
++  $(GTK2_LIBS) \
++  $(NCURSES_LIBS)
+ 
+ src_muse_DEPENDENCIES = \
+   $(GUI_OBJECTS)
diff --git a/media-sound/muse/metadata.xml b/media-sound/muse/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/muse/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/muse/muse-0.9.2_p20161002.ebuild b/media-sound/muse/muse-0.9.2_p20161002.ebuild
new file mode 100644
index 000000000000..89771e227748
--- /dev/null
+++ b/media-sound/muse/muse-0.9.2_p20161002.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Multiple Streaming Engine, an icecast source streamer"
+HOMEPAGE="http://muse.dyne.org"
+SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc gtk jack ncurses portaudio"
+
+RDEPEND="media-sound/lame
+	media-libs/libvorbis
+	media-libs/libsndfile
+	media-libs/libogg
+	media-libs/libshout
+	media-libs/libsamplerate
+	gtk? ( x11-libs/gtk+:2 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	ncurses? ( sys-libs/ncurses:0= )
+	portaudio? ( media-libs/portaudio )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.2_p20161002-fix-build-system.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-dmalloc \
+		--disable-profiling \
+		--disable-lubrify \
+		$(use_enable gtk gtk2) \
+		$(use_enable jack) \
+		$(use_enable ncurses) \
+		$(use_enable portaudio) \
+		$(use_enable doc)
+}
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
new file mode 100644
index 000000000000..c3ab4d2714b1
--- /dev/null
+++ b/media-sound/musepack-tools/Manifest
@@ -0,0 +1,6 @@
+AUX musepack-tools-465-gentoo.patch 1550 SHA256 2be117d2d336a2245360dddef315ef6e48fb5b82e1c6dc64297fbe3a120e3739 SHA512 464513d49a290967b1fee8f9c27569e4b0b7004ddd5856f80dee9935a8ed4eeacabe48021f403136df0079a216b7da149edfea5079fa41eecd8caeaa13344369 WHIRLPOOL 39a9e521b9282fc9af30d8e2d25626f88f171d5d526a638638fab7d6b13616ccf8e46819b9c52593808da4dcb302e528b65c92934fb4759593ba9e124a07ea71
+DIST musepack-tools-465.tar.bz2 167612 SHA256 3c14ea0cbbabf3b3141d680ade1caa1c48d77fb0ab286a4fbf449643f302760a SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54 WHIRLPOOL fd598d7417ce20611da79c0382a686cc6ffa0e0f064e1260b94807c9f2028ad6603043b36c019e7b5d45efda749f8e3caa7d0607681e049c69b5d04f56b354c4
+EBUILD musepack-tools-465-r1.ebuild 961 SHA256 98e9b911cb19b55f4810993013859062b7251049c1a459945457e0cdd79c35d1 SHA512 813c509d4d404a44771f03530674e5d9f06bad42d81f34e84b4040c88d05076d7da7f1005d3dae9aada74894a20f28f21689f79cc88e7880e9e3e499c901209c WHIRLPOOL e03e9d40db82f6092516079fc9337def1b174e37814f870d8c5affbab9ed0469f4816c4db808d9bfa8302c1e79bff584250b00e38a5f377668cc87a25f6f7c0c
+MISC ChangeLog 2495 SHA256 4aac3edaffc56ed4a9b237229f526fae08c2b943c0ec350b6eb4297587c2db1c SHA512 e5ed3147210f1bd1969b3d074689b19cca9fc166159e286fb8ba62608c60bc27dcd98ea09b88f47ebc8c8ef942b67c5c66fe0d319105577b09415963db17bee5 WHIRLPOOL 5fd853422f586743fff7226096369d29e6beb16c70266d64ef60e68300e3b9c04b106381e89603afd326e27baad239bb7360d12212ac5f0e1d4efabd8d54dd95
+MISC ChangeLog-2015 11933 SHA256 85237a12c392acd892747625a3dfd3e7f4e6a63aecd70392ddce9b22d3ef55ab SHA512 a916cc72838d07e0282e4a160ac6026bb376d132aed057f4b6750e9d91bcc23186373641602f5166ed767b9091dfb11900b699b8f75e41bd217970385376455d WHIRLPOOL 5b9ac27c22d9ac6ae5fb9fb18fde7c04ba8914c5b843cac95436d4fa0a93d209617fa6a7e1e3d0c61ee133fa33f7d9e8d3c446a5c694b5527a4c5b6ec6099e6b
+MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
new file mode 100644
index 000000000000..a93b5ebddadd
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
@@ -0,0 +1,40 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -15,10 +15,6 @@
+ 
+ add_definitions(-DFAST_MATH -DCVD_FASTLOG)
+ 
+-if(NOT MSVC)
+-  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe")
+-endif(NOT MSVC)
+-
+ add_subdirectory(libmpcdec)
+ add_subdirectory(libmpcpsy)
+ add_subdirectory(libmpcenc)
+--- libmpcdec/CMakeLists.txt
++++ libmpcdec/CMakeLists.txt
+@@ -1,7 +1,22 @@
+ include_directories(${libmpc_SOURCE_DIR}/include)
+ if(SHARED)
+   add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
+-else(SHARED)
+-  add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++  set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 7.0.1 SOVERSION 7)
++  if(NOT MSVC)
++    target_link_libraries(mpcdec_shared m)
++  endif(NOT MSVC)
+ endif(SHARED)
+ 
++add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++
++set_target_properties(mpcdec_static PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1)
++
++if(NOT MSVC)
++  target_link_libraries(mpcdec_static m)
++endif(NOT MSVC)
++
++install(TARGETS mpcdec_static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++
++if(SHARED)
++  install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++endif(SHARED)
diff --git a/media-sound/musepack-tools/metadata.xml b/media-sound/musepack-tools/metadata.xml
new file mode 100644
index 000000000000..39626a990be5
--- /dev/null
+++ b/media-sound/musepack-tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/musepack-tools/musepack-tools-465-r1.ebuild b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
new file mode 100644
index 000000000000..696f54ef075e
--- /dev/null
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit cmake-multilib
+
+# svn export http://svn.musepack.net/libmpc/trunk musepack-tools-${PV}
+# tar -cjf musepack-tools-${PV}.tar.bz2 musepack-tools-${PV}
+
+DESCRIPTION="Musepack SV8 libraries and utilities"
+HOMEPAGE="http://www.musepack.net"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=media-libs/libcuefile-${PV}[${MULTILIB_USEDEP}]
+	>=media-libs/libreplaygain-${PV}[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r5
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+	!media-libs/libmpcdec
+	!media-libs/libmpcdecsv7"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
new file mode 100644
index 000000000000..a35c67b9358a
--- /dev/null
+++ b/media-sound/musescore/Manifest
@@ -0,0 +1,14 @@
+AUX musescore-2.0.2-fix-buildsystem.patch 15382 SHA256 776d47e8c6905bcf938430e43e5536826125eedaf45a448e21786e805269aedb SHA512 2e61e67777654c421870a4ea098508939f636030f3721e721c089b6d039d67f6e4018223448f0b77b4a46f02b2f46636a0318698b80614e6592f43afdb6bd700 WHIRLPOOL 3003b9afa0b0dd6477d1cfc676eb4b2d9beb6ecedf01844cf04b71310b8e35c778b7bb667d240cb1c4e83fc0c05d597087226017cb9c3f8686ed0544974544e6
+AUX musescore-2.0.3-fix-buildsystem.patch 18357 SHA256 16536f956a842809871ba6780db83d135270ccfd6417b6aba6d7db96c412a896 SHA512 dca5c8614b7bec4d4f3ec7d3b0ff32742e8a1ba9edc9e88637b38edab5f34115a75ac862501610a52850d05a352b675b61e73b04d8b02c494542c219ac625098 WHIRLPOOL 34512b4f48fe2e93ad0fef350047e564326e9bdb8a63c6f645ef14fe10295e750e6a4a1683618c5d0e030905f21c4572c4a487e221de7dafd14a0d976ec47453
+AUX musescore-2.1.0-fix-buildsystem.patch 19498 SHA256 b5c3f644a4f608d1aa3359aef980e00d322976d872d244aac4d22ceabfb66381 SHA512 7efdfbde60d79ab39900c01291fa4dee48ba619c2fad72d1edf9453825db4245de45c5bfb70c35d108b21a3d442228e023e8ef3e8b960a9bf433d46207b3ad26 WHIRLPOOL 65c76484fa51d9c0e06afb665aed869ae727be6e375e010b0a93a89612e977b7519e1488e4ea3952cfd8dd439de599065ab02e99b9aa6b6d1eae067ac5f7823f
+AUX musescore-9999-fix-buildsystem.patch 21600 SHA256 76acbd997ad4cb34adf02d704b1ff65af561d3b0db76e41af683718d2f1beb3c SHA512 97d37144e393a1f0faa839790b2bd15ae38a3ca7a838d924f35a7c67f0581a6444e6efaed5f65ee31fa017cfd3bb142a9aa95d2ede47659455315592b8c43e90 WHIRLPOOL 3326508f8f3d47e85bc16761901ce7b9fefdd9e8ebc9fb365c7f1fc2e099a2d0e1e579b12ecea45177a195f8f6f136f259efd443c6793c16ad1222cb31f1705b
+DIST musescore-2.0.2.tar.gz 44528670 SHA256 92f35403d1cb87bdb080a18bc37b2023a998ed9a26e7f50a5b6d30dbc3c1db45 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c WHIRLPOOL 87c5e64f721deec1389fcb5ae3d21536586a4ec8d3419d0f88cd2dca7cb6bab0e5df283de1253fd7407f7d6f0a8cf8a95bdd6c1877923193f7d3ea24167631a6
+DIST musescore-2.0.3.tar.gz 49958474 SHA256 66c613f27fcc07252e856a51ed1162a9921f3d11ac130260763e2178b7098b01 SHA512 4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1 WHIRLPOOL bf31de08858404e7ccd5cf78c3433bb4e799a3bc020582953bbc83b7abe6075847352fb8f30f9be795cfc69c57dc856d05d1602bbd194c4dbed90d2ba2254ad2
+DIST musescore-2.1.0.tar.gz 51131549 SHA256 0581b8dd4e9bef51f863baf5b7f03b518f9784c79c0d92d6f0e33b180dd63c47 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2 WHIRLPOOL 1814cf937f1f1f9898f8aa62a60ed3dbfec4cb9af2ded6d03ccfde6c372bba6b3ddc8c6ba83677fc770363975c7c36a144adb17f16195e8b30706d6bcfea9c69
+EBUILD musescore-2.0.2-r1.ebuild 1499 SHA256 c699e4b09fec2d54978b19947436fe2c4def64213fb6936a409598f55a4f2623 SHA512 a9fcc1039397e092cb3eb9fd7f35d30932b7425df6ecd21d1372eb09a351f135b4e7186f59f049c7aa5a5e65df9afceb32c8b2047267539f92f392100f9b4c74 WHIRLPOOL 52328578405d7dcbf8cd713340bae59c348f48c02bbdad3171bfb4a9f7ddc2e17377ce8defc89dfd660e9313702f8626242fc9def279178d22550a5dc212bdd0
+EBUILD musescore-2.0.3.ebuild 1383 SHA256 d36769bf240514a39cae3439103389c594e7867f3f6e3000a66b0019e9735b45 SHA512 ad8e8c366b0a7c40e2f6b0ea5bcb45bf4abbc1dbc7e6cf73bbf693e255e19d06068fe8891f8147cb4f3c6f01172dae5f68a3e4742f9eef8468194d43fcc868a1 WHIRLPOOL 1a8d16c791bf834799b394f97ca493400b9bb31a41e550aa9f47defc1c30e0e1800119902b8351ec69efeb4ea4af6fb954457474df5d4cb1b86b9874a68fedf4
+EBUILD musescore-2.1.0.ebuild 1482 SHA256 7994b7c30df8c7a10cec7ec50675939b937b75cf60d580156c21748ba42c8c71 SHA512 0861f3d4b5e0031d60537db3ca4551c2e341501be388c156e3256f12b01b0a5e2892cee71b03371f7e52f560e00b9a5fe59d8ced83dbbfef5ff84017bc09713f WHIRLPOOL 8bd0fdc273695b28d1c3801b73fa854370149463cb7658fdb9b683b27c01852b5f167fd7dfe122f0f2f2cd1ffed6803acf70e397caef7ea77a2ec9ea3a341577
+EBUILD musescore-9999.ebuild 1345 SHA256 e51922497640263e09b603bf938bf2c9ebcf3b9a01c7906b5a260393cda548da SHA512 dc86b9ffb42f797c4ea507aff7351982213ece2f6a36042649beee6e02018135ebf3a1c267cfba297f8a91f156d39195a0193162f619bf6940e6c4535e1258e4 WHIRLPOOL 5d108fa5cfffca18c9503f9513497a1054396b0c1940efd897d8033ff5d85583d9539eefbea4f3844a968790227c24fae1b23d595e5f55d78a8a407a16638e14
+MISC ChangeLog 4416 SHA256 cac1940b664a0af7c17f66eb817b91e25e3bd04817b8a8ba854d6b5fb04d767a SHA512 e1f8025edbb55f4996c2accbe17459b27f30cab60e19a75d8909a1cb92196003ab9c6cb2eb99d9912120721a017709efb1d7f79ec32029e335353f9dafea4114 WHIRLPOOL ae849a9fc141a3649cd32164a9b0538f30fc1b73def36d49e759aba063603d5487f0d4d8dc3546b597f0bbb9c3d3769a1815a64077af5c412ed11b1f0f5e5f55
+MISC ChangeLog-2015 4410 SHA256 b82d15ced3d73641097d88b713ccfce420b3e50d3444b18545c371276c3492c2 SHA512 2daeef52739bc6fae768d584b5b7962e6e7863f6924d5d0bbb3e4f94d7168fb03d4ed3157f62b41abc526223e2934864f65854b9dace8d92dd8935f03c463cce WHIRLPOOL 2f2ce21d67bb225432b67ca68de87c46ac4232b00c992834037f109eb0d9ee1015cf1c4812b245bbf5171d4429ea6b913ee5582dbc6c6ae7b707d2419efacb95
+MISC metadata.xml 501 SHA256 e4f5230b2635e8aa2672b490ebfa00ca23ab01f2575c598249ccae3d89a99a3e SHA512 a0a5a3ca86ce04c7ac3b4c0f68914123feacfe5586c1c97813a8f6dde67383e661e2a992c955c49f3e1edaf1193eb24fcc2c14b8c0806faa93b41b5ea94c709c WHIRLPOOL 499de2629523471f290fb07877aab26bacbb9274b495aad837ff75c422d893d15d9e9fb71d39121cf6fac88e04f3f8e05d1ce1759c545d1fd7a11ed852ce022b
diff --git a/media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch b/media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch
new file mode 100644
index 000000000000..aa2749cad58d
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch
@@ -0,0 +1,429 @@
+* Remove hardcoded CXXFLAGS, set only necessary options
+* Turn off RPATH linking
+* Fix QA issues caused by wrong "Version" setting in desktop file
+
+--- MuseScore-2.0.2/aeolus/CMakeLists.txt
++++ MuseScore-2.0.2/aeolus/CMakeLists.txt
+@@ -43,7 +43,7 @@
+ set_target_properties (
+       aeolus
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ install(DIRECTORY
+--- MuseScore-2.0.2/audiofile/CMakeLists.txt
++++ MuseScore-2.0.2/audiofile/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ set_target_properties (
+       audiofile
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(audiofile all)
+--- MuseScore-2.0.2/awl/CMakeLists.txt
++++ MuseScore-2.0.2/awl/CMakeLists.txt
+@@ -43,7 +43,7 @@
+ set_target_properties (
+       awl
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(awl all)
+--- MuseScore-2.0.2/build/CreatePrecompiledHeader.cmake
++++ MuseScore-2.0.2/build/CreatePrecompiledHeader.cmake
+@@ -36,7 +36,7 @@
+             set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
+             add_custom_command(
+              OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
+-             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g  ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
++             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
+              DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
+              WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+              VERBATIM
+--- MuseScore-2.0.2/bww2mxml/CMakeLists.txt
++++ MuseScore-2.0.2/bww2mxml/CMakeLists.txt
+@@ -49,7 +49,7 @@
+    set_target_properties (
+          bww2mxml
+          PROPERTIES
+-            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
++            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+          )
+ 
+    target_link_libraries(bww2mxml
+--- MuseScore-2.0.2/CMakeLists.txt
++++ MuseScore-2.0.2/CMakeLists.txt
+@@ -115,22 +115,10 @@
+       endif()
+ endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+ 
+-if (APPLE)
+-   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -fPIC -stdlib=libc++ -g")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG")
+-else (APPLE)
+-   if (MINGW)
+-      # -mno-ms-bitfields see #22048
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -mno-ms-bitfields -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+-   else (MINGW)
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -fPIE -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+-   endif (MINGW)
+-endif(APPLE)
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
+ 
+ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
++set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF)
+ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+ 
+ # The Mscore version number.
+@@ -398,7 +386,6 @@
+     #     set library search path for runtime linker to load the same
+     #     qt libraries as we used at compile time
+     #
+-    set (CMAKE_EXE_LINKER_FLAGS "-Wl,-rpath=${_qt5Core_install_prefix}/lib")
+     # install desktop file
+     install( FILES build/mscore.desktop DESTINATION share/applications)
+     # compress man pages if gzip is installed (don't on OpenBSD)
+@@ -449,11 +436,7 @@
+     DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+     )
+-if (MINGW)
+-  set(BUILD_PCH false)
+-else (MINGW)
+-  set(BUILD_PCH true)
+-endif(MINGW)
++set(BUILD_PCH false)
+ 
+ precompiled_header(QT_INCLUDES all ${BUILD_PCH})
+ 
+--- MuseScore-2.0.2/effects/CMakeLists.txt
++++ MuseScore-2.0.2/effects/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ set_target_properties (
+       effects
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(effects all)
+--- MuseScore-2.0.2/fluid/CMakeLists.txt
++++ MuseScore-2.0.2/fluid/CMakeLists.txt
+@@ -45,7 +45,7 @@
+ set_target_properties (
+       fluid
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(fluid all)
+--- MuseScore-2.0.2/fonttools/CMakeLists.txt
++++ MuseScore-2.0.2/fonttools/CMakeLists.txt
+@@ -19,5 +19,5 @@
+       )
+ 
+ target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
+-set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch")
++set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -Wall -Wextra -Winvalid-pch")
+ 
+--- MuseScore-2.0.2/libmscore/CMakeLists.txt
++++ MuseScore-2.0.2/libmscore/CMakeLists.txt
+@@ -71,8 +71,8 @@
+ set_target_properties (
+       libmscore
+       PROPERTIES
+-         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+-#         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
++#         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
+       )
+ 
+ xcode_pch(libmscore all)
+--- MuseScore-2.0.2/manual/CMakeLists.txt
++++ MuseScore-2.0.2/manual/CMakeLists.txt
+@@ -36,13 +36,13 @@
+ set_target_properties (
+       genManual
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+       )
+ else(APPLE)
+ set_target_properties (
+       genManual
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+       )
+ endif(APPLE)
+ 
+--- MuseScore-2.0.2/midi/CMakeLists.txt
++++ MuseScore-2.0.2/midi/CMakeLists.txt
+@@ -27,7 +27,7 @@
+ set_target_properties (
+       midi
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(midi all)
+--- MuseScore-2.0.2/miditools/CMakeLists.txt
++++ MuseScore-2.0.2/miditools/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
+ 
+ set_target_properties(smf2xml
+-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+       )
+ target_link_libraries(smf2xml
+       ${QT_LIBRARIES}
+@@ -23,7 +23,7 @@
+ 
+ set_target_properties (
+       xml2smf
+-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+       )
+ target_link_libraries(xml2smf
+       ${QT_LIBRARIES}
+--- MuseScore-2.0.2/mscore/CMakeLists.txt
++++ MuseScore-2.0.2/mscore/CMakeLists.txt
+@@ -367,7 +367,7 @@
+    if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+      set_target_properties( mscore
+         PROPERTIES
+-           COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
++           COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+            LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
+         )
+    else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+@@ -488,7 +488,7 @@
+    set_target_properties (
+       mscore
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual -Winvalid-pch"
+       )
+ 
+    if (OMR)
+--- MuseScore-2.0.2/mstyle/CMakeLists.txt
++++ MuseScore-2.0.2/mstyle/CMakeLists.txt
+@@ -49,7 +49,7 @@
+ set_target_properties (
+       mstyle
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(mstyle all)
+--- MuseScore-2.0.2/mtest/cmake.inc
++++ MuseScore-2.0.2/mtest/cmake.inc
+@@ -56,16 +56,16 @@
+       ${TARGET}
+       PROPERTIES
+       AUTOMOC true
+-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
+-      LINK_FLAGS    "-g -stdlib=libc++"
++      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
++      LINK_FLAGS    "-stdlib=libc++"
+       )
+ else(APPLE)
+ set_target_properties (
+       ${TARGET}
+       PROPERTIES
+       AUTOMOC true
+-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+-      LINK_FLAGS    "-g"
++      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
++      LINK_FLAGS    ""
+       )
+ endif(APPLE)
+ 
+--- MuseScore-2.0.2/mtest/CMakeLists.txt
++++ MuseScore-2.0.2/mtest/CMakeLists.txt
+@@ -112,20 +112,7 @@
+ 
+ set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+ 
+-if (APPLE)
+-   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -fPIC -stdlib=libc++ -g")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG")
+-else (APPLE)
+-   if (MINGW)
+-      # -mno-ms-bitfields see #22048
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -mno-ms-bitfields -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+-   else (MINGW)
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -fPIC -fPIE -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+-   endif (MINGW)
+-endif(APPLE)
+-
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
+ 
+ string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
+ 
+@@ -133,17 +120,17 @@
+ set_target_properties (
+       testutils
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+       )
+ else (APPLE)
+ set_target_properties (
+       testutils
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+       )
+ endif(APPLE)
+ 
+-#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+ 
+ add_custom_target(report
+       COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
+--- MuseScore-2.0.2/omr/CMakeLists.txt
++++ MuseScore-2.0.2/omr/CMakeLists.txt
+@@ -42,7 +42,7 @@
+ set_target_properties (
+       omr
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(omr all)
+--- MuseScore-2.0.2/synthesizer/CMakeLists.txt
++++ MuseScore-2.0.2/synthesizer/CMakeLists.txt
+@@ -29,7 +29,7 @@
+ set_target_properties (
+       synthesizer
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(synthesizer all)
+--- MuseScore-2.0.2/thirdparty/beatroot/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/beatroot/CMakeLists.txt
+@@ -14,7 +14,7 @@
+ 
+ set_target_properties( beatroot
+    PROPERTIES
+-      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ xcode_pch(beatroot all)
+--- MuseScore-2.0.2/thirdparty/diff/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/diff/CMakeLists.txt
+@@ -36,7 +36,7 @@
+ set_target_properties (
+       diff_match_patch
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(diff_match_patch all)
+--- MuseScore-2.0.2/thirdparty/kQOAuth/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/kQOAuth/CMakeLists.txt
+@@ -40,7 +40,7 @@
+ set_target_properties (
+       kqoauth
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(kqoauth all)
+--- MuseScore-2.0.2/thirdparty/ofqf/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/ofqf/CMakeLists.txt
+@@ -36,7 +36,7 @@
+ set_target_properties (
+       ofqf
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(ofqf all)
+--- MuseScore-2.0.2/thirdparty/qzip/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/qzip/CMakeLists.txt
+@@ -29,7 +29,7 @@
+ set_target_properties (
+       qzip
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(qzip all)
+--- MuseScore-2.0.2/thirdparty/rtf2html/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/rtf2html/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ 
+ set_target_properties( rtf2html
+    PROPERTIES
+-      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ xcode_pch(rtf2html all)
+--- MuseScore-2.0.2/thirdparty/singleapp/src/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/singleapp/src/CMakeLists.txt
+@@ -31,7 +31,7 @@
+ set_target_properties (
+   qtsingleapp
+   PROPERTIES
+-  COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++  COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+   )
+ 
+ xcode_pch(qtsingleapp all)
+--- MuseScore-2.0.2/thirdparty/xmlstream/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/xmlstream/CMakeLists.txt
+@@ -29,7 +29,7 @@
+ set_target_properties (
+       xmlstream
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(xmlstream all)
+--- MuseScore-2.0.2/zerberus/CMakeLists.txt
++++ MuseScore-2.0.2/zerberus/CMakeLists.txt
+@@ -31,7 +31,7 @@
+ set_target_properties (
+       zerberus
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(zerberus all)
+--- MuseScore-2.0.2/build/mscore.desktop
++++ MuseScore-2.0.2/build/mscore.desktop
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=2.0
++Version=1.0
+ Comment=Create, play and print sheet music
+ Comment[ru]=Визуальный редактор нотных партитур
+ Comment[fr]=Gravure de partitions musicales
diff --git a/media-sound/musescore/files/musescore-2.0.3-fix-buildsystem.patch b/media-sound/musescore/files/musescore-2.0.3-fix-buildsystem.patch
new file mode 100644
index 000000000000..0fb52db915ca
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.0.3-fix-buildsystem.patch
@@ -0,0 +1,479 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c4fe57..b7a5cde 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -147,23 +147,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+       endif()
+ endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+ 
+-if (APPLE)
+-   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-else (APPLE)
+-   if (MINGW)
+-      # -mno-ms-bitfields see #22048
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -mno-ms-bitfields -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+-      set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
+-   else (MINGW)
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -fPIE -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+-   endif (MINGW)
+-endif(APPLE)
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS OFF)
+ 
+ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
++set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
+ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+ 
+ # The Mscore version number.
+@@ -450,7 +440,6 @@ if (NOT MINGW AND NOT APPLE)
+     #     set library search path for runtime linker to load the same
+     #     qt libraries as we used at compile time
+     #
+-    SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # ignored if CMAKE_SKIP_RPATH="TRUE"
+     string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
+     if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
+       # Build portable AppImage as per https://github.com/probonopd/AppImageKit
+@@ -554,11 +543,7 @@ add_custom_command(
+     DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+     )
+-if (MINGW)
+-  set(BUILD_PCH false)
+-else (MINGW)
+-  set(BUILD_PCH true)
+-endif(MINGW)
++set(BUILD_PCH false)
+ 
+ precompiled_header(QT_INCLUDES all ${BUILD_PCH})
+ 
+diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
+index 7962e87..a23aef3 100644
+--- a/aeolus/CMakeLists.txt
++++ b/aeolus/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (aeolus STATIC
+ set_target_properties (
+       aeolus
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ install(DIRECTORY
+diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
+index 5b1dd48..0d28df8 100644
+--- a/audiofile/CMakeLists.txt
++++ b/audiofile/CMakeLists.txt
+@@ -26,7 +26,7 @@ add_library (audiofile STATIC
+ set_target_properties (
+       audiofile
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(audiofile all)
+diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
+index 9589cce..f4172ed 100644
+--- a/awl/CMakeLists.txt
++++ b/awl/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (
+ set_target_properties (
+       awl
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(awl all)
+diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake
+index 6cb671a..3d4aae3 100644
+--- a/build/CreatePrecompiledHeader.cmake
++++ b/build/CreatePrecompiledHeader.cmake
+@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch)
+             set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
+             add_custom_command(
+              OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
+-             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g  ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
++             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
+              DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
+              WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+              VERBATIM
+diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
+index d6b7794..acec8b5 100644
+--- a/bww2mxml/CMakeLists.txt
++++ b/bww2mxml/CMakeLists.txt
+@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE)
+    set_target_properties (
+          bww2mxml
+          PROPERTIES
+-            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
++            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+          )
+ 
+    target_link_libraries(bww2mxml
+diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
+index a695f1d..cf94cae 100644
+--- a/effects/CMakeLists.txt
++++ b/effects/CMakeLists.txt
+@@ -44,7 +44,7 @@ add_library (effects STATIC
+ set_target_properties (
+       effects
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(effects all)
+diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
+index 1dc8d2f..3fede66 100644
+--- a/fluid/CMakeLists.txt
++++ b/fluid/CMakeLists.txt
+@@ -45,7 +45,7 @@ add_library (fluid STATIC
+ set_target_properties (
+       fluid
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(fluid all)
+diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
+index 74a525b..f318f4c 100644
+--- a/fonttools/CMakeLists.txt
++++ b/fonttools/CMakeLists.txt
+@@ -19,5 +19,5 @@ add_executable(
+       )
+ 
+ target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
+-set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch")
++set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -Wall -Wextra -Winvalid-pch")
+ 
+diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
+index 446d413..5d871a8 100644
+--- a/libmscore/CMakeLists.txt
++++ b/libmscore/CMakeLists.txt
+@@ -71,8 +71,8 @@ add_library (
+ set_target_properties (
+       libmscore
+       PROPERTIES
+-         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+-#         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
++#         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
+       )
+ 
+ xcode_pch(libmscore all)
+diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
+index cf6edca..ceffd73 100644
+--- a/manual/CMakeLists.txt
++++ b/manual/CMakeLists.txt
+@@ -36,13 +36,13 @@ if(APPLE)
+ set_target_properties (
+       genManual
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+       )
+ else(APPLE)
+ set_target_properties (
+       genManual
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+       )
+ endif(APPLE)
+ 
+diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
+index 05fbb83..ea95480 100644
+--- a/midi/CMakeLists.txt
++++ b/midi/CMakeLists.txt
+@@ -27,7 +27,7 @@ add_library (midi STATIC
+ set_target_properties (
+       midi
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(midi all)
+diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
+index 6df79c4..f8145e0 100644
+--- a/miditools/CMakeLists.txt
++++ b/miditools/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
+ 
+ set_target_properties(smf2xml
+-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+       )
+ target_link_libraries(smf2xml
+       ${QT_LIBRARIES}
+@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp)
+ 
+ set_target_properties (
+       xml2smf
+-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+       )
+ target_link_libraries(xml2smf
+       ${QT_LIBRARIES}
+diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
+index 3592012..b50e2bc 100644
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -370,7 +370,7 @@ if (MINGW)
+    if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+      set_target_properties( mscore
+         PROPERTIES
+-           COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
++           COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+            LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
+         )
+    else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+@@ -493,7 +493,7 @@ else (MINGW)
+    set_target_properties (
+       mscore
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual -Winvalid-pch"
+       )
+ 
+    if (OMR)
+diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt
+index e60d901..d3ba643 100644
+--- a/mstyle/CMakeLists.txt
++++ b/mstyle/CMakeLists.txt
+@@ -49,7 +49,7 @@ add_library (
+ set_target_properties (
+       mstyle
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(mstyle all)
+diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
+index 55072b0..cab1a18 100644
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -113,20 +113,10 @@ target_link_libraries(
+ 
+ set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+ 
+-if (APPLE)
+-   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-else (APPLE)
+-   if (MINGW)
+-      # -mno-ms-bitfields see #22048
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -mno-ms-bitfields -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+-   else (MINGW)
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -fPIC -fPIE -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+-   endif (MINGW)
+-endif(APPLE)
+-
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS OFF)
+ 
+ string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
+ 
+@@ -134,17 +124,17 @@ if (APPLE)
+ set_target_properties (
+       testutils
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+       )
+ else (APPLE)
+ set_target_properties (
+       testutils
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+       )
+ endif(APPLE)
+ 
+-#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+ 
+ add_custom_target(report
+       COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
+diff --git a/mtest/cmake.inc b/mtest/cmake.inc
+index 0fa9aa8..9ef0177 100644
+--- a/mtest/cmake.inc
++++ b/mtest/cmake.inc
+@@ -57,16 +57,16 @@ set_target_properties (
+       ${TARGET}
+       PROPERTIES
+       AUTOMOC true
+-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
+-      LINK_FLAGS    "-g -stdlib=libc++"
++      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
++      LINK_FLAGS    "-stdlib=libc++"
+       )
+ else(APPLE)
+ set_target_properties (
+       ${TARGET}
+       PROPERTIES
+       AUTOMOC true
+-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+-      LINK_FLAGS    "-g"
++      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
++      LINK_FLAGS    ""
+       )
+ endif(APPLE)
+ 
+diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
+index 88615e5..d719e89 100644
+--- a/omr/CMakeLists.txt
++++ b/omr/CMakeLists.txt
+@@ -42,7 +42,7 @@ add_library (
+ set_target_properties (
+       omr
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(omr all)
+diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
+index 0520920..e9bd15b 100644
+--- a/synthesizer/CMakeLists.txt
++++ b/synthesizer/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library (synthesizer STATIC
+ set_target_properties (
+       synthesizer
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(synthesizer all)
+diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
+index ae905c7..9b039e8 100644
+--- a/thirdparty/beatroot/CMakeLists.txt
++++ b/thirdparty/beatroot/CMakeLists.txt
+@@ -14,7 +14,7 @@ add_library (
+ 
+ set_target_properties( beatroot
+    PROPERTIES
+-      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ xcode_pch(beatroot all)
+diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt
+index d0155b2..35bd6ac 100644
+--- a/thirdparty/diff/CMakeLists.txt
++++ b/thirdparty/diff/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC
+ set_target_properties (
+       diff_match_patch
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(diff_match_patch all)
+diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt
+index 9beb6b1..f7ec1c5 100644
+--- a/thirdparty/kQOAuth/CMakeLists.txt
++++ b/thirdparty/kQOAuth/CMakeLists.txt
+@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
+ set_target_properties (
+       kqoauth
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(kqoauth all)
+diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
+index fc39a0a..8c11f07 100644
+--- a/thirdparty/ofqf/CMakeLists.txt
++++ b/thirdparty/ofqf/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(ofqf STATIC
+ set_target_properties (
+       ofqf
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(ofqf all)
+diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
+index 77b1997..417017e 100644
+--- a/thirdparty/qzip/CMakeLists.txt
++++ b/thirdparty/qzip/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(qzip STATIC
+ set_target_properties (
+       qzip
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(qzip all)
+diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
+index 230339b..6c94a06 100644
+--- a/thirdparty/rtf2html/CMakeLists.txt
++++ b/thirdparty/rtf2html/CMakeLists.txt
+@@ -37,7 +37,7 @@ add_library (
+ 
+ set_target_properties( rtf2html
+    PROPERTIES
+-      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ xcode_pch(rtf2html all)
+diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt
+index 2504b01..936fa3f 100644
+--- a/thirdparty/singleapp/src/CMakeLists.txt
++++ b/thirdparty/singleapp/src/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (
+ set_target_properties (
+   qtsingleapp
+   PROPERTIES
+-  COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++  COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+   )
+ 
+ xcode_pch(qtsingleapp all)
+diff --git a/thirdparty/xmlstream/CMakeLists.txt b/thirdparty/xmlstream/CMakeLists.txt
+index 5991e09..7f1268e 100644
+--- a/thirdparty/xmlstream/CMakeLists.txt
++++ b/thirdparty/xmlstream/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(xmlstream STATIC
+ set_target_properties (
+       xmlstream
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(xmlstream all)
+diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
+index c0db571..58d8ddf 100644
+--- a/zerberus/CMakeLists.txt
++++ b/zerberus/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (zerberus STATIC
+ set_target_properties (
+       zerberus
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(zerberus all)
diff --git a/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch b/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch
new file mode 100644
index 000000000000..9667c4fadc1a
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch
@@ -0,0 +1,494 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 079504708..026e8289a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -153,23 +153,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+       endif()
+ endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+ 
+-if (APPLE)
+-   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-else (APPLE)
+-   if (MINGW)
+-      # -mno-ms-bitfields see #22048
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -mno-ms-bitfields -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+-      set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
+-   else (MINGW)
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+-   endif (MINGW)
+-endif(APPLE)
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS OFF)
+ 
+ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
++set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
+ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+ 
+ # The Mscore version number.
+@@ -473,7 +463,6 @@ if (NOT MINGW AND NOT APPLE)
+     #     set library search path for runtime linker to load the same
+     #     qt libraries as we used at compile time
+     #
+-    SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # ignored if CMAKE_SKIP_RPATH="TRUE"
+     string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
+     if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
+       # Build portable AppImage as per https://github.com/probonopd/AppImageKit
+@@ -577,9 +566,6 @@ add_custom_command(
+     DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+     )
+-if (NOT MINGW)
+-  set(BUILD_PCH true)
+-endif(NOT MINGW)
+ 
+ precompiled_header(QT_INCLUDES all ${BUILD_PCH})
+ 
+diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
+index 7962e8781..a23aef396 100644
+--- a/aeolus/CMakeLists.txt
++++ b/aeolus/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (aeolus STATIC
+ set_target_properties (
+       aeolus
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ install(DIRECTORY
+diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
+index 5b1dd48ee..0d28df8ea 100644
+--- a/audiofile/CMakeLists.txt
++++ b/audiofile/CMakeLists.txt
+@@ -26,7 +26,7 @@ add_library (audiofile STATIC
+ set_target_properties (
+       audiofile
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(audiofile all)
+diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
+index 9589cceb2..f4172ed6d 100644
+--- a/awl/CMakeLists.txt
++++ b/awl/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (
+ set_target_properties (
+       awl
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(awl all)
+diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake
+index 6cb671afc..3d4aae3c2 100644
+--- a/build/CreatePrecompiledHeader.cmake
++++ b/build/CreatePrecompiledHeader.cmake
+@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch)
+             set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
+             add_custom_command(
+              OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
+-             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g  ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
++             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
+              DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
+              WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+              VERBATIM
+diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
+index d6b779465..acec8b5e9 100644
+--- a/bww2mxml/CMakeLists.txt
++++ b/bww2mxml/CMakeLists.txt
+@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE)
+    set_target_properties (
+          bww2mxml
+          PROPERTIES
+-            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
++            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+          )
+ 
+    target_link_libraries(bww2mxml
+diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
+index a695f1d5e..cf94caed9 100644
+--- a/effects/CMakeLists.txt
++++ b/effects/CMakeLists.txt
+@@ -44,7 +44,7 @@ add_library (effects STATIC
+ set_target_properties (
+       effects
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(effects all)
+diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
+index 1dc8d2f8d..3fede6647 100644
+--- a/fluid/CMakeLists.txt
++++ b/fluid/CMakeLists.txt
+@@ -45,7 +45,7 @@ add_library (fluid STATIC
+ set_target_properties (
+       fluid
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(fluid all)
+diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
+index 74a525ba3..f318f4c04 100644
+--- a/fonttools/CMakeLists.txt
++++ b/fonttools/CMakeLists.txt
+@@ -19,5 +19,5 @@ add_executable(
+       )
+ 
+ target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
+-set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch")
++set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -Wall -Wextra -Winvalid-pch")
+ 
+diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
+index 446d413ee..5d871a813 100644
+--- a/libmscore/CMakeLists.txt
++++ b/libmscore/CMakeLists.txt
+@@ -71,8 +71,8 @@ add_library (
+ set_target_properties (
+       libmscore
+       PROPERTIES
+-         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+-#         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
++#         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
+       )
+ 
+ xcode_pch(libmscore all)
+diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
+index cf6edcaed..ceffd7330 100644
+--- a/manual/CMakeLists.txt
++++ b/manual/CMakeLists.txt
+@@ -36,13 +36,13 @@ if(APPLE)
+ set_target_properties (
+       genManual
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+       )
+ else(APPLE)
+ set_target_properties (
+       genManual
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+       )
+ endif(APPLE)
+ 
+diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
+index 05fbb83d5..ea95480c9 100644
+--- a/midi/CMakeLists.txt
++++ b/midi/CMakeLists.txt
+@@ -27,7 +27,7 @@ add_library (midi STATIC
+ set_target_properties (
+       midi
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(midi all)
+diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
+index 6df79c41b..f8145e04a 100644
+--- a/miditools/CMakeLists.txt
++++ b/miditools/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
+ 
+ set_target_properties(smf2xml
+-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+       )
+ target_link_libraries(smf2xml
+       ${QT_LIBRARIES}
+@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp)
+ 
+ set_target_properties (
+       xml2smf
+-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+       )
+ target_link_libraries(xml2smf
+       ${QT_LIBRARIES}
+diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
+index 36196e1c8..cb4a889cd 100644
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -379,7 +379,7 @@ if (MINGW)
+       if (CMAKE_BUILD_TYPE MATCHES "DEBUG")
+             set_target_properties(mscore
+                   PROPERTIES
+-                  COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
++                  COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+                   LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
+                   )
+       else (CMAKE_BUILD_TYPE MATCHES "DEBUG")
+@@ -507,7 +507,7 @@ else (MINGW)
+         if (APPLE)
+             set(PORTMIDI_LIB portmidi)
+         else (APPLE)
+-            set(PORTMIDI_LIB -lportmidi -lporttime) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
++            set(PORTMIDI_LIB -lportmidi) # -lporttime) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
+         endif (APPLE)
+         target_link_libraries(mscore ${PORTMIDI_LIB})
+     endif (USE_PORTMIDI)
+@@ -526,7 +526,7 @@ else (MINGW)
+ 
+       set_target_properties(mscore
+             PROPERTIES
+-            COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
++            COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual -Winvalid-pch"
+             )
+ 
+       if (OMR)
+diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt
+index e60d901fa..d3ba64316 100644
+--- a/mstyle/CMakeLists.txt
++++ b/mstyle/CMakeLists.txt
+@@ -49,7 +49,7 @@ add_library (
+ set_target_properties (
+       mstyle
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(mstyle all)
+diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
+index 0831c0810..3e37b2d34 100644
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -113,20 +113,10 @@ target_link_libraries(
+ 
+ set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+ 
+-if (APPLE)
+-   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-else (APPLE)
+-   if (MINGW)
+-      # -mno-ms-bitfields see #22048
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -mno-ms-bitfields -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+-   else (MINGW)
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -fPIC -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+-   endif (MINGW)
+-endif(APPLE)
+-
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS OFF)
+ 
+ string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
+ 
+@@ -134,17 +124,17 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ set_target_properties (
+       testutils
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+       )
+ else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ set_target_properties (
+       testutils
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+       )
+ endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ 
+-#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+ 
+ add_custom_target(report
+       COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
+diff --git a/mtest/cmake.inc b/mtest/cmake.inc
+index 9de4518a5..275da35b1 100644
+--- a/mtest/cmake.inc
++++ b/mtest/cmake.inc
+@@ -57,16 +57,16 @@ set_target_properties (
+       ${TARGET}
+       PROPERTIES
+       AUTOMOC true
+-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+-      LINK_FLAGS    "-g -stdlib=libc++"
++      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
++      LINK_FLAGS    "-stdlib=libc++"
+       )
+ else(APPLE)
+ set_target_properties (
+       ${TARGET}
+       PROPERTIES
+       AUTOMOC true
+-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+-      LINK_FLAGS    "-g"
++      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
++      LINK_FLAGS    ""
+       )
+ endif(APPLE)
+ 
+@@ -74,7 +74,7 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ set_target_properties (
+       ${TARGET}
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+       )
+ endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ 
+diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
+index 88615e5fe..d719e895e 100644
+--- a/omr/CMakeLists.txt
++++ b/omr/CMakeLists.txt
+@@ -42,7 +42,7 @@ add_library (
+ set_target_properties (
+       omr
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(omr all)
+diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
+index 0520920cf..e9bd15b4e 100644
+--- a/synthesizer/CMakeLists.txt
++++ b/synthesizer/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library (synthesizer STATIC
+ set_target_properties (
+       synthesizer
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(synthesizer all)
+diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
+index ae905c735..9b039e8d2 100644
+--- a/thirdparty/beatroot/CMakeLists.txt
++++ b/thirdparty/beatroot/CMakeLists.txt
+@@ -14,7 +14,7 @@ add_library (
+ 
+ set_target_properties( beatroot
+    PROPERTIES
+-      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ xcode_pch(beatroot all)
+diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt
+index d0155b214..35bd6ac4b 100644
+--- a/thirdparty/diff/CMakeLists.txt
++++ b/thirdparty/diff/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC
+ set_target_properties (
+       diff_match_patch
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(diff_match_patch all)
+diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt
+index 9beb6b1f2..f7ec1c5ba 100644
+--- a/thirdparty/kQOAuth/CMakeLists.txt
++++ b/thirdparty/kQOAuth/CMakeLists.txt
+@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
+ set_target_properties (
+       kqoauth
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(kqoauth all)
+diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
+index fc39a0aa1..8c11f0710 100644
+--- a/thirdparty/ofqf/CMakeLists.txt
++++ b/thirdparty/ofqf/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(ofqf STATIC
+ set_target_properties (
+       ofqf
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(ofqf all)
+diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
+index 77b19979e..417017e12 100644
+--- a/thirdparty/qzip/CMakeLists.txt
++++ b/thirdparty/qzip/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(qzip STATIC
+ set_target_properties (
+       qzip
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(qzip all)
+diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
+index 230339bde..6c94a06ea 100644
+--- a/thirdparty/rtf2html/CMakeLists.txt
++++ b/thirdparty/rtf2html/CMakeLists.txt
+@@ -37,7 +37,7 @@ add_library (
+ 
+ set_target_properties( rtf2html
+    PROPERTIES
+-      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ xcode_pch(rtf2html all)
+diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt
+index 2504b017e..936fa3f09 100644
+--- a/thirdparty/singleapp/src/CMakeLists.txt
++++ b/thirdparty/singleapp/src/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (
+ set_target_properties (
+   qtsingleapp
+   PROPERTIES
+-  COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++  COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+   )
+ 
+ xcode_pch(qtsingleapp all)
+diff --git a/thirdparty/xmlstream/CMakeLists.txt b/thirdparty/xmlstream/CMakeLists.txt
+index 5991e09e5..7f1268e62 100644
+--- a/thirdparty/xmlstream/CMakeLists.txt
++++ b/thirdparty/xmlstream/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(xmlstream STATIC
+ set_target_properties (
+       xmlstream
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(xmlstream all)
+diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
+index c0db57150..58d8ddf9f 100644
+--- a/zerberus/CMakeLists.txt
++++ b/zerberus/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (zerberus STATIC
+ set_target_properties (
+       zerberus
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(zerberus all)
diff --git a/media-sound/musescore/files/musescore-9999-fix-buildsystem.patch b/media-sound/musescore/files/musescore-9999-fix-buildsystem.patch
new file mode 100644
index 000000000000..74ba5113874d
--- /dev/null
+++ b/media-sound/musescore/files/musescore-9999-fix-buildsystem.patch
@@ -0,0 +1,514 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e2e91f3fe..7feb7a9e5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,27 +142,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+       endif()
+ endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+ 
+-if (APPLE)
+-   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-   # This is necessary for genManual to be executed during the build phase,
+-   # it needs to be able to get the Qt libs.
+-   SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-   SET(CMAKE_INSTALL_RPATH "${QT_INSTALL_PREFIX}/lib")
+-else (APPLE)
+-   if (MINGW)
+-      # -mno-ms-bitfields see #22048
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -mno-ms-bitfields -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+-      set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
+-   else (MINGW)
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++11 -fPIC -g -Wall -Wextra -Woverloaded-virtual")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
+-   endif (MINGW)
+-endif(APPLE)
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS ON)
+ 
+ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
++set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
+ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+ 
+ # The MuseScore version number.
+@@ -415,7 +401,6 @@ if (NOT MINGW AND NOT APPLE)
+     #     set library search path for runtime linker to load the same
+     #     qt libraries as we used at compile time
+     #
+-    SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # Ignored if CMAKE_SKIP_RPATH="TRUE"
+     string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
+     if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
+       # Build portable AppImage as per https://github.com/probonopd/AppImageKit
+@@ -519,9 +504,6 @@ add_custom_command(
+     DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+     )
+-if (NOT MINGW)
+-  set(BUILD_PCH true)
+-endif(NOT MINGW)
+ 
+ precompiled_header(QT_INCLUDES all ${BUILD_PCH})
+ 
+diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
+index 7962e8781..bdcb08dae 100644
+--- a/aeolus/CMakeLists.txt
++++ b/aeolus/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (aeolus STATIC
+ set_target_properties (
+       aeolus
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ install(DIRECTORY
+diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
+index 5b1dd48ee..264a14a17 100644
+--- a/audiofile/CMakeLists.txt
++++ b/audiofile/CMakeLists.txt
+@@ -26,7 +26,7 @@ add_library (audiofile STATIC
+ set_target_properties (
+       audiofile
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(audiofile all)
+diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
+index bcf5427b7..fec81d8b3 100644
+--- a/awl/CMakeLists.txt
++++ b/awl/CMakeLists.txt
+@@ -43,7 +43,7 @@ add_library (
+ set_target_properties (
+       awl
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(awl all)
+diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake
+index 72faba0de..8f9d2636c 100644
+--- a/build/CreatePrecompiledHeader.cmake
++++ b/build/CreatePrecompiledHeader.cmake
+@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch)
+             set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
+             add_custom_command(
+              OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
+-             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g  ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
++             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
+              DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
+              WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+              VERBATIM
+diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
+index d6b779465..ad7815358 100644
+--- a/bww2mxml/CMakeLists.txt
++++ b/bww2mxml/CMakeLists.txt
+@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE)
+    set_target_properties (
+          bww2mxml
+          PROPERTIES
+-            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
++            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -fPIC -Wall -Wextra -Winvalid-pch"
+          )
+ 
+    target_link_libraries(bww2mxml
+diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
+index a695f1d5e..1f34fafce 100644
+--- a/effects/CMakeLists.txt
++++ b/effects/CMakeLists.txt
+@@ -44,7 +44,7 @@ add_library (effects STATIC
+ set_target_properties (
+       effects
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(effects all)
+diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
+index 1dc8d2f8d..99f8f574e 100644
+--- a/fluid/CMakeLists.txt
++++ b/fluid/CMakeLists.txt
+@@ -45,7 +45,7 @@ add_library (fluid STATIC
+ set_target_properties (
+       fluid
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(fluid all)
+diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
+index 74a525ba3..2cc008495 100644
+--- a/fonttools/CMakeLists.txt
++++ b/fonttools/CMakeLists.txt
+@@ -19,5 +19,5 @@ add_executable(
+       )
+ 
+ target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
+-set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch")
++set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -fPIC -Wall -Wextra -Winvalid-pch")
+ 
+diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
+index 6c7e07a3a..000c9c929 100644
+--- a/libmscore/CMakeLists.txt
++++ b/libmscore/CMakeLists.txt
+@@ -73,7 +73,7 @@ add_library (
+ set_target_properties (
+       libmscore
+       PROPERTIES
+-         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
+       )
+ 
+ xcode_pch(libmscore all)
+diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
+index cf6edcaed..9eb84926c 100644
+--- a/manual/CMakeLists.txt
++++ b/manual/CMakeLists.txt
+@@ -36,13 +36,13 @@ if(APPLE)
+ set_target_properties (
+       genManual
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
+       )
+ else(APPLE)
+ set_target_properties (
+       genManual
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
+       )
+ endif(APPLE)
+ 
+diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
+index 05fbb83d5..bf79c9e3f 100644
+--- a/midi/CMakeLists.txt
++++ b/midi/CMakeLists.txt
+@@ -27,7 +27,7 @@ add_library (midi STATIC
+ set_target_properties (
+       midi
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(midi all)
+diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
+index 6df79c41b..e3bdb90b8 100644
+--- a/miditools/CMakeLists.txt
++++ b/miditools/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
+ 
+ set_target_properties(smf2xml
+-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++      PROPERTIES COMPILE_FLAGS "-fPIC -Wall -Wextra"
+       )
+ target_link_libraries(smf2xml
+       ${QT_LIBRARIES}
+@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp)
+ 
+ set_target_properties (
+       xml2smf
+-      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++      PROPERTIES COMPILE_FLAGS "-fPIC -Wall -Wextra"
+       )
+ target_link_libraries(xml2smf
+       ${QT_LIBRARIES}
+diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
+index cd1045aa9..1b2c3a0eb 100644
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -381,13 +381,13 @@ if (MINGW)
+    if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+      set_target_properties( mscore
+         PROPERTIES
+-           COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
++           COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+            LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
+         )
+    else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+      set_target_properties( mscore
+           PROPERTIES
+-             COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
++             COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+              LINK_FLAGS "-Wl,-S ${PROJECT_BINARY_DIR}/resfile.o -mwindows -L ${CROSSQT}/lib"
+           )
+    endif(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+@@ -507,7 +507,7 @@ else (MINGW)
+    set_target_properties (
+       mscore
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wno-overloaded-virtual -Winvalid-pch"
+       )
+ 
+    if (OMR)
+diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt
+index 2bc43c4bd..3fb96fcfa 100644
+--- a/mstyle/CMakeLists.txt
++++ b/mstyle/CMakeLists.txt
+@@ -49,7 +49,7 @@ add_library (
+ set_target_properties (
+       mstyle
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch -Wno-overloaded-virtual"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Wno-overloaded-virtual"
+       )
+ 
+ xcode_pch(mstyle all)
+diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
+index c0486679a..42f14301d 100644
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -113,20 +113,10 @@ target_link_libraries(
+ 
+ set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+ 
+-if (APPLE)
+-   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-else (APPLE)
+-   if (MINGW)
+-      # -mno-ms-bitfields see #22048
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -mno-ms-bitfields -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+-   else (MINGW)
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -fPIC -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
+-   endif (MINGW)
+-endif(APPLE)
+-
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++set(CMAKE_CXX_EXTENSIONS ON)
+ 
+ string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
+ 
+@@ -134,17 +124,17 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ set_target_properties (
+       testutils
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
+       )
+ else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ set_target_properties (
+       testutils
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
+       )
+ endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ 
+-#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
+ 
+ add_custom_target(report
+       COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
+diff --git a/mtest/cmake.inc b/mtest/cmake.inc
+index 943b85e5f..35b04f51e 100644
+--- a/mtest/cmake.inc
++++ b/mtest/cmake.inc
+@@ -60,16 +60,16 @@ set_target_properties (
+       ${TARGET}
+       PROPERTIES
+       AUTOMOC true
+-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+-      LINK_FLAGS    "-g -stdlib=libc++"
++      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
++      LINK_FLAGS    "-stdlib=libc++"
+       )
+ else(APPLE)
+ set_target_properties (
+       ${TARGET}
+       PROPERTIES
+       AUTOMOC true
+-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+-      LINK_FLAGS    "-g"
++      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
++      LINK_FLAGS    ""
+       )
+ endif(APPLE)
+ 
+@@ -77,7 +77,7 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ set_target_properties (
+       ${TARGET}
+       PROPERTIES
+-      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
+       )
+ endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
+ 
+diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
+index 9ad57b930..caf9a3624 100644
+--- a/omr/CMakeLists.txt
++++ b/omr/CMakeLists.txt
+@@ -42,7 +42,7 @@ add_library (
+ set_target_properties (
+       omr
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
+       )
+ 
+ xcode_pch(omr all)
+diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
+index 0520920cf..e0a1aa7a1 100644
+--- a/synthesizer/CMakeLists.txt
++++ b/synthesizer/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library (synthesizer STATIC
+ set_target_properties (
+       synthesizer
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(synthesizer all)
+diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
+index ae905c735..f0fb50a40 100644
+--- a/thirdparty/beatroot/CMakeLists.txt
++++ b/thirdparty/beatroot/CMakeLists.txt
+@@ -14,7 +14,7 @@ add_library (
+ 
+ set_target_properties( beatroot
+    PROPERTIES
+-      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++      COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ xcode_pch(beatroot all)
+diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt
+index d0155b214..3985868bb 100644
+--- a/thirdparty/diff/CMakeLists.txt
++++ b/thirdparty/diff/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC
+ set_target_properties (
+       diff_match_patch
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(diff_match_patch all)
+diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt
+index 9beb6b1f2..f452df5de 100644
+--- a/thirdparty/kQOAuth/CMakeLists.txt
++++ b/thirdparty/kQOAuth/CMakeLists.txt
+@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
+ set_target_properties (
+       kqoauth
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -fPIC -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(kqoauth all)
+diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
+index fc39a0aa1..9200dd312 100644
+--- a/thirdparty/ofqf/CMakeLists.txt
++++ b/thirdparty/ofqf/CMakeLists.txt
+@@ -36,7 +36,7 @@ add_library(ofqf STATIC
+ set_target_properties (
+       ofqf
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(ofqf all)
+diff --git a/thirdparty/poppler/CMakeLists.txt b/thirdparty/poppler/CMakeLists.txt
+index 943cca72e..20f336087 100644
+--- a/thirdparty/poppler/CMakeLists.txt
++++ b/thirdparty/poppler/CMakeLists.txt
+@@ -134,12 +134,12 @@ add_library(poppler STATIC
+    )
+ 
+ if (APPLE)
+-   set ( POPPLER_COMPILE_FLAGS "-O2 -Wno-unknown-warning-option -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-private-field -Wno-return-stack-address -Wno-shift-negative-value -std=c++11")
++   set ( POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wno-unknown-warning-option -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-private-field -Wno-return-stack-address -Wno-shift-negative-value -std=c++11")
+ else (APPLE)
+    if (MINGW)
+-      set (POPPLER_COMPILE_FLAGS "-O2 -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -std=c++11")
++      set (POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -std=c++11")
+    else (MINGW)
+-      set (POPPLER_COMPILE_FLAGS "-O2 -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -std=c++11")
++      set (POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -std=c++11")
+    endif(MINGW)
+ endif(APPLE)
+ 
+diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
+index 77b19979e..b1b4cb841 100644
+--- a/thirdparty/qzip/CMakeLists.txt
++++ b/thirdparty/qzip/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(qzip STATIC
+ set_target_properties (
+       qzip
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(qzip all)
+diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
+index 230339bde..c052605e2 100644
+--- a/thirdparty/rtf2html/CMakeLists.txt
++++ b/thirdparty/rtf2html/CMakeLists.txt
+@@ -37,7 +37,7 @@ add_library (
+ 
+ set_target_properties( rtf2html
+    PROPERTIES
+-      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++      COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ xcode_pch(rtf2html all)
+diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt
+index 2504b017e..722e5d553 100644
+--- a/thirdparty/singleapp/src/CMakeLists.txt
++++ b/thirdparty/singleapp/src/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (
+ set_target_properties (
+   qtsingleapp
+   PROPERTIES
+-  COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++  COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+   )
+ 
+ xcode_pch(qtsingleapp all)
+diff --git a/thirdparty/xmlstream/CMakeLists.txt b/thirdparty/xmlstream/CMakeLists.txt
+index 5991e09e5..7e6db93ed 100644
+--- a/thirdparty/xmlstream/CMakeLists.txt
++++ b/thirdparty/xmlstream/CMakeLists.txt
+@@ -29,7 +29,7 @@ add_library(xmlstream STATIC
+ set_target_properties (
+       xmlstream
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(xmlstream all)
+diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
+index c0db57150..52090bd57 100644
+--- a/zerberus/CMakeLists.txt
++++ b/zerberus/CMakeLists.txt
+@@ -31,7 +31,7 @@ add_library (zerberus STATIC
+ set_target_properties (
+       zerberus
+       PROPERTIES
+-         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
+       )
+ 
+ xcode_pch(zerberus all)
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
new file mode 100644
index 000000000000..73e8e2334c09
--- /dev/null
+++ b/media-sound/musescore/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">mscore</remote-id>
+		<remote-id type="github">musescore/MuseScore</remote-id>
+	</upstream>
+	<use>
+		<flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/musescore/musescore-2.0.2-r1.ebuild b/media-sound/musescore/musescore-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..83c725c42826
--- /dev/null
+++ b/media-sound/musescore/musescore-2.0.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+SRC_URI="https://github.com/${PN}/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="audiofile debug jack mp3 portaudio pulseaudio"
+
+RDEPEND="
+	>=dev-qt/qtconcurrent-5.3.0:5
+	>=dev-qt/qtcore-5.3.0:5
+	>=dev-qt/qtdeclarative-5.3.0:5
+	>=dev-qt/qtgui-5.3.0:5
+	>=dev-qt/qthelp-5.3.0:5
+	>=dev-qt/qtprintsupport-5.3.0:5
+	>=dev-qt/qtsvg-5.3.0:5
+	>=dev-qt/qtwebkit-5.3.0:5
+	>=dev-qt/qtxmlpatterns-5.3.0:5
+	>=media-libs/alsa-lib-1.0.0
+	>=media-libs/freetype-2.5.2
+	sys-libs/zlib
+	audiofile? (
+		media-libs/audiofile
+		media-libs/libsndfile
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	mp3? ( media-sound/lame )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	"
+DEPEND="${RDEPEND}
+	dev-util/cmake
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	"
+PATCHES=(
+	"${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_audiofile="$(usex audiofile)"
+		-DBUILD_JACK="$(usex jack)"
+		-DBUILD_LAME="$(usex mp3)"
+		-DUSE_portaudio="$(usex portaudio)"
+		-DUSE_pulseaudio="$(usex pulseaudio)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake-utils_src_make -j1 lrelease manpages
+	cmake-utils_src_compile
+}
diff --git a/media-sound/musescore/musescore-2.0.3.ebuild b/media-sound/musescore/musescore-2.0.3.ebuild
new file mode 100644
index 000000000000..a574e62b731d
--- /dev/null
+++ b/media-sound/musescore/musescore-2.0.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+SRC_URI="https://github.com/${PN}/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 portaudio pulseaudio"
+
+RDEPEND="
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/freetype-2.5.2
+	media-libs/libsndfile
+	sys-libs/zlib
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	mp3? ( media-sound/lame )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.3-fix-buildsystem.patch"
+)
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ALSA="$(usex alsa)"
+		-DBUILD_JACK="$(usex jack)"
+		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_PORTAUDIO="$(usex portaudio)"
+		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake-utils_src_make -j1 lrelease manpages
+	cmake-utils_src_compile
+}
diff --git a/media-sound/musescore/musescore-2.1.0.ebuild b/media-sound/musescore/musescore-2.1.0.ebuild
new file mode 100644
index 000000000000..4f547ddc3dbd
--- /dev/null
+++ b/media-sound/musescore/musescore-2.1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="http://musescore.org/"
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+RDEPEND="
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/freetype-2.5.2
+	media-libs/libsndfile
+	sys-libs/zlib
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( virtual/jack )
+	mp3? ( media-sound/lame )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.0-fix-buildsystem.patch"
+)
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ALSA="$(usex alsa)"
+		-DBUILD_JACK="$(usex jack)"
+		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_PORTAUDIO="$(usex portaudio)"
+		-DBUILD_PORTMIDI="$(usex portmidi)"
+		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake-utils_src_make -j1 lrelease manpages
+	cmake-utils_src_compile
+}
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
new file mode 100644
index 000000000000..a04d054d3d85
--- /dev/null
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils git-r3
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="alsa debug jack mp3 portaudio pulseaudio"
+
+RDEPEND="
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwebkit:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/freetype-2.5.2
+	media-libs/libsndfile
+	sys-libs/zlib
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	mp3? ( media-sound/lame )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+	"
+PATCHES=(
+	"${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ALSA="$(usex alsa)"
+		-DBUILD_JACK="$(usex jack)"
+		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_PORTAUDIO="$(usex portaudio)"
+		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake-utils_src_make -j1 lrelease manpages
+	cmake-utils_src_compile
+}
diff --git a/media-sound/music-file-organizer/Manifest b/media-sound/music-file-organizer/Manifest
new file mode 100644
index 000000000000..fbbc75b4c8a9
--- /dev/null
+++ b/media-sound/music-file-organizer/Manifest
@@ -0,0 +1,5 @@
+DIST music-file-organizer-1.0.1.tar.xz 6644 SHA256 509fdd986872d41c82467483802b647f6c9130f52bbb1ed10884810ce1ae0f4a SHA512 4a69f90b3d859ec18746708c64c316b9f583e3ed7718848109815a9e725fe43d3ca1260dea90aae25201150569538056de7de75f05fe7ea6a1ae637f041431c2 WHIRLPOOL 2131268bc178422c8ffc55f981cc10dcc6ad3e7779e1c08c8e7379d5a61641cf7ef267a657a64f8b2ac85dc94c8aed43fa117477a9986789c5ad2e3cd12763a6
+EBUILD music-file-organizer-1.0.1.ebuild 861 SHA256 920a42d30aa1ba23283a736f9c1c353eaf08f3899ee930929ea48ef76056cdd5 SHA512 3c2ddf9c2eac6f8bcd1021da17354ca5c8fefabef9f740b77ca3fb8aef3e46eebb5faf182dca74097fd63f563442c8129fd3c71677918151a18bc51578ed2897 WHIRLPOOL 9d831978a4ef39058452c378a889e77494901b0893fbc896a9fd1c131f6267789ab9e931f686e667ce24ad68fb67ce7b15f38bf0be4dbb7eb3583f328509d11f
+MISC ChangeLog 2218 SHA256 95dce68db2ed5b91ba91ad480f02eca7b6357eb935fafd5166bdf36e1d1a4229 SHA512 154eeae80518163a5a9442affdcc096286c5af881743ea8045d2a27d21fb9611d342c81fc463a88afbb5ccc7ffa1f0f4ebc28ab41335834bd7a501d84defbf9b WHIRLPOOL 6b83acabe5b5d599a5d30e43440fa5e7b5598de88d59259ed8717e89f2a82f4c9e48b9f6475bdb15ad64723fe39444063803fc1050d86d8879e009dfeefa0359
+MISC ChangeLog-2015 804 SHA256 ffeec31abcd721862f29f04d2e472a6537ba3cf8b306ada27aaf8cdb8d305738 SHA512 3d7b520738e218422370839334cde30a7de090f0c78f3ae4e71a255349b832aa5013a3f322932747983be5aa3c2ffa7c92445f0ba8aeb08ecea734e11fdc27ec WHIRLPOOL f8a366ef97a6e4ba99f14d0facc819795bb24c10d609fc13e1a9ec07f64e057f6ad017c43c7c23548c52f9b46bc5d11558ce64f7780552724f3fb3c86e77bc70
+MISC metadata.xml 250 SHA256 b7a9bbddea766f7eb561a7d52a7f6be34183f44d309efae362085c1ab536ae09 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5 WHIRLPOOL 4cf60a5d2fb9d0af392a436d8829e387883112156cb313f44c0e58ccd52a0552a6d307ee3ceb8be396ac044da186698e41faf261f6cf6da0a1aff0ba8b47eb17
diff --git a/media-sound/music-file-organizer/metadata.xml b/media-sound/music-file-organizer/metadata.xml
new file mode 100644
index 000000000000..915f00227065
--- /dev/null
+++ b/media-sound/music-file-organizer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/music-file-organizer/music-file-organizer-1.0.1.ebuild b/media-sound/music-file-organizer/music-file-organizer-1.0.1.ebuild
new file mode 100644
index 000000000000..beee9faf4e8b
--- /dev/null
+++ b/media-sound/music-file-organizer/music-file-organizer-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Organizes audio files into directories based on metadata tags,
+along with other metadata utilities."
+HOMEPAGE="http://blog.zx2c4.com/813"
+SRC_URI="http://git.zx2c4.com/music-file-organizer/snapshot/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/taglib dev-libs/icu:="
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+pkg_postinst() {
+	einfo
+	einfo "The organizemusic utility recursively moves audio files and audio"
+	einfo "directories given as its arguments into the directory specified"
+	einfo "by the environment variable MUSICDIR. You may want to set this"
+	einfo "environment variable inside your .bashrc. If no MUSICDIR variable"
+	einfo "is set, it falls back to \"\$HOME/Music/\"."
+	einfo
+}
diff --git a/media-sound/musique/Manifest b/media-sound/musique/Manifest
new file mode 100644
index 000000000000..885092cac870
--- /dev/null
+++ b/media-sound/musique/Manifest
@@ -0,0 +1,6 @@
+AUX musique-1.5-unbundle-qtsingleapplication.patch 273 SHA256 166a736cba84c98d0a77abccd16143a85338b5c3c2567d443bbed7075713b67c SHA512 d51389a43c5045c453aa516da4da6d50e2d7fb2b064e40df5cd3ff50469a414bf0ec4d44c716be8b83b8bbf1944f72474b3b917dfcd661eef25c2b7298440641 WHIRLPOOL 08e504710e2bbb9a3a2a2daf015d7f4d9c9c2222dc8375888e89631202054f0f97d4cd1b6fb4bfa2f5b66705e33f6caea5776e3c799e87bc50e8850e9c05ed7e
+DIST musique-1.5.tar.gz 377072 SHA256 82600f4e3d58900df1cc11acd77efbf11e8eac94f8c7382d57f953cadcd49d54 SHA512 ea4ba84e6b1a69acf054c8ca001afcf3f0e9b17f3557209da649662b2940777babac454a5d4fa0a210e2e15c58bcf4cdfc8757f92b677d46217e3400fcbdc12e WHIRLPOOL 4f5f3f96ef2110b4bf7f079ffb9cd15adc8a426003e1d324db5c090130ac6c76ee361238014ffde65332a0caf4ca346ff4d40d2400db32d281c2acc7ce91d034
+EBUILD musique-1.5.ebuild 1004 SHA256 102ff09e75deebc23a37d49ccd1989c9e56003b3a0383d2ff761cf432bb8937d SHA512 96ca3c3706b1eea7ac2cf0bcd6c6af25e080153e07a3a43f06654d2cab90fd34989ec4d5143a36115622e95d6aa24fb92cad1f98d846cb9df7aa5b406b08e3aa WHIRLPOOL 48c9dcaa9011e5c521b46fc60f847419bfebb1b8e422d455b214bd3672b4061d17de9c4b82c6d9cadedb2f5a4b26b2834cba84c5c755ddf267274e6f16b3170f
+MISC ChangeLog 3344 SHA256 422cf03fa8090e8d0a4a490749c218d8ccff99b3e312a31762882aa75dda457d SHA512 c203ccc0ed746620e0381f4d28a6097d52717bb878675114274d117ac9f39f39d9c1b9e8377a1dd413c789a1e612ac1639241114fc93611b630fea83d2a28337 WHIRLPOOL cfc2de4a0d3e9ee4f4f366bff5fff81dca60c905554bc5838fe4d59c0d997201c1ef239dfaee0165897f71f09576100a6d9b40f703918fbf6966a5ba14233ae2
+MISC ChangeLog-2015 2333 SHA256 bfa087ea54e7384e2d1e4b978b593ca87d4858e6858f9d142ae0d499e04c47d0 SHA512 06b2b2cb698e5f3e474faccad436e169efe3e0abe7dbed50f4fc030fdc2233fe758c9c13f4471e416debd061d6b22ee7fd27c1905f39bdd6b9fbef44f257a064 WHIRLPOOL 4c0245ab3aa7b3aa8b00512ad84d45cc55da2982673ee52ebadac507c545106311293a798c78e000f5d02f9c07f5d3e46fcfb8e353032f9514636576afb5bfed
+MISC metadata.xml 333 SHA256 9413b9f63b4384e5a083f5cfda6de6692ff35687c6b8aabecbf493c81b0ecf88 SHA512 b2dc7bd4588fd80bc4bcce0e80102d4522d9dd2a946807ef25ff294e96621da948bead8d8bf0db19b9b65cb8d3934fee69e1f73ef57c3eda3ea429928766a897 WHIRLPOOL a3a1fc555c92c1140af8d6688966511e35d818f20f1d052fd0bbd768481c6c35116d2f46224db3b9af1215b9acaf9f3914aa38d23ee16e3dcc3b5b883f4adbc6
diff --git a/media-sound/musique/files/musique-1.5-unbundle-qtsingleapplication.patch b/media-sound/musique/files/musique-1.5-unbundle-qtsingleapplication.patch
new file mode 100644
index 000000000000..63e50b3ea721
--- /dev/null
+++ b/media-sound/musique/files/musique-1.5-unbundle-qtsingleapplication.patch
@@ -0,0 +1,13 @@
+Use system copy of qtsingleapplication.
+
+--- a/musique.pro
++++ b/musique.pro
+@@ -18,7 +18,7 @@
+ 
+ QT += network sql widgets
+ 
+-include(src/qtsingleapplication/qtsingleapplication.pri)
++CONFIG += qtsingleapplication
+ include(src/http/http.pri)
+ include(src/tags/tags.pri)
+ 
diff --git a/media-sound/musique/metadata.xml b/media-sound/musique/metadata.xml
new file mode 100644
index 000000000000..451f4c376053
--- /dev/null
+++ b/media-sound/musique/metadata.xml
@@ -0,0 +1,11 @@
+<?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="github">flaviotordini/musique</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/musique/musique-1.5.ebuild b/media-sound/musique/musique-1.5.ebuild
new file mode 100644
index 000000000000..acac1e72c4ac
--- /dev/null
+++ b/media-sound/musique/musique-1.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="Qt music player"
+HOMEPAGE="http://flavio.tordini.org/musique"
+SRC_URI="https://github.com/flaviotordini/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	media-libs/phonon[qt5(+)]
+	media-libs/taglib
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES TODO )
+PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" )
+
+src_prepare () {
+	rm -r src/qtsingleapplication || die
+	default
+}
+
+src_configure() {
+	eqmake5 ${PN}.pro PREFIX="/usr"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
new file mode 100644
index 000000000000..9bb12e252755
--- /dev/null
+++ b/media-sound/ncmpc/Manifest
@@ -0,0 +1,12 @@
+AUX ax_require_defined.m4 1217 SHA256 25e2ea9b1b89e3bf5f5ea205f979e8719b9f37770f0cc0053f23093108b32bce SHA512 40fc950b353f37580a2e8aea71b5b7a6681d753b91ef386bebcaf4541f814ec016e2cc13b187d6fbe22727c669a2965fe8ac8a80b18ba449ea99e62493a9cc4e WHIRLPOOL cd711c228b69340cc8ed4c5df4becd45ef5cc1dc54a14f47b24849e802368c22b493f9d352250a296ed870f1d823d60d95d459c6500466001383fa4033746142
+AUX ncmpc-0.24-tinfo.patch 1427 SHA256 946aa473365b57533b4ba1ca908b1bea9684a529193b5c402ad8701d5713a2d3 SHA512 545da277aac7cc4b176efe3c33bf1ad777c245a56abbcf05a8a7b30a8cf10a03dfd58bef03f09aada95afe9924e6cee9588efa1da2e4013a480cd03d599acb12 WHIRLPOOL 631974c6b6921d1c4ce538e6441b904cbcdc2c2551df870fc3d879dbd1b52bfb5e65ed48f8fc0c8d1131cd640eb671a99b5443754752f079cef6e0bf9f748b82
+DIST ncmpc-0.24.tar.xz 298012 SHA256 0e6f76b2b11449cfa479d2830ac681f4e3bff54a95a9134b069dd5a173b4c3e9 SHA512 852bedec9d1e0f13748d00ded8a57b7824a3907fa4aef441cd016c13b3a4229e630957ee965d9f5cf7c1a0c47bfa3bb040058d32c6fcf6b4474acc57f834d929 WHIRLPOOL 56aca88f833e06793113c283272ccfb1170f8cd2c094218863d91a5735a2028ebc9c3e870b416e6a260242b61714fedc3eee2f1e6d4f696e0cfd2402bdb4ab68
+DIST ncmpc-0.25.tar.xz 298128 SHA256 6e328acb71d06ae9e6c5fced99bc28ae78bcab1a73130b42ce9ab08a814ecea4 SHA512 8c871db367a70ec3b68c1337d6ec26b8ca4982cd11f674abd17bf6c5df429d366a7b531f8668d4665688b5ae9a4f5f2ba92bb1a36cf491bf8dd3f8874699b0b3 WHIRLPOOL 3a20a2594f118521faad6c8287e8ba98ae508f75711805f5c4dfe45adf8e33068caa18ed75af1e19df958da5ba93dffc80a611ab6b331c977c274cfb44f019b6
+DIST ncmpc-0.27.tar.xz 302636 SHA256 f9a26a3fc869cfdf0a16b0ea3e6512c2fe28a031bbc71b1d24a2bf0bbd3e15d9 SHA512 255b5529a5eae14d89d9419dfb06d91c50b68a9e05f2e124fc07035e2a4619c7b6801c08d52c639d934b50f939cf1dc58f3c5265805ce8eeeba211803108f663 WHIRLPOOL 6fa26f29a1dcdac2ff80a8ba0bf9cb211139acdc823f0798e87a20b759ad8ed4ec0e031f6cd42f998cf1f848abcb858597a21de53b9b458f1b3a01c948452c7b
+EBUILD ncmpc-0.24-r2.ebuild 1821 SHA256 2b6438dfb763e92b0764ecdb2b09b565ffb217832c877340289691e432629871 SHA512 495255c32918c1c8fd4f754330eb307cfe8d68844aa3f4e231e42992e146189e549085c9000c9bad9f3370fd550c912c95edaa995c1a2acf6ba28bcd28eb74c8 WHIRLPOOL defa361390bfa5abad191069579db1db0d045249508b1389e6747a1bac318ded1be3b2c8e1afcb8439284235e372c00a93d9e98f26886e3d428d7fd30e9eaca5
+EBUILD ncmpc-0.24.ebuild 1537 SHA256 f2051d145981190cf18cea1bb78a852481640e069e5a2fb56a51661f551c81a1 SHA512 c0b7d97d7df8906fb5e92673b24f1c65a88ef46581eda75435f3d7aca4d88d66fa44c23f8affb94bc99fffd74ca3bfefd0c387011f2a45c8c6d932da930e792f WHIRLPOOL 9c4e49b49a809213b48f189f2d8306e2c76b2f5d79f745eea1c5921ef8a8be2d66ae34a5c6137f73b3e05dc372fe521a89702e6aa6b73f71f74648e1b599acae
+EBUILD ncmpc-0.25.ebuild 1758 SHA256 8b058b9924018d2e2fe3098d4b3d7857f2c0be26bef8f723d0886a9d06ada8df SHA512 c6363b5687c156b406392b3f337f0553c5ee9f8d2475bdec5bef19122627fbabf4788c9820e5bd1f1395312bb1c05cd79eee27ab64baefb3fb210063bbd2f6c8 WHIRLPOOL 9efa22cb257a3157e4146e3c7076e83ccf32e5e89138bd3e01f60262dd4c91699f28dff20b9af9d12fbd0092714fd33e7e65bedb8d090ac2a81d68dcb02b1ce7
+EBUILD ncmpc-0.27.ebuild 1559 SHA256 c49ec81ce12d60a2b2b5b08038c47b455c73666789d057f2a039e44dfc553976 SHA512 598a0e9e8ed974216259fd0a5022198b1fc853b81ef58da73274c3d6ffa97bbb447dbaa663b8dc50fae240199ec16aa3e0c6206022295e6c1adbb59e5126a695 WHIRLPOOL ad9bcb031e38f564f6ec3fca3a711ce043507723903f003aa0097a9f4ce37053ac210d130368c11ea44ba68cf396d16672030815da808f0aee6267909f9301b0
+MISC ChangeLog 3657 SHA256 615b203870712d2bb3ca1652bd31ac524c944d4f18f2d80e05f5874f0b3c563b SHA512 aeb56ec9a6445fa7d56dedcf0898bf94520f8b26929618316c1e8e31099e5f27a2666578ba7104c1df19171aa2b7cd0b53d8dceb41ad93e9f1e936ab8cebf8c1 WHIRLPOOL 7dbc44cba2bcf4d81731a460ec5a10f9e0541e08658f99d8160cca9bf11be352cd9104bc28a29600e66654f674c868095b9f5b5cd79d06c3dfd481240bbbc20f
+MISC ChangeLog-2015 11475 SHA256 dda973a51dbfaf94b02a7ca9ee1949a83504889b1bfee6bb450af9453ff42e11 SHA512 037839b8616059c56188efccf64f655b491b3f1715a4f51f98fb97f0e2959fa3e9f3956e92899269253fa8ff65c8bd3a89cf8302720f348f1476f7ac579683f5 WHIRLPOOL d715b7d01566de3b91bd9ffb58f80545fe95c40ae657444466651c526fa5d3015475dfe56297fe4532bae9db62d01e515a4ea3675abf4c44ff784ab46dece363
+MISC metadata.xml 868 SHA256 ec6142b3a1d299c4eb9d969b7323ba0f19b26863977ba8426aaeb0bc5bbd187c SHA512 835dff8f4b6427a48fdd117631ca4363a28ba8601873d51382b1687e55bf7d2ce4303e40e794a3a85855d85a7b16ebb3e9d87b8b0d529d8e60439aa4daef86e1 WHIRLPOOL aa66525e2de803908d2dadf6da2a1a85925631bf09afa0402ccef2278edec262889004aefba8ca32c0e49454683dda2113c0b528f421cdda39cb4defb1455b2a
diff --git a/media-sound/ncmpc/files/ax_require_defined.m4 b/media-sound/ncmpc/files/ax_require_defined.m4
new file mode 100644
index 000000000000..cae11112d901
--- /dev/null
+++ b/media-sound/ncmpc/files/ax_require_defined.m4
@@ -0,0 +1,37 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_REQUIRE_DEFINED(MACRO)
+#
+# DESCRIPTION
+#
+#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
+#   been defined and thus are available for use.  This avoids random issues
+#   where a macro isn't expanded.  Instead the configure script emits a
+#   non-fatal:
+#
+#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
+#
+#   It's like AC_REQUIRE except it doesn't expand the required macro.
+#
+#   Here's an example:
+#
+#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+#
+# LICENSE
+#
+#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 1
+
+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
+  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
+])dnl AX_REQUIRE_DEFINED
diff --git a/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
new file mode 100644
index 000000000000..5c11e7682b59
--- /dev/null
+++ b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
@@ -0,0 +1,50 @@
+diff --git a/configure.ac b/configure.ac
+index 2d79f35..b82dd49 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,11 +17,8 @@ AC_CONFIG_MACRO_DIR([m4])
+ dnl Check for programs
+ AC_PROG_CC_C99
+ AC_PROG_INSTALL
+-AX_WITH_CURSES
++PKG_PROG_PKG_CONFIG
+ 
+-AS_IF([ test "x$ax_cv_curses" = xno ],
+-	[AC_MSG_ERROR([No curses support detected.])
+-	])
+ 
+ dnl =======================================================
+ dnl initialize variables
+@@ -83,6 +80,19 @@ mingw32* | windows*)
+ esac
+ AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1])
+ 
++dnl ncursesw
++
++PKG_CHECK_MODULES([ncursesw], [ncursesw],[
++	LIBS="$LIBS $ncursesw_LIBS"
++	ax_cv_curses_color=yes
++	ax_cv_curses_mouse=yes
++	ax_cv_curses_enhanced=yes
++	AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if the Ncurses library is present])
++	AC_SUBST([CURSES_LIB],[$ncursesw_LIBS])
++	],
++	[AC_MSG_ERROR([No curses support detected.])])
++
++
+ dnl multi-byte character support
+ 
+ AC_ARG_ENABLE([multibyte],
+@@ -207,12 +217,6 @@ AM_CONDITIONAL(ENABLE_HELP_SCREEN, test x$enable_help_screen = xyes)
+ 
+ dnl Optional - curses getmouse support
+ 
+-dnl AC_CHECK_LIB depends on being able to prepend a '-l', remove the '-l' from CURSES_LIB first
+-AC_CHECK_LIB([$(expr substr $CURSES_LIB 3 99)],
+-		[getmouse],
+-		[ax_cv_curses_mouse=yes],
+-		[ax_cv_curses_mouse=no])
+-
+ AC_ARG_ENABLE([mouse], 
+ 	AS_HELP_STRING([--enable-mouse],
+ 		[Enable curses getmouse support @<:@default=yes@:>@]),
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
new file mode 100644
index 000000000000..e4c0bc23acce
--- /dev/null
+++ b/media-sound/ncmpc/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="artist-screen">Enable artist screen</flag>
+		<flag name="chat-screen">Enable the chat screen</flag>
+		<flag name="colors">Enable color support</flag>
+		<flag name="help-screen">Enable the help screen</flag>
+		<flag name="key-screen">Enable key editor screen</flag>
+		<flag name="lyrics-screen">Enable lyrics screen</flag>
+		<flag name="mouse">Enable curses getmouse support</flag>
+		<flag name="search-screen">Enable search screen</flag>
+		<flag name="song-screen">Enable song viewer screen</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">MusicPlayerDaemon/ncmpc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/ncmpc/ncmpc-0.24-r2.ebuild b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
new file mode 100644
index 000000000000..5a3efcb99bf8
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.24-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="https://www.musicpd.org/clients/ncmpc/"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	>=media-libs/libmpdclient-2.3
+	sys-libs/ncurses:*[unicode]
+	lirc? ( app-misc/lirc )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
+
+src_prepare() {
+	# default ax_with_curses.m4 produces automagic dependency on ncursesw
+	# also, ncursesw is required for colors (bug #554245), so we force it here
+	epatch "${FILESDIR}"/${PN}-0.24-tinfo.patch
+	eapply_user
+
+	cp "${FILESDIR}"/ax_require_defined.m4 m4/ || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# upstream lirc doesn't have pkg-config file wrt #250015
+	if use lirc; then
+		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
+		export LIBLIRCCLIENT_LIBS="-llirc_client"
+	fi
+
+	# use_with lyrics-screen is for multilib
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable artist-screen) \
+		$(use_enable chat-screen) \
+		$(use_enable colors) \
+		$(use_enable debug) \
+		$(use_enable help-screen) \
+		$(use_enable key-screen) \
+		$(use_enable lirc) \
+		$(use_enable lyrics-screen) \
+		$(use_enable mouse) \
+		$(use_enable nls locale) \
+		$(use_enable nls multibyte) \
+		$(use_enable nls) \
+		$(use_enable search-screen) \
+		$(use_enable song-screen) \
+		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
+}
diff --git a/media-sound/ncmpc/ncmpc-0.24.ebuild b/media-sound/ncmpc/ncmpc-0.24.ebuild
new file mode 100644
index 000000000000..70a16761208f
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.24.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="https://www.musicpd.org/clients/ncmpc/"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
+IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	>=media-libs/libmpdclient-2.3
+	sys-libs/ncurses:*
+	lirc? ( app-misc/lirc )
+	nls? ( sys-libs/ncurses:*[unicode] )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
+
+src_configure() {
+	# upstream lirc doesn't have pkg-config file wrt #250015
+	if use lirc; then
+		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
+		export LIBLIRCCLIENT_LIBS="-llirc_client"
+	fi
+
+	# use_with lyrics-screen is for multilib
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable artist-screen) \
+		$(use_enable chat-screen) \
+		$(use_enable colors) \
+		$(use_enable debug) \
+		$(use_enable help-screen) \
+		$(use_enable key-screen) \
+		$(use_enable lirc) \
+		$(use_enable lyrics-screen) \
+		$(use_enable mouse) \
+		$(use_enable nls locale) \
+		$(use_enable nls multibyte) \
+		$(use_enable nls) \
+		$(use_enable search-screen) \
+		$(use_enable song-screen) \
+		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
+}
diff --git a/media-sound/ncmpc/ncmpc-0.25.ebuild b/media-sound/ncmpc/ncmpc-0.25.ebuild
new file mode 100644
index 000000000000..52a8d69391ab
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.25.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="http://www.musicpd.org/clients/ncmpc/"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	>=media-libs/libmpdclient-2.3
+	sys-libs/ncurses:*[unicode]
+	lirc? ( app-misc/lirc )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
+
+src_prepare() {
+	# default ax_with_curses.m4 produces automagic dependency on ncursesw
+	# also, ncursesw is required for colors (bug #554245), so we force it here
+	local PATCHES=( "${FILESDIR}"/${PN}-0.24-tinfo.patch )
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# upstream lirc doesn't have pkg-config file wrt #250015
+	if use lirc; then
+		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
+		export LIBLIRCCLIENT_LIBS="-llirc_client"
+	fi
+
+	# use_with lyrics-screen is for multilib
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable artist-screen) \
+		$(use_enable chat-screen) \
+		$(use_enable colors) \
+		$(use_enable debug) \
+		$(use_enable help-screen) \
+		$(use_enable key-screen) \
+		$(use_enable lirc) \
+		$(use_enable lyrics-screen) \
+		$(use_enable mouse) \
+		$(use_enable nls locale) \
+		$(use_enable nls multibyte) \
+		$(use_enable nls) \
+		$(use_enable search-screen) \
+		$(use_enable song-screen) \
+		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
+}
diff --git a/media-sound/ncmpc/ncmpc-0.27.ebuild b/media-sound/ncmpc/ncmpc-0.27.ebuild
new file mode 100644
index 000000000000..0082bd1b4363
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.27.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="http://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
+
+RDEPEND=">=dev-libs/glib-2.30:2
+	>=media-libs/libmpdclient-2.9
+	sys-libs/ncurses:0=[unicode]
+	lirc? ( app-misc/lirc )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
+
+src_configure() {
+	# upstream lirc doesn't have pkg-config file wrt #250015
+	if use lirc; then
+		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
+		export LIBLIRCCLIENT_LIBS="-llirc_client"
+	fi
+
+	# use_with lyrics-screen is for multilib
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--with-ncursesw \
+		$(use_enable artist-screen) \
+		$(use_enable chat-screen) \
+		$(use_enable colors) \
+		$(use_enable debug) \
+		$(use_enable help-screen) \
+		$(use_enable key-screen) \
+		$(use_enable lirc) \
+		$(use_enable lyrics-screen) \
+		$(use_enable mouse) \
+		$(use_enable nls locale) \
+		$(use_enable nls multibyte) \
+		$(use_enable nls) \
+		$(use_enable search-screen) \
+		$(use_enable song-screen) \
+		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
+}
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
new file mode 100644
index 000000000000..d7032d0503e1
--- /dev/null
+++ b/media-sound/ncmpcpp/Manifest
@@ -0,0 +1,8 @@
+DIST ncmpcpp-0.7.7.tar.bz2 443801 SHA256 b7bcbec83b1f88cc7b21f196b10be09a27b430566c59f402df170163464d01ef SHA512 a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034 WHIRLPOOL 49a5e16cf583424618db5e2c38a946cc60d5ea2e17015c7e6232c91f84cf44c308389b81bb2f380045f3f9595d83a13c2a4f571930ea122e85437f4e6cccb4d1
+DIST ncmpcpp-0.8.tar.bz2 464165 SHA256 2f0f2a1c0816119430880be6932e5eb356b7875dfa140e2453a5a802909f465a SHA512 b51217df85f95efa345f0484f16024bd74c1c0e22f2c2b25238335fc2f00caf81877088170f241c1d97fd328d104b19f022dc4de9895ff420f1fcbea341e7cdb WHIRLPOOL 765bd7889d16ea88a574ec9da3a3a50a68c133a51d976053cf1fe533b9a8d21da3e789e76d6c50b18190a36915e57daa7e4e1378154b79c1119068cc82be6085
+EBUILD ncmpcpp-0.7.7.ebuild 1501 SHA256 890749eece11fc7574eb05c9a3892a1b13d435679619ff179c7477bda5d26b7e SHA512 dc3691ec4e4d92f063fcccf219e3566ebc85d8b2b0bdf8134720701172108bce462ba9278b9405c556c8631df846747e5f5a2ccdfaab1b6efad58ec92e9474e1 WHIRLPOOL 560b09d84256bbae400866898cda50628fa1da089f8009674956d25e8758bb0b5ac25211ba6e243d825aaf843f404c70aa81007e87d77ec03f7e9b71d9284747
+EBUILD ncmpcpp-0.8.ebuild 1372 SHA256 3e6679a2c15606374fa55541bb1c7300c354f2f507bf1ac977d8b944a007aeb8 SHA512 221b4646fafb31d9faf4876fedd0c2e52418f8a8a6e448985076cf4f862a9d1e58aa3d749790488731a1c12443b2bbb1b6a0e7a1f02fab78c6cf3b5568bc3d31 WHIRLPOOL 6dae7e2127f535f219c31701e4656053d4ae40d72a78462ce91689a873613099bed1ada6072623446229b041e9c0f4156472b0cf2d2bbc10887041094e0c3f5b
+EBUILD ncmpcpp-9999.ebuild 1361 SHA256 f069fcfbf0c24ca5943a781fbbffdd900c17803bfc56be51811d86a31c2fbfd7 SHA512 8c126b75c5ce753b537b43aae6f665258c80954900d9ae61e48e89e45860e247425fd01ef77c3707ed66db97863330a27d33d2191020684394cd60e20246b505 WHIRLPOOL b581348f38ba905f8c4a192ddc829868f45b846bdd0c430cb919bd46d494e2f716648dbce8fd803547d192e2521a1f768ced259010638017fa76e229e09a8c6e
+MISC ChangeLog 11907 SHA256 f0ff7ef7493e024bc5fe3aa210666889c49ec8fd7f1607d23234b1a319dbc198 SHA512 cfe59004afc004d5556968309c0267fbabe80fb73419df7c297a2dc8c4f4e3c3aefc036720328a9c3d05cef6cd26cec7d83ce96c74678c581e68a297471e5b35 WHIRLPOOL 138c2a9d65244dadfc4904f00ad4763d3626a9d36506eea53fff072522c28ad3f5ec37a06a091fada0a701963be926bb19d455a9df4a9633cd4526adc9d7f783
+MISC ChangeLog-2015 14896 SHA256 9e9898e4312701df7ef3214e09bbb5ddbf85f0a847d450dce62fa437d066ad3f SHA512 57a13bb54c537e20ad86dca2c7916a01298f57d6d4652f95a467a6706343ccdee4e7f9d3e2cb83ff88ea3cddd1613d5e4aad2300a7004ab97e7b58b662c0af6a WHIRLPOOL 6dcead7611301385cf40a567bfb998739266fb928f1850fba5f5d52c6545cefa508cd71864476adb702e7c98f67ef525dff2082e3c3cca4ac9bca3f779e05597
+MISC metadata.xml 1174 SHA256 3b582409294d8085d7a5f013dce2086292a956dd66df435251575080131798c9 SHA512 4c212ee37621f97c0519a842878764a6fe8c44b17af68747cbfb6965cf5419b00c87bfe11a01b6964e4c5f6818acdc583c277c5cab81bd0de392ef4945a5523f WHIRLPOOL f69d138714046a686431d30539cc53e966f843fbf3b2f91bed207f752eff06a36c6e32776688f0854d3dfaf342f068409a4e0be2d2851ca76679a23cd43b823c
diff --git a/media-sound/ncmpcpp/metadata.xml b/media-sound/ncmpcpp/metadata.xml
new file mode 100644
index 000000000000..b19eb817aa0f
--- /dev/null
+++ b/media-sound/ncmpcpp/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="clock">Enable clock screen</flag>
+		<flag name="outputs">Enable outputs screen</flag>
+		<flag name="visualizer">Enable visualizer screen with sound wave/frequency
+			spectrum modes</flag>
+	</use>
+	<longdescription lang="en">
+	A featureful <pkg>sys-libs/ncurses</pkg> based <pkg>media-sound/mpd</pkg>
+	client inspired by <pkg>media-sound/ncmpc</pkg>
+
+	Ncmpcpp is very similar to ncmpc if it comes to user interface, but it
+	provides a lot of new useful features. 
+
+	Main new features:
+	 * tag editor
+	 * playlist editor
+	 * easy to use search engine
+	 * media library
+	 * music visualizer
+	 * ability to fetch artist info from last.fm
+	 * new display mode
+	 * alternative user interface
+	 * ability to browse and add files from outside of MPD music directory
+	 ..and a lot more minor convenient functions.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
new file mode 100644
index 000000000000..85d189cdcd0a
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="https://rybczak.net/ncmpcpp/"
+SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
+IUSE="clock curl outputs taglib unicode visualizer"
+
+RDEPEND="
+	!dev-libs/boost:0/1.57.0
+	>=media-libs/libmpdclient-2.1
+	dev-libs/boost:=[nls,threads]
+	sys-libs/ncurses:=[unicode?]
+	sys-libs/readline:*
+	curl? ( net-misc/curl )
+	taglib? ( media-libs/taglib )
+	unicode? (
+		dev-libs/boost:=[icu]
+		dev-libs/icu:=
+	)
+	visualizer? ( sci-libs/fftw:3.0= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable unicode) \
+		$(use_enable visualizer) \
+		$(use_with curl) \
+		$(use_with taglib) \
+		$(use_with visualizer fftw) \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	dodoc doc/{bindings,config}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.ebuild
new file mode 100644
index 000000000000..937bcfe975bf
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="https://rybczak.net/ncmpcpp/"
+SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clock outputs taglib visualizer"
+
+RDEPEND="
+	!dev-libs/boost:0/1.57.0
+	>=media-libs/libmpdclient-2.1
+	dev-libs/boost:=[nls,threads]
+	net-misc/curl
+	sys-libs/ncurses:=
+	sys-libs/readline:*
+	taglib? ( media-libs/taglib )
+	visualizer? ( sci-libs/fftw:3.0= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable visualizer) \
+		$(use_with taglib) \
+		$(use_with visualizer fftw) \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	dodoc doc/{bindings,config}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+}
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
new file mode 100644
index 000000000000..1a95c8ad5fb6
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools git-r3
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="http://ncmpcpp.rybczak.net/"
+EGIT_REPO_URI="git://repo.or.cz/ncmpcpp.git"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS=""
+IUSE="clock outputs taglib visualizer"
+
+RDEPEND="
+	!dev-libs/boost:0/1.57.0
+	>=media-libs/libmpdclient-2.1
+	dev-libs/boost:=[nls,threads]
+	net-misc/curl
+	sys-libs/ncurses:=
+	sys-libs/readline:*
+	taglib? ( media-libs/taglib )
+	visualizer? ( sci-libs/fftw:3.0= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^docdir/d' {,doc/}Makefile.am || die
+	sed -i -e 's|COPYING||g' Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable visualizer) \
+		$(use_with taglib) \
+		$(use_with visualizer fftw) \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	dodoc doc/{bindings,config}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+}
diff --git a/media-sound/neroaac/Manifest b/media-sound/neroaac/Manifest
new file mode 100644
index 000000000000..9ff49a7ecf25
--- /dev/null
+++ b/media-sound/neroaac/Manifest
@@ -0,0 +1,5 @@
+DIST NeroAACCodec-1.5.1.zip 2050564 SHA256 e0496ad856e2803001a59985368d21b22f4fbdd55589c7f313d6040cefff648b SHA512 7ceeb56a32b488fbb609eeb52a896bb4ab447c13769f765dcc50361093482e9d42f15ac42eb6be428a210b12fd31aedbff588232a7e268c88dd4d97f9ab191ef WHIRLPOOL 1e03fe8255b7aeaaf5d17b7230e30a3a4e843879ff1083d8fc39f1fa4fd11b5384d643f9a329eacd5272f2ce0f82f4dbbe41ac6b231591dfda220777ba9270b1
+EBUILD neroaac-1.5.1.ebuild 1076 SHA256 e89c4ee2e3ea908ffc476ddd71d0c5f230ec2d9e044d47fbab94f5c819d284d0 SHA512 10fa7be4ef62ff368164d8fd16e55e9914cdb63fe5dbefa6179d9ca96aceb29838ba5bfbcb6154861ddf765a77913afcaf1fe49b52d767ee7b8e369813aa6389 WHIRLPOOL eb9d64e21a779a9cf8c83d714d9f2510341c624ff585e01fe94b10837117e384384ab0b207251a7aa603c9f2e2b04fb20e4fa66c9a6fff0e8f20a6e2d6b1b34c
+MISC ChangeLog 2525 SHA256 6141716fb074a564c1403f49fc6cbe98d18ef258d178899fc0175665c64e3fc4 SHA512 c81ac9898b7179f02985265a1bcfd58c8d009a166e0d6a1c91feb1f4853508ea4d97348585bbca187aae0799b252c806ed369659504a8348f28bac428dc2757a WHIRLPOOL b9c4f9d973d55918055db989e173f29b448945aa2b86be5b4defa7753d0b8cd3bcfb9abbc86a6868c0cc6a253d44f433e2d8df59452cc2f0d230cc055da5814d
+MISC ChangeLog-2015 761 SHA256 14440f66c230d185c908830d887fa6da6ebfb0bb06e134a025c2d8d89f5d712f SHA512 130379cf99fed0739ae691a9f367d3b8baa06cc3bd7176c57d583e00b4836029fcffb666f11d424a69e782ea19123282fbc441bdaf5fa0587c62b8a5326b1900 WHIRLPOOL 719e001b4fdca634d896f3035aafb4dbc96858dd9e290ed7e66dab7716bd46815b56ac5e0e990280402932d20e80bd6b0170951e7510b46f38c3f5ee13b49065
+MISC metadata.xml 274 SHA256 765d3e85ab275e610bb466183a62d1ae3b5acaa5b1f5852e4db10a393663557e SHA512 91cd3c489d25085a58773f40f6c1a481e9057ce95e4e2813b7127215ce5282d8104574c8b6939c22795c13f1a14c4d2ab85d75c4a8c08cf669bf94049ce6493f WHIRLPOOL 80621a045b448748e0ad15b159addd349115189bb7db2df02762b0fedd7c893f1cbdf5b522adc8c033a836df90be8ef1acbddf93af5fff4af5bedd1aa8f0ffc7
diff --git a/media-sound/neroaac/metadata.xml b/media-sound/neroaac/metadata.xml
new file mode 100644
index 000000000000..ddd95185c8e4
--- /dev/null
+++ b/media-sound/neroaac/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		Nero AAC reference quality MPEG-4 and 3GPP audio codec.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/neroaac/neroaac-1.5.1.ebuild b/media-sound/neroaac/neroaac-1.5.1.ebuild
new file mode 100644
index 000000000000..a47f7908faba
--- /dev/null
+++ b/media-sound/neroaac/neroaac-1.5.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Nero AAC reference quality MPEG-4 and 3GPP audio codec"
+HOMEPAGE="http://www.nero.com/enu/technologies-aac-codec.html"
+SRC_URI="http://ftp6.nero.com/tools/NeroAACCodec-${PV}.zip"
+
+LICENSE="Nero-AAC-EULA"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="app-arch/unzip"
+
+RESTRICT="strip mirror test"
+
+QA_PRESTRIPPED="opt/${PN}/${PV}/neroAac\(Dec\|Enc\|Tag\)"
+QA_EXECSTACK="opt/${PN}/${PV}/neroAacDec opt/${PN}/${PV}/neroAacEnc"
+QA_FLAGS_IGNORED="${QA_PRESTRIPPED}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	edos2unix *.txt
+}
+
+src_install() {
+	exeinto /opt/${PN}/${PV}
+	doexe linux/*
+	dodir /opt/bin
+	dosym ../${PN}/${PV}/neroAacDec /opt/bin/neroAacDec
+	dosym ../${PN}/${PV}/neroAacEnc /opt/bin/neroAacEnc
+	dosym ../${PN}/${PV}/neroAacTag /opt/bin/neroAacTag
+	newdoc readme.txt README
+	newdoc license.txt LICENSE
+	newdoc changelog.txt ChangeLog
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins NeroAAC_tut.pdf
+	fi
+}
diff --git a/media-sound/neutrino/Manifest b/media-sound/neutrino/Manifest
new file mode 100644
index 000000000000..c212d52c270d
--- /dev/null
+++ b/media-sound/neutrino/Manifest
@@ -0,0 +1,6 @@
+AUX neutrino-0.8.4-glib-single-include.patch 3846 SHA256 fe459b9f80a5934fd085c45c98aaf2316c9148bdfaae1d27de6de34248500d02 SHA512 ea51b856120c06b70f81779fb82aaf0c53867fc2654e46815b8cc08fa7d7deaef54a5ea51231dc1053febe97aaab92783c11cddc0a55faf013c86a344f161d5f WHIRLPOOL 6da6d7521e5444de24776352b58c4aed05b496fc5fd1e9e58a066661534a4975e4e19b948214d641be57d54c6b5edb27e4b54492d97c7b24087e679a7dae46e8
+DIST neutrino-0.8.4.tar.gz 497660 SHA256 8a5bb9634ff0fa618a13b6160a0527a86c68cc71dac751c8401190f55bcbdfff SHA512 f36cc682e59565f0d3e64068a20d51396d824db8f65654d3ff0727d7e107f71a0f9590f78b220716caa8e67edb91aa234894f4b656a3dce60aab5cd950cff0c8 WHIRLPOOL dbd14a650e60f9172bd041b8fdb9459e50941749b6fa8fb999c1101119407c25a7aa9667359e74bf93f295ed8c4676192853fd737b9f559aaca5aed143f48a19
+EBUILD neutrino-0.8.4.ebuild 750 SHA256 6255231a1a48a278c98289216627a19ee1a7e2ea101e7d944a511656dda6e21e SHA512 ff1ddaf59425401cb080babbcb8b55a6e012d29b1fb43f2931ce11b4415ebab02ea95fb8d25809567a749eb832ae10de8f211110f622b51b78291320e949b48b WHIRLPOOL 49be5d1d68eb2c4a3b41e086cb1b2d276833213d01c770047a350d5099d2ddd9a1e02b918fdeca0e0bc729b3374266c0d5def85ae26ac82aadbaf0aee3c7ba9f
+MISC ChangeLog 2638 SHA256 c773461e35e8fe1d773c60be546c5b5c6ea96c2e551acd24aaa6856b84fb0d7c SHA512 7dfd5acfeb42f0685c4919e73d8c21ed8123f3b767480e7d8369703de78b3c6d4211647f0066252867e97869d09367daca855ce5f18a4b936b216928bd033a22 WHIRLPOOL ad4861aeb82405d8b8e4a6ecead819f068a68130779d8770fc2af8d7d514620684361b604083857f9a8a6d2ac6d3e3770cf8d03e63663e70f4b92a8cce90b3f9
+MISC ChangeLog-2015 1062 SHA256 714cfeda81af310c4e531a028d8088a8e017a63684db1cd7e312b6ba58831e93 SHA512 fb38310db94a6d59c5dbd26965b309808cb24e1a677f69b1427b1b3086f48b52a1cb5c9d94edbb57bb68e147c852bd0f3ae7d19f0f51c9fdaab8628c4a619a1f WHIRLPOOL e3c7831e1e06f735a0c28e100b475c0821734bcea072b611f6efde0dae86e96fe989fe5947309557d41c21b9117b6eb2a67ea06e4465e07be237ef6fe5eed713
+MISC metadata.xml 453 SHA256 a31dd60560c29217fc679eb983a153bd608f7ffa210da6e424345b31906f5c17 SHA512 d0e13e1f8467d9a0cd41e00e3bc12dff8116517ab6a4747f94ab3c3691dd7d603728cc1f7e03dd9698ebb8aa586348d80eb480da808cc0e4cfe1e6daf5dbe3d5 WHIRLPOOL 1fd48ef9a369ff9e858d50484dd70acff66492887a52969274c7973636df1dcf6070c1109fd6fd38b4024f5d16f57790c6da186f2ce8576d200754b38ea379de
diff --git a/media-sound/neutrino/files/neutrino-0.8.4-glib-single-include.patch b/media-sound/neutrino/files/neutrino-0.8.4-glib-single-include.patch
new file mode 100644
index 000000000000..1d2558dc9313
--- /dev/null
+++ b/media-sound/neutrino/files/neutrino-0.8.4-glib-single-include.patch
@@ -0,0 +1,148 @@
+Index: neutrino-0.8.4/id3/nomad-id3-util.c
+===================================================================
+--- neutrino-0.8.4.orig/id3/nomad-id3-util.c
++++ neutrino-0.8.4/id3/nomad-id3-util.c
+@@ -26,15 +26,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#include <glib/gconvert.h>
+-#include <glib/gunicode.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ 
+ #ifndef HAVE_GNOME_VFS
+ 
+-#include <glib/gfileutils.h>
+-#include <glib/gdir.h>
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
+Index: neutrino-0.8.4/id3/nomad-id3.c
+===================================================================
+--- neutrino-0.8.4.orig/id3/nomad-id3.c
++++ neutrino-0.8.4/id3/nomad-id3.c
+@@ -30,10 +30,8 @@
+ #include <libgnomevfs/gnome-vfs-file-info.h>
+ #endif
+ 
+-#include <glib/gconvert.h>
+-#include <glib/gunicode.h>
++#include <glib.h>
+ 
+-#include <glib/gtypes.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+Index: neutrino-0.8.4/libnomad/nomad-jukebox.c
+===================================================================
+--- neutrino-0.8.4.orig/libnomad/nomad-jukebox.c
++++ neutrino-0.8.4/libnomad/nomad-jukebox.c
+@@ -27,8 +27,7 @@
+ 
+ #include <string.h>
+ 
+-#include <glib/gqueue.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ 
+ #include <semaphore.h>
+ 
+Index: neutrino-0.8.4/libnomad/nomad-util.c
+===================================================================
+--- neutrino-0.8.4.orig/libnomad/nomad-util.c
++++ neutrino-0.8.4/libnomad/nomad-util.c
+@@ -31,15 +31,10 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+-#include <glib/gconvert.h>
+-#include <glib/gunicode.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ 
+ #ifndef HAVE_GNOME_VFS
+ 
+-#include <glib/gfileutils.h>
+-#include <glib/gdir.h>
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
+Index: neutrino-0.8.4/src/neutrino-file-browser.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-file-browser.c
++++ neutrino-0.8.4/src/neutrino-file-browser.c
+@@ -25,9 +25,7 @@
+ 
+ #include <config.h>
+ 
+-#include <glib/gutils.h>
+-#include <glib/ghash.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ 
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+ #include <libgnomevfs/gnome-vfs-mime-utils.h>
+Index: neutrino-0.8.4/src/neutrino-jukebox-view.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-jukebox-view.c
++++ neutrino-0.8.4/src/neutrino-jukebox-view.c
+@@ -27,7 +27,7 @@
+ 
+ #include <gdk/gdk.h>
+ 
+-#include <glib/gmarkup.h>
++#include <glib.h>
+ 
+ #include <string.h>
+ 
+Index: neutrino-0.8.4/src/neutrino-util.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-util.c
++++ neutrino-0.8.4/src/neutrino-util.c
+@@ -26,16 +26,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#include <glib/gconvert.h>
+-#include <glib/gunicode.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <gtk/gtkwidget.h>
+ 
+ #ifndef HAVE_GNOME_VFS
+ 
+-#include <glib/gfileutils.h>
+-#include <glib/gdir.h>
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
+Index: neutrino-0.8.4/src/neutrino-wav.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-wav.c
++++ neutrino-0.8.4/src/neutrino-wav.c
+@@ -28,7 +28,7 @@
+ #include <libgnomevfs/gnome-vfs-ops.h>
+ #endif
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ 
+ #include <libnjb.h>
+ 
+Index: neutrino-0.8.4/src/neutrino-window.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-window.c
++++ neutrino-0.8.4/src/neutrino-window.c
+@@ -34,7 +34,7 @@
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+ #include <libgnomevfs/gnome-vfs-utils.h>
+ 
+-#include <glib/grand.h>
++#include <glib.h>
+ 
+ #include <gtk/gtk.h>
+ 
diff --git a/media-sound/neutrino/metadata.xml b/media-sound/neutrino/metadata.xml
new file mode 100644
index 000000000000..11cae739a4e1
--- /dev/null
+++ b/media-sound/neutrino/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">neutrino</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/neutrino/neutrino-0.8.4.ebuild b/media-sound/neutrino/neutrino-0.8.4.ebuild
new file mode 100644
index 000000000000..47c47a24bc56
--- /dev/null
+++ b/media-sound/neutrino/neutrino-0.8.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A GNOME application to manage Creative music players using the PDE protocol"
+HOMEPAGE="http://neutrino.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libglade-2
+	dev-libs/libxml2
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/gconf-2
+	>=media-libs/libnjb-2.2
+	>=media-libs/id3lib-3.8.3-r6
+"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	virtual/pkgconfig
+	dev-util/intltool
+"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+PATCHES=( "${FILESDIR}/${PN}-0.8.4-glib-single-include.patch" )
diff --git a/media-sound/normalize/Manifest b/media-sound/normalize/Manifest
new file mode 100644
index 000000000000..ac601b42b706
--- /dev/null
+++ b/media-sound/normalize/Manifest
@@ -0,0 +1,7 @@
+AUX normalize-0.7.7-audiofile-pkgconfig.patch 1865 SHA256 cb39b0b0ddcdac6b87fc1329307f7c8f2c15fc2d6718823b6d8d46ab1a0b84b8 SHA512 bf8b4fdd3ba9629cefba6eecc3db21b3fe9129429a8df1fcc7794f3eb6e802f1939d0ec23863bf91edecd94651a70f798d6888f0b94b39664b53acf68b737967 WHIRLPOOL 9cb132d3f16565701a001ad077fbd321817ed66463ee574bfa8e134721cd979fdd44b6ae0fa8622328765b3ed9941d1a6a7a93c6657ac41c1dbad716e9558d1b
+DIST normalize-0.7.7-m4.patch.gz 5078 SHA256 8ac7d9e980f2534f7f2f7c81a7fc9f5dda90ac60cfe6675785f371a43ef6518a SHA512 a06d3a51557a0c54e1ff2d0eaec0a8ad51b0faf1457393f2c9207fd428d58e21ecbcbfbab59a15e9fcc59d6ec2dbf91fe78802a67d533a1f90cc6e46205d39f7 WHIRLPOOL dc0a73414fb58cddfcd5986c366b1501fc737f3f49f8a5ca039fc57c8d26bfb31daccef8ec9b1e3cfbb6f19035dd3a366b462247ac6c61e54e9eecac9c1acbc3
+DIST normalize-0.7.7.tar.bz2 388777 SHA256 ef9d8558515cc942518981d3db8fa2490fba6d6b5b74e0a3b75336fbc66c6bd8 SHA512 5fb2265eac93b243682cedb955d2ddfe05f55cafdeb1d757aaef0afb36bc9907ea3321b8554e128f6228bdeeaeef96e3e9ba000d0ad84282cc76a50b3e460ce4 WHIRLPOOL 8ea93d08cd9c9f6c2f538558a9ffe71354b18f3a7274b2180a40562a01f22418a16d8255b3f859b2e98f1f042f820a2d55600c4690ff643d9a2c597469a823b5
+EBUILD normalize-0.7.7-r1.ebuild 916 SHA256 9ab9bbf1377a7cb550b6e14d7ba0b2aa176f912ccf394d29c9317be037d49434 SHA512 cc6097ce3d9015ba33d67df13e47127877acf570eb3a3ccc93a0ae72f8023a25b5188fce9c00c353e14b016cf8a5aa6b68fa172cb37c23efd4dc102cf7794653 WHIRLPOOL e59b56f148382ffe6b14e84c6d7629b8364933dee1d209c3af1426c8f033c266404113568e202438cd95fbee5f4687cd6e08d1799197ecc90c0af75422ea72cd
+MISC ChangeLog 2634 SHA256 02f92f0167f761ee2e01b23b8af6a0e680a2bbc126614c9a669a231c3a9e1b74 SHA512 d6f3419ae9475469570737f7efb8ce45722be57e10afdab69435f12c37817db95c5e1656fb5442173f54adfe5f11d99b6d801f23c5d07f4176e22c0d1d29c8c9 WHIRLPOOL 16794c6f4b6c15df8971c5b895010ba1e9c3063e013559830d9c42b288e7323b853e5869b24769baebb7340d58df6701aa8232a14c4bf966a5d984a0d4edb9ce
+MISC ChangeLog-2015 4570 SHA256 9d585b9c34aa54e0dafda90b38a5189a0577a14e452e5b26d2527011affc486f SHA512 7a044346522fedd085a1dcb7036703bb6c4a8a4bbb11ce27b38081be6cbaaf2956607614b105092db1538c466c2c7ee10697ff00cb4f2a32baffa51839bc9033 WHIRLPOOL ef352407666bf65c278e739996051ceb8fedfaccf2254b8302f17a03cb159ea56adb713cb0b986fe07d0b27fc04bda22f64a3733def63db77ff51168326fddd5
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/normalize/files/normalize-0.7.7-audiofile-pkgconfig.patch b/media-sound/normalize/files/normalize-0.7.7-audiofile-pkgconfig.patch
new file mode 100644
index 000000000000..09f211cdfb66
--- /dev/null
+++ b/media-sound/normalize/files/normalize-0.7.7-audiofile-pkgconfig.patch
@@ -0,0 +1,55 @@
+Use pkgconfig to check for audiofile since the audiofile-config script was
+removed from >=audiofile-0.3.0.
+
+--- normalize-0.7.7/configure.ac.orig
++++ normalize-0.7.7/configure.ac
+@@ -248,33 +248,16 @@
+ 
+ 
+ dnl *** Stuff for audiofile library ***
+-dnl v0.2.1 and before have bugs with 24-bit LE files
+-AM_PATH_AUDIOFILE([ 0.2.2 ], [ have_audiofile=true ])
+-dnl AC_CHECK_LIB(audiofile, afSetVirtualSampleFormat, have_audiofile=true)
++AC_ARG_WITH(audiofile, AC_HELP_STRING([--with-audiofile],
++		   [use the audiofile library (default yes)]))
+ AH_TEMPLATE([USE_AUDIOFILE],
+ 	    [Define if you want to use the audiofile library.])
+-AC_ARG_WITH(audiofile,
+-    AC_HELP_STRING([--with-audiofile],
+-		   [use the audiofile library (default yes)]),
+-    [ case "$withval" in
+-	  no) with_audiofile=false ;;
+-	  *) with_audiofile=true ;;
+-      esac ])
+ 
+-use_audiofile=false
+-if test x$with_audiofile != xfalse; then
+-    if test x$have_audiofile = xtrue; then
+-	AC_DEFINE(USE_AUDIOFILE)
+-	use_audiofile=true
+-dnl	AUDIOFILELIBS="-laudiofile"
+-    elif test x$with_audiofile = xtrue; then
+-	AC_MSG_ERROR([--with-audiofile specified, but audiofile library not found])
+-    fi
+-fi
+-dnl AC_SUBST(AUDIOFILELIBS)
+-test x$use_audiofile = xfalse && AUDIOFILE_LIBS=
+-test x$use_audiofile = xfalse && AUDIOFILE_CFLAGS=
+-AM_CONDITIONAL(AUDIOFILE, test x$use_audiofile = xtrue)
++AS_IF([test "x$with_audiofile" = "xyes"], [
++    PKG_CHECK_MODULES([AUDIOFILE], [audiofile])
++    AC_DEFINE(USE_AUDIOFILE)
++])
++AM_CONDITIONAL(AUDIOFILE, test x$with_audiofile = xyes)
+ 
+ 
+ dnl *** Stuff for mad mpeg audio decoder library ***
+@@ -330,7 +313,7 @@
+ 
+ echo
+ echo "Configuration:"
+-echo "    audiofile library:         $use_audiofile"
++echo "    audiofile library:         $with_audiofile"
+ echo "    mpeg audio support:        $use_mad"
+ echo "    xmms volume adjust plugin: $use_xmms"
+ echo
diff --git a/media-sound/normalize/metadata.xml b/media-sound/normalize/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/normalize/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/normalize/normalize-0.7.7-r1.ebuild b/media-sound/normalize/normalize-0.7.7-r1.ebuild
new file mode 100644
index 000000000000..29194b93ee44
--- /dev/null
+++ b/media-sound/normalize/normalize-0.7.7-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="Audio file volume normalizer"
+HOMEPAGE="http://normalize.nongnu.org/"
+SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.bz2
+	https://dev.gentoo.org/~radhermit/distfiles/${P}-m4.patch.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="audiofile mad nls userland_BSD"
+
+RDEPEND="mad? ( media-libs/libmad )
+	audiofile? ( >=media-libs/audiofile-0.3.1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+src_prepare() {
+	use userland_BSD && sed -i -e 's/md5sum/md5/' "${S}"/test/*.sh
+
+	epatch "${FILESDIR}"/${P}-audiofile-pkgconfig.patch
+	epatch "${WORKDIR}"/${P}-m4.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with audiofile) \
+		$(use_with mad) \
+		$(use_enable nls) \
+		--disable-xmms
+}
diff --git a/media-sound/nted/Manifest b/media-sound/nted/Manifest
new file mode 100644
index 000000000000..af60ab805b1c
--- /dev/null
+++ b/media-sound/nted/Manifest
@@ -0,0 +1,11 @@
+AUX nted-1.10.18-automake-1.12.patch 360 SHA256 096dd97f53fcb99ab104574d03ea5eb8092cf5d3d3a013e2fa0cada11f4ca0d3 SHA512 2651b2e6330b6adb7c0877ed14ed351a7c96439da7f6bb283d1de30a119242fba7bb690586d83d99363084e8f3cc285e3a78ae45b6743e81682af1afeca43201 WHIRLPOOL e34b2604045dfed84e3e6e100ff5b281b9b0ff0f669542928b1d2ed71d57fdc6a3b6afc6ff64191a5f05997e718a311d29f9bf625037dc2a5bb221a984c59d65
+AUX nted-1.10.18-cpp14.patch 394 SHA256 e9a9080a1e81b347962177df92ec6c4c4b1d974da523e51a7cb7f5db799500b9 SHA512 a9abbe0da5bb968ee99f4560285b54f58f98f2727289f235717c58b96ab57f7728cde950f6c7daf44d2545cd5c2eaaeb37ade4f42daeeb92565cff318a1b2a46 WHIRLPOOL a193f431e47c54ede09a96bfccbcca8bfee2520862d747be7d310f1a39c9b527f7d0ed6a25e0f505c5860492e2513d810b3fe73cfb31eb13f36559cd31605637
+AUX nted-1.10.18-freetype.patch 274 SHA256 f912a7905932f2e847ba690a7aa1e4abbe459059887d4ebe222384aea2e43b6d SHA512 37da4f0ab97aaa0eb0f32d836d085dc8bf0310bd7aff40b273697815b3ddf8c6ec035a29b3e556eec892a38f2d64a19a06530dc6c133c29964704fa16a208a3b WHIRLPOOL 07ac0c293e08e9cc4c14232fa6b2c42b41a27ca1f4e36c10df639ca220c26065c5b417c699b376b5e3a631d8b0d86cfad7ff3819f2461e54b7c95dc85a978081
+AUX nted-1.10.18-gcc47.patch 380 SHA256 bd805943c7c01676e92fa469e0541db1525f8dfeb4de3ebcca75438ffd06a2a1 SHA512 d3e390cfc387b12d2cded614b8f40001f9c03002f7da03e1c61a5c490df4a4327263393ced492e204416e006c37278429db2a825d5498b65fd2ad450df256ce0 WHIRLPOOL 76ad3e2f1f1562e1e4720ffa951c368ce9b2ab1635fd1906faa927a02df9850f18c418895d15cb6ca36cbd9449f3f907dbf29500aaf94d359210aeaf6bbcd46f
+AUX nted-1.10.18-lilypond-tremolo.patch 1487 SHA256 b50d328b1924afa17ab7e9ccbd193dfd1bb4ed600d16a9fc73b3bcee23cced5f SHA512 f30cc982ce656d45579cf8af276d71f053de4e8cf403aa21d8edbf990b6a1aa90651d3e887451a2d90f5c91a09532aacc5c5aba15c3ff6d1d25792dd4ced8cf1 WHIRLPOOL 0b6a206099925302e6aa62923024b1e1022c27f7a2cc26ef08aeffba9265f1c4af588aad8cc6ce4e095dbf58501662fc4aa4f209fd8e1238ba4e7cd84b4d663a
+AUX nted-1.10.18-lilypond.patch 2317 SHA256 09bfeb1a8f8c1c4617612251b1a0e8c5ff25a7c57fcad938206faba94d49b9ba SHA512 c6414281c4eee507ab1d3a5499f6b21a0f84bbc94a6c187ec31dae899342e7a3b3b50d7b667eff6f65777682e362c8f9a7885473733f93bd805f66b1f78ead66 WHIRLPOOL e81df81d20ff57ec275f2fa35f7f1d16183ee6acbea275c8df35ef28969bb75d5022b0b4cccb5e7bf70d5c189b21ba45bcdfb45210abdf275782e87ee2a03289
+DIST nted-1.10.18.tar.gz 4099835 SHA256 808df3c851dbc4b24efdbf96c4e6ed28152deb301c4373268831f2a243e8f1ac SHA512 adf5b53afc9017f5fc89524c5b26e16acffd142da98296c598fa53259bb88770a7a2a1f527729adcff4819177173c4ffff90096c577d42534ea9721ecd964981 WHIRLPOOL b450a8082fd95aa2e2cc40122197c528b3500e082d09ee6c9860d0b7290aa8d723ee07c019d4d034afd2e33e648bbc0c29672f1c9a98d88a9788377a8a2a7ff0
+EBUILD nted-1.10.18-r3.ebuild 1868 SHA256 7aa58d2e82674a981d296487fa448fe1cdb8cd2e474d664fa43125b04b1d6d76 SHA512 0a260f33268a17a804c68271ca513b065097d9aca2bc3800a00c633df6abc2cb04ad12409bbfc902d8a3eef138bab5e75f430d53fdadfe0af4be85097ce70d9d WHIRLPOOL aef78affe3166803bf358fccd91dffb90bed427f4660e678bf01af7ea33c23254c502cab7023f52012368d61aa0b0a7fb19fbb9967ce9bd67741c313aac76463
+MISC ChangeLog 3229 SHA256 525ab87304b8ad12333d726e8ab54f96d20080657b01ea580c4965ab48e15e8f SHA512 dd1d7240306bf674bd08ea5cee5dc3ce6f356cd3a8524533854882d73a53cd74086efb2c112370138bced2aa348d60caae090670fda687280406bdd2eaf25f32 WHIRLPOOL 4ce64e25877963a9fd6ea40bb92924b7345df46c38139144472e919796dd11ee0f8b3b384c1949057897b6826464583bdbce3cbd5abd098aa17d6055eaa87bf1
+MISC ChangeLog-2015 7849 SHA256 e8ecbe43739e99443a6243816e0c23f738925fdcf10a09fb3faa94f2aac81f9b SHA512 d463b1059eb4a9789ec195a8790a124b3adaaa31bc445e9aeeb333ac744ecbf5c8b5303e770a258ef85137755fba311da7fceaad6317b961376e2432b4894e27 WHIRLPOOL a36ac024e35563341445ad88ba27c15f1bddfba05405db98ea2b60ae2333f0d574146556175edd11d2dd27fe41bc7add79460aea4e2617158f7ffe6bff956eea
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/media-sound/nted/files/nted-1.10.18-automake-1.12.patch b/media-sound/nted/files/nted-1.10.18-automake-1.12.patch
new file mode 100644
index 000000000000..0363e06ea6cd
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-automake-1.12.patch
@@ -0,0 +1,11 @@
+--- configure.in.dist	2011-01-27 13:10:04.000000000 +0000
++++ configure.in	2013-03-07 23:17:13.529353811 +0000
+@@ -12,7 +12,7 @@
+ AC_INIT([nted], [1.10.18], [nted-user@tu-chemnitz.de], [nted])
+ AC_CONFIG_SRCDIR([beaming.h])
+ AC_CONFIG_HEADERS([config.h])
+-AM_INIT_AUTOMAKE([-Wall -Werror 1.10 foreign])
++AM_INIT_AUTOMAKE([-Wall 1.10 foreign])
+ 
+ AC_PROG_CXX
+ 
diff --git a/media-sound/nted/files/nted-1.10.18-cpp14.patch b/media-sound/nted/files/nted-1.10.18-cpp14.patch
new file mode 100644
index 000000000000..04a2a15977e0
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-cpp14.patch
@@ -0,0 +1,11 @@
+--- idiotseditor/idiotseditor.cpp.dist	2016-09-18 10:47:58.933319888 +0200
++++ idiotseditor/idiotseditor.cpp	2016-09-18 10:48:28.852321336 +0200
+@@ -2538,7 +2538,7 @@
+ 
+ #define BAR_COLOR 0, 0, 0
+ #define NOMINATOR_COLOR 0, 0, 204
+-#define HALF_COLOR 0.0, 26, 153
++#define HALF_COLOR 0, 26, 153
+ #define QUARTER_COLOR  0, 51, 127
+ #define EIGHTS_COLOR 127, 77, 102
+ #define COLOR_16 0, 102, 77
diff --git a/media-sound/nted/files/nted-1.10.18-freetype.patch b/media-sound/nted/files/nted-1.10.18-freetype.patch
new file mode 100644
index 000000000000..505e756af564
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-freetype.patch
@@ -0,0 +1,11 @@
+--- nted-1.10.18/mainwindow.cpp
++++ nted-1.10.18/mainwindow.cpp
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
++#include FT_FREETYPE_H
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <cairo-ps.h>
diff --git a/media-sound/nted/files/nted-1.10.18-gcc47.patch b/media-sound/nted/files/nted-1.10.18-gcc47.patch
new file mode 100644
index 000000000000..8e706f62b99b
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-gcc47.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/show_bug.cgi?id=424291
+Index: nted-1.10.18/dynarray.h
+===================================================================
+--- nted-1.10.18.orig/dynarray.h
++++ nted-1.10.18/dynarray.h
+@@ -76,6 +76,7 @@ class NedDynArray {
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ 
+ static void erroraus(const char *s) {
+ 	fprintf(stderr, "%s\n", s);
diff --git a/media-sound/nted/files/nted-1.10.18-lilypond-tremolo.patch b/media-sound/nted/files/nted-1.10.18-lilypond-tremolo.patch
new file mode 100644
index 000000000000..a3c46c849a0e
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-lilypond-tremolo.patch
@@ -0,0 +1,45 @@
+From 161e7cf6d2f0f18e9b44ef9ce960efb07c210c79 Mon Sep 17 00:00:00 2001
+From: Christopher Harvey <chris@basementcode.com>
+Date: Sun, 7 Oct 2012 15:41:00 -0400
+Subject: [PATCH] Fix LilyPond tremolo dotted chord export
+
+For example, NtEd would export "< a f' >4:8.", but the correct syntax
+is "< a f' >4.:8"
+---
+ chordorrest.cpp |   13 ++++++-------
+ 1 files changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/chordorrest.cpp b/chordorrest.cpp
+index cd93dab..9367f32 100644
+--- a/chordorrest.cpp
++++ b/chordorrest.cpp
+@@ -3821,6 +3821,10 @@ void NedChordOrRest::exportLilyPond(FILE *fp, int *last_line, unsigned int *midi
+ 				fprintf(fp, " >");
+ 			}
+ 			if (duration != *midi_len || (m_status & TREMOLO_MASK)) {
++				sprintf(Str, "%d", WHOLE_NOTE / m_length);
++				for (i = 0; i < m_dot_count; i++) {
++					strcat(Str, ".");
++				}
+ 				if (m_status & TREMOLO_MASK) {
+ 					switch (m_status & TREMOLO_MASK) {
+ 						case STAT_TREMOLO1: tremolo =  8; break;
+@@ -3828,13 +3832,8 @@ void NedChordOrRest::exportLilyPond(FILE *fp, int *last_line, unsigned int *midi
+ 						case STAT_TREMOLO3: tremolo = 32; break;
+ 						case STAT_TREMOLO4: tremolo = 64; break;
+ 					}
+-					sprintf(Str, "%d:%d", WHOLE_NOTE / m_length, tremolo);
+-				}
+-				else {
+-					sprintf(Str, "%d", WHOLE_NOTE / m_length);
+-				}
+-				for (i = 0; i < m_dot_count; i++) {
+-					strcat(Str, ".");
++					sprintf(Str2, ":%d", tremolo);
++					strcat(Str, &Str2[0]);
+ 				}
+ 				force_length = true;
+ 			}
+-- 
+1.7.8.6
+
diff --git a/media-sound/nted/files/nted-1.10.18-lilypond.patch b/media-sound/nted/files/nted-1.10.18-lilypond.patch
new file mode 100644
index 000000000000..d1e77849e679
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-lilypond.patch
@@ -0,0 +1,58 @@
+From 54881f2bdfc3d18e1496b7739124311d8e7c394a Mon Sep 17 00:00:00 2001
+From: Christopher Harvey <chris@basementcode.com>
+Date: Sun, 7 Oct 2012 15:05:03 -0400
+Subject: [PATCH] Fix LilyPond clef exporting
+
+For example, sometimes NtEd would export "\clef \clef tenor" instead
+of just "\clef tenor"
+---
+ mainwindow.cpp |    4 +++-
+ resource.cpp   |   14 +++++++-------
+ 2 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/mainwindow.cpp b/mainwindow.cpp
+index 7263565..3343526 100644
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -3902,7 +3902,9 @@ void NedMainWindow::do_lily_export(FILE *fp, bool with_break, bool *selected_sta
+ 		if (m_staff_contexts[i].m_staff_short_name != NULL && strlen(m_staff_contexts[i].m_staff_short_name->getText()) > 0) {
+ 			fprintf(fp, " \\set Staff.shortInstrumentName = \"%s \"", m_staff_contexts[i].m_staff_short_name->getText());
+ 		}
+-		fprintf(fp, NedResource::getLilyPondClefName(m_staff_contexts[i].m_clef_number));
++		if (m_staff_contexts[i].m_clef_number != NEUTRAL_CLEF3) {
++			fprintf(fp, "\\clef %s", NedResource::getLilyPondClefName(m_staff_contexts[i].m_clef_number));
++		}
+ 		fprintf(fp, NedResource::getLilyPondKeySigName(m_staff_contexts[i].m_key_signature_number));
+ 		fprintf(fp, " \\time %d/%d", m_numerator, m_denominator);
+ 		if (m_upbeat_inverse != 0) {
+diff --git a/resource.cpp b/resource.cpp
+index 11c52b4..cff080f 100644
+--- a/resource.cpp
++++ b/resource.cpp
+@@ -3870,16 +3870,16 @@ int NedResource::determineLastLine(int treble_line, int clef) {
+ 
+ const char *NedResource::getLilyPondClefName(int clef_number) {
+ 	switch (clef_number) {
+-		case TREBLE_CLEF: return "\\clef treble";
+-		case BASS_CLEF: return "\\clef bass";
+-		case ALTO_CLEF: return "\\clef alto";
+-		case SOPRAN_CLEF: return "\\clef soprano";
+-		case TENOR_CLEF: return "\\clef tenor";
++		case TREBLE_CLEF: return "treble";
++		case BASS_CLEF: return "bass";
++		case ALTO_CLEF: return "alto";
++		case SOPRAN_CLEF: return "soprano";
++		case TENOR_CLEF: return "tenor";
+ 		case NEUTRAL_CLEF1: 
+-		case NEUTRAL_CLEF2: return "\\clef percussion";
++		case NEUTRAL_CLEF2: return "percussion";
+ 		case NEUTRAL_CLEF3: return "";
+ 	}
+-	return "\\clef treble";
++	return "treble";
+ }
+ const char *NedResource::getLilyPondKeySigName(int keysig_number) {
+ 	switch (keysig_number) {
+-- 
+1.7.8.6
+
diff --git a/media-sound/nted/metadata.xml b/media-sound/nted/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/media-sound/nted/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/media-sound/nted/nted-1.10.18-r3.ebuild b/media-sound/nted/nted-1.10.18-r3.ebuild
new file mode 100644
index 000000000000..bdd8eaf414f2
--- /dev/null
+++ b/media-sound/nted/nted-1.10.18-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+AUTOTOOLS_IN_SOURCE_BUILD=1
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils toolchain-funcs
+
+DESCRIPTION="WYSIWYG score editor for GTK+"
+HOMEPAGE="http://vsr.informatik.tu-chemnitz.de/staff/jan/nted/nted.xhtml"
+SRC_URI="http://vsr.informatik.tu-chemnitz.de/staff/jan/${PN}/sources/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2 NTED_FONT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc debug nls"
+
+RDEPEND="
+	>=dev-libs/glib-2:2
+	media-libs/alsa-lib
+	>=media-libs/freetype-2.5.1
+	x11-libs/cairo
+	>=x11-libs/gdk-pixbuf-2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( ABOUT_THE_EXAMPLES.TXT AUTHORS FAQ README )
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc47.patch" # bug #424291
+	"${FILESDIR}/${P}-lilypond.patch" # bug #437540
+	"${FILESDIR}/${P}-lilypond-tremolo.patch" # bug #437540
+	"${FILESDIR}/${P}-automake-1.12.patch" # bug #459466
+	"${FILESDIR}/${P}-freetype.patch" # bug #514522
+	"${FILESDIR}/${P}-cpp14.patch" # bug #594056
+)
+
+src_prepare() {
+	# fix desktop file, wrt bug #458080
+	sed -i \
+		-e 's/nted.png/nted/' \
+		-e '/^Categories/s/Application;//' \
+		datafiles/applications/nted.desktop || die 'sed on desktop file failed'
+	# drop -g from CXXFLAGS, wrt bug #458086
+	sed -i -e '/CXXFLAGS/s/ -g//' configure.in || die 'sed on configure.in failed'
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# Trick ./configure to believe we have gnome-extra/yelp installed.
+	has_version gnome-extra/yelp || export ac_cv_path_YELP="$(type -P true)"
+
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_with doc)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	# respect AR, wrt bug #458084
+	autotools-utils_src_compile AR="$(tc-getAR)"
+}
diff --git a/media-sound/ogg2mp3/Manifest b/media-sound/ogg2mp3/Manifest
new file mode 100644
index 000000000000..0346987bbb0c
--- /dev/null
+++ b/media-sound/ogg2mp3/Manifest
@@ -0,0 +1,5 @@
+DIST ogg2mp3-0.6.1.tar.bz2 12424 SHA256 4f6ffeed81a36bf1b6715ce0213a57fa3e7e1f40f80f382e663060645400d84e SHA512 ba4be78b14c3647af52c0c64c95949e75998847391612f6d66fa281e15283929d6ae3e5df15b0c242d2930b3941e68653934261f6d9804c576f77c8304ef4f14 WHIRLPOOL 6aa0e6a61dbd3e82cd923c0e08217004adbfce92026b1ebbd658316387b4ff168728237d172aaeeab63fd66a6b67a1d6e053d8648b30ec0b52c92eaf876ef254
+EBUILD ogg2mp3-0.6.1.ebuild 569 SHA256 4fbc225626b5ab11d7d72153efec4bb476f4c4101bf60c53d3a3f455579777f4 SHA512 74f233b4c24b61cde3f4dee09d80b9ea1bf4fc89916c01341c592db27f1d8cc3d3fe991b05129b1bc82e4ea90b745fd522213537ae8151d4eebd742a30a02305 WHIRLPOOL 5b08bd223821e4aa0207c2e1e06342be6b63bf82305beba7f9b5786ef54019598d47aaac540ebd56bbc949e0dcf80afe3e83e0aed45e4801d962db19355dfb31
+MISC ChangeLog 2971 SHA256 88bae33f13d0c56af0a0ffd65df90a0ab942a2344a5da807683fc6402c84bec1 SHA512 88d93b27d4b5e53b94f3d50e4281cd140bb45025a1ff3fec695ad8a36d49ac32e17f7af1341dc0ed971bfaad17efc88dd4493b7135c99ddbf1e4f6f791052f9e WHIRLPOOL 923d0792c9a9f6a9b358cf68c6d7ad40ca492ff2ebd73aa558da80ea40d6628e10f8fe70caed2cd6212ebbc5f59f0e3d01d16749e053ee1b49d79ca89da2feed
+MISC ChangeLog-2015 2760 SHA256 069d5ea41a6beae58f5600186a3db6181ccb3b72bfb55a4e04a927373f90ee78 SHA512 9471e2a36b432c1191d58be185de72be70e6590908b4c54d0befb2846663ca3c610fa71aee4730fe06e3e18b99857cafd0afe79f3b9df9e5a8d8ccfe451087e6 WHIRLPOOL d1abe4ea493dc670ea5cc3fd60c607cc1b1fae16a36a34f29223011a8c801c4b9e092c540c9ed95d68d6ce4383dda911e2c57200a09a1e08843865b8c162b22a
+MISC metadata.xml 780 SHA256 47cfd193018c057d4433a6b9a4b4a56272f33bcc41e2dc7b7fe2a0d9c8209f33 SHA512 aef8bed925fee6d914dd3f1ab3315b40743715c2499f72459de8ff3765cdd774755ec3a31872228cb6a8da8726cd3aa4256079431641c188c26c0c0553b51342 WHIRLPOOL 81ea1ea83e994b02b944eaec98af68eb8104ecda4551d9f6fed4580b348089792626185b4e1476d582d1c351cf27114b83c20b2d2210d565d8615b7ffa7fac20
diff --git a/media-sound/ogg2mp3/metadata.xml b/media-sound/ogg2mp3/metadata.xml
new file mode 100644
index 000000000000..5571068144eb
--- /dev/null
+++ b/media-sound/ogg2mp3/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>james.ausmus@gmail.com</email>
+    <name>James Ausmus</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <changelog>http://www.gitorious.org/ogg2mp3/ogg2mp3/commits/master</changelog>
+    <doc>http://www.gitorious.org/ogg2mp3/pages/Home</doc>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild b/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild
new file mode 100644
index 000000000000..469306c080f7
--- /dev/null
+++ b/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+DESCRIPTION="A perl script to convert Ogg Vorbis files to MP3 files"
+HOMEPAGE="http://www.gitorious.org/ogg2mp3/pages/Home"
+SRC_URI="http://www.jamesa.com/projects/ogg2mp3/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="media-sound/lame
+	dev-perl/String-ShellQuote
+	media-sound/vorbis-tools[ogg123]"
+DEPEND=""
+
+src_install() {
+	dobin ogg2mp3 || die "dobin failed"
+	dodoc doc/{AUTHORS,ChangeLog,README,TODO}
+}
diff --git a/media-sound/oggtst/Manifest b/media-sound/oggtst/Manifest
new file mode 100644
index 000000000000..6050895a0183
--- /dev/null
+++ b/media-sound/oggtst/Manifest
@@ -0,0 +1,5 @@
+DIST oggtst.tgz 19382 SHA256 4d1ff60037ae22a6e941bd68dfee3b1e7de5d0d8dd3981bae28ecd19b25946dc SHA512 6ee73f4ff1a0160135583997664eeba75857d1e76ed2e1b5a9be2d30feea064fe6bdd105edd58ad358ee8d9db20f1f3a64fe4b31c6c9dc5bce5241c5ceb2ef26 WHIRLPOOL d257e8ed66a331dfffa3ea7cab4e28dc2888e5e483c5df67b624c525619df6888668ed83521c48cd87617e23a1de3bfc33023e0d5a608b7cf982584c08522f10
+EBUILD oggtst-0.0.ebuild 700 SHA256 4da022fd0d96ab2f29f08e34ff02962b1050e5930937681d46420051e27d9bc7 SHA512 22f9412722d22411f10fad96305fd314fa4e96b81360435c3165269230a92bf30a4ad83720436a0900a8a4e838c0be27d90f2014648c22b7ef2a092da2b08915 WHIRLPOOL 5c7768294c9abcb482a324bfe33bc57a63b92f6c52d9600baa2176d0ac98a443327bed80fba2d6417e89db9206803d19d51f8906c5a8cefafd49f42a4a65ffa1
+MISC ChangeLog 2423 SHA256 b3ac9059ad4521c5ef282d59f253c22f43334815fd632fbe51618f36f8176c1e SHA512 c9d189e087398949b3569660caf3f89498c448693994cbfdc2583b301357d6b33d28961a7ad2b8f762c9b6455d5e2e25e978aac96be5710b84b8ea353b5df71f WHIRLPOOL 0a3f163b9da0888df18ea875ed4ef52ff719293acdb40a550dad51cba12f252a9c05cb31970d9a590dd874d89eacca4b4e0c153204e91a80b73b480f24230b82
+MISC ChangeLog-2015 1776 SHA256 ade270e436a60eb039f9d67d8c6115b4c82d7df4bde66e16ddebebb40bd05c11 SHA512 a432620ecca67b3c9d9383d08995ae01a3b0fc690eb5d47ed485bbfe7745f0305ffaf5597d1c3386b515eb792b7b517596a5541462967baa5012404e71631c35 WHIRLPOOL abda09cfd536eaee0f6940b2eeea2cabf44a1aa9a0b2151b2c90f3f90e38f046adae6538fa04f9cb3c6a96211de65688d2f02c79519f24f40ee40e05a009098c
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/oggtst/metadata.xml b/media-sound/oggtst/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/oggtst/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/oggtst/oggtst-0.0.ebuild b/media-sound/oggtst/oggtst-0.0.ebuild
new file mode 100644
index 000000000000..7c8930afd6da
--- /dev/null
+++ b/media-sound/oggtst/oggtst-0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit autotools
+
+DESCRIPTION="A tool for calculating ogg-vorbis playing time"
+HOMEPAGE="http://gnometoaster.rulez.org/"
+SRC_URI="http://gnometoaster.rulez.org/archive/${PN}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libao-0.8.0
+	>=media-libs/libvorbis-1.0_rc2"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# upstream didn't use make dist to create the tarball, there are
+	# unbound symlinks inside it.
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/media-sound/ogmtools/Manifest b/media-sound/ogmtools/Manifest
new file mode 100644
index 000000000000..9ba336f0004f
--- /dev/null
+++ b/media-sound/ogmtools/Manifest
@@ -0,0 +1,9 @@
+AUX ogmtools-1.5-comments.patch 1028 SHA256 f6eb56592d5456dcfc60c01115f2fd59b54addfdf48348c1230f6c89ce9880b9 SHA512 65aac830c44f73ce68eccfcd9e1d1616f62e5b340b2335c75b7363a99a94ae62b9b7d23a0e06de103dc7ea054373191e0fbfc6cfe06df3e03961bf7cc91c75d9 WHIRLPOOL 4f8bac27f92d72cd94adee6b9bb5338ddadbdf1901c00c8a3f1309f7a33de5b26cc3a96db7d2b4f2bf1d052c7457ce1671b1227b23f88b6ee0a4d6db9bf172ff
+AUX ogmtools-1.5-endian-fix.patch 406 SHA256 a2c7f6d5a8a532e55c8655f3f26dab3f4aab3310fb4a8ed4c6fc2eaa126b0052 SHA512 eeefe3bca9d39486a090a2735badc3996f087488d8b2e4121479efc247b9bfe53148f2ef60d95031fc0e0452e891d9ff6c3715bcf0e833266c946ac22b71d934 WHIRLPOOL 3dde8f44af11bc000d86edc7dbf8b85f01338b6dd57d954cd3d7ec4826d2127329fdf58266bb2bcba098af32832222001eb597da41ba660107f45d84020d65e5
+AUX ogmtools-1.5-summary_length.patch 489 SHA256 33fa479ce314ee61d8c14c86624f2c51f4b2601987814efa22564606a46c007e SHA512 ddbde11040a9426455fa91fa5c92ce4d729da91b661014b7abdb25614d3108c2f32321bf738fb984c6869a6ffcddb651541dbdd53446cb33cb9c5dc902cd6c99 WHIRLPOOL 2c1d67f4f9cafcb85394adb1aaa4c9fa6cd0855b291d6058a41ae4991e85473eac27bc4ec617060f2df86c7cb189859a7746b43a7b1f3fa570d254d561bfd63b
+AUX ogmtools-1.5-vorbis_verbosity.patch 524 SHA256 4067a23b45666c2943e2e24c7294590f5e816265d92f7e77b71e448762edaf2d SHA512 5f3b1a76aa6f414ebd29805f1a986e7050879a72610518f35025b783985d3eaa5157be7e1084541cc52dc5ad2f380ef3395d7ebaf33c73098f0844d8e0822146 WHIRLPOOL 558544871e8c4420619beb5b73281dc9c4b6db5b54936d08cd470f5e230aa77bda6ead3cb6ae81d1796e78a1eda51c68909709ef4094a5304f48d70f155d1bbb
+DIST ogmtools-1.5.tar.bz2 214934 SHA256 c8d61d1dbceb981dc7399c1a85e43b509fd3d071fb8d3ca89ea9385e6e40fdea SHA512 1ed573531f9783c491a01e419667229b28540ad48c08b46131ae09ce3a4d771e3a54cde5dd09c585c0b85952e82abb3d1353864dc5223736f6eb6480158badee WHIRLPOOL 86e5d76b50fc5515f36161a8b23fa4e27cd7fe4002f2e6b987fe34a9b8cbeab219cf8ab6b59f1d9f3977caff72882a25a973465b2830eed1ba10b0b4e954c3a1
+EBUILD ogmtools-1.5-r2.ebuild 921 SHA256 a442f870b5d72eeb2e7521daa11aaf2b2003d607616e3d07aacf6f6fbe47b2a4 SHA512 9f677033ba90ca407081ea7264754289efb5d2fbd3a3ec65fdac51458a083555ed374fe3b8c1716a0fe41c29b54081788b7336e78dc5c96478d5222dda545339 WHIRLPOOL af763c7ce51a3a329d3f704400565b6dfcee8cb4bdb9cd5bf0f6cab3e0ba4eab6a2d0f134cde5a49e7707e596e19bd8ec0db8b22bd6713ad85616bcd5d3e69d3
+MISC ChangeLog 2601 SHA256 b653cfaedfe38517f18e03c59d8c846f7323e1cdcd9c4adc463e843f482b2486 SHA512 87afa2551b264e1b80497092bafd8acc84215382d6691e4ccaa6cf7674b81e6ec9ef11b5be56e25a7c621496822236da1eaca91ab584e2148ae4cb0c3b91ae25 WHIRLPOOL 2271e435dd26846f2652fb8d27ac3deaa6a0615d2bb64e7b16c6cb63c9794e5a2b590b16c9d96ae300a5400aab6466b7bfdde0d01abf14186887dd10b879abf1
+MISC ChangeLog-2015 4651 SHA256 c1fa3f6bfd56fdfae35c3b5ab82bf970ddab82a4822607bd5b4bfe4c2a718ff9 SHA512 6e0ebbe184a50040a687cab3def2b1a048086caea33999d9edeac16a58722dfca00438d569513b279d5d19314bf633da807bad059b5d870991aeae6681867923 WHIRLPOOL c332f760585d9093eb6280521214e1de901eeb271b570a168b1a00b40894f3aa64295e49b3082c116c60c9db125b79a3dcce36e084acb07f43c88b6fc54cf0f4
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-comments.patch b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
new file mode 100644
index 000000000000..0440a8040b8c
--- /dev/null
+++ b/media-sound/ogmtools/files/ogmtools-1.5-comments.patch
@@ -0,0 +1,21 @@
+--- vorbis_header_utils.c.orig	Fri Aug 31 14:47:55 2007
++++ vorbis_header_utils.c	Fri Aug 31 14:51:23 2007
+@@ -153,15 +153,15 @@
+     die("malloc");
+   
+   memcpy(new_vc, vc, sizeof(vorbis_comment));
+-  new_vc->user_comments = (char **)malloc((vc->comments + 1) * sizeof(char *));
+-  new_vc->comment_lengths = (int *)malloc((vc->comments + 1) * sizeof(int));
++  new_vc->user_comments = (char **)malloc((vc->comments + 1) * sizeof(*new_vc->user_comments));
++  new_vc->comment_lengths = (int *)malloc((vc->comments + 1) * sizeof(*new_vc->comment_lengths));
+   if ((new_vc->user_comments == NULL) || (new_vc->comment_lengths == NULL))
+     die("malloc");
+   for (i = 0; i < vc->comments; i++)
+     new_vc->user_comments[i] = strdup(vc->user_comments[i]);
+   new_vc->user_comments[vc->comments] = 0;
+   memcpy(new_vc->comment_lengths, vc->comment_lengths,
+-         (vc->comments + 1) * sizeof(char *));
++         (vc->comments + 1) * sizeof(*new_vc->comment_lengths));
+   new_vc->vendor = strdup(vc->vendor);
+   
+   return new_vc;
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch b/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
new file mode 100644
index 000000000000..8945ca47c082
--- /dev/null
+++ b/media-sound/ogmtools/files/ogmtools-1.5-endian-fix.patch
@@ -0,0 +1,11 @@
+--- avilib/avidump.c.orig	2004-11-02 15:30:16.000000000 +0000
++++ avilib/avidump.c	2004-11-17 19:12:02.730255128 +0000
+@@ -54,7 +54,7 @@
+                    ((x<<8)  & 0x00ff0000) |\
+                    ((x<<24) & 0xff000000))
+ # define SWAP8(x) (((SWAP4(x)<<32) & 0xffffffff00000000ULL) |\
+-                   (SWAP4(x)))
++                   SWAP4(x))
+ #else
+ # define SWAP2(a) (a)
+ # define SWAP4(a) (a)
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
new file mode 100644
index 000000000000..8457918beb8f
--- /dev/null
+++ b/media-sound/ogmtools/files/ogmtools-1.5-summary_length.patch
@@ -0,0 +1,12 @@
+diff -ur ogmtools-1.5.orig/ogminfo.c ogmtools-1.5/ogminfo.c
+--- ogmtools-1.5.orig/ogminfo.c	2003-11-21 00:21:36.000000000 +0200
++++ ogmtools-1.5/ogminfo.c	2009-05-12 12:41:58.000000000 +0300
+@@ -513,7 +513,7 @@
+               stream->serial, stream->size,
+               (stream->size * 8.0 / 1000.0) / now,
+               (stream->size / 1024.0) / now,
+-              stream->num_packets, now * 1000.0);
++              stream->num_packets, now);
+       stream = stream->next;
+     }
+   }
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
new file mode 100644
index 000000000000..085cc5d978d3
--- /dev/null
+++ b/media-sound/ogmtools/files/ogmtools-1.5-vorbis_verbosity.patch
@@ -0,0 +1,12 @@
+diff -ur ogmtools-1.5.orig/ogminfo.c ogmtools-1.5/ogminfo.c
+--- ogmtools-1.5.orig/ogminfo.c	2003-11-21 00:21:36.000000000 +0200
++++ ogmtools-1.5/ogminfo.c	2009-05-12 12:42:56.000000000 +0300
+@@ -188,7 +188,7 @@
+     }
+     vorbis_comment_clear(&vc);
+   } else if ((stream->stype == 'a') && stream->vorbis) {
+-    if (verbose < 1)
++    if (verbose < 2)
+       return;
+     fprintf(stdout, "(%s) a%d: % 7ld bytes granulepos: % 10lld pno: % 10lld ",
+              __FILE__, stream->sno, pack->bytes, ogg_page_granulepos(page),
diff --git a/media-sound/ogmtools/metadata.xml b/media-sound/ogmtools/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/ogmtools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
new file mode 100644
index 000000000000..8e6971a61fc0
--- /dev/null
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Information, extraction or creation for OGG media streams"
+HOMEPAGE="http://www.bunkus.org/videotools/ogmtools/"
+SRC_URI="http://www.bunkus.org/videotools/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="dvd"
+
+RDEPEND="dvd? ( media-libs/libdvdread )
+	media-sound/vorbis-tools"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-comments.patch \
+		"${FILESDIR}"/${P}-endian-fix.patch \
+		"${FILESDIR}"/${P}-vorbis_verbosity.patch \
+		"${FILESDIR}"/${P}-summary_length.patch
+}
+
+src_configure() {
+	econf \
+		$(use_with dvd dvdread)
+}
+
+src_install() {
+	dobin ogmmerge ogmdemux ogminfo ogmsplit ogmcat || die "dobin failed"
+
+	if use dvd; then
+		dobin dvdxchap || die "dobin failed"
+	fi
+
+	dodoc ChangeLog README TODO
+	doman *.1
+}
diff --git a/media-sound/opus-tools/Manifest b/media-sound/opus-tools/Manifest
new file mode 100644
index 000000000000..b5986110b445
--- /dev/null
+++ b/media-sound/opus-tools/Manifest
@@ -0,0 +1,5 @@
+DIST opus-tools-0.1.10.tar.gz 312093 SHA256 a2357532d19471b70666e0e0ec17d514246d8b3cb2eb168f68bb0f6fd372b28c SHA512 4ead97b9fe4658968a4b5cbe4bde5e2d8cbfaaea18dd0d817597cc6b6b11f26937b9eee7358ade63568f0213131aa80ecbed169d1b3885980a556871a4a7fe98 WHIRLPOOL 8ecfdf10c55adda1a05f76a515b8583e56e5e80a32fcfda8fbf0db9026e9e3a176c90ef11782d89264e4c85ca139e20c15934790355c2c7c3646a74a248e2816
+EBUILD opus-tools-0.1.10.ebuild 944 SHA256 3d2ef1bd531d4fbb30e7800a935890505dc9db6feacad59f4f03b15c92e7522a SHA512 844133cf0a6077d13cc85eec31dc47af94c25bd3dac6eea41eb396b9a36a27d6b0d67e86be0fc53dea8bd3ea03595ef47aba87d06482f3ddf144bc70466b7c38 WHIRLPOOL beb98190a168f39992df505f789db66362d28af090a9b616aa5fce56c87774621d653197deb002f6597273488ef8052b92eb337beb270ad77bbed81e2b0e1a9b
+MISC ChangeLog 2852 SHA256 90744a83b75c979ff2b0607168cf75067cd4781730ae9162f1e1fc503fa87499 SHA512 af580b4810103d0188b0e3a89c489eb582b48b6cc6cc54e937771d14d70ac9a2a3547eaf2c06989808dfc893c7c36eb32d3dac4728f00ef64ab75fcec1f0a6d8 WHIRLPOOL d6cc6b56737952f68cf8dbbb3177cf9338260f73a206843811a0cf237e92e7ab2952f9b5069538d9cb35cb59502140a89fa4cea712228e752d9c615e31ef3b71
+MISC ChangeLog-2015 1850 SHA256 e8adebe21d245944e18fa1ca1085d45dba19d931339114867399bf04080263f6 SHA512 6db6d18830f4f2a865c461602855039d78d83d20e443d78049d7d38d2698a7c09fe755b44995f9a548d94d4931026385bc4becf43288e752f534dd2df49dae08 WHIRLPOOL 2bec54018696cc0e63c7d7f164a6a80d259b089363038472c050fa76d4623db9f2ce75ffc2664ea13739301e6f88e7f518919f5248aee4466ff91af22f6d293f
+MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/media-sound/opus-tools/metadata.xml b/media-sound/opus-tools/metadata.xml
new file mode 100644
index 000000000000..39626a990be5
--- /dev/null
+++ b/media-sound/opus-tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/opus-tools/opus-tools-0.1.10.ebuild b/media-sound/opus-tools/opus-tools-0.1.10.ebuild
new file mode 100644
index 000000000000..652f98ca9693
--- /dev/null
+++ b/media-sound/opus-tools/opus-tools-0.1.10.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Royalty-free, highly versatile audio codec"
+HOMEPAGE="https://opus-codec.org/"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.xiph.org/opus-tools.git"
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
+else # Official release
+	SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="flac"
+
+RDEPEND=">=media-libs/libogg-1.3.0
+	 >=media-libs/opus-1.0.3
+	 flac? ( >=media-libs/flac-1.1.3 )"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with flac)
+}
+
+src_install() {
+	default
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-sound/orpheus/Manifest b/media-sound/orpheus/Manifest
new file mode 100644
index 000000000000..68dd1bdfc11e
--- /dev/null
+++ b/media-sound/orpheus/Manifest
@@ -0,0 +1,14 @@
+AUX 1.5-amd64.patch 962 SHA256 cd0c12aebe6909dceba04b6db0741fa997bf86f2501cbed3fccf070c9802395a SHA512 8acf3a971620efd0d9cb5a93aa313458dcbfed4b3cbd7ddfb84d63911281081d98a25d17443031489d2f8954e829ae6218b8911090efca9971e6e273fbafac65 WHIRLPOOL b3392f3649a8dc823d95c1ed0b29f729162ab3b43f6d033396e917d77454ef528785fefa8694dca6070a75d3b7451634029b04eeedfc9930d106a0fcf0331e3f
+AUX 101_fix-buffer-overflow.diff 614 SHA256 f6c2ee9d2e53b079764b40e85678b8d23664d86432c14cedf0246112c59f2501 SHA512 403701d1a4815f28f782311f80ca3db3527107a8d558baa8ee991d794d5439ef5e3f28f41f155ffb4140fd39eed30d135c50a6a4af809317f541d02281600611 WHIRLPOOL 01d5b611555cbc198e61530d1d6ed6afc1ee3cbc36b1a9380ff730f9367be2a6e476713cd92bd211299af0ec205483cbb52734541aa347765f5ec4cd13b551b2
+AUX orpheus-1.6-bufsize.patch 590 SHA256 d5aef82370efca028deee08176494bb926a0239f56322815eed22b3b5c44ed8a SHA512 47e166074a585657bf49c7b3af33c2849dacbc737872ee6abd70891fddd7e8c63cf293e1180cd0f04077dcd6def495203103e92ca78a87564dcec56c0ea2f4e3 WHIRLPOOL 92499f8f9b74cdcc011ca11d19d62074c372611df08772d4e1f2728fc269c625fd3a371c5889d596b7cc9360547dff2b6ba229fd8d87eab1e1fd02583309f18a
+AUX orpheus-1.6-constify.patch 2123 SHA256 db6a5fea1765c72edaf173293cc4325d905201eda5f53d42491f1022deb85e4f SHA512 9e4ba5e66f65994462098f1b20208bb668e97acab3e95262ddf814879130bf3ff3caaee829631354784326b276ac23ff68dfa62374d43c8679c8beeebcd4d21b WHIRLPOOL d1b2605391120247626e3be8aeb1bcbdbb2b26ecfe1091fa259bb3929d104f76ecb9e2fe9cafc3a121bf74239246b265bf9b68d5630791469a11b7745c3e1f7e
+AUX orpheus-1.6-cppflags.patch 830 SHA256 0e2750cc1cd492273a0b9b77b6e006b96bfa8534770b8ffd1b0aa409be495bff SHA512 4a8d51eb3ef9cadfa78c0d11ae264166589dc0a63f084f904bb7a698fda6aa570cfb940b3ad50b0fbff201d21df049369d92b7ed5452cff473ee2d7b60fda43f WHIRLPOOL 68c1846933600d11f7238afb37ae184a25f92eec92c6a4ceca975c0a482ad0c78bfea245adf129641e5f584c6dd277d7786aed728e84caef2c883637bb8eeb7b
+AUX orpheus-1.6-fix-buildsystem.patch 4231 SHA256 7f89bd50f6f26edd5ad9aaf102c46e51aaeee7054180b6809b8cf26dd630a046 SHA512 829048f8d327751e78e23fb4304a0b1a9308521bcd47b23dc15015c9ce4a2d36533a6fff18d8903a107c63131bffdb89851088c53bb28ade769245c1dd25e225 WHIRLPOOL 6ecf3583d1a8fa74df4a92bfb971870d4b597227adeef22bc3b2b84b2789f64a88d12f809a5bf4c096ccb607adba8bbb85cdadca880362f5427e46e133248283
+AUX orpheus-1.6-gcc47.patch 275 SHA256 673ee366a33dc261f9c683a7e919e2340a6913001780fb75d86a845774ef6df3 SHA512 d502efb94e6cc1e1cb452a5c7f4ed4f662353ef1bb953117d725f8125a4c7f43713071089ce5df2ab9d8adb3f2b62b178e8869b2cf2b52681ba9f9510aa313d7 WHIRLPOOL b4d2bd74224e6a1a067a5673643456d2c10f3b8790a042eaf0e37453b1f98f22d91be6d6161a489276aba7d5dc08964f6d84020e2236406452015fa6ca3a46e3
+AUX orpheus-1.6-nolibghttp.patch 731 SHA256 7162d95a07ec1ce1c4109befeaf704817a46d3036c17990f10a5600deebef5e0 SHA512 0757f7451fe0ce1d84e4ed710537daac09fff4ffbc14b9fa397cc00bf0c04ed8ad27785917d327ccd69efac10840b534f6379b2f3b020b9d1713fd801e13806b WHIRLPOOL 423f51857b2120ec6f6007de5ff0d90707b82689c3e573670498174765ce6e565745fac7d08df807be4d1375e3b80327bac10d2e7b8f3046f0722420dd772819
+DIST orpheus-1.6.tar.gz 440553 SHA256 18a6a4b0171c8a2a5a09be6e2cd8fc781c145fde1b266e43a9902fef10ee6ff5 SHA512 40f4ac7533449940370f29d4a14281d7f235ce711166e0e979f3e2a5ca37f792dc74b5267ee2a4f51af6c20f346c543d0d9f1fc88f47670971ad32f7c2856abb WHIRLPOOL 4c166cdc42315a6981d730de3ad62b6d36b9953c6d7ee7c02c7ea21fbae885a9ff1286902644e9c7410675ab64f026ed987ff3b56c15ffb270ea65738df6c7fe
+EBUILD orpheus-1.6-r2.ebuild 1226 SHA256 bd3e8a51e462e518def43daf4abe643fa0a51b69fe17a101c3b358f40fdab49d SHA512 d3d66b7086d5dc1d6852e36a36dbaba0e6ee021a81d714a302e8100d16d0b853bc2b9820f69215f85b9b726d2f38b277c6a387c26e4d45b73967fe0d7a508a42 WHIRLPOOL 0a59fe864607c1d012f1d362d27ff9f6b058996c490572f332312e6f90df65f3ac7f22604684930ce1123cfa8796ad5a31f964ad0d29527aa1acfad8d6da3684
+EBUILD orpheus-1.6-r3.ebuild 983 SHA256 540352916b14c786b34637a35ca0f66434d7d1c15dee9bfb8724aa241e9b5b40 SHA512 9088b4501fd74539fd9fe226e59476c2d08356e682b1672db1d4dc2437d406ee9d6c347174c7ad0e3b7890aab24002d6717216ce490f0b52bf0e1e19f8e10dc2 WHIRLPOOL 06f863c1b4414c0a00b8c6a30cf8dc0657c768d824bd5936e28c2bf6cad447b1fe480b072468d0a386f6c216c3567aa88e7a72a89a131d79f0ecc18055e544df
+MISC ChangeLog 2912 SHA256 aa600dbfadb1bc4cce43f03735f7e1cc33e9d8941a96cf61e1d75cea3300cd4d SHA512 0b84e8198afbfce14fa5f73171c11b203a504b74624d7087e1d183c3e4b36eba2ccc87fd19eec363c41b02fba54e4d75abe20764f88400b1643fc82db2f17f3b WHIRLPOOL 1c19254478262e6d10af1f04255ee4606d015ecfd0b4fe17599df5e7b1604f2f225db56a3e32cb2e7a89c5dab94c6cc8c3515f9c19aa8fa16e78a50c8560d5d9
+MISC ChangeLog-2015 5118 SHA256 b6afdcbe06ddc854487f1e03149dd3b306a4d5beba7d46d7fc795d01c1e60217 SHA512 defb2f6bf159392451bf01f0c8c41b27104e9e2460efa5e2f0dd53f41346f9be6882456c96f87ca15507361702e496a9884cb3e0a4804719bca0dbea832e142f WHIRLPOOL c83d0f54dc5eba5a2a17c2b64888e600097864ee596b6da30a2a241245ea875aa6aa3e6c8b01ccf7eb224b3c1bc94176310ee025bd84c10498682b3960b2bb97
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/orpheus/files/1.5-amd64.patch b/media-sound/orpheus/files/1.5-amd64.patch
new file mode 100644
index 000000000000..eac0ab0a2c61
--- /dev/null
+++ b/media-sound/orpheus/files/1.5-amd64.patch
@@ -0,0 +1,31 @@
+--- orpheus-1.5/kkstrtext-0.1/kkstrtext.cc	2004-01-15 21:25:31.000000000 +0100
++++ orpheus-1.5-new/kkstrtext-0.1/kkstrtext.cc	2006-08-28 11:48:36.926598598 +0200
+@@ -431,7 +431,7 @@
+ }
+ 
+ int intcompare(void *s1, void *s2) {
+-    return (int) s1 != (int) s2;
++    return (long) s1 != (long) s2;
+ }
+ 
+ string i2str(int i) {
+@@ -885,7 +885,7 @@
+ #ifdef HAVE_ICONV
+     iconv_t cd = iconv_open(tocs.c_str(), fromcs.c_str());
+ 
+-    if(((int) cd) != -1) {
++    if(((long) cd) != -1) {
+ 	string r, text(atext);
+ 	size_t inleft, outleft, soutleft;
+ 	char *inbuf, *outbuf, *sinbuf, *soutbuf;
+--- orpheus-1.5/kkconsui-0.1/src/texteditor.cc	2003-09-09 23:51:33.000000000 +0200
++++ orpheus-1.5-new/kkconsui-0.1/src/texteditor.cc	2006-08-28 11:56:10.082753610 +0200
+@@ -1940,7 +1940,7 @@
+ }
+ 
+ int texteditor::findint(void *p1, void *p2) {
+-    return *(int *) p1 != (int) p2;
++    return *(long *) p1 != (long) p2;
+ }
+ 
+ int texteditor::findhighline(void *p1, void *p2) {
diff --git a/media-sound/orpheus/files/101_fix-buffer-overflow.diff b/media-sound/orpheus/files/101_fix-buffer-overflow.diff
new file mode 100644
index 000000000000..4d6c8e4e18a4
--- /dev/null
+++ b/media-sound/orpheus/files/101_fix-buffer-overflow.diff
@@ -0,0 +1,15 @@
+Fix a stack-based buffer overflow in kkstrtext.h in ktools library.
+(CVE-2005-3863) (Closes: #368402)
+Index: orpheus-1.5/kkstrtext-0.1/kkstrtext.h
+===================================================================
+--- orpheus-1.5.orig/kkstrtext-0.1/kkstrtext.h	2003-12-14 11:51:38.000000000 +0100
++++ orpheus-1.5/kkstrtext-0.1/kkstrtext.h	2006-08-01 21:57:14.000000000 +0200
+@@ -87,7 +87,7 @@
+     { \
+ 	va_list vgs__ap; char vgs__buf[1024]; \
+ 	va_start(vgs__ap, fmt); \
+-	vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \
++	vsnprintf(vgs__buf, 1024, fmt, vgs__ap); c = vgs__buf; \
+ 	va_end(vgs__ap); \
+     }
+ 
diff --git a/media-sound/orpheus/files/orpheus-1.6-bufsize.patch b/media-sound/orpheus/files/orpheus-1.6-bufsize.patch
new file mode 100644
index 000000000000..319fcd83eecc
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.6-bufsize.patch
@@ -0,0 +1,13 @@
+Index: orpheus-1.6/kkstrtext-0.1/kkstrtext.cc
+===================================================================
+--- orpheus-1.6.orig/kkstrtext-0.1/kkstrtext.cc
++++ orpheus-1.6/kkstrtext-0.1/kkstrtext.cc
+@@ -1132,7 +1132,7 @@ string striprtf(const string &s, const s
+ 			    bunicode = false;
+ 			    if(unichar.substr(0, 4).find_first_not_of("0123456789") == -1) {
+ 				long l = strtol(unichar.substr(0, 4).c_str(), 0, 0);
+-				char ubuf[sizeof(long)+4];
++				char ubuf[sizeof(long)*2+4];
+ 			    #ifdef HAVE_ICONV
+ 				memcpy(ubuf, "\xff\xfe", 2);
+ 				memcpy(ubuf+2, &l, sizeof(long));
diff --git a/media-sound/orpheus/files/orpheus-1.6-constify.patch b/media-sound/orpheus/files/orpheus-1.6-constify.patch
new file mode 100644
index 000000000000..8255b4094ef6
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.6-constify.patch
@@ -0,0 +1,60 @@
+Index: orpheus-1.6/kkstrtext-0.1/kkstrtext.cc
+===================================================================
+--- orpheus-1.6.orig/kkstrtext-0.1/kkstrtext.cc
++++ orpheus-1.6/kkstrtext-0.1/kkstrtext.cc
+@@ -41,17 +41,17 @@ char *strimlead(char *str)  { return tri
+ char *strimtrail(char *str) { return trimtrail(str, " \t"); }
+ char *strim(char *str)      { return trim(str, " \t");      }
+ 
+-char *trimlead(char *str, char *chr) {
++char *trimlead(char *str, const char *chr) {
+     while(strchr(chr, str[0]) && strlen(str)) strcpy(str, str + 1);
+     return str;
+ }
+ 
+-char *trimtrail(char *str, char *chr) {
++char *trimtrail(char *str, const char *chr) {
+     while(strchr(chr, str[strlen(str)-1]) && strlen(str)) str[strlen(str)-1] = 0;
+     return str;
+ }
+ 
+-char *trim(char *str, char *chr) {
++char *trim(char *str, const char *chr) {
+     return trimlead(trimtrail(str, chr), chr);
+ }
+ 
+@@ -370,7 +370,7 @@ const char *strqstr(const char *s, const
+     return ret;
+ }
+ 
+-char *strinsert(char *buf, int pos, char *ins) {
++char *strinsert(char *buf, int pos, const char *ins) {
+     char *p = strdup(buf+pos);
+     memcpy(buf+pos+strlen(ins), p, strlen(p)+1);
+     memcpy(buf+pos, ins, strlen(ins));
+Index: orpheus-1.6/kkstrtext-0.1/kkstrtext.h
+===================================================================
+--- orpheus-1.6.orig/kkstrtext-0.1/kkstrtext.h
++++ orpheus-1.6/kkstrtext-0.1/kkstrtext.h
+@@ -119,9 +119,9 @@ __KTOOL_BEGIN_C
+ 
+ char *strcut(char *strin, int frompos, int count);
+ 
+-char *trimlead(char *str, char *chr);
+-char *trimtrail(char *str, char *chr);
+-char *trim(char *str, char *chr);
++char *trimlead(char *str, const char *chr);
++char *trimtrail(char *str, const char *chr);
++char *trim(char *str, const char *chr);
+ 
+ char *strimlead(char *str);
+ char *strimtrail(char *str);
+@@ -145,7 +145,7 @@ const char *strqstr(const char *s,
+     const char *esc = "");
+ 
+ char *strccat(char *dest, char c);
+-char *strinsert(char *buf, int pos, char *ins);
++char *strinsert(char *buf, int pos, const char *ins);
+ char *strcinsert(char *buf, int pos, char ins);
+ 
+ int strchcount(char *s, char *accept);
diff --git a/media-sound/orpheus/files/orpheus-1.6-cppflags.patch b/media-sound/orpheus/files/orpheus-1.6-cppflags.patch
new file mode 100644
index 000000000000..bf7effbcd9d9
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.6-cppflags.patch
@@ -0,0 +1,12 @@
+Index: orpheus-1.6/kkconsui-0.1/src/Makefile.am
+===================================================================
+--- orpheus-1.6.orig/kkconsui-0.1/src/Makefile.am
++++ orpheus-1.6/kkconsui-0.1/src/Makefile.am
+@@ -1,6 +1,6 @@
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/../kkstrtext -I$(top_srcdir)/../kkstrtext-0.1
+ noinst_LIBRARIES = libsrc.a
+-CPPFLAGS = 
++AM_CPPFLAGS = 
+ libsrc_a_SOURCES =  treeview.cc colorschemer.cc textinputline.cc fileselector.cc textwindow.cc texteditor.cc dialogbox.cc screenarea.cc textbrowser.cc abstractui.cc horizontalbar.cc linkedlist.cc cmenus.cc conscommon.cc
+ EXTRA_DIST = treeview.cc colorschemer.cc textinputline.cc fileselector.cc textwindow.cc texteditor.cc dialogbox.cc screenarea.cc textbrowser.cc abstractui.cc horizontalbar.cc linkedlist.cc cmenus.cc conscommon.cc
+ SUBDIRS = 
diff --git a/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch b/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch
new file mode 100644
index 000000000000..5819fe9a053c
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.6-fix-buildsystem.patch
@@ -0,0 +1,182 @@
+--- orpheus-1.6/configure.ac
++++ orpheus-1.6/configure.ac
+@@ -1,5 +1,5 @@
+-AC_INIT(aclocal.m4)
+-AM_INIT_AUTOMAKE(orpheus, 1.6)
++AC_INIT([orpheus],[1.6])
++AM_INIT_AUTOMAKE
+ 
+ AC_CANONICAL_HOST
+ 
+@@ -8,7 +8,8 @@
+ AC_PROG_CPP
+ AC_PROG_RANLIB
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
++AM_PROG_AR
+ 
+ ###     use option --enable-locales-fix to fix problems with double-byte
+ ###     encodings on systems with broken locale, iscntrl()
+@@ -20,30 +20,21 @@
+ 
+ AC_CHECK_HEADERS(sys/soundcard.h soundcard.h machine/soundcard.h, break)
+ 
+-AM_PATH_XML2(2.0.0, [
+-    CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS"
+-    LIBS="$LIBS $XML_LIBS"
+-    AC_DEFINE(HAVE_LIBXML2, 1, [use libxml2])
+-], [
+-    AC_MSG_WARN(libxml2 not found, internet radio presets fetching disabled)
++PKG_CHECK_MODULES([DEPENDENCIES], [ncurses vorbis vorbisfile ogg libxml-2.0],
++[
++AC_DEFINE([HAVE_LIBXML2], [1], [Defined if libxml is present])
++AC_DEFINE([HAVE_LIBNCURSES], [1], [Defined if ncurses is present])
++AC_DEFINE([HAVE_LIBVORBIS], [1], [Defined if libvorbis is present])
++AC_DEFINE([HAVE_LIBVORBISFILE], [1], [Defined if libvorbisfile is present])
+ ])
+ 
+-AC_CHECK_LIB(ncurses, main,, AC_CHECK_LIB(curses, main,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program)))
+-
+-AC_CHECK_LIB(ghttp, ghttp_request_new,,
+-    [AC_MSG_WARN(libghttp not found - the support for CDDB is be disabled)])
+-
+-AC_CHECK_LIB(vorbis, vorbis_synthesis_headerin,,
+-    AC_MSG_WARN(libvorbisfile not found - the support for OGG tags edit is disabled))
+-    
+-AC_CHECK_LIB(vorbisfile, ov_open,,
+-    AC_MSG_WARN(libvorbis not found - the support for OGG files is disabled))
+-
+ AM_ICONV_LINK
+ 
+-LIBS="$LIBS $LIBICONV"
++CPPFLAGS="$CPPFLAGS $DEPENDENCIES_CFLAGS"
++LIBS="$LIBS $LIBICONV $DEPENDENCIES_LIBS"
+ 
+ ALL_LINGUAS="ru ca"
+ AM_GNU_GETTEXT
+ AC_CONFIG_SUBDIRS(kkstrtext-0.1 kkconsui-0.1)
+-AC_OUTPUT(Makefile src/Makefile src/abstract/Makefile po/Makefile.in intl/Makefile)
++AC_CONFIG_FILES([Makefile src/Makefile src/abstract/Makefile po/Makefile.in intl/Makefile])
++AC_OUTPUT
+--- orpheus-1.6/kkconsui-0.1/configure.ac
++++ orpheus-1.6/kkconsui-0.1/configure.ac
+@@ -6,7 +6,7 @@
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_RANLIB
+-
++AM_PROG_AR
+ 
+ ###	use option --enable-locales-fix to fix problems with double-byte
+ ###	encodings on systems with broken locale, iscntrl()
+--- orpheus-1.6/kkstrtext-0.1/configure.ac
++++ orpheus-1.6/kkstrtext-0.1/configure.ac
+@@ -6,6 +6,7 @@
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ AC_CHECK_HEADERS(_G_config.h)
+ AC_LANG_CPLUSPLUS
+--- orpheus-1.6/po/Makefile.in.in
++++ orpheus-1.6/po/Makefile.in.in
+@@ -29,7 +29,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
++MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
+ mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+ 
+ GMSGFMT = @GMSGFMT@
+--- orpheus-1.6/src/cdtrack.cc
++++ orpheus-1.6/src/cdtrack.cc
+@@ -22,6 +22,8 @@
+ *
+ */
+ 
++#include "../config.h"
++
+ #include "cdtrack.h"
+ #include "playlist.h"
+ 
+--- orpheus-1.6/src/main.cc
++++ orpheus-1.6/src/main.cc
+@@ -21,6 +21,9 @@
+ * USA
+ *
+ */
++
++#include "../config.h"
++
+ #include "uitext.h"
+ #include "cdtrack.h"
+ #include "mp3track.h"
+--- orpheus-1.6/src/mp3track.cc
++++ orpheus-1.6/src/mp3track.cc
+@@ -22,6 +22,8 @@
+ *
+ */
+ 
++#include "../config.h"
++
+ #include "mp3track.h"
+ #include "orpheusconf.h"
+ 
+--- orpheus-1.6/src/oggtrack.cc
++++ orpheus-1.6/src/oggtrack.cc
+@@ -22,6 +22,8 @@
+ *
+ */
+ 
++#include "../config.h"
++
+ #include "oggtrack.h"
+ #include "orpheusconf.h"
+ 
+--- orpheus-1.6/src/orpheusconf.cc
++++ orpheus-1.6/src/orpheusconf.cc
+@@ -22,6 +22,8 @@
+ *
+ */
+ 
++#include "../config.h"
++
+ #include "orpheusconf.h"
+ 
+ #include <sys/stat.h>
+--- orpheus-1.6/src/playlist.cc
++++ orpheus-1.6/src/playlist.cc
+@@ -22,6 +22,8 @@
+ *
+ */
+ 
++#include "../config.h"
++
+ #include "playlist.h"
+ #include "mp3track.h"
+ #include "oggtrack.h"
+--- orpheus-1.6/src/streamtrack.cc
++++ orpheus-1.6/src/streamtrack.cc
+@@ -22,6 +22,8 @@
+ *
+ */
+ 
++#include "../config.h"
++
+ #include "streamtrack.h"
+ #include "playlist.h"
+ 
+--- orpheus-1.6/src/uitext.cc
++++ orpheus-1.6/src/uitext.cc
+@@ -22,6 +22,8 @@
+ *
+ */
+ 
++#include "../config.h"
++
+ #include "uitext.h"
+ #include "playlist.h"
+ #include "cdtrack.h"
diff --git a/media-sound/orpheus/files/orpheus-1.6-gcc47.patch b/media-sound/orpheus/files/orpheus-1.6-gcc47.patch
new file mode 100644
index 000000000000..605bb9927760
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.6-gcc47.patch
@@ -0,0 +1,15 @@
+ https://bugs.gentoo.org/430386
+ 
+ src/streamtrack.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/streamtrack.cc
++++ b/src/streamtrack.cc
+@@ -34,6 +34,7 @@
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <signal.h>
++#include <unistd.h>
+ 
+ #include <algorithm>
+ 
diff --git a/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch b/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch
new file mode 100644
index 000000000000..e6a5f87a210f
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch
@@ -0,0 +1,15 @@
+Index: orpheus-1.6/configure.in
+===================================================================
+--- orpheus-1.6.orig/configure.in
++++ orpheus-1.6/configure.in
+@@ -30,8 +30,8 @@ AM_PATH_XML2(2.0.0, [
+ 
+ AC_CHECK_LIB(ncurses, main,, AC_CHECK_LIB(curses, main,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program)))
+ 
+-AC_CHECK_LIB(ghttp, ghttp_request_new,,
+-    [AC_MSG_WARN(libghttp not found - the support for CDDB is be disabled)])
++#AC_CHECK_LIB(ghttp, ghttp_request_new,,
++#    [AC_MSG_WARN(libghttp not found - the support for CDDB is be disabled)])
+ 
+ AC_CHECK_LIB(vorbis, vorbis_synthesis_headerin,,
+     AC_MSG_WARN(libvorbisfile not found - the support for OGG tags edit is disabled))
diff --git a/media-sound/orpheus/metadata.xml b/media-sound/orpheus/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/orpheus/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/orpheus/orpheus-1.6-r2.ebuild b/media-sound/orpheus/orpheus-1.6-r2.ebuild
new file mode 100644
index 000000000000..2766f98a6073
--- /dev/null
+++ b/media-sound/orpheus/orpheus-1.6-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Command line MP3 player"
+HOMEPAGE="http://konst.org.ua/en/orpheus"
+SRC_URI="http://konst.org.ua/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses
+	media-libs/libvorbis
+	media-sound/mpg123
+	media-sound/vorbis-tools[ogg123]"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/1.5-amd64.patch
+
+	# Fix a stack-based buffer overflow in kkstrtext.h in ktools library.
+	# Bug 113683, CVE-2005-3863.
+	epatch "${FILESDIR}"/101_fix-buffer-overflow.diff
+
+	epatch "${FILESDIR}"/${P}-nolibghttp.patch \
+		"${FILESDIR}"/${P}-cppflags.patch \
+		"${FILESDIR}"/${P}-bufsize.patch \
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-constify.patch
+	cp "${S}/config.rpath" "${S}/kkstrtext-0.1/" || die
+
+	# For automake 1.9 and later
+	sed -i -e 's:@MKINSTALLDIRS@:$(top_srcdir)/mkinstalldirs:' \
+		po/Makefile.in.in || die
+
+	einfo "Removing outdated files..."
+	find . -name "missing" -print -delete
+	eautoreconf
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
diff --git a/media-sound/orpheus/orpheus-1.6-r3.ebuild b/media-sound/orpheus/orpheus-1.6-r3.ebuild
new file mode 100644
index 000000000000..774baecbecde
--- /dev/null
+++ b/media-sound/orpheus/orpheus-1.6-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Command line MP3 player"
+HOMEPAGE="http://konst.org.ua/en/orpheus"
+SRC_URI="http://konst.org.ua/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0=
+	media-libs/libvorbis
+	media-sound/mpg123
+	media-sound/vorbis-tools[ogg123]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/1.5-amd64.patch"
+	"${FILESDIR}/101_fix-buffer-overflow.diff"
+	"${FILESDIR}/${P}-fix-buildsystem.patch"
+	"${FILESDIR}/${P}-cppflags.patch"
+	"${FILESDIR}/${P}-bufsize.patch"
+	"${FILESDIR}/${P}-gcc47.patch"
+	"${FILESDIR}/${P}-constify.patch"
+)
+
+src_prepare() {
+	# rename all configure.in files to prevent future
+	# autoconf breakage
+	local i
+	for i in "" "kkstrtext-0.1" "kkconsui-0.1"
+	do
+		mv ./${i}/configure.{in,ac} || die
+	done
+
+	default
+	cp "${S}"/{config.rpath,kkstrtext-0.1} || die
+
+	eautoreconf
+}
diff --git a/media-sound/pamix/Manifest b/media-sound/pamix/Manifest
new file mode 100644
index 000000000000..c34eea50a588
--- /dev/null
+++ b/media-sound/pamix/Manifest
@@ -0,0 +1,7 @@
+DIST pamix-1.4.1.tar.gz 15900 SHA256 52c0022bb650d93ee348a7e50156bc94dd9a77a47fff279b07e92f0b40ce145d SHA512 2b33f384760f7706a10879ba51f027fd47e46f53c7a784feae0adf18f0badd7826a19a6ed75886a0c78afa115ca0725ddf7e319e55565f5b05081578310512d2 WHIRLPOOL b6a4b25edb1eb4c7dbe3cff88c0fd874d2608143daf15f4edcb56e99441d43d5f96483aaa4e5aaa57e4b0d3e5fba7e5e533c99595aac10602e06d8e156e57739
+DIST pamix-1.5.tar.gz 16902 SHA256 f0085f00a9b0285465ad89c14d2aaa14090c1658ec4c34c49a2a42f5abb50fc3 SHA512 51516664c5f5d8d0c70565c5cdd7a91e7d40c83a49d75ca76c38286d937a737da28f9070e9d0185545d8e74999894e3afa9f1d2f8c22658f83af5c1c161f7938 WHIRLPOOL f5b6b2d7984279374c77efeedd5c45558a8accf3e328d499f65c4a2c327ef8f36b827952a0bcb57c879b84c24816043f9984759a87db57a8f044ca24ff3319b5
+EBUILD pamix-1.4.1.ebuild 776 SHA256 fae05cad9c48390ee314d5760979439f479bb73b7c7de8aee63919bd68ebdafb SHA512 b2c5f9027d1e691b6a3a2f90645666f7df5e7bfaef4f0b8817d603d35c16f1a36e6743c3fc6bdf8d6aac5a7c205b91895e495a37d0daf64e91dd71e4f8a07b72 WHIRLPOOL 4a1878d3367d264d44b02dfbfa14e0b4fe5665c58b93d5c47dc13f042b77e2f7314e3f84416d829836f1761471b9090c1f069b507392f35c432511d5b65dca5f
+EBUILD pamix-1.5.ebuild 775 SHA256 bd4b36038ca9543e17060345512037e9f9a54ced1d65564a06bfa005b3a95573 SHA512 a550d7a541050ee64b1b391d5b5eda0ec3eab2b780b86066e22696599ea490ba561415915c403e66ec79284eed3133470f7b2aaf70d63d2aac703b136df26976 WHIRLPOOL 0459a080cb88720baeae970840fa65fbd2d069aad9fa87fb3273fcdeb8deefe5d2a4242c492612d73e890c4c8e9466f71eaec9cbe9766b1a48e3d5948d6f8ba4
+EBUILD pamix-9999.ebuild 776 SHA256 fae05cad9c48390ee314d5760979439f479bb73b7c7de8aee63919bd68ebdafb SHA512 b2c5f9027d1e691b6a3a2f90645666f7df5e7bfaef4f0b8817d603d35c16f1a36e6743c3fc6bdf8d6aac5a7c205b91895e495a37d0daf64e91dd71e4f8a07b72 WHIRLPOOL 4a1878d3367d264d44b02dfbfa14e0b4fe5665c58b93d5c47dc13f042b77e2f7314e3f84416d829836f1761471b9090c1f069b507392f35c432511d5b65dca5f
+MISC ChangeLog 2471 SHA256 12908fff5d53a343c5ece7de46476a9fc02181b33f002f55ba5ed4afb05f2161 SHA512 f63d9b88230fcda271b98b69f63eec9185b8884883f3798e5b5fe3b419e4af9e774c31e56932e8dc134e8fa2f1ad090f95db6b6fddc3140ae8c0403d1c04e994 WHIRLPOOL ef6906b27ac054273028ac2d520a868965d7b39d210928a3aed4c52026cec6a181c2ee41d0192643a71b89943125fea42671796df66a533e6ccedd66b9190a67
+MISC metadata.xml 341 SHA256 f98c7ea77e2c8e56490880713992bdb2960fe0028c517d95516e74c344c943b4 SHA512 8ca39f3e12bac0db8cd11f2ef8707d06fe1008f265bc99b0757650e98d4c2e36c4693cc46c7e657b26f7737e29479ac64a22e305171072bbbc74ab48ea67b5cf WHIRLPOOL 3af79a894a7a9131094a094de2ed04d2f275cf70eb89647b54d38ab1da05e51e4de84a9de5e890e21cbd6e706bf44bbc85ed1dd3be75f9b3685cbf7363a861c7
diff --git a/media-sound/pamix/metadata.xml b/media-sound/pamix/metadata.xml
new file mode 100644
index 000000000000..88f381f7a09d
--- /dev/null
+++ b/media-sound/pamix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">patroclos/PAmix</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/pamix/pamix-1.4.1.ebuild b/media-sound/pamix/pamix-1.4.1.ebuild
new file mode 100644
index 000000000000..05816380caad
--- /dev/null
+++ b/media-sound/pamix/pamix-1.4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" == 9999 ]] && SCM="git-r3"
+inherit autotools ${SCM}
+unset SCM
+
+DESCRIPTION="A PulseAudio NCurses mixer"
+HOMEPAGE="https://github.com/patroclos/PAmix"
+LICENSE="MIT"
+SLOT="0"
+IUSE="+unicode"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
+else
+	SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/PAmix-${PV}"
+fi
+
+RDEPEND="media-sound/pulseaudio
+	sys-libs/ncurses:0=[unicode?]"
+DEPEND="sys-devel/autoconf-archive
+	virtual/pkgconfig
+	${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable unicode)
+}
diff --git a/media-sound/pamix/pamix-1.5.ebuild b/media-sound/pamix/pamix-1.5.ebuild
new file mode 100644
index 000000000000..1efd5b465935
--- /dev/null
+++ b/media-sound/pamix/pamix-1.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" == 9999 ]] && SCM="git-r3"
+inherit autotools ${SCM}
+unset SCM
+
+DESCRIPTION="A PulseAudio NCurses mixer"
+HOMEPAGE="https://github.com/patroclos/PAmix"
+LICENSE="MIT"
+SLOT="0"
+IUSE="+unicode"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
+else
+	SRC_URI="https://github.com/patroclos/PAmix/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/PAmix-${PV}"
+fi
+
+RDEPEND="media-sound/pulseaudio
+	sys-libs/ncurses:0=[unicode?]"
+DEPEND="sys-devel/autoconf-archive
+	virtual/pkgconfig
+	${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable unicode)
+}
diff --git a/media-sound/pamix/pamix-9999.ebuild b/media-sound/pamix/pamix-9999.ebuild
new file mode 100644
index 000000000000..05816380caad
--- /dev/null
+++ b/media-sound/pamix/pamix-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+[[ "${PV}" == 9999 ]] && SCM="git-r3"
+inherit autotools ${SCM}
+unset SCM
+
+DESCRIPTION="A PulseAudio NCurses mixer"
+HOMEPAGE="https://github.com/patroclos/PAmix"
+LICENSE="MIT"
+SLOT="0"
+IUSE="+unicode"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/patroclos/PAmix.git"
+else
+	SRC_URI="https://github.com/patroclos/PAmix/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/PAmix-${PV}"
+fi
+
+RDEPEND="media-sound/pulseaudio
+	sys-libs/ncurses:0=[unicode?]"
+DEPEND="sys-devel/autoconf-archive
+	virtual/pkgconfig
+	${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable unicode)
+}
diff --git a/media-sound/paprefs/Manifest b/media-sound/paprefs/Manifest
new file mode 100644
index 000000000000..08df3dde3efc
--- /dev/null
+++ b/media-sound/paprefs/Manifest
@@ -0,0 +1,5 @@
+DIST paprefs-0.9.10.tar.xz 163444 SHA256 261c5a67543f2d0c019894fb933949f6ee7c5e181808e1e9565f0784961eabb0 SHA512 51823fc28b82559f948361c62e3c9a0b6ca9f4c3b483d4a63258d9e061d0b4fb01d7282f6cb5bfe2679a676d63737c0282fe183cf4de9a0d5afd2c9a901e20cc WHIRLPOOL eb8171967c5b3bfd661aacf86d334c945530ed8a46bb235924795ed4289dfb215f2d09848d3aaaa84be1c2df3b8bfa9b77db86481896b25e86048d9bd8a0e9c6
+EBUILD paprefs-0.9.10.ebuild 891 SHA256 5b6542492d9b2bfcbae5efaf6b285c0fb9850eb2e0a7ee8861677778f0df8b4a SHA512 3f8fc067216fcba9b673b33bce256958d19b8c2a528e2c2b6ff3d6ce37b0eef21ffe34d1ca0581ac57e2d58420872d4ab978ebb9636cd770df6d6887ad4cde4c WHIRLPOOL 2d293f1490bc44514731ccca92d416801cec45118e06d15e7e50d9f6f83f5ddaad4c92257163642aa632359bdd3861b0a663523b4f10cdd8cba491c0cd597dac
+MISC ChangeLog 3551 SHA256 1d1448f92cf656ea2d03442c9972d06cd2b68f5ff0bd28c376ae3d81c0ba92e2 SHA512 df17712ecbee21050bdb5b0b21491f2e50c1d7c6e33784458a3333f0cbd4a4442b856fb942e289dd5eaf80b13c1ded26965c31f99ce7cb11d2af92d7a49064b6 WHIRLPOOL c4204eee6878bd301eff55866d0ac1b00df0ab6c32c74a268d1f18dc0a5ba625ad94cb77922e79aeee8f9965caf4594b6c9f5f79457da8776d84c3f95db4ff49
+MISC ChangeLog-2015 3984 SHA256 42b3a16b2be0ab6e3f37fdd72fc8c9fe6b25ded479113c60c72b14d991d48df4 SHA512 6f6834227b98f74ff1f1960e6b5d23bd46aec338dcaae18e4135a77d70ed380899f8bb63c819ed0d2ec2f855cba3038bceb5f7f98911e51619b34edb28d812df WHIRLPOOL ba7b22195e734fa1260aee0a241eade624ed2a12b4573ea2fef67a58d2fe6e738495b7eeec377de5aab37d7246edf75bf7e293bc3f2a3797f5815a593af8b226
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/paprefs/metadata.xml b/media-sound/paprefs/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/paprefs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/paprefs/paprefs-0.9.10.ebuild b/media-sound/paprefs/paprefs-0.9.10.ebuild
new file mode 100644
index 000000000000..fb32deaf5096
--- /dev/null
+++ b/media-sound/paprefs/paprefs-0.9.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit flag-o-matic
+
+DESCRIPTION="PulseAudio Preferences, configuration dialog for PulseAudio"
+HOMEPAGE="https://freedesktop.org/software/pulseaudio/paprefs"
+SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="nls"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	dev-cpp/libglademm:2.4
+	>=dev-cpp/gconfmm-2.6
+	>=dev-libs/libsigc++-2.2:2
+	media-sound/pulseaudio[glib,gnome]
+	|| ( x11-themes/tango-icon-theme x11-themes/adwaita-icon-theme )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext
+		dev-util/intltool )
+	virtual/pkgconfig"
+
+src_configure() {
+	append-cxxflags -std=c++11 #568590
+	econf \
+		--disable-dependency-tracking \
+		--disable-lynx \
+		$(use_enable nls)
+}
+
+src_install() {
+	default
+	dohtml -r doc
+}
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
new file mode 100644
index 000000000000..330358314e19
--- /dev/null
+++ b/media-sound/pasystray/Manifest
@@ -0,0 +1,9 @@
+AUX fix-missing-gint.patch 629 SHA256 f4fac19ba12a46a82cdc40533a1f5ff2bad6edc51fc7b3426564c6f45582fbbf SHA512 66aaa515cbb7a76f6f87fa527723cc60082ed77efeb02cb8fef784be3ab8a8fbec37ec61d7ff67c4b0cc0074cc281dd238c19cb1fb7686e57bb274b226dc25c9 WHIRLPOOL d2085d2dd8d3e5a2d0dba7a749aeaf9a170b3b9ba0d7c8f798ace4ddb37fe8fb0a8f6938177cbd5f0ae569b778ffd91427b3313a69998015d3693fdb2b77f2c9
+DIST pasystray-0.2.1.tar.bz2 100456 SHA256 d24fe23773e0a25fd32aefe101bb703ca42a487c8e25411c831621332cee61a7 SHA512 db7c05c2eb5fd3dada2e3c23f28978497d17a2147078390ab3e8c88654c4bd8ce48d07a15e9a5b3834acffcc2d86fa719ce2403255915bdfb2eb610bd0549041 WHIRLPOOL 71e4519b9bf6012e770820cf1a72bfb875a34eb87e74eab87edc4a18e01d88ecabf56b88e30686ae409d6fe2456a1058a3194ce539e72934410ba402d72cdd22
+DIST pasystray-0.6.0.tar.gz 53835 SHA256 44383b38fdafbbcb05d212b4f374c57a263f627d137ee51f5d956887a82ea271 SHA512 51fdb5aab22ad10ffe73f6de68115ee1559f09f58cfe4d5201a2f262323ca3476a8b09c7fc02c4144414f44444661edd25d2d39b3de54ed4c662660867da622c WHIRLPOOL 915987ba126903a2fee004dc660d508cfd16b45d0702947e37569257e51c1954f8764674d76946f0fbd07b21f846e7bde4ee7e20ec8267bd85b885122a749570
+EBUILD pasystray-0.2.1.ebuild 879 SHA256 78a35ce05413a3ce0a41ce00f78faf9eb90c6340d2e04359e4a19caa86dbfcb6 SHA512 f74684712b6d36c901c70c69953b98947eda6e79e88e78e743f0de183bd6253d9bc6d71938ceb9f6bcefd9771783555fff1749cef1f8def7dacc2d559e5ad418 WHIRLPOOL 4beea7e95444562f1bd9b7b72c8bccb3147f72d2a23a6b5a4a63b7eb154620eac13644fdceecbd7f00e66dd70ca9aa37d614a4015b4612cbf8c880534f398e54
+EBUILD pasystray-0.6.0-r1.ebuild 1043 SHA256 a5a0c219c8307468ad3f3bb75e57425da50e7624a74abb3252c0d4c54ca909db SHA512 534ffc663633ba4cc9c7f539db311e35dd973ffc08a76b5638dc32e4d48999583e73c94863e1937ac8e66af05816e20de447e557569e86f4e06f043698f7d0b7 WHIRLPOOL eadac124ae04ebd2adfe8556382d09628aa88bb5e54cbc315127a509120f20bfb049fb02effc4c7e3ecd1037817a02f129da54abbbe418737ee820a0c858250a
+EBUILD pasystray-0.6.0-r2.ebuild 1098 SHA256 fa7929c9e3b58d05dfa4b21a71751d1f1b8d2aeb3c720c2122a825a813bd8baa SHA512 6a11e33c0ce6cd4f4272978d2371b219e697c554b32a3596519eb9be7b621d3e5aff01ff308b8e912d53be4d767fc2f9e4ded71bf47244ca2d5379fc43e3c4b7 WHIRLPOOL e9d9272e8cfbcda1fb6682f3f4755e85b653b53b40d81124214ab51e5442a76065fd216f9d0dde1ec895e90ad431847cf89460990a6dd7aed72771c9d3548256
+MISC ChangeLog 3159 SHA256 bf0cb9d301cc8ec140541bbaab5641fd1085e9a4767afa8263d0bec656977c3d SHA512 6bbcff42106d8560c5cf6bbc3088c3df8683e60d9b0de95cd94d710baa1e5fb9173515054c61aedf464c26c4ec3aeebd749a0929b41343100e0b124b605955c8 WHIRLPOOL 6e9fa30f7fd9f9757fa8a355f82436fcb954394cc2af2b7cd9a77cf8e601c707c8e6fce0acdddd6af3ffd1db24a5a3649b26a48917e44b237a1e083caba7ecef
+MISC ChangeLog-2015 900 SHA256 ed577aac0d87e6454cb12f96d08f914847dfdbf38a38254f65d4522144f3243b SHA512 1d97d4b47fc4e0d02695e6a008eaa2129635ad24787d3bdfbc913bdf2593fad28c2d89d268152fae6b2ea68e14d6d7c2a215cdbb6c34947365f4459a5d5a443a WHIRLPOOL 87f9b089e35b5bccaba33f9927b899e19de4934db10a9c677c7da5c0fc862d9c34dbbae16414b7927a6c546bb2332dbd2812400a897c29e61ded32e6ca8b4eb2
+MISC metadata.xml 730 SHA256 53ad61a70394e35a6ad0724fd5594083b8882f0843f6cb3dff7b78a3e2693d1d SHA512 18850c548477a5871ce9ea07a3a8a4711654d3b5fec4faec985547c44f42e16f183f1c130766aa3a1e7caff4fa18459f8f5ac7c58bd22581409e2d14a8791d4d WHIRLPOOL 1a767c56735d547630ac2a68c4394eadc90b3e82763d512775ae5164fe6e5a57b14a20a3959792e38c03cb883bdd3c84827cce08ae466dcb5e6ad2583c705e81
diff --git a/media-sound/pasystray/files/fix-missing-gint.patch b/media-sound/pasystray/files/fix-missing-gint.patch
new file mode 100644
index 000000000000..7eeded9284f1
--- /dev/null
+++ b/media-sound/pasystray/files/fix-missing-gint.patch
@@ -0,0 +1,20 @@
+diff --git a/src/notify.c b/src/notify.c
+index adec0ca..8b54808 100644
+--- a/src/notify.c
++++ b/src/notify.c
+@@ -23,11 +23,13 @@
+ 
+ #ifndef HAVE_NOTIFY
+ 
++#include <glib.h>
++
+ #include "notify.h"
+ 
+ void notify_initialize(){}
+-notify_handle_t notify(const char* msg, const char* body, const char* icon){ return 0; }
+-void notify_update(notify_handle_t h, const char* msg, const char* body, const char* icon){}
++notify_handle_t notify(const char* msg, const char* body, const char* icon, gint value){ return 0; }
++void notify_update(notify_handle_t h, const char* msg, const char* body, const char* icon, gint value){}
+ 
+ #else
+ 
diff --git a/media-sound/pasystray/metadata.xml b/media-sound/pasystray/metadata.xml
new file mode 100644
index 000000000000..2499ed091c18
--- /dev/null
+++ b/media-sound/pasystray/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+        	<email>lmiphay@gmail.com</email>
+	        <name>Paul Healy</name>
+	        <description>Proxy maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+        	<email>sound@gentoo.org</email>
+        	<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer type="project">
+        	<email>proxy-maint@gentoo.org</email>
+        	<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">christophgysin/pasystray</remote-id>
+		<bugs-to>https://github.com/christophgysin/pasystray/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/pasystray/pasystray-0.2.1.ebuild b/media-sound/pasystray/pasystray-0.2.1.ebuild
new file mode 100644
index 000000000000..3ce386fe140d
--- /dev/null
+++ b/media-sound/pasystray/pasystray-0.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit gnome2-utils
+
+DESCRIPTION="A system tray for pulseaudio controls (replacement for the deprecated padevchooser)"
+HOMEPAGE="https://github.com/christophgysin/pasystray"
+SRC_URI="mirror://github/christophgysin/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="
+	|| ( >=media-sound/pulseaudio-1.0[glib,avahi] >=media-sound/pulseaudio-5.0-r3[glib,zeroconf] )
+	>=net-dns/avahi-0.6
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS README TODO"
+
+src_configure() {
+	econf $(use_enable libnotify notify)
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/pasystray/pasystray-0.6.0-r1.ebuild b/media-sound/pasystray/pasystray-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..2730461f08c8
--- /dev/null
+++ b/media-sound/pasystray/pasystray-0.6.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils autotools vcs-snapshot xdg
+
+DESCRIPTION="PulseAudio system tray"
+HOMEPAGE="https://github.com/christophgysin/pasystray"
+SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify zeroconf"
+
+RDEPEND="
+	>=dev-libs/glib-2.48.2
+	>=media-sound/pulseaudio-5.0-r3[glib,zeroconf?]
+	zeroconf? ( >=net-dns/avahi-0.6 )
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable libnotify notify) \
+		$(use_enable zeroconf avahi)
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/pasystray/pasystray-0.6.0-r2.ebuild b/media-sound/pasystray/pasystray-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..d4c1899f2812
--- /dev/null
+++ b/media-sound/pasystray/pasystray-0.6.0-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils autotools vcs-snapshot xdg
+
+DESCRIPTION="PulseAudio system tray"
+HOMEPAGE="https://github.com/christophgysin/pasystray"
+SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="libnotify zeroconf"
+
+RDEPEND="
+	>=dev-libs/glib-2.48.2
+	>=media-sound/pulseaudio-5.0-r3[glib,zeroconf?]
+	zeroconf? ( >=net-dns/avahi-0.6 )
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/fix-missing-gint.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable libnotify notify) \
+		$(use_enable zeroconf avahi)
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
new file mode 100644
index 000000000000..a83cd8c153e0
--- /dev/null
+++ b/media-sound/patchage/Manifest
@@ -0,0 +1,8 @@
+AUX patchage-0.5.0-desktop.patch 224 SHA256 0d078e63c5dbdde508be319e7180fa1694e7575414e0cdc062b0559d66da389c SHA512 ae000bc340d48a9bb89fc067b4b1abba3de39ef9be086c7eeffae71ddca6172ce500ea6ea9854fde8cc19df3117195cb6fdb4ecd0867aa69f332ac0a7d377b69 WHIRLPOOL 4edab48a5b35eba0eb0dbcd6545c09581f85c1910a9a81a16b22f8d8451c053e6567fa8aa5ec98e86a3b74b2639344239ec90508a625e0ac7846db22b3f6d004
+DIST patchage-0.5.0.tar.bz2 411848 SHA256 9bb9d1ba0205c0ad95c6dbecba56c513ff706f1057348d33ff7567bc9cbd89d2 SHA512 2b6c971f5fb192309734d6f42f17db83979805e6dcafbc95b343c3749afd85ea65c9b7d101b0b4bdf5102b6d60394cabcaa0d511aeb3fe1bf2db924b7e8b46cf WHIRLPOOL 03cf8510a6994edd0424982b1d336e99dda6096e90fb1f03057d965d333324936ab0edb386d0a048c6141ec0dad4d12419379210701c23c18fe7d81f15eb1ca0
+DIST patchage-1.0.0.tar.bz2 414300 SHA256 6b21d74ef1b54fa62be8d6ba65ca8b61c7b6b5230cc85e093527081239bfeda9 SHA512 0a2be0183257a34a68ec84e6fb17d29a3d8ba7dd54a05fcdd13784ac8f5621eb7a376f17d42168958f5e1a8dab8858a9c5c8c867aa1838736cc2b7775f75f510 WHIRLPOOL 86278e94a71069e86a92d3f00ae61a99aca710738df79345ffa47d797df340719dce452c19b0a6165420bba97f3fc7d27f918dc4e294e90bfe4158d7a4f333bb
+EBUILD patchage-0.5.0-r1.ebuild 1086 SHA256 1622073741e1ff0375414fce8c7b2af9c6959f58c19fb8cb611f1ad6713396e5 SHA512 47740b4f02296904862aeb732ef24cf4c74901c85983c709124f7e94f3d06daa5051bf3b8fcb2b15b4df680d4bc6df11a7ef2326b7c11278ccb3d42fd755e428 WHIRLPOOL 22fe0c4d72befbf01be7986e7ee8fe164fde66a8feec9c3857b75bf07af9be9b0f0570875e4b6ef9e3d4d3d33591734983edbbfc47864ba685cd4e028ebff622
+EBUILD patchage-1.0.0.ebuild 1054 SHA256 e0ff43e91b4b7b862b075200d6e69788dcdd55e1754cb3450e493d5595fc87ac SHA512 91f656b6084e36c9f85a8aaf62eb53dae8396f031611a1a20a1f0acc9e454df56835b117a41652de8d2da82a8a11800698d22bb2a43b8c4df127d5514452ec15 WHIRLPOOL 9c3a51dcc8dbd79210298461de2859825370e8daeddd9dffac6fb99e112a386f8eb0dcc20f5610816ee140ee75f1a8fb70bf5473ab7cf802a527fe2e0ae59f4e
+MISC ChangeLog 3077 SHA256 b13205431c6de491b64eacc47d715386e76f9118e2946cc6c8ce80176b35721f SHA512 82961960734d5c4b8376821b1245785fcc8d0ecb35a8fb5650344c765922ad902830cc3cba01b0e39012fe3518c79e67ee59c03a6142549c9b72bee7c92d3d9a WHIRLPOOL 3f1e0ee00fbdf3c756cb66bfda31321dc25e9f174e86a8879354c91e8f09c83daa8a8ec28ee91bcc8a11383dc059ad9cf0158d6df59ab8fce61fa947c93ab2ee
+MISC ChangeLog-2015 3509 SHA256 939f52d0c7e2c721a60142f5221cbb39d764c2e4039e56d2c33c759b760f7b95 SHA512 ec7e4b26daffe052ebe391486e2b45e699bbfcdee78f5e2f7ed694ab9ea181d77d6451ed06c01c73fedeef6461f1c6ce7f2c4f3d0e6a3a50ed8c9e595a05025e WHIRLPOOL dd42819d3607cdeb29fe162522aae6ccac8703a79f3c497f3216678135efc8588361971be1691327269e2347b3f2ae39be1d8caa9ea71e5c236d2c7193faeb85
+MISC metadata.xml 600 SHA256 328d5523796f70d83115dfb2ca81d1482e3f2b6fd3fecb4aad9173e1b3fc400f SHA512 d08bd05a57ca03d9f91c0904f9a1b92e332e4475fd6729feefb63c75df2c5ad6eebd718b6e7db8482819f463606dcca888400c1560dd9b2c9e426c26634ece77 WHIRLPOOL d2ae8940cafd4cc656938963bded9738c790a8022edb43f579f23014f05073d1ff7792a177683b760a3722c1c1634bdc656fd265195b2864f9d87402511734b9
diff --git a/media-sound/patchage/files/patchage-0.5.0-desktop.patch b/media-sound/patchage/files/patchage-0.5.0-desktop.patch
new file mode 100644
index 000000000000..cf4eaeaaa788
--- /dev/null
+++ b/media-sound/patchage/files/patchage-0.5.0-desktop.patch
@@ -0,0 +1,8 @@
+--- patchage-0.5.0/patchage.desktop.in
++++ patchage-0.5.0/patchage.desktop.in
+@@ -6,4 +6,4 @@
+ Terminal=false
+ Icon=@APP_INSTALL_NAME@
+ Type=Application
+-Categories=Application;AudioVideo;Audio
++Categories=AudioVideo;Audio;
diff --git a/media-sound/patchage/metadata.xml b/media-sound/patchage/metadata.xml
new file mode 100644
index 000000000000..8817f44b941c
--- /dev/null
+++ b/media-sound/patchage/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <use>
+    <flag name="jack-dbus">Use Jack via D-Bus instead of libjack</flag>
+    <flag name="session">Include experimental Jack session management
+      (save/restore) support</flag>
+  </use>
+  <longdescription lang="en">
+    Patchage is a modular patch bay for audio and MIDI for Jack based audio
+    systems.
+  </longdescription>
+</pkgmetadata>
diff --git a/media-sound/patchage/patchage-0.5.0-r1.ebuild b/media-sound/patchage/patchage-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..e9ef3beb4975
--- /dev/null
+++ b/media-sound/patchage/patchage-0.5.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils flag-o-matic waf-utils python-any-r1
+
+DESCRIPTION="Modular patch bay for audio and MIDI systems"
+HOMEPAGE="http://wiki.drobilla.net/Patchage"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="alsa debug lash"
+
+RDEPEND=">=media-libs/raul-0.7.0
+	>=x11-libs/flowcanvas-0.7.1
+	>=dev-cpp/gtkmm-2.11.12:2.4
+	>=dev-cpp/glibmm-2.14:2
+	>=dev-cpp/libglademm-2.6.0:2.4
+	dev-cpp/libgnomecanvasmm:2.6
+	>=media-sound/jack-audio-connection-kit-0.107
+	alsa? ( media-libs/alsa-lib )
+	lash? ( dev-libs/dbus-glib )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS README ChangeLog )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktop.patch
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	waf-utils_src_configure \
+		$(use debug && echo "--debug") \
+		$(use alsa || echo "--no-alsa") \
+		$(use lash || echo "--no-lash")
+}
diff --git a/media-sound/patchage/patchage-1.0.0.ebuild b/media-sound/patchage/patchage-1.0.0.ebuild
new file mode 100644
index 000000000000..87cdc2f529e1
--- /dev/null
+++ b/media-sound/patchage/patchage-1.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+inherit waf-utils python-any-r1
+
+DESCRIPTION="Modular patch bay for JACK-based audio and MIDI systems"
+HOMEPAGE="http://drobilla.net/software/patchage"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack-dbus session"
+
+RDEPEND=">=dev-cpp/glibmm-2.14:2
+	>=dev-cpp/gtkmm-2.11.12:2.4
+	>=dev-cpp/libglademm-2.6.0:2.4
+	dev-cpp/libgnomecanvasmm:2.6
+	>=media-libs/ganv-1.4.0
+	>=media-sound/jack-audio-connection-kit-0.120.0
+	alsa? ( media-libs/alsa-lib )
+	jack-dbus? ( dev-libs/dbus-glib
+		sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+src_configure() {
+	waf-utils_src_configure \
+		$(use debug && echo "--debug") \
+		$(use alsa || echo "--no-alsa") \
+		$(use jack-dbus && echo "--jack-dbus") \
+		$(use session && echo "--jack-session-manage")
+}
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
new file mode 100644
index 000000000000..05c2004cb361
--- /dev/null
+++ b/media-sound/pavucontrol/Manifest
@@ -0,0 +1,8 @@
+AUX pavucontrol-2.0-fix-startup-crashes.patch 7437 SHA256 7502d564db65c83b4def1bb59c4cc143f615cb96da36e84a3d18604df1b90467 SHA512 f5cfdc8731867bcda61a38ccd30a91b2dc3e28106bae7300254957e6e1f8fd8806322c9bd90b7bd2f269aa6190203c1b9f545c18bd5b3f11c3f2d6983f114aac WHIRLPOOL cd6eaf1e3e0dc57e1db5326a148e517c08fe7fd2e379b8647cbfffc341f33c8ae2d66528ecd75d2d55dc2dd3b8d54e50b97dbf854849021c54c66ceee25197aa
+DIST pavucontrol-2.0.tar.xz 151560 SHA256 22f29dd81b4a1a34ec7bffe9b027aff2a37fc76ccded4539d43a8c126a39470b SHA512 2b5f83f79cf6d7ce94bd836278274acb09824af389f5a7ad7d3977db743d8f9c5def78d8e9dea901a7e05355cfebb060f513cf01997baf546fd2dd2ada0513b1 WHIRLPOOL f85b60363ea30aee976e4e704bddf607b4e18ea9f9041d63acd0dc36183e103435f37c70e3b55b6327b7b1c7291c898b8167742cbcc7c47ebcd83a10f790d33c
+DIST pavucontrol-3.0.tar.xz 145092 SHA256 b3d2ea5a25fc88dcee80c396014f72df1b4742f8cfbbc5349c39d64a0d338890 SHA512 3562fc50e5f60c6b6280c2d524e13cf44114bf481e5ec98b8714c7c2f162d0332179ebcf4c5a78d86f511de857bdc3aa7415e1548e0c10d4582b5958c4cacae9 WHIRLPOOL f743b900985bb2eabb2a22e0ac3f070cb6e8a3ee7373598b101c6b0522546349e85e89e30859b394a8cfd1d6b6ef5dafdc7a630cfae2f77174509780471af4a3
+EBUILD pavucontrol-2.0-r1.ebuild 942 SHA256 3bb194d3d72cb5cdd44dfcd05d4a283dda021480b586a2a0de6dc441b2fde319 SHA512 ed88a58947b6097d1aa2ea15ff121ea4cc3fb57a66e8ebdec9fa159bfe5c30c3711e763f47ea24aecf67b72cb578cbaea7e01714100049913699d22493b7f377 WHIRLPOOL faea94df27011a1c2ae9230c82059038c3ee89d04b0f5dc49d2b3fa047a7e3128465a7013d0b9e755c9bb8d2503a807341040d17b77ea7b4afc04371bd1cb62a
+EBUILD pavucontrol-3.0.ebuild 874 SHA256 1de0ce60d6ad7fa3118a5a14d8fbb46207874217c4bd200782f6985fbb403d11 SHA512 375fb354831c40b2cb4cbdc506b8f34cd378bb4d4e1481c9f173b10be248cb73629864765ee490b73ded942039ac1c9e21c5d283a1e1a2a3d70c2f27ad80b9fd WHIRLPOOL 488be7112df00819edec48a7aaa290feb5291dbc474c4822cbb261ace35bbbc87824a2486e9385656f945bd0fb7a3d6801bfb9f5073f452204d96b7235df0f1f
+MISC ChangeLog 4614 SHA256 79861cd8bcce11e6eb5a8cd996ee15a03c241f4750c74f5b617b19be0654c7e7 SHA512 8ab73f3a8d2e377775aede0c7d983966c8d44c00f380ea742faf43035125529268e49291cbda976d8c6784a837d9f452df1fca423deebcc56e71f370842ec976 WHIRLPOOL 98f9e10ec3220e6e7b2609ad7e1e3ad27b5edf930ed10ae40d4001aa0d07a407fca500be5085f2faea509733dad5ecf1752d28c621ce62ac545ff9246b17e6d9
+MISC ChangeLog-2015 7111 SHA256 89fed9db2e62b9df7f6257f7b961decdbfe4871b3f0940d451ea1c2592ccd8db SHA512 e25abb794fb18d7fb54f5e8a5b468336bca0a51853f455165c75f8bfbc16e3caf09dbb2d035258f6c4a083a61bf451d581e73782fe994e8d9786bb02b6b6d7ae WHIRLPOOL 2837aee2221b3b7611341ab5b83c26b99c7af1bec1bfa82d317f4ac1ffe6bb3c6888d96b2fbe85f7c6d1330bca6d5b2d65c96815fb49983191aa640d96ca2abc
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/pavucontrol/files/pavucontrol-2.0-fix-startup-crashes.patch b/media-sound/pavucontrol/files/pavucontrol-2.0-fix-startup-crashes.patch
new file mode 100644
index 000000000000..0689290b6229
--- /dev/null
+++ b/media-sound/pavucontrol/files/pavucontrol-2.0-fix-startup-crashes.patch
@@ -0,0 +1,188 @@
+From b2362f2223b1ecc0c92fac9d261d5684f33af06f Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Thu, 28 Aug 2014 12:58:05 +0200
+Subject: Reference the widget before returning it from ::create methods
+
+Widgets (unlike Windows and Dialogs) returned by Gtk::Builder::get_widget*
+start owned by the GtkBuilder object, the idea being that they will get
+added to a container before the scope of the GtkBuilder object ends, and it
+thus automatically gets destroyed.
+
+But in the various ::create methods in pavucontrol, a pointer to the widget
+gets returned, so that it can be added to a cointainer by the caller.
+However as soon as the ::create method exits the GtkBuilder object owning
+the widget, and thus also the widget gets destroyed, and we end up returning
+free-ed memory.
+
+This commit fixes this by making all ::create methods take a reference on
+the widget before returning it, and having all the callers unreference the
+widget after adding it to a container.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=83144
+https://bugzilla.redhat.com/show_bug.cgi?id=1133339
+
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+
+diff --git a/src/cardwidget.cc b/src/cardwidget.cc
+index c79ac6c..28c558d 100644
+--- a/src/cardwidget.cc
++++ b/src/cardwidget.cc
+@@ -45,6 +45,7 @@ CardWidget* CardWidget::create() {
+     CardWidget* w;
+     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "cardWidget");
+     x->get_widget_derived("cardWidget", w);
++    w->reference();
+     return w;
+ }
+ 
+diff --git a/src/channelwidget.cc b/src/channelwidget.cc
+index 6f59de2..fe94c11 100644
+--- a/src/channelwidget.cc
++++ b/src/channelwidget.cc
+@@ -53,6 +53,7 @@ ChannelWidget* ChannelWidget::create() {
+     x->add_from_file(GLADE_FILE, "adjustment1");
+     x->add_from_file(GLADE_FILE, "channelWidget");
+     x->get_widget_derived("channelWidget", w);
++    w->reference();
+     return w;
+ }
+ 
+diff --git a/src/devicewidget.cc b/src/devicewidget.cc
+index 1a148ee..813780f 100644
+--- a/src/devicewidget.cc
++++ b/src/devicewidget.cc
+@@ -89,6 +89,7 @@ void DeviceWidget::setChannelMap(const pa_channel_map &m, bool can_decibel) {
+         snprintf(text, sizeof(text), "<b>%s</b>", pa_channel_position_to_pretty_string(m.map[i]));
+         cw->channelLabel->set_markup(text);
+         channelsVBox->pack_start(*cw, false, false, 0);
++        cw->unreference();
+     }
+     channelWidgets[m.channels-1]->last = true;
+ 
+diff --git a/src/mainwindow.cc b/src/mainwindow.cc
+index 5a42318..5d205fb 100644
+--- a/src/mainwindow.cc
++++ b/src/mainwindow.cc
+@@ -300,6 +300,7 @@ void MainWindow::updateCard(const pa_card_info &info) {
+     else {
+         cardWidgets[info.index] = w = CardWidget::create();
+         cardsVBox->pack_start(*w, false, false, 0);
++        w->unreference();
+         w->index = info.index;
+         is_new = true;
+     }
+@@ -416,6 +417,7 @@ bool MainWindow::updateSink(const pa_sink_info &info) {
+         sinkWidgets[info.index] = w = SinkWidget::create(this);
+         w->setChannelMap(info.channel_map, !!(info.flags & PA_SINK_DECIBEL_VOLUME));
+         sinksVBox->pack_start(*w, false, false, 0);
++        w->unreference();
+         w->index = info.index;
+         w->monitor_index = info.monitor_source;
+         is_new = true;
+@@ -570,6 +572,7 @@ void MainWindow::updateSource(const pa_source_info &info) {
+         sourceWidgets[info.index] = w = SourceWidget::create(this);
+         w->setChannelMap(info.channel_map, !!(info.flags & PA_SOURCE_DECIBEL_VOLUME));
+         sourcesVBox->pack_start(*w, false, false, 0);
++        w->unreference();
+         w->index = info.index;
+         is_new = true;
+ 
+@@ -686,6 +689,7 @@ void MainWindow::updateSinkInput(const pa_sink_input_info &info) {
+         sinkInputWidgets[info.index] = w = SinkInputWidget::create(this);
+         w->setChannelMap(info.channel_map, true);
+         streamsVBox->pack_start(*w, false, false, 0);
++        w->unreference();
+         w->index = info.index;
+         w->clientIndex = info.client;
+         is_new = true;
+@@ -743,6 +747,7 @@ void MainWindow::updateSourceOutput(const pa_source_output_info &info) {
+         w->setChannelMap(info.channel_map, true);
+ #endif
+         recsVBox->pack_start(*w, false, false, 0);
++        w->unreference();
+         w->index = info.index;
+         w->clientIndex = info.client;
+         is_new = true;
+@@ -838,6 +843,7 @@ bool MainWindow::createEventRoleWidget() {
+ 
+     eventRoleWidget = RoleWidget::create();
+     streamsVBox->pack_start(*eventRoleWidget, false, false, 0);
++    eventRoleWidget->unreference();
+     eventRoleWidget->role = "sink-input-by-media-role:event";
+     eventRoleWidget->setChannelMap(cm, true);
+ 
+diff --git a/src/rolewidget.cc b/src/rolewidget.cc
+index fd3196c..db07f92 100644
+--- a/src/rolewidget.cc
++++ b/src/rolewidget.cc
+@@ -40,6 +40,7 @@ RoleWidget* RoleWidget::create() {
+     RoleWidget* w;
+     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget");
+     x->get_widget_derived("streamWidget", w);
++    w->reference();
+     return w;
+ }
+ 
+diff --git a/src/sinkinputwidget.cc b/src/sinkinputwidget.cc
+index b88b718..5a0ba39 100644
+--- a/src/sinkinputwidget.cc
++++ b/src/sinkinputwidget.cc
+@@ -43,6 +43,7 @@ SinkInputWidget* SinkInputWidget::create(MainWindow* mainWindow) {
+     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget");
+     x->get_widget_derived("streamWidget", w);
+     w->init(mainWindow);
++    w->reference();
+     return w;
+ }
+ 
+diff --git a/src/sinkwidget.cc b/src/sinkwidget.cc
+index 7f4902c..f682cf2 100644
+--- a/src/sinkwidget.cc
++++ b/src/sinkwidget.cc
+@@ -82,6 +82,7 @@ SinkWidget* SinkWidget::create(MainWindow* mainWindow) {
+     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget");
+     x->get_widget_derived("deviceWidget", w);
+     w->init(mainWindow, "sink");
++    w->reference();
+     return w;
+ }
+ 
+diff --git a/src/sourceoutputwidget.cc b/src/sourceoutputwidget.cc
+index 827c5a8..4d915b0 100644
+--- a/src/sourceoutputwidget.cc
++++ b/src/sourceoutputwidget.cc
+@@ -49,6 +49,7 @@ SourceOutputWidget* SourceOutputWidget::create(MainWindow* mainWindow) {
+     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget");
+     x->get_widget_derived("streamWidget", w);
+     w->init(mainWindow);
++    w->reference();
+     return w;
+ }
+ 
+diff --git a/src/sourcewidget.cc b/src/sourcewidget.cc
+index 5e4ecf0..fde5333 100644
+--- a/src/sourcewidget.cc
++++ b/src/sourcewidget.cc
+@@ -35,6 +35,7 @@ SourceWidget* SourceWidget::create(MainWindow* mainWindow) {
+     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget");
+     x->get_widget_derived("deviceWidget", w);
+     w->init(mainWindow, "source");
++    w->reference();
+     return w;
+ }
+ 
+diff --git a/src/streamwidget.cc b/src/streamwidget.cc
+index 94363ec..e602cce 100644
+--- a/src/streamwidget.cc
++++ b/src/streamwidget.cc
+@@ -77,6 +77,7 @@ void StreamWidget::setChannelMap(const pa_channel_map &m, bool can_decibel) {
+         snprintf(text, sizeof(text), "<b>%s</b>", pa_channel_position_to_pretty_string(m.map[i]));
+         cw->channelLabel->set_markup(text);
+         channelsVBox->pack_start(*cw, false, false, 0);
++        cw->unreference();
+     }
+     channelWidgets[m.channels-1]->last = true;
+     channelWidgets[m.channels-1]->setBaseVolume(PA_VOLUME_NORM);
+-- 
+cgit v0.10.2
+
diff --git a/media-sound/pavucontrol/metadata.xml b/media-sound/pavucontrol/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/pavucontrol/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/pavucontrol/pavucontrol-2.0-r1.ebuild b/media-sound/pavucontrol/pavucontrol-2.0-r1.ebuild
new file mode 100644
index 000000000000..de1f512e73de
--- /dev/null
+++ b/media-sound/pavucontrol/pavucontrol-2.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
+HOMEPAGE="https://freedesktop.org/software/pulseaudio/pavucontrol/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND="
+	>=dev-cpp/gtkmm-3.0:3.0
+	>=dev-libs/libsigc++-2.2:2
+	>=media-libs/libcanberra-0.16[gtk3]
+	>=media-sound/pulseaudio-3[glib]
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+		)
+"
+
+src_prepare() {
+	# Fix statup crashes (bug #530170)
+	epatch "${FILESDIR}"/${P}-fix-startup-crashes.patch
+}
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--disable-lynx \
+		$(use_enable nls)
+}
diff --git a/media-sound/pavucontrol/pavucontrol-3.0.ebuild b/media-sound/pavucontrol/pavucontrol-3.0.ebuild
new file mode 100644
index 000000000000..ff3dab09d8ee
--- /dev/null
+++ b/media-sound/pavucontrol/pavucontrol-3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit flag-o-matic
+
+DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
+HOMEPAGE="https://freedesktop.org/software/pulseaudio/pavucontrol/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="nls"
+
+RDEPEND="
+	>=dev-cpp/gtkmm-3.0:3.0
+	>=dev-libs/libsigc++-2.2:2
+	>=media-libs/libcanberra-0.16[gtk3]
+	>=media-sound/pulseaudio-3[glib]
+	virtual/freedesktop-icon-theme
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+
+src_configure() {
+	append-cxxflags -std=c++11 #567216
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html \
+		--disable-lynx \
+		$(use_enable nls)
+}
diff --git a/media-sound/pavumeter/Manifest b/media-sound/pavumeter/Manifest
new file mode 100644
index 000000000000..ba1179918766
--- /dev/null
+++ b/media-sound/pavumeter/Manifest
@@ -0,0 +1,5 @@
+DIST pavumeter-0.9.3.tar.gz 89241 SHA256 fd8d5804c27efb22d63579aba5ab69d70ad115f5eb8c7bd1d63d5024113f067b SHA512 7aa87e547a26b92d367c8b6d4ca827f9176ceabe4a66e3f4461d7b54ec85a4ac51a42ddd13793052f7948926f5152b5882d726f566176f499eea2d739a510ad8 WHIRLPOOL 067987b8aa6e3db55bb7dfec8fb201d55823c512fb783bc8e45a8c273b826694b31aa6ee0927a14a754e868d4585716b7a28ea2b1da069e7c6fc7ef406f41ee3
+EBUILD pavumeter-0.9.3-r1.ebuild 717 SHA256 7a306d8c3c12e152b856303f28b54fa4c67134a2ee911ae331ee623d00882710 SHA512 f1b523b9986559c0af5f9c34297d61ae76fefa3b91057aa7a72df1eabd17d03a8d7d8e18e07eaa15c55e7e03fac1908ed1555a2e2ee37cb99a1ea6205b058046 WHIRLPOOL 0137462abd5f5897a108376029ccfa1c925e0cf8a91b4fdd5c53898826c7f0f792dbdd36bb6934530b6863c01387b064c0d49d9988644acd86734ba33c6710b7
+MISC ChangeLog 2605 SHA256 c92b6c2de36613bf2e5f8bd8be00658f5f770a6f520f6277b91cd385b85a074c SHA512 0dd0f41cdaa6d8dd16868cd5d955d01e298b3750e6ccb2faf93ff0df55d07e1fde753f62dca216cf16a848a4a14a233387ec7b004998a31cac7234c194d515d6 WHIRLPOOL 9553a68d84860218b1724da38a141d649c4ef31aaa1f4d5eab45684cc03e20a66fce821002006100fcee1744749de50915887ea9d39248809c5884710a9d50f7
+MISC ChangeLog-2015 2229 SHA256 d0963224049f988a71714a7a751247ef09f5722a03acbbdd64b64d771ede755b SHA512 7ba318178ba5c9ad7027cf6bf39e117b4e529dda36876a2b98429dcac2962566cba73012211bdc0d933171ca3be30bc59e34e50a37f49bd13df5fa6afe57aa36 WHIRLPOOL 56b07c283d49ec92275530593672681709cd8da9caa35acc40a9cca112e500e6f67d557eb371c910f79ff073f1dd55706d7dc91ac647ae9e2df8a21d4cd9f3d1
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/pavumeter/metadata.xml b/media-sound/pavumeter/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/pavumeter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild b/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..6e371695d4b3
--- /dev/null
+++ b/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit flag-o-matic
+
+DESCRIPTION="PulseAudio Volume Meter, simple GTK volume meter for PulseAudio"
+HOMEPAGE="http://0pointer.de/lennart/projects/pavumeter/"
+SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE=""
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	dev-libs/libsigc++:2
+	>=media-sound/pulseaudio-0.9.7[glib]
+	|| ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	append-cxxflags -std=c++11 #568592
+	econf \
+		--disable-lynx
+}
+
+src_install() {
+	default
+	dohtml -r doc
+}
diff --git a/media-sound/peercast/Manifest b/media-sound/peercast/Manifest
new file mode 100644
index 000000000000..8f8da86a1db0
--- /dev/null
+++ b/media-sound/peercast/Manifest
@@ -0,0 +1,10 @@
+AUX peercast-0.1216-amd64.patch 339 SHA256 f9bcbfb554ae111a64134cfaac97374efc03fb633c62038154b16ddb605b7e8e SHA512 f179688ff12147d5eb3b411d75f05cca4d66384f132daf1d2d937a02c5362b34952f162a585828fd00691a79192d880c35ebff985b4e06439700077941d4d673 WHIRLPOOL 2d4746b99fb621f03d8245764e83293315043883e3168c3e5e877f61f923f6c9f1975f1ac2f24aabdd30d8dc951fbd81a773a5f0dd24fa92449de395133b5eee
+AUX peercast-0.1216-makefile.patch 961 SHA256 bcbc8b92b01d6720734cf4d3deca3c7f8fa7925b80ef49259066f2d2b670cc51 SHA512 693cb4594dd35d6103b5e3c6bd52e60620a3b7f3acb1a0f09e84a46a851302009fc623817620c679f6a2d470a0117cfbdc72dd3f98b0109c61ed91f9d7463276 WHIRLPOOL cc85f264708e94e56b5d0b448fc3f2666f29a1198c841b51bfd51a6bbdee83508fac7e412c1f2331cfc15b2ea5726c511d9daec32d2ff32a34fc0b8abc5a1438
+AUX peercast-0.1218-CVE-2008-2040.patch 4545 SHA256 f1455846673d28b2f35e62f672b548ef5f1303664482e98fde459e31e78144d9 SHA512 c0e3e1acae5f666fa7d7023f705a543dfd46f20144d4c6073bf80fbdb80a9f1f09e4aa1299c4c2f8a8149182098cb4036a9a7c8bd29cb7a4116956fb73aeb7a8 WHIRLPOOL fe94f0b6773e47a2fa3ec2b7d6adc3fe86c2b026798495e12b90b4b43b9f44209438680eac5ceed9809a58cb31b48f6bda422f74430ba11fc443b23f461c9d97
+AUX peercast-0.1218-glibc-2.10.patch 3332 SHA256 7ab7bb5eedbc7d136ef331c7020b9ede0dad1a51ecd0f58dc81692938aa312a9 SHA512 26fa888300a4e4f9934bf3bfbeaad35cf05ff677b7e417fbb0e1ca0163af5091b883264de151c46f9acf01f70ec5cf6f0faba886462d0593e05dbb314fbda27b WHIRLPOOL 6184b21f4995b62b0d4e1fb54c72876f31b8fe61a6959b1dcbe0d8b47a42f3ff3a9bea6f39d6a41408345e29ec4b7bc9399e86b93d72fcc6bde8a8710455be25
+AUX peercast.initd 591 SHA256 8b74cc603e2862e2f2888b684eb98bceeb2d20ffb7892e7dfe9f9ac50d89f224 SHA512 85352d87c40d468f324e179078b30412a96c0fac39f012f74c32a6509c3066729145b5df27da06eb1bce80306eb62800d0f6b0d8307021e3cadd67158760e1f2 WHIRLPOOL 4128be6e8b431588368598f4d49aee8804a4a20df2539ac8753c8a837557b39cb10fe4fd928bd0c8bf96411fba8618ea754e50abdd8157d00ba29ebd1b0bfcb4
+DIST peercast-0.1218-src.tgz 557909 SHA256 d480e3bc5a23c2e7612c05503852888126210e7159d07e9c36bf5e3716569036 SHA512 b9233fd12b8f2e7a89faa1df0e61a4cdeddede23fb56b03ff0d92614a6b43300fe683636d92ca97f200e1b066c2eda79d8d7e56597d81fe2f3766ccd6e199253 WHIRLPOOL 107b437979ad4a3aaa0bcf2fb18ed86e2696596703850e1a05c6b393779962e75a1fee6c1bd0d29946c4db89a4f09e157586bae1378fadb57d7a0e97f3c8dc3b
+EBUILD peercast-0.1218-r2.ebuild 1187 SHA256 3a1d99f6a96e7d9914a768b0f5bb82dfc2b44c09ea71e9e044f10d529d8bc9c0 SHA512 781c5b00566e0a411436788fce2de9a97ffea25597f80a4e282caf1feb23e73d89c694b5f8d360590efd10d323e82904c659625fe70ba00205a2e6d8fa7066af WHIRLPOOL 3f0f91917730b1108c91aec0498b34adfd32b2859c3f0928cd3298f95738af5df5b4e00711562985d770d591af7e4c150f0c702f2763bcaed70cfe5c17aafa31
+MISC ChangeLog 2884 SHA256 60949b68e08c0484207bc1d306c567ed6fc7a79866b01f56fe38509e9be5912d SHA512 fe1609b7c26c394780630910f32f3429b3180df6ccb985a696457e206e0e49e2f22d75ca0967336fcebe0be054d7c8401cf7210f493da5fc37a2029b1e970655 WHIRLPOOL 2f2f86727f153ae76fbb43fa4802cdf0a2a5334092793a5c03f1fe3f7bd2cad2376b1b126f33951e08c3703afa6b0f368645cfa4a93b4289f47aae22a38504fc
+MISC ChangeLog-2015 4099 SHA256 1b3462c5d3b511decd58f76113dca835c0fa8350851304ad6bc08791d9d0be39 SHA512 c91a0c8d1faa3747fb466c96a1c364fd9f56098580cd3561e7fc0fe106a6ac3bae6790467aab6a1aae8a50f000f940d99961aa8f0a732083bb9dc2859db91ffd WHIRLPOOL e0e0e39c07fa4e0790032b9e60a7be2bafa56ce74a3fd1045b8633787987a0ae94b3c4f7335ac6722245bfc0a33fe58fb85f7c344e8fc91f48cb2d876a15213e
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/peercast/files/peercast-0.1216-amd64.patch b/media-sound/peercast/files/peercast-0.1216-amd64.patch
new file mode 100644
index 000000000000..95144730d580
--- /dev/null
+++ b/media-sound/peercast/files/peercast-0.1216-amd64.patch
@@ -0,0 +1,13 @@
+Index: work/core/common/sys.h
+===================================================================
+--- work.orig/core/common/sys.h
++++ work/core/common/sys.h
+@@ -322,7 +322,7 @@ public:
+ #define _BIG_ENDIAN 1
+ #endif
+ 

+-typedef long long int64_t;
++#include <stdint.h>
+ 
+ typedef int (*THREAD_FUNC)(ThreadInfo *);
+ #define THREAD_PROC int 
diff --git a/media-sound/peercast/files/peercast-0.1216-makefile.patch b/media-sound/peercast/files/peercast-0.1216-makefile.patch
new file mode 100644
index 000000000000..e54c4ae622de
--- /dev/null
+++ b/media-sound/peercast/files/peercast-0.1216-makefile.patch
@@ -0,0 +1,26 @@
+Index: work/ui/linux/makefile
+===================================================================
+--- work.orig/ui/linux/makefile
++++ work/ui/linux/makefile
+@@ -79,10 +79,10 @@ clean:
+ 	rm  -f $(LINUXOBJ) $(COREOBJ) $(TARGET) ${LIBOBJSTATIC} ${LIBOBJSHARED} $(COREOBJSTATIC)
+ 
+ %.o: %.cpp
+-	$(CC) $(INCLUDES) $(CPPFLAGS) -fPIC -c $< -o $@
++	$(CC) $(CXXFLAGS) $(INCLUDES) $(CPPFLAGS) -fPIC -c $< -o $@
+ 
+ %.a: %.cpp
+-	$(CC) $(INCLUDES) $(CPPFLAGS) -c $< -o $@
++	$(CC) $(CXXFLAGS) $(INCLUDES) $(CPPFLAGS) -c $< -o $@
+ 
+ DEPENDFILE = makedepend
+ 
+@@ -92,7 +92,7 @@ depend: 
+ 	$(CC) $(INCLUDES) $(CPPFLAGS) -MD $(CORESOURCE) $(LINUXSOURCE) >> $(DEPENDFILE)
+ 
+ peercast-so: $(COREOBJSTATIC) $(COREOBJ) $(LINUXOBJ)
+-	$(LD) $(LDSOFLAGS),$(LIBSONAME) -o ${LIBOBJSHARED} $(COREOBJ) -lc
++	$(LD) $(LDFLAGS) $(LDSOFLAGS),$(LIBSONAME) -o ${LIBOBJSHARED} $(COREOBJ) -lc
+ 	$(LD) $(LDFLAGS) -o $@ $(LINUXOBJ) $(LIBOBJSHARED) -ldl
+ 	${AR} rcs $(LIBOBJSTATIC) $(COREOBJSTATIC)
+ 
diff --git a/media-sound/peercast/files/peercast-0.1218-CVE-2008-2040.patch b/media-sound/peercast/files/peercast-0.1218-CVE-2008-2040.patch
new file mode 100644
index 000000000000..23037ac82b74
--- /dev/null
+++ b/media-sound/peercast/files/peercast-0.1218-CVE-2008-2040.patch
@@ -0,0 +1,122 @@
+diff -Nurad peercast-0.1218+svn20080104/core/common/channel.cpp peercast-0.1218+svn20080104.new/core/common/channel.cpp
+--- peercast-0.1218+svn20080104/core/common/channel.cpp	2008-04-01 13:59:52.000000000 +0200
++++ peercast-0.1218+svn20080104.new/core/common/channel.cpp	2008-04-30 17:45:28.000000000 +0200
+@@ -440,7 +440,7 @@
+ 		if (http.isHeader(PCX_HS_POS))

+ 			streamPos = atoi(arg);

+ 		else

+-			Servent::readICYHeader(http, info, NULL);

++			Servent::readICYHeader(http, info, NULL, 0);

+ 

+ 		LOG_CHANNEL("Channel fetch: %s",http.cmdLine);

+ 	}

+diff -Nurad peercast-0.1218+svn20080104/core/common/http.cpp peercast-0.1218+svn20080104.new/core/common/http.cpp
+--- peercast-0.1218+svn20080104/core/common/http.cpp	2008-04-01 13:59:52.000000000 +0200
++++ peercast-0.1218+svn20080104.new/core/common/http.cpp	2008-04-30 17:45:28.000000000 +0200
+@@ -102,7 +102,7 @@
+ 		return 0;
+ }
+ //-----------------------------------------
+-void HTTP::getAuthUserPass(char *user, char *pass)
++void HTTP::getAuthUserPass(char *user, char *pass, size_t ulen, size_t plen)
+ {
+ 	if (arg)
+ 	{
+@@ -119,10 +119,14 @@
+ 			if (s)
+ 			{
+ 				*s = 0;
+-				if (user)
+-					strcpy(user,str.cstr());
+-				if (pass)
+-					strcpy(pass,s+1);
++				if (user){
++					strncpy(user,str.cstr(), ulen);
++					user[ulen - 1] = 0;
++				}
++				if (pass){
++					strncpy(pass,s+1, plen);
++					pass[plen - 1] = 0;
++				}
+ 			}			
+ 		}
+ 	}
+diff -Nurad peercast-0.1218+svn20080104/core/common/http.h peercast-0.1218+svn20080104.new/core/common/http.h
+--- peercast-0.1218+svn20080104/core/common/http.h	2008-04-01 13:59:52.000000000 +0200
++++ peercast-0.1218+svn20080104.new/core/common/http.h	2008-04-30 17:45:28.000000000 +0200
+@@ -176,7 +176,7 @@
+ 	char	*getArgStr();
+ 	int		getArgInt();
+ 
+-	void	getAuthUserPass(char *, char *);
++	void	getAuthUserPass(char *, char *, size_t, size_t);
+ 
+ 	char	cmdLine[8192],*arg;
+ 
+diff -Nurad peercast-0.1218+svn20080104/core/common/servent.h peercast-0.1218+svn20080104.new/core/common/servent.h
+--- peercast-0.1218+svn20080104/core/common/servent.h	2008-04-01 13:59:52.000000000 +0200
++++ peercast-0.1218+svn20080104.new/core/common/servent.h	2008-04-30 17:45:28.000000000 +0200
+@@ -206,7 +206,7 @@
+ 	void	sendPCPChannel();

+ 	void	checkPCPComms(Channel *, AtomStream &);

+ 
+-	static void	readICYHeader(HTTP &, ChanInfo &, char *);
++	static void	readICYHeader(HTTP &, ChanInfo &, char *, size_t);
+ 	bool	canStream(Channel *);
+ 
+ 	bool	isConnected() {return status == S_CONNECTED;}

+diff -Nurad peercast-0.1218+svn20080104/core/common/servhs.cpp peercast-0.1218+svn20080104.new/core/common/servhs.cpp
+--- peercast-0.1218+svn20080104/core/common/servhs.cpp	2008-04-01 13:59:52.000000000 +0200
++++ peercast-0.1218+svn20080104.new/core/common/servhs.cpp	2008-04-30 17:45:28.000000000 +0200
+@@ -587,7 +587,7 @@
+ 		{

+ 			case ServMgr::AUTH_HTTPBASIC:

+ 				if (http.isHeader("Authorization"))

+-					http.getAuthUserPass(user,pass);

++					http.getAuthUserPass(user,pass, sizeof(user), sizeof(pass));

+ 				break;

+ 			case ServMgr::AUTH_COOKIE:

+ 				if (http.isHeader("Cookie"))

+@@ -1405,7 +1405,7 @@
+ 

+ }
+ // -----------------------------------
+-void Servent::readICYHeader(HTTP &http, ChanInfo &info, char *pwd)
++void Servent::readICYHeader(HTTP &http, ChanInfo &info, char *pwd, size_t plen)
+ {
+ 	char *arg = http.getArgStr();
+ 	if (!arg) return;
+@@ -1429,8 +1429,10 @@
+ 		info.desc.set(arg,String::T_ASCII);

+ 		info.desc.convertTo(String::T_UNICODE);

+ 
+-	}else if (http.isHeader("Authorization"))
+-		http.getAuthUserPass(NULL,pwd);
++	}else if (http.isHeader("Authorization")){
++		if(pwd)
++			http.getAuthUserPass(NULL,pwd, 0, plen);
++    }
+ 	else if (http.isHeader(PCX_HS_CHANNELID))
+ 		info.id.fromStr(arg);

+ 	else if (http.isHeader("ice-password"))
+@@ -1501,7 +1503,7 @@
+ 	while (http.nextHeader())
+ 	{
+ 		LOG_DEBUG("ICY %s",http.cmdLine);
+-		readICYHeader(http,info,loginPassword.cstr());
++		readICYHeader(http,info,loginPassword.cstr(), String::MAX_LEN);
+ 	}
+ 
+ 
+diff -Nurad peercast-0.1218+svn20080104/core/common/url.cpp peercast-0.1218+svn20080104.new/core/common/url.cpp
+--- peercast-0.1218+svn20080104/core/common/url.cpp	2008-04-01 13:59:52.000000000 +0200
++++ peercast-0.1218+svn20080104.new/core/common/url.cpp	2008-04-30 17:45:28.000000000 +0200
+@@ -171,7 +171,7 @@
+ 				LOG_CHANNEL("Fetch HTTP: %s",http.cmdLine);
+ 
+ 				ChanInfo tmpInfo = ch->info;
+-				Servent::readICYHeader(http,ch->info,NULL);
++				Servent::readICYHeader(http,ch->info,NULL, 0);
+ 
+ 				if (!tmpInfo.name.isEmpty())
+ 					ch->info.name = tmpInfo.name;
diff --git a/media-sound/peercast/files/peercast-0.1218-glibc-2.10.patch b/media-sound/peercast/files/peercast-0.1218-glibc-2.10.patch
new file mode 100644
index 000000000000..3f290578dd50
--- /dev/null
+++ b/media-sound/peercast/files/peercast-0.1218-glibc-2.10.patch
@@ -0,0 +1,109 @@
+Index: work/core/common/common.h
+===================================================================
+--- work.orig/core/common/common.h
++++ work/core/common/common.h
+@@ -274,7 +274,7 @@ inline int strToID(char *str)
+ }
+ 
+ // -----------------------------------
+-char *getCGIarg(const char *str, const char *arg);
++const char *getCGIarg(const char *str, const char *arg);
+ bool cmpCGIarg(char *str, char *arg, char *value);
+ bool hasCGIarg(char *str, char *arg);
+ 
+Index: work/core/common/html.cpp
+===================================================================
+--- work.orig/core/common/html.cpp
++++ work/core/common/html.cpp
+@@ -103,7 +103,7 @@ void HTML::writeVariable(Stream &s,const
+ 			r = true;

+ 		}else if (varName.startsWith("loop.hit."))

+ 		{

+-			char *idstr = getCGIarg(tmplArgs,"id=");

++			const char *idstr = getCGIarg(tmplArgs,"id=");

+ 			if (idstr)

+ 			{

+ 				GnuID id;

+@@ -136,7 +136,7 @@ void HTML::writeVariable(Stream &s,const
+ 	{

+ 		if (varName.startsWith("page.channel."))

+ 		{

+-			char *idstr = getCGIarg(tmplArgs,"id=");

++			const char *idstr = getCGIarg(tmplArgs,"id=");

+ 			if (idstr)

+ 			{

+ 				GnuID id;

+@@ -150,7 +150,7 @@ void HTML::writeVariable(Stream &s,const
+ 

+ 			String v = varName+5;

+ 			v.append('=');

+-			char *a = getCGIarg(tmplArgs,v);

++			const char *a = getCGIarg(tmplArgs,v);

+ 			if (a)

+ 			{

+ 				s.writeString(a);		

+Index: work/core/common/sys.cpp
+===================================================================
+--- work.orig/core/common/sys.cpp
++++ work/core/common/sys.cpp
+@@ -740,12 +740,12 @@ void LogBuffer::write(const char *str, T
+ }
+ 
+ // -----------------------------------
+-char *getCGIarg(const char *str, const char *arg)
++const char *getCGIarg(const char *str, const char *arg)
+ {
+ 	if (!str)
+ 		return NULL;
+ 
+-	char *s = strstr(str,arg);
++	const char *s = strstr(str,arg);
+ 
+ 	if (!s)
+ 		return NULL;
+Index: work/core/common/servhs.cpp
+===================================================================
+--- work.orig/core/common/servhs.cpp
++++ work/core/common/servhs.cpp
+@@ -150,10 +150,10 @@ void Servent::handshakeHTTP(HTTP &http, 
+ 			if (!isAllowed(ALLOW_BROADCAST))
+ 				throw HTTPException(HTTP_SC_UNAVAILABLE,503);

+ 
+-			char *pwdArg = getCGIarg(fn,"pass=");
+-			char *songArg = getCGIarg(fn,"song=");
+-			char *mountArg = getCGIarg(fn,"mount=");
+-			char *urlArg = getCGIarg(fn,"url=");
++			const char *pwdArg = getCGIarg(fn,"pass=");
++			const char *songArg = getCGIarg(fn,"song=");
++			const char *mountArg = getCGIarg(fn,"mount=");
++			const char *urlArg = getCGIarg(fn,"url=");
+ 
+ 			if (pwdArg && songArg)
+ 			{
+@@ -560,7 +560,7 @@ bool Servent::handshakeAuth(HTTP &http,c
+ 	char user[64],pass[64];

+ 	user[0] = pass[0] = 0;

+ 

+-	char *pwd  = getCGIarg(args, "pass=");

++	const char *pwd  = getCGIarg(args, "pass=");

+ 

+ 	if ((pwd) && strlen(servMgr->password))

+ 	{

+@@ -671,7 +671,7 @@ void Servent::handshakeCMD(char *cmd)
+ 	{
+ 		if (cmpCGIarg(cmd,"cmd=","redirect"))
+ 		{
+-			char *j = getCGIarg(cmd,"url=");
++			const char *j = getCGIarg(cmd,"url=");
+ 			if (j)
+ 			{
+ 				termArgs(cmd);
+@@ -1079,7 +1079,7 @@ void Servent::handshakeCMD(char *cmd)
+ 					index++;
+ 				}
+ 
+-				char *findArg = getCGIarg(cmd,"keywords=");
++				const char *findArg = getCGIarg(cmd,"keywords=");
+ 
+ 				if (hasCGIarg(cmd,"relay"))
+ 				{
diff --git a/media-sound/peercast/files/peercast.initd b/media-sound/peercast/files/peercast.initd
new file mode 100644
index 000000000000..9739b4a31381
--- /dev/null
+++ b/media-sound/peercast/files/peercast.initd
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile=/var/run/peercast.pid
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting peercast daemon"
+	start-stop-daemon --start --quiet --background \
+		--make-pidfile --pidfile ${pidfile} \
+		--chuid nobody:audio \
+		--exec /usr/sbin/peercast -- \
+		-i /usr/share/peercast/peercast.ini \
+		-l /var/log/peercast.log \
+		-P /usr/share/peercast
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping peercast daemon"
+	start-stop-daemon --stop --quiet --pidfile ${pidfile}
+	eend $?
+}
diff --git a/media-sound/peercast/metadata.xml b/media-sound/peercast/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/peercast/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/peercast/peercast-0.1218-r2.ebuild b/media-sound/peercast/peercast-0.1218-r2.ebuild
new file mode 100644
index 000000000000..105d18390306
--- /dev/null
+++ b/media-sound/peercast/peercast-0.1218-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="A client and server for Peercast P2P-radio network"
+HOMEPAGE="http://www.peercast.org"
+SRC_URI="http://www.peercast.org/src/${P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-CVE-2008-2040.patch \
+		"${FILESDIR}"/${PN}-0.1216-makefile.patch \
+		"${FILESDIR}"/${PN}-0.1216-amd64.patch \
+		"${FILESDIR}"/${P}-glibc-2.10.patch
+}
+
+src_compile() {
+	append-ldflags -pthread
+
+	cd ui/linux
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" LDFLAGS="${LDFLAGS}" \
+		LD="$(tc-getCXX)" || die "emake failed"
+}
+
+src_install() {
+	dosbin ui/linux/peercast
+
+	insinto /usr/share/peercast
+	doins -r ui/html
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+	elog "Start Peercast with '/etc/init.d/peercast start' and point your"
+	elog "webbrowser to 'http://localhost:7144' to start using Peercast."
+	elog
+	elog "You can also run 'rc-update add peercast default' to make Peercast"
+	elog "start at boot."
+}
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
new file mode 100644
index 000000000000..c07b8bb0c5d7
--- /dev/null
+++ b/media-sound/pianobar/Manifest
@@ -0,0 +1,8 @@
+DIST pianobar-2016.06.02.tar.bz2 46262 SHA256 c6efb0d0fe36013c6506dadf3718e8ed9471b7839654c97027e036ed16212559 SHA512 943e4b7bdfa5690f73378c6454666ec972f4d33faa0549ec087fb0ffeb5584e7ec26cef39dfd0134eefe2723638cc41f29c76eecb306c295c067996443958027 WHIRLPOOL 1289313f7f9e19f4974c849854204a08d26efa0afc7e4ca56b7dfb43b5c696976e8faa8a0cc1b0d27e6166b39b27714e9eb566e234afdccc3faf968129a1edf6
+DIST pianobar-2017.08.30.tar.bz2 46664 SHA256 ec14db6cf1a7dbc1d8190b5ca0d256021e970587bcdaeb23904d4bca71a04674 SHA512 35019bd387a323c85928e8979c075c7b2a8d88115066a55068dd62279760200fcadf022f7000a40e198bebc3cfc5507913da7c9c06ae220cba6fe3910a6bca54 WHIRLPOOL e0ff835c9a143df9779f5f8e76bf55dde3ca97e50b17db64107c386b14cbaf99886c2558887ff8f468f7eca7fecfaf9e47582b139c9b62f645c66b569ded9ee1
+EBUILD pianobar-2016.06.02.ebuild 1011 SHA256 dc9d0899230aac7ef512f0b8c991566b48b98691abe2dddf40b4269a2a2765ea SHA512 bef989c331007c3e8e68673a243e8a852fa845d3e8595cb0fb32106854c6078d1f14d8d6124b535e13af323a36ab51338bd1371afc8a410b02ce055ac68d1a48 WHIRLPOOL 5aefc5dfc31291e8581560ced60d509a20ea240fbc69f5d50833f21a6deaac0a06442f80b747a5eb771694da37c494da0e0ea75b8b33036064c86e75ffbe1d0e
+EBUILD pianobar-2017.08.30.ebuild 1076 SHA256 781627f9d1133fc67b9b6dd3378ba6601efa648a5051b07b2d68ee8df6faa8a4 SHA512 83f739c2210c43095752259acff9f3ac0e9586d05a4011d5c98e70b54cb6723337cdc2c47585370ca8bb07813f75777c0959ddbee325102000a097fc8251d98e WHIRLPOOL 2e66187db36dcb50afeedc931ddf7f1e3d5e922263ec0d41d490fdf6a58b273f310050e5535ff64979b44911a623d68ff1443453d9f6d7b9b387c00bec8c284c
+EBUILD pianobar-9999.ebuild 1076 SHA256 781627f9d1133fc67b9b6dd3378ba6601efa648a5051b07b2d68ee8df6faa8a4 SHA512 83f739c2210c43095752259acff9f3ac0e9586d05a4011d5c98e70b54cb6723337cdc2c47585370ca8bb07813f75777c0959ddbee325102000a097fc8251d98e WHIRLPOOL 2e66187db36dcb50afeedc931ddf7f1e3d5e922263ec0d41d490fdf6a58b273f310050e5535ff64979b44911a623d68ff1443453d9f6d7b9b387c00bec8c284c
+MISC ChangeLog 3246 SHA256 28816b7fca9c95b033f6f1cb6a20969a511aad64dd027a98fdac5d7e51341606 SHA512 bfa7458e853a9f7558e68f14767021a34e71879f3837ea0b564cfb0db9c12516496d23b549d1a10e00556e1cc81ef087d12ba4e6de32405b04342ffbbbc1fdc1 WHIRLPOOL d1e7de86de4e94dc22588da89bb12696979ee25ba17b7f26791812dac17c9bb9e3827a3d6113cc12189ac4b9a8477d71e434a1ff11bfbc9e4bea0fa9b6513edf
+MISC ChangeLog-2015 6185 SHA256 addbcc6b8c9cca337cad80ec45f98bac643b5874bd9d285a615766477a87842f SHA512 75319724fc75d31a84df987121b2d4a33a4028217d3beb55e4e4d70fb3b11bd370879bbc017ab010ec4360ae1154a55b362b4af9b674105633ac6becc95be788 WHIRLPOOL 71e8412a25716fdcd68e0811171da079b65590e178c514da2e8e219ce944d5603b83706bb717d6b7ae2b95dd7124d93f6f32fed22a95c9a9a80ded60db537dca
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/pianobar/metadata.xml b/media-sound/pianobar/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/pianobar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/pianobar/pianobar-2016.06.02.ebuild b/media-sound/pianobar/pianobar-2016.06.02.ebuild
new file mode 100644
index 000000000000..0e3bb2a1d58e
--- /dev/null
+++ b/media-sound/pianobar/pianobar-2016.06.02.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PromyLOPh/${PN}.git"
+else
+	SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="A console-based replacement for Pandora's flash player"
+HOMEPAGE="https://6xq.net/pianobar/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND="media-libs/libao
+	net-misc/curl
+	dev-libs/libgcrypt:0=
+	dev-libs/json-c:=
+	>=virtual/ffmpeg-9"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	append-cflags -std=c99
+	tc-export CC
+	emake V=1 DYNLINK=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
+	dodoc ChangeLog README.md
+
+	use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
+
+	docinto contrib
+	dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
+	docompress -x /usr/share/doc/${PF}/contrib
+}
diff --git a/media-sound/pianobar/pianobar-2017.08.30.ebuild b/media-sound/pianobar/pianobar-2017.08.30.ebuild
new file mode 100644
index 000000000000..9d1f513a05ea
--- /dev/null
+++ b/media-sound/pianobar/pianobar-2017.08.30.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PromyLOPh/pianobar.git"
+else
+	SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A console-based replacement for Pandora's flash player"
+HOMEPAGE="https://6xq.net/pianobar/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="libav static-libs"
+
+RDEPEND="media-libs/libao
+	net-misc/curl
+	dev-libs/libgcrypt:0=
+	dev-libs/json-c:=
+	libav? ( >=media-video/libav-12:0= )
+	!libav? ( >=media-video/ffmpeg-3.1:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	append-cflags -std=c99
+	tc-export AR CC
+	emake V=1 DYNLINK=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
+	dodoc ChangeLog README.md
+
+	use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
+
+	docinto contrib
+	dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
+	docompress -x /usr/share/doc/${PF}/contrib
+}
diff --git a/media-sound/pianobar/pianobar-9999.ebuild b/media-sound/pianobar/pianobar-9999.ebuild
new file mode 100644
index 000000000000..9d1f513a05ea
--- /dev/null
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PromyLOPh/pianobar.git"
+else
+	SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A console-based replacement for Pandora's flash player"
+HOMEPAGE="https://6xq.net/pianobar/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="libav static-libs"
+
+RDEPEND="media-libs/libao
+	net-misc/curl
+	dev-libs/libgcrypt:0=
+	dev-libs/json-c:=
+	libav? ( >=media-video/libav-12:0= )
+	!libav? ( >=media-video/ffmpeg-3.1:0= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_compile() {
+	append-cflags -std=c99
+	tc-export AR CC
+	emake V=1 DYNLINK=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
+	dodoc ChangeLog README.md
+
+	use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
+
+	docinto contrib
+	dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
+	docompress -x /usr/share/doc/${PF}/contrib
+}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
new file mode 100644
index 000000000000..e6923c6951fb
--- /dev/null
+++ b/media-sound/picard/Manifest
@@ -0,0 +1,11 @@
+DIST picard-1.3.1.tar.gz 2047677 SHA256 f83ec4ab703134a3dbd8203a2b30c15ea87bec79c02446506e4dce1ec87f7d02 SHA512 72641e1f604cc3db339400511e1b37ce513f315e200af3ed25dd842cfa32b8b0a3b93cf60cd01b565be49f95931e7da36742efeb45a4619351acbe70edb511c5 WHIRLPOOL ace3cb441038e09888a2985e2f23149bcaa665d311a2bbd583648e17aeee4453168fc5e9df68b8fcd6acf772e1e4b4e33329643cb840f3355b2a1f420763bcb1
+DIST picard-1.3.2.tar.gz 2047760 SHA256 e728234560b82eb33d3143a53d3bbb92833455fd130f8d2083193cffceea4120 SHA512 d5613dd0b29f67a754a9449c6ebb29e4f7a519137dbcd29b03e64678ba49c75542573487c1f95047c0ab43630794fd92365a46dc9820347ffd2eae5a04e531be WHIRLPOOL 5c3cbd5860162ede0150f7e680d7732f38c875e5475fb16dfac2f6f7d51979678567fe677a2887197db963fdf1a75f1ba4f45d132e9fc0923a2d726ffe30a019
+DIST picard-1.4.1.tar.gz 2101829 SHA256 994c7f835e1adbd7905e88af841ee6e7c249dc75b8be9963b1b3dc6cb8de6a4a SHA512 3b9508101a52bfde060d9503f11a3c3fd6955c114c46c07ba6f299471f3682cf22b97c955c2b6990bd245fac30626fdbd17d1cb7b23b17839a51ec91091cc42d WHIRLPOOL 4a771205f621b0c9ffab43f0af830382d6af6b57085ac9ef00538758e7e1d6499f3283c6ecd46d23c01aa205a2c3e704e04d345c5cd8ac00b8dc6440a6e149ed
+DIST picard-1.4.2.tar.gz 2116021 SHA256 f0adee3877bbd66c827a43b57dd2233037b99f6ebfdc1700b26cb9d400992234 SHA512 5e4a6a8cfadd86b7015ab77da1969acec26e0ed92564c6634afeee5060d33d34e8fc83015880e6c8f17df66c8d15b86a85031dbe5b596c995579fb449cf8a74e WHIRLPOOL d7f1adaa7853c3ef0d0b27cd46cfb5b888bf73a3ba965e3654d2b55c8738c69258c7251a2ab41aac3846f0ab9ac613edd99c69b4800f2b38f39eecf66907439d
+EBUILD picard-1.3.1.ebuild 1305 SHA256 969d0538e9b6b7d7158317481280c51d17558dad59418df82afc6e87864de9fb SHA512 99ffcb297f20dc17f30f188c85c6955fecaf6188e0b9c25d9a5242d08db585ea6fe9b09c754540fd74c4e0724d2f39da88e483f6cfb9b5eabbc74f3dc2d20d5b WHIRLPOOL 912029138bb625e3ca9012d40e8b573550d74118cf971bdfb7d8274de5122d23cad1cc0fc41e794cf4620f864b70dffa452f35d7285cb9ed3e23233dc0e7d761
+EBUILD picard-1.3.2-r1.ebuild 1332 SHA256 d3521816a7cb5dafa4a9ac6447fc62367a0b2fc6cc79ef9738cb7e79ec0714ae SHA512 7b059c984c0ac001fa837197fbf7559a0933777f3667b429560b6d603716faea067cc15ad6005092e800a55b605d47a5e41f2cf420d6b7ffff7afca92c673981 WHIRLPOOL cda05129249c1e89bf17e9d082cb348159a08558d6f7b09e773c04077786ae3ac42f8c59b9ff67b3415e8c251e13e1959c97779c8d9b7fde54965e29f031e639
+EBUILD picard-1.4.1.ebuild 1582 SHA256 2d75f91d37d75856a3318ca14f232e82085db2eba1e8cb481f116784da0f446a SHA512 0a003ed174c9e8cb7159b11d1782d1205f471b3c1c08a3fe33f32e1261e4e4b33c7e71aae3d85b9bb39d3006d2200dc40be078019df472fb2b3ea501bdc537fa WHIRLPOOL 0a2396c9a7d8614ff98254cb5f197a0bfb7308e43222c14cd2e38562ddba6b3397f1c43d142aa6af8a9d767f8abc8255cb489b40d54ee271ad691fa1363df4d4
+EBUILD picard-1.4.2.ebuild 1582 SHA256 2d75f91d37d75856a3318ca14f232e82085db2eba1e8cb481f116784da0f446a SHA512 0a003ed174c9e8cb7159b11d1782d1205f471b3c1c08a3fe33f32e1261e4e4b33c7e71aae3d85b9bb39d3006d2200dc40be078019df472fb2b3ea501bdc537fa WHIRLPOOL 0a2396c9a7d8614ff98254cb5f197a0bfb7308e43222c14cd2e38562ddba6b3397f1c43d142aa6af8a9d767f8abc8255cb489b40d54ee271ad691fa1363df4d4
+MISC ChangeLog 2876 SHA256 038428dffbaaa64a27fc3b5a5ce13fb01b272d338effc0d17fb65ef8e81f45bd SHA512 336a643800eba682ddb2cfcd9fa4c557eddee83bfad22ee654652555ab247a0de87d0f4da7362f7e8395b75b3dd198601a374db2882e8f96cdafdfb02f63c8b8 WHIRLPOOL 6d240f5e43223624dde9114d61af037c673e6b423829027bd4759eeec13a7becf2a2c759199b47a767f8f9e149d263fb521274c069efc41cc237d259a7b89be7
+MISC ChangeLog-2015 8587 SHA256 9ff902965e0ec129dace44423ed68df7bdcb1dddb02a9aa60800c519ff5b051b SHA512 840a07393644bf13f5ff52f8e461ebb7e68eba28c953b4c03ac9c2ce67d119f619b4b4b7eef0998aceca03cb38253515d1ace06bdfc1820d3ec0a75e2ee5c80d WHIRLPOOL 6dcd0c1369c1d4d4b730e0ad6820b5eea61a54405279bab89a17fca9fef330b3ad2530a920c20118507732f5f4b693be0591e49555dc17a4a95ce870bbdb3bf6
+MISC metadata.xml 664 SHA256 71d7265f73c9596796cb95e3a47f3fd9a39e62be96b034ce4c4b7fa6457a7d30 SHA512 f0671dca61d99480b92fc90cfdfa456d6a88c692a6e2b86ccc9d9ecf95bff6f634b885b14aa2e2b2e1c140090cd06043cc4f396dce0999c1febef61f831dcd09 WHIRLPOOL d92e2120512f58080b805f27609b1b8eb905e623a744b154cbed865a72d76e90ce35444da29ef99ce027851e6bab86a00e3327f2bc01d351c24d0fe6d287c9a0
diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml
new file mode 100644
index 000000000000..a74c990d56e8
--- /dev/null
+++ b/media-sound/picard/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+  </maintainer>
+  <longdescription>MusicBrainz Picard is a cross-platform MusicBrainz tag editor
+  written in Python. Picard Tagger is intended to be the next generation of
+  tagger for MusicBrainz, with a focus on album oriented tagging as opposed to
+  track based tagging and cross platform compatibility.</longdescription>
+<use>
+  <flag name="acoustid">Use media-libs/chromaprint for acoustic fingerprinting</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/picard/picard-1.3.1.ebuild b/media-sound/picard/picard-1.3.1.ebuild
new file mode 100644
index 000000000000..dfa121bd47e1
--- /dev/null
+++ b/media-sound/picard/picard-1.3.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+inherit eutils distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A cross-platform music tagger"
+HOMEPAGE="http://picard.musicbrainz.org/"
+SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/picard/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="+acoustid +cdda nls"
+
+DEPEND="dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	media-libs/mutagen
+	acoustid? ( >=media-libs/chromaprint-1.0[tools] )
+	cdda? ( >=media-libs/libdiscid-0.1.1 )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test" # doesn't work with ebuilds
+S=${WORKDIR}/${PN}-release-${PV}
+DOCS="AUTHORS.txt NEWS.txt"
+
+src_compile() {
+	distutils-r1_src_compile $(use nls || echo "--disable-locales")
+}
+
+src_install() {
+	distutils-r1_src_install --disable-autoupdate --skip-build \
+		$(use nls || echo "--disable-locales")
+
+	doicon picard.ico
+	domenu picard.desktop
+
+	local DOC_CONTENTS="If you are upgrading Picard and it does not start,
+try removing Picard's settings:
+	rm ~/.config/MusicBrainz/Picard.conf
+
+You should set the environment variable BROWSER to something like
+	firefox '%s' &
+to let python know which browser to use."
+	readme.gentoo_create_doc
+}
diff --git a/media-sound/picard/picard-1.3.2-r1.ebuild b/media-sound/picard/picard-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..1592652f1fdd
--- /dev/null
+++ b/media-sound/picard/picard-1.3.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+inherit eutils distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A cross-platform music tagger"
+HOMEPAGE="http://picard.musicbrainz.org/"
+SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/picard/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="+acoustid +cdda nls"
+
+DEPEND="dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	dev-qt/qtgui:4[accessibility]
+	media-libs/mutagen
+	acoustid? ( >=media-libs/chromaprint-1.0[tools] )
+	cdda? ( dev-python/python-discid )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test" # doesn't work with ebuilds
+S=${WORKDIR}/${PN}-release-${PV}
+DOCS="AUTHORS.txt NEWS.txt"
+
+src_compile() {
+	distutils-r1_src_compile $(use nls || echo "--disable-locales")
+}
+
+src_install() {
+	distutils-r1_src_install --disable-autoupdate --skip-build \
+		$(use nls || echo "--disable-locales")
+
+	doicon picard.ico
+	domenu picard.desktop
+
+	local DOC_CONTENTS="If you are upgrading Picard and it does not start,
+try removing Picard's settings:
+	rm ~/.config/MusicBrainz/Picard.conf
+
+You should set the environment variable BROWSER to something like
+	firefox '%s' &
+to let python know which browser to use."
+	readme.gentoo_create_doc
+}
diff --git a/media-sound/picard/picard-1.4.1.ebuild b/media-sound/picard/picard-1.4.1.ebuild
new file mode 100644
index 000000000000..763fc7e9db21
--- /dev/null
+++ b/media-sound/picard/picard-1.4.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/picard/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+DEPEND="
+	dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	dev-qt/qtgui:4[accessibility]
+	media-libs/mutagen"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test" # doesn't work with ebuilds
+S="${WORKDIR}/${PN}-release-${PV}"
+
+DOCS=( AUTHORS.txt NEWS.txt README.md )
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
+calculation and lookup of AcoustID fingerprints.
+
+Install optional package dev-python/python-discid to enable
+calculation and lookup of compact disc identifiers (disc IDs).
+
+If you are upgrading Picard and it does not start, try removing
+Picard's settings:
+	rm ~/.config/MusicBrainz/Picard.conf"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/picard/picard-1.4.2.ebuild b/media-sound/picard/picard-1.4.2.ebuild
new file mode 100644
index 000000000000..763fc7e9db21
--- /dev/null
+++ b/media-sound/picard/picard-1.4.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+inherit distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="A cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/picard/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+DEPEND="
+	dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	dev-qt/qtgui:4[accessibility]
+	media-libs/mutagen"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test" # doesn't work with ebuilds
+S="${WORKDIR}/${PN}-release-${PV}"
+
+DOCS=( AUTHORS.txt NEWS.txt README.md )
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
+calculation and lookup of AcoustID fingerprints.
+
+Install optional package dev-python/python-discid to enable
+calculation and lookup of compact disc identifiers (disc IDs).
+
+If you are upgrading Picard and it does not start, try removing
+Picard's settings:
+	rm ~/.config/MusicBrainz/Picard.conf"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/picoxine/Manifest b/media-sound/picoxine/Manifest
new file mode 100644
index 000000000000..50e192ed2b88
--- /dev/null
+++ b/media-sound/picoxine/Manifest
@@ -0,0 +1,5 @@
+DIST 39596-picoxine-0.0.7.tar.bz2 13677 SHA256 aeee5c6f7343e20755ddd0f3bdbb624656198b79e8fed213ea05bc868b09c21a SHA512 c028e5f0c8dc8d692637ee091322d608c89509a7d9ab842ce15e14b28a940f03c356e8fdb8c90eb26ac9a7eed9c7c0e20c15eb0de06cf88e4e495cb99eabbbd9 WHIRLPOOL 78fc9f4947b11510337f2977489b636889b2f4387caf6b5e046ab6422d7f32c18d7745c55f8d02028e48c3b768949933eec6e3f6243eeac446aa89040389ac0b
+EBUILD picoxine-0.0.7.ebuild 796 SHA256 21f0d9def11ca8d465e7db988702c45a75a3c78319e1a7a0eb627a5bbf0d81cd SHA512 9792a16a4d8f4fb26eeffcc5d52d804b1e4db1ba99b7cf8b9a79c85e772fdde40361a3167ec5a4a21c806c578597a30af39372c2d858a36c7a40aae81080161a WHIRLPOOL 7f804486789cf27becbb8ca9637f1cace2c4a175a4834aae160ac939d7510f4b1f15d085884829f881ac3a96601c118578b32c6b2edf6b7b5e796c40632ea756
+MISC ChangeLog 2433 SHA256 2061bebbfa3434c208a3b3b2dc184fab63f67bc8f69ab3be415a99b78a8710fa SHA512 f286d7d912a9e0f9344c2e0e08477e476e375b1a837d43f2668bdaf3230c8513c69e8a0217339498c55daed36f0334e00ca05b1d83df1ff4f47c119618850858 WHIRLPOOL 49637d57307ce4f438edb5d442dd34462b5a6cf5770679d327ffb93a265a331b73c007ba66659137e7b8832c610d7f366e2a44ea683a4258243e92d4ae99a760
+MISC ChangeLog-2015 1421 SHA256 ec11c8fd4a38401c3297af5f4eafc8cf2e11314b8c06e2ba8921ae91d03e6815 SHA512 b2c42768af3cf2144865a4c0176ca95a0daa12f8d64621ae69a7737379716864e2556494382ef04310b323b39cdeee0a68343ff08a2facdd128464a23046909d WHIRLPOOL 98f685fba9e09b1bf2d241d278a345c4ac37d5f975bde53d570f91d4fe30ec700b70eba0019a075b960e0622de085a24adff6fb2fd52b95a2d38dd675a2c0c8b
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/picoxine/metadata.xml b/media-sound/picoxine/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/picoxine/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/picoxine/picoxine-0.0.7.ebuild b/media-sound/picoxine/picoxine-0.0.7.ebuild
new file mode 100644
index 000000000000..3adc17c1911a
--- /dev/null
+++ b/media-sound/picoxine/picoxine-0.0.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs
+
+DESCRIPTION="Very small xine frontend for playing audio events"
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=39596"
+SRC_URI="http://www.kde-apps.org/content/files/39596-${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="media-libs/xine-lib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -f "${S}/${PN}"
+}
+
+doecho() {
+	echo "$@"
+	"$@"
+}
+
+src_compile() {
+	doecho $(tc-getCC) -o ${PN} \
+		${CFLAGS} $(pkg-config --cflags libxine) ${LDFLAGS} \
+		${PN}.c -lm $(pkg-config --libs libxine) \
+		|| die "build failed"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc AUTHORS INSTALL
+}
diff --git a/media-sound/pitchtune/Manifest b/media-sound/pitchtune/Manifest
new file mode 100644
index 000000000000..519cc33f5543
--- /dev/null
+++ b/media-sound/pitchtune/Manifest
@@ -0,0 +1,6 @@
+AUX pitchtune-0.0.4-lm.patch 208 SHA256 69f62555e53ab9cec7ae96eb8afd8601c554dd7486ab64aee6876d87ef087315 SHA512 74fc3e0f5e42c9cc61ebaa19a4f0de3e0f4893a4a8a7a638e1a200152ff8b8b4c8c69b0bcc4d2eac51a9f11573ed19c8f0883e5a5755faafff29d3d76c0c9a19 WHIRLPOOL aa16aca6f8b965c5b1712e6332e10ff597e16ffc9c13215d45c92a5a800c0035a723b870571169dee2b7f14442ce05b79e21154bc6f14ce742dbf45a4264ac0f
+DIST pitchtune-0.0.4.tar.gz 163348 SHA256 f6e81b0aa1cfafc8678527b3ef8e8e4f3b2414f591629b7f51853dc9e27c9299 SHA512 7085dada0210ae5df8437e14de3fcd5fb5cba4305718b29b33730f737008451b9dba6e667b0caf8d57921c405de6205f288c8900db5c276ff401a9f5f0a3610a WHIRLPOOL ffe97690c8d0492ba4022ee3c8bae099ddda1547eca3e0487824f947552509030754f58e88da111307001a5a8dff0952897bf06b8a9640f0541a837af1deeedc
+EBUILD pitchtune-0.0.4.ebuild 688 SHA256 8b1973ff6f8e72a6a5ea8ee5ce83ef501cb44aba8f479f6f01c2f1bd5542e65d SHA512 14a3aaaf0d7d0baa73abe98de0d89caca61d4e8416cc5fd0a055cd53195614c6e41faaba0f3f553b558b80f4fa65e320054c3e72b3782ad55c011fdc3e4c44ad WHIRLPOOL 3dccf2824f462e3530e4feb2878f6f26f1a3900d7705d99b64aa84e6e6e021cab2f3ec0bb3c58e16bcb71d371217599448831d0fc632ce00e0ca5951ad1e95aa
+MISC ChangeLog 2725 SHA256 73cc37cb873dfbede10377d858dfe059af3a4c05874fa5d6b4593b1499373342 SHA512 42c8256679dabb43e040e93c078539243671cce014207b8d541e5c216a6e31a44e292f8910de994d43575e0e96885bd3490091750cb223a5786090c37bb5952e WHIRLPOOL cb696786dfb1059d690f07223a58d1f78377b7d5a26bcac72fde0161d8bf6c60eda876ee81ffc28a64056d315b74ec31ea975edf280e0f8c785b1c55cce16355
+MISC ChangeLog-2015 400 SHA256 a162f3c4e81a34d2d1f8047c53e3335998e1e005fb3e13b2c276322c23f9f0db SHA512 ee236cc46bbe43ad346a61c86c3444040cff5909f14656de06803b4a5a85a0a2aef1329fff38131d6aca28f7303285472928ffa51d04eb9c2facd67ce8b7bf12 WHIRLPOOL 7345eae0e6090492809f47d941118596043adbb4e95d43bf51797c3c59fab05f752ade3176afc7b88711a01e2b8d3c1ce54c9cf770625a19b0defbcca2897e1c
+MISC metadata.xml 342 SHA256 135e84bf8349edba76091263fcd39cc89ab87ccee5bd454f61e392a93a049f54 SHA512 f1d19843fe070069700704bc96d0d195080b9a3e71569829771d9bb1269ae9c4c17ff478476c10fbe4993ff30e38d887bd5344d635ab40095fefec82c6c00af2 WHIRLPOOL be2435d7ae09020de684ab5c67a14423cb4cefb3110372b3aa34aacc10c3fe47fa6bc10f8f813a9678c4efc43d95c58dfd0366f544d8c9dd0f8ea577d97c82f3
diff --git a/media-sound/pitchtune/files/pitchtune-0.0.4-lm.patch b/media-sound/pitchtune/files/pitchtune-0.0.4-lm.patch
new file mode 100644
index 000000000000..b5598846636f
--- /dev/null
+++ b/media-sound/pitchtune/files/pitchtune-0.0.4-lm.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -17,6 +17,7 @@
+ PKG_CHECK_MODULES(GTK, [$pkg_modules])
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
++AC_SEARCH_LIBS(ceil, m)
+ 
+ 
+ dnl From glade-2 generated configure.in
diff --git a/media-sound/pitchtune/metadata.xml b/media-sound/pitchtune/metadata.xml
new file mode 100644
index 000000000000..a972b97d893f
--- /dev/null
+++ b/media-sound/pitchtune/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">pitchtune</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/pitchtune/pitchtune-0.0.4.ebuild b/media-sound/pitchtune/pitchtune-0.0.4.ebuild
new file mode 100644
index 000000000000..480bbb1f29df
--- /dev/null
+++ b/media-sound/pitchtune/pitchtune-0.0.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="Precise Instrument Tweaking for Crispy Harmony - tuner"
+HOMEPAGE="https://sourceforge.net/projects/pitchtune/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/alsa-lib
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+"
+
+DOCS=( AUTHORS README REQUIRED TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.4-lm.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	doicon pixmaps/${PN}.xpm
+	make_desktop_entry ${PN} Pitchtune
+}
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
new file mode 100644
index 000000000000..e1fe71d1c54d
--- /dev/null
+++ b/media-sound/pithos/Manifest
@@ -0,0 +1,11 @@
+AUX pithos-1.3.1-dont-try-to-update-icon-cache.patch 584 SHA256 c28ce898d43324e07c25618cdfd636bec1d312ed1d990810ffa07acf2c08a18a SHA512 cc30b733388a9dea61ea4ab23c4291c11656a117e0f9aa98e3b286b6698ec38242154da21af9dc840bc697a34a1e604f86e489a2c5d6fcb76ac6f3e1bef750e5 WHIRLPOOL a450fe6e8c080801e70ef0bf3c18d33200c8d517d475f017fc66b5453b1922063bedcaf4c8e6b15c51b8f1d7e4750491686fc485e35a0673a5f8e61bc1ce4476
+DIST pithos-1.1.1.tar.gz 112793 SHA256 4424534bbf7ab3d3d6c51764d689606fd0df214422eb79ccc91a8981f95d7dce SHA512 8813e5218b448cac64d9787388f3bfa8e7a06cc785c3f7ca6bdce5dee2fdb393d9019169256a01f43fd610ebfd8e07d6fcdafeb476c18d88d8de87895c5b9c2f WHIRLPOOL 401cbd1e3cbeaa0457e4e75be3f2fe04e0ca252274e1539fe9de0777e2c77c3e50e4b4e401bbca0ff0371c8aedc08920384b87016f8357b2caadd3f86e90247d
+DIST pithos-1.1.2.tar.gz 115119 SHA256 560cc42410981c4578505bf67635c75d11b63fe8ff5d4d73e154e016e7fe5465 SHA512 3eb5177de64f3e7e0a19409adebb1bf77a4c5d6226b6cc4a536611662a89599dc6175c92883af5f4115b6599ba94a8439fef769b0879a05fa48685598c4cdd01 WHIRLPOOL ed6b5170c3ffbf6f687020f3492902831d37ba14eae0ac26ad075225affb636891ad4106054ae627d8b87b7cb7be5ad45d5b04cf3135b6928ad07c9814e0d548
+DIST pithos-1.3.1.tar.gz 119658 SHA256 95d6bfd961a574f1ea8b42b5bf05680eff4ab7a5f0172a9987ddd9411b91a219 SHA512 c06715516992e4aa8bb3b200035ee10ef8dcec9491d32af0fb3f4e176d0ad5313a437f228747d5d716a29d2fe5b93ddd3704aa4fe674ce3be5a17eaad13b0da4 WHIRLPOOL b9d6bd12971417d17f77fb1466797d4e05d5c38f87a36973044295c785882e8c58829c67fc4095b20d38794c29ce412504350432470d045eb8e24f519030be67
+EBUILD pithos-1.1.1.ebuild 1129 SHA256 2d579c010cfbc61067b39d3ac34e8ac9df5d9cbdfd41d017b0d8b16622b8ac9c SHA512 4235e0d80cae5c2765cd18b17ce7ad94749dbaa14435b7db7f954a8298e65a55f791199d856cbfd39d776a8fb5aa560616761dbb4669dab4198fb3f03debdbc7 WHIRLPOOL 0fd7a656b21b41e9c556a5315666d748b2d82a77116074446df304f0286200befbba3369746fa622042fff625b384e7c3b2faea9fb6fea77173c20b186f146d8
+EBUILD pithos-1.1.2.ebuild 1139 SHA256 956bda671f9fe1663d5232f373fc4c0471c7f0a482a19c287d9ee9549e498f07 SHA512 28076e948bb4bf46022f1f8a3481cd4bd1260fdef358a91a3610b437ad4678d0f921a520656a0a746322e6a21348e27b505f40ecc3971722814107b18f070773 WHIRLPOOL 9e144a59ebea885e2262e0c9993767ead9d1e99cbd54c8b04332e2972eac2eb55b565656a094de62515628ecaa15e11cdca93be2e6761af0e21c2af81441b256
+EBUILD pithos-1.3.1.ebuild 1987 SHA256 06ceb0c2d806185b971d9036129c37a56d10082051aac4033109f37a50ae5b01 SHA512 7c327136d8bb41ab61590caac2d3621061cdf89786eae9fce9aca86e14282058aebecd76dd7d53df28ea325a833ba7d692f788450bc5b512d913da49be8c8a1a WHIRLPOOL d8c8aa7b852d85d0ae0e299c650e60dc67040ebc61c24a854d2557c80e5d9f8019ea8a8f86c451c3f4342644bad5f7076f2a6766ec7d6a0171952e56267f0571
+EBUILD pithos-9999.ebuild 1982 SHA256 3af5c890d3521b79c18d9fa7a363273d2d56c87866986b08ce318ca8982471fe SHA512 d54579d2de361413b9da412c113ded4284b94584666016870fc10337aa02422622a6cff9ea5862717006c5844cd396b591e6b8eddc2b7cb4704472d06ad90a34 WHIRLPOOL a16779e29dd25965feb308aebd6eb355d717d5676c667435bb9fd042eb21d48c049a70d2e31e8ba6a8b7ff5fe1712f83caceb2d716153e88966bf9ef50b0c179
+MISC ChangeLog 2695 SHA256 55a0926594245c3c810f78cc3283be82c1f3773f0963eb5cf0bec0518ba5330e SHA512 753d135f7317f845075fedd212eff398c15c0b521c65913ef4fa9a613cf61293052318ead652199770084f26557ebf42fba532ec9efd35857606893e0588bc0f WHIRLPOOL 5be860d8ac8c7b0eb0fca09cf373328b1b7c4b70f13b31abe2e275fdd87f72618f0dabf9f3c44f319d3218536ce14b06a35048224aed832bd843750f82b3b8c2
+MISC ChangeLog-2015 1808 SHA256 758c163819ea46478b6f9259b1d3c5d9650d21d6d9ce013d9b347b21b1be9518 SHA512 e6c4962bbefaa640eae57d262b49697b27ecfe97c9ab1525cb8d5f8673140b2254b361a9cc947f2c215bd2b9c3a63499ad0e924d71a605cd2a7cb4764431e89d WHIRLPOOL c65eae295afca87a9ae35c43e463842eb8c47dce5b7c7316af5fa5c79ca1550de762c22555db0f60b26618808467b9c785f031f9a70813ff2ac2f60ff6fa9ba0
+MISC metadata.xml 517 SHA256 433a950810307cfbd043f7e82afde423903cbec871949f568a8db291bc4994bc SHA512 1922b0145e076b849061072c03eafe7354bf79ab32d7f2a5bab219db6a9caa92074423c5bf1196b91ff1e183bd8fab2fcbad583f20b02b9916c3e73140a97367 WHIRLPOOL 0c9e043ea1db19855679aac93c9d07c28a5f600c03a2d4aa3b1c4da72b4ff1b221ea67e23e46394cc8061ef6a426b2b9fb942921595c79f450f1b8e4aa884930
diff --git a/media-sound/pithos/files/pithos-1.3.1-dont-try-to-update-icon-cache.patch b/media-sound/pithos/files/pithos-1.3.1-dont-try-to-update-icon-cache.patch
new file mode 100644
index 000000000000..5e1b5da91c9a
--- /dev/null
+++ b/media-sound/pithos/files/pithos-1.3.1-dont-try-to-update-icon-cache.patch
@@ -0,0 +1,20 @@
+diff --git a/Makefile.am b/Makefile.am
+index 0c5e1cb..b413774 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -85,13 +85,11 @@ ubuntu_light_DATA = data/icons/ubuntu-mono-light/16x16/apps/io.github.Pithos-tra
+ ubuntu_darkdir = $(datadir)/icons/ubuntu-mono-dark/16x16/apps
+ ubuntu_dark_DATA = data/icons/ubuntu-mono-dark/16x16/apps/io.github.Pithos-tray.svg
+ 
+-UPDATE_ICON_CACHE = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor || :
+-
+ install-data-hook:
+-	$(UPDATE_ICON_CACHE);
++	:;
+ 
+ uninstall-hook:
+-	$(UPDATE_ICON_CACHE);
++	:;
+ 
+ BUILT_SOURCES = pithos.gresource
+ SUBDIRS = po
diff --git a/media-sound/pithos/metadata.xml b/media-sound/pithos/metadata.xml
new file mode 100644
index 000000000000..d1915fe5a788
--- /dev/null
+++ b/media-sound/pithos/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<use>
+		<flag name="appindicator">Enable usage of appindicator to export menu options in to unity</flag>
+		<flag name="keybinder">Use keybinder to enable global key bindings</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">pithos/pithos</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/pithos/pithos-1.1.1.ebuild b/media-sound/pithos/pithos-1.1.1.ebuild
new file mode 100644
index 000000000000..7274cef6dec8
--- /dev/null
+++ b/media-sound/pithos/pithos-1.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python3_4)
+inherit eutils distutils-r1
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Pandora.com client for the GNOME desktop"
+HOMEPAGE="https://pithos.github.io/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify appindicator +keybinder"
+
+RDEPEND="
+	dev-python/pylast[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
+	x11-libs/pango[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
+	>=x11-libs/gtk+-3.14:3[introspection]
+	x11-themes/gnome-icon-theme-symbolic
+	libnotify? ( x11-libs/libnotify[introspection] )
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	keybinder? ( dev-libs/keybinder:3[introspection] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/media-sound/pithos/pithos-1.1.2.ebuild b/media-sound/pithos/pithos-1.1.2.ebuild
new file mode 100644
index 000000000000..abfd5d440871
--- /dev/null
+++ b/media-sound/pithos/pithos-1.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=(python3_4 python3_5)
+inherit eutils distutils-r1
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Pandora.com client for the GNOME desktop"
+HOMEPAGE="https://pithos.github.io/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify appindicator +keybinder"
+
+RDEPEND="
+	dev-python/pylast[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
+	x11-libs/pango[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
+	>=x11-libs/gtk+-3.14:3[introspection]
+	x11-themes/gnome-icon-theme-symbolic
+	libnotify? ( x11-libs/libnotify[introspection] )
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	keybinder? ( dev-libs/keybinder:3[introspection] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
diff --git a/media-sound/pithos/pithos-1.3.1.ebuild b/media-sound/pithos/pithos-1.3.1.ebuild
new file mode 100644
index 000000000000..b1d11f32bb78
--- /dev/null
+++ b/media-sound/pithos/pithos-1.3.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python3_4 python3_5)
+inherit autotools gnome2-utils python-r1
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Pandora.com client for the GNOME desktop"
+HOMEPAGE="https://pithos.github.io/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify appindicator +keybinder"
+
+RDEPEND="
+	dev-python/pylast[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
+	dev-libs/appstream-glib[introspection]
+	x11-libs/pango[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
+	>=x11-libs/gtk+-3.14:3[introspection]
+	x11-themes/gnome-icon-theme-symbolic
+	libnotify? ( x11-libs/libnotify[introspection] )
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	keybinder? ( dev-libs/keybinder:3[introspection] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.1-dont-try-to-update-icon-cache.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	python_copy_sources
+}
+
+pithos_src_configure() {
+	pushd "${BUILD_DIR}" || die
+	econf UPDATE_ICON_CACHE=":"
+	popd || die
+}
+
+src_configure() {
+	python_foreach_impl pithos_src_configure
+}
+
+pithos_src_compile() {
+	pushd "${BUILD_DIR}" || die
+	emake
+	popd || die
+}
+
+src_compile() {
+	python_foreach_impl pithos_src_compile
+}
+
+pithos_src_install() {
+	pushd "${BUILD_DIR}" || die
+	emake DESTDIR="${D}" install
+	python_doscript "${D}"/usr/bin/pithos
+	popd || die
+}
+
+src_install() {
+	python_foreach_impl pithos_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/media-sound/pithos/pithos-9999.ebuild b/media-sound/pithos/pithos-9999.ebuild
new file mode 100644
index 000000000000..0daa0a2dd5e1
--- /dev/null
+++ b/media-sound/pithos/pithos-9999.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python3_4 python3_5)
+inherit autotools gnome2-utils python-r1
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="Pandora.com client for the GNOME desktop"
+HOMEPAGE="https://pithos.github.io/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="libnotify appindicator +keybinder"
+
+RDEPEND="
+	dev-python/pylast[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
+	dev-libs/appstream-glib[introspection]
+	x11-libs/pango[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
+	>=x11-libs/gtk+-3.14:3[introspection]
+	x11-themes/gnome-icon-theme-symbolic
+	libnotify? ( x11-libs/libnotify[introspection] )
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	keybinder? ( dev-libs/keybinder:3[introspection] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.1-dont-try-to-update-icon-cache.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	python_copy_sources
+}
+
+pithos_src_configure() {
+	pushd "${BUILD_DIR}" || die
+	econf UPDATE_ICON_CACHE=":"
+	popd || die
+}
+
+src_configure() {
+	python_foreach_impl pithos_src_configure
+}
+
+pithos_src_compile() {
+	pushd "${BUILD_DIR}" || die
+	emake
+	popd || die
+}
+
+src_compile() {
+	python_foreach_impl pithos_src_compile
+}
+
+pithos_src_install() {
+	pushd "${BUILD_DIR}" || die
+	emake DESTDIR="${D}" install
+	python_doscript "${D}"/usr/bin/pithos
+	popd || die
+}
+
+src_install() {
+	python_foreach_impl pithos_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
new file mode 100644
index 000000000000..39a533688377
--- /dev/null
+++ b/media-sound/playerctl/Manifest
@@ -0,0 +1,4 @@
+DIST playerctl-0.5.0.tar.gz 17015 SHA256 e1ea761c05774471a0a1274ad93805178b32d55d358ece0424fd087c1def8017 SHA512 307cad5eeea7efa0c97c885660f49468f442fe907ef2495b56ac512e0551c7248750897b6d00934cbfcfcb35f486a101a238b276ef71d2ef866132ca3cc0932c WHIRLPOOL 11e374a1b38586a8ee362b821d503af8175c36f0b48f067c91176d32aeae034a4fbd6c1e2afc2c78987a7be574248f0c8f329efc2dcf4b07f8df52d8e7d35726
+EBUILD playerctl-0.5.0.ebuild 911 SHA256 55f668c757a5396f6efff67cdc9a11dd5033effb13185ae5d7f4fa1005f527c8 SHA512 0a8d421ab0874a479aca422f676c4b4ccc92cb1043ab82c799a332375439802da585d69afa3325a36f597e6ae6e25e8e8dab32631daf280ee8186ad5d116d8b1 WHIRLPOOL 25b27b61e311c4d87d3cb375336ae46f8a7668e540a991bb72bc233ec896f44dc47cfce838d36d4b6630c19b4bd02476bb6283a279fa54675a8e67751a6046cc
+MISC ChangeLog 831 SHA256 07065e126ff85048ba2609db976c921316eabdd13ba2efb595f653532a55658c SHA512 e5d32eeda9bfac0fb0c4f5a5fd5dc283080bff5185c6db2bd42d273e6eb40908c6e47516e5f3d5885cb4b21b61b20b1b060549c2ad89bab4f0e63b615a0e78db WHIRLPOOL 658477543f9b6acbd0f9b3778c5c9ce69565e895b480f92dcb68d632880b351b103b2b5db3d556df37dcd0bae22baf68e069014c3ee74bcef60c89d17050b451
+MISC metadata.xml 487 SHA256 e21947c51cd8faf1265f27d0c86dbe4b654d90c55d92d4e97775c188cc6573f4 SHA512 f97cd3597a70b86c784f11ffcc5c7c8fb5c16a124cb871907f8e3f216b7ff26d7e2954a52f52a5640fc8a8f41300a4419c527c57f410350a322ed36b1fa2e77f WHIRLPOOL 22eae4306d9eeb4f9fb0cd736196e257a015031395aa1da96eac64fa6f722056cc58f52b600fcac9bf2a2bd46c3e5123bfe4be02a00f6c4ce0cd68bd8c50bb54
diff --git a/media-sound/playerctl/metadata.xml b/media-sound/playerctl/metadata.xml
new file mode 100644
index 000000000000..42a351ac3998
--- /dev/null
+++ b/media-sound/playerctl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gokturk@gentoo.org</email>
+    <name>Göktürk Yüksek</name>
+  </maintainer>
+  <longdescription>
+    mpris command-line controller and library for spotify, vlc,
+    audacious, bmp, xmms2, and others.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">acrisci/playerctl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/playerctl/playerctl-0.5.0.ebuild b/media-sound/playerctl/playerctl-0.5.0.ebuild
new file mode 100644
index 000000000000..67ba0cbdc5cf
--- /dev/null
+++ b/media-sound/playerctl/playerctl-0.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools xdg-utils
+
+DESCRIPTION="A CLI utility to control media players over MPRIS"
+HOMEPAGE="https://github.com/acrisci/playerctl"
+SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/gtk-doc-am
+	doc? ( dev-util/gtk-doc )
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	if ! use doc; then
+		echo 'EXTRA_DIST = ' > gtk-doc.make || die
+	fi
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	xdg_environment_reset # 596166
+
+	econf \
+		$(use_enable doc gtk-doc) \
+		$(use_enable doc gtk-doc-html)
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-sound/playmidi/Manifest b/media-sound/playmidi/Manifest
new file mode 100644
index 000000000000..92df5946d6c5
--- /dev/null
+++ b/media-sound/playmidi/Manifest
@@ -0,0 +1,8 @@
+AUX CAN-2005-0020.patch 2512 SHA256 35b550aac776e7476de0c4711e41be74d4afc8b061ec69307bbba8df81ddf024 SHA512 8e878acb01ae570b7a2f39fd71569772b5d3a586ae2150c277691fe53265ad9c81880057294f9c8130fd3f25813a52c1a987c5e37bcfaafff360c76a435dc039 WHIRLPOOL 71f79ccbce8ac445e2f2d8432d1cb905ffc0b343545657201d9648d48c69ab38215eb5ae866604e19491715cdc830e8c051cfc398e8b178c22c4650cf4607f96
+AUX playmidi-2.5-includes.patch 2365 SHA256 9c8f01351fc221f1c5c6962fa216e23a9b2a244632bd3d43a759f82b65e84269 SHA512 d02a17ebda6b39ca938195bcebd385b63cea41e3a7448fcd8d7d9f547013d828f44dab4eb5fe1da08ddaa369b4b11faa2add22f76e0df3a646dd03fbbfbe7ed0 WHIRLPOOL 744da23e89219d76deeacaeb9e7dec086035757e15c5e2f65b80ebc33c1468ea7d875ae31985b93dfb773ffdbda32472359400774435b7db1c292eba679ade4b
+AUX playmidi-2.5.patch 773 SHA256 5ccaa809ab46f64d82177ed34020028672bd67f5963802b77c10506502ea4f96 SHA512 72914298cc9a54f4c596a69031f5b02b0155f6b9c68c1ad214e81b478a973250a26c7697b714f9f6b8490784febfd688ea5a603d8175c381b5fa2d02e8fbd42d WHIRLPOOL 21eecab353e14b6475567dbbfd0f004eb38fb5791e775588961637a4d27e739006672ef12f386bc2f8f9eaea58c416fc5fcaa040f99b8bc3fcca4aa8397c5539
+DIST playmidi-2.5.tar.gz 147687 SHA256 a7ce37c2a2234fc875290e6ecc897ea2d405c63e95eda5244487c6a7053bfbdd SHA512 246885e17c89469ed10ded2ccf47ac8b89396458315faf26e312ec0bfc2613ebf97c3634e0ec220d87e3ddaefe7291d1fb4d16bd99e32f18a053d2dcdbe1629b WHIRLPOOL e5e5022597f038f8cc6e1553921af4fa5855d5ad9440e25792dc7d9e38a1a442ca71468eecb9fc9aaa531571ee86168882eeafbc0effd10ebbd12ec1e70f9eda
+EBUILD playmidi-2.5-r2.ebuild 1246 SHA256 802200e70a9d992885f373d35429ccd2e3b9a1a5120aea51d5e338e9157251f7 SHA512 d6ade9f02bd621e4838a4f952372ea0ced7307aaead8b5d8a9e34b52ea7607f63ebb1e9ea24a28e35c6bacb7713d8482485718adda12971c44c876a07bd638f8 WHIRLPOOL 8f8b36b8125b4aaeade44c4c75848a1a0eabbe14184c6e9d14af4814e98da1b5fca83c9cd96f9b90a34f2d87bbd01c797344bc0ac46d11a8f6973a51f17c0cd5
+MISC ChangeLog 2642 SHA256 c3267ada996e889cb4dacd8a22a5f6dce439421f726dcc5aa6a58f4d8a50b873 SHA512 316440d2b1237bde6cd907a3131f9c9ed97ae3de19499792c1aac6e0e7c7b438b96e9ceee6d60dea9b140fa7bf54fc9b07b025d9da72eb4bd0d236ee3ad9f526 WHIRLPOOL 65821fb51d1063eb5d2dbe5b3338fe8f156101a999e796b39bed50ce9dd06dedd03c7e251e9a52f834b916f388d60390a1b88b9668e7f15d8ee904d2cae11b18
+MISC ChangeLog-2015 1952 SHA256 030e523ee1a309ecfbcd64bd2a970f48b6fad7a26055e53b21a01b75905b496a SHA512 7c9fb0f3c0e73812be00af0cf31450f913808a26fbb9fbb7280f80c6abcf2b6f6f8a6e2b6756b68ddfc86ab7faf6b2a17d6d9b4f08577c85666d660f3a9347ea WHIRLPOOL 356f940c328ff28ba2a18e0dc23be0103c4fc20d08faa873afee665fb3ac506d0cdea411dcd82290bc7a36e641ea0f61406594c112bc42a0ddfe88916bb17a3f
+MISC metadata.xml 331 SHA256 7b5aa710843f402aab1dc9114b0e6424d4545acd91bdb65bb04e041aa8b422be SHA512 b3c5e539cd9a23bc7e5544d014f09f25eb7c68fb23df7b91a24215286c305c1289641d718fdb957197ee160df5d36997baa44e936f7268fe5a01d4c3cf2ca6db WHIRLPOOL 8b82c786517060163b50fa454bf3ce77123b8ebc92f6ad22012837326198ed05f293dfaa775eab298a777035158d6d04d6d611a41c42b2159b1ae623fd5ff03c
diff --git a/media-sound/playmidi/files/CAN-2005-0020.patch b/media-sound/playmidi/files/CAN-2005-0020.patch
new file mode 100644
index 000000000000..9cd120eddb59
--- /dev/null
+++ b/media-sound/playmidi/files/CAN-2005-0020.patch
@@ -0,0 +1,69 @@
+--- playmidi.c.orig	2005-01-17 17:43:20.578060936 -0500
++++ playmidi.c	2005-01-17 17:48:55.022217696 -0500
+@@ -22,6 +22,7 @@
+ #include <ctype.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
++#include <errno.h>
+ #include "playmidi.h"
+ 
+ SEQ_DEFINEBUF(SEQUENCERBLOCKSIZE);
+@@ -186,6 +187,15 @@
+     struct stat info;
+     int piped = 0;
+ 
++    /* CPhipps 2000/02/04 - this might be splaymidi, in which case we're
++     * probably setuid root. Drop privs immediately.. io_svgalib.c can
++     * regain them */
++    if (getuid() != geteuid())
++       if (seteuid(getuid())) {
++           perror("seteuid");
++           exit(EPERM); /* Seems appropriate */
++       }
++
+     printf("%s Copyright (C) 1994-1997 Nathan I. Laredo,"
+ 	   " AWE32 by Takashi Iwai\n"
+ 	   "This is free software with ABSOLUTELY NO WARRANTY.\n"
+@@ -439,9 +449,9 @@
+     for (i = optind; i < argc;) {
+ 	filename = argv[i];
+ 	if (stat(filename, &info) == -1) {
+-	    if ((extra = malloc(strlen(filename) + 4)) == NULL)
++	    if ((extra = malloc(strlen(filename) + 5)) == NULL)
+ 		close_show(-1);
+-	    sprintf(extra, "%s.mid", filename);
++	    snprintf(extra, sizeof(extra), "%s.mid", filename);
+ 	    if (stat(extra, &info) == -1)
+ 		close_show(-1);
+ 	    if ((mfd = fopen(extra, "r")) == NULL)
+@@ -452,7 +462,7 @@
+ 	    if (ext && strcmp(ext, ".gz") == 0) {
+ 		char temp[1024];
+ 		piped = 1;
+-		sprintf(temp, "gzip -l %s", filename);
++		snprintf(temp, sizeof(temp), "gzip -l %s", filename);
+ 		if ((mfd = popen(temp, "r")) == NULL)
+ 		    close_show(-1);
+ 		fgets(temp, sizeof(temp), mfd); /* skip 1st line */
+@@ -460,7 +470,7 @@
+ 		strtok(temp, " "); /* compressed size */
+ 		info.st_size = atoi(strtok(NULL, " ")); /* original size */
+ 		pclose(mfd);
+-		sprintf(temp, "gzip -d -c %s", filename);
++		snprintf(temp, sizeof(temp), "gzip -d -c %s", filename);
+ 		if ((mfd = popen(temp, "r")) == NULL)
+ 		    close_show(-1);
+ 	    } else if ((mfd = fopen(filename, "r")) == NULL)
+--- io_svgalib.c.orig	2005-01-17 17:49:55.758984304 -0500
++++ io_svgalib.c	2005-01-17 17:49:59.310444400 -0500
+@@ -259,6 +259,10 @@
+     tcgetattr(mytty, &newtty);
+     newtty.c_lflag &= ~(ICANON | ECHO | ICRNL | ISIG);
+     tcsetattr(mytty, TCSANOW, &newtty);
++    /* CPhipps 2000/02/04 - restore euid root in order to start SVGALib.
++     * We don't have to worry about errors, or dropping priv's afterwards,
++     * SVGALib handles that safely for us. */
++    seteuid(0);
+     vga_init();
+     if ((vgamode = vga_getdefaultmode()) == -1)
+ 	vgamode = G640x480x256;
diff --git a/media-sound/playmidi/files/playmidi-2.5-includes.patch b/media-sound/playmidi/files/playmidi-2.5-includes.patch
new file mode 100644
index 000000000000..0a93c5930892
--- /dev/null
+++ b/media-sound/playmidi/files/playmidi-2.5-includes.patch
@@ -0,0 +1,66 @@
+diff -ur playmidi-2.4.orig/Makefile playmidi-2.4/Makefile
+--- playmidi-2.4.orig/Makefile	1998-10-01 05:39:18.000000000 +0300
++++ playmidi-2.4/Makefile	2007-07-25 16:22:23.000000000 +0300
+@@ -12,38 +12,38 @@
+ 
+ # ncurses usually /usr/lib, -L/usr/local/lib doesn't hurt
+ # unless there's more than one ncurses floating around on your system
+-LIBNC	= -L/usr/local/lib -lncurses
++LIBNC	= -L/usr/lib -lncurses
+ 
+ ######### NOTE:  X11R6 or newer REQUIRED
+-LIBX11	= -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
+-LIBGTK	= -L/usr/X11R6/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
+-LIBVGA	= -L/usr/local/lib -lvgagl -lvga
++LIBX11	= -L/usr/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
++LIBGTK	= -L/usr/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
++LIBVGA	= -L/usr/lib -lvgagl -lvga
+ 
+ # ncurses is usually in /usr/include/ncurses, but you may need
+ # to use /usr/local/include/ncurses depending on your setup.
+ INCNC	= -I/usr/include/ncurses
+ 
+ # just in case you keep your X includes in an odd location.
+-INCX11	= -I/usr/X11R6/include -DNARROWPROTO
++INCX11	= -I/usr/include -DNARROWPROTO
+ 
+ # stuff for sound blaster awe32
+ INCAWE  = -DVOXWARE_CONTROLLER_7_WORKING
+ # awe_voice.h path
+-INCAWE  += -I/usr/lib/oss/include/sys
++INCAWE  += -I.
+ 
+ # usually in /usr/include, but -I/usr/local/include doesn't hurt
+ # unless there's more than one svgalib floating around your system.
+-INCVGA	= -I/usr/local/include
++INCVGA	= -I/usr/include
+ 
+ # Directory where application defaults files are stored for X11 version
+-XAPPDEFAULTS = /usr/X11R6/lib/X11/app-defaults
++XAPPDEFAULTS = /usr/share/X11/app-defaults
+ 
+ INCLUDES= $(INCNC) $(INCX11) $(INCVGA) $(INCAWE)
+ INSTALLDIR = /usr/bin
+ INSTALL = install -s
+ 
+ # if you are using the GUS Ultra driver module, add -DULTRA_DRIVER
+-CFLAGS	= -Wall -pipe -fomit-frame-pointer -O2 -m486 $(INCAWE)
++CFLAGS	= -Wall $(INCAWE)
+ LDFLAGS =
+ 
+ OBJECTS = playmidi.o readmidi.o playevents.o \
+diff -ur playmidi-2.4.orig/playmidi.h-dist playmidi-2.4/playmidi.h-dist
+--- playmidi-2.4.orig/playmidi.h-dist	1997-05-12 00:26:36.000000000 +0300
++++ playmidi-2.4/playmidi.h-dist	2007-07-25 16:22:44.000000000 +0300
+@@ -52,11 +52,7 @@
+ #include <stdlib.h>
+ #include <sys/soundcard.h>
+ #include <sys/ioctl.h>
+-#ifdef linux
+-#include <linux/awe_voice.h>
+-#else
+ #include <awe_voice.h>
+-#endif
+ 
+ struct chanstate {
+     int program;
diff --git a/media-sound/playmidi/files/playmidi-2.5.patch b/media-sound/playmidi/files/playmidi-2.5.patch
new file mode 100644
index 000000000000..317b5c8734b7
--- /dev/null
+++ b/media-sound/playmidi/files/playmidi-2.5.patch
@@ -0,0 +1,22 @@
+--- io_ncurses.c.orig	2003-11-30 19:23:34.000000000 -0800
++++ io_ncurses.c	2003-11-30 19:23:46.000000000 -0800
+@@ -14,11 +14,7 @@
+    Kelly Drive, Lackland AFB, TX 78236-5128, USA.
+  *************************************************************************/
+ #include "playmidi.h"
+-#ifdef linux
+-#include <ncurses/curses.h>
+-#else
+ #include <ncurses.h>
+-#endif
+ #include "gsvoices.h"
+ #include <sys/time.h>
+ #include <unistd.h>
+--- playmidi.h-dist.orig	2003-11-30 19:49:35.000000000 -0800
++++ playmidi.h-dist	2003-11-30 19:49:46.000000000 -0800
+@@ -1,4 +1,4 @@
+-#define RELEASE "Playmidi 2.4"
++#define RELEASE "Playmidi 2.5"
+ /************************************************************************
+    playmidi.h  --  defines and structures for use by playmidi package
+ 
diff --git a/media-sound/playmidi/metadata.xml b/media-sound/playmidi/metadata.xml
new file mode 100644
index 000000000000..8c84a6074c44
--- /dev/null
+++ b/media-sound/playmidi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">playmidi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/playmidi/playmidi-2.5-r2.ebuild b/media-sound/playmidi/playmidi-2.5-r2.ebuild
new file mode 100644
index 000000000000..5dee5bf77bbb
--- /dev/null
+++ b/media-sound/playmidi/playmidi-2.5-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Command Line and GUI based MIDI Player"
+HOMEPAGE="https://sourceforge.net/projects/playmidi/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE="svga X"
+
+RDEPEND="sys-libs/ncurses
+	svga? ( media-libs/svgalib )
+	X? ( x11-libs/libX11
+		x11-libs/libSM
+		x11-libs/libXaw )"
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xextproto )"
+
+S="${WORKDIR}/${P/2.5/2.4}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}.patch
+	epatch "${FILESDIR}"/CAN-2005-0020.patch
+	epatch "${FILESDIR}"/${P}-includes.patch
+}
+
+src_compile() {
+	local targets="playmidi"
+
+	use svga && targets="$targets splaymidi"
+	use X && targets="$targets xplaymidi"
+
+	echo "5" | ./Configure
+
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		depend clean || die "emake failed."
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}" ${targets} \
+		|| die "emake failed."
+}
+
+src_install() {
+	dobin playmidi
+	use svga && dobin splaymidi
+	use X && dobin xplaymidi
+	dodoc BUGS QuickStart README.1ST
+	docinto techref
+	dodoc techref/*
+}
diff --git a/media-sound/pms/Manifest b/media-sound/pms/Manifest
new file mode 100644
index 000000000000..062c9f9c5def
--- /dev/null
+++ b/media-sound/pms/Manifest
@@ -0,0 +1,6 @@
+DIST pms-0.42_p20170508.tar.gz 140157 SHA256 a5453fe84421608cd2ebe0827e9c011259723a41e1eba1519eb3df83e4ade7f4 SHA512 686a5e265ebad418a153b9888cc213bbf8cca5aa2d398206848823105edac16e298431c288dc0a74adb23d327c75845cdec1680a6a2a2ae40bc7b41c55ca163c WHIRLPOOL 745e7a8bf61c06e35575ff62a22fa36b808db21b0f1500ecebd7ec830e968d708fb7ed0e813e98f52fa689f1cafcf6ade3da69e756cd7adffd5c64ad68c9baa0
+EBUILD pms-0.42_p20170508.ebuild 749 SHA256 20b58995f29485d61a6aa04f9ed65f003ddcc60c6fabb7faaa870f491c6680f2 SHA512 26d99bc5f34ce213c00e33fa81e9c14828bda5ed3d15e67c92b3a2e05cce82dba4369d87728ccb7ca55eee658786e058864efa57c04434676bfc46233fdbcf8a WHIRLPOOL 2873248c18e88b88e2a7c6b5c27f4b6b2fb2ead6f9077b94952cfcc848af6980390762d9c62eb54e15807063029ccb09bc2fb2ee6d8c6624a4944f8ca4f84abe
+EBUILD pms-9999.ebuild 719 SHA256 ab82e5044cb91c0cefe8232933a1e6b7533cf1a6afdb45064b52b612704fb0cc SHA512 4404ea4fc14b16fa98967da327ffa74a6e860849ce8a8785d813a6d7a2c32994ea93504812640fd8e720b80a25419056fed439b9f00384b30426fbf5117cd5a3 WHIRLPOOL 0e3b27f5050e10aa889359b387b7ee4ebdfbc7d3472e48fd47899961d8ec5b9210a6344d4997f887d373e76cba80f6b1a3f912174b864e89625595cb9b0dfa23
+MISC ChangeLog 4683 SHA256 5fed4aacd5acb1e0d178c9995ed68d2374404b0202a6e63ea8747e288275b9bc SHA512 e2895f26da62f8dce53cbc311b11135f23a6e808c62b5dd886d2800baaa6044f28b23ed34e6388312fb941c9fc6fcee6dbda4f37a1575a8788ceaf4d35085628 WHIRLPOOL b16383cd82fc5f9611414d8a42853f191fff63ac9b5ce98b848b1890099401a1c7ad4deddfec8a241d7c2cb4c4bc80e3c837959546522553459a7f498b20ff7d
+MISC ChangeLog-2015 1516 SHA256 fdd2dfa1e0a7ddfae8d6564d2b0c67704dfaad3dbc02d855a1fba4f3dd37c312 SHA512 fe99ae2029a62c974d6516ebbb5fca3eb2b855ea5fdc03b997bef1616f2a804d8205fb9b44f8b3d42704d091a15da6ccda04ca5c9c73e8fb52ab1feab00f12af WHIRLPOOL cf4e16308c9e8f948fd3148b3072ca3a36a8cf8b4fae2512f32cbb5063da6f920bfe6c608bb7314b35496aa6fcf6f99d22027e456d146ec11b87c10200922dfa
+MISC metadata.xml 542 SHA256 e5f118e1a827daeec2ffe42b1b2f1eced168e3262aa3342f16edc957b803cfea SHA512 a8a7160b02c402c699f9cf8fe65a8f9b9ca2dc66e6f721ced78e96a3b6cf5a42d5886fce45daa68f9343fb8a73a651f6ee606642c44fc997ad921259b874fe5e WHIRLPOOL 8afccc88bce4c020e551ffd26ee50a7a27211614b3d89f8d025f4cfb9617dfbc57861640130c0c88f08ae5bf49a59c621f9e8de23bea070261255b1ab8b19f7d
diff --git a/media-sound/pms/metadata.xml b/media-sound/pms/metadata.xml
new file mode 100644
index 000000000000..aa181ca7a9c6
--- /dev/null
+++ b/media-sound/pms/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hilobakho@gmail.com</email>
+		<name>Mykyta Holubakha</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<use>
+		<flag name="regex">Enable regular expression searches</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">ambientsound/pms</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/pms/pms-0.42_p20170508.ebuild b/media-sound/pms/pms-0.42_p20170508.ebuild
new file mode 100644
index 000000000000..13f5072cbc92
--- /dev/null
+++ b/media-sound/pms/pms-0.42_p20170508.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils vcs-snapshot
+
+REF="8c8918488a4a22924ee04442dc5e5216783d51ff"
+
+DESCRIPTION="Practical Music Search: an open source ncurses client for mpd, written in C++"
+HOMEPAGE="https://ambientsound.github.io/pms"
+SRC_URI="https://github.com/ambientsound/${PN}/tarball/${REF} -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+regex doc"
+
+RDEPEND="
+	sys-libs/ncurses:0=[unicode]
+	media-libs/libmpdclient
+"
+DEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/pandoc )
+	${RDEPEND}
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_REGEX=$(usex regex)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/pms/pms-9999.ebuild b/media-sound/pms/pms-9999.ebuild
new file mode 100644
index 000000000000..2a0de1e38b9c
--- /dev/null
+++ b/media-sound/pms/pms-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils git-r3
+
+DESCRIPTION="Practical Music Search: an open source ncurses client for mpd, written in C++"
+HOMEPAGE="https://ambientsound.github.io/pms"
+
+EGIT_REPO_URI="https://github.com/ambientsound/pms.git"
+EGIT_BRANCH="0.42.x" # todo: package the golang version
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS=""
+IUSE="+regex doc"
+
+RDEPEND="
+	sys-libs/ncurses:0=[unicode]
+	media-libs/libmpdclient
+"
+DEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/pandoc )
+	${RDEPEND}
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_REGEX=$(usex regex)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/pnmixer/Manifest b/media-sound/pnmixer/Manifest
new file mode 100644
index 000000000000..ce2dc33b2f97
--- /dev/null
+++ b/media-sound/pnmixer/Manifest
@@ -0,0 +1,10 @@
+AUX pnmixer-0.6_pre20111213-build.patch 1571 SHA256 e7e3702eca6b300dec759391c0e645d8ac8421c597bc3e8110695fcda7b01fa0 SHA512 c0ad5ab5e9e5b89d6f4b1af736381f4acfcaf259ed4b3291c8eeab8519825896233d074af1abda73e5bb6ecfa878bd5d36b115dd6bf3a77684ccc354d75a87ad WHIRLPOOL 6c87abd3251308424bdc6903154363fb99045db955a56157dcdb871ad93a624492e073ad1114188ef5b553a5a90c5ae1407d1b75a70b579126741f7a03741d7b
+AUX pnmixer-0.6_pre20111213-desktopfile.patch 328 SHA256 1dd714d9fd7c57b6b319eaeb9e24226b6978952dea8f3eed35805a30dd0c9fcb SHA512 ee9eee6503291e9bfeddbb5e5758aea496785e50722246fc9119bc69fd285e9145d63d9e61c4f01a52769f3142a12211d01c32a7c6a9edd31bc3a7e1fa044657 WHIRLPOOL f24f8ae0bc7688ea2b0e03d82573a8e3f3d519b41243c7a917bdf792d69ba140c7472760d148b9bbced4756fedec2500591bd3064ff037ecae169b5649d40850
+DIST pnmixer-0.6_pre20111213.tar.xz 131328 SHA256 aa42180145aa56639440168935a8b16c576e6e49db0bbe2955b79a890437f013 SHA512 967a685593256f9f2e8ab2ef955a91a03c3710d96956087ac55301d5232e6f01897efbb064bd6dc1804836af1b66c038cb3d04203043462de5246e4f14dd37c4 WHIRLPOOL 1fe36a5ea212447212bbd9b6b4efee22e1f75fbb0f2c0548447c0987664d94524e306e2942f6e96c6f10cf6bf15abc35df6b7953d63ef8ec2241eef3d627c16d
+DIST pnmixer-0.7.1.tar.gz 237949 SHA256 3214b3bb54a245b8f38a5b28ebe853df8648edfbdaebec14128e4ffe3f1f4bc2 SHA512 08d83424d921ef6112700fe8c3b55e147ace7767698a9d3ee4bb79ed0e727be7bcc82d55d3debc4b805e75f07c5702443be157e1bccce44d76072c36f8825816 WHIRLPOOL c56b26f8e8bd783f732c9a691c184139cf082c0362e7a2c4122b5aae965b4d014ef1ec36f31a17794c7634726c991957ced77e1afb0e22e28a61a763eea7a70a
+EBUILD pnmixer-0.6_pre20111213.ebuild 959 SHA256 e3f9e6f2951eb417780610a16d1307e718ceb41a7582cc1e74510d65c71cab06 SHA512 c3301b8ac6715307517bc7ca402421216b0878a0233d9f44c55132f513d61befc95eae83b2b64bfb183f268bac6cd0540692224239deb021612beb7ead00ffa9 WHIRLPOOL 3acfd66907fa3b56166edea97451b21fcb7cb06726eb3422e6c031ab722947e13897429172338c8189f0c9f0ca655d9c818a64612f8adad7d21df588f138dcc0
+EBUILD pnmixer-0.7.1.ebuild 817 SHA256 901406ec652179d30ee8340477e465819c85691f6fb93a7dd9cf68af9c920d0f SHA512 c648143edc699c2a4eeeed324436d01328eae8177be4bf34535d8dda648b0a4b3353f1b5b07c5c328dd4be8a470d35e0cd57a784efa3281f51e2bac74228e42a WHIRLPOOL c0f16c30fd02f62b255259ad55aa76227973178edc52c64be514148afa44438b863c0c5ca8e0c5fb733a21f57a1f792d4e81c9b996838613bba425bd6b208c3c
+EBUILD pnmixer-9999.ebuild 819 SHA256 1c201e9fc2b0bcbbbc38efdbd0ac2122340151540947d430845a928165dfa987 SHA512 126ae9a4c6e539fc34dec05d9210ceffe01fd1279958e4e89df7295c8cc4e6dcb95c81cef9f8c0839190ed826b0b143f38538310190d0e8fa16372d0c7094189 WHIRLPOOL 7ab85278630d1ea023751cad20d511368515c3635ec8a39988d208e67d7d0ba45aaa4ec491c5ba22c7b5df398d2c9af521150cede6fc0a16a140acf6e79a9c9b
+MISC ChangeLog 5093 SHA256 6da158846b731cb7b54067ccd61b67132faa28bff8af7b02955ede4c70960a78 SHA512 fa328b258398a3090ac7e661e2ee12785dbfc7429f15d11d981deb7a05045658a077cc6810eb1742f3a1da112b9678554e45aa10c7cd7a31487694de1f057df7 WHIRLPOOL f2d0985eb46c6f303b2322c3d6af44bc9a6c9658b305d751dfc6e4687f09ad345dcbbf672d46a8f46dc44f35e15d3e77d0c3d4bac8379278e2934473094ae912
+MISC ChangeLog-2015 2217 SHA256 35e40272ffb0e6f9ebfa451d57945df74ad155f15336853efc294672e56cb1ce SHA512 75abc30610a8ea919bbdac61733bf8d06ef315657cca530b8cdf4e7218fb9839235ba1902293868726fde69b3a74c1879c09483bb6b046a5ee1ea9836546bd20 WHIRLPOOL 89619316bd85ae855a5734022ff01f5b1871ee126e756ed4dd748f0be2cf958be3dab290a24fed519e47a6309f6678feef54d4e1d9ce0da2b3a07db4a81ad901
+MISC metadata.xml 2085 SHA256 c312441f7d57b49e51bb55c5c8b08235afcd9d115dea8c4e29199bda4373c5b3 SHA512 57421f90ca52f34dc76db9fef86c7e01bb35222ff9bf37e4ca98a245289bcdeb3e77b6e1a8224394ba07d6def209065cfc81e2e48dac3338f0dca96db85f2f9e WHIRLPOOL 0609b684369ac6d7d0e45f1fd1a1f8dadd9080c0999571d3db8948c9216a87c8d56d47314d90d3b147df62794962591b7af085666dfa7967a995e73b240400a4
diff --git a/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch b/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch
new file mode 100644
index 000000000000..5e4fba2d0750
--- /dev/null
+++ b/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch
@@ -0,0 +1,63 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Nov 15 23:59:49 UTC 2012
+Subject: build system
+
+respect CFLAGS, use rdynamic
+don't use AM_CFLAGS in configure.in
+fix macros for automake-1.13
+
+--- configure.in
++++ configure.in
+@@ -1,16 +1,13 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT(configure.in)
+-AM_INIT_AUTOMAKE(pnmixer, 0.6-dev)
+-AM_CONFIG_HEADER(config.h)
++AC_INIT([pnmixer], [0.6-dev])
++AM_INIT_AUTOMAKE
++AC_CONFIG_HEADERS(config.h)
+ AM_MAINTAINER_MODE
+ 
+-OLD_CFLAGS=$CFLAGS
+ AC_ISC_POSIX
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+-CFLAGS=$OLD_CXXFLAGS
+ 
+ pkg_modules="gtk+-2.0 >= 2.16.0"
+ 
+@@ -37,12 +34,13 @@
+ 
+ if test x"$debugit" = x"yes"; then
+     AC_DEFINE([DEBUG],[],[Debug Mode])
+-    AM_CFLAGS="$AM_CFLAGS -g -Wall -Werror -Wno-uninitialized -Wformat -Wformat-security -O0 -export-dynamic"
+ else
+     AC_DEFINE([NDEBUG],[],[No-debug Mode])
+-    AM_CFLAGS="$AM_CFLAGS -O2 -export-dynamic"
+ fi
+ 
++CFLAGS="$CFLAGS -Wall -Wno-uninitialized -Wformat -Wformat-security"
++LDFLAGS="-rdynamic $LDFLAGS"
++
+ ##########################################################################
+ 
+ # Make sure we have X11, and also have it added to LIBS
+@@ -74,7 +72,6 @@
+    AC_DEFINE([HAVE_LIBN],1,[Defined if you have libnotify])
+ fi
+ 
+-AC_SUBST([AM_CFLAGS])
+ 
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -1,6 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-AM_CFLAGS = @AM_CFLAGS@
+ 
+ INCLUDES = \
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
diff --git a/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-desktopfile.patch b/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-desktopfile.patch
new file mode 100644
index 000000000000..992e02936477
--- /dev/null
+++ b/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-desktopfile.patch
@@ -0,0 +1,15 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Fri Nov 16 00:03:56 UTC 2012
+Subject: desktop file
+
+	comply with fd.o spec
+
+--- data/pnmixer.desktop
++++ data/pnmixer.desktop
+@@ -12,4 +12,4 @@
+ Icon=pnmixer
+ Terminal=false
+ Type=Application
+-Categories=Application;AudioVideo;
+\ No newline at end of file
++Categories=AudioVideo;
diff --git a/media-sound/pnmixer/metadata.xml b/media-sound/pnmixer/metadata.xml
new file mode 100644
index 000000000000..0877b41108af
--- /dev/null
+++ b/media-sound/pnmixer/metadata.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		PNMixer is a simple mixer application designed to run in your system
+		tray. It integrates nicely into desktop environments that don't have
+		a panel that supports applets, and therefore can't run a mixer applet.
+		In particular it's been used quite a lot with fbpanel and tint2, but
+		should run fine in any system tray.
+
+		PNMixer is designed to work on systems that use ALSA for sound
+		management. Any other sound driver like OSS or FFADO, or sound
+		server like PulseAudio or Jackd, are currently not supported
+		(patches welcome).
+
+		PNMixer is a fork of OBMixer with a number of additions.
+		These include:
+			* Volume adjustment with the scroll wheel
+			* Select which ALSA device and channel to use
+			* Detect disconnect from sound system and re-connect if requested
+			* Bind and use HotKeys for volume control
+			* Texual display of volume level in popup window
+			* Continous volume adjustment when dragging the slider (not just
+				when you let go)
+			* Draw a volume level onto system tray icon
+			* Use system icon theme for icons and use mute/low/medium/high
+				volume icons
+			* Configurable middle click action
+			* Preferences for:
+				- volume text display
+				- volume text position
+				- icon theme
+				- amount to adjust per scoll
+				- middle click action
+				- drawing of volume level on tray icon
+
+		Source and so on are at: https://github.com/nicklan/pnmixer
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/nicklan/pnmixer/issues</bugs-to>
+		<changelog>https://github.com/nicklan/pnmixer/releases</changelog>
+		<doc lang="en">https://github.com/nicklan/pnmixer/wiki</doc>
+		<remote-id type="github">nicklan/pnmixer</remote-id>
+		<maintainer status="active">
+			<email>hasufell@posteo.de</email>
+			<name>Julian Ospald</name>
+		</maintainer>
+		<maintainer status="active">
+			<email>elboulangero@gmail.com</email>
+			<name>El Boulangero</name>
+		</maintainer>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild b/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild
new file mode 100644
index 000000000000..809462325d8b
--- /dev/null
+++ b/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils gnome2-utils
+
+DESCRIPTION="Alsa volume mixer for the system tray"
+HOMEPAGE="https://github.com/nicklan/pnmixer"
+SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug libnotify"
+
+RDEPEND="media-libs/alsa-lib
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	libnotify? ( x11-libs/libnotify )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{build,desktopfile}.patch
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_with libnotify)
+}
+
+src_install() {
+	default
+	newicon -s 128 pixmaps/${PN}-about.png ${PN}.png
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/pnmixer/pnmixer-0.7.1.ebuild b/media-sound/pnmixer/pnmixer-0.7.1.ebuild
new file mode 100644
index 000000000000..830c6b74c7ec
--- /dev/null
+++ b/media-sound/pnmixer/pnmixer-0.7.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Volume mixer for the system tray"
+HOMEPAGE="https://github.com/nicklan/pnmixer"
+SRC_URI="https://github.com/nicklan/pnmixer/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="dev-libs/glib:2
+	media-libs/alsa-lib
+	>=x11-libs/gtk+-3.12:3
+	x11-libs/libX11
+	libnotify? ( x11-libs/libnotify )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${PV/_rc/-rc}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_LIBNOTIFY="$(usex libnotify)"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/pnmixer/pnmixer-9999.ebuild b/media-sound/pnmixer/pnmixer-9999.ebuild
new file mode 100644
index 000000000000..69801bb9225a
--- /dev/null
+++ b/media-sound/pnmixer/pnmixer-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WANT_LIBTOOL=none
+inherit cmake-utils gnome2-utils git-r3
+
+DESCRIPTION="Volume mixer for the system tray"
+HOMEPAGE="https://github.com/nicklan/pnmixer"
+EGIT_REPO_URI="git@github.com:nicklan/pnmixer.git
+	https://github.com/nicklan/pnmixer.git"
+EGIT_BRANCH="master"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="libnotify"
+
+RDEPEND="dev-libs/glib:2
+	media-libs/alsa-lib
+	>=x11-libs/gtk+-3.12:3
+	x11-libs/libX11
+	libnotify? ( x11-libs/libnotify )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_LIBNOTIFY="$(usex libnotify)"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/poc/Manifest b/media-sound/poc/Manifest
new file mode 100644
index 000000000000..7bd48cdb68c3
--- /dev/null
+++ b/media-sound/poc/Manifest
@@ -0,0 +1,7 @@
+AUX poc-0.4.1-fec-pkt-prototype.patch 214 SHA256 09148192f3f17d24f6f33f355c7a37b8e44d76e08255d1a084e2fc1311d09208 SHA512 d98b35b746f5bc92c017e2c3f3bf3f19b2ed28970a955dd0ca6010f338889cacf0c3e527f2eb8a57bbdfc67499fd2eb24b93662dbb2b24c43ed790e79e249e99 WHIRLPOOL 3a9e9d26670a07763d8ca4532241299f5ca55c5bfc6b511022e3bc20bc3601d440aa3a0ff9591d2c498cb1d517645b6cfa77f89c1757af4faaf881d592f1a6e5
+AUX poc-0.4.1-file-perms.patch 269 SHA256 668265ef6e9bb5969d57c5c1f56a22c4e71c5062e71bd33f4f0a34ceb3f5d666 SHA512 a86671efabc9438876132f92a9d59ec2a125010796f645c63b67ec29d26040bfd158852580881576564961e2efd0ee86eaf8b29577ad5bbd94d974ed1e4d811b WHIRLPOOL b41fd976397848d19a804c4c092c66ba8e6f1318748644a5c877dc1cbd90c98f38b068608bf6c7eb8f8f7d8a847c46d60a09239a7f24797301ecdef30148cbed
+DIST poc-0.4.1.tar.gz 114875 SHA256 a8f8be5281b80f9bb1dd0d330ec59e608d557351f6e6ad5b3d14932f7b952d29 SHA512 84cbe5421006a9b81310925c22d4b25888c036c83ee1c59ee63415fb5656b9c04d5c417817d026f8ad85240f401b3d5cdeb2c4f480b13bf7a295d147ef2246b7 WHIRLPOOL c646d6f2e9fbda7787edfe008996bd4970a5c300a3bc17343770e6ffda6ef4ae8b792244e9420c37b860198ef91d0a6f86ee962e7cf2f04fe64cffb34e5b3dba
+EBUILD poc-0.4.1.ebuild 833 SHA256 489996335ef25ca430766354b3be805c7bdfaf52490b90dfe48a840ff7576587 SHA512 eecadac2b6c836512d4ab6813b7484a5ac54d8049b1c53d16630dc0ab80d4e2d14b623e9ace912817919650f03dff780dce51ea928b7c4713de938ab731599c7 WHIRLPOOL 6b7200fdd6f50dfb28f7e5cf72a65ab631d2254abdb314c401a0a538be1c12845358ca815f47518b282cfaa58c4cfccede08ab749e342a5f0e8ef10a6ad9c61b
+MISC ChangeLog 2497 SHA256 b04e10b752030bd4b68040c0c606190436e5d9592cfa23319a6e9e2d28b816bd SHA512 5f662b7def2570f8fcf5ac8f90c6ae480a2b12bd5a4d5b17e8ca4d3d49102377c2f14cb4314c857e6df0120822dadc9bbe88ca2399f2772aca2a8f58f7a97bcf WHIRLPOOL eb5863de5fa6ba61519f18fff7dec7aa91bb2681b3f6433669620cf28d12c69539bc5413084e0c09dd68f05ce11d0738e01caca4b9eb63adaffbccfe00d0df87
+MISC ChangeLog-2015 612 SHA256 a1de8d5a7ec435119d639c3ab03f242aebd76cc3ab3efb27a025fb048eb1570c SHA512 e6dca93f4e00428d7f286524ba0bb54cbf11f42ae99b345314b71811b0db408e73b7ab44143c418b17d9e0b4fd4c92c9886aaf719a1ab47ec9e7cbf1e8b8600c WHIRLPOOL d96f0747d53089ea5011c4123a6ef82113b66d55b527d6425dc274b6c3a63b6123154bdb77e5c6091046b28df14ecd87c39b18bfb8467ead4715c1607102728b
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/poc/files/poc-0.4.1-fec-pkt-prototype.patch b/media-sound/poc/files/poc-0.4.1-fec-pkt-prototype.patch
new file mode 100644
index 000000000000..f0957a1ca292
--- /dev/null
+++ b/media-sound/poc/files/poc-0.4.1-fec-pkt-prototype.patch
@@ -0,0 +1,9 @@
+sync prototypes between the header and source
+
+--- fec-pkt.c
++++ fec-pkt.c
+@@ -68,3 +68,3 @@
+ **/
+-int fec_pkt_read(fec_pkt_t *pkt, int fd) {
++ssize_t fec_pkt_read(fec_pkt_t *pkt, int fd) {
+   assert(pkt != NULL);
diff --git a/media-sound/poc/files/poc-0.4.1-file-perms.patch b/media-sound/poc/files/poc-0.4.1-file-perms.patch
new file mode 100644
index 000000000000..ee23d90ab82b
--- /dev/null
+++ b/media-sound/poc/files/poc-0.4.1-file-perms.patch
@@ -0,0 +1,9 @@
+Creating mp3 files with u+x attributes is just silly
+
+--- file.c
++++ file.c
+@@ -136,3 +136,3 @@
+     file->fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC,
+-                    S_IRWXU | S_IRGRP | S_IROTH);
++                    S_IRUSR|S_IWUSR | S_IRGRP | S_IROTH);
+ 
diff --git a/media-sound/poc/metadata.xml b/media-sound/poc/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/poc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/poc/poc-0.4.1.ebuild b/media-sound/poc/poc-0.4.1.ebuild
new file mode 100644
index 000000000000..2800c61f8822
--- /dev/null
+++ b/media-sound/poc/poc-0.4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="mp3 and ogg streamer (include mp3cue and mp3cut)"
+HOMEPAGE="http://www.bl0rg.net/software/poc"
+SRC_URI="http://www.bl0rg.net/software/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="sys-devel/flex
+	sys-devel/bison"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e '/^CFLAGS/s:-O2::' \
+		-e '/^PREFIX/s:/local::' \
+		Makefile
+	epatch "${FILESDIR}"/${P}-fec-pkt-prototype.patch
+	epatch "${FILESDIR}"/${P}-file-perms.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed."
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc README TODO
+}
diff --git a/media-sound/podcatcher/Manifest b/media-sound/podcatcher/Manifest
new file mode 100644
index 000000000000..4b538e3c92da
--- /dev/null
+++ b/media-sound/podcatcher/Manifest
@@ -0,0 +1,5 @@
+DIST podcatcher-3.1.6.tar.gz 22260 SHA256 0672fd11c3aefde8d28f2539bd3f8d1f47a3acb1b0bb8120ed028d4dfbd365db SHA512 5e1ac6771a4d81d2bfbc77c4a89861a976329a77144b630aaa7f6a1663a0dd9021acc71cfd44e6373bdaf4562718bbb3c19ff7cda56be1c7624cf389ff293599 WHIRLPOOL 03f081fd2aa2a81cfdfb6d3b402fd4013dcf4d5a8725a07e1c1e73117b57cb62d6ec24a5d58d8ac2f81a6475795ae375de33e1781f10fd8c9756b3546abfcf42
+EBUILD podcatcher-3.1.6.ebuild 530 SHA256 14562fdd6d5896e980f3982e1a2541ff1d8938433823c655f111f6670a6cd8ae SHA512 5fa1d26d2fef8bf10fc312339c5dfc83ed967eba1a6cefa9ba69cfc8af0376fac7c83b70fd84b79a4f9721dd6cb1b43a213b85b50244c86230d95b65c50f78e0 WHIRLPOOL 0d11e669d96a7aaa4847923a839cf1e4f2434fa50a803da82ddd19cd1e3a77a8bd4d1d2f38d45c84b7398132f290d5fd11c905b35118294dc41b7f54c3a6a708
+MISC ChangeLog 3115 SHA256 78c9c251476e10338a7b27ad03939e55549297862168cc29e29378b62e94077b SHA512 caae56a83b2692743e839b3708a8f5ebe6e772d1841548ba9d60f9bbb69541f93eda551773cbc04c55e1fe350c7c659919a654c22e9b39e1f5cf64e98deec5af WHIRLPOOL e11944ce52fd6217305b2c5ab6e14ba6cf0b5f677b3a7ccca3bb52640380250a44f424eab5988850df580201b2589ecade3f0301451d8bfa67338380b6ff80f6
+MISC ChangeLog-2015 1197 SHA256 eb1c827e4e4a305c77ebb97662d68caf6e48c89364c89512e5e6ca8def7addce SHA512 4773fb6f64c99c09a2e3056ea58d6a9de75cd1fc273073f01359e5be7a6301fc32fc25a345187f62ad64c7abaaeac3769ac46f74adef7efd7649ebb14fbd6c8c WHIRLPOOL c62cfec58489861a2c27be93cc0f0254dff9b9a17c8d010301e10e343ee9f50eef25bf905b5af50e3e732cc6f60a0bf541744cbce0ab7ece26f7b50b831c1aa1
+MISC metadata.xml 351 SHA256 1379432b2ba8dc8a8bfda8244babe95bf8fd7c330272a6f8ed96b297668b405b SHA512 1b84c382924038fe95185b9bc62ea191c83dea26382b28302e5a88682add8fdc381e009d70c54a150940282c79d0ac761cf314ba9b343b23b5a04c080cea4639 WHIRLPOOL 76205382ab8301172563bbab343bdc2d0a704ed90f1baf80c79348df1303cdfa8cc84970cfffcf17da8f9496ad9ad4eb79cc6b2dec41f0ce0eb26362db2be9c8
diff --git a/media-sound/podcatcher/metadata.xml b/media-sound/podcatcher/metadata.xml
new file mode 100644
index 000000000000..ec28374bebb2
--- /dev/null
+++ b/media-sound/podcatcher/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="bittorrent">Enable support for bittorrent downloads</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/podcatcher/podcatcher-3.1.6.ebuild b/media-sound/podcatcher/podcatcher-3.1.6.ebuild
new file mode 100644
index 000000000000..49cbbc3e2063
--- /dev/null
+++ b/media-sound/podcatcher/podcatcher-3.1.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Podcast client for the command-line written in Ruby"
+HOMEPAGE="http://podcatcher.rubyforge.org/"
+SRC_URI="http://rubyforge.org/frs/download.php/76053/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="bittorrent"
+
+RDEPEND=">=dev-lang/ruby-1.8.2
+	bittorrent? ( dev-ruby/rubytorrent )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	dobin bin/podcatcher
+	dodoc demo/*
+}
diff --git a/media-sound/podget/Manifest b/media-sound/podget/Manifest
new file mode 100644
index 000000000000..dcc154adbcba
--- /dev/null
+++ b/media-sound/podget/Manifest
@@ -0,0 +1,9 @@
+DIST podget-0.7.14.tar.gz 63356 SHA256 02de95ef369eafa8d1aa998ff00bdad780cd4ec30b7fa09d64edc0ffb97ecc6f SHA512 a54d4cdac88f220f470304d9b50ef00c01540ca2e986e4ffc80d9d5aea4ddd6b80484e243f742967dcf800780a8fdfdd55437f9fe710e536ca6a5d6140374022 WHIRLPOOL 9cfd17b0d73c464dd9545cee99d27980afcf2b121dc0dd815343b70087cf79d9ef8b5150d1be3cd8d0f3d0ed997ac8673fd7e420aeea00ddbe5a855ae148fe57
+DIST podget-0.8.1.tar.gz 66284 SHA256 e7cf67066b8516062b3f15ca54d347c264f4dc3c931b32fa17c9128577a62944 SHA512 d2cadeccbba71b04e74863656dfd600e99b95ec58b09a4ba4713c401dd37aa24c339031d251cf5b4d2ee1cd4efbc91b41d8eca1a488def2dc3b5a6968b0a1d20 WHIRLPOOL 689aa8773f620a4c0b0853ac13d184c74b6a252224ec6eebef016ee2857e599b522a9f5b53f09d388af517884de0c192852575c392526ad2350d174d8aa18c63
+DIST podget-0.8.2.tar.gz 66786 SHA256 3207ec9464a6c3a97aa900cf693ab8ba4af2db8725328c1799fcd6bd647de3c2 SHA512 4e61b4d0197976b755f07445a371368cdc090e148c378b86b925ec1d23e447a4d66d9cc68c2fc8431246bc016d44161340bdb30195481d01d8fb00cf142fa696 WHIRLPOOL 9ed11899774d3fa9eeb8dfff258c6767b498905a435eaf1247099a9cd26062728e48bae7a4e8ff462c7e367bd42702eb694c6c543f262df7ac7bf694d215bac9
+EBUILD podget-0.7.14.ebuild 627 SHA256 424d0a2dde47e4f457171e42d18b4becf989b8d92270eaf7128f639f294b7305 SHA512 34e44f729e9b54839e1b9a0dc6da0401142986fd8a24659bb2873a232da868fef1e99cd3e9faa33b514c831150c4b57e84e62e6e9c82eb256a10b03345b103d3 WHIRLPOOL acc30f545d770fb7de6e4adeabd019646c3ed9c5987787cfec6faf42b9e92e071510eb3767125da11f3a8fdcccef314b7cb4dc4b2db31e49a191988598821dd6
+EBUILD podget-0.8.1.ebuild 627 SHA256 424d0a2dde47e4f457171e42d18b4becf989b8d92270eaf7128f639f294b7305 SHA512 34e44f729e9b54839e1b9a0dc6da0401142986fd8a24659bb2873a232da868fef1e99cd3e9faa33b514c831150c4b57e84e62e6e9c82eb256a10b03345b103d3 WHIRLPOOL acc30f545d770fb7de6e4adeabd019646c3ed9c5987787cfec6faf42b9e92e071510eb3767125da11f3a8fdcccef314b7cb4dc4b2db31e49a191988598821dd6
+EBUILD podget-0.8.2.ebuild 627 SHA256 424d0a2dde47e4f457171e42d18b4becf989b8d92270eaf7128f639f294b7305 SHA512 34e44f729e9b54839e1b9a0dc6da0401142986fd8a24659bb2873a232da868fef1e99cd3e9faa33b514c831150c4b57e84e62e6e9c82eb256a10b03345b103d3 WHIRLPOOL acc30f545d770fb7de6e4adeabd019646c3ed9c5987787cfec6faf42b9e92e071510eb3767125da11f3a8fdcccef314b7cb4dc4b2db31e49a191988598821dd6
+MISC ChangeLog 7091 SHA256 222982b8bc9fcf6d5398cb02a9d433264f3fd8fcb5dc9858aaa61c415701533b SHA512 44aa0e5ac250c2a0ec1ab6c75bf709e6dbd3723f5d48c399c0404e01e6edcdde473d6c7d3d1914aef1252c9f61b44945ebb97e26f3be45b874b51d52a717ce0f WHIRLPOOL 9c2b3041f9304e794cb67e6f06aeb06019950b0e9cea275b8d01a261f364647d5c41490541783f63442910de3a276bc421706e1adef31c4f1f32e45b62913292
+MISC ChangeLog-2015 1132 SHA256 b85cf1068f256630b2d771ad23434036231ba5ebb012cf21273734cb2ab2c0a8 SHA512 861cc31241977e7ccf27be24c7783b12caa23f90fefee809800eef475c217ba689dfc48080d81c533ded66d4e83876ff3ef8cd452952ac29bd1f9f41b0a54a2e WHIRLPOOL d85d1aba6a8bec717750ae5a9a1136ff75e3ba1b52bb4a43bab934c6ea24949fbbee290ffb0a4207d0825e4af8fa44224fbe785e987aa5111a515e2f733c1a2a
+MISC metadata.xml 496 SHA256 809b7d7b4ec46aa7bef2c42f4c4046148ed55e2c3ff6cd5374ffb7fa5936e5b2 SHA512 8dbe29f566ceddf1dd6a946e63b24a6c92e85e0bdcd1b598aa42a7839604010eaed1760a344205a30f0ea002cc029b6aabb47fe8b66eb5e35818def6fb68e834 WHIRLPOOL 508bf2a28a697ff2492d03086a70f62544bd6a56c82a12e20d70721c18237a0c3a6bd8b5d52c19af28f6e929f4c292e4143d0589586dd2d8b98ab7e6e81bfec4
diff --git a/media-sound/podget/metadata.xml b/media-sound/podget/metadata.xml
new file mode 100644
index 000000000000..4f4416b228ce
--- /dev/null
+++ b/media-sound/podget/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kitcat490@gmail.com</email>
+		<name>Michael Niehoff</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dvehrs/podget</remote-id>
+		<remote-id type="sourceforge">podget</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/podget/podget-0.7.14.ebuild b/media-sound/podget/podget-0.7.14.ebuild
new file mode 100644
index 000000000000..a2eb5f346793
--- /dev/null
+++ b/media-sound/podget/podget-0.7.14.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A simple podcast aggregator optimized for running as a scheduled job"
+HOMEPAGE="http://podget.sourceforge.net/ https://github.com/dvehrs/podget"
+SRC_URI="https://github.com/dvehrs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	net-misc/wget
+	virtual/libiconv
+"
+
+DOCS=( README Changelog )
+
+src_compile() {
+	# There is a Makefile that we don't want to use.
+	:;
+}
+
+src_install() {
+	dobin ${PN}
+	doman DOC/${PN}.7
+	einstalldocs
+}
diff --git a/media-sound/podget/podget-0.8.1.ebuild b/media-sound/podget/podget-0.8.1.ebuild
new file mode 100644
index 000000000000..a2eb5f346793
--- /dev/null
+++ b/media-sound/podget/podget-0.8.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A simple podcast aggregator optimized for running as a scheduled job"
+HOMEPAGE="http://podget.sourceforge.net/ https://github.com/dvehrs/podget"
+SRC_URI="https://github.com/dvehrs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	net-misc/wget
+	virtual/libiconv
+"
+
+DOCS=( README Changelog )
+
+src_compile() {
+	# There is a Makefile that we don't want to use.
+	:;
+}
+
+src_install() {
+	dobin ${PN}
+	doman DOC/${PN}.7
+	einstalldocs
+}
diff --git a/media-sound/podget/podget-0.8.2.ebuild b/media-sound/podget/podget-0.8.2.ebuild
new file mode 100644
index 000000000000..a2eb5f346793
--- /dev/null
+++ b/media-sound/podget/podget-0.8.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A simple podcast aggregator optimized for running as a scheduled job"
+HOMEPAGE="http://podget.sourceforge.net/ https://github.com/dvehrs/podget"
+SRC_URI="https://github.com/dvehrs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	net-misc/wget
+	virtual/libiconv
+"
+
+DOCS=( README Changelog )
+
+src_compile() {
+	# There is a Makefile that we don't want to use.
+	:;
+}
+
+src_install() {
+	dobin ${PN}
+	doman DOC/${PN}.7
+	einstalldocs
+}
diff --git a/media-sound/podracer/Manifest b/media-sound/podracer/Manifest
new file mode 100644
index 000000000000..1fec42145fed
--- /dev/null
+++ b/media-sound/podracer/Manifest
@@ -0,0 +1,5 @@
+DIST podracer-1.4.tar.bz2 14600 SHA256 93319054315ed5edeaa62b84eee9103036142d5b55b85ae6524297bc1e6412e0 SHA512 f1a6946299b6e32d8a86a153b531c7e6d8ec9cf175719fb8fd2f1d9974ed29469e7b1a2548c4104d7e3e1991cb8138e2970a0b6a4208b7a537dde8c2ca425dd3 WHIRLPOOL 733333300ef3eae9c1f5cf4405e95dd5e3363513bfd9fbd376c9472ff8d5e772d7b2e563a6dfc8812a1b98ea98f8cae48895ac404d4fd196ff457f009ed7488a
+EBUILD podracer-1.4-r2.ebuild 922 SHA256 018ede609766891ec04854a8e9e4a5e6d20759a8d2dfd39c665a59671f069dfc SHA512 ba21660c5cf30dcb2fc91e7051b7be8e2eed5f74d68caae3d94c4981aa55921d244efd335ba56bf413144494dfb1c0eb16a1117b331d775c5c63c5d2ee862585 WHIRLPOOL cc16d50732f5fe871e8c2a38deece909cdaf7e3b6d5841834262424a3523b48b6c3df66033f1677caf56df0a38126a36f6daa6e4d202343bb0476b2e5e11cff6
+MISC ChangeLog 2524 SHA256 d744c56e7cec2d69a7dc249d76e4cb6469b2e5248348db2fc5e93ce6dd9f699c SHA512 31e6cbb40ae8b2a36bdf19d49ed2215844077caca31abe9a690e61fcb25692b6a1821a6778831d531f7c7ce7a5266f713fd77c63550861b8c265ecd8ec2a1c0f WHIRLPOOL ac2dc748c154c2de103da1e4888ad10b3c3143c3c61597a266a03b2bef4372b9c9426f8ae96b840c08aa9a890dc3f9445937d92c85173a3184a8b43de254e49b
+MISC ChangeLog-2015 679 SHA256 0aef662180c23c487270c72be1afc8090999ce7e4e2994941e59fe384bf3de9e SHA512 2e9c68af62316ee3b05d56a9eeb4c8c81c6d68cb7580ae521b016dac889147fd17de766f3aecce8ba4354af7ec73ba97ef6030bdb040fcc86e0c0bbdaa1d0dda WHIRLPOOL 3c37d9f433ac14e2846fb48be61a468d64f2a84d10c1713b3768890cf6b11a55a8a77faed3b575b72a484731a73e118534fe65026b0bab965d81c668edc8abd4
+MISC metadata.xml 245 SHA256 766d1e1af875b8b6873cc226a44b733d9a11db5042f9de8eefb6fad615f0246f SHA512 e7d260d609a6e9d0a12434d38c351b2beebf4345476e50c47efb0881407e4c0e23e50f9b44540b75ed6ac18e5a6dc60254fcbdcd0ee44a37b7b3205e173bba60 WHIRLPOOL 7ed82195ba894538ee8741b8f6b23a3c4e6a1d3eca35bd05db15edc6cab5b80ba02ea961ba1000be06c0b451cbee3fdf8da6470232da6c83b479cccc4c5db9ef
diff --git a/media-sound/podracer/metadata.xml b/media-sound/podracer/metadata.xml
new file mode 100644
index 000000000000..560d81a96b68
--- /dev/null
+++ b/media-sound/podracer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">podracer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/podracer/podracer-1.4-r2.ebuild b/media-sound/podracer/podracer-1.4-r2.ebuild
new file mode 100644
index 000000000000..13ff3b40a5e5
--- /dev/null
+++ b/media-sound/podracer/podracer-1.4-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A simple podcast aggregator, designed for cron"
+HOMEPAGE="http://podracer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash
+	net-misc/curl"
+
+src_unpack() {
+	default
+
+	# Bug 619956. Change directories first to ensure that "unpack" outputs
+	# to ${S} and not to ${WORKDIR}.
+	cd "${S}" || die
+	unpack "${S}/podracer.1.gz"
+}
+
+src_install() {
+	dobin podracer
+	sed -i -e "s:sample=/usr/share/doc/\$progname/sample.subscriptions:sample=/usr/share/doc/${PF}/sample.subscriptions:" "${D}"/usr/bin/podracer || die
+	dodoc CREDITS README ChangeLog TODO
+	doman podracer.1
+	docompress -x "/usr/share/doc/${PF}/sample.subscriptions"
+	dodoc sample.subscriptions
+	insinto /etc/
+	doins podracer.conf
+}
diff --git a/media-sound/positron/Manifest b/media-sound/positron/Manifest
new file mode 100644
index 000000000000..05a4f9f9bb35
--- /dev/null
+++ b/media-sound/positron/Manifest
@@ -0,0 +1,5 @@
+DIST positron-1.1.tar.gz 88427 SHA256 c4f6311c58c29725dfca1e2110e1ef3608d07912051e8f16832837299943f0b4 SHA512 610f872d69e3ea192630338b2134c82d3ac8e7345b074f99853de67e0723808894ee5ef71151397920f4f91f2aeefe99f659521a68178ea618853a607372ccc5 WHIRLPOOL 96b9ae0ec50018f4becb95fe2f5c663128fd9e5d31a3a03386cdc480957cda78156b1b140afddab3957f2222a7c355dd94cfbbabe004f15f90d26fc9461a0735
+EBUILD positron-1.1-r1.ebuild 659 SHA256 a5b954f32c7f63d84a39b5fa64e4be08218dc37fbb5f02c2e0cb836ca2bad2c6 SHA512 9478d5411a5cd73097ff3f19a971c5fdaaa346ea0b94bf30ee89937ff0c435e270d99e11f67dc6c0b1fadad633670e7009730e41e8e9e0fbd0e4e279b9cce0d6 WHIRLPOOL 18f1928cc4a64770a550c9ef1cdc60e7d29b7c76a9c92f24f71ea43ee7d471c1121c5c1a9aa48207a003df427190feedf2367a2544c7a9644552369fe0a627bc
+MISC ChangeLog 2429 SHA256 a56438ca9e74855451908aa867f40bc25b2c621c159f1015eed84637277a427d SHA512 71bbf7e717395662163edb9041e1d655f42855dae644576b0c3247506b9e0956aa16a008edd97f893ae3d7e7c9ec8427ffbc29c31b00cd445531130a8710c425 WHIRLPOOL 67b072de50e64a5ef67026df7b21ea1a6273cc7411b0851b99c47f16f39b1ecf1c4fad3255efe006a8f65ba97246e1471088327e40d47b1878e09e26fe2c4fd1
+MISC ChangeLog-2015 2473 SHA256 5647f6941d048a7d216734bdaaf2b305f184f85aa0254468dfc28a2ac3aa90aa SHA512 9264a5b64fe11c7fa92832c3b126ee94d71d65e0c2cdc5a8610d5f0a9bf9694ff32a6ea897d6300d61406edb8f13c4eb9ac5991d6deecd6ddcf103d2391da974 WHIRLPOOL be28e0411ba4b54982de488711a748447e190a950013a7f4d60da7164fb699327378315612711c70aa949bb3fe9d2c424d669072f8ec93c57ca54c3ae8e50740
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/positron/metadata.xml b/media-sound/positron/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/positron/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/positron/positron-1.1-r1.ebuild b/media-sound/positron/positron-1.1-r1.ebuild
new file mode 100644
index 000000000000..1bb9cca764ef
--- /dev/null
+++ b/media-sound/positron/positron-1.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Synchronization manager for the Neuros Audio Computer"
+HOMEPAGE="http://www.xiph.org/positron"
+SRC_URI="http://www.xiph.org/positron/files/source/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="vorbis"
+
+DEPEND="vorbis? ( dev-python/pyvorbis[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# install docs in /usr/share/doc/${PF}, bug #241290
+	sed -i -e "s:share/doc/positron:share/doc/${PF}:" setup.py
+	distutils-r1_python_prepare_all
+}
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest
new file mode 100644
index 000000000000..b44322017531
--- /dev/null
+++ b/media-sound/potamus/Manifest
@@ -0,0 +1,6 @@
+AUX ffmpeg29.patch 684 SHA256 418630b8d03dd0f1f2710e491ba4366fc1a4d8f0e3e58b4d70db3a74d1f6c6d0 SHA512 3de805c7e4808863ca4fa9fa7c450ce1db6222a69ef6e43016e2d7d687a5461beda75869b3bd5ad6266f00948ce94ff63b15c9fa97104303a56300e0aa2cb475 WHIRLPOOL 4001fa3a4be37677a39554768e7d3345c06ed4923ebbdf8e25f3da0e37166fb4e0d97734d9fd34bbbd410687f9abcfd2edb294f625d75874569414349204ec71
+DIST potamus-16.tar.gz 144874 SHA256 0b31955f5495477d68048915560e528d13d741178fb90ef39e3ff2dbcad7ae63 SHA512 e4c87d4166d958d200edc13835c57c894b0803b243fd79fb211480a217a33ca34fbd451622842efc47c0ed1b79bcd0fa4f0258f129f70678f14c373234b1b32d WHIRLPOOL c4cd12042a907e222495435fe3434ee7bee8d167a3ce883891cdae8bfe638a6340525daf0d0f8c51ce2f13bbf151768a390cee565d8aa289dafa862c266f305f
+EBUILD potamus-16.ebuild 1272 SHA256 8274333c3ac0b471a653cd4b872f33432b8772bb4f2425305f6021f9ee0872f3 SHA512 48b6b50e09ba733c0f12e25d716dc4f34ac97f8882ce62a0dca924fb257fcf293d3338b5d20b4a5b5e7309f269e75a017b3c34b66ecb46c33cfa2466985f6d4c WHIRLPOOL ab339c9c8ff6512d51a4886e67e037e7685e8f2ef3abbc5b9fa1a57437c52e5496967b1ad79b95e4998f8780fc33dd20998777ac8c41db56ce280048f46cd529
+MISC ChangeLog 3091 SHA256 9be85b893b0d8024808230c49890f964e288cfcc1ae3c61ec3ff97481bfba1d0 SHA512 5337ce8c4209b0afdab6bb9bc5ac8a9abed71812cbd60a91a0284d0925439dc2d8c26eccd830d254c1f9e49071abd2d38a09b5c32e29f190c3ade5ec7dcab315 WHIRLPOOL 65d0da6be0d94f2cb7dc64e738bccb456e9a90cbfad37164dcf87c690f5ced0382b1b7281f829b434d1566d09810dfbe777992be96b53baccc3c3422f6f82f05
+MISC ChangeLog-2015 2361 SHA256 c593bbd97f10f2cbc1eec91da7f5745530eddbd4a3bfa63b1a005771a0370cc0 SHA512 3835e369002e871856dfdc342df6925748c567c9aacc011afe112df51ade953ffc4982438a3abaec8f7fdb3b058d1b9f65f8016bb3d0fdcf5cfa5c502012c078 WHIRLPOOL 6efbe276ba6655eb4cea0edea44e3960fcbe96fc9d3241d9802ee26b0c62ce6b158730b8b10236b3f56ba7271e5ed87cd8eb3776ed2dbda3b5803586f8bbaa8b
+MISC metadata.xml 321 SHA256 a346c5c4bc5d356f1206b615949d32a969cb05915bf7449b5bea99a0521766ad SHA512 10c84204031ebaad014bcd3acae8faceaad8f9e589ab6f6429485074e242111a94b41995af7c35f1cbf7b85b2cf76a304b1b6b49d018cffff330f861efd01a3f WHIRLPOOL b5e011ee5b913ba6891a7a6832e46bf61d166cfae1a46c8f73c48650d3410ce310fbdb1b0f6d4084b4e589baf3651f86eed042edc11911bd950ca3792037616a
diff --git a/media-sound/potamus/files/ffmpeg29.patch b/media-sound/potamus/files/ffmpeg29.patch
new file mode 100644
index 000000000000..8565d7d3d99f
--- /dev/null
+++ b/media-sound/potamus/files/ffmpeg29.patch
@@ -0,0 +1,22 @@
+Index: potamus-16/src/input-avcodec.c
+===================================================================
+--- potamus-16.orig/src/input-avcodec.c
++++ potamus-16/src/input-avcodec.c
+@@ -41,7 +41,7 @@ static int input_avcodec_open(input *p,
+ 		g_error("out of memory");
+ 	p->data = a;
+ 
+-	a->frame = avcodec_alloc_frame();
++	a->frame = av_frame_alloc();
+ 
+ 	for (int pass = 0; pass < 2; pass++) {
+ 		a->format = NULL;
+@@ -114,7 +114,7 @@ static int input_avcodec_get_audio(input
+ 
+ 		// Decode the packet.
+ 		while (packet.size > 0) {
+-			avcodec_get_frame_defaults(a->frame);
++			av_frame_unref(a->frame);
+ 
+ 			int got_frame = 0;
+ 			int in_used = avcodec_decode_audio4(a->codec_ctx,
diff --git a/media-sound/potamus/metadata.xml b/media-sound/potamus/metadata.xml
new file mode 100644
index 000000000000..72f0cd7e04cf
--- /dev/null
+++ b/media-sound/potamus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+<use>
+	<flag name="opus">Adds support for the Opus codec.</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/potamus/potamus-16.ebuild b/media-sound/potamus/potamus-16.ebuild
new file mode 100644
index 000000000000..8a71e5f23935
--- /dev/null
+++ b/media-sound/potamus/potamus-16.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A lightweight audio player with a simple interface and an emphasis on high audio quality"
+HOMEPAGE="http://offog.org/code/potamus/"
+SRC_URI="http://offog.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ao audiofile flac jack libav mad modplug opus vorbis"
+
+RDEPEND="
+	x11-libs/gtk+:2
+	>=gnome-base/libglade-2
+	media-libs/libsamplerate
+	ao? ( media-libs/libao )
+	audiofile? ( media-libs/audiofile )
+	flac? ( media-libs/flac )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libav? ( media-video/libav:= )
+	!libav? ( >=media-video/ffmpeg-2.8:0= )
+	mad? ( media-libs/libmad )
+	modplug? ( media-libs/libmodplug )
+	opus? ( media-libs/opusfile )
+	vorbis? ( media-libs/libvorbis )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/ffmpeg29.patch" )
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable audiofile input-audiofile) \
+		$(use_enable flac input-flac) \
+		$(use_enable mad input-mad) \
+		$(use_enable modplug input-modplug) \
+		$(use_enable opus input-opus) \
+		$(use_enable vorbis input-vorbis) \
+		$(use_enable ao output-ao) \
+		$(use_enable jack output-jack)
+
+}
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
new file mode 100644
index 000000000000..e8e46fae444e
--- /dev/null
+++ b/media-sound/pragha/Manifest
@@ -0,0 +1,9 @@
+DIST pragha-1.3.1.tar.bz2 621106 SHA256 49287152f59e5d62b57620f94b228517caaca001873c30c7abd426afacfc8a78 SHA512 17d086d84382c8e417e513c8803ea90612ca9d5c665384299362b3197978a8697faef531996b078e4ce12c52b7fad3be377083622c923775c6c738d5ae6acb93 WHIRLPOOL 1d531e588723623b99aa0bde1d2e1d8407e15cce89112847893ecf50f1fce4709ffb3bb1b5d88ce14a616db2809e81991228262fc12227cacf213d0c85a9c0ae
+DIST pragha-1.3.3.tar.bz2 679754 SHA256 74844eb99df44984206d6c55b15f1b553e9f122ddb0bad00902a7b7935d0a504 SHA512 3dc87d4e75cd9f145c3921af4c09140a705611d72176fd80db2d89048bc22c8edda5f87bce75f26e0cce4f6934c927e814e5c54fec7820116485cf4e04e876a9 WHIRLPOOL 86cd62135bfe477a2ba10038968f695d4fea81eab15f219df1e1b4b76326258f08cbd60e6d344a79a76842456d10cc7c4b6e85cb059e8977a57dab616b5ee61d
+DIST pragha-1.3.90.tar.bz2 760153 SHA256 eb41cb15886bd6ac749fb49b7c4ce96cf7a646b7ec94d38bed098792104842fa SHA512 877d27814927ab67a0b1defe70d753466e3ad14a0274a2168eb2521ded4eddeb04bce5177869b19ca57b38e7374047ee36982cce3f7e8a75b801cd060f8460d2 WHIRLPOOL 0118c8764841923a49f53e7c855e7ce9278deb2a29764699f787e9b285c3f930d31910452944e2a72fd9c774b58064043f22b939c4a00feb851ebfbec6f56aab
+EBUILD pragha-1.3.1-r1.ebuild 2602 SHA256 060ea76576dd40372aeb570dab6e0450e9c5cfce2c1805f0b7e94ba54495eac5 SHA512 c17edf8c79aa6a16803de9cbcc9c9f62a3a5f9f02c427f80548623b087feccd6be5e10584bbe8fe01b6b559e2344b367d1db06328fd9d1081f7c37c3fd7145a4 WHIRLPOOL 5f250d98b809cfc565c714b783a9e65a0cf3df3c4e92026de57809629b8a0140a93113bdb0ee20d7673f613e2a69297f69ca4f2f14fd9f953063ed8b45a704f4
+EBUILD pragha-1.3.3.ebuild 2290 SHA256 6c02e18cf28bf39740f6d3a184dc866751df9f2b0c2b174f5b6e1380507583fd SHA512 7142e1ae0b4ad53588b212fffa572e2ea3f6a002d3d31244db485efbc65fd6cfe329458783b77a3d0d699f4b88d35a78364cd5ed8e27cf1e0b47ad0b5e15e711 WHIRLPOOL 22383c28fa700b982cb764db7c82e5256032348f2c985f2f05e2ec34c614987401789f0a15788ad6707e2c0d84bf7e49deb437c57bde480f3b11bf5c020589f2
+EBUILD pragha-1.3.90.ebuild 2487 SHA256 2f88def902ed8742869c8319ca594d6ab241f3cdc543bcfb4f8daf8ed3e9ec59 SHA512 57514988c2f5ef8e19d0abf8c329cee174be7d0e15c71bc1d0d8881cad14ceef6f4938a5610c4e3dfadf43144ddb0b87e9de10c2a031549025c8462bc4eb3c72 WHIRLPOOL 58a556442373c20006f70699e362bc661b580678edc00adb5caaf976efb05ecf56c8208d3c247aeb5e8f21193fffb59399d4bd353dfa11e807337f317b9d6120
+MISC ChangeLog 2752 SHA256 a3f6825ee729c9e131fea95bc936a42174da6740112b385a7b1571c06f49f129 SHA512 a8cff01e02ad57267e2021b08d765eb32cd9b8b575a64d05b6281ac9aa90e950ca490c66b28293a9d06463abcf3050c3b672e038fc728a7982de49eb99670b4b WHIRLPOOL a4765db8e6003fc399f444fbbb13ba6a9cfd4a16d22c4b062b6129c42cd016a43f30f5b5df6d47e6edec9c4a79298a1bc5bf2e09cae816acc8a225ac9fac6a45
+MISC ChangeLog-2015 4874 SHA256 e5761ea6cce69e3f08b65ca707a211561e009f933a627e08cae112658b28bb3e SHA512 40215c754bd18168e4593b0d0d00c31f07af52d704d3895d7eb73832750bab275b9c7df9e6169c98c991fc0168195694a666ea42032130aa55045a180a237332 WHIRLPOOL a0e9f9f9fcb3fcf6925bd316877c4aba40df942e785a241c9393ca1e51072cf294389ff67d92d6f68c422bbfde7b81c80c322d29fb4d8605ea93e286fa6080c0
+MISC metadata.xml 1158 SHA256 9347869b951a7a8a873e151724264b7c3cff8ac05c81344bd619bcca30261eee SHA512 68257f425b4e8634f4ed696e7066a8b0c328b1bca0794a72a54f438d2aaa174b4cf816cf693046221bfef88e6b8fc08dfe2211e9be98c28da0d119d957bf9812 WHIRLPOOL 32f501bce529fd7db685a07d4babd4f834f536d213ba21cc38eaeb88d0fd04085a0f91223910ae1f20280d6572e8b0345546dd56f72e7632b0d4afa0059e716b
diff --git a/media-sound/pragha/metadata.xml b/media-sound/pragha/metadata.xml
new file mode 100644
index 000000000000..965cbf1c844f
--- /dev/null
+++ b/media-sound/pragha/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
+  <use>
+    <flag name="glyr">Enable music metadata searchengine support using <pkg>media-libs/glyr</pkg></flag>
+    <flag name="grilo">Play songs on DLNA servers using <pkg>media-libs/grilo</pkg></flag>
+    <flag name="keybinder">Enable shortcut support using <pkg>dev-libs/keybinder</pkg></flag>
+    <flag name="lastfm">Enable last.fm support using <pkg>media-libs/libclastfm</pkg></flag>
+    <flag name="peas">Enable various plugins that will pull in <pkg>dev-libs/libpeas</pkg> as a dependency</flag>
+    <flag name="playlist">Enable enhanced playlist support using <pkg>dev-libs/totem-pl-parser</pkg></flag>
+    <flag name="rygel">Share music on DLNA using <pkg>net-misc/rygel</pkg></flag>
+    <flag name="soup">Search metadata on AcoustID and radios on TuneIn using <pkg>net-libs/libsoup</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">pragha-music-player/pragha</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/pragha/pragha-1.3.1-r1.ebuild b/media-sound/pragha/pragha-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..48e150a7febd
--- /dev/null
+++ b/media-sound/pragha/pragha-1.3.1-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xfconf # autotools
+
+DESCRIPTION="A lightweight music player (with support for the Xfce desktop environment)"
+HOMEPAGE="https://github.com/pragha-music-player/pragha"
+SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug +glyr grilo +keybinder lastfm libnotify mtp +peas +playlist rygel soup +udev"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
+	>=dev-libs/glib-2.32:=
+	>=dev-libs/libcdio-0.90:=
+	>=dev-libs/libcdio-paranoia-0.90:=
+	media-libs/gst-plugins-base:1.0=
+	>=media-libs/libcddb-1.3.0:=
+	>=media-libs/taglib-1.7.0:=
+	>=x11-libs/gtk+-3.4:3=
+	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
+	glyr? ( >=media-libs/glyr-1.0.1:= )
+	grilo? ( >=media-libs/grilo-0.2.10:= )
+	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
+	lastfm? ( >=media-libs/libclastfm-0.5:= )
+	libnotify? ( >=x11-libs/libnotify-0.7:= )
+	mtp? ( >=media-libs/libmtp-1.1.0:= )
+	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
+	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
+	rygel? ( >=net-misc/rygel-0.20:= )
+	soup? ( >=net-libs/libsoup-2.38:= )
+	udev? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	>=dev-util/xfce4-dev-tools-4.10
+	sys-devel/gettext
+	virtual/pkgconfig"
+REQUIRED_USE="glyr? ( peas )
+	grilo? ( peas )
+	libnotify? ( peas )
+	mtp? ( udev )
+	rygel? ( peas )
+	soup? ( peas )
+	udev? ( peas )"
+
+pkg_setup() {
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable debug)
+		$(use_enable peas libpeas-1.0)
+		$(use_enable glyr libglyr)
+		$(use_enable lastfm libclastfm)
+		$(use_enable playlist totem-plparser)
+		--with-gstreamer=1.0
+		)
+
+	if use peas; then
+		XFCONF+=(
+			$(use_enable libnotify)
+			$(use_enable keybinder)
+			$(use_enable udev gudev-1.0)
+			$(use_enable mtp libmtp)
+			$(use_enable soup libsoup-2.4)
+			$(use_enable rygel rygel-server-2.2)
+			$(use_enable grilo grilo-0.2)
+			)
+	else
+		XFCONF+=(
+			--disable-libnotify
+			--disable-keybinder
+			--disable-gudev-1.0
+			--disable-libmtp
+			--disable-libsoup-2.4
+			--disable-rygel-server-2.2
+			--disable-grilo-0.2
+			)
+	fi
+}
+
+src_prepare() {
+	sed -i -e '/CFLAGS/s:-g -ggdb -O0::' configure || die
+
+	# Prevent glib-gettextize from running wrt #423115
+#	export AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros
+#	intltoolize --automake --copy --force
+#	_elibtoolize --copy --force --install
+#	eaclocal; eautoconf; eautoheader; eautomake
+
+	xfconf_src_prepare
+}
diff --git a/media-sound/pragha/pragha-1.3.3.ebuild b/media-sound/pragha/pragha-1.3.3.ebuild
new file mode 100644
index 000000000000..5fadecd16a18
--- /dev/null
+++ b/media-sound/pragha/pragha-1.3.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A lightweight music player (for Xfce)"
+HOMEPAGE="https://github.com/pragha-music-player/pragha"
+SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda +glyr grilo +keybinder lastfm libnotify mtp +peas +playlist rygel soup +udev"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
+	>=dev-libs/glib-2.36:=
+	media-libs/gstreamer:1.0=
+	media-libs/gst-plugins-base:1.0=
+	>=media-libs/taglib-1.8:=
+	>=x11-libs/gtk+-3.8:3=
+	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
+	cdda? ( >=dev-libs/libcdio-0.90:=
+		>=dev-libs/libcdio-paranoia-0.90:=
+		>=media-libs/libcddb-1.3.0:= )
+	glyr? ( >=media-libs/glyr-1.0.1:= )
+	grilo? ( >=media-libs/grilo-0.2.10:= )
+	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
+	lastfm? ( >=media-libs/libclastfm-0.5:= )
+	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
+	mtp? ( >=media-libs/libmtp-1.1.0:= )
+	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
+	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
+	rygel? ( >=net-misc/rygel-0.20:= )
+	soup? ( >=net-libs/libsoup-2.38:= )
+	udev? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	>=dev-util/xfce4-dev-tools-4.10
+	sys-devel/gettext
+	virtual/pkgconfig"
+REQUIRED_USE="glyr? ( peas )
+	grilo? ( peas )
+	libnotify? ( peas )
+	mtp? ( udev )
+	rygel? ( peas )
+	soup? ( peas )
+	udev? ( peas )"
+
+src_configure() {
+	local myconf=(
+		$(use_enable peas libpeas-1.0)
+		$(use_enable glyr libglyr)
+		$(use_enable lastfm libclastfm)
+		$(use_enable cdda libcdio)
+		$(use_enable cdda libcdio_paranoia)
+		$(use_enable cdda libcddb)
+		$(use_enable playlist totem-plparser)
+
+		$(use_enable libnotify)
+		$(use_enable keybinder)
+		$(use_enable udev gudev-1.0)
+		$(use_enable mtp libmtp)
+		$(use_enable soup libsoup-2.4)
+		$(use_enable rygel rygel-server-2.2)
+		$(use_enable grilo grilo-0.2)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/pragha/pragha-1.3.90.ebuild b/media-sound/pragha/pragha-1.3.90.ebuild
new file mode 100644
index 000000000000..c5dfe2453911
--- /dev/null
+++ b/media-sound/pragha/pragha-1.3.90.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A lightweight music player (for Xfce)"
+HOMEPAGE="https://github.com/pragha-music-player/pragha"
+SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/V${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda +glyr grilo +keybinder lastfm libnotify mtp +peas +playlist rygel soup +udev"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
+	>=dev-libs/glib-2.36:=
+	media-libs/gstreamer:1.0=
+	media-libs/gst-plugins-base:1.0=
+	>=media-libs/taglib-1.8:=
+	>=x11-libs/gtk+-3.8:3=
+	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
+	cdda? ( >=dev-libs/libcdio-0.90:=
+		>=dev-libs/libcdio-paranoia-0.90:=
+		>=media-libs/libcddb-1.3.0:= )
+	glyr? ( >=media-libs/glyr-1.0.1:= )
+	grilo? ( media-libs/grilo:0.3=[network] )
+	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
+	lastfm? ( >=media-libs/libclastfm-0.5:= )
+	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
+	mtp? ( >=media-libs/libmtp-1.1.0:= )
+	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
+	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
+	rygel? ( >=net-misc/rygel-0.26:= )
+	soup? ( >=net-libs/libsoup-2.38:= )
+	udev? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	>=dev-util/xfce4-dev-tools-4.10
+	sys-devel/gettext
+	virtual/pkgconfig"
+REQUIRED_USE="glyr? ( peas )
+	grilo? ( peas )
+	libnotify? ( peas )
+	mtp? ( udev )
+	rygel? ( peas )
+	soup? ( peas )
+	udev? ( peas )"
+
+src_configure() {
+	local myconf=(
+		$(use_enable peas libpeas-1.0)
+		$(use_enable glyr libglyr)
+		$(use_enable lastfm libclastfm)
+		$(use_enable cdda libcdio)
+		$(use_enable cdda libcdio_paranoia)
+		$(use_enable cdda libcddb)
+		$(use_enable playlist totem-plparser)
+
+		$(use_enable libnotify)
+		$(use_enable keybinder)
+		$(use_enable udev gudev-1.0)
+		$(use_enable mtp libmtp)
+		$(use_enable soup libsoup-2.4)
+		$(use_enable rygel rygel-server-2.6)
+		$(use_enable grilo grilo-0.3)
+		$(use_enable grilo grilo-net-0.3)
+		# avoid trying to use 0.2 & 0.3 simultaneously
+		# https://github.com/pragha-music-player/pragha/issues/124
+		--disable-grilo-0.2
+		--disable-grilo-net-0.2
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/projectm-jack/Manifest b/media-sound/projectm-jack/Manifest
new file mode 100644
index 000000000000..53dc96b362ff
--- /dev/null
+++ b/media-sound/projectm-jack/Manifest
@@ -0,0 +1,7 @@
+DIST projectM-complete-2.1.0-Source.tar.gz 31130351 SHA256 513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f WHIRLPOOL f60ee006dac8465a17e1397a9331bdabd7a3967455f9e16644e1ff5e544ab1662b3aa8a2b428c0258f0b38c91513bfbda3cd29b4419e05e64aa410e61ad03972
+DIST projectM-jack-2.0.1-Source.tar.gz 35003 SHA256 6ea58a6330b59001f6b9748bc0af848e9eaf6ae13d04cba591edb0e50b3b92ca SHA512 8cb57029685b182a82fdc0bd1479028de462b2364106f415bf11990b6642b4fd667c2a4adb13a04886cb0a89e1828133577f6d2623cfc821f4323d21fab21464 WHIRLPOOL 0c68687cb8aaa9cfe1ecff448f98f90edbd952876bf2369920e2fa09b36bd7284d8fcf58b44f47199b3a4f9b64da4821c5360bbba44592ad6f9fd381903fe471
+EBUILD projectm-jack-2.0.1.ebuild 531 SHA256 8f7f680f3f4775dd9feb79cca5f1d610d02bc39aa77dfa36f360037bb66be877 SHA512 3eb3d9b6db93cfbe40b59681626c129e852175a0ee3bbfe5687aa45c9dcc339f3c2d7aba5bcf9731847191aac0fe9bb1d4cc5822ecf61ef1fed7d7a77bc8c73a WHIRLPOOL 01e80787cfc0ed5d858bd640951d48c5203a3e3157117d6099d22271e909cc7ddcb75583a105252c40ebcc6e9e7dc056abf5189c14af6718d236feb23b22879b
+EBUILD projectm-jack-2.1.0.ebuild 572 SHA256 5c970aed0e8cd6e3bc5af4700c9502597e780ca75c91db335fb08f10c7e6f11f SHA512 c477ccadff1c013e4280d3e32d6de0800df89737ed474c5a2bfeac273f83439417a0c5b567e26c0d4ffd3cb279cdb3aa7ad84509d68a1344a85f861592232c83 WHIRLPOOL 317be603bbe5f2ff93d0ce7a0986b45bdd805f9ff6c74e3026fcbb0cff0d7f9df2c40665bc25e374aed2c9ce13847cb26ceecb2e2be87fe610ee560f8ea2e239
+MISC ChangeLog 2512 SHA256 3418fcb1c9cfefdfbbf2ea4d98d06750000fe9d5e5a100e12ea8da7a1365a8c8 SHA512 5807cf562cf8783f2c64fe6b23d9c9ec6139236be01162baace12988225fa05ff5633e3fe178facb7ba5c92712a005840cfd5f1a3da01033a7882199f000577f WHIRLPOOL 53c4fdf06beae799b0859a1dce7283d9facd0f15765039cb6ccde90a9623960cf775aad52cfd3f139421276ed338e6f28fe71c2c9f6e73e8cf57e2df01a06726
+MISC ChangeLog-2015 2036 SHA256 2260066df4746108ac32c2999904e41774d36b2f80e4a286ef0f8decbc2dabed SHA512 58c2c7bfd152fd74c12d4cb1c909287779dc4848ac413314065a5880fa1f478f1a8c733a8236adbce5875e5b075b26dbccb78dd90f8651700f34407ca8b7bde5 WHIRLPOOL 0de946cfd546a7b139ac917fbb6cff722b3e4aadc12528d9fccfd138d90c936114580d7f551999c2c55cb5066369aa22c6650845aec53d693dfba747d484aac8
+MISC metadata.xml 331 SHA256 7980d09ed08ac1b06efd12fa6022b052f892c81eb21e0af43115341b4bdfd1ff SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740 WHIRLPOOL 364e9e4036552c4311c7ea3f7ec078fc120ce2f2cb3c8476ffabf4cd18cae4dd49f8cb7335a32d0e75a5da5c81573b9bf581855fce96c987136400bb8fdc14f8
diff --git a/media-sound/projectm-jack/metadata.xml b/media-sound/projectm-jack/metadata.xml
new file mode 100644
index 000000000000..4b7d1d427e51
--- /dev/null
+++ b/media-sound/projectm-jack/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">projectm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/projectm-jack/projectm-jack-2.0.1.ebuild b/media-sound/projectm-jack/projectm-jack-2.0.1.ebuild
new file mode 100644
index 000000000000..d6c3b0fe2f40
--- /dev/null
+++ b/media-sound/projectm-jack/projectm-jack-2.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+EAPI=5
+
+inherit cmake-utils
+
+MY_P=${P/m/M}-Source
+
+DESCRIPTION="A Qt based GUI for projectM that visualizes your JACK output"
+HOMEPAGE="http://projectm.sourceforge.net"
+SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-sound/jack-audio-connection-kit
+	>=media-libs/libprojectm-qt-2.0.1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
diff --git a/media-sound/projectm-jack/projectm-jack-2.1.0.ebuild b/media-sound/projectm-jack/projectm-jack-2.1.0.ebuild
new file mode 100644
index 000000000000..6a96ac452c97
--- /dev/null
+++ b/media-sound/projectm-jack/projectm-jack-2.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+MY_P=${PN/m-jack/M}-complete-${PV}-Source
+
+DESCRIPTION="A Qt based GUI for projectM that visualizes your JACK output"
+HOMEPAGE="http://projectm.sourceforge.net"
+SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	media-sound/jack-audio-connection-kit
+	>=media-libs/libprojectm-qt-2.1.0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}/src/${PN/m/M}"
diff --git a/media-sound/projectm-pulseaudio/Manifest b/media-sound/projectm-pulseaudio/Manifest
new file mode 100644
index 000000000000..b4e4734dc38f
--- /dev/null
+++ b/media-sound/projectm-pulseaudio/Manifest
@@ -0,0 +1,5 @@
+DIST projectM-complete-2.1.0-Source.tar.gz 31130351 SHA256 513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f WHIRLPOOL f60ee006dac8465a17e1397a9331bdabd7a3967455f9e16644e1ff5e544ab1662b3aa8a2b428c0258f0b38c91513bfbda3cd29b4419e05e64aa410e61ad03972
+EBUILD projectm-pulseaudio-2.1.0.ebuild 628 SHA256 8f38c241ce74582697118e96e297488d4ed359df7329742294f56da908caab1c SHA512 10124655b0acca25cc01ef626861699e40f29c0b820445018e3b3d6b5cc4b46d6e5d4edf46c975ab30685c502044baf422c6f808ac39806a7880d376458d727e WHIRLPOOL 873bff25ff7118f14523076c8c7337bd578ff539a314fe1c184ab8972ded4bc4ac92470201c218ce06fbec7f062fa1cbfe82c5abe048f8a440162cfdcbfb3629
+MISC ChangeLog 2466 SHA256 dfb145ff2a4dd737495ca59a0d62e49bbeda1a4e29ec96f09af94432d3f851c7 SHA512 c08ec98cb59aa0eda3733104c54ec8d25f9a9344908310234e8a47075b63740be4c9cff97fb80911f7ef2820869f1182e865909860da0ce8a5d689a140a3e762 WHIRLPOOL 29d5df657d1476104adbd1405f4439b61655c06f7b28b04202f7194b9db2e07b3ab8ac8062377de866384e3b88460e3e2e43b224a24822d58fc9b91cbdf0ac49
+MISC ChangeLog-2015 794 SHA256 be08bf9e60bdccaf42aa1eaba1e93b4ababa8f328c551abd6d43565cedd137d9 SHA512 2d7f539c0b3e72ae696aeae47cfe116fd8c29734b8127eddc2c78d45ffdf7ff0da94b1b41d6f76b7208eaad6b2296ed94b984208f83b561e7b9a6d873aa7752a WHIRLPOOL 81a37fe8bb1a7ead3511d4ed2631458b7932c85661bbde3572abf8f6205719907a29b08b62ec23dc0d345be35675067597effb4a6a9482c8f5a70129865a872d
+MISC metadata.xml 331 SHA256 7980d09ed08ac1b06efd12fa6022b052f892c81eb21e0af43115341b4bdfd1ff SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740 WHIRLPOOL 364e9e4036552c4311c7ea3f7ec078fc120ce2f2cb3c8476ffabf4cd18cae4dd49f8cb7335a32d0e75a5da5c81573b9bf581855fce96c987136400bb8fdc14f8
diff --git a/media-sound/projectm-pulseaudio/metadata.xml b/media-sound/projectm-pulseaudio/metadata.xml
new file mode 100644
index 000000000000..4b7d1d427e51
--- /dev/null
+++ b/media-sound/projectm-pulseaudio/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">projectm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/projectm-pulseaudio/projectm-pulseaudio-2.1.0.ebuild b/media-sound/projectm-pulseaudio/projectm-pulseaudio-2.1.0.ebuild
new file mode 100644
index 000000000000..d34667d2de2d
--- /dev/null
+++ b/media-sound/projectm-pulseaudio/projectm-pulseaudio-2.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+MY_P=${PN/m-pulseaudio/M}-complete-${PV}-Source
+
+DESCRIPTION="A Qt GUI for projectM that visualizes your pulseaudio output"
+HOMEPAGE="http://projectm.sourceforge.net"
+SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	media-sound/pulseaudio
+	media-libs/ftgl
+	>=media-libs/libprojectm-2.1.0
+	>=media-libs/libprojectm-qt-2.1.0
+	virtual/opengl
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}/src/${PN/m/M}"
diff --git a/media-sound/protux/Manifest b/media-sound/protux/Manifest
new file mode 100644
index 000000000000..ef735bf0f52f
--- /dev/null
+++ b/media-sound/protux/Manifest
@@ -0,0 +1,5 @@
+DIST protux-0.50.100.tar.gz 392027 SHA256 cb8edab6684ea58c13e5cfcec0b6925f32e35cfca4129ca5ab668234541f78e2 SHA512 8a7f241c1673193141f456367d40260bd9c1d9ec93130d51abebd14e1dfb03784a2cd21c6c72bce645bd362f138e52e5d41182358ea4b4dad50f892025b6dad7 WHIRLPOOL a2ba3282c381447f3ffa1c1d5b0653950a1f0b40d0fba98333233e018c3d2e3178b8691e5864bba7f01b49ea853c065d07eec69591ce425f4e0d72f23088de68
+EBUILD protux-0.50.100.ebuild 1046 SHA256 1291e447503278ccd174d464aa144c1989e0a5da2fcd7c226ee787988311a005 SHA512 a1ff48e6468de76de88f7217773ccf749c3db3552b84f6542ba3b0a445e39075b6a5f4806edc70df60f9eefee6f9ee4929d919857854d8f212143cade64ea054 WHIRLPOOL 4597fbb506152d156572570e7f8f647bae370272967fae15d55c5a68e648f432336af125bb201a3d21f004f43dd8e671734d4e8a37d1b1c1ac87bb4cbaf21f5a
+MISC ChangeLog 3119 SHA256 ccb9c3621fc9a14990f209ef8547ab34ae3e246cd811e903235516a7ba33292d SHA512 56ee6e7c8fb8c8d8e7bd8a142d639c137ea384098013599f90b04ab867003d2bb981b6b8618ee75d75e560af6a69c18d7b92fee3f91ba55b3a6d07ff05df6f3e WHIRLPOOL 98d88700836d2fda4e4b8c8418c192df416179ad4d0397b6e292d581da7d01a42d48b1f9f4eabff0cb2751dd00ca049656f05530318bdf282ddfb471c13b3de5
+MISC ChangeLog-2015 3929 SHA256 821fbca068bff48db0f78f01e6abe1aced6ef9cd1efc234061c02aa9f95a95b1 SHA512 fe1bb2bd537e739e63445d3c17695496fc641084f0daf6b17e6a06f3b524dc206e278d0cfb74b641de8102cbfae0ae563ec75615bc72b1193edd9160e070cedc WHIRLPOOL e0ffb84b433c424599a2f53ec7a32a685ce38694b9437a6fc5d4add40662eaff18ea7760bb059ce5aa48d2df47aef87c9a3e8cd65a678faea0353e0f4a0372cc
+MISC metadata.xml 448 SHA256 fd0e68b770b2401f1623420ad5451c4b984d3d2b7edb1274b0893a0d96c721e6 SHA512 6db37340b09ea0b4f18892b7868aeabbc50f4a9d2505332d9f927a9299fd0d13178a8e351f6378f1f5c55b6a9862a08323213995027ebf9f9e2f235c6d857943 WHIRLPOOL 73bd00df88a5008ed506e90807b673a056a14aa543556e8f6254fa51124653d58d26d92e24626617dc040a095f844c1e0d320871aa1f85f2922271a27ae8effb
diff --git a/media-sound/protux/metadata.xml b/media-sound/protux/metadata.xml
new file mode 100644
index 000000000000..d1b3ad750f41
--- /dev/null
+++ b/media-sound/protux/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">protux</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/protux/protux-0.50.100.ebuild b/media-sound/protux/protux-0.50.100.ebuild
new file mode 100644
index 000000000000..630b6005c7b9
--- /dev/null
+++ b/media-sound/protux/protux-0.50.100.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit java-pkg-2
+
+DESCRIPTION="Professional Audio Tools for GNU/Linux"
+HOMEPAGE="http://protux.sourceforge.net/"
+SRC_URI="http://${PN}.sourceforge.net/releases/${P}.tar.gz"
+
+IUSE="source"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 x86"
+
+DEPEND=">=virtual/jdk-1.5
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# bug #318589
+	sed -i '/com.sun.jmx.snmp.Enumerated/d' "${S}/src/org/protux/core/GlobalProperties.java" || die
+}
+
+src_compile() {
+	cd src
+	ejavac -encoding latin1 $(find . -name "*.java")
+	jar cf ${PN}.jar $(find . -name "*.class") || die
+}
+
+src_install() {
+	java-pkg_dojar src/${PN}.jar
+	dodoc AUTHORS BUGLIST ChangeLog COPYRIGHT INSTALL README TODO || die
+	use source && java-pkg_dosrc src/org
+	# pwd like this because it does not find resources otherwise
+	java-pkg_dolauncher ${PN} \
+		--main org.protux.Main \
+		--pwd /usr/share/${PN}
+	insinto /usr/share/${PN}
+	doins -r resources || die
+}
diff --git a/media-sound/ptabtools/Manifest b/media-sound/ptabtools/Manifest
new file mode 100644
index 000000000000..8e275d9def5f
--- /dev/null
+++ b/media-sound/ptabtools/Manifest
@@ -0,0 +1,6 @@
+AUX ptabtools-0.5.0-makefile.patch 778 SHA256 1bfd0e89bee304fbb41f0f26348260dc91809c35ea7441154f11f1ad75ead0ed SHA512 d68a8791e3ec053ed557db0dce4de6bf07e91017e416a11cb131a5786ef66957cf2ea955a77fd8d009ab6d5b20ed6b044abe805994f4342a00fe84a3392f0dab WHIRLPOOL 09487f8a1fe86e912a731d9fd63915b340a7ab8d1d6a9a181fef5d1ada4b9c247445f7f5f8ca37f0de288975c3fa8022d6b441e6fb9064d64266468210db3547
+DIST ptabtools-0.5.0.tar.gz 116083 SHA256 2204d5969eaf17c538d839ee5cabdf68f4c458d0ef1e314689e3f6523633db98 SHA512 c0028daec1587b190692b8aa8d9002063022ff7516d99e9fae3fd01f25d27ce4230cb2b15ecf4652fd4b902de27bd8ae4b63af248e950ac8e7c1f277da37cc93 WHIRLPOOL efc06cf5b93422063ef1d223a66d784bd9bb64b3c7ada003129e5db03435ba3c25f05286a11f8f7f83b1967cd77dfe738ab4bb1e1649859309fde5d16db46b2c
+EBUILD ptabtools-0.5.0.ebuild 702 SHA256 743680632b35b8de7d29364eb3f39d6dc014e5691922ba959b11775a05864c3d SHA512 b1625ff6397d1b828e4b7ff2d174e21876d43a86730467a27873e290f06c2a32c059b6669aace6fcafb7bd89c8084404fa959601646e651d12ec8d32d2f9c86e WHIRLPOOL 8d06c24fb437005848df7020609c75b5ccc71c89b4b3665514272842b73aaba416fbdf76ef47eddcf93318ddfa86d13d6fc970e9b6b04781a78bccd7572d16f9
+MISC ChangeLog 2655 SHA256 3f8909bd0c6868f4d8ef47ae39d2456ca37c1a3ea5d5622e62b9a1e67e583673 SHA512 7db8e7540ffa24c31dafc8edae09955dd65991a387fdda0f89a244212d9ea33d6697236b1dcbfb3f3dee2ba8a54ca61268225821facb05a39aaf4bf95dbf1a50 WHIRLPOOL 19430c4a7c04a29de1a451f7466b543fb0bf54a9d9c3f446790415b2272d71607c34d10748dd584dbd7729ca909e4e6d7df492da573661b83b726006c8794002
+MISC ChangeLog-2015 3305 SHA256 3ec346c45c090ca74d0396f8327f5cd54e136d240901c5978f9aa323bb6036ec SHA512 f5f54d13c74946ef683ffc171d5a6af69d990a5007c57fe80b680c48fdd1d873d4b6bca51022aea2fd51b047a89e7638b794a63d2aafb5f7320d942ac3eec510 WHIRLPOOL 69e5b82e8e58cb6a412e687fb518c9ae1630680f03f2e267aac03daf65af4502ad081a0f0d1709bf29b6d03f5e86f43267a56e0e25c484bf5cb0f6212a742841
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/ptabtools/files/ptabtools-0.5.0-makefile.patch b/media-sound/ptabtools/files/ptabtools-0.5.0-makefile.patch
new file mode 100644
index 000000000000..72c72a58599b
--- /dev/null
+++ b/media-sound/ptabtools/files/ptabtools-0.5.0-makefile.patch
@@ -0,0 +1,27 @@
+--- ptabtools-0.5.0/Makefile.orig
++++ ptabtools-0.5.0/Makefile
+@@ -8,13 +8,13 @@
+ all: $(TARGETS)
+ 
+ tests/check: tests/check.o tests/ptb.o tests/gp.o ptb.o
+-	$(CC) $(FLAGS) $^ -o $@ $(CHECK_LIBS) 
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(CHECK_LIBS) 
+ 
+ ptb2xml.o: ptb2xml.c
+ 	$(CC) $(CFLAGS) -c $< $(LIBXSLT_CFLAGS) $(LIBXML_CFLAGS) $(XSLT_DEFINE)
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) -I. -c $< -o $@
+ 
+ %.po: %.c
+ 	$(CC) $(CFLAGS) -fPIC -c $< -o $@
+@@ -23,7 +23,7 @@
+ 	$(CC) $(SHFLAGS) $(CFLAGS) -Wl,--out-implib=ptb.dll.a -o $@ $^
+ 
+ libptb.so.$(VERSION): $(PTBLIB_OBJS:.o=.po)
+-	$(CC) $(SHFLAGS) -Wl,-soname,libptb.so.$(SOVERSION) -Wl,$@ $(CFLAGS) -o $@ $^
++	$(CC) $(SHFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ libptb.a: $(PTBLIB_OBJS)
+ 	$(AR) rs $@ $^
diff --git a/media-sound/ptabtools/metadata.xml b/media-sound/ptabtools/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/ptabtools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/ptabtools/ptabtools-0.5.0.ebuild b/media-sound/ptabtools/ptabtools-0.5.0.ebuild
new file mode 100644
index 000000000000..ce38e48576a8
--- /dev/null
+++ b/media-sound/ptabtools/ptabtools-0.5.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Utilities for PowerTab Guitar files (.ptb)"
+HOMEPAGE="http://www.samba.org/~jelmer/ptabtools/"
+SRC_URI="http://www.samba.org/~jelmer/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="dev-libs/popt
+	dev-libs/libxml2
+	dev-libs/libxslt"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	emake DESTDIR="${D}" libdir="/usr/$(get_libdir)" install
+	dodoc AUTHORS NEWS README ROADMAP TODO
+}
diff --git a/media-sound/puddletag/Manifest b/media-sound/puddletag/Manifest
new file mode 100644
index 000000000000..04e1b5e2015b
--- /dev/null
+++ b/media-sound/puddletag/Manifest
@@ -0,0 +1,5 @@
+DIST puddletag-1.2.0.tar.gz 1231226 SHA256 12dab2c3dbbb1ee63ea26f17af969ebdbcbf1c9e4265f9d9f6f6d16b227120d5 SHA512 4fd57f3e89c01e2914c3cf2e08760752ab5454c15c66c97fb1b42165fd27893d240762ac3591bc5165a31d03ef7fbf8d411c4cd989e07dcc69f43f5e87e89611 WHIRLPOOL 18284241702de58af79d5cd8254c50e94badf785b5ff48945b6f02069b8e461a28b0af585d5bc884933223bbb92a69a0927d8717889aa3bf7d63c1be0c3fbfde
+EBUILD puddletag-1.2.0.ebuild 1004 SHA256 658fc070f556fd0b59a5749ed35c151fd51212fda45dd415942d450a21163d7f SHA512 f453158eeb6acaf99bb5b63a9afafb5b11b470a11cbf29a9034d7eaf575f544496cdd9d01a9fffa55d55352db1679e2c73fff817269a536d13815c5446eda041 WHIRLPOOL 4041a287d41642fd21994d9c48327ac9c711a083062bfb894f74325edbfe5ce4ae8ba887cb40ffb9cf57ce217103b65ddf8200656d2ec3d9abeaae74a23e6561
+MISC ChangeLog 3667 SHA256 ca3688fdee719d7faa9ac711a1d8187449ac0297db74faf019026f8019261d47 SHA512 6daa50ff246760128791314dfb246be07eeda808801b4800582e7b33c711e77bed37ab14bac44f8bbf00ef48b8393e9b1f7e8531fa38f7eb7e39433a3f58bcd0 WHIRLPOOL 174bb60ae80ddd7971fc621785545725269b772bd1c6ca588cda9dbef7887a716927a135464151a24b15341218b316e84364720d73eb112598197af4de62e6a1
+MISC ChangeLog-2015 6032 SHA256 1a6f27d830cb34c83e68bce275af69badbc5da70552490b3f6407d3c1faf2b42 SHA512 3250163d1df24b7f23e6e76144d52fa59e9e0e5783f53d6e4de3847af5b1bcf144a4ea14ba96d7dc44267a4830ceae49b82fda4df5372c07b6e6b52b41d06930 WHIRLPOOL 78ff2b0cef121200f712a1d304a649430c31518ae2e0f6814e18ae19c5b8614afec64f628a024d92c0532720d6eadeb73ec0768678ec46db57ff05650780b984
+MISC metadata.xml 778 SHA256 527376c9f526a585bed1307f65b1248f609b5e384af05af73be023acd2759946 SHA512 3d8d7e8b38b916809424a16b9e306f301c07906fed200f8694b3496dd58259faee37c3e1964e914bdf11db2123dd68bbd5436555edddcf72d377fa5581645867 WHIRLPOOL d70297f808abf6a353ae8a1ce5affa7c9b629437bff72d8d0ba34bf4b166106dbb29cb930f5719da5b0a9d41bcc47a5666b53a157ea5e57adf383d548446913d
diff --git a/media-sound/puddletag/metadata.xml b/media-sound/puddletag/metadata.xml
new file mode 100644
index 000000000000..dd26272a674e
--- /dev/null
+++ b/media-sound/puddletag/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>billie@gentoo.org</email>
+		<name>Daniel Pielmeier</name>
+	</maintainer>
+	<use>
+		<flag name="cover"> Enables editing of FLAC cover art</flag>
+		<flag name="musicbrainz"> Enables support for musicbrainz, needs <pkg>dev-python/python-musicbrainz</pkg></flag>
+		<flag name="quodlibet">Enables support for editing <pkg>media-sound/quodlibet</pkg> databases</flag>
+		<flag name="acoustid">Use <pkg>media-libs/chromaprint</pkg> for acoustic fingerprinting</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">puddletag</remote-id>
+		<remote-id type="github">keithgg/puddletag</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/puddletag/puddletag-1.2.0.ebuild b/media-sound/puddletag/puddletag-1.2.0.ebuild
new file mode 100644
index 000000000000..263adc18efad
--- /dev/null
+++ b/media-sound/puddletag/puddletag-1.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 fdo-mime
+
+DESCRIPTION="Audio tag editor"
+HOMEPAGE="http://docs.puddletag.net/"
+SRC_URI="https://github.com/keithgg/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid cover musicbrainz quodlibet"
+
+DEPEND=""
+RDEPEND=">=dev-python/PyQt4-4.9.6-r2[${PYTHON_USEDEP},svg]
+	>=dev-python/pyparsing-1.5.1[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.21[${PYTHON_USEDEP}]
+	>=dev-python/configobj-4.7.2-r1[${PYTHON_USEDEP}]
+	acoustid? ( >=media-libs/chromaprint-0.6 )
+	musicbrainz? ( >=dev-python/python-musicbrainz-0.7.4-r1[${PYTHON_USEDEP}] )
+	cover? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	quodlibet? ( >=media-sound/quodlibet-2.5[${PYTHON_USEDEP}] )
+	>=dev-python/sip-4.14.2-r1:0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.0.1[${PYTHON_USEDEP}]"
+
+DOCS=(changelog HACKING NEWS THANKS TODO)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
new file mode 100644
index 000000000000..d0d794233f05
--- /dev/null
+++ b/media-sound/pulseaudio/Manifest
@@ -0,0 +1,15 @@
+AUX pulseaudio.conf.d 151 SHA256 99f8e923e249ad64a8dcc3084a3300988a42412f8160476184115d5f3580a667 SHA512 f97ed431e371e43d297b099952bf1e897b243a822183524b8e3ea17e888c08590bb3793e195bc22e3254eae7f2e1fa00204a752638746c4dde825a423f08c24b WHIRLPOOL fd6904b6cbf82f9c216b64dd543be8899f91b196cdc1c37f70fd9e63aa7b2d9c08afad4c3eb392de5035d22f0e264facfd0be8393dc7df363d1c5aff5eec7ed7
+AUX pulseaudio.init.d-5 2227 SHA256 f3f19fe6aee3822b861de486c55412f05aeed112e9a062103c1381e83ad72c69 SHA512 d0e1519fc97208c2d42c7d9d8f2e7d4658e741e8063102713da361748b6deaeae475619a65b3d3d1893c107a4511e17d4245264b5430190087f1823899c0f64b WHIRLPOOL 689d0cd2dd8c160f4c9ff610d49ddd0235078bd906f942383a77bc620de7e4e6c254ce23d5cf40da92974306d8ce3c160ad94350c6ae8666a4fbe262cb67f99c
+AUX pulseaudio.service 227 SHA256 62cd3b7e83845a27f437790cf293970f85ff02816da599a53cd5f3bf13da3788 SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6 WHIRLPOOL bb548efc14d88b372abaafae557fe23681ce93d1b010fe7761458c5f7793a96886aa368df4cbec5a4fde078f9e8d940020e3ad2a36248ff6c8ab3b70f412d634
+AUX pulseaudio.tmpfiles 36 SHA256 d836951fb800308256288506b6bd82919d377399e1292dc10905a7aa12dac0e9 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1 WHIRLPOOL b293b7372b7f63ddea63e6985d1f66a2010d8778ea3ae00501e58f15bfba3ed19b794111c073ee3bd5c8cf98d33f3c8db95220acf57f97477523f4cfa7121553
+DIST pulseaudio-10.0.tar.xz 1608040 SHA256 a3186824de9f0d2095ded5d0d0db0405dc73133983c2fbb37291547e37462f57 SHA512 11d98b4b2000a41bdea92df253409452bc9b77d8bb309b6d14c439e3b902e3f90c69da00daff409e3859a54ad01c63a75be5723616bdcb492801d622a6406481 WHIRLPOOL 6d03d8cf7b96cbb46a8cc5f7810f7cf1c4187aa9321483d5e56435874b218d437bc66860d25a149be59ca73de7118916e05e481758e04619e099cb9a50dcb119
+DIST pulseaudio-10.99.1.tar.xz 1635836 SHA256 c9791844569d8d0adb468c183d0d9fb6ac12b9db34a4a078a7773c8bac993f32 SHA512 410758da3cf3431b5810b9a5790d60ed8fe0bba58f621f4ca8e7ba66be8dcdd53cbd8284105ee6694b04f81a37791c3e8c5fe4af3ee034e89dff0b66fdbde006 WHIRLPOOL c8dfe0e4ab54029fdc3b47fb43282406908b7993ee155d6aaa9919419fb4e58a8f1df34bc569a33697a02533979c6ff4002944a20ed96c1246993eb3b97b7eb3
+DIST pulseaudio-11.0.tar.xz 1648128 SHA256 072305d4018fc5e75bb1b45ee6b938fa52fc9fd27493bf327415ef89ed14c969 SHA512 37d0afe343c136cef1906342f17c3473f791fe17b7e6dd463ce120d45285bc12e3680b8b4b6779d79b8ce2e755fe2a0cc4d4c960209b1dae9f924731484ecded WHIRLPOOL a7ddd82f9b65fe85ee4509909e03fb8526fb1998f4d13505637a4fc4d5f379f96e279279413aa7a878b6c13e9a331b4a4b06e0c63efa7ef8e5609194d9af9018
+DIST pulseaudio-11.1.tar.xz 1648924 SHA256 f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a WHIRLPOOL 53e6d83853dff5dc4291403506277fc832e60d8e55f555e39e377903856668c2f158a600019719902f30827d707850391aa4cc0bb07664864d87d5fc175c912f
+EBUILD pulseaudio-10.0.ebuild 10963 SHA256 727bd75bcbcd49f37f4188d43419347b6ff28770e58679534c30f57a38e4bc5d SHA512 0f4eeac1aa1d2446db522259bd669c67ad06f717964b6272f3ad733a01feecdc00bfd4fd886636a284522a7e766a090fcaba60251a8e65486ec518677425825f WHIRLPOOL 30a1344a7de4248ca68c7bc6786c1f89d6172817a7c20d916b0aea2f896c810e4caa4b07029eb584aadc7e2db603fac1bfdcf5a257c57e6348331f9b4484fcb9
+EBUILD pulseaudio-10.99.1.ebuild 10972 SHA256 35ac28a1ab6838e5720c3325e523055cd3ba736c1fe5846de0688f25c4f36eb2 SHA512 9140a7bacc08ed57975a5016d7ccca54c585a3c58cc0605f29ace3b2a9c4f7e5af817cd9be75034fa6b8769ae9b314cb2b56d53675308d8fef95edda5079e764 WHIRLPOOL 0ffee03dedbb1807cccce95ee9afaf28e619e3da3946fbbad99b25c3a5ed730b09bcf731250cc777df7342b11f77e1a6811c845b621aeaa7c0709a54fbdb6ec1
+EBUILD pulseaudio-11.0.ebuild 10960 SHA256 8c32ceb6a44f122d6b119dedc3e83a6365d57d5b19c89149f582511f8bfe4e8a SHA512 5857ec66ea36197411d0e42b2234683686f3a6982a5b5168b23f69dec72e4827155d664b6e4164f578758290362d885d7370f068a32c0c37d77d7806895cdb67 WHIRLPOOL 95e1c6dfeb6bf571fb45b8d1f7baed02c2ae8629e94d75887e87e88fcb5aad325f8f31a8aea277bc7c22d67fd9494e80cb50a487b4c2e5cac8681c484bcee4b1
+EBUILD pulseaudio-11.1.ebuild 10960 SHA256 8c32ceb6a44f122d6b119dedc3e83a6365d57d5b19c89149f582511f8bfe4e8a SHA512 5857ec66ea36197411d0e42b2234683686f3a6982a5b5168b23f69dec72e4827155d664b6e4164f578758290362d885d7370f068a32c0c37d77d7806895cdb67 WHIRLPOOL 95e1c6dfeb6bf571fb45b8d1f7baed02c2ae8629e94d75887e87e88fcb5aad325f8f31a8aea277bc7c22d67fd9494e80cb50a487b4c2e5cac8681c484bcee4b1
+MISC ChangeLog 11540 SHA256 721b6fd79ffce2f0d2cd26022f7bbcad88b1fdebd1139bbdfd1e5b07ef4b7ab2 SHA512 63d72899dab2227aa9159deb9a106da315f3bf6ebf63fb79e7214edbf351bc13c063e1abedf4d616c5746e33132ba8445c2c6fb6d5903107cf148c2562865ece WHIRLPOOL 109e3cd94d1b0df5ceeecc2df51a3594edd86722b92c66f5fc012c931291f5ee7d161a676ec6f5b6855989939ee13835cfa32e7e4e888778c1ca6e4c25ff1244
+MISC ChangeLog-2015 73034 SHA256 daebab187cd3a8bcffd1013ca2bd5f1ba94a30be9131949e23ff7fabf8953b2b SHA512 db0cda662b8f52d41b0502ef68001170c6eea3e18141e61984f96e2b7bb528126f752e4c7c4a622fcac04dd763a44c2816a5adc2ecb52d2b55230ed80e3454c9 WHIRLPOOL 5a9ef76f9272053d13dbb4f5c5646b10278a2a58e6e4ade4d9a301b4aeac99f1e6ebae6476d7e5ae57ca6760270c34c092479c6ef327247caf5d1c945b64b024
+MISC metadata.xml 3415 SHA256 3bfd27ff5ae2987f910aeaf1964f5b5a0fa9299e93b4bfe305a8472e7b42a5a3 SHA512 1c7e7a12eeafc6abd5d9bd315e4b512a7b479ae933ee3865b9fc37d994f123beea8208dfe742334d12dd4b20c7eb8077bb37fcd1a862dcf1f5874a0fa8777896 WHIRLPOOL 69bc332ea2cf65ebab7f1a9fbdd331a8eeb01c94dba024ded2450456ca5e607042fe1cb542c858de338f71c81e3bcc44e2086de858bcbedc01a474781e1e10a0
diff --git a/media-sound/pulseaudio/files/pulseaudio.conf.d b/media-sound/pulseaudio/files/pulseaudio.conf.d
new file mode 100644
index 000000000000..9e7245344a57
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio.conf.d
@@ -0,0 +1,6 @@
+# Config file for /etc/init.d/pulseaudio
+
+# For more see "pulseaudio -h".
+
+# Startup options
+PA_OPTS="--log-target=syslog --disallow-module-loading=1"
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-5 b/media-sound/pulseaudio/files/pulseaudio.init.d-5
new file mode 100644
index 000000000000..d5415d6987d8
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio.init.d-5
@@ -0,0 +1,80 @@
+#!/sbin/openrc-run
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need localmount
+	use net
+
+	local script="/etc/pulse/system.pa"
+
+	for opt in ${PA_OPTS}; do
+		case "$opt" in
+			--file=*)	script="${opt#*=}" ;;
+			-F*)		script="${opt#-F}" ;;
+		esac
+	done
+
+	config "$script"
+
+	local needs="$(get_options need)"
+	if [ -n "${needs}" ]; then
+		need ${needs}
+		return
+	fi
+
+	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-console-kit' "$script"; then
+	    needs="${needs} consolekit"
+	fi
+
+#ifdef UDEV
+	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-udev-detect' "$script"; then
+	    needs="${needs} udev"
+	fi
+#endif
+
+#ifdef AVAHI
+	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-zeroconf-publish' "$script"; then
+	    needs="${needs} avahi-daemon"
+	fi
+#endif
+
+#ifdef BLUETOOTH
+	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-bt-proximity' "$script"; then
+	    needs="${needs} bluetooth"
+	fi
+#endif
+
+#ifdef ALSA
+	if egrep -q '^[[:space:]]*load-module[[:space:]]+module-alsa-(sink|source)' "$script" || 
+	    egrep -q '^[[:space:]]*load-module[[:space:]]+module-(udev-)?detect' "$script" ||
+	    egrep -q '^[[:space:]]*add-autoload-source[[:space:]]+(input|output)[[:space:]]+module-alsa-(sink|source)' "$script"; then
+	    needs="${needs} alsasound"
+	fi
+#endif
+
+	need "${needs}"
+	save_options need "${needs}"
+}
+
+start() {
+	if [ -z "${PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE}" ]; then
+		eerror "Please don't use system wide PulseAudio unless you read the"
+		eerror "documentation available at http://www.pulseaudio.org/wiki/WhatIsWrongWithSystemMode"
+		eerror ""
+		eerror "When you're done, please set the variable PULSEAUDIO_SHOULD_NOT_GO_SYSTEMWIDE in"
+		eerror "/etc/conf.d/pulseaudio . Please remember that upstream does not support this mode"
+		eerror "when used for standard desktop configurations."
+		return 1
+	fi
+	ebegin "Starting pulseaudio"
+	PA_ALL_OPTS="${PA_OPTS} --fail=1 --daemonize=1 --system"
+	start-stop-daemon --start --exec /usr/bin/pulseaudio -- ${PA_ALL_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping pulseaudio"
+	start-stop-daemon --stop --quiet --exec /usr/bin/pulseaudio --pidfile /var/run/pulse/pid
+	eend $?
+}
diff --git a/media-sound/pulseaudio/files/pulseaudio.service b/media-sound/pulseaudio/files/pulseaudio.service
new file mode 100644
index 000000000000..c5f0d5799929
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=System wide PulseAudio instance
+After=syslog.target network.target alsasound.service
+
+[Service]
+Restart=always
+ExecStart=/usr/bin/pulseaudio --system --log-target=syslog
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-sound/pulseaudio/files/pulseaudio.tmpfiles b/media-sound/pulseaudio/files/pulseaudio.tmpfiles
new file mode 100644
index 000000000000..88374e35574b
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio.tmpfiles
@@ -0,0 +1 @@
+d /var/run/pulse 0755 pulse audio -
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
new file mode 100644
index 000000000000..3a9d6bb69ff7
--- /dev/null
+++ b/media-sound/pulseaudio/metadata.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="X">
+      Build the X11 publish module to export PulseAudio information
+      through X11 protocol for clients to make use. Don't enable this
+      flag if you want to use a system wide instance. If unsure, enable
+      this flag.
+    </flag>
+    <flag name="alsa-plugin">
+      Request installing <pkg>media-plugins/alsa-plugins</pkg> with
+      PulseAudio plugin enabled. This ensures that clients supporting
+      ALSA only will use PulseAudio.
+    </flag>
+    <flag name="gnome">
+      Use GConf to store user preferences on streams and so on. Don't
+      enable this flag if you want to use a system wide instance. If
+      unsure, enable this flag.
+    </flag>
+    <flag name="oss">
+      Enable OSS sink/source (output/input). Deprecated, upstream does
+      not support this on systems where other sink/source systems are
+      available (i.e.: Linux). The padsp wrapper is now always build
+      if the system supports OSS at all.
+    </flag>
+    <flag name="glib">
+      Add support to <pkg>dev-libs/glib</pkg>-based mainloop for the
+      libpulse client library, to allow using libpulse on glib-based
+      programs.
+    </flag>
+    <flag name="system-wide" restrict="&gt;=media-sound/pulseaudio-0.9.21.1">
+      Allow preparation and installation of the system-wide init
+      script for PulseAudio. Since this support is only supported for
+      embedded situations, do not enable without reading the upstream
+      instructions at
+      https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ .
+    </flag>
+    <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
+    <flag name="doc">Build the doxygen-described API documentation.</flag>
+    <flag name="realtime" restrict="&gt;=media-sound/pulseaudio-0.9.21.2-r1">
+      Makes PulseAudio use RealtimeKit (<pkg>sys-auth/rtkit</pkg>) to get
+      real-time priority while running.
+    </flag>
+    <flag name="equalizer">
+      Enable the equalizer module (requires <pkg>sci-libs/fftw</pkg>).
+    </flag>
+    <flag name="ssl">
+      Use <pkg>dev-libs/openssl</pkg> to provide support for RAOP
+      (AirPort) streaming.
+    </flag>
+    <flag name="gdbm">
+      Use <pkg>sys-libs/gdbm</pkg> to store PulseAudio
+      databases. Recommended for desktop usage. This flag causes the
+      whole package to be licensed under GPL-2 or later.
+    </flag>
+    <flag name="webrtc-aec">
+      Uses the webrtc.org AudioProcessing library for enhancing VoIP calls
+      greatly in applications that support it by performing acoustic echo
+      cancellation, analog gain control, noise suppression and other processing.
+    </flag>
+    <flag name="systemd">
+      Build with <pkg>sys-apps/systemd</pkg> support to replace standalone
+      ConsoleKit.
+    </flag>
+    <flag name="native-headset">
+      Build with native HSP backend for bluez 5.
+    </flag>
+    <flag name="ofono-headset">
+      Build with oFono HFP backend for bluez 5, requires <pkg>net-misc/ofono</pkg>.
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/pulseaudio/pulseaudio-10.0.ebuild b/media-sound/pulseaudio/pulseaudio-10.0.ebuild
new file mode 100644
index 000000000000..9c5aa47edde5
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-10.0.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+# qpaeq equalizer pyqt GUI frontend is AGPL-3+
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+# +alsa-plugin as discussed in bug #519530
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
+gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
++orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
++webrtc-aec +X zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ofono-headset? ( bluetooth )
+	native-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+"
+
+# libpcre needed in some cases, bug #472228
+RDEPEND="
+	|| (
+		elibc_glibc? ( virtual/libc )
+		elibc_uclibc? ( virtual/libc )
+		dev-libs/libpcre
+	)
+	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libICE[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+	)
+	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.19 )
+	glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( virtual/jack )
+	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
+	lirc? ( app-misc/lirc )
+	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:3 )
+	gnome? ( >=gnome-base/gconf-2.4.0 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		>=sys-apps/dbus-1.0.0
+		media-libs/sbc
+	)
+	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	realtime? ( sys-auth/rtkit )
+	equalizer? ( sci-libs/fftw:3.0 )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	|| (
+		(
+			>=media-libs/speex-1.2.0
+			media-libs/speexdsp
+		)
+		(
+			<media-libs/speex-1.2.0
+			>=media-libs/speex-1.2_rc1
+		)
+	)
+	gdbm? ( sys-libs/gdbm )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+	dev-libs/libltdl:0
+	selinux? ( sec-policy/selinux-pulseaudio )
+"
+# it's a valid RDEPEND, libltdl.so is used for native abi
+
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-libs/check-0.9.10 )
+	X? (
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
+	)
+	dev-libs/libatomic_ops
+	virtual/pkgconfig
+	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+	dev-util/intltool
+	>=sys-devel/gettext-0.18.1
+"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+# PyQt4 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+	equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		bluetooth? ( >=net-wireless/bluez-5 )
+	)
+"
+
+pkg_pretend() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
+	check_extra_config
+
+	if linux_config_exists; then
+		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
+		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
+			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
+			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
+		fi
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	gnome2_environment_reset #543364
+
+	enewgroup audio 18 # Just make sure it exists
+
+	if use system-wide; then
+		enewgroup pulse-access
+		enewgroup pulse
+		enewuser pulse -1 -1 /var/run/pulse pulse,audio
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Skip test that cannot work with sandbox, bug #501846
+	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if use gdbm; then
+		myconf+=( --with-database=gdbm )
+	else
+		myconf+=( --with-database=simple )
+	fi
+
+	if use bluetooth; then
+		if multilib_is_native_abi; then
+			myconf+=( --enable-bluez5 --disable-bluez4
+				$(use_enable native-headset bluez5-native-headset)
+				$(use_enable ofono-headset bluez5-ofono-headset) )
+		fi
+	else
+		myconf+=( --disable-bluez5 --disable-bluez4 )
+	fi
+
+	myconf+=(
+		--enable-largefile
+		$(use_enable glib glib2)
+		--disable-solaris
+		$(use_enable asyncns)
+		$(use_enable oss oss-output)
+		$(use_enable alsa)
+		$(use_enable lirc)
+		$(use_enable neon neon-opt)
+		$(use_enable tcpd tcpwrap)
+		$(use_enable jack)
+		$(use_enable zeroconf avahi)
+		$(use_enable dbus)
+		$(use_enable gnome gconf)
+		$(use_enable gtk gtk3)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable orc)
+		$(use_enable X x11)
+		$(use_enable test default-build-tests)
+		$(use_enable udev)
+		$(use_with sox soxr)
+		$(use_enable systemd systemd-daemon)
+		$(use_enable systemd systemd-login)
+		$(use_enable systemd systemd-journal)
+		$(use_enable ipv6)
+		$(use_enable ssl openssl)
+		$(use_enable webrtc-aec)
+		$(use_with caps)
+		$(use_with equalizer fftw)
+		--disable-adrian-aec
+		--disable-esound
+		--localstatedir="${EPREFIX}"/var
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+	)
+
+	if ! multilib_is_native_abi; then
+		# disable all the modules and stuff
+		myconf+=(
+			--disable-oss-output
+			--disable-alsa
+			--disable-lirc
+			--disable-jack
+			--disable-avahi
+			--disable-gconf
+			--disable-gtk3
+			--disable-samplerate
+			--disable-bluez4
+			--disable-bluez5
+			--disable-udev
+			--disable-openssl
+			--disable-orc
+			--disable-webrtc-aec
+			--without-fftw
+			--without-soxr
+
+			# tests involve random modules, so just do them for the native
+			--disable-default-build-tests
+
+			# hack around unnecessary checks
+			# (results don't matter, we're not building anything using it)
+			ac_cv_lib_ltdl_lt_dladvise_init=yes
+			--with-database=simple
+			LIBSPEEX_CFLAGS=' '
+			LIBSPEEX_LIBS=' '
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+		use doc && emake doxygen
+	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la
+	fi
+}
+
+multilib_src_test() {
+	# We avoid running the toplevel check target because that will run
+	# po/'s tests too, and they are broken. Officially, it should work
+	# with intltool 0.41, but that doesn't look like a stable release.
+	if multilib_is_native_abi; then
+		emake -C src check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
+		use doc && dohtml -r doxygen/html/
+	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C src \
+			install-libLTLIBRARIES \
+			install-padsplibLTLIBRARIES \
+			lib_LTLIBRARIES="${targets[*]}" \
+			install-pulseincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	# Drop the script entirely if X is disabled
+	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
+
+	if use system-wide; then
+		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+			use "$1" && echo "-D$define" || echo "-U$define"
+		}
+
+		unifdef $(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}/pulseaudio.init.d-5" \
+			> "${T}/pulseaudio"
+
+		doinitd "${T}/pulseaudio"
+
+		systemd_dounit "${FILESDIR}/${PN}.service"
+	fi
+
+	use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+	dodoc NEWS README todo
+
+	# Create the state directory
+	use prefix || diropts -o pulse -g pulse -m0755
+
+	# We need /var/run/pulse, bug #442852
+	use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+
+	# Prevent warnings when system-wide is not used, bug #447694
+	use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use system-wide; then
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		if use gnome ; then
+			elog
+			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
+			elog "that you might need to remove the gnome USE flag or disable the"
+			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
+			elog "with a system-wide instance."
+		fi
+	fi
+
+	if use equalizer && ! use qt4; then
+		elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
+		elog "This will build the equalizer module, but the 'qpaeq' tool"
+		elog "which is required to set equalizer levels will not work."
+	fi
+
+	if use native-headset && use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+	fi
+
+	if use libsamplerate; then
+		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
+		elog "particular advantage over speex. Upstream suggests disabling them."
+	fi
+}
diff --git a/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild b/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild
new file mode 100644
index 000000000000..54df4e0b7f57
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+# qpaeq equalizer pyqt GUI frontend is AGPL-3+
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+# +alsa-plugin as discussed in bug #519530
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
+gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
++orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
++webrtc-aec +X zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ofono-headset? ( bluetooth )
+	native-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+"
+
+# libpcre needed in some cases, bug #472228
+RDEPEND="
+	|| (
+		elibc_glibc? ( virtual/libc )
+		elibc_uclibc? ( virtual/libc )
+		dev-libs/libpcre
+	)
+	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libICE[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+	)
+	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.19 )
+	glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( virtual/jack )
+	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
+	lirc? ( app-misc/lirc )
+	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:3 )
+	gnome? ( >=gnome-base/gconf-2.4.0 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		>=sys-apps/dbus-1.0.0
+		media-libs/sbc
+	)
+	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	realtime? ( sys-auth/rtkit )
+	equalizer? ( sci-libs/fftw:3.0 )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	|| (
+		(
+			>=media-libs/speex-1.2.0
+			media-libs/speexdsp
+		)
+		(
+			<media-libs/speex-1.2.0
+			>=media-libs/speex-1.2_rc1
+		)
+	)
+	gdbm? ( sys-libs/gdbm )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+	dev-libs/libltdl:0
+	selinux? ( sec-policy/selinux-pulseaudio )
+"
+# it's a valid RDEPEND, libltdl.so is used for native abi
+
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-libs/check-0.9.10 )
+	X? (
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
+	)
+	dev-libs/libatomic_ops
+	virtual/pkgconfig
+	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+	dev-util/intltool
+	>=sys-devel/gettext-0.18.1
+"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+# PyQt4 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+	equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		bluetooth? ( >=net-wireless/bluez-5 )
+	)
+"
+
+pkg_pretend() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
+	check_extra_config
+
+	if linux_config_exists; then
+		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
+		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
+			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
+			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
+		fi
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	gnome2_environment_reset #543364
+
+	enewgroup audio 18 # Just make sure it exists
+
+	if use system-wide; then
+		enewgroup pulse-access
+		enewgroup pulse
+		enewuser pulse -1 -1 /var/run/pulse pulse,audio
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Skip test that cannot work with sandbox, bug #501846
+	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if use gdbm; then
+		myconf+=( --with-database=gdbm )
+	else
+		myconf+=( --with-database=simple )
+	fi
+
+	if use bluetooth; then
+		if multilib_is_native_abi; then
+			myconf+=( --enable-bluez5 --disable-bluez4
+				$(use_enable native-headset bluez5-native-headset)
+				$(use_enable ofono-headset bluez5-ofono-headset) )
+		fi
+	else
+		myconf+=( --disable-bluez5 --disable-bluez4 )
+	fi
+
+	myconf+=(
+		--enable-largefile
+		$(use_enable glib glib2)
+		--disable-solaris
+		$(use_enable asyncns)
+		$(use_enable oss oss-output)
+		$(use_enable alsa)
+		$(use_enable lirc)
+		$(use_enable neon neon-opt)
+		$(use_enable tcpd tcpwrap)
+		$(use_enable jack)
+		$(use_enable zeroconf avahi)
+		$(use_enable dbus)
+		$(use_enable gnome gconf)
+		$(use_enable gtk gtk3)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable orc)
+		$(use_enable X x11)
+		$(use_enable test default-build-tests)
+		$(use_enable udev)
+		$(use_with sox soxr)
+		$(use_enable systemd systemd-daemon)
+		$(use_enable systemd systemd-login)
+		$(use_enable systemd systemd-journal)
+		$(use_enable ipv6)
+		$(use_enable ssl openssl)
+		$(use_enable webrtc-aec)
+		$(use_with caps)
+		$(use_with equalizer fftw)
+		--disable-adrian-aec
+		--disable-esound
+		--localstatedir="${EPREFIX}"/var
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+	)
+
+	if ! multilib_is_native_abi; then
+		# disable all the modules and stuff
+		myconf+=(
+			--disable-oss-output
+			--disable-alsa
+			--disable-lirc
+			--disable-jack
+			--disable-avahi
+			--disable-gconf
+			--disable-gtk3
+			--disable-samplerate
+			--disable-bluez4
+			--disable-bluez5
+			--disable-udev
+			--disable-openssl
+			--disable-orc
+			--disable-webrtc-aec
+			--without-fftw
+			--without-soxr
+
+			# tests involve random modules, so just do them for the native
+			--disable-default-build-tests
+
+			# hack around unnecessary checks
+			# (results don't matter, we're not building anything using it)
+			ac_cv_lib_ltdl_lt_dladvise_init=yes
+			--with-database=simple
+			LIBSPEEX_CFLAGS=' '
+			LIBSPEEX_LIBS=' '
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+		use doc && emake doxygen
+	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la
+	fi
+}
+
+multilib_src_test() {
+	# We avoid running the toplevel check target because that will run
+	# po/'s tests too, and they are broken. Officially, it should work
+	# with intltool 0.41, but that doesn't look like a stable release.
+	if multilib_is_native_abi; then
+		emake -C src check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
+		use doc && dohtml -r doxygen/html/
+	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C src \
+			install-libLTLIBRARIES \
+			install-padsplibLTLIBRARIES \
+			lib_LTLIBRARIES="${targets[*]}" \
+			install-pulseincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	# Drop the script entirely if X is disabled
+	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
+
+	if use system-wide; then
+		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+			use "$1" && echo "-D$define" || echo "-U$define"
+		}
+
+		unifdef $(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}/pulseaudio.init.d-5" \
+			> "${T}/pulseaudio"
+
+		doinitd "${T}/pulseaudio"
+
+		systemd_dounit "${FILESDIR}/${PN}.service"
+	fi
+
+	use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+	dodoc NEWS README todo
+
+	# Create the state directory
+	use prefix || diropts -o pulse -g pulse -m0755
+
+	# We need /var/run/pulse, bug #442852
+	use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+
+	# Prevent warnings when system-wide is not used, bug #447694
+	use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use system-wide; then
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		if use gnome ; then
+			elog
+			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
+			elog "that you might need to remove the gnome USE flag or disable the"
+			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
+			elog "with a system-wide instance."
+		fi
+	fi
+
+	if use equalizer && ! use qt4; then
+		elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
+		elog "This will build the equalizer module, but the 'qpaeq' tool"
+		elog "which is required to set equalizer levels will not work."
+	fi
+
+	if use native-headset && use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+	fi
+
+	if use libsamplerate; then
+		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
+		elog "particular advantage over speex. Upstream suggests disabling them."
+	fi
+}
diff --git a/media-sound/pulseaudio/pulseaudio-11.0.ebuild b/media-sound/pulseaudio/pulseaudio-11.0.ebuild
new file mode 100644
index 000000000000..9ca990d07101
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-11.0.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+# qpaeq equalizer pyqt GUI frontend is AGPL-3+
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+# +alsa-plugin as discussed in bug #519530
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
+gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
++orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
++webrtc-aec +X zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ofono-headset? ( bluetooth )
+	native-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+"
+
+# libpcre needed in some cases, bug #472228
+RDEPEND="
+	|| (
+		elibc_glibc? ( virtual/libc )
+		elibc_uclibc? ( virtual/libc )
+		dev-libs/libpcre
+	)
+	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libICE[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+	)
+	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.19 )
+	glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( virtual/jack )
+	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
+	lirc? ( app-misc/lirc )
+	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:3 )
+	gnome? ( >=gnome-base/gconf-2.4.0 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		>=sys-apps/dbus-1.0.0
+		media-libs/sbc
+	)
+	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	realtime? ( sys-auth/rtkit )
+	equalizer? ( sci-libs/fftw:3.0 )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	|| (
+		(
+			>=media-libs/speex-1.2.0
+			media-libs/speexdsp
+		)
+		(
+			<media-libs/speex-1.2.0
+			>=media-libs/speex-1.2_rc1
+		)
+	)
+	gdbm? ( sys-libs/gdbm )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+	dev-libs/libltdl:0
+	selinux? ( sec-policy/selinux-pulseaudio )
+"
+# it's a valid RDEPEND, libltdl.so is used for native abi
+
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-libs/check-0.9.10 )
+	X? (
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
+	)
+	dev-libs/libatomic_ops
+	virtual/pkgconfig
+	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+	dev-util/intltool
+	>=sys-devel/gettext-0.18.1
+"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+# PyQt4 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+	equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		bluetooth? ( >=net-wireless/bluez-5 )
+	)
+"
+
+pkg_pretend() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
+	check_extra_config
+
+	if linux_config_exists; then
+		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
+		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
+			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
+			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
+		fi
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	gnome2_environment_reset #543364
+
+	enewgroup audio 18 # Just make sure it exists
+
+	if use system-wide; then
+		enewgroup pulse-access
+		enewgroup pulse
+		enewuser pulse -1 -1 /var/run/pulse pulse,audio
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Skip test that cannot work with sandbox, bug #501846
+	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if use gdbm; then
+		myconf+=( --with-database=gdbm )
+	else
+		myconf+=( --with-database=simple )
+	fi
+
+	if use bluetooth; then
+		if multilib_is_native_abi; then
+			myconf+=( --enable-bluez5 --disable-bluez4
+				$(use_enable native-headset bluez5-native-headset)
+				$(use_enable ofono-headset bluez5-ofono-headset) )
+		fi
+	else
+		myconf+=( --disable-bluez5 --disable-bluez4 )
+	fi
+
+	myconf+=(
+		--enable-largefile
+		$(use_enable glib glib2)
+		--disable-solaris
+		$(use_enable asyncns)
+		$(use_enable oss oss-output)
+		$(use_enable alsa)
+		$(use_enable lirc)
+		$(use_enable neon neon-opt)
+		$(use_enable tcpd tcpwrap)
+		$(use_enable jack)
+		$(use_enable zeroconf avahi)
+		$(use_enable dbus)
+		$(use_enable gnome gconf)
+		$(use_enable gtk gtk3)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable orc)
+		$(use_enable X x11)
+		$(use_enable test default-build-tests)
+		$(use_enable udev)
+		$(use_with sox soxr)
+		$(use_enable systemd systemd-daemon)
+		$(use_enable systemd systemd-login)
+		$(use_enable systemd systemd-journal)
+		$(use_enable ipv6)
+		$(use_enable ssl openssl)
+		$(use_enable webrtc-aec)
+		$(use_with caps)
+		$(use_with equalizer fftw)
+		--disable-adrian-aec
+		--disable-esound
+		--localstatedir="${EPREFIX}"/var
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+	)
+
+	if ! multilib_is_native_abi; then
+		# disable all the modules and stuff
+		myconf+=(
+			--disable-oss-output
+			--disable-alsa
+			--disable-lirc
+			--disable-jack
+			--disable-avahi
+			--disable-gconf
+			--disable-gtk3
+			--disable-samplerate
+			--disable-bluez4
+			--disable-bluez5
+			--disable-udev
+			--disable-openssl
+			--disable-orc
+			--disable-webrtc-aec
+			--without-fftw
+			--without-soxr
+
+			# tests involve random modules, so just do them for the native
+			--disable-default-build-tests
+
+			# hack around unnecessary checks
+			# (results don't matter, we're not building anything using it)
+			ac_cv_lib_ltdl_lt_dladvise_init=yes
+			--with-database=simple
+			LIBSPEEX_CFLAGS=' '
+			LIBSPEEX_LIBS=' '
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+		use doc && emake doxygen
+	else
+		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake -C src ${targets[*]}
+	fi
+}
+
+multilib_src_test() {
+	# We avoid running the toplevel check target because that will run
+	# po/'s tests too, and they are broken. Officially, it should work
+	# with intltool 0.41, but that doesn't look like a stable release.
+	if multilib_is_native_abi; then
+		emake -C src check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
+		use doc && dohtml -r doxygen/html/
+	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C src \
+			install-libLTLIBRARIES \
+			install-padsplibLTLIBRARIES \
+			lib_LTLIBRARIES="${targets[*]}" \
+			install-pulseincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	# Drop the script entirely if X is disabled
+	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
+
+	if use system-wide; then
+		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+			use "$1" && echo "-D$define" || echo "-U$define"
+		}
+
+		unifdef $(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}/pulseaudio.init.d-5" \
+			> "${T}/pulseaudio"
+
+		doinitd "${T}/pulseaudio"
+
+		systemd_dounit "${FILESDIR}/${PN}.service"
+	fi
+
+	use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+	dodoc NEWS README todo
+
+	# Create the state directory
+	use prefix || diropts -o pulse -g pulse -m0755
+
+	# We need /var/run/pulse, bug #442852
+	use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+
+	# Prevent warnings when system-wide is not used, bug #447694
+	use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use system-wide; then
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		if use gnome ; then
+			elog
+			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
+			elog "that you might need to remove the gnome USE flag or disable the"
+			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
+			elog "with a system-wide instance."
+		fi
+	fi
+
+	if use equalizer && ! use qt4; then
+		elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
+		elog "This will build the equalizer module, but the 'qpaeq' tool"
+		elog "which is required to set equalizer levels will not work."
+	fi
+
+	if use native-headset && use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+	fi
+
+	if use libsamplerate; then
+		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
+		elog "particular advantage over speex. Upstream suggests disabling them."
+	fi
+}
diff --git a/media-sound/pulseaudio/pulseaudio-11.1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1.ebuild
new file mode 100644
index 000000000000..9ca990d07101
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-11.1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+# qpaeq equalizer pyqt GUI frontend is AGPL-3+
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+# +alsa-plugin as discussed in bug #519530
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
+gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
++orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
++webrtc-aec +X zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ofono-headset? ( bluetooth )
+	native-headset? ( bluetooth )
+	udev? ( || ( alsa oss ) )
+"
+
+# libpcre needed in some cases, bug #472228
+RDEPEND="
+	|| (
+		elibc_glibc? ( virtual/libc )
+		elibc_uclibc? ( virtual/libc )
+		dev-libs/libpcre
+	)
+	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libICE[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+	)
+	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.19 )
+	glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( virtual/jack )
+	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
+	lirc? ( app-misc/lirc )
+	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:3 )
+	gnome? ( >=gnome-base/gconf-2.4.0 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		>=sys-apps/dbus-1.0.0
+		media-libs/sbc
+	)
+	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	realtime? ( sys-auth/rtkit )
+	equalizer? ( sci-libs/fftw:3.0 )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	|| (
+		(
+			>=media-libs/speex-1.2.0
+			media-libs/speexdsp
+		)
+		(
+			<media-libs/speex-1.2.0
+			>=media-libs/speex-1.2_rc1
+		)
+	)
+	gdbm? ( sys-libs/gdbm )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+	dev-libs/libltdl:0
+	selinux? ( sec-policy/selinux-pulseaudio )
+"
+# it's a valid RDEPEND, libltdl.so is used for native abi
+
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-libs/check-0.9.10 )
+	X? (
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
+	)
+	dev-libs/libatomic_ops
+	virtual/pkgconfig
+	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+	dev-util/intltool
+	>=sys-devel/gettext-0.18.1
+"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+# PyQt4 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+	equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		bluetooth? ( >=net-wireless/bluez-5 )
+	)
+"
+
+pkg_pretend() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
+	check_extra_config
+
+	if linux_config_exists; then
+		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
+		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
+			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
+			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
+		fi
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	gnome2_environment_reset #543364
+
+	enewgroup audio 18 # Just make sure it exists
+
+	if use system-wide; then
+		enewgroup pulse-access
+		enewgroup pulse
+		enewuser pulse -1 -1 /var/run/pulse pulse,audio
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Skip test that cannot work with sandbox, bug #501846
+	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if use gdbm; then
+		myconf+=( --with-database=gdbm )
+	else
+		myconf+=( --with-database=simple )
+	fi
+
+	if use bluetooth; then
+		if multilib_is_native_abi; then
+			myconf+=( --enable-bluez5 --disable-bluez4
+				$(use_enable native-headset bluez5-native-headset)
+				$(use_enable ofono-headset bluez5-ofono-headset) )
+		fi
+	else
+		myconf+=( --disable-bluez5 --disable-bluez4 )
+	fi
+
+	myconf+=(
+		--enable-largefile
+		$(use_enable glib glib2)
+		--disable-solaris
+		$(use_enable asyncns)
+		$(use_enable oss oss-output)
+		$(use_enable alsa)
+		$(use_enable lirc)
+		$(use_enable neon neon-opt)
+		$(use_enable tcpd tcpwrap)
+		$(use_enable jack)
+		$(use_enable zeroconf avahi)
+		$(use_enable dbus)
+		$(use_enable gnome gconf)
+		$(use_enable gtk gtk3)
+		$(use_enable libsamplerate samplerate)
+		$(use_enable orc)
+		$(use_enable X x11)
+		$(use_enable test default-build-tests)
+		$(use_enable udev)
+		$(use_with sox soxr)
+		$(use_enable systemd systemd-daemon)
+		$(use_enable systemd systemd-login)
+		$(use_enable systemd systemd-journal)
+		$(use_enable ipv6)
+		$(use_enable ssl openssl)
+		$(use_enable webrtc-aec)
+		$(use_with caps)
+		$(use_with equalizer fftw)
+		--disable-adrian-aec
+		--disable-esound
+		--localstatedir="${EPREFIX}"/var
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+	)
+
+	if ! multilib_is_native_abi; then
+		# disable all the modules and stuff
+		myconf+=(
+			--disable-oss-output
+			--disable-alsa
+			--disable-lirc
+			--disable-jack
+			--disable-avahi
+			--disable-gconf
+			--disable-gtk3
+			--disable-samplerate
+			--disable-bluez4
+			--disable-bluez5
+			--disable-udev
+			--disable-openssl
+			--disable-orc
+			--disable-webrtc-aec
+			--without-fftw
+			--without-soxr
+
+			# tests involve random modules, so just do them for the native
+			--disable-default-build-tests
+
+			# hack around unnecessary checks
+			# (results don't matter, we're not building anything using it)
+			ac_cv_lib_ltdl_lt_dladvise_init=yes
+			--with-database=simple
+			LIBSPEEX_CFLAGS=' '
+			LIBSPEEX_LIBS=' '
+		)
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+		use doc && emake doxygen
+	else
+		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake -C src ${targets[*]}
+	fi
+}
+
+multilib_src_test() {
+	# We avoid running the toplevel check target because that will run
+	# po/'s tests too, and they are broken. Officially, it should work
+	# with intltool 0.41, but that doesn't look like a stable release.
+	if multilib_is_native_abi; then
+		emake -C src check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
+		use doc && dohtml -r doxygen/html/
+	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C src \
+			install-libLTLIBRARIES \
+			install-padsplibLTLIBRARIES \
+			lib_LTLIBRARIES="${targets[*]}" \
+			install-pulseincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	# Drop the script entirely if X is disabled
+	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
+
+	if use system-wide; then
+		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+			use "$1" && echo "-D$define" || echo "-U$define"
+		}
+
+		unifdef $(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}/pulseaudio.init.d-5" \
+			> "${T}/pulseaudio"
+
+		doinitd "${T}/pulseaudio"
+
+		systemd_dounit "${FILESDIR}/${PN}.service"
+	fi
+
+	use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+	dodoc NEWS README todo
+
+	# Create the state directory
+	use prefix || diropts -o pulse -g pulse -m0755
+
+	# We need /var/run/pulse, bug #442852
+	use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+
+	# Prevent warnings when system-wide is not used, bug #447694
+	use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use system-wide; then
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+		if use gnome ; then
+			elog
+			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
+			elog "that you might need to remove the gnome USE flag or disable the"
+			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
+			elog "with a system-wide instance."
+		fi
+	fi
+
+	if use equalizer && ! use qt4; then
+		elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
+		elog "This will build the equalizer module, but the 'qpaeq' tool"
+		elog "which is required to set equalizer levels will not work."
+	fi
+
+	if use native-headset && use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+	fi
+
+	if use libsamplerate; then
+		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
+		elog "particular advantage over speex. Upstream suggests disabling them."
+	fi
+}
diff --git a/media-sound/pwavecat/Manifest b/media-sound/pwavecat/Manifest
new file mode 100644
index 000000000000..84e43035cef5
--- /dev/null
+++ b/media-sound/pwavecat/Manifest
@@ -0,0 +1,7 @@
+AUX pwavecat-0.4.5-overflow.patch 1255 SHA256 f9ce887f945b4836c71a3e35ea82212f42e8c3ac97b547f10a4a379cc58463a4 SHA512 560281481a1de5550f8a491d77aed483a297c5d192d71d75d0aca2274c7afb15fa7ebe01070a07961f05c15fc0adbff41548e9722d9a94b369120b8ffea225c5 WHIRLPOOL 3eeb15ae223a99cb1f7c96623fe65292fb5a1b282492b806aa61e540ae94693b463b09ad1af87a2a754314e01ad5f508d2b10d481a731f05506ed0215e932b74
+AUX pwavecat-0.4.5.diff 823 SHA256 0a8f3e9998559016b8e4b78d8fff7000815bc3bf13df15e45026d75644e0a3fa SHA512 a92e9f242cb79af4392f099b2fc2014c97676e679e2646cfb5eeb5fca8173e953c031eeee8e72de08efe68750773fae77d8009ee12a43ed8be7eff6d57818336 WHIRLPOOL 91cd057db13efb3327a0db0604e642ae21b3a03a272dea46491a43f19971909f0bd2f0c205cac00cebe6aa7ca342d74aada6192dc7c5acc63f1cf42eed1c526b
+DIST pwavecat-0.4.5.tgz 13110 SHA256 3a7d270f09fc918ac7c78258bb99b38369744b90f2217f9f7aa30393f6467db7 SHA512 3faa03d08cc1cde47294837c0295eeabb8461327c9e13caa317b985fc12bdc8d00ec7207411aad1325a54c7cc63cca5f5638db5c988c7e6887f3a0d77b5ace55 WHIRLPOOL 8426a8485939a245faa2b9c3a140036367106cd72afe5aba6c7e5c20cfa5729319365ee50103ebe7f864ebe7a4eb6fe5a31e9efc8212d44ddc7083d3e2e15a4e
+EBUILD pwavecat-0.4.5.ebuild 701 SHA256 e79b869969ef8f4bed5259aa0255a983a077c61e6ad17cb2917dfc7bbf6eb910 SHA512 7d922d5f46a87fbd08e54b04bec6598788815608ed3de81188f91db5cef39a926ec1d0d7accbfb0b22c55cc70b331f584905bcdd788835949fb0cd3462633355 WHIRLPOOL 92df97add00eb0d7072538e959e801c33a7ec0002d14d2fff53bdd44ea583f1fb91e46871179cce9e254005ce948c6ac46ada0c0b784358b0abdec27875ee356
+MISC ChangeLog 2501 SHA256 f9c619a51f650c3a189e293b031b28ae7c25ce37a132eba66604db36131d37de SHA512 ec5e69ecf15a906fe5c505afcaf4149616795175845381c04205c822716c7b4ba19efa5f6b98e26f930d0f4a6026285d7d5862c9afda6923a6faa46aad412a8b WHIRLPOOL aa555407851e580e3bf76fbc6ef2e583df07aaa041555280757dcc8ddd09ac8d4caeecf64d4d12832be9300b8815e64c801c972ae1fb0496159998ce6a59db40
+MISC ChangeLog-2015 664 SHA256 6b86b764754dc816b9e53482122c3fd98afd093a3733eccdc2615b102f7bdaee SHA512 0bc8fd21f90981f9135bdb438136ba1d4ffeb096e4e144755d048b5e781dd0a82dbb9807e2dd6549926d1d760733406d3140b481c57e3cd85e8b7a09c90dde3d WHIRLPOOL 0a1ab217f1b4cdcfb85fb57134f7bd32ddec33e20f2ba2bad17340ce2dd17959923b2f4fa752e8e83129dbcb32b8d49ba7985453566129f62e90154a9e0683cf
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch b/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch
new file mode 100644
index 000000000000..f3d54221bc7d
--- /dev/null
+++ b/media-sound/pwavecat/files/pwavecat-0.4.5-overflow.patch
@@ -0,0 +1,27 @@
+diff --git a/parts.c b/parts.c
+index 670d0d5..a59ad98 100644
+--- a/parts.c
++++ b/parts.c
+@@ -338,10 +338,10 @@ if(! file_header)
+ 	return 0;
+ 	}
+ 
+-strcpy(file_header -> main_chunk, "RIFF");
++memcpy(file_header -> main_chunk, "RIFF", 4);
+ file_header -> length = length + header_size - 8;
+-strcpy(file_header -> chunk_type, "WAVE"); 
+-strcpy(file_header -> sub_chunk, "fmt ");	// watch out the zero termination overwrites next var
++memcpy(file_header -> chunk_type, "WAVE", 4);
++memcpy(file_header -> sub_chunk, "fmt ", 4);	// watch out the zero termination overwrites next var
+ file_header -> length_chunk = 16;							//always 16
+ file_header -> format = 1;									//PCM
+ file_header -> modus = modus;								// stereo
+@@ -349,7 +349,7 @@ file_header -> sample_fq = sample_fq;						// 44100, 48000, etc...
+ file_header -> byte_p_sec = byte_p_sec;						// little endian
+ file_header -> byte_p_spl = byte_p_spl;		 				// 4 stereo
+ file_header -> bit_p_spl = bit_p_spl;						// 16 bits
+-strcpy(file_header -> data_chunk, "data");	// watch out the zero termination overwrites next var
++memcpy(file_header -> data_chunk, "data", 4);	// watch out the zero termination overwrites next var
+ file_header -> data_length = (unsigned long)length;
+ 
+ if(debug_flag)
diff --git a/media-sound/pwavecat/files/pwavecat-0.4.5.diff b/media-sound/pwavecat/files/pwavecat-0.4.5.diff
new file mode 100644
index 000000000000..abe00c69daec
--- /dev/null
+++ b/media-sound/pwavecat/files/pwavecat-0.4.5.diff
@@ -0,0 +1,27 @@
+diff -Naur pwavecat-0.4.5.orig/Makefile pwavecat-0.4.5/Makefile
+--- pwavecat-0.4.5.orig/Makefile	2005-10-06 15:52:56.000000000 +0200
++++ pwavecat-0.4.5/Makefile	2007-10-06 16:27:25.000000000 +0200
+@@ -15,9 +15,9 @@
+ parts.o
+ 
+ all:
+-	gcc $(CFLAGS) -c $(SRC1)
++	$(CC) $(CFLAGS) -c $(SRC1)
+ 
+-	gcc -o pwavecat   $(OBJECT1) $(LIBRARY)
++	$(CC) $(LDFLAGS) -o pwavecat   $(OBJECT1) $(LIBRARY)
+ 
+ # DEPENDENCIES
+ pwavecat.o : pwavecat.c pwavecat.h pwavecat_proto.h parts.h wave_header.h
+diff -Naur pwavecat-0.4.5.orig/pwavecat.h pwavecat-0.4.5/pwavecat.h
+--- pwavecat-0.4.5.orig/pwavecat.h	2005-10-06 15:52:56.000000000 +0200
++++ pwavecat-0.4.5/pwavecat.h	2007-10-06 16:27:50.000000000 +0200
+@@ -27,7 +27,7 @@
+ 
+ char *input_filename[MAX_FILES];
+ 
+-#define VERSION "0.4.4"
++#define VERSION "0.4.5"
+ 
+ #endif  /* _PWAVECAT_H_ */
+ 
diff --git a/media-sound/pwavecat/metadata.xml b/media-sound/pwavecat/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/pwavecat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/pwavecat/pwavecat-0.4.5.ebuild b/media-sound/pwavecat/pwavecat-0.4.5.ebuild
new file mode 100644
index 000000000000..4f9f719b74aa
--- /dev/null
+++ b/media-sound/pwavecat/pwavecat-0.4.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+IUSE=""
+
+DESCRIPTION="concatenates any number of audio files to stdout"
+HOMEPAGE="http://panteltje.com/panteltje/dvd/"
+SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}.diff" \
+		"${FILESDIR}"/${P}-overflow.patch
+}
+
+src_compile() {
+	append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE	-D_LARGEFILE64_SOURCE
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin pwavecat || die
+	dodoc CHANGES README
+}
diff --git a/media-sound/pympd/Manifest b/media-sound/pympd/Manifest
new file mode 100644
index 000000000000..34225de91ea9
--- /dev/null
+++ b/media-sound/pympd/Manifest
@@ -0,0 +1,6 @@
+AUX pympd-0.08.1-desktop-entry.patch 1412 SHA256 bc96c7dba3353e1008ac92781c4d7d5f105e2f1a161b3071567f5fa564d93900 SHA512 3c6a4bc9f372f879acedb1285f42d2ed939f17751ab2eba0034b604f9b3a5157685afec1a53040a8d5010989a352dc05ec24b3036ad2148d17b619033d889deb WHIRLPOOL adc9244d98fd01ed282fc7c2eb121fdb04e8544ca4f98bfec4fa9b778c0444c68bbf91e4b677719806f24ecf8470bb5494d3b21df3263ec2a8c0f3c38f04897d
+DIST pympd-0.08.1.tar.gz 101120 SHA256 8da3b91c06857c486321a1d2769c035becd90286ce03791aa2058b0a5f620a06 SHA512 199ea794fbcd5d7678c079bcc07613c106fb43a423f05fb7ef624a41580c263ede147ff9c2f2a22f38a4f150f71d9ee99c99c7524278f8e98525f955233641ea WHIRLPOOL 0b23400c9599bbff1a86c83a5d6dfa94dd2272e558fbd14000a32f99d60e6afb4d36451a83949830a1def3d7d70b93cfaeb846b5994f9d96a73b6bace14437f0
+EBUILD pympd-0.08.1-r1.ebuild 1247 SHA256 229dbbf1adcd5624d562fb6f325a67ab3ec0819a68e27960a2d1bd70844e3ac1 SHA512 0dd88c3dd1ac596fa61667caaaf7d46c058ca98342b9c45ad8457a86372cff00fade9c30ea277ef6ce5cbb563b74d14898d00e8deb47f2d700b1a9b6889eedf3 WHIRLPOOL d269e74aac4478fcdbf5f1bd4c3f21602e5e827de089b44c767d16e2d7c1ab3f1d88cd3d7153a63c4469535cb1d03a7d1958fabd5f9108d80d305c9d3a8df1dc
+MISC ChangeLog 3289 SHA256 71011e3dcc66ea2c548fe3e791ed80c4b1c6f0839be7bf7e32a18703e318e20d SHA512 5fa4265d16fd700d9e941d7d1dc328a7951b4c668615806e91d72e1fb4f5dd0790a930cf9423585e16add7b60a251740c8e8c5a17fb56cbdb66d60ef48a3b658 WHIRLPOOL c50e1780c0b26f6dc5f0a777409e6dcaf2cea19d882524b9a2a554fcb7655c90c3e88b2040aa55f8d3030210dd8e6582c38d23e2448538da8fef53bc727b2835
+MISC ChangeLog-2015 4417 SHA256 5c3ac6228b88e834575a6e38a2a4c5a802c9eca7e24814a6581b8f87aa1490f0 SHA512 624930838349736b5fe44dac90f13dc8e599afc6b8469fa988d75f86d0c25e5b16829398bc7462a6bb4f8d932de9e9433575577303b20a554737a62709822dc8 WHIRLPOOL 0c0fa1e03c41cbfccd0a56bf5b4aad1596a04d7375f1b82efd62a30638492aa835c98c01d61efecaeb14f68e399907e256288bcd2cbf5e23cbcc21d1d6589bbd
+MISC metadata.xml 449 SHA256 a2c672fb1bff5a2e694728a4db04722df4984bd40cbec884f88637852dab97f7 SHA512 d3013665b1a81c7ca4f2dad97d0114417120280527fb76ebc1b2f87a982d6a756c148d249bbebe66437089b9116d3bfeb19631d34dcdea6d9f5d077753f40dd4 WHIRLPOOL c6c7f3f6e4d774c9abd6c4870da38cd60bff7d428379049773dc7f733f4f6047a329ff67aa16dae8bf83ef760e0e041ee3bc06370da8b1145c4f47689ff09edc
diff --git a/media-sound/pympd/files/pympd-0.08.1-desktop-entry.patch b/media-sound/pympd/files/pympd-0.08.1-desktop-entry.patch
new file mode 100644
index 000000000000..ac8698c67940
--- /dev/null
+++ b/media-sound/pympd/files/pympd-0.08.1-desktop-entry.patch
@@ -0,0 +1,30 @@
+diff -ur pympd-0.08.1.orig/pympd.desktop pympd-0.08.1/pympd.desktop
+--- pympd-0.08.1.orig/pympd.desktop	2007-05-10 16:11:16.000000000 +0300
++++ pympd-0.08.1/pympd.desktop	2009-05-22 05:20:43.000000000 +0300
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Version=0.06.2
++Version=1.0
+ Type=Application
+-Encoding=UTF-8
+ Name=pympd
+ Comment=pyGTK+ Frontend for MPD
+ TryExec=pympd
+ Exec=pympd
+-Icon=pympd.svg
+-Categories=Application;AudioVideo;Audio;Player;
++Icon=pympd
++Categories=AudioVideo;Audio;Player;
+ Terminal=false
+diff -ur pympd-0.08.1.orig/setup.py pympd-0.08.1/setup.py
+--- pympd-0.08.1.orig/setup.py	2007-05-10 16:11:16.000000000 +0300
++++ pympd-0.08.1/setup.py	2009-05-22 05:24:56.000000000 +0300
+@@ -23,7 +23,7 @@
+         package_dir= {'pympd':'src'},
+         packages=['pympd', 'pympd.modules'],
+         package_data={'pympd.modules': ['trayicon.so']},
+-        data_files=[('share/pympd/glade', glades + ['pympd.svg']), ('share/pympd/plugins', plugins), ('share/pixmaps', ['pympd.svg']), ('share/pympd/', ['pympd.svg']), ('share/applications', ['pympd.desktop']), ('share/pympd/pixmaps',icons) ],
++        data_files=[('share/pympd/glade', glades + ['pympd.svg']), ('share/pympd/plugins', plugins), ('share/icons/hicolor/scalable/apps', ['pympd.svg']), ('share/pympd/', ['pympd.svg']), ('share/applications', ['pympd.desktop']), ('share/pympd/pixmaps',icons) ],
+         
+         scripts = ['pympd']
+      )
diff --git a/media-sound/pympd/metadata.xml b/media-sound/pympd/metadata.xml
new file mode 100644
index 000000000000..0747a6d8aebc
--- /dev/null
+++ b/media-sound/pympd/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <longdescription>
+    pympd is a GTK+ front end client for the music playing daemon MPD
+  </longdescription>
+  <upstream>
+    <remote-id type="sourceforge">pympd</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/pympd/pympd-0.08.1-r1.ebuild b/media-sound/pympd/pympd-0.08.1-r1.ebuild
new file mode 100644
index 000000000000..183544630d50
--- /dev/null
+++ b/media-sound/pympd/pympd-0.08.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="a Rhythmbox-like PyGTK+ client for Music Player Daemon"
+HOMEPAGE="https://sourceforge.net/projects/pympd"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}]
+	gnome-base/libglade:2.0
+	x11-libs/gdk-pixbuf:2[jpeg]
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-desktop-entry.patch )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	python_fix_shebang .
+	sed -i -e 's:FLAGS =:FLAGS +=:' src/modules/tray/Makefile || die
+	sed -i -e 's:\..\/py:/usr/share/pympd/py:g' src/glade/pympd.glade || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr DESTDIR="${D}"
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/qarecord/Manifest b/media-sound/qarecord/Manifest
new file mode 100644
index 000000000000..0e6db53573a9
--- /dev/null
+++ b/media-sound/qarecord/Manifest
@@ -0,0 +1,5 @@
+DIST qarecord-0.5.0.tar.bz2 100173 SHA256 404c72800201e1e005941a078e098368c8f76fce1f3959acf44a90857195666c SHA512 1179d6d5017d243860910a2fdd0d731b3c5262b95998b96e2c13f3b5bd15fc7daf8d7d1c399d0c602ac48b2790153a2d3fcb10e9541afb90a5ec393fb6182460 WHIRLPOOL 134374a4d44238f549a1995b2fce286a3e8f3c9a71fd518f26e45648bcb191b8f0e4a8c9fc5f0b395689283b84c6041954b04325e92f9bc3fbeb9c92915b01a4
+EBUILD qarecord-0.5.0.ebuild 716 SHA256 6eaf047025f2de09073d51a783ea05753618ef36ffa8171d631d85f179a2839c SHA512 ce12ae682791e87ee8761a6b0a33e4684e52c0961bd6c6d417aee13372371596ee6089ec01490811af37a020870feaea98d0e66085c98c61be793dc3e2b9beec WHIRLPOOL 1707e6d2f792872056a494a740ca2883d26520039dc3f1fc0f61976e377fb40b2c80ff07a2cf78154fd1d2aa207b0386b1b69a111036ea13da06a62b69b3dc8a
+MISC ChangeLog 2433 SHA256 7479011f1b571a5dcac26e8f7e2969b8d5e87720ced12d78acd20e81a82c9a08 SHA512 16ae713618564009633d745caee104c4a645446c5d4d126d0a108e1baa1038c7d845db5a3cb5f806a217139bd7c7081503333804e3d15aa4f67d27f50f1df049 WHIRLPOOL ad682e060c82b9e50803153be7c8b3cbbcd7b6c0c22e722e14139df38d0aa2073ce607e21cbaf3f331cd4c09047ba9c58fb3ff26722c49242235e7d8f6db3c30
+MISC ChangeLog-2015 793 SHA256 9976bece2a643b4991aa7f867a7532b429f557addfcf80cf6453893110e61d1a SHA512 1b367791802ce4718eea8ae203e81fad7e73fbb26c5520215e9bbfe0d0da4896b37c5b9efdaec50c80b6397ca7f2f8c8d7b6ae2cd0daba6b1cf093cbe13af1f7 WHIRLPOOL 1243f6050d3ff7342d7ec6b8fdc39cd9e8a73efcc9253423d4cdafe793ec524a48b3702881f9ace504068da9566c2e425376c5013cc7ceaaa462b2922e412a91
+MISC metadata.xml 334 SHA256 cedf85634f2e592ae02fe8074867d136e0f34bfe99b568b46e7e0d2bf7e12623 SHA512 e2486625819d1be0d7f0e638a5bb9312633c085d1d568dc329d1aae35575a8eff40845baab9ac171c0739667becc59332996ed8162db168b6fbf2250f71ded60 WHIRLPOOL 231178c25af8ac6f59249f48f2f89b3ac17598735f88a78fbdec5ec0e9fe65b34844dc815b6ef8c72e676febf48d275e6f7efe9238e76934aca137754545c82a
diff --git a/media-sound/qarecord/metadata.xml b/media-sound/qarecord/metadata.xml
new file mode 100644
index 000000000000..7b3a323df70b
--- /dev/null
+++ b/media-sound/qarecord/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">alsamodular</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/qarecord/qarecord-0.5.0.ebuild b/media-sound/qarecord/qarecord-0.5.0.ebuild
new file mode 100644
index 000000000000..4513c915c884
--- /dev/null
+++ b/media-sound/qarecord/qarecord-0.5.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit flag-o-matic multilib
+
+DESCRIPTION="A simple harddisk recorder writing from an input audio stream to a .wav file"
+HOMEPAGE="http://alsamodular.sourceforge.net/"
+SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-qt/qtgui:4
+	media-sound/jack-audio-connection-kit
+	media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/qt4
+	econf \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-sound/qastools/Manifest b/media-sound/qastools/Manifest
new file mode 100644
index 000000000000..9671549e9e03
--- /dev/null
+++ b/media-sound/qastools/Manifest
@@ -0,0 +1,5 @@
+DIST qastools_0.21.0.tar.xz 206548 SHA256 2380e0ed16d24771404a7e4783b5b14f7be344915a40b5cf16e417ea58699b26 SHA512 17c837ef508a5bf1853f597abd38c3c950914c8cefe98f83a47a911462e1da11f410e3fe3f8426e3f17a3aac8980ee6459f50de2480120813202b342a1e3509b WHIRLPOOL 90c340e296cdf8c5648635a9d043f81f26f4eb4c8263cdf84b351a54b0fabeebb12491d7ccccf634a55468e118ef58586d6580aee939c9e128f15ffeed9b5dfa
+EBUILD qastools-0.21.0.ebuild 676 SHA256 cec4cf770a5714adf0a447945fc4739ce051181f6756b5af6f0ad202427d04e3 SHA512 82527c93e4b524b63344169c22bcf699fe8302afb357bb9b5eeff89e75c8bed8f33a7ad24c8f4a850162f9137a9bd774b04c06cc65a1d170a533c8cd9319ce86 WHIRLPOOL d92b127b40c14f772d1abbc89204f8dda79d58170793a6a3a5cf0f349c6f70c6d840832615ffd1e0789535ae63151c0f8f76d8f807c6c4369a3ec83c709ddac2
+MISC ChangeLog 2943 SHA256 07b6b19944c4052f659109187a272672c6ca7d28b753290d38b6dbeff9f2538c SHA512 7f58678b03eac7d2baaea9e3fb91a751c6936d6ae9b10568df9b163d674e19b7fd67051ae11544a5de898688b06fd419999bb00069b194e7d0cc51f589330939 WHIRLPOOL 35b8c47a54054376f936c0fb7af5febab0b704b57d2752b6dfdf46d955e385493a5394b37a88597d1374ce5cae80a3498a81409abe6bce07417d0c9893804e29
+MISC ChangeLog-2015 1713 SHA256 e5e78d963fd93d408c854a6f3434cddf14a0595de9377bce859bb3d2448041b6 SHA512 9ef5d55d7e2c4bc3ab67beb4349ce5b823e72321e80613c32de871dc5b1b23055c08bc4161551e26fc3d81916c7f15c98b7f412a2188cb0efcf38d8cd91a7d6d WHIRLPOOL 57ed058e26f5f3efe3fbc925bb7ab4f78233d4e2978369a32d087064f88a8479f411fa042380f25c67dd4ffcdf02e4acebc5a7c0b07ea2f6199361a009d0ff0b
+MISC metadata.xml 325 SHA256 7cc662190fc72e558bd65f02fd35bbcaac6a7d716947c926a08a908c7de73a12 SHA512 311b842ee0ea6099f1beea4753e44e6af6ba70ded6c54f6321b244c5366b47071ac80a0c7012b1473e0d5afc47b44f23665630adc36b96fe1f55bfad753b2276 WHIRLPOOL 8fcf0b257ae31d06ba39588eb39a78e8feb0338bfbcd9fad279435c00f528cc7b8496063aa3f91cad22f3fb8beea19cc9df3f499dbf640547370a7ebe085a155
diff --git a/media-sound/qastools/metadata.xml b/media-sound/qastools/metadata.xml
new file mode 100644
index 000000000000..a35e89ccdeee
--- /dev/null
+++ b/media-sound/qastools/metadata.xml
@@ -0,0 +1,11 @@
+<?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">qastools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/qastools/qastools-0.21.0.ebuild b/media-sound/qastools/qastools-0.21.0.ebuild
new file mode 100644
index 000000000000..52bc9b5486cf
--- /dev/null
+++ b/media-sound/qastools/qastools-0.21.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Qt5 GUI ALSA tools: mixer, configuration browser"
+HOMEPAGE="http://xwmw.org/qastools/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	virtual/libudev:=
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local mycmakeargs=( -DSKIP_LICENSE_INSTALL=TRUE )
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
new file mode 100644
index 000000000000..1578d1d1d9a1
--- /dev/null
+++ b/media-sound/qjackctl/Manifest
@@ -0,0 +1,5 @@
+DIST qjackctl-0.4.5.tar.gz 832932 SHA256 c50da569ec8466ac6cc72c65e2d8212eb9c40149daed0a10fb7795ff9ddc4ab7 SHA512 251b7275fd6cb13c91420b7c11d5d2a1d9b7c5b11b78a4b5ba41955b4bbaa3c4f4721123f3375c2ce4a243ee9defc69c982cc93796e17e01e096e1228c4fe5fd WHIRLPOOL 7b84829668930f39d01b27998090f46ba5f724c2f3e78a75ccd76e5b9906df55a7be2a08c615e9f57f78b70641af3b6e5ca86c2945e0af7b6d1b883a90ce2bcb
+EBUILD qjackctl-0.4.5.ebuild 950 SHA256 434569b553d9b16a65ce21e88a8d27ac15a2d965ffc381c392561f43166af129 SHA512 09a0ecfb94b74741e3b88361394033ad14b069b549eda269d8dc045d84d5ec0173a4b48feade3b31b595c0fbb4278b7ad2d2b33f07d0b5cc3b1c551ebd0708c1 WHIRLPOOL d068ed16255d7260563541be170c0e9eb8303ca5d3bfe25f32fcab164902e713d10080a670f0571f1b3a4be6d02fcffb654026d03aed03d36edc9b823accd4f8
+MISC ChangeLog 5091 SHA256 58c41c8e9071743e81c8f7ab26337dcabb169480c8cc21703e6c8e82f644f7eb SHA512 ff34e15eb34209e1c50dba9900476ae08a11fdb1dc6ed8c6e2176f091631f8c096270604f30399c4a97e37e84e072fde6774fcb10c5d61c8532ad5bd5ddfc8f9 WHIRLPOOL e18243df879d2dc0c366d95ac616b1aee3f466b00165358841db4f978996a15625add6250ce67282cfb265cab47d006b0aa2fb46ff5fe383a36bab89823ae6c0
+MISC ChangeLog-2015 11570 SHA256 ef02478d3ec628698d152205849c677b09d28006d4491f65eeb3228d215e87d7 SHA512 482737c22f379f098a8673a9fbfb78194c666054afdaea77e236dd964c6e4adef4b2225ad92aef372bd0b9952ca959229ea3cef95637dcb74c23331a209535d2 WHIRLPOOL 3b8f7671ffb7ce2585b6f0db8794eb283c320cf4d26ecde7827bddc65cd65bee7bb4f28c621a0951ea2864c191e16ef4ea530863d84567d350c420f6ec6d9783
+MISC metadata.xml 337 SHA256 7ee3435cc37151307dbfbd3852cceeab528abc51f1a5c5c4889cc9a3d9de53db SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9 WHIRLPOOL 73f726dd37b8a1924dd4a3dd448694039445694cdef72fcaee4d51a854df1127e220abfffd8dd591ab8e13c0a8ec7c25e7ba78c632f582ef452e22d9a79c405f
diff --git a/media-sound/qjackctl/metadata.xml b/media-sound/qjackctl/metadata.xml
new file mode 100644
index 000000000000..b61555de1db3
--- /dev/null
+++ b/media-sound/qjackctl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">qjackctl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/qjackctl/qjackctl-0.4.5.ebuild b/media-sound/qjackctl/qjackctl-0.4.5.ebuild
new file mode 100644
index 000000000000..05a40eed7807
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.4.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="http://qjackctl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="alsa dbus debug portaudio"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		--with-qt5="$(qt5_get_bindir)/.." \
+		$(use_enable alsa alsa-seq) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable portaudio)
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_compile() {
+	emake -f ${PN}.mak
+}
diff --git a/media-sound/qmidiarp/Manifest b/media-sound/qmidiarp/Manifest
new file mode 100644
index 000000000000..8233da033ba3
--- /dev/null
+++ b/media-sound/qmidiarp/Manifest
@@ -0,0 +1,7 @@
+DIST qmidiarp-0.6.3.tar.bz2 541646 SHA256 10f5f4784cb3d0e131978f455bff57bf82fae71956a923d83a3809ea92b4f07f SHA512 0dbb916e4d27cf03924ce5c76928d01afe677331ec9b2a1ea7ca0c06725ead012458956d254e811908f9c351b00bf309bdf806b0ff68cdd40d129d73dab683c9 WHIRLPOOL 823d0130bd90e45132ba6d423b11c4713225208353382df9ae0824d55e2d439e566a30d9c2e5184263b956cf5fa1cda301cb4449fde0a950ca6961f7791c9bcf
+DIST qmidiarp-0.6.4.tar.bz2 537804 SHA256 1d96536927ce71691ae6fe779f627b277cfa0373341669ec9a06b92715da6ebe SHA512 06f3dc52c6673f452af4d5c5f4d2efc50fbe16b8fe792cb9d115f9efa124224e0131e763d31ee60cee68b78d952061e69976a09fa3118b23362ea3cea76260d0 WHIRLPOOL e04e64725e1efb4e772b62f6c030a61370f9447f61989fb5615dfee778f46c5036231f97f0518fa6750278875cd3003d3ebf667736fa026a550d8a561ed0f74b
+EBUILD qmidiarp-0.6.3-r1.ebuild 809 SHA256 887dac783bf69dcf8b1c62ee004494bff3db3fa6a47187324a4128323f8b9327 SHA512 0666a61d00394ebb68a607ab6b48dd2ccc2fbecc06eaf7a89a262991ff8f2a6d87b6548a60895e64d9dc0359b62fc96d5b7b884d513276f827b689991358b5e2 WHIRLPOOL 5cd63c3709044eda28cc855afffc5e924abc06bd7d9e49f79586263db550acb95e45a4db9a83d616248fca916a6448a8bab59018aff7137de973e22fc4c75e86
+EBUILD qmidiarp-0.6.4-r1.ebuild 809 SHA256 2f38edb4736afa87b60de58a93deb3b9f92110e83bd5ec67532b445b74b8b74c SHA512 2dcf33ab68419ef2afe2dd170169a6d3f73ac088ca43bd1c5b6bbd7a16c2a73a3d31122fa961e5df2ef6bcc8101a1d60952f660754c48e0b3dd75e54d824016b WHIRLPOOL bdd10c2fc320cf0d4d27e7c7809d26a9376f36ca43cbde7bc9c71e4354cd04f616af18b935ee762ea6b55aad38b0fc1bd76afed367a75057e81f4e7bafb0ea71
+MISC ChangeLog 3022 SHA256 aad5911342881d63994a56d8503263ad32284ad5721ab9cb844b7819f0223af9 SHA512 b22d66e82cb0b7bf3f294fb2a01ab102411837ca26b836ee1c10e2ff8cda3d9587a9f68eee8a4394c0b085dce342d66fe76d7b71224743d4bec918f175dff78c WHIRLPOOL 29c8d215fdf35c7168719b03db34ef2e0870d52f81390b1ae79571565a887b039e5f75580b882a02147409581e6e367a349a0f9aeaeb4cebca1909e62f8f60f2
+MISC ChangeLog-2015 777 SHA256 a57a18e0efc049a21a2adbddfdc1f11c64dc0253fe8da94f29b5bbdde82bb953 SHA512 6706645a52450dc6409cc4d71bd992d8b6ebff3677209adbbe5ade4b5da601354122a710f51ab38541a7ad4434f3070740321cd16015598f3d3f95010ab38c0a WHIRLPOOL c6148acce7ad9f18a464edbd80aecc5ba3860737f3ad3366875ef64ff89a804181e3a56462837f4d3f8aa30ce5e699959af062c95860e3937449a57eaf79318e
+MISC metadata.xml 408 SHA256 882575d45b3a83c9c7393e08b891ecdabdc79bfa16d671c2820652bba8f9b12f SHA512 cf1e13b22bdedf6b677d3aee84e5f0aed7a295dc641587c2829b0a95b15c775fcf99651452db1d04b3a8999fd907963c874fe13400c81d528716fcd06fa10f87 WHIRLPOOL 3765ba69ed731a861c689e193eece2f34beb27543e197799a85b4dc44aa67162348f5386a6ec6cbddd901fb1f5293a059c813662be169cd1bf156312a3b45289
diff --git a/media-sound/qmidiarp/metadata.xml b/media-sound/qmidiarp/metadata.xml
new file mode 100644
index 000000000000..73b19701a760
--- /dev/null
+++ b/media-sound/qmidiarp/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+	<upstream>
+		<remote-id type="sourceforge">qmidiarp</remote-id>
+	</upstream>
+  <use>
+    <flag name="lv2">Enables Ladspa V2 plugins.</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/qmidiarp/qmidiarp-0.6.3-r1.ebuild b/media-sound/qmidiarp/qmidiarp-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..e203c96ce9c1
--- /dev/null
+++ b/media-sound/qmidiarp/qmidiarp-0.6.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils
+
+DESCRIPTION="An arpeggiator, sequencer and MIDI LFO for ALSA"
+HOMEPAGE="http://qmidiarp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls lv2 osc"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	virtual/jack
+	lv2? ( media-libs/lv2 )
+	osc? ( media-libs/liblo )"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/qttranslations:5 )
+	virtual/pkgconfig"
+
+src_configure() {
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	append-cxxflags -std=c++11
+
+	econf \
+		--enable-qt5 \
+		$(use_enable lv2 lv2plugins) \
+		$(use_enable nls translations) \
+		$(use_enable osc nsm)
+}
diff --git a/media-sound/qmidiarp/qmidiarp-0.6.4-r1.ebuild b/media-sound/qmidiarp/qmidiarp-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..14029ae8b0bd
--- /dev/null
+++ b/media-sound/qmidiarp/qmidiarp-0.6.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils
+
+DESCRIPTION="An arpeggiator, sequencer and MIDI LFO for ALSA"
+HOMEPAGE="http://qmidiarp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls lv2 osc"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	virtual/jack
+	lv2? ( media-libs/lv2 )
+	osc? ( media-libs/liblo )"
+DEPEND="${RDEPEND}
+	nls? ( dev-qt/qttranslations:5 )
+	virtual/pkgconfig"
+
+src_configure() {
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	append-cxxflags -std=c++11
+
+	econf \
+		--enable-qt5 \
+		$(use_enable lv2 lv2plugins) \
+		$(use_enable nls translations) \
+		$(use_enable osc nsm)
+}
diff --git a/media-sound/qmidiroute/Manifest b/media-sound/qmidiroute/Manifest
new file mode 100644
index 000000000000..62fa425b866d
--- /dev/null
+++ b/media-sound/qmidiroute/Manifest
@@ -0,0 +1,8 @@
+AUX qmidiroute-0.4.0-drop-qtopengl.patch 1031 SHA256 a301886ff273125024f1c93696c28d15e86cc37b5d2c67912832d3f217bedf84 SHA512 e7fb53f481818912646502fa84ab32e2f115443f662f9a3442aa63f04794847d4be7973e4e5d2d7d718825ca5b5bf9c099d1ffecd8e90a0adbd7ba7edef1a501 WHIRLPOOL 16a562dc3f6ffb7e491e55803cd56ca112e318b263145485ad0ecc1edf31690e9950798c28aadf11856e6e1e4b69e0d7aeea7719be72bb6394ec866d168a6c79
+DIST qmidiroute-0.3.0.tar.bz2 103285 SHA256 238ab3af3fdfaccab1366ecfec3d203d29e459b39f1ea579a3929b8035e19479 SHA512 34f626573f02803267b50a0e85b4343dcccfb28ef7ad9655a0234e25f2b6a5bdf6bd61e3d988e086f1d29e46ed64d644b4c6d5c115ec8d5235aa583385c07f94 WHIRLPOOL d7502e4cabec519f932d1691a0dcf7c4e9ff9cf0070b4a63bc7598c570fd4eac3b3e88ea0e0057512789919a82c456f445eb0a637f5626fae0946604ebc29194
+DIST qmidiroute-0.4.0.tar.bz2 121625 SHA256 09c6fc7c3be7c7a3dd86d1b4a310c62c1c3ec6040cb77e76fa833efad6bd61a7 SHA512 b3b5ded66c0e226848a3181d67f61ea9e4e76c253400dac63592e4f462f4cf06760b3f2d24a33bbc836f4fe29950a4d702adc048ad80c9b6d673ade8c1a88342 WHIRLPOOL 9a52dbb75cdeb273eb8a5650ac150d3d17a074a0790df11905068263925d78c69c6ed09de6319f404180797483e6efabacbc2c79092fcf8d7d2ef1cdcf1889c6
+EBUILD qmidiroute-0.3.0.ebuild 577 SHA256 07c91778b05d63e21b10738c19f226ddce111351c36fe698ceb20510702eee7b SHA512 7d48ea547c0e10b8723ccf692930097aba4f03141e0b6383fbdedb62937baa50282a0c987446c9357c5727d162c0dadc2006ab80ecdd34b0b43a8b3663951500 WHIRLPOOL 9b685123c9842e27685b4ba8144141e48f131dc9e9679b8fb11de51a984b20d0959a72cc196c248d947d7f093a7c738accfa637ccf0c370a40a2e3ac4593cba4
+EBUILD qmidiroute-0.4.0.ebuild 714 SHA256 b0de9f0bff6b2167d4807b33250568e5f7833c7e2502047065cd42d79b39ae4a SHA512 2256a7e0fa84fceea71dfbb55000cfee7733b716f6a8444c78e05208732d61906cf9ce56717313d5bb2224aced4900106b308a8c653545b8775868b7e98ebb7f WHIRLPOOL af345cbed7026f5c97b89ea615a495306511a04af719bfd169414639b825be5eee2b1328e26df65c938977892c39d46c7f2c1a4d7c9cc94f6b87192052266451
+MISC ChangeLog 2439 SHA256 479c958aa71c3a3f9dca45f559ef390cb3dd1fb2fe5ccdfedb7313b0a44aafb7 SHA512 dbeca9308fe94340946cde4dfb41eea00e11595da34719fc2015c9f4bbe0c371ac07f98deffa722d9ed92a587f7fc2b7be7d3cce002366076f18a3e40e094364 WHIRLPOOL 1aca967b8e4454a0af6d895ac167a681ad02a45b43876d31821778b868aa1074e48005292f4d7c8a729aa501cacdc28f3ce3a46ac5a793c10444f4045c365392
+MISC ChangeLog-2015 1045 SHA256 74c0c668c2b4298312c3bcfb26007d48a82a88282e3ffe87fc260ca2a5f94089 SHA512 b72198d4329c84de1f65d5c37499eeb25c7653b0ba4d5b00ca1119201e6fb3fc4db61acf41f3486d343e73e0b39283699379e0e264aa102fc78e46b3e677d15b WHIRLPOOL 45734f31dfe267720ed7431682483905377c6c08cdb0f9a83a175e6dc7e34a537e809c754d31f17a49c9299ccc3cd599559b8196971a6d89f993d0127bce85f9
+MISC metadata.xml 334 SHA256 cedf85634f2e592ae02fe8074867d136e0f34bfe99b568b46e7e0d2bf7e12623 SHA512 e2486625819d1be0d7f0e638a5bb9312633c085d1d568dc329d1aae35575a8eff40845baab9ac171c0739667becc59332996ed8162db168b6fbf2250f71ded60 WHIRLPOOL 231178c25af8ac6f59249f48f2f89b3ac17598735f88a78fbdec5ec0e9fe65b34844dc815b6ef8c72e676febf48d275e6f7efe9238e76934aca137754545c82a
diff --git a/media-sound/qmidiroute/files/qmidiroute-0.4.0-drop-qtopengl.patch b/media-sound/qmidiroute/files/qmidiroute-0.4.0-drop-qtopengl.patch
new file mode 100644
index 000000000000..3dcd67b461a9
--- /dev/null
+++ b/media-sound/qmidiroute/files/qmidiroute-0.4.0-drop-qtopengl.patch
@@ -0,0 +1,21 @@
+# Drop unused and silent dependency on QtOpenGL. Fixes #623414.
+--- qmidiroute-0.4.0.orig/configure.ac
++++ qmidiroute-0.4.0/configure.ac
+@@ -29,7 +29,7 @@
+   dnl Check needed because in some cases the QtGui includedir
+   dnl doesn't contain the subsystem dir.
+   QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir QtGui`
+-  QT_CXXFLAGS=`$PKG_CONFIG --cflags QtCore QtGui QtOpenGL`
++  QT_CXXFLAGS=`$PKG_CONFIG --cflags QtCore QtGui`
+   EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
+   AC_CHECK_FILE([$QT_INCLUDE_DIR/QWidget],
+     AC_MSG_NOTICE([No extra QT_INCLUDE_DIR needed]),
+@@ -58,7 +58,7 @@
+   dnl Check needed because in some cases the QtGui includedir
+   dnl doesn't contain the subsystem dir.
+   QT_INCLUDE_DIR=`$PKG_CONFIG --variable=includedir Qt5Gui`
+-  QT_CXXFLAGS=`$PKG_CONFIG --cflags Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets`
++  QT_CXXFLAGS=`$PKG_CONFIG --cflags Qt5Core Qt5Gui Qt5Widgets`
+   QT_CXXFLAGS="$QT_CXXFLAGS -fPIC"
+   EXTRA_QT_INCLUDE_DIR="$QT_INCLUDE_DIR/Qt"
+   AC_CHECK_FILE([$QT_INCLUDE_DIR/QtWidgets/QWidget],
diff --git a/media-sound/qmidiroute/metadata.xml b/media-sound/qmidiroute/metadata.xml
new file mode 100644
index 000000000000..7b3a323df70b
--- /dev/null
+++ b/media-sound/qmidiroute/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">alsamodular</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/qmidiroute/qmidiroute-0.3.0.ebuild b/media-sound/qmidiroute/qmidiroute-0.3.0.ebuild
new file mode 100644
index 000000000000..ee6752b3831b
--- /dev/null
+++ b/media-sound/qmidiroute/qmidiroute-0.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit flag-o-matic multilib
+
+DESCRIPTION="QMidiRoute is a filter/router for MIDI events"
+HOMEPAGE="http://alsamodular.sourceforge.net"
+SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:4
+	media-libs/alsa-lib"
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/qt4
+	econf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild b/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
new file mode 100644
index 000000000000..782410c6e9e3
--- /dev/null
+++ b/media-sound/qmidiroute/qmidiroute-0.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic qmake-utils
+
+DESCRIPTION="QMidiRoute is a filter/router for MIDI events"
+HOMEPAGE="http://alsamodular.sourceforge.net"
+SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-drop-qtopengl.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags '-std=c++11'
+	export PATH="$(qt5_get_bindir):${PATH}"
+	econf --enable-qt5
+}
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
new file mode 100644
index 000000000000..9f0c2d3d9104
--- /dev/null
+++ b/media-sound/qmmp/Manifest
@@ -0,0 +1,14 @@
+DIST qmmp-0.10.10.tar.bz2 1346679 SHA256 7f8982a1a4bb216cd4c8d5d5599b24a16c3f2bc1faf22c1ab40bdaf6c6ea5cc0 SHA512 427419bd4b1baba0d8f118ba98d66feb5a775f27a46c5766b4fe7345b0d9231061287b7bbb8ccea2c155f9ae26e8c7c0fc078c25587d24adfc303279ea3ea48f WHIRLPOOL f3d1d6a4b46ef5057395305ba92de64c8227b2aef584f8558605756fa83db5af44ccd099ef6061874f74cd9177ef8c0a8d26114bf5b4e5c8a7f6d78079358596
+DIST qmmp-0.10.9.tar.bz2 1342488 SHA256 e9481ca8d42dd3e91da1c49273e2bbe5f86f02e219b90438135afbb0f0b94442 SHA512 c7a55e08de550a1830108980e53256eb7622554edd97aab0fc0d72378f973e19eef2ea1b35e28c57c67f22b421da0622ce3006367ad85d2f18de53d7473ae73a WHIRLPOOL 47b0e45b55512609da3585e6eb34fb57acfedb69ff796e4313049df770a065d486b69c75290b9c3838100fc9416a12517948b709d9e434b8fad61c3af3bda7d2
+DIST qmmp-1.1.10.tar.bz2 1142444 SHA256 1e5781bf65b3a27dd5e21349ac007464e67861dda99f8a0206984687881e0b9a SHA512 f9945ea428265c900751dd692e25eb0618e162e621bda7ab5f0f77d504aee66fa06390edca0155d18ca041706f461dcb9bb20678eaf32250b766e0f593915356 WHIRLPOOL 1beaa2339fa8b86c79876774a3da12a8a5a62bf729e4fd6bd6896aa225bc573dc2272cc7438b257fe6567c8c85f38a301f2740eef788322e1d872404e5db6c0c
+DIST qmmp-1.1.7.tar.bz2 1135005 SHA256 464f79d9a54e6456c5abcb570d7f062e48d3eaa3d60ad2b09c58bc62af5b87a7 SHA512 058187d34b848c0917077a167bcb52c63e39b5150409295ea658484d99fcd5582f7871979d3d3eea40aa97f0d9bf2a2d72ae721b827bcc0366b1bbc652aa3a72 WHIRLPOOL 1c1f22a22329619f63a1a24590b41b352d398bb4653117c81918b2e940e887c6aaa06f178674a97893de7418673022bdc800a09643d3fb38096f6dc78b7774c3
+DIST qmmp-1.1.9.tar.bz2 1136753 SHA256 e25bfc0fb4182793df81c6ec222d553183ccd3f61e5919d217c9c5d788f3df2e SHA512 54ff71626b2ef778efef84fa56a50b483d6e9d14f1f53be2f1b01223a0f23db04fcc734a371eb22985404d9e15839b76c28d0909bf110c286ebbdf4ae27d1cd9 WHIRLPOOL 5fed1f1d3971887e3922d581e9805966c6715d834120218e013b5bb8b3e166ef89e21af6676ac642713370cfc54f6b0d62a47e5fa91445361cc5a59c749d0d1a
+EBUILD qmmp-0.10.10.ebuild 3602 SHA256 9889e9f252befc7f99b77fb197cf92ee0e35e4ea2ca96404a00f668cebbfd6ec SHA512 a42eb0f109f8ed8bbb944e7a514a1e03a9d3b7de806426d56d477092f01afd606f8ce82862e3ebc4957e57dea86f1e4c981fc16c4bb6d0d849c1471ef7081c66 WHIRLPOOL 1bd8b6aebaac55b1715c50ea30653144332e286f0bb429cd48f03954e33f0104f5f48151efbef9c2c55d3265b6912b886adba3011bc39a591c6f02687fdfec83
+EBUILD qmmp-0.10.9.ebuild 3602 SHA256 9889e9f252befc7f99b77fb197cf92ee0e35e4ea2ca96404a00f668cebbfd6ec SHA512 a42eb0f109f8ed8bbb944e7a514a1e03a9d3b7de806426d56d477092f01afd606f8ce82862e3ebc4957e57dea86f1e4c981fc16c4bb6d0d849c1471ef7081c66 WHIRLPOOL 1bd8b6aebaac55b1715c50ea30653144332e286f0bb429cd48f03954e33f0104f5f48151efbef9c2c55d3265b6912b886adba3011bc39a591c6f02687fdfec83
+EBUILD qmmp-1.1.10.ebuild 3858 SHA256 b27e5dd787378b86732b902aa1e37fa0f2bda0ab39e3fee24c55af95230dd92d SHA512 4e207516f6ceab473fcac12699f8795916da85380ea933612cf16f632d2a815702ac598a260f31fe26a07c3aed96fabbb24a996b0501821e35c7866a8f6fcc1f WHIRLPOOL 0bab7edc488bf7695b2616f1830552959cbbc4ec0c59725f82d5430bd63fbdef6a63f9c2fd552b1230d6f932381fa0872e8e90e1b79eab09eb2d66ae6b531c55
+EBUILD qmmp-1.1.7-r1.ebuild 3856 SHA256 5dc5790f785a0c1444e58f5a57e785ad7f9a9a2faf64132a36bc63a16ce6ddaa SHA512 e0922330692482d5ae933f27cb8f12201412cd97f717601bf925eed638412ba70463eba3afecb17d011b5040f1d30f69eb07b8bef1d0599f2341574050434aba WHIRLPOOL 760702483d215e8ee9153096358600b309951d0a0f66c5b25b3ba1cbad6b1a470e1665f5f1e70c3c5fc2aaf96dde8087d6637540be5992fd5dcb117c9f6965bf
+EBUILD qmmp-1.1.9.ebuild 3858 SHA256 b27e5dd787378b86732b902aa1e37fa0f2bda0ab39e3fee24c55af95230dd92d SHA512 4e207516f6ceab473fcac12699f8795916da85380ea933612cf16f632d2a815702ac598a260f31fe26a07c3aed96fabbb24a996b0501821e35c7866a8f6fcc1f WHIRLPOOL 0bab7edc488bf7695b2616f1830552959cbbc4ec0c59725f82d5430bd63fbdef6a63f9c2fd552b1230d6f932381fa0872e8e90e1b79eab09eb2d66ae6b531c55
+EBUILD qmmp-9999.ebuild 3858 SHA256 b27e5dd787378b86732b902aa1e37fa0f2bda0ab39e3fee24c55af95230dd92d SHA512 4e207516f6ceab473fcac12699f8795916da85380ea933612cf16f632d2a815702ac598a260f31fe26a07c3aed96fabbb24a996b0501821e35c7866a8f6fcc1f WHIRLPOOL 0bab7edc488bf7695b2616f1830552959cbbc4ec0c59725f82d5430bd63fbdef6a63f9c2fd552b1230d6f932381fa0872e8e90e1b79eab09eb2d66ae6b531c55
+MISC ChangeLog 11794 SHA256 602bd5ff0c4fead6e2ef8ad3ae1bb93e63e3b9fc314ac99ac28e86e3c893d185 SHA512 52fa69e0eeab93580764aca9582d8fc70bb9bd9eaa7d82fbf4b4e0f68b9bb2d4c9cff29230bc34dbad9fa48b4f8c6bf4ad585d92470ebff2c7467232fce5ec8c WHIRLPOOL 9e76ba77ac78fd4820fb2f77b662f6a0d50ad894ebfbdb608821bc0b67b5d42e728df4135c3f876144553dd5359e22936b1b494326844489c1a83c4183375e2a
+MISC ChangeLog-2015 18869 SHA256 c6b9b2d4ab726c2c37d4f47a5de3564be303d73c9de6e0eedccf8536ad93b7be SHA512 6d39df9af1d2ce8427c0f0a1c506a070942cc25a5fbeb08431b41d0aaee8e0d5fb6c0a2aa2bc8b526909253079179b5b2600d6bd8deda38c921d174349525fb8 WHIRLPOOL 80b378e67e041dfc1333e5d57ccd45925b37e96582620753756f86164b8d1708b3db872c70a72722d4d3252c8f4d8dc7c4257d96ebf0587f7373981117c7687a
+MISC metadata.xml 1709 SHA256 e307cf82f74d4405f33cafc3d1dcfc14c386e4fbc06b9190ffdf7f70a71391b3 SHA512 256eb3be8f8a455a54a93c72975b5aec45700258913c9f92d3d4098ee64027bca2862ff9371649a5f429a42ae838f9955354836f4fc002606959ae18bfe65016 WHIRLPOOL dd36676c92da680e29ebf890a9f5b8e9f26223565dde4e817c6e8c21d4b1756168e491a30c18b15fdaaf97a473466ea91061a2ddfa9508926b4eb5465b562241
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
new file mode 100644
index 000000000000..472f2398ac72
--- /dev/null
+++ b/media-sound/qmmp/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+		</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="analyzer">Enable visual analyzer</flag>
+		<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
+		<flag name="cover">Enable album cover support</flag>
+		<flag name="crossfade">Enable crossfade effect when switching tracks</flag>
+		<flag name="cue">enable CUE sheet parsing</flag>
+		<flag name="dbus">Enable DBus notifiications and MPRIS support</flag>
+		<flag name="enca">Detects the character encoding automatically</flag>
+		<flag name="game">Enable Game music support</flag>
+		<flag name="gnome">Enable Gnome hotkey support (requires Qt5DBus)</flag>
+		<flag name="lyrics">Fetch track lyrics from the web</flag>
+		<flag name="midi">Enable midi support using wildmidi library</flag>
+		<flag name="notifier">Enable qmmps' notifier system</flag>
+		<flag name="opus">Enable the opus plugin</flag>
+		<flag name="projectm">Enable projectm music visualization plugin</flag>
+		<flag name="qsui">Enable QMMP simple UI</flag>
+		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
+		<flag name="scrobbler">Enable audioscrobbler/last.fm support</flag>
+		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
+		<flag name="soxr">Use the SoX resampling library</flag>
+		<flag name="stereo">Enable stereo effect</flag>
+		<flag name="tray">Build tray icon</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/qmmp/qmmp-0.10.10.ebuild b/media-sound/qmmp/qmmp-0.10.10.ebuild
new file mode 100644
index 000000000000..8cae55c54f91
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.10.10.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	ESVN_REPO_URI="https://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp/"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome
+jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui scrobbler sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtmultimedia:4
+	media-libs/taglib
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio
+		dev-libs/libcdio-paranoia
+	)
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:4 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtopengl:4
+		media-libs/libprojectm
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FFMPEG_LEGACY=OFF
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_UDISKS=OFF
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-0.10.9.ebuild b/media-sound/qmmp/qmmp-0.10.9.ebuild
new file mode 100644
index 000000000000..8cae55c54f91
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.10.9.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	ESVN_REPO_URI="https://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp/"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome
+jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui scrobbler sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtmultimedia:4
+	media-libs/taglib
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio
+		dev-libs/libcdio-paranoia
+	)
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:4 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtopengl:4
+		media-libs/libprojectm
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FFMPEG_LEGACY=OFF
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_UDISKS=OFF
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-1.1.10.ebuild b/media-sound/qmmp/qmmp-1.1.10.ebuild
new file mode 100644
index 000000000000..846c740edb76
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.1.10.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.1"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome
+jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio
+		dev-libs/libcdio-paranoia
+	)
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-1.1.7-r1.ebuild b/media-sound/qmmp/qmmp-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..a73c1c46206f
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.1.7-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="amd64 x86"
+else
+	QMMP_DEV_BRANCH="1.1"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome
+jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio
+		dev-libs/libcdio-paranoia
+	)
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-1.1.9.ebuild b/media-sound/qmmp/qmmp-1.1.9.ebuild
new file mode 100644
index 000000000000..846c740edb76
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.1.9.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.1"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome
+jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio
+		dev-libs/libcdio-paranoia
+	)
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
new file mode 100644
index 000000000000..846c740edb76
--- /dev/null
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.1"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game gnome
+jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="gnome? ( dbus ) udisks? ( dbus )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio
+		dev-libs/libcdio-paranoia
+	)
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qmpdclient/Manifest b/media-sound/qmpdclient/Manifest
new file mode 100644
index 000000000000..5b22240c2d01
--- /dev/null
+++ b/media-sound/qmpdclient/Manifest
@@ -0,0 +1,6 @@
+AUX qmpdclient-1.2.2-qt48.patch 1484 SHA256 36cbccd5058fcf8a4f23d5e49f8638bf173465fd6c3bf39c00db617abb5270f3 SHA512 5674b1de888f9ed03eb83be471b2f03ccf7a5e463c9c0056d1b276f7ed7bec73a3d4340131cb10a03f8f5cbbfe0b40694c213b6a3d8e90bb6da96c829ea03394 WHIRLPOOL a0ab1b846f1286f7a3c969d528bc0b86a2401db6e03c42774802cebfdb046b1efe52f866971c0257aa30ed23f51af38afd1afce0eda56ff59a5dfa5f9c4773c1
+DIST qmpdclient-1.2.2.tar.bz2 271565 SHA256 ed65705eaae8fb10fdce34ce20e010757a87423c2874479e1466e4368a866289 SHA512 2ae8a2235640c0c644f32290a9d39bcef6f041bb7eca1d269b54433975578c31067f2e5a28d9d679c229075962523b6b20e779b1ed23af7c47129ff4b63e5735 WHIRLPOOL e52e5b99892cc7b475f1c1b26a514b8125d704c83fef02b140307536acad45a94bdc4fe59adbec289d379cd599f4748452f17c5345b166ab443defbfcfeb0460
+EBUILD qmpdclient-1.2.2-r3.ebuild 892 SHA256 48dd6d75f6e78c241997488e19ece826d82ee3ab262512745f3c601a0c2d38c6 SHA512 7a2d64bae3e1566685581fbda231d8e52c650f7eb8a122f7075becfaf8f7b58910cf89f688ea2568ce8540a65d9fcb1ad03a3d06ae1e84a6c96fe1c5216bc60e WHIRLPOOL 198e3604138ef36d8b276c83a0fa8d3554a28148a5d2c67a774839f37ad2fb57e47f12fbb25d98c0edcf9c41bffa4d473ee0e409f59be648bfe792412487a199
+MISC ChangeLog 2604 SHA256 bb4d6ffaab43847f39ae761343560a38bcc17143176ca1f89757e3b0f81de948 SHA512 bbca8b54885bcbec0561de4b5bdc0a9a083e5d7205264ed5d03ba4c3b1be02b4139ddb26c92f003a88f7a07e9563153d597a3c1c74a6c75d70119c6af0ccd59e WHIRLPOOL 9c91762b3047a9ca4e80d4c13f6d9dc78e0111d1072c8d043239b5b4b40f7364a3f6be63c1ae3a4522ce047da859c03c9f9b3cdad6fc95039309a198d0ec617b
+MISC ChangeLog-2015 14452 SHA256 f36fffe04088bca82e078052d8f63fb269ed1607efe51a6e0f39e71962e26188 SHA512 7c75fe9185c0b8787d3b1cb2a309a1928ee0c86b967ded482aced26dda628a74c739284317b9de1aa630bea062328cee0a7de64578c2209b1af233e46a457acd WHIRLPOOL 933ae6a0bb8817d37fd5285be0baea86f9227958133a5d198fa2c936753cbc360d342d04ee05662eb2a9b3e4cca3c625b63ccc83978c7d47a8cc7f09a2986137
+MISC metadata.xml 352 SHA256 122cdcd98a7afc160784dd295d9770c078f830fb9ba30171a0ac30b737554688 SHA512 0344118bc0ba6bb6997dc9476d5f8ab3dd8e53d09767c0e4bf050dcc394d11810e6b437fb114c6f3e83a7cabcd7ef16852d34012390126328773159b51a2a5a2 WHIRLPOOL b447e1b12215f86acf4d263519292bbcf348fc5e6671f36f5c5d702a78996008f6dd0ee0accfacd4356e944ca8b91d954d3e9105698be1cf97aee307765101b6
diff --git a/media-sound/qmpdclient/files/qmpdclient-1.2.2-qt48.patch b/media-sound/qmpdclient/files/qmpdclient-1.2.2-qt48.patch
new file mode 100644
index 000000000000..2eac669c092c
--- /dev/null
+++ b/media-sound/qmpdclient/files/qmpdclient-1.2.2-qt48.patch
@@ -0,0 +1,40 @@
+From 20edef54b109882632f58549d181123b9985d65b Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Fri, 1 Jun 2012 21:54:10 +1200
+Subject: [PATCH] First attempt at fixing lastfm scrobbling
+
+---
+ src/lastfmsubmitter.cpp |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/lastfmsubmitter.cpp b/src/lastfmsubmitter.cpp
+index cff94bc..a9b6ea9 100644
+--- a/src/lastfmsubmitter.cpp
++++ b/src/lastfmsubmitter.cpp
+@@ -112,7 +112,10 @@ void LastFmSubmitter::scrobbleNp(MPDSong & s) {
+ 	data += QString("l=%1&").arg(s.secs() >0 ? QString::number(s.secs()) : "100");
+ 	data += QString("n=%1").arg(QString(QUrl::toPercentEncoding(s.track())));
+ 	//qDebug() << data;
+-	m_netAccess->post(QNetworkRequest(QUrl(m_npUrl)), data.toAscii());
++	QUrl url(m_npUrl);
++	QNetworkRequest request(url);
++	request.setRawHeader("Content-Type", "application/x-www-form-urlencoded");
++	m_netAccess->post(request, data.toAscii());
+ }
+ 
+ void LastFmSubmitter::scrobbleCurrent() {
+@@ -152,7 +155,10 @@ void LastFmSubmitter::scrobbleQueued() {
+ 	if (i>0) {
+ 		//qDebug() << "sending scrobble to " << m_subUrl.toAscii();
+ 		//qDebug() << "data: " << data.toAscii();
+-		m_netAccess->post(QNetworkRequest(QUrl(m_subUrl)), data.toAscii());
++		QUrl url(m_subUrl);
++		QNetworkRequest request(url);
++		request.setRawHeader("Content-Type", "application/x-www-form-urlencoded");
++		m_netAccess->post(request, data.toAscii());
+ 		m_awaitingScrob = true;
+ 	}
+ }
+-- 
+1.7.9.4
+
diff --git a/media-sound/qmpdclient/metadata.xml b/media-sound/qmpdclient/metadata.xml
new file mode 100644
index 000000000000..28569ac4e913
--- /dev/null
+++ b/media-sound/qmpdclient/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription lang="en">
+		QMPDClient is an easy to use Qt4 client for MPD
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/qmpdclient/qmpdclient-1.2.2-r3.ebuild b/media-sound/qmpdclient/qmpdclient-1.2.2-r3.ebuild
new file mode 100644
index 000000000000..014cca271ad6
--- /dev/null
+++ b/media-sound/qmpdclient/qmpdclient-1.2.2-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fdo-mime cmake-utils
+
+DESCRIPTION="QMPDClient with NBL additions, such as lyrics' display"
+HOMEPAGE="http://bitcheese.net/wiki/QMPDClient"
+SRC_URI="http://dump.bitcheese.net/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="debug"
+
+DEPEND="
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtxmlpatterns:4
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( AUTHORS README THANKSTO )
+
+PATCHES=( "${FILESDIR}"/${P}-qt48.patch )
+
+src_prepare() {
+	sed -i -e "/^Categories/s/Network/AudioVideo/" ${PN}.desktop || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=( "-DVERSION=${PV}" )
+	cmake-utils_src_configure
+}
+
+pkg_postinst() { fdo-mime_desktop_database_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; }
diff --git a/media-sound/qpitch/Manifest b/media-sound/qpitch/Manifest
new file mode 100644
index 000000000000..1446595a4acb
--- /dev/null
+++ b/media-sound/qpitch/Manifest
@@ -0,0 +1,5 @@
+DIST qpitch-1.0.1.tar.gz 116676 SHA256 20153417bf8e25dfd6e73c46ac5e05b7aaf5d4060b85a09778e0dcc61d4496a0 SHA512 d732d0b2a7c07741586d3724a6a2c73bb02b4390bbd4baa5e7fe4abe3531ad12e7be208a470ca6f0da38334e4cb556cebe5c0df3839547c3f55c5b37b9944e94 WHIRLPOOL 4e5a6d46d389e49837d73dd4d642ae5f84ad81d95bdc5a361b091607b09f5fd37aa411882148b3791d47d922ad553cb27cb57ecbfed741f9f2774af627b0453e
+EBUILD qpitch-1.0.1-r1.ebuild 519 SHA256 514733ef16d08fa8d8654747d9e87b75980755e034545360c543e4c5fcfa8586 SHA512 cee418bb2f3da5ba23c2f1cf6a009127f2840e2fd390f7c566e16b6756a21c94140512e8217f12d66d9565ef3ec3caf8a480b78d5ef918d4a8427b01ad526858 WHIRLPOOL a2fc7ce1cdde2b4fbbd9eb320d72ee320818054a0a26c5afde895ee81b83d754346fc032c1dccddd41a0003a00b1c1f09a5a1ff0d4d2645af6c28bfb9af1e01d
+MISC ChangeLog 3111 SHA256 bf4a1a1588fea2a5b1fd5816cbb95dad42da9fe1cfff0ca1066c418a03801897 SHA512 00a0b603c263a2d5ad5328b2ecbd850436badde2706c27f62265a2cfb70a2a9aa917933ef11b02815f46d14c47d5c829ab5187f51117bf3592bce6702f484621 WHIRLPOOL 5724b915898ea20d3fcb4745ed21c512f381094af1c0918c748964df2524d41619607165b03fb2864314548c2aaccad8e8d26512dfe50c805ab2863456a23664
+MISC ChangeLog-2015 1220 SHA256 4eb010d74ef8ecd35b46ced56c982c346a18fcb5a6a72b3be883f98ad36e9bcd SHA512 58d01d205505019e849e845c2a55026b60458a7acb4d06a746929bde0b56a0cf947e6862c2cdc1ba6f507954395cd851c6f0260acc2f5ff6a053f5e66a7b85a5 WHIRLPOOL 6131c144c981b4c48c08cbffe2c8e75fc317ff0c0ec91bf504340fac076708ce48bfa511ea585885649529d2c00422ae01952ee22378e44b174d93b6a42f35e2
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/qpitch/metadata.xml b/media-sound/qpitch/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/qpitch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/qpitch/qpitch-1.0.1-r1.ebuild b/media-sound/qpitch/qpitch-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..036eaa3fd026
--- /dev/null
+++ b/media-sound/qpitch/qpitch-1.0.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="A program to tune musical instruments using Qt4"
+HOMEPAGE="http://wspinell.altervista.org/qpitch/"
+SRC_URI="http://download.gna.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	>=media-libs/portaudio-19_pre20071207
+	>=sci-libs/fftw-3.1.0
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README changelog )
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
new file mode 100644
index 000000000000..6f8d76677290
--- /dev/null
+++ b/media-sound/qsampler/Manifest
@@ -0,0 +1,11 @@
+DIST qsampler-0.4.0.tar.gz 243065 SHA256 4f45e80dca00593ad7d9703125e300f98a6f4dce5216985b07f26f3f76ba80e4 SHA512 42c235396cf68bd811fa251fd6f112a835ce1769130823163fa1a0e517431922b941aa56bc88f22890e6d6326b38765a2f3ced8e67a78d3420600f85e827d467 WHIRLPOOL 330769bd6615ec9a909914e1f3559f5999bbfa9e3d9de85432c12656459e5956a2ea547737b7ef72d8545d2b91da710289ce83e2cff6a9fdd5aee28a5e208818
+DIST qsampler-0.4.1.tar.gz 243377 SHA256 2e2315b8b4c1c33512618a2a3c0d6dfdb5ee10914cc9eac5deb2f5c0d9bcb08d SHA512 ffa6e2feb11f9a96580fb1803b6ddb5c56ae475c1f04b5bfa94b1403c29ed0e14f8f60e9166ca166d5b478184c37337b0de0e098a54f74a90f951260d070ce14 WHIRLPOOL b4cfed615681d621b100b0f22525fbdedda8b5907888b16660959e324cbb7c91941c123bf7dc04625f7fdf50ca064a88513bc47dad1052a7b9778c2464e631ba
+DIST qsampler-0.4.2.tar.gz 244794 SHA256 b5b4193dc2ef3b4947fb43aa82b28aca056f0babfe0d0b1a94f65d63d11dd5c9 SHA512 edebbc801e177cce44aa4e8cdc9db9e9e5c6cb35b75f33c4c15cae5920fa869053748075179c3b4d68956e30b05e5c94513419af567e60f27ca222f77fa41f30 WHIRLPOOL 945bee93f9a3dd5f5953dd28a3356bb9bacf6479a4afb8a1a8c7e66f5b7ce18e673cb6a58cf21dc64eae88a69c9b8b8948fa76c3fb026407d6903bd8333b38b2
+DIST qsampler-0.4.3.tar.gz 246314 SHA256 d1857eed701f6a58be2c5d2cce318b58fcf467daca5d9b6646fefb270448e1f1 SHA512 015b747bd7c796341c6516fec68dd3b12725f461f7e5e3898b24862af556d69d67d73354f0aaf3bfbca069ebe67de34121350dcd3ee8161ec12e6bae80227fb9 WHIRLPOOL 81d66f658a45fbf7c44bc3024bae6c744008426b39a3c6f9c247cebaf35098418921e32343f6c757e51a65bea0fe49427ab92882604d3a09c5992ccf6266b9f8
+EBUILD qsampler-0.4.0-r1.ebuild 963 SHA256 3c6c9ca77ddfb885ee6fef78e785346458479d552df7dbdb0f74ab1aa75fde09 SHA512 7b70af07ebf5d221140b208d58801c7df7ec772d0e99ec84c1b099b5dbfbfe55cde3516d1e30060bdd9149901a46bf107302e563fe999a3e00d6c9f721b69d98 WHIRLPOOL 76be89a564eaa3249a28f450f090b94795c0532b144be9beb8091745c131fc87093f0397efb808289721f72246b4796d286d9be3fa2b142cda275745af7671b2
+EBUILD qsampler-0.4.1.ebuild 946 SHA256 12b206f93ae14ed1beb4b7e2b2107dc7a94a18bf5ba1fbd2de7d599869cb6e07 SHA512 a9b3ab3e38b00cf0188f1e35e0d9fc4df1b0035ef71d882e886105d4a0b4f3c3e76f288f109cdcff21be84ddb244f0b0288670c28fc1fcc0f7a9e766ab415a6e WHIRLPOOL 47adfe765b8523e690dd6fd4807994cb3b48593724f6e5313bf7523cb3a4d5cdece0d271be6c80579d966601f1a237755a7bda8a116b2947cc1426bdf5fdfa8d
+EBUILD qsampler-0.4.2.ebuild 946 SHA256 12b206f93ae14ed1beb4b7e2b2107dc7a94a18bf5ba1fbd2de7d599869cb6e07 SHA512 a9b3ab3e38b00cf0188f1e35e0d9fc4df1b0035ef71d882e886105d4a0b4f3c3e76f288f109cdcff21be84ddb244f0b0288670c28fc1fcc0f7a9e766ab415a6e WHIRLPOOL 47adfe765b8523e690dd6fd4807994cb3b48593724f6e5313bf7523cb3a4d5cdece0d271be6c80579d966601f1a237755a7bda8a116b2947cc1426bdf5fdfa8d
+EBUILD qsampler-0.4.3.ebuild 978 SHA256 9acf1cb305486c1adfa527bde8192fbc74c7d0e575beb8fd62ca313e881fe089 SHA512 50d4038e18d83d3fa9473b5dc03acee1e6fe1070250168dc3a05826ce3c7252e7e35b3f6d3a8bb13ab220c6ff60e66c2744824de8bc26c7e47bc4e539f176187 WHIRLPOOL 8a79771ae50a846f10481dada3f30769b105f1f19e61d3b69423e052ea7960937cf264fce7c8ee27ff06c5e5537c9d3256d9878af31d404be727ae995cde817d
+MISC ChangeLog 4590 SHA256 0b0c19b228a8ffda99a4a1cf9238ff134039be3fd577cdd89f7074489c63831d SHA512 6a043390065c712147ea0b7f3cc3c72452d38c5992814d3dca87da9315318be796c7b237135c92066cfff69f25de6ad4adcf9d804e14a4c164a32332eef9ff08 WHIRLPOOL 9fd412f38903e5b753260ec9533953550cd9a79fef2e1e0ffebe6521eb8b964f591893197500d70bb513d8d72c1171ded64f52ad3c51b7e3567766afe0acb4ef
+MISC ChangeLog-2015 2473 SHA256 c91119578d79d0683c06a4d240a93984c9b1ba6fd84871e5fdf91972d91466b0 SHA512 484dba9b89d407dcb35fb5f270745f988ef5041612dfe0fe2492c946616644a240ea907e0431b7197e079ea8c8309cf7b3f5d2fe1b40f4f53eb68b4540d317f4 WHIRLPOOL 569ca728e3e2d32f4f0ab43d3feb6ed4231e73b319b91de0bffe23745650b83413e1294eefeacc28cf5550056986b2dc18950916907b85d46789365b3b8ff5d0
+MISC metadata.xml 493 SHA256 4added7db9e8c03675a2e9487d9b3d3042f94e8fe2fbd9f178a274a3e93005ed SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd WHIRLPOOL 448ace6bbd6666daf813922d7a2bb61d520fa82d6791afd4f2fdd371e94cf327d49827f959922b7bd21ad832103e8936c0a3aaba21e303010562ea0a77fd2b69
diff --git a/media-sound/qsampler/metadata.xml b/media-sound/qsampler/metadata.xml
new file mode 100644
index 000000000000..70aeb4a9f721
--- /dev/null
+++ b/media-sound/qsampler/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="libgig">Enable libgig support for loading Gigasampler files and
+      DLS (Downloadable Sounds) Level 1/2 files</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">qsampler</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/qsampler/qsampler-0.4.0-r1.ebuild b/media-sound/qsampler/qsampler-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..f64b383de284
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.4.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qmake-utils
+
+DESCRIPTION="A graphical frontend to the LinuxSampler engine"
+HOMEPAGE="http://www.linuxsampler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +libgig"
+
+DEPEND="media-libs/alsa-lib
+	>=media-libs/liblscp-0.5.6:=
+	x11-libs/libX11
+	libgig? ( >=media-libs/libgig-3.3.0:= )
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}
+	>=media-sound/linuxsampler-0.5"
+DEPEND="${DEPEND}
+	dev-qt/linguist-tools:5"
+
+src_configure() {
+	ac_qmake="$(qt5_get_bindir)/qmake" \
+		econf $(use_enable debug) \
+		$(use_enable libgig) \
+		--disable-qt4 \
+		--enable-qt5
+	cd "${S}/src"
+	eqmake5 src.pro -o Makefile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README TODO TRANSLATORS
+	doman ${PN}.1
+}
diff --git a/media-sound/qsampler/qsampler-0.4.1.ebuild b/media-sound/qsampler/qsampler-0.4.1.ebuild
new file mode 100644
index 000000000000..4dca71da49fa
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.4.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qmake-utils
+
+DESCRIPTION="A graphical frontend to the LinuxSampler engine"
+HOMEPAGE="http://www.linuxsampler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +libgig"
+
+DEPEND="media-libs/alsa-lib
+	>=media-libs/liblscp-0.5.6:=
+	x11-libs/libX11
+	libgig? ( >=media-libs/libgig-3.3.0:= )
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}
+	>=media-sound/linuxsampler-0.5"
+DEPEND="${DEPEND}
+	dev-qt/linguist-tools:5"
+
+src_configure() {
+	ac_qmake="$(qt5_get_bindir)/qmake" \
+		econf $(use_enable debug) \
+		$(use_enable libgig) \
+		--disable-qt4
+	cd "${S}/src"
+	eqmake5 src.pro -o Makefile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README TODO TRANSLATORS
+	doman ${PN}.1
+}
diff --git a/media-sound/qsampler/qsampler-0.4.2.ebuild b/media-sound/qsampler/qsampler-0.4.2.ebuild
new file mode 100644
index 000000000000..4dca71da49fa
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qmake-utils
+
+DESCRIPTION="A graphical frontend to the LinuxSampler engine"
+HOMEPAGE="http://www.linuxsampler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +libgig"
+
+DEPEND="media-libs/alsa-lib
+	>=media-libs/liblscp-0.5.6:=
+	x11-libs/libX11
+	libgig? ( >=media-libs/libgig-3.3.0:= )
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}
+	>=media-sound/linuxsampler-0.5"
+DEPEND="${DEPEND}
+	dev-qt/linguist-tools:5"
+
+src_configure() {
+	ac_qmake="$(qt5_get_bindir)/qmake" \
+		econf $(use_enable debug) \
+		$(use_enable libgig) \
+		--disable-qt4
+	cd "${S}/src"
+	eqmake5 src.pro -o Makefile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README TODO TRANSLATORS
+	doman ${PN}.1
+}
diff --git a/media-sound/qsampler/qsampler-0.4.3.ebuild b/media-sound/qsampler/qsampler-0.4.3.ebuild
new file mode 100644
index 000000000000..6eebb29abc59
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.4.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qmake-utils
+
+DESCRIPTION="A graphical frontend to the LinuxSampler engine"
+HOMEPAGE="http://qsampler.sourceforge.net http://www.linuxsampler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +libgig"
+
+DEPEND="media-libs/alsa-lib
+	>=media-libs/liblscp-0.5.6:=
+	x11-libs/libX11
+	libgig? ( >=media-libs/libgig-3.3.0:= )
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}
+	>=media-sound/linuxsampler-0.5"
+DEPEND="${DEPEND}
+	dev-qt/linguist-tools:5"
+
+src_configure() {
+	ac_qmake="$(qt5_get_bindir)/qmake" \
+		econf $(use_enable debug) \
+		$(use_enable libgig) \
+		--disable-qt4
+	cd "${S}/src"
+	eqmake5 src.pro -o Makefile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README TODO TRANSLATORS
+	doman ${PN}.1
+}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
new file mode 100644
index 000000000000..0845d068851d
--- /dev/null
+++ b/media-sound/qsynth/Manifest
@@ -0,0 +1,12 @@
+AUX qsynth-0.4.0-qt5-tagging.patch 372 SHA256 365f1f95e7851d6afe1caf7c0d208dc257320e32397cbf7591d297307bf7aeae SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1 WHIRLPOOL e6656c15df829b29646e98d97dbb31e1d333352c6be161c8b7db430741f2402a9b3fbb070ffe6bef8b2343282b7ad0efdd2e4f2641cad04f813219935d04d957
+DIST qsynth-0.3.9.tar.gz 255130 SHA256 eb2050d0f7a8011b9ac20f82fec88faf2237a2475dfefc424cb4944399b17e22 SHA512 7702dc9eb3d38d338dcab5587e02e9fcdaffbe6188437e3b0f54b07499553f7a7d083f233cd21963a908578108f82c0d904b68da2f156ca0ab489e989b5787a8 WHIRLPOOL 621b53fbf251e4b35dcdefb6b63e6ed124fc12dccad6148f077914bd25931cc8ea10a8dfb959b5ad4ae8a451686c63dedeb060b8a68d7a3d6e72e2d5c437104a
+DIST qsynth-0.4.2.tar.gz 252394 SHA256 25a59769e20a5af971f197f4be7233cedbbfa7c7a7ee54c9f49b6b4a8e4ef8f2 SHA512 d951969b6a4ea185b9c732867559000e91e73b69fcd19974d406516ce79c0040b598ee578cc10aa2ed199f652535e061fe8178c8b37651438e605a0bc3ee674e WHIRLPOOL a95a7ec9ecac41962e9b81dfa10f18df962ad3a6046fccf5b7073a17f05802568bacc37252b4fbb05c41a038fcf3047d57eb178a8a524f5e5a3019ec47f3deb7
+DIST qsynth-0.4.3.tar.gz 258870 SHA256 de27097a6e5e68799e0ab72641682b3c8f3d7bc404d2ba38e2ca66e952aab0c8 SHA512 940a664e279890a0a5eaa557376fc10b60c13527ac813be8c3c6b29d04adf8b4c447846a7032c1f37ce6b8213093a7c1891fa7649371edb3cabc7142784b6782 WHIRLPOOL ddc3eb52421d1785551ffe80bea05cef86880192a20e9de20e61719e31ca2eb79503753551bfcf0ee53fd527fca5750e3f0872bf50439ea7bc70d8602150f910
+DIST qsynth-0.4.4.tar.gz 260482 SHA256 0ef914447b1f3a3ecd9c38101f06fc9c67e1d8367202a3f7a494f5d167b40e62 SHA512 8995881ab992b8d02f83797093d406391327a362d0c331d0c8e023e1695baff5acb589be08427a25563f159067a8965c89be114ce74583db98e5a816f73aa9f0 WHIRLPOOL aea2556c5b142923d047d8a09c8534d534aa10bae9ef5c04778976e0adc1a7207c66b87d6711ec30616c7b33c5d1a9b844afee1fa59973e0fde45ae239a4a65d
+EBUILD qsynth-0.3.9.ebuild 1227 SHA256 744432c63db83946951b01bbc6773f376ea6766e832d7027fb5a4c6d96902c52 SHA512 b4f62f6dea2d1d990efe150a75a383a905eab1ef2aa10e2d7f9446e32dad454e4ce0e3cf5743f9a1529c335c823ec96a49f48c239e63f8136fb02cf713ac2e7c WHIRLPOOL 8e39dc6766c74796c2c3b20798f52a5998b81ea149b4cb09ed948173f23736594bc2343d8037a58581835e51481bd3085d54f02d4cd9ed9bc40063a187457543
+EBUILD qsynth-0.4.2-r1.ebuild 1274 SHA256 3016b25e68958ff0589fb41560eb89dc6767bab3da14d21a1ab30426f2918b64 SHA512 b714287716436e34fff9676ce471283ed7b123a88766cc0b2eca5fb9c85d2a7aa72ba923bd467b70ba44cd7b0a7ac8b3f5a09c608cf410071bf74cd82b2b3551 WHIRLPOOL 3ccbe659cbe771271d12becb0ce09949e2a5523db04751547532f99f944688b005c04b815efdb4735cc83e2b5c7831104b8d53e48f80124e6dce3aa112022a64
+EBUILD qsynth-0.4.3.ebuild 1274 SHA256 3016b25e68958ff0589fb41560eb89dc6767bab3da14d21a1ab30426f2918b64 SHA512 b714287716436e34fff9676ce471283ed7b123a88766cc0b2eca5fb9c85d2a7aa72ba923bd467b70ba44cd7b0a7ac8b3f5a09c608cf410071bf74cd82b2b3551 WHIRLPOOL 3ccbe659cbe771271d12becb0ce09949e2a5523db04751547532f99f944688b005c04b815efdb4735cc83e2b5c7831104b8d53e48f80124e6dce3aa112022a64
+EBUILD qsynth-0.4.4.ebuild 1273 SHA256 e1e3473a3ef9da71d3b21a98dc28ea1b4b47e90d2b3af23c5cd8901e521d3e1f SHA512 892e4f4b4af8dca09010f4e7af1aa7c79a35e10f0882300fb47d82bafdfef54dc02babf35183946b680a3d0ba8734b428b827ccfa7ec26ac633d94dc0c8c94de WHIRLPOOL 07d458fcff21e2cf77f01dd3badabbbf682a47c60dcd9c9410d1ecbe0707888b30873909d34015775d8aa022d37c32d722dd048120552d3995e6f80d3c35b74c
+MISC ChangeLog 4759 SHA256 d5231fd7eabfbd72c202e1fccc06406e59b4f4ec756c1916e6124f07e8450ef4 SHA512 8739c18599645121c30c929f20a6c60da042c2317de75bce93c51aacc7345d8a1a57cbec05a6510623ed0a0b16c3f1afee2a697b60174c75e44375043d0b9daf WHIRLPOOL 2de8c1631604cfb875b4fc1cb1f7158fca2ec5f6ffe468eb04a6e8ec01d4bbd01b257d2684c0b095ecbad596669b14abf0f36445f66f798a9e41a1c9bf32b264
+MISC ChangeLog-2015 10926 SHA256 1706925fb5646bc835ea4c751e1917a14c799fa45a8d1b25481ede18e3d9c000 SHA512 33036742742911326e33054024235d108d3db11ddda9ea44ae3ab005ae0daeedb2f8dc7ce0cbbb7e32d3c8a1f7b22cadde871e7805eee6aca95357d2e4c9019a WHIRLPOOL 6cf9152968549abf3de778388c799d6f3185e2f50df6d47ce3b6497f2a73b42ba99fa3208b30cb9d88bcc12d6e277692794f5665018cb174bb210ba6b0d324ce
+MISC metadata.xml 755 SHA256 825dc970bb78e173d7851943a63577e3048f8f162f2fd009b71e5e29b1683198 SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933 WHIRLPOOL afaa1961b7e76d401d26dde8011e83fd9c19efb8f386d5d3ef5152dd4442e2296750ad633a50c58f2aabbba5e4fcc14fa892080fd0c38658358dcd1ec0501c53
diff --git a/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch b/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch
new file mode 100644
index 000000000000..6b164924aca9
--- /dev/null
+++ b/media-sound/qsynth/files/qsynth-0.4.0-qt5-tagging.patch
@@ -0,0 +1,11 @@
+diff -ru qsynth-0.4.0/configure qsynth-0.4.0-modified/configure
+--- qsynth-0.4.0/configure	2015-09-07 16:59:25.083842955 +0200
++++ qsynth-0.4.0-modified/configure	2016-01-12 15:57:36.673008368 +0100
+@@ -4159,6 +4159,7 @@
+ 
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#define QT_NO_VERSION_TAGGING
+ #include "QtCore/qglobal.h"
+ int
+ main ()
diff --git a/media-sound/qsynth/metadata.xml b/media-sound/qsynth/metadata.xml
new file mode 100644
index 000000000000..22d9da6dd56b
--- /dev/null
+++ b/media-sound/qsynth/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription>
+QSynth is a fluidsynth GUI front-end application written in C++ around the
+Qt toolkit using Qt Designer. Eventually it may evolve into a softsynth
+management application allowing the user to control and manage a variety of
+command line softsynth but for the moment it wraps the excellent FluidSynth.
+FluidSynth is a command line software synthesiser based on the Soundfont
+specification.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">qsynth</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/qsynth/qsynth-0.3.9.ebuild b/media-sound/qsynth/qsynth-0.3.9.ebuild
new file mode 100644
index 000000000000..477c7ca4b564
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.3.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+LANGS="cs de fr ru sr"
+
+inherit qt4-r2 eutils
+
+DESCRIPTION="A Qt application to control FluidSynth"
+HOMEPAGE="http://qsynth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug jack alsa pulseaudio"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND=">=dev-qt/qtcore-4.2:4
+	>=dev-qt/qtgui-4.2:4
+	>=media-sound/fluidsynth-1.0.7a[jack?,alsa?,pulseaudio?]
+	x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
+
+src_configure() {
+	econf $(use_enable debug)
+	eqmake4 "${PN}.pro" -o "${PN}.mak"
+}
+
+src_compile() {
+	"$(qt4_get_bindir)"/lupdate "${PN}.pro" || die "lupdate failed"
+	qt4-r2_src_compile
+}
+
+src_install () {
+	qt4-r2_src_install
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm -rf "${D}/usr/share/applications/qsynth.desktop"
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/media-sound/qsynth/qsynth-0.4.2-r1.ebuild b/media-sound/qsynth/qsynth-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..a11efc39ab92
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.4.2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic qmake-utils
+
+DESCRIPTION="A Qt application to control FluidSynth"
+HOMEPAGE="http://qsynth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug jack alsa pulseaudio"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-sound/fluidsynth[jack?,alsa?,pulseaudio?]
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		$(use_enable debug) \
+		--with-qt5=$(qt5_get_bindir)/..
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_install () {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${ED}usr/share/applications/qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/media-sound/qsynth/qsynth-0.4.3.ebuild b/media-sound/qsynth/qsynth-0.4.3.ebuild
new file mode 100644
index 000000000000..a11efc39ab92
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.4.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic qmake-utils
+
+DESCRIPTION="A Qt application to control FluidSynth"
+HOMEPAGE="http://qsynth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug jack alsa pulseaudio"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-sound/fluidsynth[jack?,alsa?,pulseaudio?]
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		$(use_enable debug) \
+		--with-qt5=$(qt5_get_bindir)/..
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_install () {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${ED}usr/share/applications/qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/media-sound/qsynth/qsynth-0.4.4.ebuild b/media-sound/qsynth/qsynth-0.4.4.ebuild
new file mode 100644
index 000000000000..d88d540d7268
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.4.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic qmake-utils
+
+DESCRIPTION="A Qt application to control FluidSynth"
+HOMEPAGE="http://qsynth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug jack alsa pulseaudio"
+KEYWORDS="~amd64 ppc ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-sound/fluidsynth[jack?,alsa?,pulseaudio?]
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		$(use_enable debug) \
+		--with-qt5=$(qt5_get_bindir)/..
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_install () {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${ED}usr/share/applications/qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/media-sound/qtagconvert/Manifest b/media-sound/qtagconvert/Manifest
new file mode 100644
index 000000000000..eaba5a0a5608
--- /dev/null
+++ b/media-sound/qtagconvert/Manifest
@@ -0,0 +1,6 @@
+AUX qtagconvert-2.0.0-desktop.patch 469 SHA256 1e47cfa6c6855f1d642b0f455eb38490965d7589788ebd1f4617e79e31d2ebf0 SHA512 49c9a8fcdfe431be1e8289f94fda3d704a0b75f9b6461f03294ca30e3bc98ca65779bd7d4bf5d6a1061e668f8fd09516207d10ef0ed5e996c2bafd69a8867fe9 WHIRLPOOL bfc44e437a0effc250998bf0dc226ff0904ebf330f20af7fed1dfcb8148b2abb4ef8b0e47d8c9b45ad15d4af6c4c0bdd0cf1204eee3d73865990286a5e15e791
+DIST qtagconvert-2.0.0.tar.gz 95475 SHA256 7d76a9e377e1b21ebbf8f5a5bc7adaf7b846b5d7772c9e9ce7a633facadecc42 SHA512 dec5ac042dbe9219fceaeaa3d2aa7476ac12321157421bcd2f1dce9fb9dcabffc8c059ec86ac16b2043f168161d3b3b13c9f4e24fad469a955575d4df8733390 WHIRLPOOL f732d962ea08b0a4682499ac46d2912ae7fa62f461ac9533dc8d238b1afb4ef365a41ef6e5c7b750a71c5a4c156300168c38784d665d5ba56728f64dfa8099a6
+EBUILD qtagconvert-2.0.0-r2.ebuild 668 SHA256 652c4952eaffc2234099d579b6a614ea5d6d3c1e3cf1b38d02a96c1f91620eaa SHA512 7d425a8c624d48df30d496b2567bcbb9b745a6fe551f42b66c59586f4c423bf5b238cf673b9b000a99a1d7707dc971650158a70eadf026a619a407e8aee8fb0e WHIRLPOOL 125eed39e78ad62a907dc597ddeba3082e7759d7e868896bd0b210dacd9fafb43bb23f16c97a16f3a6432631fcd94cfe5795366de3b0bcf2189553a32e60fd94
+MISC ChangeLog 2490 SHA256 e49a576ab8c611e5c6e9e72b4ae7bb8e48df3f4f01383c934743e7f92cda4fbd SHA512 3f0bb518499ac5d5fff616799499e6f27ef383fb4f279d24b05816cb0be7cc75e8d217e108d7d4354e0a75eb813395030765d9f3953d4ad60f77acdd11781d03 WHIRLPOOL 160f306c0c54be7925a915241e87fe6605e889bdfdca15c314f14a5e87ae6107c203681eeffa3e7c6a5c756b1cc73075456d5e2fa078c51f5abb6046f2a05947
+MISC ChangeLog-2015 1128 SHA256 325fe400b12508dd92152ad2460ca487fe701d47c335941f6fa83d5d87536ade SHA512 09ba008e5494ec4b4d4d78bc644bf2a19c7fc2ad65e91a88caab8282605f51ff11de68073d28103a5f4ac0626b7dc5be3aa31751c65dbb9e4dc951d031b7aeb8 WHIRLPOOL 6a39167ae0763a33c493df56fab458031caea1edd52b15258955759a98d531c06132c8f071ede664c2363ba85566ac9dfdb89ae985b12df5e100a2ebc35e315d
+MISC metadata.xml 328 SHA256 1e2f0e083d13bde09f8543a7a1bbec578bdd276e213829e8768739e6ef145398 SHA512 31b63461293758d449b0d2da10b701e79a6e619fe15c796b81728eb0f9f18ca811e703f9a4737ea1698fb4b09edeee21352f13235a9c5db4579e53147ac563dd WHIRLPOOL 0ca0e79e86399c1e95d4f49f2e994c4872dc038ff1e6c0c0455ef45e735bae1955dbe9aea8c356c366219068eaed71733862d3bc251b2ca1c70521849a20f939
diff --git a/media-sound/qtagconvert/files/qtagconvert-2.0.0-desktop.patch b/media-sound/qtagconvert/files/qtagconvert-2.0.0-desktop.patch
new file mode 100644
index 000000000000..57465247db9f
--- /dev/null
+++ b/media-sound/qtagconvert/files/qtagconvert-2.0.0-desktop.patch
@@ -0,0 +1,21 @@
+Solve validation errors and add an additional category.
+
+--- qtagconvert.desktop
++++ qtagconvert.desktop
+@@ -1,14 +1,12 @@
+ [Desktop Entry]
+ Type=Application
+-Version=2.0.0
+-Encoding=UTF-8
++Version=1.0
+ Name=QTagConvert
+ Name[ru]=QTagConvert
+ GenericName=Tag Editor
+ GenericName[ru]=Редактор тегов
+ Exec=qtagconvert
+-Comment=QTagConvert
+ Icon=qtagconvert
+ MimeType=audio/mpeg;audio/x-mp3;
+ Terminal=false
+-Categories=AudioVideo;
++Categories=Qt;AudioVideo;
diff --git a/media-sound/qtagconvert/metadata.xml b/media-sound/qtagconvert/metadata.xml
new file mode 100644
index 000000000000..a80c00098ea8
--- /dev/null
+++ b/media-sound/qtagconvert/metadata.xml
@@ -0,0 +1,11 @@
+<?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">qtagconvert</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/qtagconvert/qtagconvert-2.0.0-r2.ebuild b/media-sound/qtagconvert/qtagconvert-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..79ab013b30b0
--- /dev/null
+++ b/media-sound/qtagconvert/qtagconvert-2.0.0-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit qt4-r2
+
+DESCRIPTION="Qt4 tag editor for mp3 files"
+HOMEPAGE="http://www.qt-apps.org/content/show.php/QTagConvert2?content=100481"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="dev-libs/glib:2
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	media-libs/taglib"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.utf8 )
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
+src_prepare() {
+	sed -e "/INSTALLS +=/s/documentation//" -i ${PN}.pro \
+		|| die "failed to remove unneeded docs"
+
+	qt4-r2_src_prepare
+}
diff --git a/media-sound/qtagger/Manifest b/media-sound/qtagger/Manifest
new file mode 100644
index 000000000000..152ab916d96d
--- /dev/null
+++ b/media-sound/qtagger/Manifest
@@ -0,0 +1,5 @@
+DIST qtagger-1.0.1.tar.gz 60791 SHA256 f20a4fc529c09338d91411ae51d705fd1e8d6db46e58d913f8cc377753c44812 SHA512 45969475abefa865244946fb6a74dcfa7397f0a9bd57b0fda4de98fc8c8edb2c0c3a631eccfa199bebb8442df38b0beaca9234fae4166629bcb5c08aee42b47a WHIRLPOOL 4744c1a5643129424d8d847b4483ab65f31a3b88a067bac706e8e54a504cbdf9c204c4093b6419eb37ca8a3c19e9b7027b01f67218b4d8486ba2ce78aaf88543
+EBUILD qtagger-1.0.1-r2.ebuild 906 SHA256 bacfddfe5eda74a7293a60ad459c192f2c8f59a64c98194e2e24ff49a015eae5 SHA512 d1a61f34be72cc595a19adbe8b6856896bb6c07d73ec1205bc27cac42a1744519180679beeccf26ca37195196dfd170977f38336dbe36405f2abdf182c041dac WHIRLPOOL 80093166ea9047cde509be7baf78373c8ff97f5cf1a5e93749893d8e409f00b24d7eb48a0e08374dcf22578b5ab91e078b688661ed34be394d4fbe865508d3c9
+MISC ChangeLog 4032 SHA256 75be022ab3dce87b8f0dfc7bb37323727f66c6c392e5eb43c7dffbafd4714df2 SHA512 2b07e952370bae2a9fdc9ba1d188dcb26b7a60dd1c385368ff85618a3b0f6606324d3243e66009928aa219dfe0d3c7979acfa94373094715bada37c620a35c0e WHIRLPOOL 533a66564f0b61f547d6b7103284182cc46d0cdaa38f9732db7d59470cf1ab74c4e7341c29273f9810154119b5abeab139e2952a028fcdc6baf9261ad7f86b47
+MISC ChangeLog-2015 943 SHA256 3efab23c97fcf2061bfbca43c93ae166c5c0a1f231ff7606feeb1345614e9941 SHA512 5e9711988cf7a51a3b07171deda79f63a71c213176ad3cd428178cf9dc0f0f28c4697911d4fa3f13525d700fbf2e0892b3f96ccb07b5228464ad4a91cdca5eb2 WHIRLPOOL 36681b135a555ae4cbf059413cb0114246b33bae3459e3b8bd964a4d70014c615a7003501c7a26006adecd96dd4781ba1598cd1faa15b1d55c9cac552fa0c6ce
+MISC metadata.xml 326 SHA256 26db9a15b5837102b9eb5790dab00b5b554bd816499c3760eb40bfe3535bc95b SHA512 e73586aa673a0b41300f88e9523c322d3dd42c2f319bd237b8b88fe346327c068c8d9e272ebc0e5503adbfb2562925231663da7fbf86a9edf7b48026d65a3854 WHIRLPOOL df928d1322cfd39f9d2b089a7d9bb4a92f51ac9a44cdc9b5750e96e1b30d495995a6219e145c01cf9d8d0fd1464e3d5b09a83b720bd72f0b407829bc452fac6c
diff --git a/media-sound/qtagger/metadata.xml b/media-sound/qtagger/metadata.xml
new file mode 100644
index 000000000000..8a2a74a1ca47
--- /dev/null
+++ b/media-sound/qtagger/metadata.xml
@@ -0,0 +1,11 @@
+<?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="github">DOOMer/qtagger</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/qtagger/qtagger-1.0.1-r2.ebuild b/media-sound/qtagger/qtagger-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..2412d4a4374d
--- /dev/null
+++ b/media-sound/qtagger/qtagger-1.0.1-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake-utils
+
+DESCRIPTION="Simple Qt4 ID3v2 tag editor"
+HOMEPAGE="https://github.com/DOOMer/qtagger"
+SRC_URI="https://github.com/DOOMer/qtagger/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	media-libs/taglib
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# fix doc installation path
+	sed -i -e "s/doc\/${PN}/doc\/${PF}/" CMakeLists.txt || die
+	sed -i -e "s/share%1doc%1qtagger/share%1doc%1${PF}/" src/mainwindow.cpp || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/{ChangeLog~,LICENSE} || die
+}
diff --git a/media-sound/qtgain/Manifest b/media-sound/qtgain/Manifest
new file mode 100644
index 000000000000..1418d3dc747a
--- /dev/null
+++ b/media-sound/qtgain/Manifest
@@ -0,0 +1,5 @@
+DIST 56842-QtGain_1.0.0.zip 86401 SHA256 03790318eab370287ebab3be4e55b7a49e35e44ebc12dd6a84da1974d345f31b SHA512 7e95d4f60329bc41db3cb3355ecea0eb214bcbceee403dacd639d14ff4827d551e51c4ffa0fcfb840c9f98b6b17653d2d3a937b6fabdd88f33dbabe315c3c95e WHIRLPOOL 161b1820f5128b9f8cc1e145886fd2a22b5aaf2cd9af6713ba90e5589af14511bdbff574ab4b314786fa0593f647cb3775a065492c62b3f6293473470db6737a
+EBUILD qtgain-1.0.0.ebuild 1088 SHA256 034f1c0dfd4f11dbd64478f7e1bb1eea69ef5c8e233b2ff5e41792830f855f7e SHA512 60a2f407512920fb8f90dcc68eb807d02d376803a4336add3196e49f4e5dcf241d4722e636230a459d946d81c9dc8c76673fa12c4fa814bfbd2a2b84372a3563 WHIRLPOOL 343722820c35f3e8b363ce48c4ac4c52b8333eaae900c5830b3f4d6d574ff890be860bbed6997f611b47c31a5d4a67a56f03e99593899fefd14178ca31c4b58b
+MISC ChangeLog 2427 SHA256 e82c231176af3897b1f7fc6a939457f05c8076d74210afd2b8cc9cdcddd5287b SHA512 56b83a18b5314e1461682428e9acb27549529d41e1a06ad8187b7bf0755f828ca6ac5f1133dcf9cb68919c71b653b417d0001862a855c1f97c680af7eac888ee WHIRLPOOL ceebcaac918d9e3ae5edc89d3fae1e3508fa5257948b363dc471a5ad73e3949f6ff0db54ec1e25b091f0ecbce3df5552de1140b368e8a95c32b508cab0e55a91
+MISC ChangeLog-2015 858 SHA256 e2c9ff5aaa1add98264a16445b0ce50ab2d72f717d1d0704433a411eda505c2a SHA512 45a1d043cf2029c14879e7ab5d6fc38b8150934339368224aaa1a63003e224fd016f9e02a0a069732784d574d8e6c9196dc060c57dc700b2e906370e66c41516 WHIRLPOOL 853293d259a964d31f682a071433de73d352ee47afe727c46528e56bc32571680a2d5a400e1a53f5ba081f9cc2dbf8f435cb3c2d9ad5495ccee8d01fde67e97c
+MISC metadata.xml 371 SHA256 af1f8d968495df48d4a5f6ecf103a6ec0eb764409490b877096e87e2f3c9ec88 SHA512 838cca8b66e3af3e9bef2e4c289cf2bbcf8bcf697c9735a41cf2a0d28ef96d41163ca4c78099ff6048731ef427ea0e4ad2aa46c7b8bf61f7794f90960b52ded6 WHIRLPOOL 8059410f6d8c1af1dacf0dc732732aa831e34787ad6aa65df48026dc577db292bab9cb9250fd3fa1c23c19d41efac445453e57d8a0efe8b6766e20521936398f
diff --git a/media-sound/qtgain/metadata.xml b/media-sound/qtgain/metadata.xml
new file mode 100644
index 000000000000..27ed34b21c11
--- /dev/null
+++ b/media-sound/qtgain/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+<maintainer type="project">
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/qtgain/qtgain-1.0.0.ebuild b/media-sound/qtgain/qtgain-1.0.0.ebuild
new file mode 100644
index 000000000000..0c9e85181ddd
--- /dev/null
+++ b/media-sound/qtgain/qtgain-1.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="QtGain"
+inherit eutils qmake-utils
+
+DESCRIPTION="A simple frontend to mp3gain, vorbisgain and metaflac"
+HOMEPAGE="https://www.linux-apps.com/content/show.php/QtGain?content=56842"
+SRC_URI="https://dl.opendesktop.org/api/files/download/id/1466640864/56842-${MY_PN}_${PV}.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac mp3 mp4 vorbis"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
+
+S="${WORKDIR}/${PN}"
+
+src_configure() {
+	eqmake5 ${MY_PN}.pro
+}
+
+src_install() {
+	dobin bin/${PN}
+	newicon Icons/lsongs.png ${PN}.png
+	make_desktop_entry ${PN} ${MY_PN}
+}
+
+pkg_postinst() {
+	elog "Additional features can be enabled by installing optional packages:"
+	elog ""
+	elog "media-libs/flac - flac support"
+	elog "media-sound/aacgain - aac support"
+	elog "media-sound/mp3gain - mp3 support"
+	elog "media-sound/vorbisgain - vorbis support"
+	elog "media-sound/id3v2 - mass renamer and cover downloader"
+}
diff --git a/media-sound/qtmpc/Manifest b/media-sound/qtmpc/Manifest
new file mode 100644
index 000000000000..18183fd35a2e
--- /dev/null
+++ b/media-sound/qtmpc/Manifest
@@ -0,0 +1,6 @@
+AUX qtmpc-0.6.1-underlinking.patch 1481 SHA256 8295218ebeeb14372c36c34510a9eed7210e82d8e474ef3caae1bd58327780d3 SHA512 dd7471ddf9e7cb6b389c8551580193b569b53c56f717528f2631885ad4f788723b0e11fff572b09205f5fb53f60681b26cd412bdf549d8d24028c6bd69ce5778 WHIRLPOOL d7c860863cbb8463894a66c4a860c49b645f8914d729fe285c480e650084ab38768913d02889e5be9c18f283b1138d4633ecd27203fef6e2704277c982498adf
+DIST QtMPC-0.6.1.tar.bz2 96341 SHA256 82287a26788b36d49db26518b66203f332cf686eefb81ee2d9be095e61123a62 SHA512 9b55a3d0190cc8f7aa96c379e9b8f428f6d306bd2d02e7b8b70032aaee6fd486b7bc0db2cdb1216623c866954a49f60b9563edf39c4e62df81333230b37fe304 WHIRLPOOL 25397f159ea38da400b518d4ef8ef5b82f353f42425dc281a8f32e049fb49a6833a0c2def9d4b0a4abda8efc11488731d7853bc47761ef14fdefe87a809cfe22
+EBUILD qtmpc-0.6.1.ebuild 490 SHA256 64419b659d21a1441e63070052681a49bba0497241f3bbc16fbd996ae3c4c9f9 SHA512 0c2e62c3b41e782c053b8bf8a0d4140a60da84a68a5804ea9b1ad75ac5823e1ff6f33b7596151f21fd56662fa26e65747188df073e72dc367803f455942e10f1 WHIRLPOOL b8a8f03b1f8ac499b78bad64468cf42965c1d88573242f805bf69f4e79e151b83d6c02241c26bfb722c975cfe1b89786e931e904f8f07141a59dbe684f00f335
+MISC ChangeLog 2856 SHA256 b5c235020bc40b9ef9741ec8e7ad6b68b4fc4a06034d3ce327676c1dd396bb8a SHA512 6b354225764bdc1ab97c9f68136fe9b54b93d589b28de70c79acbad20aa1b8ee177f681c812d1bf901cf758156e5d413b3512bed9a203d6d49012e92dd6bd995 WHIRLPOOL 48f9a882dd3337b5b35ceedc4c03f67eb8b2adc2be178b943aca3ef237ce7cef1b38d0836f878fd88a1da3e7ea3598e48594c6285955c2dc512fe6f1a1d349f4
+MISC ChangeLog-2015 763 SHA256 94ecb9926cbb66fd8406f63f11ad384128f98b440ac2f9774cb8ec2f01637619 SHA512 cba02c92ef8aee747b27830c6905619deb7094a59b050b83f51be5bd805c648fd8ed85355dfef530b7fbfbb9e5bbb82f56517d485daf59a9b5e724224ba8177b WHIRLPOOL 0e7c20a0905db4893e5879d77b5cef9fec1dadaeeb146a334b7fd8ab958ee58bec6407bf39afe24264c2423255237b14c3dfa1262ca1d53d4a2e4872c6dfad29
+MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/media-sound/qtmpc/files/qtmpc-0.6.1-underlinking.patch b/media-sound/qtmpc/files/qtmpc-0.6.1-underlinking.patch
new file mode 100644
index 000000000000..881187d1f9ce
--- /dev/null
+++ b/media-sound/qtmpc/files/qtmpc-0.6.1-underlinking.patch
@@ -0,0 +1,40 @@
+diff -ruN QtMPC-0-vanilla/CMakeLists.txt QtMPC/CMakeLists.txt
+--- QtMPC-0-vanilla/CMakeLists.txt	2010-11-02 17:00:58.000000000 +0100
++++ QtMPC/CMakeLists.txt	2011-11-20 23:27:18.000000000 +0100
+@@ -81,6 +81,11 @@
+ 
+ # this command finds Qt4 libraries and sets all required variables
+ FIND_PACKAGE( Qt4 REQUIRED )
++
++# add some useful macros and variables
++# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains a path to CMake script)
++INCLUDE( ${QT_USE_FILE} )
++
+ FIND_PACKAGE( KDE4 )
+ 
+ IF( NOT DEFINED WANT_KDE_SUPPORT )
+@@ -134,12 +139,6 @@
+ 	ADD_DEFINITIONS( -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -Wall -Wextra )
+ ENDIF( NOT ENABLE_KDE_SUPPORT )
+ 
+-# add some useful macros and variables
+-# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains a path to CMake script)
+-IF( NOT ENABLE_KDE_SUPPORT )
+-	INCLUDE( ${QT_USE_FILE} )
+-ENDIF( NOT ENABLE_KDE_SUPPORT )
+-
+ ADD_SUBDIRECTORY( external/libmaia )
+ 
+ # Compile the resource files
+@@ -169,9 +168,9 @@
+ 
+ # Last but not least, link everything. Based on whether we are using KDE or not.
+ IF( ENABLE_KDE_SUPPORT )
+-	TARGET_LINK_LIBRARIES( QtMPC ${QT_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} Maia )
++	TARGET_LINK_LIBRARIES( QtMPC Maia ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_LIBRARIES} )
+ ELSE( ENABLE_KDE_SUPPORT )
+-	TARGET_LINK_LIBRARIES( QtMPC ${QT_LIBRARIES} Maia )
++	TARGET_LINK_LIBRARIES( QtMPC Maia ${QT_LIBRARIES} )
+ ENDIF( ENABLE_KDE_SUPPORT )
+ 
+ IF( ENABLE_KDE_SUPPORT )
diff --git a/media-sound/qtmpc/metadata.xml b/media-sound/qtmpc/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/media-sound/qtmpc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/qtmpc/qtmpc-0.6.1.ebuild b/media-sound/qtmpc/qtmpc-0.6.1.ebuild
new file mode 100644
index 000000000000..30544bb03374
--- /dev/null
+++ b/media-sound/qtmpc/qtmpc-0.6.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P="QtMPC-${PV}"
+inherit kde4-base
+
+DESCRIPTION="Qt MPD client with a tree view music library interface"
+HOMEPAGE="http://lowblog.nl/category/qtmpc/"
+SRC_URI="http://files.lowblog.nl/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/QtMPC"
+
+PATCHES=( "${FILESDIR}/${P}-underlinking.patch" )
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
new file mode 100644
index 000000000000..b1d633c8969d
--- /dev/null
+++ b/media-sound/qtractor/Manifest
@@ -0,0 +1,7 @@
+DIST qtractor-0.8.3.tar.gz 1750869 SHA256 6852facb08c1a38c9c4bf5bf9922b0b9a050a00b85c6b5aeda1764f3afb8f83d SHA512 a80fd1c274ff11ff43b1c60a5fd0d4ff5c0e9d333849b6ff0b811e1afc31352395b47b712614c091af3a445d0664ea407d3b6594a38b7a6f5e8fc7adec6f62dc WHIRLPOOL 49ac1f3dfcabc2ebbc5b67a181997a5d15435a0d83f493f26fcb835715e837ed523a7cfe44412c36ebfc05dc8d7234d9031b47a5e84d2cc307af18c8f8c0fc45
+DIST qtractor-0.8.4.tar.gz 1752418 SHA256 3ace8b4fdf623e5e6ccecd7047de73f72bcfdd10b01f187079832092ac936b9d SHA512 406c19eb37273ac932b0f797db6e064e48119a245fe25762f743a261c9f80ec3ce762c76ddbc633ad17bb5924affb7db7ded95d1403b9b1edaa360e6ff060f92 WHIRLPOOL d045b3f5e996aeca04f606be9daf047c42a762d57de61ee0114b86aa2d4c81232d7a56bb4a74d229578d2f7d1af2e412eed452023d1f8191be78e96aefe3121d
+EBUILD qtractor-0.8.3.ebuild 1717 SHA256 c0238a24f87d60ca3bc82df1d19e20a1f3faab83050eac90e5cb203ea93d5a2f SHA512 cd7f5bcdfc0a75e01c4a5a6a43902248914b215ca74f99723a67773450139389ea8e3794a58fc1867bbf630c7be7a4ba0bb94ae689790ad2eccc9f72437376d9 WHIRLPOOL bc436d17750147ca9811066567c7e6eae788c88e82d500c0328abde18bc24833136eab9cd22f7a68666e83604dc18fe7522f292fd637e6cc3a7097f006bf3a45
+EBUILD qtractor-0.8.4.ebuild 1671 SHA256 773d434b5e7bf2228c525d302823621087c379bd71ed5728114a42dbb7b745e9 SHA512 92969eec036aa026d3b7d820638f04584a774ae1e34e73ce49e771f47b8965be3293a37334071c9bcafc94c56f99fa51518fd68c8ec4dedb4f0b7b61fb72e9fe WHIRLPOOL 812623c0ce9644e22c6a5b9046e8138ff64b6f64d48b04c8bf17b556379b01854590488915d54cfcb49d0fbd60419db4fa1596ce40316676786f903bff52dd70
+MISC ChangeLog 5859 SHA256 72bfe26b005c8550a752ecff80000cae6e1f92e5a9209d6710e6ed449fb01c1f SHA512 d790a7c10df64ac63c504eced8a65f62cc1c6ebce7bb78cf9728480b70590fae41df45822a5f3e2f4877cbc55003bbda7a4774414ad9c158a34885cedcfdb699 WHIRLPOOL 99252f269a6872c31e9b047a5b3b770afc9558b37c69aaa63b5b4803b621c2303396640a25445b1f2410dcf099d809e90095a515340e88160ca4ad36713afd39
+MISC ChangeLog-2015 9643 SHA256 f24ca0a5415798dd70e6cd41f87421cbd8579c1662a44af30e035d3d92e39ed5 SHA512 c8482ee13b5b9187b4e5afb6fdb65b3372cdb9c3b3c0db2c2d78167ee36dd0fba08abb555618efc8a6d9ce3468e361109278c3037337a1c09c6c2279418de3e0 WHIRLPOOL cb5c79ace8bf4e9c4f612f891ed3333a31e549b4d60dadb38b08a4d4dda4e80aed323ed3509496faec81a59bac08db29569dc1263525d17111080dce587e34a5
+MISC metadata.xml 542 SHA256 9597243fd5cd725858d25b4b3207cc4273a166cc884a1cbd8bd205c546ca06f0 SHA512 002d353914af0071fae342598619aef3b0dfe099d500da0bc98f40c209689f123dbbd93ca80a89a53c6257a54ee808798a858987d80a0443e2cc723dbfdedb7b WHIRLPOOL b51eebd5e61a25a5c437fd101360727500156ca7692ced610232f7a6aa7f24bfb7042e911f72521967a3419f49943ad739a4d974c75261fe255336587efcda9d
diff --git a/media-sound/qtractor/metadata.xml b/media-sound/qtractor/metadata.xml
new file mode 100644
index 000000000000..939b40e07f51
--- /dev/null
+++ b/media-sound/qtractor/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="dssi">Enable support for DSSI Soft Synth Interface</flag>
+		<flag name="rubberband">Enable support for in-place audio clip pitch-shifting through the rubberband library</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">qtractor</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/qtractor/qtractor-0.8.3.ebuild b/media-sound/qtractor/qtractor-0.8.3.ebuild
new file mode 100644
index 000000000000..d855a90627bb
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.8.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit qmake-utils flag-o-matic eutils
+
+DESCRIPTION="Qtractor is an Audio/MIDI multi-track sequencer"
+HOMEPAGE="http://qtractor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug dssi libsamplerate mad osc +qt5 rubberband vorbis cpu_flags_x86_sse zlib"
+
+RDEPEND="
+	!qt5? (
+		>=dev-qt/qtcore-4.2:4
+		>=dev-qt/qtgui-4.7:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dev-qt/qtx11extras:5
+	)
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	virtual/jack
+	media-libs/ladspa-sdk
+	>=media-libs/lilv-0.16.0
+	media-libs/lv2
+	media-libs/suil
+	dssi? ( media-libs/dssi )
+	mad? ( media-libs/libmad )
+	libsamplerate? ( media-libs/libsamplerate )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+DOCS="README ChangeLog TODO AUTHORS"
+
+src_configure() {
+	append-cxxflags '-std=c++11'
+	econf \
+		$(use_enable mad libmad) \
+		$(use_enable libsamplerate) \
+		$(use_enable vorbis libvorbis) \
+		$(use_enable osc liblo) \
+		--enable-ladspa \
+		$(use_enable dssi) \
+		--enable-lilv \
+		$(use_enable !qt5 qt4) \
+		$(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
+		$(use_enable rubberband librubberband) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable zlib libz) \
+		$(use_enable debug)
+
+	if use qt5 ; then
+		eqmake5 ${PN}.pro -o ${PN}.mak
+	else
+		eqmake4 ${PN}.pro -o ${PN}.mak
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+}
diff --git a/media-sound/qtractor/qtractor-0.8.4.ebuild b/media-sound/qtractor/qtractor-0.8.4.ebuild
new file mode 100644
index 000000000000..232c990cca34
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.8.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils
+
+DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="http://qtractor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cpu_flags_x86_sse debug dssi libsamplerate mad osc +qt5 rubberband vorbis zlib"
+
+RDEPEND="
+	!qt5? (
+		>=dev-qt/qtcore-4.2:4
+		>=dev-qt/qtgui-4.7:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dev-qt/qtx11extras:5
+	)
+	media-libs/alsa-lib
+	media-libs/ladspa-sdk
+	media-libs/libsndfile
+	>=media-libs/lilv-0.16.0
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	dssi? ( media-libs/dssi )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )"
+
+DOCS=( README ChangeLog TODO AUTHORS )
+
+src_configure() {
+	append-cxxflags '-std=c++11'
+	econf \
+		$(use_enable mad libmad) \
+		$(use_enable libsamplerate) \
+		$(use_enable vorbis libvorbis) \
+		$(use_enable osc liblo) \
+		--enable-ladspa \
+		$(use_enable dssi) \
+		--enable-lilv \
+		$(use_enable !qt5 qt4) \
+		$(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
+		$(use_enable rubberband librubberband) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable zlib libz) \
+		$(use_enable debug)
+
+	if use qt5 ; then
+		eqmake5 ${PN}.pro -o ${PN}.mak
+	else
+		eqmake4 ${PN}.pro -o ${PN}.mak
+	fi
+}
diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
new file mode 100644
index 000000000000..1b378813d708
--- /dev/null
+++ b/media-sound/qtscrobbler/Manifest
@@ -0,0 +1,7 @@
+AUX qtscrobbler-0.10-Makefile.patch 1359 SHA256 3f7437b4ebdfb7085b5575e8aece347304b56647082500f950b8e4f0a2b45dda SHA512 13c6256dc3121fad8b52e479a4700c807229dd8b29f4d8f79492df9e1c2e06e9d28ab50cbccc73a706f2ec3cbd9be7ffc2274bc015862afa4ea1297a73a6d004 WHIRLPOOL a9bde94e9dd3c6506d22794f256b18210eb19ac6c64421baf5bfd0b8ff5dc53b9346516a44e3185d667583d156dd1f602323139b75aad2f0e80d5d0d2e739e43
+AUX qtscrobbler-0.10-free.patch 623 SHA256 522fe173f6cb6d147398b6679f1f9c4af7e3518e4840e8322ef055c6da23c0d2 SHA512 42d4093e033883fd2dda4313a2c731d418fbbf6ae70a2d79003622f917791560eedf9ea185029bca25416b34ac51bbc1b7e78bb597a33d89b92e6abab89f4226 WHIRLPOOL c2ecfa3c6fe53b14f0fab6dffc499e7bafabe5129d7e224b53193d9c555746c383b367d8da2f085d31336335967263ba0654f9aa4f3137d6c02c6fdfa897063d
+DIST qtscrob-0.10.tar.bz2 132507 SHA256 b77451625d4943a1e19e4418616417944091339db7b31983c593f4bf7d73ee7b SHA512 d743976ef26c4f61402187930ac2cfba71bc4d7079e1166bdb34115196c99d3e0093a4df06d4b0eda24ab4f0f6fcce840812fd2d1dff847dc905adc9a74127c5 WHIRLPOOL 0905d7741a5b77949abad0cf963d6ef87ec59b05993fe1539ade6d78022514e6f134912791a4d0ddc687ea5ac9cc13d3ab5f3138dc9148d083d6b15595078569
+EBUILD qtscrobbler-0.10.ebuild 1403 SHA256 61d3f672b90e6e48970906da3f9790dca309f3ecdae3de44fcc082ffed10f654 SHA512 37d29012f2666a44ebb8ecca08b65d5563c9ca3bf7c6b0404315c989159af5ac2818b046f7ab8da674b329fff066361099ea6489ab71ce756f866a8679f8d6ff WHIRLPOOL 1dd367950f1de813c8551ab6b95ca3bad25e9ee7c8f7d897afdf0c5fd819ec2a730d51d279c2459cb699d97caacf2c5f8439bc7130c2568b44f0835a1387f6d9
+MISC ChangeLog 2518 SHA256 42320d674add698e9031edb1e98754ff42cb885b725f2a4bfb1f248cdf5d60d9 SHA512 958b162d0bb3df0b1ac00d20dab930d3fa421769796ef71fc0cf5c68e3bdc5102cb56db55d62ed0e49c382f4807cf624d12cc659261bc870744c45ff8025505e WHIRLPOOL 49bc815361073e82aba3d7777cad0a225c7c47f3564d051ea6660cbeceb9ec9facec090e125a8e905dc5ccbb2b05b54893be4591ca0cdd6fa49576cf2637f8da
+MISC ChangeLog-2015 1919 SHA256 8eb47628ce6ae17a3ea40358560c94381072e57bb3c724c196a3a5c590444f71 SHA512 62d57985772d64908bfbba21decfb5cff31164d5a2b098df8b2463fced64671fcbdf9387fcb3553d53307a788bc8d76dd5378e669858fdba991857bc30d75b08 WHIRLPOOL 13caa46d33588d247910deb746a2124068ad3099e239d2e5e9d46ca525f9e64dcfb870ab4a31049808cf32146c0a0cfad3ea4e87d09c9b9d414a152e4ea01d04
+MISC metadata.xml 410 SHA256 e05a610d5f437b34aeeb53a221559ed5517c1b568046e814fcb8e52ed1f31d79 SHA512 66998d7596e0dabf7b01af9fa59bd2b4b9d74b5cdd6e902ecbabf81683ff5f84ebf0d4d3dd876d19e510c886ceff741f9ebe163a5214c7f845f256b73601a401 WHIRLPOOL 6583dfef919975cfdf811802e6553090723a10dcbbff6e1f848eb78e4ebc4bae6002fceda320216ee4c70518c571f8bccf2f1c20d6cf2e9ad9f19278c0efd82b
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch
new file mode 100644
index 000000000000..0558b72c9bf5
--- /dev/null
+++ b/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch
@@ -0,0 +1,46 @@
+--- src/cli/Makefile
++++ src/cli/Makefile
+@@ -1,4 +1,4 @@
+-CC   = g++
++CXX ?= g++
+ mingw = false
+ WINDRES =
+ RES  =
+@@ -27,7 +27,7 @@
+     LINKOBJ  = scrobble-cli.o libscrobble.o md5.o ConvertUTF.o mtp.o $(RES)
+ endif
+ 
+-CFLAGS = -Wall -O2 -g $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
++CXXFLAGS += -Wall $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
+ 
+ .PHONY: all all-before all-after clean clean-custom
+ 
+@@ -37,22 +37,22 @@
+ 	rm -f *.o *~ *.d $(BIN) $(BIN).exe
+ 
+ $(BIN): $(OBJ)
+-	$(CC) $(LINKOBJ) -o $(BIN) $(LIBS)
++	$(CXX) $(LDFLAGS) $(LINKOBJ) -o $(BIN) $(LIBS)
+ 
+ scrobble-cli.o: scrobble-cli.cpp
+-	$(CC) -c scrobble-cli.cpp -o scrobble-cli.o $(CFLAGS)
++	$(CXX) -c scrobble-cli.cpp -o scrobble-cli.o $(CXXFLAGS)
+ 
+ libscrobble.o: ../lib/libscrobble.cpp
+-	$(CC) -c ../lib/libscrobble.cpp -o libscrobble.o $(CFLAGS)
++	$(CXX) -c ../lib/libscrobble.cpp -o libscrobble.o $(CXXFLAGS)
+ 
+ md5.o: ../lib/md5.c
+-	$(CC) -c ../lib/md5.c -o md5.o $(CFLAGS)
++	$(CXX) -c ../lib/md5.c -o md5.o $(CXXFLAGS)
+ 
+ ConvertUTF.o: ../lib/ConvertUTF.c
+-	$(CC) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CFLAGS)
++	$(CXX) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CXXFLAGS)
+ 
+ mtp.o: ../lib/mtp-libmtp.cpp
+-	$(CC) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CFLAGS)
++	$(CXX) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CXXFLAGS)
+ 
+ install:
+ 	install -D -m 755 scrobble-cli -p $(DESTDIR)$(bindir)/scrobble-cli
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch
new file mode 100644
index 000000000000..d6802751f0e0
--- /dev/null
+++ b/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch
@@ -0,0 +1,16 @@
+g++ -c ../lib/mtp-libmtp.cpp -o mtp.o -Wall -I../lib `curl-config --cflags` `pkg-config --cflags libmtp` -DHAVE_LIBMTP
+../lib/mtp-libmtp.cpp: In member function ‘void Scrobble::mtp_iterate(bool)’:
+../lib/mtp-libmtp.cpp:104:30: error: ‘free’ was not declared in this scope
+
+http://bugs.gentoo.org/405667
+
+--- src/lib/mtp-libmtp.cpp
++++ src/lib/mtp-libmtp.cpp
+@@ -16,6 +16,7 @@
+  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
+  ***************************************************************************/
+ 
++#include <cstdlib> /* free */
+ #include <iostream>
+ #include "libscrobble.h"
+ 
diff --git a/media-sound/qtscrobbler/metadata.xml b/media-sound/qtscrobbler/metadata.xml
new file mode 100644
index 000000000000..2ef2af033cb1
--- /dev/null
+++ b/media-sound/qtscrobbler/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="cli">Build commandline client</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">qtscrob</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
new file mode 100644
index 000000000000..c03b41f39d2b
--- /dev/null
+++ b/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils gnome2-utils qt4-r2 toolchain-funcs
+
+MY_PN=qtscrob
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Updates a last.fm profile using information from a supported portable music player"
+HOMEPAGE="http://qtscrob.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="cli +qt4"
+
+RDEPEND=">=media-libs/libmtp-1.1.0
+	net-misc/curl
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-Makefile.patch \
+		"${FILESDIR}"/${P}-free.patch
+}
+
+src_configure() {
+	if use qt4; then
+		pushd src/qt >/dev/null
+		eqmake4 ${MY_PN}.pro
+		popd >/dev/null
+	fi
+}
+
+src_compile() {
+	if use cli; then
+		tc-export CXX
+		emake -C src/cli
+	fi
+
+	if use qt4; then
+		emake -C src/qt
+	fi
+}
+
+src_install() {
+	if use cli; then
+		newbin src/cli/scrobble-cli qtscrobbler-cli
+	fi
+
+	if use qt4; then
+		pushd src/qt >/dev/null
+		newbin qtscrob qtscrobbler
+		insinto /usr/share/icons/hicolor/128x128/apps
+		newins resources/icons/128.png qtscrobbler.png
+		make_desktop_entry qtscrobbler QtScrobbler
+		popd >/dev/null
+	fi
+
+	dodoc AUTHORS CHANGELOG README
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/quark/Manifest b/media-sound/quark/Manifest
new file mode 100644
index 000000000000..cedea1b026fe
--- /dev/null
+++ b/media-sound/quark/Manifest
@@ -0,0 +1,6 @@
+AUX quark-3.24-build.patch 2865 SHA256 5fa4d91b9fec0ea65e96379f5cf9b7a2923a972f2978eb143b47a527beab8156 SHA512 11212f9ff12f192645fc41a7f1cb17e94c649db03dfe46fdbcc7cc2ff3f40826954b603d1b1aedb97f8a5443e7d3a1d9b9103ad2d7eca7fee6ac395ee554e132 WHIRLPOOL 0995ded70e4e25154703f83ef7b210d76eeeb3132e37cb803233f211ad7f2b47c8e1248473580ba16450e3fa97bcdab959cdd95925ea5a9034d92d1a997ba662
+DIST quark-3.24.tar.gz 215417 SHA256 afac7b03082fd581412cf701187a21a4d6f6eea75c207b366f4b1dc939fff04c SHA512 a34a3160ab4cfe976cbabd6b2d94cc21ca263c069c53ad6244ed23674e17bf713dc759af998d4ae74720c91ba5e452e3996408d6ae11305bf581eb9a71876a01 WHIRLPOOL bb90b6087cc48ef7333332b77f183f222a9cc85260a972694f145ad28a0ae80e377d0533d8719bed8d087f2532b52859858755f6426c81d11fa5e46d6c7751da
+EBUILD quark-3.24.ebuild 1379 SHA256 85e96be6e0daa0cf8a600c3c54d9adfa80e6e023f20e99e896e56950c408c87f SHA512 f4544169c56260c373a96684d114cb9e9d71c78e7b873fc79e3d61cd6e271a415adc5cbbb94edc3bd378a315b6d1b4754bc9320c358fd1e5c23e7bd9e985548b WHIRLPOOL fbd1a637074ca919c803f77ab7f16b49df56e107ed4bbe373d41cd1d6b8ccd5f4459991953007d2e71b3789ddd79dd7ad8e9c3418e0b1c0f55f877709aa019c6
+MISC ChangeLog 2858 SHA256 622ecd2709f797e2030d13e1b812fa980475388dd6baa7cbc96dcc580d73c636 SHA512 b5291640b7e52dd694953309282a35405715c2e3fe390d79590a94736a0a839f19a6a2cf0648b60963f32dcafac29e62d1bf501ce990998ec1b59f60ded2a8ea WHIRLPOOL 456323d64f8eda8143498f1b7c3c34a90a04f432e1c73ca8b606499f72968a8e822beebe30f0bbe06fdb0b8e44f8df07ff1e9eaf270f75f7c0588206ccabfe6a
+MISC ChangeLog-2015 2641 SHA256 a3b40f956b269eeb2e3c37eb23d7c3ee7190c52e66aba4717e2cc1b2eb922e2c SHA512 c0786c2ab229d78fbc4bdcf75e154a385c3d0b826010c6cf7cba4c4adced87759203e177676ef5fd015212e29fee4ee47eff83cc4664a921537fb311f1e24357 WHIRLPOOL 51b22b4acc1e43bdbfcbdd28ab11c841b597c9c8db126ecb0d18e333e9769905f4792d5a79ff75ff8841c819beeb7f7445422873bcbbe6121b2385ff9dea007f
+MISC metadata.xml 341 SHA256 84106bee0b9b0834b4c13a5f44abeb653eeb5bcb038be4d437be06a42a5a415d SHA512 acf7dab27e45ec4a03cfc7db8c8728f64830e5b715203f810fc10ad942c1f9b7f1fe149ff8909e842f095bb15334a2665922c2b1430930691e1eec309107abec WHIRLPOOL 209ea596eaecd78888e4433d7b650e55ddcc394e10767bf7c2bcf0db722847a00267f9f3a94e387fa0a2cf97029e69ce316ae0864a3897633db5b07af9dc3580
diff --git a/media-sound/quark/files/quark-3.24-build.patch b/media-sound/quark/files/quark-3.24-build.patch
new file mode 100644
index 000000000000..479af4b11fac
--- /dev/null
+++ b/media-sound/quark/files/quark-3.24-build.patch
@@ -0,0 +1,107 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu May 31 13:46:18 UTC 2012
+Subject: build system
+
+fix underlinking ( https://bugs.gentoo.org/show_bug.cgi?id=367859 )
+remove DEPRECATED flags ( https://bugs.gentoo.org/show_bug.cgi?id=387823 )
+fix permissions on schema files
+make icondir modifiable
+
+--- configure.ac
++++ configure.ac
+@@ -41,6 +41,10 @@
+ AC_SUBST(GTHREAD_CFLAGS)
+ AC_SUBST(GTHREAD_LIBS)
+ 
++PKG_CHECK_MODULES(X11, [x11])
++AC_SUBST(X11_CFLAGS)
++AC_SUBST(X11_LIBS)
++
+ AC_ARG_ENABLE(gconf,
+   [  --disable-gconf         disable use of gconf (for embedded targets)],
+   [], [enable_gconf="yes"])
+@@ -64,6 +68,13 @@
+ fi
+ AM_CONDITIONAL(USE_GCONF, test "$enable_gconf" = "yes")
+ 
++AC_ARG_WITH([icondir],
++	    [AC_HELP_STRING([--with-icondir=DIR],
++			    [where icon gets installed to (default: datadir/pixmaps)])],
++	    [icondir="$withval"],
++	    [icondir="$datadir/pixmaps"])
++AC_SUBST(icondir)
++
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_FILES([
+   Makefile
+--- quark/Makefile.am
++++ quark/Makefile.am
+@@ -1,7 +1,6 @@
+ localedir=$(datadir)/locale
+ 
+ AM_CPPFLAGS=$(GLIB_CFLAGS) $(GTHREAD_CFLAGS) $(GNOMEVFS_CFLAGS) $(GCONF_CFLAGS) $(XINE_CFLAGS) \
+-  -DG_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED \
+   -DLOCALEDIR=\"$(localedir)\"
+ 
+ bin_PROGRAMS = quark
+@@ -30,7 +29,7 @@
+ 	gconftool-2 --makefile-install-rule $<
+ endif
+ 	$(INSTALL) -d $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
+-	$(INSTALL) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
++	$(INSTALL_DATA) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
+ 
+ uninstall-local:
+ 	$(RM) $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/quark.schemas
+--- strange-quark/Makefile.am
++++ strange-quark/Makefile.am
+@@ -6,14 +6,13 @@
+   $(GTK_CFLAGS) \
+   $(GCONF_CFLAGS) \
+   $(GDK_PIXBUF_CFLAGS) \
+-  -DG_DISABLE_DEPRECATED \
+   -DG_LOG_DOMAIN=\"strange-quark\" \
+-  -DPIXMAPDIR=\"$(pixmapdir)\" \
++  -DPIXMAPDIR=\"$(icondir)\" \
+   -DLOCALEDIR=\"$(localedir)\"
+ 
+ bin_PROGRAMS = strange-quark
+ 
+-strange_quark_LDADD = $(GTK_LIBS) $(GCONF_LIBS)
++strange_quark_LDADD = $(GTK_LIBS) $(GCONF_LIBS) $(X11_LIBS)
+ strange_quark_SOURCES = \
+   gettext.h \
+   main.c \
+@@ -43,7 +42,7 @@
+ 	gconftool-2 --makefile-install-rule $<
+ endif
+ 	$(INSTALL) -d $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
+-	$(INSTALL) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
++	$(INSTALL_DATA) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
+ 
+ uninstall-local:
+ 	$(RM) $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/strange-quark.schemas
+--- pixmaps/Makefile.am
++++ pixmaps/Makefile.am
+@@ -1,8 +1,5 @@
+-pixmapdir = $(datadir)/pixmaps
+-
+-pixmap_DATA = \
+-  quark.png \
+-  quark48.png
++icon_DATA = \
++  quark.png
+ 
+ EXTRA_DIST = \
+   quark.png \
+--- strange-quark/quark.desktop
++++ strange-quark/quark.desktop
+@@ -3,7 +3,7 @@
+ Name=Quark Music Player
+ Comment=Play music from the system tray
+ Exec=strange-quark
+-Icon=quark48.png
++Icon=quark.png
+ Terminal=false
+ Type=Application
+ Categories=Application;AudioVideo;
diff --git a/media-sound/quark/metadata.xml b/media-sound/quark/metadata.xml
new file mode 100644
index 000000000000..5d2ab12cccea
--- /dev/null
+++ b/media-sound/quark/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="gnome">Provides tray-icon and enables gconf support</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/quark/quark-3.24.ebuild b/media-sound/quark/quark-3.24.ebuild
new file mode 100644
index 000000000000..71a2a4351eeb
--- /dev/null
+++ b/media-sound/quark/quark-3.24.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+# I don't want gnome2 eclass
+inherit autotools eutils fdo-mime gnome2-utils
+
+DESCRIPTION="Quark is the Anti-GUI Music Player with a cool Docklet!"
+HOMEPAGE="https://hsgg.github.com/quark/"
+SRC_URI="https://hsgg.github.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="gnome"
+
+RDEPEND="dev-libs/glib:2
+	gnome-base/gnome-vfs:2
+	media-libs/xine-lib
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	gnome? ( gnome-base/gconf:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS README"
+
+src_prepare() {
+	# sandbox violations
+	gnome2_environment_reset
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+
+	# fix underlinking wrt #367859
+	# remove DEPRECATED flags wrt #387823
+	epatch "${FILESDIR}"/${P}-build.patch
+	eautoreconf
+}
+
+src_configure() {
+	# debug switch only provides cflags
+	econf \
+		--disable-debug \
+		--with-icondir=/usr/share/icons/hicolor/48x48/apps \
+		$(use_enable gnome gconf)
+}
+
+pkg_preinst() {
+	use gnome && gnome2_gconf_savelist
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if use gnome ; then
+		gnome2_gconf_install
+		gnome2_schemas_update
+	fi
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gnome && gnome2_schemas_update
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/quimup/Manifest b/media-sound/quimup/Manifest
new file mode 100644
index 000000000000..aec412d96eb9
--- /dev/null
+++ b/media-sound/quimup/Manifest
@@ -0,0 +1,6 @@
+AUX quimup-1.4.0-qdatastream.patch 298 SHA256 2516587f849fcf46db669e584c3f19d6a57fb359fae31d908a36afd22de6fd49 SHA512 04cd65acabdeee81a7002a3a9402213d842ae1aea52832549ebfa1037c9279ab4e2e3503f4fc6c0fd410d974b00838da6214fe1f11df311d57c15dc51a7e5abb WHIRLPOOL 37a034ea92be88faad23213b4d0ad2fd0686df446244f60ee57f7e5a4b835310b27c37ede0f7d3f96a011b23d4713a4f0604cfb1d7746b94184a730ffbe1dbcc
+DIST quimup_1.4.0_src.tar.gz 225621 SHA256 b46f8ff651b9154a43cf90b005c160cbbddcc2fb8c6b17dfdee9b6c4a2e131ea SHA512 e5351d33a8082371fa50914381fcb7d0b15fe2d8d65feab64774c2d85476b6135d199a17bf125d2e39fa64916bc3d31da1ba5eec6b274ff6298e0b93237f8b61 WHIRLPOOL c51e3ebe1a686415358f92aa7485f9bb03334f54fa53deaf8fabfcf8ea637f5e0dbd0ee9f10cba7fe2513e0d87586ff053d2f837adee7447fed3f8e7bceed3ce
+EBUILD quimup-1.4.0.ebuild 848 SHA256 22007f203bc2dbeb9a1d3434a0f52c761109fbf329177b872b52cd39ad97d64d SHA512 d45bb1a1a4c0974faadd572b382ba997aaf02d88f0d3febb30bb5623dd9761f49d861a0974a375305f54d65cbcaaa98cb2774860672acea2fa5397da4cda8f8b WHIRLPOOL 43573ec70c3739ba96283c369bd9b375fa09fa71cf635596674c583b605a49b9a8ad6bfb4d8c738ece2755b9691e3908a2823e5ed6d56ffa62bd19e452fc1d8e
+MISC ChangeLog 3196 SHA256 b7681b9ec02f3b589bce135d4d4aa0c1d645dc3f8bfc85bb70fd1a1c0274e6a4 SHA512 dd4b7e5a319a14ba0f09a5834515703890057a0c2ea591d99b43d4e7458514f28f01af35f20282b673df9055f68781c893748775085e04050e0cab136b918715 WHIRLPOOL 9d0094881faa1ef2b29c5e3230abe2ebdf999567da196c35b646c8b141c60765d64fc92dd1cff9a312ddd38d4670e3520bd243b35b2f1f9ec5b5fb6b3cdd79cb
+MISC ChangeLog-2015 3036 SHA256 ef1384ff2817fe65d137e100bd37b1513323bdf7d999711068780d208c5e74e3 SHA512 5a419e1c7150b0c2101f589cde3da4c268bf20af5f685f000617aa1de1094216c552130f8c20dc3fc5aeb2cdbf5955893e4380175d09904f177d346a0010c0ca WHIRLPOOL b60aed7423cf6241d6fe67f1cc3c43cc3d9b134bc7b2ccbd19c0d76ab5ee02962c7a03fc31a2ccc03f2c7f5b1febb69ba95076a56d499b47aa941abaf23efe8a
+MISC metadata.xml 339 SHA256 925b29036d33af347a8a3de860f314c92c28285a1c0cfddff85e90bd5c600afc SHA512 02c262de7f82e49ebd91d60aa4e6577b8c4cead1b0b1df8a7bc18b575358e93b17384bc42ace5cf64b13116db9077fbc2262f110f6308cfa3621e994170cebd6 WHIRLPOOL 2ec2746c6758b95afc6c5797e77ec4806a7f005cbd45d4b168d1954c1ff993ea6f6aa6d9c50f564a198ec899f934644bbd5a992b71dcc1280451236e9fed77d4
diff --git a/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch b/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch
new file mode 100644
index 000000000000..3f1396fcc704
--- /dev/null
+++ b/media-sound/quimup/files/quimup-1.4.0-qdatastream.patch
@@ -0,0 +1,12 @@
+diff --git a/src/qtlocalpeer.cpp b/src/qtlocalpeer.cpp
+index ddd2c74..52d6e6c 100644
+--- a/src/qtlocalpeer.cpp
++++ b/src/qtlocalpeer.cpp
+@@ -41,6 +41,7 @@
+ #include "qtlocalpeer.h"
+ #include <QCoreApplication>
+ #include <QTime>
++#include <QDataStream>
+ 
+ #if defined(Q_OS_WIN)
+ #include <QLibrary>
diff --git a/media-sound/quimup/metadata.xml b/media-sound/quimup/metadata.xml
new file mode 100644
index 000000000000..b82bb04a8443
--- /dev/null
+++ b/media-sound/quimup/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">quimup</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/quimup/quimup-1.4.0.ebuild b/media-sound/quimup/quimup-1.4.0.ebuild
new file mode 100644
index 000000000000..c0bee4f81dfb
--- /dev/null
+++ b/media-sound/quimup/quimup-1.4.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qmake-utils
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="A Qt5 client for the music player daemon (MPD) written in C++"
+HOMEPAGE="http://mpd.wikia.com/wiki/Client:Quimup"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	>=media-libs/libmpdclient-2.3
+	media-libs/taglib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN} ${PV}"
+
+DOCS=( changelog FAQ.txt README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qdatastream.patch
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	default
+	dobin ${PN}
+
+	newicon src/resources/mn_icon.png ${PN}.png
+	make_desktop_entry ${PN} Quimup
+}
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
new file mode 100644
index 000000000000..4d558ce1125f
--- /dev/null
+++ b/media-sound/quodlibet/Manifest
@@ -0,0 +1,9 @@
+DIST quodlibet-3.7.1.tar.gz 3651908 SHA256 229a26289880860abfd0ec31d9f0aa830c84a3f78205feb11f3ec710e02f02cd SHA512 73f2a909e29178fb4074dbf451a6d04170aebecb7934248b04b909f9639c9098054eefe3343cfb67cc3c622f6d453b5417e5233d4d2ec9c87c48a0c5b4debf4f WHIRLPOOL 2149daf74da7bc01a9822d841de7634c72cca02ef2ab59ae8ac2cd4716e72bed2d6f3342c3b32ddd66c393ecab7c311729e424175a8c7264de0edf2525391187
+DIST quodlibet-3.8.1.tar.gz 3697363 SHA256 7c26ddd391a7b3d2bcdb4b009b005db604a133a059499284613436a88d164401 SHA512 5f8f7ba3157dea83782c64989114ad38295c660300284b72e825eba46eae053120c96e60518d573b4010dd49e396a4fe8d04788e632e61e38fa6edd953014275 WHIRLPOOL b3d73a78dbf77b14d04e6fdb1c1b154a9106d364e62d55f25acc7e750eed6cf39a6584b3c9409bd1cb45d322ebd3268e45e36bfc455647fa2c9fbe7961648a3b
+DIST quodlibet-3.9.1.tar.gz 3850929 SHA256 75dcbac8ec4452f501be775d81d1690230d14de09ad0c788a7dff57db22bffc6 SHA512 6d6b6380de2fc2d3ab1614b304f2d7219ff1d823e03f532baa0e9b1308fd36094ad745433494253d956182ae9914eb62846df3d3e5fea92dddccdaa725178563 WHIRLPOOL ad60e6d7216910e56fc9aecdd068fac09fee26bd8e5b749f2926d9b68a1d84ef61008869635490efad0eb8e84934d7643b03c3d65d7c2881c4cfa420ae36f969
+EBUILD quodlibet-3.7.1.ebuild 1673 SHA256 b9d9c7c3f59258993db21537136d6d2a1772e00cc8efe620be5c467a8caec4aa SHA512 9c31b63c2387b8b3f57515b5d6e35127f488af5c2308bf9470fa649ecf3819c8a4a391f8cd6c3148a5fd72685bab1f88ba86359881d380dde0f1dbbc458383f1 WHIRLPOOL 3eeccb06592b5acf87200c43e23cb4ffcaf26755e8d7a2e50159a96ab5f3349ced416df368f245803f92826e91235f40ef4ab1d4e62cc6bff1d03cf7ef41ca81
+EBUILD quodlibet-3.8.1-r1.ebuild 1726 SHA256 299b1090c30644d6bb81171cf65faff09680a10ecd3b99c8f7ac8a7e8be8ca23 SHA512 96f66cf45c75e536b9ddd55c81baf932e9dd58c356eea676a4011032eedd3456b1a1ea226f36df5137db1cb31ac95d1a9bccb6ab7bf6aef2b23c383ba604544d WHIRLPOOL 26e645d3e03b3266d918155bb94150cf2ced27f090cbe62fe6e73b7ec1478a0a7abb9d3895e3f21f57c2cf9acba664dc1763505a7e8a9c4950770133cda1a6d1
+EBUILD quodlibet-3.9.1.ebuild 1776 SHA256 ebe76c79036dc1eb6c2a105b1f916cb5ef6d5a979e929ade8f85688615724393 SHA512 f80e1e31c053d01dae188726ff2100a2c819e2108119e88374ecd1cee2dc5cda3cb4756f59ad8f442ca0dbcce44394f6c456a37bee84ccfbcea9bed46f869941 WHIRLPOOL 336df4ace252a517a9efbae4a294b661c54125cb375f35595f7663c2eebcf490d44f2d3bdfa2786e9d40153ee99aed83fd26873149a5f188dfa7344d2fcdc9f1
+MISC ChangeLog 6291 SHA256 d1424a537c23475774941e8c7f58878c6a4d399f9502116df902d0e64d727c75 SHA512 20b973a06a26034fe4ec919659bd7920656be515db6499516201c5af7a63e1626b2fc8fa864b43fcba24b6a30e4865a75fa1358186ff60cdace9b3ec52933d77 WHIRLPOOL 651383dc1d1f0c54c1424f4fe9aca8d818e487329147d8c09372f9052776b783f8a32b4a0389e0ccb13f941bf58e152d32f1734873fab3b9d68d6ae339fdb78d
+MISC ChangeLog-2015 18654 SHA256 344b3be0028bac35491d9f83361175c8bfd903d2a49215ec9bea8e07c8c58d62 SHA512 3c58c198af43cdaace04a56a3f8c460632457020ab1d10b9b3ead7b670c6eb8811460bd2d8e58d0d5a4ae8c8cc9052025ce2fbe7a59a357fc54e19999e60825f WHIRLPOOL f243c465995b0be74f03c569eebd0a373ed96f45654f92deab9babadb663a65b2fb051980f3d474969646089cb97c4c11880906234a2f588c3e9052b54974130
+MISC metadata.xml 1136 SHA256 6be1cbff9592348aa06da7735b2f02a12311cf3d606d3e2d2b6aecd987090cd4 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb WHIRLPOOL 422de4d13394477660f396b8825c96fa26f87d151e623f9355e9090540ebf5283bb5729e72fcfbb90f5afda0a03071caf8dbd350408d2457a05840abd9b67674
diff --git a/media-sound/quodlibet/metadata.xml b/media-sound/quodlibet/metadata.xml
new file mode 100644
index 000000000000..6c2b729f2933
--- /dev/null
+++ b/media-sound/quodlibet/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>klausman@gentoo.org</email>
+		<name>Tobias Klausmann</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription>Quod Libet is a GTK+-based audio player written in Python. It's 
+	designed around the idea that you know better than we do how to 
+	organize your music. It lets you make playlists based on regular 
+	expressions (don't worry, regular searches work too). It lets you 
+	display and edit any tags you want in the file. And it lets you do 
+	this for all the file formats it supports -- Ogg Vorbis, FLAC, MP3, 
+	Musepack, and MOD.</longdescription>
+	<upstream>
+		<remote-id type="google-code">quodlibet</remote-id>
+		<remote-id type="github">quodlibet/quodlibet</remote-id>
+		<remote-id type="bitbucket">lazka/quodlibet-files</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/quodlibet/quodlibet-3.7.1.ebuild b/media-sound/quodlibet/quodlibet-3.7.1.ebuild
new file mode 100644
index 000000000000..3732b05d0912
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-3.7.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 gnome2-utils fdo-mime
+
+DESCRIPTION="audio library tagger, manager, and player for GTK+"
+HOMEPAGE="http://quodlibet.readthedocs.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="+dbus gstreamer ipod +udev"
+
+RDEPEND="dev-libs/keybinder:3[introspection]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.32[${PYTHON_USEDEP}]
+	net-libs/libsoup
+	x11-libs/gtk+[introspection]
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-meta:1.0
+		)
+	!gstreamer? ( media-libs/xine-lib )
+	dbus? (
+		app-misc/media-player-info
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		)
+	ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] )
+	udev? ( virtual/udev )
+	!media-plugins/quodlibet-plugins"
+DEPEND="dev-util/intltool"
+REQUIRED_USE="ipod? ( dbus )"
+
+S="${WORKDIR}/${PN}-release-${PV}/${PN}"
+
+src_prepare() {
+	local qlconfig=${PN}/config.py
+
+	if ! use gstreamer; then
+		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
+	fi
+
+	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc NEWS README
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/quodlibet/quodlibet-3.8.1-r1.ebuild b/media-sound/quodlibet/quodlibet-3.8.1-r1.ebuild
new file mode 100644
index 000000000000..bbdb1c99bb4e
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-3.8.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 gnome2-utils fdo-mime
+
+DESCRIPTION="audio library tagger, manager, and player for GTK+"
+HOMEPAGE="http://quodlibet.readthedocs.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="+dbus gstreamer ipod +udev"
+
+RDEPEND="dev-libs/keybinder:3[introspection]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/futures[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.32[${PYTHON_USEDEP}]
+	net-libs/libsoup[introspection]
+	x11-libs/gtk+[introspection]
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-meta:1.0
+		)
+	!gstreamer? ( media-libs/xine-lib )
+	dbus? (
+		app-misc/media-player-info
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		)
+	ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] )
+	udev? ( virtual/udev )
+	!media-plugins/quodlibet-plugins"
+DEPEND="dev-util/intltool"
+REQUIRED_USE="ipod? ( dbus )"
+
+S="${WORKDIR}/${PN}-release-${PV}/${PN}"
+
+src_prepare() {
+	local qlconfig=${PN}/config.py
+
+	if ! use gstreamer; then
+		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
+	fi
+
+	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc NEWS README
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/quodlibet/quodlibet-3.9.1.ebuild b/media-sound/quodlibet/quodlibet-3.9.1.ebuild
new file mode 100644
index 000000000000..1211cda94c3f
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-3.9.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 gnome2-utils xdg-utils
+
+DESCRIPTION="audio library tagger, manager, and player for GTK+"
+HOMEPAGE="http://quodlibet.readthedocs.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+dbus gstreamer ipod +udev"
+
+RDEPEND="dev-libs/keybinder:3[introspection]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/faulthandler[${PYTHON_USEDEP}]
+	dev-python/futures[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.32[${PYTHON_USEDEP}]
+	net-libs/libsoup[introspection]
+	x11-libs/gtk+[introspection]
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-meta:1.0
+		)
+	!gstreamer? ( media-libs/xine-lib )
+	dbus? (
+		app-misc/media-player-info
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		)
+	ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] )
+	udev? ( virtual/udev )
+	!media-plugins/quodlibet-plugins"
+DEPEND="dev-util/intltool"
+REQUIRED_USE="ipod? ( dbus )"
+
+S="${WORKDIR}/${PN}-release-${PV}/${PN}"
+
+src_prepare() {
+	local qlconfig=${PN}/config.py
+
+	if ! use gstreamer; then
+		sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
+	fi
+
+	sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	distutils-r1_src_install
+	dodoc NEWS README
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg-utils_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg-utils_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/rawrec/Manifest b/media-sound/rawrec/Manifest
new file mode 100644
index 000000000000..e813872c9351
--- /dev/null
+++ b/media-sound/rawrec/Manifest
@@ -0,0 +1,6 @@
+AUX rawrec-libs.patch 817 SHA256 e32907dd341bd64fc8ccbd8613ee0d92d186a001278b380b28ad8111a0e045e7 SHA512 86707ebc6533c137c3a569394cbfd17626dd855e2caeebe2a469091ad5d88f50932e4b4717d4e9cf88e44678c4bc51f74bfccd04c13d98f6e3471300fdaf4dd8 WHIRLPOOL 4159b87ec3c335c3ff7654564b4b9258c0f75d682270d8674f593a8f7dc0feaf67769f7453ec74fe873758438b21e34005cfc3c363f8f60a21c2972b11c5076d
+DIST rawrec-0.9.991.tar.gz 62134 SHA256 1b65d65ae5f11650cc9cd2c10d54ac379eaaa802b89b08423b6a95046faac03f SHA512 3f0c6080b246231089cf01dbb5be0e9e6749cd9d339a9d3ea865681e836767c69909bb9f70ef7d87b39298603438169e9531e957e364dfcbe64aef074f862d90 WHIRLPOOL 06748822741ca6d82e4c1e63de442d47a4ec939ee3fdce68b0fa1f091eb5805abee6f0de2707b692d315fd2306cbf615c5a7e0ec0659c0163311eaf9570299f2
+EBUILD rawrec-0.9.991.ebuild 751 SHA256 89bbfef39303861f08b59405a146170ee9801bc03705f114bf2477ed491c0558 SHA512 e56e377590aa4a5dfa21504f008b7f174eea5e5389079da5d4f20dc08089e0ee5703193ca3d8fdd38730ea4048e77e7c3f796041d8474c0c9a1d976d0e704a76 WHIRLPOOL 49ae1b76ba413f5125b0d470f975907f773de1f716cdaa9f0c460ee590a62c69b7fd98e0d8110926b42b2140f08a8436c48f0457755842d4b9f535c1a07aa485
+MISC ChangeLog 2457 SHA256 8a3a0533150fec7449f48a818d69e0436c79f618d9880562a80877afe6d12af4 SHA512 d5fe71c555fea73fb61041522bddcd184ba3e8c7dcc98b30d30227c041f75a439cb8664aef17bfd1fc389c692e4929efa2931fa90abf16b1de6b8d9849dee25a WHIRLPOOL 82c44599dfb43b33838670548d5a7c34c394db2220db14e160e5deef04c79ae962031c8bfc2928e81513d1ec4209e16c391de842ed6df42de2516560b03a9549
+MISC ChangeLog-2015 2578 SHA256 56ce4bb6bfe6feff9086daf880ef68a7e83becdca9a6f09138601a8283f154e7 SHA512 3feebe26086afe299a902b1448f88951970675a2774be1b75642045cb340a46b096405bb9f01b2903c94d02403897e11cfc39ed487060463ddbba31c2595de2b WHIRLPOOL 5c13a9f7750e424869c2163f153d7947ba26790bc26b83d765b29d9679594ce08dd676aa369b30509d7b0e68802154f9f40a9b49dda7de011c33615609474f15
+MISC metadata.xml 329 SHA256 1b68725892120ee00bd06ea754979cbb51494cd0bb1747923f6152931304effb SHA512 03288474cb2d673f67059727711ae15215ea738740e473082470065728892794d13cf2c7426b48d93a85adbcf805d81f1b3eeb2f89dec08fe459a4202f6f87cb WHIRLPOOL 495aac2a5e09b4e5d7bba0b31754a0ac8c40b9e5d11a0154debcbe7bd0aad97169ddf7f7c0728fbc55b0b002fcbb62540c15b0be4bad66f3cf49a638b645d7dc
diff --git a/media-sound/rawrec/files/rawrec-libs.patch b/media-sound/rawrec/files/rawrec-libs.patch
new file mode 100644
index 000000000000..c894c5ba692d
--- /dev/null
+++ b/media-sound/rawrec/files/rawrec-libs.patch
@@ -0,0 +1,22 @@
+Index: src/Makefile
+===================================================================
+--- src.orig/Makefile
++++ src/Makefile
+@@ -19,7 +19,7 @@ OPTFLAGS = -O2
+ CFLAGS = $(WARNFLAGS) $(OPTFLAGS) $(DEBUGFLAGS) -DUSEBUFFLOCK \
+          $(FANCY_THREAD_DEFINES) -D_REENTRANT -D_GNU_SOURCE \
+          -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+-LDFLAGS = -lm -lpthread
++LIBS = -lm -lpthread
+ 
+ # The GNU way is just too painful.  I'm not writing three tiers of
+ # variables just to get to /usr/local/man/man1.  If it starts to seem 
+@@ -35,7 +35,7 @@ MAN_DIR = /usr/local/man/man1
+ all: $(PROG) $(ALT_INVOC)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(OBJS) $(LDFLAGS) -o $(PROG)
++	$(CC) $(LDFLAGS) $(OBJS) -o $(PROG) $(LIBS)
+ 
+ # Everything is rebuilt if this Makefile (which is hopefully named
+ # "Makefile") or any header changes.
diff --git a/media-sound/rawrec/metadata.xml b/media-sound/rawrec/metadata.xml
new file mode 100644
index 000000000000..b963d482205a
--- /dev/null
+++ b/media-sound/rawrec/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">rawrec</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/rawrec/rawrec-0.9.991.ebuild b/media-sound/rawrec/rawrec-0.9.991.ebuild
new file mode 100644
index 000000000000..2364bfd5a25e
--- /dev/null
+++ b/media-sound/rawrec/rawrec-0.9.991.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="CLI program to play and record audiofiles"
+HOMEPAGE="http://rawrec.sourceforge.net"
+SRC_URI="mirror://sourceforge/rawrec/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+S="${S}"/src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-libs.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed."
+}
+
+src_install() {
+	emake EXE_DIR="${D}/usr/bin" \
+		MAN_DIR="${D}/usr/share/man/man1" install || die "emake install failed."
+
+	einfo "Removing SUID from binary.."
+	fperms 755 /usr/bin/rawrec
+}
diff --git a/media-sound/rcenter/Manifest b/media-sound/rcenter/Manifest
new file mode 100644
index 000000000000..cd9041a6f787
--- /dev/null
+++ b/media-sound/rcenter/Manifest
@@ -0,0 +1,6 @@
+AUX rcenter-0.6.2-makefile.patch 555 SHA256 badd0045a8b545acaa09d719be7f34c24711390641140df0c004afc10f2de1b3 SHA512 385c22722ac44ae17420135f68e72ece74a4c3ee1e2eddd578b441c1a32efa6d9ccfc2b80f154475c5a434b49e029189fc1c21682c0a5530e81bb129fdfd041c WHIRLPOOL ce603dc008e70be80b5d73be30e46d3ad3b0320f6891a1d883a050efdcf77c1fb608ccad1f044e5ba05fb2234f59f96fa0e96cbec8629be3eda609895cb3249c
+DIST rcenter-0.6.2.tgz 15053 SHA256 53b82756e11bc2e4e64242e0fd7f37aa5ceb5179d45b504c598958b9d101a800 SHA512 0db7780c3c9f991ff79a9513fcb1640b18050336241d52b99fc63c8632a5d0a1d9a96e1e265c41c0ff2f0c11be9ddf17dd6d4d9b1ee8ce92cdcd2afd716e788b WHIRLPOOL da1fa411071661d57d929fbc27a2d3804f3317a9a76832ac77e68ea5cb61ceeb696a63b99e7ac43e2b735f3c3cefb84113bf6a2378c5b7b9243e4d2fc284a209
+EBUILD rcenter-0.6.2.ebuild 1125 SHA256 e02fe2c094040ae194c6a9d10d62b78f22df5f8d515cd97cea226376d15152fd SHA512 405c37e4b5b32cc9709eb7b219b0ddb4ba1c4c20223f824bec9dc82dbff198b4dd0560730f69e1b26f731f2524888d4d01166ace2a121545ba7da7d90267d46b WHIRLPOOL a10dced5412b3b8ae266bedb80b6508aad0a62ec5947255252eb7d1fa09d437bf6c556182c9fe0fe7b319928385c68a6e00e645bfbbf1492b06ad1e4de7d1dcb
+MISC ChangeLog 2467 SHA256 3135d2cd0eab601ac062e640aeafd08e5546f7d8e0e31e5df51629f03c9e393f SHA512 a4515d093d34490047cda84068ed1197de5c63fb02e26c56d5a2b5504751dd80cbb5a9d82d15cc996a97051fe1448fe194642b9f1a1e44abe0b67ceed1d4f637 WHIRLPOOL 7afe48d6de3498ca8c54ee024ad45ef69b0da7f8188bfa62bde0742e92f198dc0ed546b2499d4138baa2688a0d4f9c0ae243994ce5863ea5db8493b0634f248d
+MISC ChangeLog-2015 1698 SHA256 be5ed942afdcefd93a44796b9455db4e120c57055a5299b6803538e905ac6550 SHA512 13bf3037deaf75c5fa1e6aea549988ddbcfd7610417135f64f2be8f34c634ea959617220df1c56c6335a1ef76b195e19cb88472e4579875d36f198c94dc8a33a WHIRLPOOL 40c141b691d97f789c9c4d2c58d86bffae56719f81d5a0eb44400747ba514848b7f6241675b655913f8f6446d4a02507396688774ea9cdf5240b4de1af2a2908
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch b/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch
new file mode 100644
index 000000000000..2c5fbd761a83
--- /dev/null
+++ b/media-sound/rcenter/files/rcenter-0.6.2-makefile.patch
@@ -0,0 +1,16 @@
+Index: rcenter-0.6.2/Makefile
+===================================================================
+--- rcenter-0.6.2.orig/Makefile
++++ rcenter-0.6.2/Makefile
+@@ -19,9 +19,9 @@ button.o : button.c
+ main.o : main.c
+ 
+ rcenter : main.o lowlevel.o handler.o button.o
+-	$(CC) $(CFLAGS) -o rcenter $^ -lpthread
++	$(CC) $(LDFLAGS) -o rcenter $^ -lpthread
+ 
+-projname := $(shell awk '/RCENTER_VERSION/ { print $$3 }' version.h )
++projname := $(shell gawk '/RCENTER_VERSION/ { print $$3 }' version.h )
+ 
+ install: rcenter
+ 	install -D rcenter $(PREFIX)/bin/rcenter
diff --git a/media-sound/rcenter/metadata.xml b/media-sound/rcenter/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/rcenter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/rcenter/rcenter-0.6.2.ebuild b/media-sound/rcenter/rcenter-0.6.2.ebuild
new file mode 100644
index 000000000000..8e035205dde5
--- /dev/null
+++ b/media-sound/rcenter/rcenter-0.6.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+IUSE=""
+
+DESCRIPTION="Rcenter - A program to control the EMU10K Remote Control"
+HOMEPAGE="http://rooster.stanford.edu/~ben/projects/rcenter.php"
+SRC_URI="http://rooster.stanford.edu/~ben/projects/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-sparc: emu10k1 doesn't get recognized on sparc hardware
+KEYWORDS="amd64 -sparc x86"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	chmod 755 rcenter
+	dobin rcenter
+	dodir /usr/share/rcenter
+	cp -R config "${D}"/usr/share/rcenter/
+	dodoc HISTORY README
+}
+
+pkg_postinst() {
+	elog "Rcenter Installed  - However You need to setup the scripts"
+	elog "for making remote control commands actually work"
+	elog
+	elog "The Skel scripts can be copied from /usr/share/rcenter/config to <user>/.rcenter"
+	elog "Where <user> is a person who will use rcenter"
+	elog "Remeber to use emu-config -i to turn on the remote"
+}
diff --git a/media-sound/redoflacs/Manifest b/media-sound/redoflacs/Manifest
new file mode 100644
index 000000000000..d048d86dca85
--- /dev/null
+++ b/media-sound/redoflacs/Manifest
@@ -0,0 +1,12 @@
+AUX README.gentoo 203 SHA256 643cb1c5f630b691e358f1fb47237a090ca41320d4ea1709b86be0a7ea508f63 SHA512 0a19f8694e723ba19871dd6bac72e91d7df9320205ef5feb67fcc7c4bc5a345c126661704470274e4375824a3acc16b4c20a17ac5cfba8486596334b9bbf9266 WHIRLPOOL 7c1c24795351bcc67f571dbcf17ae6f30f26adeafec8a4ae4729874ca2de3ec5978c6d239079f22ab0d795ac92523db872542442610e2cd1ac1d9bbaf080e371
+DIST redoflacs-0.15.tar.gz 17425 SHA256 3d9d55a1014bf8f099c4d827c21a5a7aa5e3a290ac8c328886b5658caae20864 SHA512 b0305130e50cdf64db190e7d915bb54bcd79906f3a48fec592cb38a3c41d4704ef835d14a8da6ddbaa1fe1aec0306fd0f5bbabf1a93c1a725440518c67e2faec WHIRLPOOL 7201634938a98c104a32765a56da5b20eccc0702dfc853388b5c3f671173f37ae038c4d15b76e6d31e4aabbd7fe2e7067c607a922d9298e4dff913dabb089938
+DIST redoflacs-0.16.2.tar.gz 20193 SHA256 8598c5e301b749f2d82b43a3b2a9f012ed53fe6593f211a87ecc2b56c77b66e1 SHA512 f9f861934a9dfb359912d1b529af615a67eca0779ece8a2ab978161e8dc36d25cb870e97713082469fae2ada4152668db2a7d9c7a8bb1555321d21cff8f91476 WHIRLPOOL 1759d2229aa9086b00ba5de0d6711a0d8e36482798deee46eac281628fc045969d4b5c89bbb671fbbb4f2c315fb243d7247f9badcb90ffaad2288033a1875f79
+DIST redoflacs-0.19.tar.gz 31952 SHA256 c368f69087f2b76483ae23d04079bd9ab46732a05b68f4499b244fb405419730 SHA512 20988dc0c4c2292f343e9af1c0e638487ca0e0ade3653addcf6cb50fac77e389a662e2d69bc0896899618062b008d5caaede8b3a7cd0c634141b0d5849746777 WHIRLPOOL 684f0a0aa06d95b0847c2f90804e80247523aaee4dae4c91958ea1f93e7f2397120fea7a3c8921e8a1fce6e671e9ccf1b5235e3e262f0b651695e5700fadee35
+DIST redoflacs-0.30.tar.gz 40711 SHA256 97a1d1eb28812bf29785c926688f7ec6ca82d0ecbf0f3e2515b73d9cc1075732 SHA512 bdd706909f4609668da1dd80635c486821616310d8de1caac1d4dbce17d8eb76ae04657f7f77fe22a05aabcb0b12d34e2e2c0812d16e973af132ab8a420afc4a WHIRLPOOL 6bb9e370f8ad4e4b649a8876be4b6f6392f7e918abbe545f9aadcb8d973dd854d009122167987047d625c99017aa17170633eac7d9c1af01566f4b6bde32ca6c
+EBUILD redoflacs-0.15.ebuild 743 SHA256 e1e0490a144dd7a8b5ecd4dfcdbbfc40e227920d50187ae7e222a30e5bbeca4d SHA512 aa71afeea8e2443ac73ecf9793d84082701b2746dbb0894ddad6e2d58e4b024085ce200211c900f88f596206c26a1b9538321f6b27f00a14e0a2c2b7919ec9b1 WHIRLPOOL fa73a7b099349fa8f543e1033966bc0d144ca1c6fd4a955b5d62685b7e2c91a5b605ae41609b124facd9677307c0a82f22e2206990f69ed213f270f572574258
+EBUILD redoflacs-0.16.2.ebuild 878 SHA256 b87038ebe953be7b4eea4b6bec2095be6388fef2ab426d1dd1baf062e72bcb5c SHA512 180efa95c4878650aedae58c30e7a3c54601dfb21e6b7a14e6d3104769d7ae2a72966f2e962661f4a4c177b8be7999188198d5bfadca5499857c01407a0aa69f WHIRLPOOL 9a17ef04f66efaf3f65854fc5b70fdf036ef8067653d0e5a357cc63dd11c1b3fef504101edd6e84dfdde42b503710af821367c19867b2d11a2cd27d44e3e1206
+EBUILD redoflacs-0.19.ebuild 562 SHA256 0d8733a1aa537cb267bed9b9394f483faf7677d4457a792ce164681b3ed2bfdf SHA512 20a93abcbd9e339d74d9ab048ed3c24e088efbc2df36b11e5bf8bbec2ee2b71465e3b40f89d0750ebe8efd05e1ee7e4565255045f242ad31290de7216f99684e WHIRLPOOL f585b4f26a9154caadda22146586e8bcb97064be846412331f6c4a8ece057c6feaa7f506027afc0c2848765f8823dd44b052d6c55ea8d3b9ab1d490c6880002f
+EBUILD redoflacs-0.30.ebuild 562 SHA256 0d8733a1aa537cb267bed9b9394f483faf7677d4457a792ce164681b3ed2bfdf SHA512 20a93abcbd9e339d74d9ab048ed3c24e088efbc2df36b11e5bf8bbec2ee2b71465e3b40f89d0750ebe8efd05e1ee7e4565255045f242ad31290de7216f99684e WHIRLPOOL f585b4f26a9154caadda22146586e8bcb97064be846412331f6c4a8ece057c6feaa7f506027afc0c2848765f8823dd44b052d6c55ea8d3b9ab1d490c6880002f
+MISC ChangeLog 2624 SHA256 132e761d96effb46d3a558716fc09063d51c6ce56e0699970852d2e862803b0c SHA512 cfd74d85d745ba7cba777bd0873225f3d0dfa500060b7b92147d9b5c9689013c8788c09cc89f60d9a7acd64b928847d9a3e6d9456cc2b6ffa386af571e1cf673 WHIRLPOOL c13917d4213802f67143777e95ed3ea0b979c80cdd7f695c3bc05cfeb7f073af9682191cf76b336498cf5c7044c12555987f8a4a3e37a0e8a268dc03c7f8d583
+MISC ChangeLog-2015 1424 SHA256 7dfdabc00f8023a0ea32c72994f388a52475abbad21892863ab326d6f734ea38 SHA512 a3c5a0ab82cd35c5eececf33fd12e8db780577359f93674309e4aa9128ceaf2954da1d7fc087a9fcc8108881653a2e852e2ecc66315b076afbf054b14c54d8bc WHIRLPOOL c21e64328b95abb678012240f7a75a4d3a7a77c93d960015a89948aad03d23113962af0a8fcecda7d105319e6a7b0c4f49293297a1dd33b98d66a1469c49127e
+MISC metadata.xml 346 SHA256 1f89749319284ce1bdf795e4da5439620e3bd2845fc7711aa6b564cec5401ba3 SHA512 5d4b3441227598c1dac9c9f901a195cbe8a2d616bdbf851dc755b5e74f36c6b93542ca73666d7cb54dbfb5d44612d6b3ac17fe8b5a64b02778b0de5fd59544eb WHIRLPOOL ddefa3312d75b59b754a7515756c719b0324ce1a0ec9710d8b2494c4f8724f33e07631c52a3207a49347867bdcdcd31a82b6b3084b19ba92bfc04a3160fc7676
diff --git a/media-sound/redoflacs/files/README.gentoo b/media-sound/redoflacs/files/README.gentoo
new file mode 100644
index 000000000000..d1d631bd427f
--- /dev/null
+++ b/media-sound/redoflacs/files/README.gentoo
@@ -0,0 +1,4 @@
+This script makes use of optional programs if installed:
+
+  media-sound/sox      -> for creating spectrograms (enable USE=png)
+  media-sound/aucdtect -> for determining authenticity of FLAC files (CDDA)
diff --git a/media-sound/redoflacs/metadata.xml b/media-sound/redoflacs/metadata.xml
new file mode 100644
index 000000000000..6e23e090c268
--- /dev/null
+++ b/media-sound/redoflacs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">sirjaren/redoflacs</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/redoflacs/redoflacs-0.15.ebuild b/media-sound/redoflacs/redoflacs-0.15.ebuild
new file mode 100644
index 000000000000..e2502c656841
--- /dev/null
+++ b/media-sound/redoflacs/redoflacs-0.15.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vcs-snapshot
+
+DESCRIPTION="Bash commandline flac verifier, organizer, analyzer"
+HOMEPAGE="https://github.com/sirjaren/redoflacs"
+SRC_URI="https://github.com/sirjaren/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-shells/bash
+	media-libs/flac
+	sys-apps/coreutils
+	sys-apps/findutils"
+
+src_install() {
+	newbin redoFlacs.sh redoflacs
+}
+
+pkg_postinst() {
+	elog "This script makes use of optional programs if installed:"
+	elog "   media-sound/sox    ->  support for creating spectrograms"
+	elog "   media-libs/libpng  ->  needed by media-sound/sox"
+}
diff --git a/media-sound/redoflacs/redoflacs-0.16.2.ebuild b/media-sound/redoflacs/redoflacs-0.16.2.ebuild
new file mode 100644
index 000000000000..39d688ace3e0
--- /dev/null
+++ b/media-sound/redoflacs/redoflacs-0.16.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vcs-snapshot
+
+DESCRIPTION="Bash commandline flac verifier, organizer, analyzer"
+HOMEPAGE="https://github.com/sirjaren/redoflacs"
+SRC_URI="https://github.com/sirjaren/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-shells/bash
+	media-libs/flac
+	sys-apps/coreutils
+	sys-apps/findutils"
+
+src_install() {
+	newbin redoFlacs redoflacs
+}
+
+pkg_postinst() {
+	elog "This script makes use of optional programs if installed:"
+	elog "   media-sound/sox       ->  support for creating spectrograms"
+	elog "   media-libs/libpng     ->  needed by media-sound/sox"
+	elog "   media-sound/aucdtect  ->  support for determining authenticity"
+	elog "                             of FLAC files (CDDA)"
+}
diff --git a/media-sound/redoflacs/redoflacs-0.19.ebuild b/media-sound/redoflacs/redoflacs-0.19.ebuild
new file mode 100644
index 000000000000..a41aaed10bde
--- /dev/null
+++ b/media-sound/redoflacs/redoflacs-0.19.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo vcs-snapshot
+
+DESCRIPTION="Bash commandline flac compressor, verifier, organizer, analyzer, retagger"
+HOMEPAGE="https://github.com/sirjaren/redoflacs"
+SRC_URI="https://github.com/sirjaren/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	>=app-shells/bash-4
+	media-libs/flac
+	sys-apps/coreutils"
+
+src_install() {
+	dobin redoflacs
+	readme.gentoo_create_doc
+}
diff --git a/media-sound/redoflacs/redoflacs-0.30.ebuild b/media-sound/redoflacs/redoflacs-0.30.ebuild
new file mode 100644
index 000000000000..a41aaed10bde
--- /dev/null
+++ b/media-sound/redoflacs/redoflacs-0.30.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit readme.gentoo vcs-snapshot
+
+DESCRIPTION="Bash commandline flac compressor, verifier, organizer, analyzer, retagger"
+HOMEPAGE="https://github.com/sirjaren/redoflacs"
+SRC_URI="https://github.com/sirjaren/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	>=app-shells/bash-4
+	media-libs/flac
+	sys-apps/coreutils"
+
+src_install() {
+	dobin redoflacs
+	readme.gentoo_create_doc
+}
diff --git a/media-sound/retrovol/Manifest b/media-sound/retrovol/Manifest
new file mode 100644
index 000000000000..9fb12a0c8954
--- /dev/null
+++ b/media-sound/retrovol/Manifest
@@ -0,0 +1,7 @@
+DIST retrovol-0.12.tar.gz 202171 SHA256 f0360f43aef692060fa8d37c7e4d4e8f1d997895a2a93ebcf9e0fbb555b0c66c SHA512 9e485c9c8d086f53c4b0a736bf09fc74d7393014bdffcd50146c288c536e77334dcb224e47b26bc3abe09a4b1694625ab30e126036a7550f46f33a9cec405e81 WHIRLPOOL d7e0a27c569dfa97e771c3b83c58bda64b6e77765cd0112da02da808d5a101eb7566c7259c04121062e0a01e3b9b9e097ebd84e57c2a9c3dd6b5912b5e45ff7d
+DIST retrovol-0.13.tar.gz 210929 SHA256 b857a40b2f9d957052b8868858c2b2d01564873aead0b6c5cf8964028bf0818b SHA512 a2e21ae70b1be7c824061a7118b331558dd27f5d93861d509ac03fd85856661555880ad592eb1fb4750eebeac7f1930aebc3c1f64b31ce6983b993098b509ce4 WHIRLPOOL cb4b07bab061e76c9e05fb7b21becb5a234344564fcdda1332718b1f430214b847d37470cc1178a09ca7f3a132045ade730c04b1a8bbb1efb228357047ad9088
+EBUILD retrovol-0.12.ebuild 939 SHA256 bf13128c9c8e2886040cd7e46d98f0b0487dabce618cbbe4742ab3018c373cd0 SHA512 3a2e7bba3a60a4d0b30de4aab28594d4bc19627541daeeb7b404ad35237d73db33e6ff9302415a0a9135614d3d3d58ba2633c0965cb84350bdfcd82158d4bfb8 WHIRLPOOL 8b869ed373a300f8cef39477e282b467de9641046cc0eeb61681a4662037b5d2286e860e90a91d9e602c0f38b73ac5db61d4cbc67d2a2a4bae74db17c7ca727e
+EBUILD retrovol-0.13.ebuild 939 SHA256 bf13128c9c8e2886040cd7e46d98f0b0487dabce618cbbe4742ab3018c373cd0 SHA512 3a2e7bba3a60a4d0b30de4aab28594d4bc19627541daeeb7b404ad35237d73db33e6ff9302415a0a9135614d3d3d58ba2633c0965cb84350bdfcd82158d4bfb8 WHIRLPOOL 8b869ed373a300f8cef39477e282b467de9641046cc0eeb61681a4662037b5d2286e860e90a91d9e602c0f38b73ac5db61d4cbc67d2a2a4bae74db17c7ca727e
+MISC ChangeLog 2589 SHA256 1320c9f8584b7f8631eab2af214024c9b1e842047395174b98d34a9681c5ac5b SHA512 03760fdb62a554661402e488d724f2e6bffb1dbc192442b7c12aeed8ed83d5ebf1712e58913e91dda91bdc207853d6955280f65c95465b747ac05bd178a1dbc2 WHIRLPOOL 01f16e376ea5df75cb56b63fe0f5778633e82dfa87e2a0c0054fffc707fdedfe4b84eeb6893c679583aabea363021ac6fa007536320b9223739a3a98507a167f
+MISC ChangeLog-2015 400 SHA256 9cb3962e7ac155074872dd0e703efd8d0c69672cb55e58b563ef2166be86a8b0 SHA512 620e4bb7d113a32b18ef84744c55c334239b1f429dd3c54105ce6a1757ee1625671dfe7d27f87ab383ee773dd977442573b70ada3a7af1818b1399610b896f92 WHIRLPOOL 0a285f9ed3aabf9ecf7b0dfaa1d08f7b08672de94d111f0f9bdb9871b45bae629520de81b1ebceead834c1f4c8087e13ddea51a54520d983b5562035108ce88f
+MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/media-sound/retrovol/metadata.xml b/media-sound/retrovol/metadata.xml
new file mode 100644
index 000000000000..39626a990be5
--- /dev/null
+++ b/media-sound/retrovol/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/retrovol/retrovol-0.12.ebuild b/media-sound/retrovol/retrovol-0.12.ebuild
new file mode 100644
index 000000000000..d42288adcdb2
--- /dev/null
+++ b/media-sound/retrovol/retrovol-0.12.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+PLOCALES="de fr"
+inherit base l10n
+
+DESCRIPTION="Systemtray volume mixer applet from PuppyLinux"
+HOMEPAGE="http://puppylinux.org/wikka/Retrovol"
+SRC_URI="http://www.browserloadofcoolness.com/software/puppy/PETget/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS="ChangeLog README TODO"
+
+src_prepare() {
+	# Check for locales added/removed from previous version
+	l10n_find_plocales_changes "po" "" '.po'
+
+	base_src_prepare
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+pkg_postinst() {
+	echo
+	elog "You can find a sample configuration file at"
+	elog "   ${ROOT%/}/usr/share/retrovol/dot.retrovolrc"
+	elog "To customize, copy it to ~/.retrovolrc and edit it as you like"
+	echo
+}
diff --git a/media-sound/retrovol/retrovol-0.13.ebuild b/media-sound/retrovol/retrovol-0.13.ebuild
new file mode 100644
index 000000000000..d42288adcdb2
--- /dev/null
+++ b/media-sound/retrovol/retrovol-0.13.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+PLOCALES="de fr"
+inherit base l10n
+
+DESCRIPTION="Systemtray volume mixer applet from PuppyLinux"
+HOMEPAGE="http://puppylinux.org/wikka/Retrovol"
+SRC_URI="http://www.browserloadofcoolness.com/software/puppy/PETget/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS="ChangeLog README TODO"
+
+src_prepare() {
+	# Check for locales added/removed from previous version
+	l10n_find_plocales_changes "po" "" '.po'
+
+	base_src_prepare
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+pkg_postinst() {
+	echo
+	elog "You can find a sample configuration file at"
+	elog "   ${ROOT%/}/usr/share/retrovol/dot.retrovolrc"
+	elog "To customize, copy it to ~/.retrovolrc and edit it as you like"
+	echo
+}
diff --git a/media-sound/rexima/Manifest b/media-sound/rexima/Manifest
new file mode 100644
index 000000000000..f8f345ec2130
--- /dev/null
+++ b/media-sound/rexima/Manifest
@@ -0,0 +1,5 @@
+DIST rexima-1.4.tar.gz 15903 SHA256 bd5192bc12b6e3b1149cb936403fddba7985628ae85d9d08f6a79f2aca35bde6 SHA512 6a4c70fd2f61446a2e79a3a22218d443f7ae4df9928b73c66f8d4d2f592d50c57f5fe53875bf975a8ffb6d9d8f99bc99d083ced2714b7623bef06229f8e37fd6 WHIRLPOOL 0aed1add9680371e3236c8552cc8b8a0f5df21d685774bccc77fdcec655a642de94b2b7322d1b30049473176b02329c729b9cddabc1d65fca1b621141ec7ca02
+EBUILD rexima-1.4-r1.ebuild 692 SHA256 4c3b47328d37bc0435fc94bc09d4a8fb61107ef17066998e6710077dffada4b3 SHA512 2b55e8243b1eae5402b3ed88c68717cdc1c3ae12c7482e45959497bdda97a8a89b5d3f1932b8bc07333b5b712cbef9ca4bf25433109dc5e942c60b3312cb6422 WHIRLPOOL 571ba1cfe6923f6837e886f84a06367795f5b0e356f5d8377a913ee6abc9d0e17f76e724f5a7e24df12b468bea099c525e15776514495a6d8bd8999908253224
+MISC ChangeLog 2423 SHA256 c06c19a6682f1d9db001381f697db921e50f18576eb8acbf5779a6ebe72ab47d SHA512 6ffbd0b70fdbc9aae1e1446ed33797245a96379f24ade1474c00e16098d41ea05b7f32c8a724d8d703a4de29e275574d81c4c6f397134108a2023118293b27b2 WHIRLPOOL da2a616d83341a4bd9a809c01b2a480daf909b3c0073061ed8adbaeaeed5e99fb28a59631b4368a2d518855500741c07a8964b5c160820e919831066776d6d7a
+MISC ChangeLog-2015 1741 SHA256 0e2bb9a86717638b4cbf98bda554394fde5b9ab43af076488ecebf0bac14fcc6 SHA512 fd3fe90018986da371316e9c1fe9bc3ac4ee34ab0898ec197fcbba40a56123188ac4109f6827b6bff0cd657de255d02d9b677b439085f4fb95d02ccddcbf76a3 WHIRLPOOL 5dcd14923efec152d732f340ae65f3def89c384cfcafe297feff3a2c61c494ea1fc720c3047f81f6ff4fac10006c502eea5d175684951e1fe1b3bf64ad2074fa
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/rexima/metadata.xml b/media-sound/rexima/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/rexima/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/rexima/rexima-1.4-r1.ebuild b/media-sound/rexima/rexima-1.4-r1.ebuild
new file mode 100644
index 000000000000..cd78692ee670
--- /dev/null
+++ b/media-sound/rexima/rexima-1.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A curses-based interactive mixer which can also be used from the command-line"
+HOMEPAGE="http://www.svgalib.org/rus/rexima.html"
+SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	tc-export CC
+
+	cat > Makefile <<- _EOF_ || die
+		LDLIBS=$($(tc-getPKG_CONFIG) --libs ncurses)
+		all: rexima
+	_EOF_
+}
+
+src_install () {
+	dobin rexima
+
+	einstalldocs
+	doman rexima.1
+}
diff --git a/media-sound/rgain/Manifest b/media-sound/rgain/Manifest
new file mode 100644
index 000000000000..9411d90da025
--- /dev/null
+++ b/media-sound/rgain/Manifest
@@ -0,0 +1,5 @@
+DIST rgain-1.2.1.tar.gz 24741 SHA256 041b4217d506937a7199ed3a406387760f06db38fef817f1aee883af24eb5e32 SHA512 ac9a0c9918e55150d34b07dfbe839a0e497f8c5793ecbaad4f35063f2e00e0ebd1cb9739c5d0022513c2fe9b0aa880941ba848d791a4db31373ad0d421a133df WHIRLPOOL bb2288eda097ff2963c888eb910813a62becf6bdcec777bf324b93cf1ab9f54104251ca154d6c1504639580319e56b2bff55e94bea4ea23ab1bfd253d6a4063d
+EBUILD rgain-1.2.1.ebuild 857 SHA256 b9b0e50fc7c8eff040c7a298a41ae161c533307824a5e0579088d5ae34a6154b SHA512 c9ca1e9ae6a9ce1cd60714543d7bbfacb6bef8096f9eb7fba46051bf2a2dfd57bc66bd7c93799667d3e5906d4205d8f7b6aa40263cc18bc5b2b978271c7364ae WHIRLPOOL 47ea205f46a78d5be47acaead29e3ab352673bbdc1386b89a10cfebeeb06bcc91266050b5e7eb50afeba51294d4ae2262990149fa48db4c720af81dfcb59612b
+MISC ChangeLog 2660 SHA256 ec7aab40eaf605b5f77618e436337010105edcbb9a79753cb5c6008c83b031ab SHA512 8080694d2dddefa6a39957a3054ce50d34bdbd5e6a08168e5e9a1eba76bb60ba6fcb8856c5062a9cefdda7f2d5c2d1c1033c990fbd4982813e75d039780e4188 WHIRLPOOL 8b38ec53d9efa3e9e05812f22d783853cc72dea29029b1372c63e522891b1ba2fb5d97dfcb3c91c3f939df9d292394d51713d9fac56ec0b1a4758f3e9d3877a9
+MISC ChangeLog-2015 1672 SHA256 aacfd1794e1bb7da54ec03bd50d5ad2c7b624a0a6acdb432606e0344996a3f03 SHA512 59bb24e36a55ef2d0a48ae6c0d07740a107a9fbaac34b34abece6118cca5cf17d181dcd20a77050131c30627faf0128a85eac4112899396f96f735bf3fe33e72 WHIRLPOOL c3f8448ef6f921f501c397f600b8d360c5eac0f44e5f6334a637ac9055b9c3765c7dc25fadcd3cfbaceb0531fc255ddcd9ec047c429241804937e7950901793b
+MISC metadata.xml 947 SHA256 9146a65f076a7aff83875d0b7f451c30c708008ca32a65fe6dade7211339bec4 SHA512 9504486c33e3e6890adb3607ba506c1381d7ffd4c59d6472eec6c463511a68690f5b070349b0aae63b1a4d9c953b1ea30af8b610e36b994db65d3dfe7fbd936f WHIRLPOOL ecc093fe479666c70ba4a11df934a09fc9bae32b205f8bcaa2dc27907f09959ead82fc350223d10fcb2d3e9f4c23e986376ea4efbcd26279f206bdd77321c667
diff --git a/media-sound/rgain/metadata.xml b/media-sound/rgain/metadata.xml
new file mode 100644
index 000000000000..8c838e4b2c3f
--- /dev/null
+++ b/media-sound/rgain/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription lang="en">
+A set of Python modules and utility programmes to deal with Replay Gain information -- calculate it (with GStreamer), read and write it (with Mutagen). It has support for Ogg Vorbis (or probably anything stored in an Ogg container), Flac, WavPack (oddly enough) and MP3 (in different incarnations). There‘s also a command-line programme, replaygain, that works very similar to its like- named cousins, most prominently vorbisgain and mp3gain -- only that it works for all those supported formats alike. collectiongain on the other hand is a kind of fire-and-forget tool for big amounts of music files.
+	</longdescription>
+  <upstream>
+    <remote-id type="pypi">rgain</remote-id>
+    <remote-id type="bitbucket">fk/rgain</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/rgain/rgain-1.2.1.ebuild b/media-sound/rgain/rgain-1.2.1.ebuild
new file mode 100644
index 000000000000..9c0e7c069f0d
--- /dev/null
+++ b/media-sound/rgain/rgain-1.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Set of programmes and Python modules to deal with Replay Gain information"
+HOMEPAGE="https://bitbucket.org/fk/rgain"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac mp3 vorbis wavpack"
+
+DEPEND=">=dev-python/docutils-0.9"
+RDEPEND="media-libs/mutagen
+	dev-python/pygobject:3[$PYTHON_USEDEP]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-good:1.0
+	media-libs/gst-plugins-base:1.0[vorbis?]
+	flac? ( media-plugins/gst-plugins-flac:1.0 )
+	mp3? ( media-plugins/gst-plugins-mad:1.0 )
+	wavpack? ( media-plugins/gst-plugins-wavpack:1.0 )
+"
+
+src_install() {
+	distutils-r1_src_install
+	doman build/man/*
+}
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
new file mode 100644
index 000000000000..dbb111abad2d
--- /dev/null
+++ b/media-sound/rhythmbox/Manifest
@@ -0,0 +1,5 @@
+DIST rhythmbox-3.4.1.tar.xz 6914220 SHA256 039f86661cba495f9429df6572fa79e68279635809e52fa0d19f57e8db8341b6 SHA512 b00034e9369222f64d5d9c5e246b99f5d738336d3faf2d303c444f84c316688871e0a09992e96012f38e2e90e8efc936ad231bed5057a5aaf31ee66963f59ae6 WHIRLPOOL 08997a533857a3545d926730be9f9f8f0b420da976011598919520b18546959658765eb7bfdfe7fce430706b9b1a882c46ea6cba1d9b968b6433c8ec2791adf2
+EBUILD rhythmbox-3.4.1-r1.ebuild 3630 SHA256 d9870b4b7240dfdee1a603c331ebfe35192095ffe63d4c499af45ab2099d6c95 SHA512 342ebb0f18fa31627e80fef7a354125f20a0abb98524ff5d41883d1eb7f3394cadfc5e0e7258097e71d93d80299afbe866aab53b8f1ccafb44f911c44236044e WHIRLPOOL 75d3f52824a29f18262275d9bf3cbe2b8d7b9e80ff933d17a0b2b31ccd25d5baf9aec73ba7bc756e1c8350de37051dc5b487e83de89d3c1a58a6277f824a303c
+MISC ChangeLog 4913 SHA256 b2398c965b63d880bbdfb2219550eeb77f0b266bf6e1794960600ffc831adca9 SHA512 abf8a09134187167d2fff8bfe8931b9964bf5ab02eca80194dee2976b3059286b5f0ed4ae7f715bc04e0832c70b21c74d83cdf89fb279a35137a6ef111f562d0 WHIRLPOOL 3b44f8d724327e90c1145192d622023f1568afcd3cae6048feea87a5d88603e9c3c333ba032f41c29890f870b2c170a75464c4aae525dcf21b9cf49857d61e95
+MISC ChangeLog-2015 43151 SHA256 76c7ce9e452285e39932299be33af71489c2bdb4fc1137ede367754f42752a7d SHA512 f3d74a0893072bce1045e24be5158404cc61c34b1a0d0a690a8822dbbc2e51e5d0ebc9fd302fd8ff9963a336c76edd0801aaea2f65f957017517669cf39e36c1 WHIRLPOOL 8e2948c320986a34f982212c5855ede909f943e9c38b7c6c3708feab8da22cfffb213100c63b518fdbb58501ec169e7eb550ce8eecccf4f79e087f9035dc94f2
+MISC metadata.xml 771 SHA256 6c49fddbe53ca72d4ba16abd3a6b3fb27d4c4944334e4faa21a8fdfbf516c87f SHA512 b50f990bbbdd508a2592f1d52b95caa2e0d78d0b670f207e5520a26847efe51199f3242c1327e144a8b087954c1ac82289eb5ebff6d207b8edc7caf687ecbd23 WHIRLPOOL 9072aa142b5df7b3716a64449001fc22568c29940a1962172e207c0c9d5ef19991cc3f3e311ce76bee75e0aab25f8a6805a4f04dda8ef6db166d08fc65e00e92
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
new file mode 100644
index 000000000000..501e3717867c
--- /dev/null
+++ b/media-sound/rhythmbox/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer type="project">
+  <email>gstreamer@gentoo.org</email>
+  <name>GStreamer package maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="daap">Build the local network music sharing plugin which uses the DAAP protocol using <pkg>net-libs/libdmapsharing</pkg></flag>
+    <flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
+    <flag name="visualizer">Enable support for visualizations using <pkg>media-plugins/gst-plugins-libvisual</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.1-r1.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.1-r1.ebuild
new file mode 100644
index 000000000000..0c79c310ec2b
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-3.4.1-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 python-single-r1 multilib virtualx
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av visualizer zeitgeist"
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.7.8:2
+	>=x11-libs/gtk+-3.16:3[X,introspection]
+	>=x11-libs/gdk-pixbuf-2.18:2
+	>=dev-libs/gobject-introspection-0.10:=
+	>=dev-libs/libpeas-0.7.3[gtk]
+	>=dev-libs/totem-pl-parser-3.2
+	>=net-libs/libsoup-2.42:2.4
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection]
+	>=media-libs/gstreamer-1.4:1.0[introspection]
+	>=sys-libs/tdb-1.2.6
+	dev-libs/json-glib
+
+	cdr? ( >=app-cdr/brasero-2.91.90 )
+	daap? (
+		>=net-libs/libdmapsharing-2.9.19:3.0
+		>=media-plugins/gst-plugins-soup-1.4:1.0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	libnotify? ( >=x11-libs/libnotify-0.7.0 )
+	lirc? ( app-misc/lirc )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+	)
+	udev? (
+		virtual/libgudev:=
+		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
+		mtp? ( >=media-libs/libmtp-0.3 ) )
+	visualizer? (
+		>=media-libs/clutter-1.8:1.0
+		>=media-libs/clutter-gst-1.9.92:2.0
+		>=media-libs/clutter-gtk-1.0:1.0
+		>=x11-libs/mx-1.0.1:1.0
+		>=media-plugins/gst-plugins-libvisual-1.4:1.0 )
+	zeitgeist? ( gnome-extra/zeitgeist )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-libmms:1.0
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0 )
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-0.7.3[python,${PYTHON_USEDEP}]
+		net-libs/libsoup:2.4[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+
+		dbus? ( sys-apps/dbus )
+		gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) )
+	upnp-av? (
+		>=media-libs/grilo-0.3:0.3
+		>=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
+		MAINTAINERS MAINTAINERS.old NEWS README THANKS"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=737831
+	rm -v lib/rb-marshal.{c,h} || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --enable-vala just installs the sample vala plugin, and the configure
+	# checks are broken, so don't enable it
+	gnome2_src_configure \
+		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins \
+		VALAC=$(type -P true) \
+		--enable-mmkeys \
+		--disable-more-warnings \
+		--disable-static \
+		--disable-vala \
+		--without-hal \
+		$(use_enable visualizer) \
+		$(use_enable daap) \
+		$(use_enable libnotify) \
+		$(use_enable lirc) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable python) \
+		$(use_enable upnp-av grilo) \
+		$(use_with cdr brasero) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with ipod) \
+		$(use_with mtp) \
+		$(use_with udev gudev)
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	virtx emake check CK_DEFAULT_TIMEOUT=60
+}
diff --git a/media-sound/rip/Manifest b/media-sound/rip/Manifest
new file mode 100644
index 000000000000..6d2713f40cd7
--- /dev/null
+++ b/media-sound/rip/Manifest
@@ -0,0 +1,5 @@
+DIST rip-1.07.tar.gz 110261 SHA256 3031c5efbfb72bcd80de70b13528702893be45f386764a285c95c42b8550c6a8 SHA512 4a89b945cb917d07459f1765bd6e19bb20b84d45e762b01a25374e0a80fced79996440ab85e01fc2fb1bf87175eb9407745294e3099b396d2e4dfc6ee652cc87 WHIRLPOOL f8e6af0b854a2d06d31e821b97dcbcd49ccd4e105fda2238b107cf672872210049465aca4a2d33fe456d810287e6f2597238a62725a9fd626febc2f50e2a8663
+EBUILD rip-1.07.ebuild 795 SHA256 d5ae97502b3f88649fdf47c0297427a1427807840a4af3b66db31c972faf8a0a SHA512 0dc7d2fb63ea849e98f6317a09b5d9f804ba780faa0b74eba5e6b3bc5afa9cf5b15969b1dae8689b212986494732aa4cd62ac381396f3fd1f24c07098b97dc06 WHIRLPOOL fce3e0f6aedef7c813d9362134155481a232d86f1dd70d79a03b45d31aea06f5c1d5506fce2fa99ae3555aa785feb06a79fa5b34de468cfc2c2c479ca425e19b
+MISC ChangeLog 2962 SHA256 2354d0ac6ff90034a59b7c0bf973a2834319fa8dba0065b346306d5f26395786 SHA512 2dc63122263890c8920efc560212eb9a05bad473e1adc5260e9a738851da76ef6d181bff86e2c831a3942bb9c5a891e46cd3edfe57940a3e91865c8f3023cf99 WHIRLPOOL 22b6dae9fce6c5baa5cb1ff24a08b2cc4ed97a8eb526b3df9ce29304361551c766460ac991b8c2c1d61126406037e402bc2adca0dde943acb479eda267ddcca0
+MISC ChangeLog-2015 2766 SHA256 ee78a6b76d8cf46dc1fc35b8c0d3ad2ef48954c4c2ebafefbca374b2fb7951de SHA512 861b13a09414a15112e1511b5774a3393d0a20ad8b13ff170f77db6020ef674c2109ed0c6a4bd76fecc88923f9d4da07d943699573f030acdc113b64a5355808 WHIRLPOOL 2dcfd860834731959e150b1c8deb00b5aff5286ae067b77e7d03756601fa512047c906c5ddad7fd6bda9cee3744cd077e48a825f252c28b486b0485f211f06d5
+MISC metadata.xml 326 SHA256 1fd8719727e4c8645d450291dcce13f09fa4115f7d97eda0565f7d4a7f4a1505 SHA512 9be190109b6b10f56e73609510a59a349a3f4c2e841eb64fabcbbcb35535047f8806fc33a3ebaffd8ead47b1c1057e93e435b9db79ba4eef9e16e6325846c13e WHIRLPOOL b72565d10ee0b52aa1984e8e63ccf3e33d6caa018d0612242da4b845365cf8d6621ab9d2b415efe040a86a9151dce81dc7ca4defc3f0cfec0edca61c2555ae59
diff --git a/media-sound/rip/metadata.xml b/media-sound/rip/metadata.xml
new file mode 100644
index 000000000000..437cb26a73b1
--- /dev/null
+++ b/media-sound/rip/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">rip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/rip/rip-1.07.ebuild b/media-sound/rip/rip-1.07.ebuild
new file mode 100644
index 000000000000..f1b6e92177e0
--- /dev/null
+++ b/media-sound/rip/rip-1.07.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+IUSE=""
+
+DESCRIPTION="A command-line based audio CD ripper and mp3 encoder"
+SRC_URI="http://rip.sourceforge.net/download/${P}.tar.gz"
+HOMEPAGE="http://rip.sourceforge.net"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+DEPEND=""
+
+RDEPEND="media-sound/cdparanoia
+	virtual/eject
+	dev-lang/perl
+	>=dev-perl/CDDB_get-2.10
+	>=dev-perl/MP3-Info-0.91
+	|| ( media-sound/vorbis-tools media-sound/lame media-libs/flac media-sound/bladeenc media-sound/gogo )"
+
+src_compile() {
+	#the thing itself is just a perl script
+	#so we need an empty method here
+	echo "nothing to be done"
+
+}
+
+src_install () {
+
+	chmod 755 rip
+	dobin rip || die
+
+	# Install documentation.
+	dodoc FAQ README
+}
diff --git a/media-sound/ripperx/Manifest b/media-sound/ripperx/Manifest
new file mode 100644
index 000000000000..8975175c24db
--- /dev/null
+++ b/media-sound/ripperx/Manifest
@@ -0,0 +1,7 @@
+AUX ripperx-2.7.3-ldflags.patch 360 SHA256 5d755881e9db81b47951fd3bcb8abccdc03ac5ac1a2c144453c9ee7f1feb37fd SHA512 f430e043284f4d35f88b3fc8349fd4cfe9df87f6f1ec11cd52b97c25e853b9394a87066a54612f828987023dcfe4724cb31fd39c91c319d76b2f3209aa6546c4 WHIRLPOOL 6aa961000add2d882426f669edf4195896e8b2801c31c5fc466213a8c24a3028e8075d42720bfcde64bcc0f79337bfd08b7b4affca91c29f2cb71e55de1ab86d
+AUX ripperx-2.7.3-pkgconfig.patch 210 SHA256 00c921ad411f7331231ab9868095964a781c5c7be263c5f961abe7383914c8e9 SHA512 87382681d64c65e9353940d3e0c8955f5f7113b9dd23d58c06034ccfb13ac4369577e3ad1cc325bd44e2b38f453ae82870198c45af6335fab7fe0c70993ac276 WHIRLPOOL 6e8bba880c990fcd83acab6b418b8761a7453d22ea0846d27c03f24d78ef8e9d75d4effa200944a113da4c6d0239e9569eb897b044203324446a8c7c0b88da57
+DIST ripperX-2.7.3.tar.gz 536059 SHA256 7d58f95d9fc3b43890db4c09eafa3880e45880c9385524ce8786024fc5d2198c SHA512 fad4d8ee5e7ea37608b827230446f213c871d425920d0ffae5b0151e2270b36ca67156a78a530a3267141f8c5d0577a17647e4342468662472ea0f88bda69cea WHIRLPOOL 57a6acfad3e3e0701592f77a97980ad2db305c59e8cba4a28031c18e41bc4d67fef49534b2c7c8b469c9d036357dec077a20334c121e116cd36892dbd6295db7
+EBUILD ripperx-2.7.3.ebuild 1058 SHA256 85f4feea7d3350e0b5b0000e4596480eadb60a8c5f3f4c4ffe129e7992c9634d SHA512 b0b324da5b629c17b46d6332f52437751a50736f5a1b274a2f8f0863c7b01772527bc3a334a1ae0e44b0bc31d80520840739e9dd2a607e3fdc8a51bd0ae70969 WHIRLPOOL 2f5c6dd715a4c4d432b0fafdcac79d9944e7f5d76f4368a149772612197adc980f2579427304ab3e9bf3492bb0e883ccc2679133984d8a24c5be90938c1ec414
+MISC ChangeLog 2618 SHA256 f4b062058918bd11c08135bb2779d81009b832e614bcad89d011657b0f8104a1 SHA512 5f15cd565f7834d38a25ecf6e684cecfc8a9ad1bb5dd79d89d07f3b6f40b65cd594c9d5b4ba6ac38094ce7da4b865253b1ac23bd349a971eb4015c6ebe8631db WHIRLPOOL 87c5c8fcc3913c99250e8692358ab63956ab709cb387a80556eafe982ce6e226d711bb897deadff3d09221ef15c3732848dd81f8a2ec6a5a7efb2d8152684fd3
+MISC ChangeLog-2015 6981 SHA256 74d2aa0db83e0c9c88ee9edd356610d8765e119513caa9db60829be8cefd3914 SHA512 0d2303f69951c6e760b9aa899241d5617318321334000aa7569dc2b136797e600f4c5731d5618b8f5e83307a43afef3abd395719c5b39977f72c93a50416e0dc WHIRLPOOL 851138a3a7608b647530348651e2325a6bb4afaeed77bb856e0cace9e643750c41f71d38454ded8ff00b445af88ef850b84718402a61a4a60f1fe0848b9b2000
+MISC metadata.xml 340 SHA256 7f03639ea98711dd84ecb2024a99613502c16538d6a368fa46b812647aa147a8 SHA512 0e9310c5b4c10d5a2663b6da6d247e5f992011c11c6c49a679c72b34e110a10509f40382fcdb1ae21ff529a1b8756820be197fbc0e4d64f30f1ce47430ae81d8 WHIRLPOOL 4311060778b8f5ed0e7279abc3e00aea779318b16b640479bad7ea7389f0251f131a7ade9582f0265d6382c3a7ef2dd16dcb1bdcbd76fa1c378fe11d4e4b11b2
diff --git a/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch b/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch
new file mode 100644
index 000000000000..11e18972e638
--- /dev/null
+++ b/media-sound/ripperx/files/ripperx-2.7.3-ldflags.patch
@@ -0,0 +1,11 @@
+--- plugins/Makefile.in
++++ plugins/Makefile.in
+@@ -658,7 +658,7 @@ uninstall-am: uninstall-binPROGRAMS
+ all: ripperX_plugin_tester $(PLUGINS)
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $(LDFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) -c $< -o $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch b/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch
new file mode 100644
index 000000000000..48c24f4054a9
--- /dev/null
+++ b/media-sound/ripperx/files/ripperx-2.7.3-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- ripperX.pc.in
++++ ripperX.pc.in
+@@ -1,6 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
++includedir=@includedir@
+ 
+ pkglibdir=${libdir}/@PACKAGE@
+ pkgincludedir=${includedir}/@PACKAGE@
diff --git a/media-sound/ripperx/metadata.xml b/media-sound/ripperx/metadata.xml
new file mode 100644
index 000000000000..6bb1c7ca3d69
--- /dev/null
+++ b/media-sound/ripperx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">ripperx</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/ripperx/ripperx-2.7.3.ebuild b/media-sound/ripperx/ripperx-2.7.3.ebuild
new file mode 100644
index 000000000000..96bb4e62f35e
--- /dev/null
+++ b/media-sound/ripperx/ripperx-2.7.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+MY_P=${P/x/X}
+MY_PN=${PN/x/X}
+
+DESCRIPTION="a GTK program to rip CD audio tracks and encode them to the Ogg, MP3, or FLAC formats"
+HOMEPAGE="https://sourceforge.net/projects/ripperx"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="nls"
+
+RDEPEND="media-libs/id3lib
+	media-sound/cdparanoia
+	media-sound/lame
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# AC_CHECK_LIB(m, ceilf, [], [MATH_LIB="-lm" MATH_LIB=""]) #401867
+	sed -i -e '/ripperX_LDADD/s:=:= -lm:' src/Makefile.in || die
+
+	epatch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-pkgconfig.patch
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc BUGS CHANGES FAQ README* TODO
+	doicon src/xpms/${MY_PN}-icon.xpm
+	make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN}-icon
+}
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
new file mode 100644
index 000000000000..456d7cf787c8
--- /dev/null
+++ b/media-sound/rosegarden/Manifest
@@ -0,0 +1,17 @@
+AUX rosegarden-12.12.25-debug.patch 762 SHA256 51634e806a7876e4c944c0ce302934644d48c0f4f2cffb4e1f5ec8e7246831dc SHA512 20897f94f366c1f8cf0df503a7949fc7b77f84cd893bbf24819e84a061e8b9fd0d179e3d95bbb13edfbd413e8c9bf8db1f92178781566c30a66a56b61bec83ca WHIRLPOOL 02ba461651d8aab8bc2aa85b5235450349bcec9d11ea6ed7c7c9cabf61fb065ccae46de6d90717d22d8371d8e95a0d7c59a9febb44caf6f9765ed94c77a3836e
+AUX rosegarden-13.10-segfault_at_export_to_lilypond.patch 1714 SHA256 23c4030cc58f725c389e75c28cd8f9ae5db28962106b251981051c8666b24104 SHA512 aee47dd62b49d7ae1edb02b8bc585a81f4277adf812b6a252fe315392a1ae744416fdbe1fb14e1867b8b4c1d755ef83085032694f05c96cfbeda92a15422c911 WHIRLPOOL b712f7205c881adbf2088f0cf2d82dcfb103acd566b44e61681caeaf59c79b12e47358ee26ad18f11f3170b103c505b080ad0f04e625d0a1e28e7c9d5d83a2e9
+DIST rosegarden-13.04.tar.bz2 5858085 SHA256 4d8dabb08a7b807cad46d64d808752a82e26dc6d0144e5849392c51421936c7d SHA512 a01bf391be92c564d20d53c03556552cf5e9cd8f1b1eda49de18432dbcb97ed8c65795efb2275ae9a2f91c7701ea71d3497bbf062606331dbe3487a41c33cdfa WHIRLPOOL 5b4fe5a149350a64cabbde04b5c16cdda92f848c1aa45adbf4136c3f55da75dc07434f8d126404334a477e36922e5fd1c5efe66fa46e9b38d42b661b3c158ecd
+DIST rosegarden-13.10.tar.bz2 6355164 SHA256 6c3a1961b75ded3ded634e9c24f194fd483b11bc797a2603cf5a61fec674e6d5 SHA512 f65bf1c2098b2e2266131e6c430c598ee881e43a5daf77d6ef843be0e2543a07264af4442335573f4408568dde74357c596d8b99cf77b311fb9a55ca3584d18a WHIRLPOOL c39fbe2939411ee10ba8370bce41578e6e683839645c935ee9dfd341d2d0be4d18866893e9cbc10d15245c5d6bc5a8cf5ca90279dde53a979a3d9f7750f0a916
+DIST rosegarden-14.02.tar.bz2 6402898 SHA256 f5d1d78424582326dcde4bb46b521eb25c2b3fd05b98ce3aaf7f2ffd2e9f7cd6 SHA512 ed11482dbb65823186cae4b1532b9e38c75a29e209a97a965521091cc7b6d4fdc32571b30a2be38dee06fd2f516fc924ab1a8e72acaa7212b12dd28d61e224f3 WHIRLPOOL 780edec4c442788e85563d9dc10d36dd2eceadf31b7a865d1e03c3f92623506b354795318e28518dab9335e287d4da3e9a085be80923641588ea4f0c2ab940ee
+DIST rosegarden-14.12.tar.bz2 6235233 SHA256 f876fbb818326da7f012a01a4d6baf45022dcbb98626e0ce40c67b6943ee147e SHA512 7820197d97025365c781f95811a9725058b86375654df9915599957f743f5ea335eb468d0b52100e7be5096e9d10bc6fdad4252db48dc5c49d9ed6d8e7db6660 WHIRLPOOL 9d34eaa60707b3b18007a939c4b5da282e459699a898cc0a1c8016c35c4052f565ff0f7f8bcade4ba986ba501a4d28b3d2fb48c4caba769a270dedb5f124e52e
+DIST rosegarden-16.06.tar.bz2 6362923 SHA256 1044334f2c1a2ac7560d80910e0721c8913bd924f8185a393f630c89020340db SHA512 b95c1c9c49967b15cd100fe45c06db9f389adc17161c16c46f1b4c989d6e93373c90f9f2e622b960f83d2fb9fec9f12458b19840b22cb8c233e66d6e25f2d0de WHIRLPOOL 5b6304a12f3cabbfbaba6a15a7a358f1adbb840cf1dfb9c7edacb64df63fd2b5bf9bb0cfc3f16944e694df364c77a8c3de3df091e003698d96f5646f44645a5c
+DIST rosegarden-17.04.tar.bz2 6454603 SHA256 988a6141c5b0a8e85c029f650de78bf57100c4d778c22d0194b0692584640ece SHA512 23240522cba8cc3b5d0e3b29ee5b871c911c7634d74f65d04b353f59747bdf6a1bfd9985f16ab331ea2399a797e66b2ebd110e192bb52ba4df453d42d7b8f73b WHIRLPOOL 91b7d8d74578e8666de607f55cecdfc57dde9b9b4e2367d7b5a2f1d3ae76eaf3d0ef6b62d78ae4f9f080448019caf8e0580d5c1e30f56708c9b2dcc2c3113aa9
+EBUILD rosegarden-13.04.ebuild 1377 SHA256 4dbe4f190529f5d4732d63d70726ea529c15bf05e368a21c3a34db4d8157bf05 SHA512 f98f4a363d29e49f9cbac0747d85965c728a1a813f0c51678822092e121c24c51789d0faf912e780291a25b92ab2a23678406e11c191ec63c36f9d8ff28bc8fc WHIRLPOOL 619617a74ec1eb9491c83654703b2e55913626ba8074bd5eb45a13ff260ab9c215b4f076f031ebac04b83c40f833b73cf7f2dc44fac6c4f83b42fbd408aef37e
+EBUILD rosegarden-13.10-r1.ebuild 1409 SHA256 8d7fb1c7b0c6ebd7bd7d948a0489ba6662aef2d5b64713b4a9cdaa5c898963ba SHA512 98eb179338d92006bbdc5864c38359e57a96f989d97cba990c8dc033052d636c0696be42c9e25dfdbecafe9475bbb71595ae7577bb1eed3b6dff9f4afd528040 WHIRLPOOL d8cf8dec220a434c40508f050b9be55c1aa7e4cf70000be6fe877b0b8815c764da2c5edb5a55786ccd633567a0172b0fb509403c4b95d5a52292c830a14738c4
+EBUILD rosegarden-14.02.ebuild 1344 SHA256 58c9d7a49c53882f68c3b595d499830210443c88cab0f6425f6501595ad97f50 SHA512 a172a1af9468882d81ccc71d4ca348160d564985e435479f61d3fd06c0e24d97c2cca4110b4edbc0af725bb63e7521afc5524e9ad96dd8b96dfaee5be2a24d04 WHIRLPOOL 3183a8c6b30fd3e560b7ec26f082d8d94402eab43789ad4ad0a1986f229f747ec1ac105f7b4764fb039a2603c3dbf09039715248b9006e5f8d4c6218aace272f
+EBUILD rosegarden-14.12.ebuild 1344 SHA256 c547934cbdf7c196dcbc6881dd85eeeb64755b41fcec3a9057a66f753f03d5f7 SHA512 548f0f77b9b0b3f472dadf2990bd5b5b03111aa5d676ddd5801a6df2e3b8dc074d345501bf3b4385d095c2989eafeae8519d2fc01b7c875c4590fdd5b9b9d61c WHIRLPOOL e1cec26f577e59a74b0ab7b6d1a65d76729f3d249fe7763b5e5d5f2fcf92a4dd1a83406da17efb4aa2a2ab08cba630b4cba84f2ab714b97f462e224596e66e6a
+EBUILD rosegarden-16.06.ebuild 1229 SHA256 f1a0a89e05c2a82f7214f0825e895f5a2466a9c397ddff1f422175523a641ecb SHA512 68f53340b772abd4b4753c8e464fb171e1ffef0b08e4014cfef496e19180d34ec95dae8ad3cba103b4c9d2a93b9f14f1a3639a10865f6129db5f651af4d1ca5c WHIRLPOOL b7427dcdec2b29ba5ff63835eb7de09238d92e2b19be877aee2c7b62b3b9271a58d28384cc21127b670e6d185b45352f47acb7e00f9e979b6ee823b3f5b0311f
+EBUILD rosegarden-17.04.ebuild 1229 SHA256 97c657a26344be444905d3696062132843ac674b15ba93f85832e410a287a3ae SHA512 9bb6476c74bc574beb5e1e3ad3966117bcb5d6216a2925acab557e20fddd04470f4610a8bc1d7f190fb57088aad148eb6b9e1a8f4b980c01de2c8ad0e1978f94 WHIRLPOOL f5ce011b9eec8a06350a30f21a3134c799344a1bc732f48ef2d0c0210437c8d5f5333d1a884a027f70d4794d00255b9a45e788ad39ffa4d7c312a801c9cf0d4a
+MISC ChangeLog 2727 SHA256 be55ccf9c47079162f342f5fdcd3e29716830208b662db9e2cad298a163099fb SHA512 62397ced0bd3488d288b169947e1738772ecc9d593d6bc3e23bf8fded711897fd14c794a31874634f70daf5a54d8d30becf066877a67322965bd2dd243a44481 WHIRLPOOL 085027c89c950080bd28045ff1df3779d7422e895b1c4e04171fb1b6387b684ec56651cf342a570b8c0151ba78c076da1636a6e1b4068eeeccd6b142e40f7076
+MISC ChangeLog-2015 17235 SHA256 1ed26604a1c352d288c3a34dc80dd927487e9a6ae457e373187a5df2baf2182a SHA512 1da5fde59601358153aa6a02c043dc4dc5cd676c64b89488af2379bb043c1a784a42649f5d59e1207a67a6bf715da668220e95cd633638478d9947a0698ff402 WHIRLPOOL 8ddd9d31ae8e2316b3c55570b8c3e5f0f33ef7afcc48a6713c5707cd839bc38bcc82e65e519ca7e1c5af35a9bcd31b86f97f633c86d82b7e30fc2dc883c24149
+MISC metadata.xml 349 SHA256 97a83e4c15e9cdbac3ca20099643e4dd0a8ba32661aa2b87febcd48445aa1613 SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee WHIRLPOOL ff9d9c24a41d18572aa6396d46f3c2a8646663b0bca8ec7d70459a9e975d10440d63c69ad37e6b4495615c6252ca07246afbaa957115c0d1642668dc976733c7
diff --git a/media-sound/rosegarden/files/rosegarden-12.12.25-debug.patch b/media-sound/rosegarden/files/rosegarden-12.12.25-debug.patch
new file mode 100644
index 000000000000..d52b4c6b1928
--- /dev/null
+++ b/media-sound/rosegarden/files/rosegarden-12.12.25-debug.patch
@@ -0,0 +1,18 @@
+--- rosegarden-12.12.25/configure.ac
++++ rosegarden-12.12.25/configure.ac
+@@ -137,9 +137,12 @@
+ CXXFLAGS_BUILD="$CXXFLAGS_RELEASE"
+ RG_DEFINES_BUILD="$RG_DEFINES_RELEASE"
+ 
+-AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug],[enable debug support [default=no]])],[AC_MSG_NOTICE([enabling debug build])
+-CXXFLAGS_BUILD="$CXXFLAGS_DEBUG"
+-RG_DEFINES_BUILD="$RG_DEFINES_DEBUG"])
++AC_ARG_ENABLE([debug], AS_HELP_STRING([--enable-debug],[enable debug support [default=no]]))
++
++AS_IF([test "x$enable_debug" = "xyes"], [
++   AC_MSG_NOTICE([enabling debug build])
++   CXXFLAGS_BUILD="$CXXFLAGS_DEBUG" RG_DEFINES_BUILD="$RG_DEFINES_DEBUG"
++])
+ 
+ if test x"$USER_CXXFLAGS" != x; then
+    	AC_MSG_NOTICE([The CXXFLAGS environment variable is set to "$USER_CXXFLAGS".])
diff --git a/media-sound/rosegarden/files/rosegarden-13.10-segfault_at_export_to_lilypond.patch b/media-sound/rosegarden/files/rosegarden-13.10-segfault_at_export_to_lilypond.patch
new file mode 100644
index 000000000000..5efa65258aa7
--- /dev/null
+++ b/media-sound/rosegarden/files/rosegarden-13.10-segfault_at_export_to_lilypond.patch
@@ -0,0 +1,28 @@
+Index: src/document/io/LilyPondExporter.cpp
+===================================================================
+--- src/document/io/LilyPondExporter.cpp	(revision 13602)
++++ src/document/io/LilyPondExporter.cpp	(revision 13603)
+@@ -706,13 +706,18 @@
+                 std::string header = protectIllegalChars(metadata.get<String>(property));
+                 if (property == headerCopyright) {
+                     // replace a (c) or (C) with a real Copyright symbol
+-                    int posCpy = header.find("c");
+-                    if (!posCpy) posCpy = header.find("C");
+-                    if (posCpy) {
+-                        std::string leftOfCpy = header.substr(0, posCpy - 1);
+-                        std::string rightOfCpy = header.substr(posCpy + 2);
++                    size_t posCpy = header.find("(c)");
++                    if (posCpy == std::string::npos) posCpy = header.find("(C)");
++                    if (posCpy != std::string::npos) {
++                        std::string leftOfCpy = header.substr(0, posCpy);
++                        std::string rightOfCpy = header.substr(posCpy + 3);
+                         str << indent(col) << property << " =  \\markup { \"" << leftOfCpy << "\""
+                             << "\\char ##x00A9" << "\"" << rightOfCpy << "\" }" << std::endl;
++                    } else {
++                        if (header != "") {
++                            str << indent(col) << property << " = \""
++                                << header << "\"" << std::endl;
++                        }
+                     }
+                 } else if (header != "") {
+                     str << indent(col) << property << " = \"" << header << "\"" << std::endl;
diff --git a/media-sound/rosegarden/metadata.xml b/media-sound/rosegarden/metadata.xml
new file mode 100644
index 000000000000..c399767911ba
--- /dev/null
+++ b/media-sound/rosegarden/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">rosegarden</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/rosegarden/rosegarden-13.04.ebuild b/media-sound/rosegarden/rosegarden-13.04.ebuild
new file mode 100644
index 000000000000..2559e060c757
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-13.04.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils multilib
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="http://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="debug lirc"
+
+RDEPEND="dev-qt/qtgui:4
+	media-libs/ladspa-sdk
+	x11-libs/libSM
+	media-sound/jack-audio-connection-kit
+	media-libs/alsa-lib
+	>=media-libs/dssi-1.0.0
+	media-libs/liblo
+	media-libs/liblrdf
+	sci-libs/fftw:3.0
+	media-libs/libsamplerate[sndfile]
+	lirc? ( app-misc/lirc )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-misc/makedepend"
+
+src_prepare() {
+	if ! use lirc; then
+		sed -i \
+			-e '/AC_CHECK_HEADER/s:lirc_client.h:dIsAbLe&:' \
+			-e '/AC_CHECK_LIB/s:lirc_init:dIsAbLe&:' \
+			configure.ac || die
+	fi
+
+	epatch "${FILESDIR}"/${PN}-12.12.25-debug.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	export USER_CXXFLAGS="${CXXFLAGS}"
+
+	econf \
+		$(use_enable debug) \
+		--with-qtdir=/usr \
+		--with-qtlibdir=/usr/$(get_libdir)/qt4
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-sound/rosegarden/rosegarden-13.10-r1.ebuild b/media-sound/rosegarden/rosegarden-13.10-r1.ebuild
new file mode 100644
index 000000000000..2abf3d68fe0e
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-13.10-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils multilib
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="http://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug lirc"
+
+RDEPEND="dev-qt/qtgui:4
+	media-libs/ladspa-sdk:=
+	x11-libs/libSM:=
+	media-sound/jack-audio-connection-kit:=
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	sci-libs/fftw:3.0
+	media-libs/libsamplerate:=[sndfile]
+	lirc? ( app-misc/lirc:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-misc/makedepend"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-12.12.25-debug.patch \
+		"${FILESDIR}"/${P}-segfault_at_export_to_lilypond.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	export USER_CXXFLAGS="${CXXFLAGS}"
+
+	export ac_cv_header_lirc_lirc_client_h=$(usex lirc)
+	export ac_cv_lib_lirc_client_lirc_init=$(usex lirc)
+
+	econf \
+		$(use_enable debug) \
+		--with-qtdir=/usr \
+		--with-qtlibdir=/usr/$(get_libdir)/qt4
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-sound/rosegarden/rosegarden-14.02.ebuild b/media-sound/rosegarden/rosegarden-14.02.ebuild
new file mode 100644
index 000000000000..2aec54b130e6
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-14.02.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils multilib
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="http://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug lirc"
+
+RDEPEND="dev-qt/qtgui:4
+	media-libs/ladspa-sdk:=
+	x11-libs/libSM:=
+	media-sound/jack-audio-connection-kit:=
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	sci-libs/fftw:3.0
+	media-libs/libsamplerate:=[sndfile]
+	lirc? ( app-misc/lirc:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-misc/makedepend"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-12.12.25-debug.patch
+	eautoreconf
+}
+
+src_configure() {
+	export USER_CXXFLAGS="${CXXFLAGS}"
+
+	export ac_cv_header_lirc_lirc_client_h=$(usex lirc)
+	export ac_cv_lib_lirc_client_lirc_init=$(usex lirc)
+
+	econf \
+		$(use_enable debug) \
+		--with-qtdir=/usr \
+		--with-qtlibdir=/usr/$(get_libdir)/qt4
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-sound/rosegarden/rosegarden-14.12.ebuild b/media-sound/rosegarden/rosegarden-14.12.ebuild
new file mode 100644
index 000000000000..eb5098019f71
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-14.12.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils multilib
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="http://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug lirc"
+
+RDEPEND="dev-qt/qtgui:4
+	media-libs/ladspa-sdk:=
+	x11-libs/libSM:=
+	media-sound/jack-audio-connection-kit:=
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	sci-libs/fftw:3.0
+	media-libs/libsamplerate:=[sndfile]
+	lirc? ( app-misc/lirc:= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-misc/makedepend"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-12.12.25-debug.patch
+	eautoreconf
+}
+
+src_configure() {
+	export USER_CXXFLAGS="${CXXFLAGS}"
+
+	export ac_cv_header_lirc_lirc_client_h=$(usex lirc)
+	export ac_cv_lib_lirc_client_lirc_init=$(usex lirc)
+
+	econf \
+		$(use_enable debug) \
+		--with-qtdir=/usr \
+		--with-qtlibdir=/usr/$(get_libdir)/qt4
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-sound/rosegarden/rosegarden-16.06.ebuild b/media-sound/rosegarden/rosegarden-16.06.ebuild
new file mode 100644
index 000000000000..95b8daa1f8a0
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-16.06.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit cmake-utils eutils fdo-mime gnome2-utils
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="http://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lirc"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	media-libs/ladspa-sdk:=
+	x11-libs/libSM:=
+	media-sound/jack-audio-connection-kit:=
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	sci-libs/fftw:3.0
+	media-libs/libsamplerate:=
+	media-libs/libsndfile:=
+	sys-libs/zlib:=
+	lirc? ( app-misc/lirc:= )"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DDISABLE_LIRC=$(usex lirc OFF ON)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-sound/rosegarden/rosegarden-17.04.ebuild b/media-sound/rosegarden/rosegarden-17.04.ebuild
new file mode 100644
index 000000000000..17a8df025a95
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-17.04.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit cmake-utils eutils fdo-mime gnome2-utils
+
+DESCRIPTION="MIDI and audio sequencer and notation editor"
+HOMEPAGE="http://www.rosegardenmusic.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="lirc"
+
+RDEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	media-libs/ladspa-sdk:=
+	x11-libs/libSM:=
+	media-sound/jack-audio-connection-kit:=
+	media-libs/alsa-lib:=
+	>=media-libs/dssi-1.0.0:=
+	media-libs/liblo:=
+	media-libs/liblrdf:=
+	sci-libs/fftw:3.0
+	media-libs/libsamplerate:=
+	media-libs/libsndfile:=
+	sys-libs/zlib:=
+	lirc? ( app-misc/lirc:= )"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		"-DDISABLE_LIRC=$(usex lirc OFF ON)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
new file mode 100644
index 000000000000..b1383ce69560
--- /dev/null
+++ b/media-sound/rplay/Manifest
@@ -0,0 +1,10 @@
+AUX rplay-3.3.2-built-in_function_exit-r1.patch 366 SHA256 f6d326a88a5160df29986fbcd159aa1d6af5a8ef9ada67c47fb6d161d13b37d3 SHA512 6c5f358a6ef89b7338ae5bf2e485a3996e143fdab0c73455d97bdb2e07729464323992d72424d29c954f2537acef2c45ebd744db6a2e26b99ffd97be2f44957d WHIRLPOOL be47d1d85f76f836e7aca5b50c21fa4f5741eeb47011fa243e6ec9c4fa15375baa11fe7a390ddca70404cf5f0f7a7d19b81c0235d9eec40efef15cda86b9dddc
+AUX rplay-3.3.2-built-in_function_exit.patch 358 SHA256 413839bb757a42fb386db911308ac67ca35426c18bab48f08a6d0187f75fada8 SHA512 64c95e1f01f414301e7fea56986e2cf5230b1ce30bff909984fa489105c9951e7d9c05779dfa542aa8002203d0fbb3d71b0fc0412fa849d21b7b8786aaedc2ed WHIRLPOOL e6554dd4aaa590259ef48a92b0799601c9390f703a88370cc6b6e91298ab0809b501da39c6f29180f9a99a096b6208a84499f1107e571904c69516e95355dadc
+DIST rplay-3.3.2.tar.gz 480015 SHA256 74265153457a44e1e2f0fa38c59c9b12ea5b684db2c83eb055184f86db81fdd8 SHA512 b0683de0f5dc1483d22ac68c0502fe66e89ba1c25300fdca9486df1cb6ea96393b18b783f918f18dba0ba0fbfd20410448e3e03df06fc4afba1b63024d82a713 WHIRLPOOL d23479b9809b566c634e8a1574229567e16c81fc943185a99667c373caf02d174c0ab6b2c6437ff5e960d034110c0e480565bbdc8ce436e51970487e64d80bf0
+DIST rplay_3.3.2-12.diff.gz 25322 SHA256 9f38ea87379e915ffb3fb338baf454f7ce2cbc605616c27b82df25f708220626 SHA512 b9a178fbca44cec9814ef0b65e4924e18c053ec6f0024c30b35abbcd9062c094bfffe3ca7113c74604df80b12b38d412a45c645ff13903e6b23500ea99f89d7b WHIRLPOOL 8d97ca2cc143b58ead591701709be4922fb0b3c83f2f00c9bb4b8687fe5b937d011e9b9ecc01f9682677d0c84e1ddb03ed510356126939a2d10fe70a536690c1
+DIST rplay_3.3.2-16.debian.tar.xz 25456 SHA256 3c0e1dd8b107d1194ff7b73578281622a1bce97a3a21681d4e124e5c00977d62 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b WHIRLPOOL b8e566dd3a407fe2685b084537122b20944b9c0eaf33ea8f15ccd941fc2beaeffdf83ea54394e274d9e4f332b449230d9e0a5d3ca3b7e060accae70b45ca4677
+EBUILD rplay-3.3.2-r1.ebuild 964 SHA256 fb002bab4acbfd5302ea4581edb07b73234598b9defa55d0acc0d38abb25475f SHA512 e6d60ccaa796159ef682b84970e171f88f03100b6f2c1e09ced966c274330fe37d809fda4c055f91c5c2e9bb3b8874c96ee7515f62b8cc4b573146c419abd3e2 WHIRLPOOL 5684af472e284d509d4de386f7fd100f7532db8146911532f8526972741fb23c247758995d3832f70a5a3e67cb9fa5ec62a75a000a9a398feaafcdc578f041e9
+EBUILD rplay-3.3.2-r2.ebuild 1125 SHA256 1f6c780e6750759e75454f2dd87faa1d3577451ee8f47b16957493b122f0de6d SHA512 8b949b1f97bf29b94cc9eac103a1cb365bee26da8f3dd91f2c6ac187cf0254366e36bf062d95fe0cef79dee0f3797faee54342430ecd3719c6e3c22fceb73785 WHIRLPOOL f21b8c23e27dfa34d6f84b5e7da63e486138a17d4ef9b94cfd9ff1b42c862491e1ce4bae3fef021187ad1240680b0c3e72e5e6c4c1b82ca79d951e9994dbde51
+MISC ChangeLog 3046 SHA256 8a1e854ea87225966d14bf5f9adcf3e071affebc3a8d7b52c1f2d55e17d06cc4 SHA512 c1088c017f5ac4422c2f2a723b30509807dbd7bf99c6d38291d3412d0eacddf85fe8e33f0cb5d920eaace2b7c497f7cc5ca97ff5a5c4be7975445629e60ae071 WHIRLPOOL dc7123a7d17496eb1fd19acca2ad633c0a12d82ab0a83dc4030c99f28f434a59ce39951633fd4bbe9c55f4854c0f04dc764cf4328c34b5c5f238cc4b6e478c34
+MISC ChangeLog-2015 2754 SHA256 c6383692d8d43199cc12db4886d31e4ce20be2fea186a738e7858a6ed5fe9df9 SHA512 9e18ad9b4c300d5223e0084572c2dc8524972f14863f6a53fc2cbf5e81d86caa3980c9a63b7c5407cabcff1f72ad009f7d46556cbc71d59b05ce41cac1af550a WHIRLPOOL f3e15f9480dd974a909d5385b9ad4bfda436634c2ea9caae3d06a7fb713348d8394d6e102a5431c593bee09e525282aac88b6696b76539bdb5c75626aedf0239
+MISC metadata.xml 603 SHA256 27a322eac014412e304b02db608ec87e44d5006ac20625d154d04c6e99d2c3ef SHA512 2c14a0b95c45b0c088dd0f2c58e30b15c7d5eba6b40cc56dfa5b999d3f419ef3eeaf95459e2a6da975f516ee9a0ba7aab62bece704bf2292c1f4312092c8889a WHIRLPOOL 0233323f9672a8ea979b6e8229023c575359e0121ddf215eff01ebd8dc72a4f0e7cde31fde7cd7df04caf764d48b014b79d526795516e69b33bdc81f2b32fab2
diff --git a/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit-r1.patch b/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit-r1.patch
new file mode 100644
index 000000000000..79d9a128806e
--- /dev/null
+++ b/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit-r1.patch
@@ -0,0 +1,20 @@
+--- a/adpcm/decode.c
++++ b/adpcm/decode.c
+@@ -6,6 +6,7 @@
+  * Usage : decode [-3|4|5] [-a|u|l] < infile > outfile
+  */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "g72x.h"
+ 
+ 
+--- a/adpcm/encode.c
++++ b/adpcm/encode.c
+@@ -6,6 +6,7 @@
+  * Usage : encode [-3|4|5] [-a|u|l] < infile > outfile
+  */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "g72x.h"
+ 
+ 
diff --git a/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit.patch b/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit.patch
new file mode 100644
index 000000000000..e7b59dfeba88
--- /dev/null
+++ b/media-sound/rplay/files/rplay-3.3.2-built-in_function_exit.patch
@@ -0,0 +1,20 @@
+--- adpcm/decode.c
++++ adpcm/decode.c
+@@ -6,6 +6,7 @@
+  * Usage : decode [-3|4|5] [-a|u|l] < infile > outfile
+  */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "g72x.h"
+ 
+ 
+--- adpcm/encode.c
++++ adpcm/encode.c
+@@ -6,6 +6,7 @@
+  * Usage : encode [-3|4|5] [-a|u|l] < infile > outfile
+  */
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "g72x.h"
+ 
+ 
diff --git a/media-sound/rplay/metadata.xml b/media-sound/rplay/metadata.xml
new file mode 100644
index 000000000000..cade504eaab3
--- /dev/null
+++ b/media-sound/rplay/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription lang="en">
+ 		rplay is a flexible network audio system that allows sounds to be played
+		to and from local and remote Unix systems. Sounds can be played with or
+		without sending audio data over the network using either UDP or TCP.
+		rplay audio servers can be configured to share sound files with each
+		other.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/rplay/rplay-3.3.2-r1.ebuild b/media-sound/rplay/rplay-3.3.2-r1.ebuild
new file mode 100644
index 000000000000..31c12f49a0c7
--- /dev/null
+++ b/media-sound/rplay/rplay-3.3.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit autotools eutils multilib user
+
+DESCRIPTION="Play sounds on remote Unix systems, without sending audio data over the network"
+HOMEPAGE="http://rplay.doit.org/"
+SRC_URI="http://rplay.doit.org/dist/${P}.tar.gz mirror://debian/pool/main/r/rplay/rplay_${PV}-12.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="media-sound/gsm"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup rplayd ""
+	enewuser rplayd "" "" "" rplayd
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch "${WORKDIR}"/rplay_${PV}-12.diff
+	cd "${S}"
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="dpatch" epatch debian/patches
+	epatch "${FILESDIR}"/${P}-built-in_function_exit.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--enable-rplayd-user=rplayd \
+		--enable-rplayd-group=rplayd
+	emake || die
+}
+
+src_install() {
+	einstall || die
+}
diff --git a/media-sound/rplay/rplay-3.3.2-r2.ebuild b/media-sound/rplay/rplay-3.3.2-r2.ebuild
new file mode 100644
index 000000000000..4083ac523973
--- /dev/null
+++ b/media-sound/rplay/rplay-3.3.2-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools user
+
+DESCRIPTION="Play sounds on remote Unix systems without data transfer"
+HOMEPAGE="http://rplay.doit.org/"
+SRC_URI="${HOMEPAGE}dist/${P}.tar.gz
+	mirror://debian/pool/main/r/${PN}/${PN}_${PV}-16.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="media-sound/gsm"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${WORKDIR}/debian/patches"
+	"${FILESDIR}/${P}-built-in_function_exit-r1.patch"
+)
+
+pkg_setup() {
+	enewgroup rplayd ""
+	enewuser rplayd "" "" "" rplayd
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-rplayd-user=rplayd \
+		--enable-rplayd-group=rplayd
+}
+
+src_install() {
+	# This is borrowed from the old einstall helper, and is necessary
+	# (at least some of variables).
+	emake prefix="${ED}/usr" \
+		datadir="${ED}/usr/share" \
+		infodir="${ED}/usr/share/info" \
+		localstatedir="${ED}/var/lib" \
+		mandir="${ED}/usr/share/man" \
+		sysconfdir="${ED}/etc" \
+		install
+}
diff --git a/media-sound/saydate/Manifest b/media-sound/saydate/Manifest
new file mode 100644
index 000000000000..6b40c86050d8
--- /dev/null
+++ b/media-sound/saydate/Manifest
@@ -0,0 +1,5 @@
+DIST saydate-0.3.0.tar.gz 137732 SHA256 d57ceae4daebe64b559dcdf444e59cf965ef1bdc316d0385a6abfbfc6381ee9a SHA512 b53bc6037f4f757deefba54855036b25287c721f424a53858d038362b1b0c42d27bf7e72739768362c3b02cc9cca13945fb33dc6f3df9c1e76dba23b1cedbd71 WHIRLPOOL 0760dba664754a06080b3faa4bd0db8eaddef1082cafd543b072e69fc677cae929fe5389e3e2cb8855dd13f8c4cd96518c2788d09a1180489d3fbdec2499995d
+EBUILD saydate-0.3.0.ebuild 916 SHA256 c12b2af1f3cc78219c75af5333e9ab91250af57149d4ceabeb113a3580ae5f8d SHA512 29879c713b19f8a93aecb84f2ca872a7f3471001f3fa2c86a4063136a176f95c51477994df4a24fcc91b70e9389f1cb5f84be3527b05fae62fb6cd4d2750ce22 WHIRLPOOL 1e270f8d3ab4e5f1c958f8acdc0febf219cbdaa9f3ef517fce9ff29b1ce69f5dabbe86422d01f1669dcab44d4d94d24874f1c6819989125ed21e0b2111258d4c
+MISC ChangeLog 2430 SHA256 83c089558f8933574ac62815aa7529b481cbc70cc4a7879b9fedb254002c2329 SHA512 3436707dd31641998e07d8a989082b9d6df93e3dcbbc424333b2eae36337e10d1ceb3d45ccdeae47b19596852cea0134284a820deae72c528ea2a9bc845dbeed WHIRLPOOL ca4d38d095a978a913cb26d43b64de4ac8eb7ec71d0a827ec23946eed8c9cbeffdb7af937f4d7f4d1a2416c919d3f1bf89158fa539a92592235329f0b4435775
+MISC ChangeLog-2015 1274 SHA256 d8fc911b2807cda7b7b1ee1470b96caed833aff31eede420efac83b831ae7964 SHA512 aefe77ed47eb01743a49745f71cd3fcf932e9b212049e490e20acea8895c30f3add2f5dd9a436126e6c93affc2c20c280852603e600e7ad7db606963700bb60a WHIRLPOOL a0eeb39456132868230a30c4d96c4b0e5413def0f0b40f3faabd66805710bbaa1b0816b2e1bc6db39b30e2fb6118a87429ac3db1d386adc7b7a5ce90032fcca3
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/saydate/metadata.xml b/media-sound/saydate/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/saydate/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/saydate/saydate-0.3.0.ebuild b/media-sound/saydate/saydate-0.3.0.ebuild
new file mode 100644
index 000000000000..83a3896bff56
--- /dev/null
+++ b/media-sound/saydate/saydate-0.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="A Linux shell program that talks the date and system uptime"
+HOMEPAGE="http://unihedron.com/projects/saydate/saydate.php"
+SRC_URI="http://unihedron.com/projects/saydate/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
+
+DEPEND="=sys-apps/sed-4*"
+IUSE=""
+
+# Don't leave this empty or it tries to install directly
+# on livefs
+src_compile() { :; }
+
+src_install () {
+	insinto /usr/share/man/man1
+	doins "${S}"/man/saydate.1.gz "${S}"/man/au2raw.1.gz
+
+	dodir /usr/share/saydate
+	insinto /usr/share/saydate
+	doins "${S}"/data/*.raw
+
+	sed -i "s:/dev/audio:/dev/dsp:" "${S}"/saydate
+	sed -i "s:/dev/audio:/dev/dsp:" "${S}"/au2raw
+	sed -i "s:/dev/audio:/dev/dsp:" "${S}"/DESIGN
+	dodoc README TODO HISTORY DESIGN
+	dobin saydate au2raw || die "dobin failed"
+}
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
new file mode 100644
index 000000000000..fc4a5334efdf
--- /dev/null
+++ b/media-sound/schismtracker/Manifest
@@ -0,0 +1,5 @@
+DIST schismtracker-20120105.tar.bz2 1097124 SHA256 31cef23e6806027618aef03675a5e4681043a99afa6e9e92d82ad4cec5e6c7db SHA512 5b92603af3b6add0e8bd6d0b140b0ddedbaf8e2b434f651ab887e3211ccc8bcfa94be281aabc3b28dbd84e3d91f539eb0939d6d4e0596529133db7ce10aeafd8 WHIRLPOOL 64b73a08080d2b1ff8df710013b0ff4bf6e85398778045e525d4369163769b57f1adbd09ae19ba493f33fe4db68ddb0e51d8889b75ed05bbd3a7d88845218de2
+EBUILD schismtracker-20120105.ebuild 1406 SHA256 ed2ea96422d26d01d9367a01b05ed5cc9652fea369db61d5769c55d1fd9e6e14 SHA512 edd74023adffd42d23b319251f73bca83672beb3b0f7b952aac50922faa8845c1686a388cdc7f8b3ac88b2a57cd7301610ce70485916561a2e0f6fcb83a4e58e WHIRLPOOL a8e2956aa3e54a02e36809aaba5c4ca2f81feaffd86bda32687a19092bb561515edac1b773e631e9250a828eb3db5a5207147d979a0fd54b99282d8c3ce7ddec
+MISC ChangeLog 2779 SHA256 8d633cdf6239c5c6d2f70bce7f209e566f2e01595d266266f376a3bfc37cb65e SHA512 1203936036efaaab1009090d9f4a46bfac60768a56b0d8a15166744058c0386df2be8f7477dd284237fa4647b3789cbb697b51b27658c6337f4b716ab143841d WHIRLPOOL 3b216929fccbc06ae525f070b952a45319a212afe80f42fa79df596c358e36bbbf1d621d5fbc442e2861543c83b1026faebeb42f48048c39f41426dcb27b5bd9
+MISC ChangeLog-2015 1661 SHA256 25cf37a7e4b56677d50bd6d6fdfd5c8c6b95b40daa5be7dcc90760a100e6c373 SHA512 eb0ce23d218a4aa6666f7d8d79a9646bed60ee5341a413399c590d04a1856bfbb679ffbd6f668f70baaa3912766ea693ff69c70e8d069e9b65a965e2be0bb62b WHIRLPOOL 1891c36445d254b359b57581933c697e737d4796e1cb097d1776699f93572c4bd92e2ea51954cae4cdf0bdee4ff2c13ea276e4738ccd54988a6a3228f3ad9303
+MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/media-sound/schismtracker/metadata.xml b/media-sound/schismtracker/metadata.xml
new file mode 100644
index 000000000000..39626a990be5
--- /dev/null
+++ b/media-sound/schismtracker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/schismtracker/schismtracker-20120105.ebuild b/media-sound/schismtracker/schismtracker-20120105.ebuild
new file mode 100644
index 000000000000..b64ae46f367d
--- /dev/null
+++ b/media-sound/schismtracker/schismtracker-20120105.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
+HOMEPAGE="http://eval.sovietrussia.org//wiki/Schism_Tracker"
+SRC_URI="http://${PN}.org/dl/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2 public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	>=media-libs/libsdl-1.2[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+	x11-libs/libXxf86misc"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	x11-proto/kbproto
+	x11-proto/xf86miscproto
+	x11-proto/xproto"
+
+DOCS="AUTHORS NEWS README TODO"
+
+src_prepare() {
+	default
+
+	# workaround for temporary files (missing directory). Fixes:
+	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
+	# /bin/sh: auto/default-font.c: No such file or directory
+	mkdir auto
+
+	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
+	#   wine provides /usr/bin/windres
+	# and schismtracker fails to use it properly:
+	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
+	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
+}
+
+src_install() {
+	default
+
+	domenu sys/fd.org/*.desktop
+	doicon icons/schism{,-itf}-icon-128.png
+}
diff --git a/media-sound/scmpc/Manifest b/media-sound/scmpc/Manifest
new file mode 100644
index 000000000000..5ccfaad10ecf
--- /dev/null
+++ b/media-sound/scmpc/Manifest
@@ -0,0 +1,6 @@
+AUX scmpc-2.init 317 SHA256 1e9000bf38df68b91b6cf83270f0f4e39582a461c305bc3cc4593394161dba80 SHA512 58cd9269acbdb92bd4ab0ae23c1f5a07909debf9b37131824827089aece9552493b984f5d73c654a7f6ef47e7bb496e424cbe3885db932ab5554bee9f296f0df WHIRLPOOL 0b2ea6e6d017853c0690604996d1fd904d05e25573c70c27fdeea4c4b5b4bbe73521fd1118c4ad6b4548e99953e6687ae216e672ed9c56d408a1cd8d68b70519
+DIST scmpc-0.4.1.tar.bz2 88288 SHA256 f89958dc0449f1dfbcbe81b453986812196dc86200153ac700cf606297c3fde3 SHA512 7d9f8aad29d58f2227a6149a6b4c9bfc4d400946ac316cbb34482feffd71619c1f311cb1ce6f02c22912793e866661e4d976c8f4ee99ffd1e76be65c9a06d876 WHIRLPOOL 15036bae6c20670c5bc605f3c4b3a52a97f4527bdde6ac94788ec651c2f785bdc6c705644ae4937a7bf66a4ad498f858a14fbdbe4f821c007349e7026207fc62
+EBUILD scmpc-0.4.1.ebuild 663 SHA256 5081ae8426e951236e3614671f3033c85c5c2457b532f34b34d1d7f7ee7847ae SHA512 964e38c230f79930c210f481cf0227ea7a3136e7b98b4feabe0eb2ef3164fd4cb639178efc0a713f1ed5b0085e1844ff28e40ce585e2bac163daf3377d3d1bfe WHIRLPOOL 47db86f0eda4f743d81d3f1401ce0d66c55bd605568b450fb5d1232d1f50d24687f47924790f0bd1a2d55213c924e9d3d9b0a7084f2246646f0d3f8b74932b04
+MISC ChangeLog 3123 SHA256 45ec3ca1d19db399c3751eea87abb32e8b9b831c8f56dab430d9ff80377882ac SHA512 94d898cb563f06e6a83591495b6c08a4c1585ce8cec88a669c92fc2491ac416e86ea58c95bbdfc7963a0d4cc8e75b715c40ffc6a2f9544646e0b203f1800a5de WHIRLPOOL 6193d73a45e84a3a70284900fe36ccd634cbbaaf7c5c8216409336dda043dd348ff76b4fa0c44202695088fb16ca1eb181c78e63696d1555bd18d1ae6eb13b10
+MISC ChangeLog-2015 3111 SHA256 953a38817716d5fd097c2ff4ab6c1f6ad183d27ffd0576aa8b617d3817ccef25 SHA512 d02bcad28c396cf49cfe5a29155083a991fa2148bdbbbe02c402a7471884e31a807c289fbb32b65bfa0332bd570e419fbc7a86868b62a142ce55be5989f59721 WHIRLPOOL 19375a03a6b894c4100b88fb566720309c318d7c28a1058fff26942511a78c264bba388c045bc867ceae1b46fbedd9cbe7beed8e1062c2f109cd7f0d01bf8e63
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/media-sound/scmpc/files/scmpc-2.init b/media-sound/scmpc/files/scmpc-2.init
new file mode 100644
index 000000000000..afd48028a852
--- /dev/null
+++ b/media-sound/scmpc/files/scmpc-2.init
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	use net mpd
+}
+
+start() {
+	ebegin "Starting scmpc"
+	/usr/bin/scmpc -f /etc/scmpc.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping scmpc"
+	/usr/bin/scmpc -kf /etc/scmpc.conf
+	eend $?
+}
diff --git a/media-sound/scmpc/metadata.xml b/media-sound/scmpc/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/media-sound/scmpc/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/media-sound/scmpc/scmpc-0.4.1.ebuild b/media-sound/scmpc/scmpc-0.4.1.ebuild
new file mode 100644
index 000000000000..714a7b51ba2a
--- /dev/null
+++ b/media-sound/scmpc/scmpc-0.4.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="a client for MPD which submits your tracks to last.fm"
+HOMEPAGE="https://cmende.github.com/scmpc/"
+SRC_URI="https://dev.gentoo.org/~angelos/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/confuse
+	media-libs/libmpdclient
+	net-misc/curl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md scmpc.conf.example )
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}-2.init ${PN}
+	insinto /etc
+	insopts -m600
+	newins scmpc.conf.example scmpc.conf
+}
diff --git a/media-sound/seq24/Manifest b/media-sound/seq24/Manifest
new file mode 100644
index 000000000000..51801fdefa11
--- /dev/null
+++ b/media-sound/seq24/Manifest
@@ -0,0 +1,8 @@
+AUX seq24-0.9.2-lash-fix.patch 6333 SHA256 7bb74e3df46bb93021144a937b45c28aa6d633e30c5fffc156230a58bfa822cc SHA512 762d1bc75e736947f62316465c4ccd24f0c2ccc610803f04e41c28e1e4dd73e59d12eeacea73383c4d26735bef5c8d9a2300424ea2a3c0fcf0d80465d3431184 WHIRLPOOL 2c64b6549472c41ea2ed18e3f6dd96288be896ce97028309628272ecbe4917c83bfb3b12f7f299db494eafd5a3ab4616031dd7752998605cc0b9391d796855a1
+DIST seq24-0.9.2.tar.bz2 213059 SHA256 dbcfd18b7744ae739717588dd71a9923e5c08cf8fe1d3e71c897515cab875b0a SHA512 31e57c7fafbccf85a69229674d3bcfb86e2fa9b2f095b50fd59a44673896edc5c4f9dd97585923cee9129bc8619ac6eb33274241271cdcc56732c920d4106ec8 WHIRLPOOL b2f80410abb372c89f040409b3c0dd1a614da337d35bfa4b2507c276e4d47f853856d1a485e8ddcab6ccbacfed4c03238bae53739621da8ea5a5a7b6d728b43d
+DIST seq24-0.9.3.tar.bz2 221014 SHA256 e22ad4438b9b350fb8d4d37c3664905e760fa9d8213e55379861ba6d6183b789 SHA512 f0fe13ceedbc87899df058918f3bdd57dbb9f1a3491d23503ae48367ba9eebdd2c8b5706b7b041db0959703a941d52d67f57823937ffdc574b01323eda32e3ad WHIRLPOOL 996de8cd78bfef4f6eab3458522f16d3da443ffaeef1b356567cb8a2827e2a60354844d2bbfb9fb4764525d52e97c774f8c7af8c03ded2fefc8651a02f2596e2
+EBUILD seq24-0.9.2-r1.ebuild 897 SHA256 28da8ffc78d4d288c157cb94e9dbbf1c121d6ff0802c9b31540237a07968406a SHA512 50136ff4cae38c053ee8b209a6969b7023cb03ea26e3b31ea035dcbe6858432d66a16bcf737452e027230cecc451d1542c4859f00c6adc2f85d43a04100163dd WHIRLPOOL eabc1cc33590e7dd744e6d6a79ce461f06518688fea6b49849e0fe2083eac726aff8af06d4a30afb8a470630db99f1d5cda35ac6448fbd0cd6ada6c12a295f93
+EBUILD seq24-0.9.3.ebuild 837 SHA256 c8e5ddafb934df8bbb8df0cf91b70c8aaf8bf719dc8218e056a8e1899b69f1ce SHA512 6c150a31c96c8b41d7b033ea300b2487d2780d7bc7c29712a2d1fab656ec0e2a19e1265bf49f8f8dd9a5bc2bdb8570855ebbcf2a17b64f311834994dcde48da6 WHIRLPOOL ce46441f9e52a0e5eb85c9429415dc99caf99264d5b524e6213f480af7446b4e15200b7d9f78ffded27c4dd0fb50a59fe5f10920b05e31efe0d3adadb783440d
+MISC ChangeLog 3208 SHA256 82a7b072c561bedc0b543f4ceb5ab2a00e20fa0c681b6fd1b6aaeb070ff37ab9 SHA512 d78d4a49fd483954b66f991a8f0a28074800f66326ce4cc6426b0d35a94f70e63cbb1a688eb5e6284b9d857d89c5f5d259c4d5c99a000f3408fdd2b368d79d98 WHIRLPOOL dca5ad09293bdcd181812879f4ddbb5c27894624433c120adc6bfe97d692d8cf88b1ff421ea910b6332db2b47a83aeb8703cdc4600fac08cb304fdb3c14b0e61
+MISC ChangeLog-2015 6114 SHA256 c1f766e4cba5e262ffd57f3984f1d8cbd263fc826546fd484731fa2396cdaabf SHA512 e9578e312464661ebb8283c8f13e8337bc1deef0bbf952d1831c3cb6f1ce496c1e77f8859dec2805b580f1dfaeb14501d9948d8636d1a99d69c303bbd40fe22d WHIRLPOOL 50c9a963d08af6af13ab2d7204267c15b963b7908206e175d7d00802a6efb92ec29ec1829e0214a01e4c189e70c2a92920d4132d1fb15cf491ada500790fc86c
+MISC metadata.xml 255 SHA256 fc6dd027d0011f9f42d437ea0687857760a11bf2137f8822ec8692186d0bcbe3 SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 WHIRLPOOL de03966b13986c67a61f862755281e80740260a9031e5e34cbee88a3053e66f705df0f36499b154744ff447c94e19a28b8649535e08819216569e78eb4ce9a38
diff --git a/media-sound/seq24/files/seq24-0.9.2-lash-fix.patch b/media-sound/seq24/files/seq24-0.9.2-lash-fix.patch
new file mode 100644
index 000000000000..8b0efadb7b55
--- /dev/null
+++ b/media-sound/seq24/files/seq24-0.9.2-lash-fix.patch
@@ -0,0 +1,248 @@
+Upstream fix for segfault when built with lash support.
+https://bugs.launchpad.net/seq24/+bug/696371
+
+=== modified file 'src/lash.cpp'
+--- old/src/lash.cpp
++++ new/src/lash.cpp
+@@ -29,17 +29,9 @@
+ lash::lash(int *argc, char ***argv)
+ {
+ #ifdef LASH_SUPPORT
+-   m_lash_args = lash_extract_args(argc, argv);
+-#endif // LASH_SUPPORT
+-}
+-
+-
+-void lash::init(perform* perform)
+-{
+-#ifdef LASH_SUPPORT
+-    m_perform = perform;
+-
+-    m_client = lash_init(m_lash_args, PACKAGE_NAME,
++    m_perform = NULL;
++
++    m_client = lash_init(lash_extract_args(argc, argv), PACKAGE_NAME,
+             LASH_Config_File, LASH_PROTOCOL(2, 0));
+ 
+     if (m_client == NULL) {
+@@ -65,9 +57,10 @@
+ 
+ 
+ void
+-lash::start()
++lash::start(perform* perform)
+ {
+ #ifdef LASH_SUPPORT
++    m_perform = perform;
+     /* Process any LASH events every 250 msec (arbitrarily chosen interval) */
+     Glib::signal_timeout().connect(sigc::mem_fun(*this, &lash::process_events), 250);
+ #endif // LASH_SUPPORT
+
+=== modified file 'src/lash.h'
+--- old/src/lash.h
++++ new/src/lash.h
+@@ -43,7 +43,6 @@
+ #ifdef LASH_SUPPORT
+     perform       *m_perform;
+     lash_client_t *m_client;
+-    lash_args_t *m_lash_args;
+ 
+     bool process_events();
+     void handle_event(lash_event_t* conf);
+@@ -54,13 +53,12 @@
+ public:
+     lash(int *argc, char ***argv);
+ 
+-    void init(perform* perform);
+     void set_alsa_client_id(int id);
+-    void start();
++    void start(perform* perform);
+ };
+ 
+ 
+-/* global lash driver, defined in seq24.cpp */
++/* global lash driver, defined in seq24.cpp and used in midibus.cpp*/
+ extern lash *lash_driver;
+ 
+ 
+
+=== modified file 'src/midibus.cpp'
+--- old/src/midibus.cpp
++++ new/src/midibus.cpp
+@@ -877,11 +877,11 @@
+ 
+     /* set up our clients queue */
+     m_queue = snd_seq_alloc_queue( m_alsa_seq );
+-#endif
+ #ifdef LASH_SUPPORT
+ 	/* notify lash of our client ID so it can restore connections */
+ 	lash_driver->set_alsa_client_id(snd_seq_client_id(m_alsa_seq));
+ #endif
++#endif
+ }
+ 
+ 
+
+=== modified file 'src/perform.cpp'
+--- old/src/perform.cpp
++++ new/src/perform.cpp
+@@ -1342,6 +1342,7 @@
+             stats_last_clock_us= (last.tv_sec * 1000000) + (last.tv_nsec / 1000);
+ #else
+         /* get start time position */
++        /* timeGetTime() returns a "DWORD" type (= unsigned long)*/
+         last = timeGetTime();
+ 
+         if ( global_stats )
+
+=== modified file 'src/seq24.cpp'
+--- old/src/seq24.cpp
++++ new/src/seq24.cpp
+@@ -108,12 +108,66 @@
+      * GTK+. */
+     Gtk::Main kit(argc, argv);
+ 
+-    /* Init the lash driver (strips lash specific command line
+-     * arguments, but does not connect to daemon) */
++    /*prepare global MIDI definitions*/
++    for ( int i=0; i<c_maxBuses; i++ )
++    {
++        for ( int j=0; j<16; j++ )
++            global_user_midi_bus_definitions[i].instrument[j] = -1;
++    }
++
++    for ( int i=0; i<c_max_instruments; i++ )
++    {
++        for ( int j=0; j<128; j++ )
++            global_user_instrument_definitions[i].controllers_active[j] = false;
++    }
++
++
++    /* Init the lash driver (strip lash specific command line
++     * arguments and connect to daemon) */
+ #ifdef LASH_SUPPORT
+     lash_driver = new lash(&argc, &argv);
+ #endif
+ 
++    /* the main performance object */
++    /* lash must be initialized here because mastermidibus uses the global
++     * lash_driver variable*/
++    perform p;
++
++    /* read user preferences files */
++    if ( getenv( HOME ) != NULL )
++    {
++        Glib::ustring home( getenv( HOME ));
++        last_used_dir = home;
++        Glib::ustring total_file = home + SLASH + config_filename;
++        
++        if (Glib::file_test(total_file, Glib::FILE_TEST_EXISTS))
++        {
++            printf( "Reading [%s]\n", total_file.c_str());
++
++            optionsfile options( total_file );
++
++            if ( !options.parse( &p ) ){
++                printf( "Error Reading [%s]\n", total_file.c_str());
++            }
++        }
++
++        total_file = home + SLASH + user_filename;
++        if (Glib::file_test(total_file, Glib::FILE_TEST_EXISTS))
++        {
++            printf( "Reading [%s]\n", total_file.c_str());
++
++            userfile user( total_file );
++
++            if ( !user.parse( &p ) ){
++                printf( "Error Reading [%s]\n", total_file.c_str());
++            }
++        }
++
++    }
++    else
++        printf( "Error calling getenv( \"%s\" )\n", HOME );
++
++
+     /* parse parameters */
+     int c;
+ 
+@@ -229,65 +283,14 @@
+     } /* end while */
+ 
+ 
+-    /*prepare global MIDI definitions*/
+-    for ( int i=0; i<c_maxBuses; i++ )
+-    {
+-        for ( int j=0; j<16; j++ )
+-            global_user_midi_bus_definitions[i].instrument[j] = -1;
+-    }
+-
+-    for ( int i=0; i<c_max_instruments; i++ )
+-    {
+-        for ( int j=0; j<128; j++ )
+-            global_user_instrument_definitions[i].controllers_active[j] = false;
+-    }
+-
+-
+-    /* the main performance object */
+-    perform p;
+-
+-    p_font_renderer = new font();
+-
+-
+-    if ( getenv( HOME ) != NULL )
+-    {
+-        Glib::ustring home( getenv( HOME ));
+-        last_used_dir = home;
+-        Glib::ustring total_file = home + SLASH + config_filename;
+-        
+-        if (Glib::file_test(total_file, Glib::FILE_TEST_EXISTS))
+-        {
+-            printf( "Reading [%s]\n", total_file.c_str());
+-
+-            optionsfile options( total_file );
+-
+-            if ( !options.parse( &p ) ){
+-                printf( "Error Reading [%s]\n", total_file.c_str());
+-            }
+-        }
+-
+-        total_file = home + SLASH + user_filename;
+-        if (Glib::file_test(total_file, Glib::FILE_TEST_EXISTS))
+-        {
+-            printf( "Reading [%s]\n", total_file.c_str());
+-
+-            userfile user( total_file );
+-
+-            if ( !user.parse( &p ) ){
+-                printf( "Error Reading [%s]\n", total_file.c_str());
+-            }
+-        }
+-
+-    }
+-    else
+-        printf( "Error calling getenv( \"%s\" )\n", HOME );
+-
+     p.init();
+     p.launch_input_thread();
+     p.launch_output_thread();
+     p.init_jack();
+ 
+ 
++    p_font_renderer = new font();
++
+     mainwnd seq24_window( &p );
+     if (optind < argc)
+     {
+@@ -299,8 +302,7 @@
+ 
+     /* connect to lash daemon and poll events*/
+ #ifdef LASH_SUPPORT
+-    lash_driver->init(&p);
+-    lash_driver->start();
++    lash_driver->start(&p);
+ #endif
+     kit.run(seq24_window);
+ 
+
diff --git a/media-sound/seq24/metadata.xml b/media-sound/seq24/metadata.xml
new file mode 100644
index 000000000000..f79bb67acbd9
--- /dev/null
+++ b/media-sound/seq24/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/seq24/seq24-0.9.2-r1.ebuild b/media-sound/seq24/seq24-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..a63621d8a8cb
--- /dev/null
+++ b/media-sound/seq24/seq24-0.9.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Seq24 is a loop based MIDI sequencer with focus on live performances"
+HOMEPAGE="https://edge.launchpad.net/seq24/"
+SRC_URI="https://edge.launchpad.net/seq24/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="jack lash"
+
+RDEPEND="media-libs/alsa-lib
+	>=dev-cpp/gtkmm-2.4:2.4
+	>=dev-libs/libsigc++-2.2:2
+	jack? ( >=media-sound/jack-audio-connection-kit-0.90 )
+	lash? ( >=media-sound/lash-0.5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README RTC SEQ24 )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-lash-fix.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable jack) \
+		$(use_enable lash)
+}
+
+src_install() {
+	default
+	newicon src/pixmaps/seq24_32.xpm seq24.xpm
+	make_desktop_entry seq24
+}
diff --git a/media-sound/seq24/seq24-0.9.3.ebuild b/media-sound/seq24/seq24-0.9.3.ebuild
new file mode 100644
index 000000000000..842af4afc562
--- /dev/null
+++ b/media-sound/seq24/seq24-0.9.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Seq24 is a loop based MIDI sequencer with focus on live performances"
+HOMEPAGE="https://edge.launchpad.net/seq24/"
+SRC_URI="https://edge.launchpad.net/seq24/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="jack lash"
+
+RDEPEND="media-libs/alsa-lib
+	>=dev-cpp/gtkmm-2.4:2.4
+	>=dev-libs/libsigc++-2.2:2
+	jack? ( >=media-sound/jack-audio-connection-kit-0.90 )
+	lash? ( >=media-sound/lash-0.5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README RTC SEQ24 )
+
+src_configure() {
+	econf \
+		$(use_enable jack) \
+		$(use_enable lash)
+}
+
+src_install() {
+	default
+	newicon src/pixmaps/seq24_32.xpm seq24.xpm
+	make_desktop_entry seq24
+}
diff --git a/media-sound/setmixer/Manifest b/media-sound/setmixer/Manifest
new file mode 100644
index 000000000000..b1589fc87e36
--- /dev/null
+++ b/media-sound/setmixer/Manifest
@@ -0,0 +1,7 @@
+AUX setmixer.rc 449 SHA256 39a08793e7dc9b0dcf3125fafa93f9f69d78968155c5a606ac6cd7439818a6f4 SHA512 a0a3e26798e04b4b209b290a3ebae531f1a2effb3610b370b2b2329c42498c3ac9497c7be8d32fb64abc99452c3877a98662c0469352400812077cb0721d8345 WHIRLPOOL 1d5c4335f690589b78e5fe5630ea8952993dbcaa7ff99c609e7f2d4e7fbd8ba2580765780889add846c7b33f504f710254602c3ff3d93db518bd8ce3a8071fbf
+DIST setmixer_27DEC94ds1-1.diff.gz 3843 SHA256 922618c8a35208af81b043c1b4f4e08daab18e753acb20fc1d6837d15c435542 SHA512 ec58b6b2da3723659352eb9930d6b1afcfa9087056511eddf4502e3a2a962763152b1df25a9bc44b0587a7284701b80c4583af4f00105bc3998f68b25842b0a7 WHIRLPOOL f8b4c7ca6170de4e6f4eea6edcfea3824cb190638f72df3ef06de63cbc79b9f592ea8f580343d3f45604062384c3ee0c2b3ad6ec4ad1084c7f4d18e1d8b3286b
+DIST setmixer_27DEC94ds1.orig.tar.gz 2884 SHA256 e9a570ecb5e02420414fa2aad650d2efd81587777bbe53b6de38423adb493d03 SHA512 65a88ba577b62d0e7f98897b711f319aad886918695ea0b5c5f7897c45d109d7d26d9b9c64fb6a53bd419ba7346c631f6c0252ef305797bfca0ab2407eefec15 WHIRLPOOL 8d87e411d6768f5413faff01755b289154749f5cc068981ea79d11152e8cdee9be08ca87fe9c1f77b48834961abcb99f58a551b3b7ce29ea08efe83da3a99625
+EBUILD setmixer-19941227_p1.ebuild 880 SHA256 4cdd816cb3f99706e5901eafc7f13ec6bc36dd18bba2aa705a953d8fb36cf964 SHA512 fc545b5f9da5afcc0d76be5f8458867ebdf48530f6824e76f87671967a87b82ec8a62450126a9cf25114bb62689c21c4950ccb77dd4c83ef32f8670f2c1aed8a WHIRLPOOL 8b5065445d5d99f4bbd31f471d0511e2705429660473a56fc9997d6b80539b3a6f4ced3b10efb278bad061fa94243e4b8513c88586deb3d78930bb3392c5823d
+MISC ChangeLog 2593 SHA256 21d1bd53fed5d08a8488b7d022009ffcc217c7005ffb735bb7b13a68cada29a5 SHA512 ec7fa79d856f76aaf975bab61acc4e70a780f56d74955056cbaf98b7d31804cff34eaf857a0c2ba1bff42a32a86d72210a7003737dc5755400310009777e2048 WHIRLPOOL 5941ee7c399b98e286e249c684681b12d965bb698807b11216c3c61257f045e81f0ab751021a05bda33605679610044239e6845c8af0e3c60f6807c75e146e4f
+MISC ChangeLog-2015 1748 SHA256 7055f3378edc6c81b93c58345207bc631d207cb5fc534fb965295ee1b41737dd SHA512 1cd696261d8dab90bea0f6de2dd2cb80f7aa1c4fe5f70301326d8b47a3794f39f8d6a02fd6c5d9ce6fedda2bd793ea1c33dc2dc5a5600804f30d75de6cb12aa5 WHIRLPOOL 05edc5505036b8fad70cc727b7b2e8f42a2bfe2c4ff7e914309a2606a2412d2f1240d2df16b671e6ee398cf8688f0fc1ef39609d2ca9b5ac18eadc89cf65e5bc
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/setmixer/files/setmixer.rc b/media-sound/setmixer/files/setmixer.rc
new file mode 100644
index 000000000000..4070041fb560
--- /dev/null
+++ b/media-sound/setmixer/files/setmixer.rc
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need modules
+	use alsa
+}
+
+start() {
+	ebegin "Loading mixer settings"
+	[ ! -e /etc/setmixer.conf ] && setmixer -V | sed -e 's:-::' > /etc/setmixer.conf 
+	setmixer $(cat /etc/setmixer.conf)
+	eend $?
+}
+
+stop() {
+	ebegin "Saving mixer settings"
+	setmixer -V | awk '{print $1" "$3}' > /etc/setmixer.conf
+	eend $?
+}
diff --git a/media-sound/setmixer/metadata.xml b/media-sound/setmixer/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/setmixer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/setmixer/setmixer-19941227_p1.ebuild b/media-sound/setmixer/setmixer-19941227_p1.ebuild
new file mode 100644
index 000000000000..9dc57eb2b010
--- /dev/null
+++ b/media-sound/setmixer/setmixer-19941227_p1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+MY_PV="27DEC94ds1"
+DEB_REV="1"
+
+DESCRIPTION="A commandline mixer"
+HOMEPAGE="http://packages.debian.org/unstable/sound/setmixer"
+SRC_URI="mirror://debian/pool/main/s/${PN}/${PN}_${MY_PV}.orig.tar.gz
+	mirror://debian/pool/main/s/${PN}/${PN}_${MY_PV}-${DEB_REV}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}-${MY_PV}.orig
+
+src_unpack() {
+	unpack ${A}
+	epatch "${DISTDIR}"/${PN}_${MY_PV}-${DEB_REV}.diff.gz
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" setmixer || die "emake failed."
+}
+
+src_install() {
+	dobin setmixer
+	dodoc README setmixer.lsm
+	doman setmixer.1
+	insinto /etc
+	doins debian/setmixer.conf
+	newinitd "${FILESDIR}"/setmixer.rc setmixer
+}
diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest
new file mode 100644
index 000000000000..b5087ed28c95
--- /dev/null
+++ b/media-sound/sexypsf/Manifest
@@ -0,0 +1,8 @@
+AUX sexypsf-0.4.7-misc.patch 7770 SHA256 c06b86ff01762168d375d20e00b3bda2a88879abd1adfb37faae82e21cdf2c39 SHA512 7568573f143195faaad0aef8224d538c6628653c9bbfa43b1cf18195ac5fc675514200709419030f02a365279cabd81e5239faf3e12d1adcabe4b150549d6c47 WHIRLPOOL ced2bfc73e31efe5fcc4b12d6cb439608fbafc928ce511c411ae2ea316e3ff6aebbeb1bcc613ca61c445e6eb8d9e61fb48d804f4e71510452ed34ab7b2a05230
+DIST sexypsf-0.4.7.tar.bz2 83001 SHA256 6a6b4abb8b1cb919eb2d4cd23ae72cc2ec1360590831c131e58fcf99fe2b31aa SHA512 5b4fe7662769e668e15bea0db8785c5355a803dfe39f86eeba6dfce5df573f342525e10bc5317e1cd2b1ef70730ee4cf766c9d02cc9f404b0e39defbb30c364c WHIRLPOOL c10fe48d55cc17e6aafec63242b51e76a6345556e89d6547e6b7fe1551ac317550db40ad950e522cf7f457f0b3e7bbc925a2e503a9d8c80491677a6d9cefc25c
+DIST sexypsf-0.4.8.tar.bz2 82954 SHA256 72418cfbefd91018c60f9935e6ee07649fcba9a18e2c03082b41353fcab003a0 SHA512 bb95cdb40cf7172fdf815d6a2083adc4f684973534625d76c4fdb04752888acecfdd5ba329f9e2eed64311f30eb4400c8913ace13e4fa371c89c774905dc35d0 WHIRLPOOL da830f9d38c04aa26926125cfb4ab2991e45f40bce58193d38ac60f6402d695733e0d9347d90cddd550a11a5cf31d0a0cafc2f7c6df08aafd8a410299857c31c
+EBUILD sexypsf-0.4.7.ebuild 1021 SHA256 e8badfe308703fd3b91ef20af9357ff577ce57e867cd4e88778fd23fcfeebcc2 SHA512 e296e6e79025147f13bed66a271230e04e5fcc24fa19c6456aebfe54543bd89b4ddbb3714aee8bce0780c252013b93adc123525f811dab4bdeb5e37c25dfd2f5 WHIRLPOOL e8c0c89e3deeffc522c0b5bafbe01cef52f4bb4ebd39575984c68d20e7ec7f66d032c4f343700d0905def1b224f135ec2a225c56fc7a87a7b6f76d522e493331
+EBUILD sexypsf-0.4.8.ebuild 523 SHA256 dfccca56106b8102caa1050a903a02b18f3f5a6a2e2537641ff7483ff2ad934f SHA512 0deb8a5d513a7217d729b16259140f2f0ff248f05c3b32eef6a4b407359e827a00e9dc2d57498ddbdbfa8aacb755748363fc95af2daf23fa9ea115395cb8a3ac WHIRLPOOL 455523ec2be762825d7e93cc7e794839fe0aa22af9dfca9156c01d7a37799738db5a6d23bdbc63a8b7e99be08d61679a9d0036cef175649e954f9d174c83d53c
+MISC ChangeLog 2622 SHA256 a0c963240d21a39a7e6e771e290b359aafea99ad8a5c384271e165148e3f1189 SHA512 9510838ce647eb63b6e635189764511453b96732b76b8ac8514f059ab39966da655ae89d76f41e3c9508a1bda8687973e4316fae3c8969e5067c20f68c97ab32 WHIRLPOOL 6a575e622500bc4bc233be0540a288c133cca5a35c22063f087ee6d7b194f0a627b7385d88333be672a5d34fe6441ae25cc468640474aace38bafa79c0830694
+MISC ChangeLog-2015 3281 SHA256 47d57a81578160624ac540ab4bd15286b80b852482e824ea090d60c4bbb30ab5 SHA512 1d3451c5d4b765c9a73af4e882d727225df76d6a05e5b45b086622f31425257ba8854fdf93b5f4359f63f22fadfb958d56e1e93851c2075fd73afaa9ab7520e6 WHIRLPOOL 6c25189d4af2efee86831517f5f642a7fad74c39d1ac8c8132c72752c9caadbfdc058f6cce8f68d13b137aeaed41092398e10c2d1979e847f21312406856c1d5
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
new file mode 100644
index 000000000000..bd1c21ce503b
--- /dev/null
+++ b/media-sound/sexypsf/files/sexypsf-0.4.7-misc.patch
@@ -0,0 +1,297 @@
+--- sexypsf/driver.h
++++ sexypsf/driver.h
+@@ -23,4 +23,4 @@
+ PSFINFO *sexy_getpsfinfo(char *path);
+ void sexy_freepsfinfo(PSFINFO *info);
+ 
+-void sexyd_update(char*,long);
++void sexyd_update(unsigned char*,long);
+--- sexypsf/Linux/LnxMain.c
++++ sexypsf/Linux/LnxMain.c
+@@ -26,6 +26,7 @@
+ #include <time.h>
+ 
+ #include "driver.h"
++#include "oss.h"
+ #include "Linux.h"
+ 
+ int main(int argc, char *argv[]) {
+--- sexypsf/Linux/Makefile
++++ sexypsf/Linux/Makefile
+@@ -4,12 +4,10 @@
+ 
+ all: sexypsf
+ 
+-CC = gcc 
+ RM = rm -f
+ STRIP = strip
+ 
+-OPTIMIZE = -O2 -fomit-frame-pointer -finline-functions -ffast-math
+-FLAGS = -g  -D__LINUX__ -DPSS_STYLE=1 
++FLAGS = -D__LINUX__ -DPSS_STYLE=1 
+ #-DTIMEO
+ LIBS = -lz
+ 
+@@ -20,11 +18,11 @@
+ 
+ OBJS+= LnxMain.o
+ 
+-CFLAGS = -Wall -Winline ${OPTIMIZE} -I. -I.. ${FLAGS}
++CFLAGS += -Wall -Winline -Wno-nonnull -I. -I.. ${FLAGS}
+ #CFLAGS+= $(shell pkg-config gtk+-2.0 --cflags)
+ 
+ sexypsf:	${OBJS}
+-		${CC} ${CFLAGS} ${OBJS} -o sexypsf ${LIBS}
++		${CC} ${LDFLAGS} ${CFLAGS} ${OBJS} -o sexypsf ${LIBS}
+ 
+ .PHONY: clean sexypsf
+ 
+--- sexypsf/Linux/oss.c
++++ sexypsf/Linux/oss.c
+@@ -54,6 +54,9 @@
+ 
+ #define OSS_MEM_DEF
+ #include "oss.h"
++
++#include "driver.h"
++
+ static int oss_audio_fd = -1;
+ extern int errno;
+ 
+@@ -66,8 +69,6 @@
+  int pspeed=44100;
+  int pstereo;
+  int format;
+- int fragsize = 0;
+- int myfrag;
+  int oss_speed, oss_stereo;
+ 
+  pstereo=OSS_MODE_STEREO;
+--- sexypsf/Linux/oss.h
++++ sexypsf/Linux/oss.h
+@@ -32,4 +32,6 @@
+ 
+ #define OSS_SPEED_44100	44100
+ 
++void SetupSound(void);
++
+ #endif // _OSS_SOUND_H
+--- sexypsf/Makefile
++++ sexypsf/Makefile
+@@ -12,18 +12,13 @@
+ RM = rm -f
+ 
+ LIBS = -shared -lz
+-OPTIMIZE = -O2 -finline-functions -ffast-math
+-FLAGS = -DPSS_STYLE=1 -DSPSFVERSION="\"${VERSION}\""
++FLAGS = -DPSS_STYLE=1 -DSPSFVERSION="\"${VERSION}\"" -fPIC
+ 
+ OBJS =	PsxBios.o PsxCounters.o PsxDma.o Spu.o PsxHw.o PsxMem.o Misc.o	\
+ 	R3000A.o PsxInterpreter.o PsxHLE.o spu/spu.o
+ 
+ OBJS+=	xmms/xmms.o
+-FLAGS+=	`gtk-config --cflags`
++FLAGS+=	`xmms-config --cflags`
+-
+-ifeq (${CPU}, ix86)
+-	OPTIMIZE += -fomit-frame-pointer -mcpu=i686 -fno-exceptions
+-endif
+ 
+ ifeq (${CPU}, ppc)
+ 	FLAGS+=-DMSB_FIRST
+@@ -33,10 +28,10 @@
+ 	FLAGS+=-DMSB_FIRST
+ endif
+ 
+-CFLAGS = -Wall ${OPTIMIZE} -I. ${FLAGS}
++CFLAGS += -Wall -Wno-nonnull -I. ${FLAGS}
+ 
+ sexypsf: ${OBJS}
+-	${CC} ${CFLAGS} ${OBJS} -o libsexypsf.so ${LIBS}
++	${CC} ${LDFLAGS} ${OBJS} -o libsexypsf.so ${LIBS}
+ 
+ install: sexypsf
+ 	mv libsexypsf.so ${HOME}/.xmms/Plugins
+--- sexypsf/Misc.c
++++ sexypsf/Misc.c
+@@ -226,7 +226,7 @@
+ {
+         FILE *fp;
+         EXE_HEADER tmpHead;
+-        char *in,*out=0;
++        unsigned char *in,*out=0;
+ 	u8 head[4];
+         u32 reserved;
+         u32 complen;
+--- sexypsf/PsxInterpreter.c
++++ sexypsf/PsxInterpreter.c
+@@ -417,7 +417,7 @@
+ * Load higher 16 bits of the first word in GPR with imm  *
+ * Format:  OP rt, immediate                              *
+ *********************************************************/
+-static void psxLUI() { if (!_Rt_) return; _u32(_rRt_) = psxRegs.code << 16; } // Upper halfword of Rt = Im
++static void psxLUI() { if (!_Rt_) return; _rRt_ = psxRegs.code << 16; } // Upper halfword of Rt = Im
+ 
+ /*********************************************************
+ * Move from HI/LO to GPR                                 *
+@@ -491,7 +491,7 @@
+ 
+ static void psxLBU() {
+ 	if (_Rt_) {
+-		_u32(_rRt_) = psxMemRead8(_oB_);
++		_rRt_ = psxMemRead8(_oB_);
+ 	} else {
+ 		psxMemRead8(_oB_); 
+ 	}
+@@ -507,7 +507,7 @@
+ 
+ static void psxLHU() {
+ 	if (_Rt_) {
+-		_u32(_rRt_) = psxMemRead16(_oB_);
++		_rRt_ = psxMemRead16(_oB_);
+ 	} else {
+ 		psxMemRead16(_oB_);
+ 	}
+@@ -515,7 +515,7 @@
+ 
+ static void psxLW() {
+ 	if (_Rt_) {
+-		_u32(_rRt_) = psxMemRead32(_oB_);
++		_rRt_ = psxMemRead32(_oB_);
+ 	} else {
+ 		psxMemRead32(_oB_);
+ 	}
+@@ -530,7 +530,7 @@
+ 	u32 mem = psxMemRead32(addr & ~3);
+ 
+ 	if (!_Rt_) return;
+-	_u32(_rRt_) =	( _u32(_rRt_) & LWL_MASK[shift]) | 
++	_rRt_ =	( _u32(_rRt_) & LWL_MASK[shift]) | 
+ 					( mem << LWL_SHIFT[shift]);
+ 
+ 	/*
+@@ -552,7 +552,7 @@
+ 	u32 mem = psxMemRead32(addr & ~3);
+ 
+ 	if (!_Rt_) return;
+-	_u32(_rRt_) =	( _u32(_rRt_) & LWR_MASK[shift]) | 
++	_rRt_ =	( _u32(_rRt_) & LWR_MASK[shift]) | 
+ 					( mem >> LWR_SHIFT[shift]);
+ 
+ 	/*
+--- sexypsf/PsxMem.c
++++ sexypsf/PsxMem.c
+@@ -21,7 +21,7 @@
+ 
+ #include "PsxCommon.h"
+ 
+-void LoadPSXMem(u32 address, s32 length, char *data)
++void LoadPSXMem(u32 address, s32 length, unsigned char *data)
+ {
+  //printf("%08x %08x\n",address,length);
+  while(length>0)
+@@ -56,8 +56,8 @@
+ 
+ 	writeok=1;
+ 
+-	psxMemLUT = (u32*)malloc(0x10000 * 4);
++	psxMemLUT = malloc(0x10000 * sizeof *psxMemLUT);
+-	memset(psxMemLUT, 0, 0x10000 * 4);
++	memset(psxMemLUT, 0, 0x10000 * sizeof *psxMemLUT);
+ 
+ 	psxM = (char*)malloc(0x00200000);
+ 	psxP = (char*)malloc(0x00010000);
+@@ -67,16 +67,16 @@
+ 		printf("Error allocating memory"); return -1;
+ 	}
+ 
+-	for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16];
++	for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16];
+ 
+-	memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4);
++	memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
+-	memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
++	memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
+ 
+-	for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f00] = (u32)&psxP[i << 16];
++	for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f00] = &psxP[i << 16];
+ 
+-	for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f80] = (u32)&psxH[i << 16];
++	for (i=0; i<0x01; i++) psxMemLUT[i + 0x1f80] = &psxH[i << 16];
+ 
+-	for (i=0; i<0x08; i++) psxMemLUT[i + 0xbfc0] = (u32)&psxR[i << 16];
++	for (i=0; i<0x08; i++) psxMemLUT[i + 0xbfc0] = &psxR[i << 16];
+ 
+ 	return 0;
+ }
+@@ -215,16 +215,16 @@
+ 					case 0x800: case 0x804:
+ 						if (writeok == 0) break;
+ 						writeok = 0;
+-						memset(psxMemLUT + 0x0000, 0, 0x80 * 4);
++						memset(psxMemLUT + 0x0000, 0, 0x80 * sizeof *psxMemLUT);
+-						memset(psxMemLUT + 0x8000, 0, 0x80 * 4);
++						memset(psxMemLUT + 0x8000, 0, 0x80 * sizeof *psxMemLUT);
+-						memset(psxMemLUT + 0xa000, 0, 0x80 * 4);
++						memset(psxMemLUT + 0xa000, 0, 0x80 * sizeof *psxMemLUT);
+ 						break;
+ 					case 0x1e988:
+ 						if (writeok == 1) break;
+ 						writeok = 1;
+-						for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = (u32)&psxM[(i & 0x1f) << 16];
++						for (i=0; i<0x80; i++) psxMemLUT[i + 0x0000] = &psxM[(i & 0x1f) << 16];
+-						memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * 4);
++						memcpy(psxMemLUT + 0x8000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
+-						memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * 4);
++						memcpy(psxMemLUT + 0xa000, psxMemLUT, 0x80 * sizeof *psxMemLUT);
+ 						break;
+ 					default:
+ 						break;
+--- sexypsf/PsxMem.h
++++ sexypsf/PsxMem.h
+@@ -41,21 +41,21 @@
+ }
+ #endif
+ 
+-s8 *psxM;
++char *psxM;
+ #define psxMu32(mem)	(*(u32*)&psxM[(mem) & 0x1fffff])
+ 
+-s8 *psxP;
++char *psxP;
+-s8 *psxR;
++char *psxR;
+ #define psxRu32(mem)	(*(u32*)&psxR[(mem) & 0x7ffff])
+ 
+-s8 *psxH;
++char *psxH;
+ 
+ #define psxHu8(mem)	(*(u8*) &psxH[(mem) & 0xffff])
+ 
+ #define psxHu16(mem)   	(*(u16*)&psxH[(mem) & 0xffff])
+ #define psxHu32(mem)   	(*(u32*)&psxH[(mem) & 0xffff])
+ 
+-u32 *psxMemLUT;
++char **psxMemLUT;
+ 
+ #define PSXM(mem)		(psxMemLUT[(mem) >> 16] == 0 ? NULL : (void*)(psxMemLUT[(mem) >> 16] + ((mem) & 0xffff)))
+ 
+@@ -76,6 +76,6 @@
+ void psxMemWrite16(u32 mem, u16 value);
+ void psxMemWrite32(u32 mem, u32 value);
+ 
+-void LoadPSXMem(u32 address, s32 length, char *data);
++void LoadPSXMem(u32 address, s32 length, unsigned char *data);
+ 
+ #endif /* __PSXMEMORY_H__ */
+--- sexypsf/xmms/xmms.c
++++ sexypsf/xmms/xmms.c
+@@ -101,7 +101,7 @@
+ }
+ 
+ static pthread_t dethread;
+-void sexyd_update(char *Buffer, long count)
++void sexyd_update(unsigned char *Buffer, long count)
+ {
+  int mask = ~((((16 / 8) * 2)) - 1);
+  if(count)
diff --git a/media-sound/sexypsf/metadata.xml b/media-sound/sexypsf/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/sexypsf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/sexypsf/sexypsf-0.4.7.ebuild b/media-sound/sexypsf/sexypsf-0.4.7.ebuild
new file mode 100644
index 000000000000..9be3043804fc
--- /dev/null
+++ b/media-sound/sexypsf/sexypsf-0.4.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="sexyPSF is an open-source PSF1 (Playstation music) file player"
+HOMEPAGE="http://projects.raphnet.net/#sexypsf"
+SRC_URI="http://projects.raphnet.net/sexypsf/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+#-sparc: 0.4.5: Couldn't load minispf
+KEYWORDS="amd64 ppc -sparc x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-misc.patch
+
+	# ppc and sparc are big-endian while all other keywords are
+	# little-endian (as far as I know)
+	use ppc64 || use ppc || use sparc &&
+	sed -i -e "s:-D__LINUX__:& -DMSB_FIRST:" "${S}"/Linux/Makefile
+	# what about using the correct macro and avoid to cause severe damages to
+	# innocent ears?
+	sed -i -e "s:AFMT_S16_LE:AFMT_S16_NE:" "${S}"/Linux/oss.c
+}
+
+src_compile() {
+	cd "${S}"/Linux
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin Linux/sexypsf
+	dodoc Docs/*
+}
diff --git a/media-sound/sexypsf/sexypsf-0.4.8.ebuild b/media-sound/sexypsf/sexypsf-0.4.8.ebuild
new file mode 100644
index 000000000000..4e6f81968a1e
--- /dev/null
+++ b/media-sound/sexypsf/sexypsf-0.4.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="sexyPSF is an open-source PSF1 (Playstation music) file player"
+HOMEPAGE="http://projects.raphnet.net/#sexypsf"
+SRC_URI="http://projects.raphnet.net/sexypsf/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib"
+
+src_compile() {
+	tc-export CC
+	cd "${S}"/Linux
+	emake
+}
+
+src_install() {
+	dobin Linux/sexypsf
+	dodoc Docs/*
+}
diff --git a/media-sound/sfc/Manifest b/media-sound/sfc/Manifest
new file mode 100644
index 000000000000..87fe6d9cb4b6
--- /dev/null
+++ b/media-sound/sfc/Manifest
@@ -0,0 +1,5 @@
+DIST sfc-0.018.tar.gz 125680 SHA256 6a3566deb8396891107186c63bb576b9f28ac077d40a641a74f6ba221c85d3ee SHA512 9007f00d19acee7150b48718a742cf05df471c69a2f36cdfa9572aece80e1711dde03f9e31ad32892ef8bfc4b33a145d17ccabc29c63cacc40bb071a8b8b6262 WHIRLPOOL e505185e22fbdb9bbbc26d673ba75765fc26ca04b7cb7789bc1cf1d150d922dc449917b8b9c403d1e65b79462f3b4c9e98f50fd49a38b37067f95950711eeac4
+EBUILD sfc-0.018-r1.ebuild 589 SHA256 3c059f4512e07c0436ca7f988888b3d8b942586fa79e73ba652c3a7c18cdaa51 SHA512 fd4e67b686fdca772b334265ce35e6cdb831b05ee36e1768287e7701dbbeeb5c3d48d6542e1f8a069502958ae88cf6be519f8b3632bec5b1940f7069ebddfcfa WHIRLPOOL d79644fbbd3e917ce8c21ef26e8e55677cf64fdfc2d9bb62fcad52a365e53b207cf9833830b4a8790f79bd5059edb5eb12743ba3bda6f057982da0b89bd907f0
+MISC ChangeLog 2424 SHA256 be5013c0b4fcf8aa8d86a2c74ed350ca16c9bdf6ba550e33c41e5b8b752e1bd1 SHA512 8ae2ef4056e4c61f3c4cb5836dccf19a66d08196aeee594f75051b24d4a4dc3d5b086ba9e746da2686d5d5cd8904329af8c564a0072495ad0545413b22da7d52 WHIRLPOOL 9dcb20dfc5852b7f00192d38e6e0617182824a017e6e5f9222d0527ca2b201ed3c554830425c56d4c1282b6fd6e0b5eb044b9249a5557b8d71a7cde30efd6126
+MISC ChangeLog-2015 2402 SHA256 dc56a455bdb9c5725cb53a30519eeee9ec29b088a64d7ba9fc6a2f40f386790d SHA512 430680dbe0a16b0656bc79913370b8acad175829d5da4f2345a6aa31e15e353e2bb64bb2d100a7f7f1c538a5bc2bf0138ab7b89df99b9284d3069e200b26631c WHIRLPOOL b91622c468d16a239c4de83baa9767076a683f4765d077ac9c628e5176b0f301df5fdce83a50e1ff12d01e130023e58d20bb5aed720d2c9f24ba2d77eba1a109
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/sfc/metadata.xml b/media-sound/sfc/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/sfc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/sfc/sfc-0.018-r1.ebuild b/media-sound/sfc/sfc-0.018-r1.ebuild
new file mode 100644
index 000000000000..58a1f87d34c6
--- /dev/null
+++ b/media-sound/sfc/sfc-0.018-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="SoundFontCombi is an opensource software pseudo synthesizer"
+HOMEPAGE="http://personal.telefonica.terra.es/web/soudfontcombi/"
+SRC_URI="http://personal.telefonica.terra.es/web/soudfontcombi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND="
+	media-libs/alsa-lib
+	x11-libs/fltk:1"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" configure.in || die
+	epatch_user
+	eautoreconf
+}
diff --git a/media-sound/shnflacverify/Manifest b/media-sound/shnflacverify/Manifest
new file mode 100644
index 000000000000..1990a1e19ac8
--- /dev/null
+++ b/media-sound/shnflacverify/Manifest
@@ -0,0 +1,5 @@
+DIST shnflacverify-0.3.zip 11845 SHA256 ce57b0b4bd707dff34b975557e7cc3705c6662a342202128342191a9077e7b5a SHA512 8d05d476d7c89ca7f93f3d4b12d6bdb8c197e87c9c400e12f39ad3fd9b8b2a2b8d158baa0e663a98a898f732694c16064c8ba2996101d4b74d173a3ca13942b0 WHIRLPOOL d45aa22cf38423954302dc8c76050a572d53ccffc98ff64f7acb70f5b2a8a613aa1ee182530d96ac3e9afdeaf8a2af38c784272d110847744eb81fbf928f0425
+EBUILD shnflacverify-0.3.ebuild 874 SHA256 fe560a1a9188bd06839a6ec672f585b0cbfd15fc9f875c1d913186ba94033557 SHA512 130f9e97262cc212d7717b15c5576a993b5b7a000c2265c014b502f89852aa29c91ca712022f6bb4bc6afc80b4fb30c19f9ec97f22eca83a91e061beaf68812a WHIRLPOOL 276a55344a6360861887f850cc93cc327958ea1d31dcf2af2bec65ec1740b0857e199588f0259f42ea4356aaab05d4f580806a13c883f9efa1790ed41fe3540b
+MISC ChangeLog 3201 SHA256 f0afe2bc00630e96615c0ddcb369acc7bbd372d9bc125c3292b83a8198b028fb SHA512 79a7518e9ba453bb4920471f859f727872232d0e44d47e7ccb7aa76e5d0021c9fe58b9dd6329bb64473c1e34ce155a23fadf17c0aa219f804461834ca9f6ae35 WHIRLPOOL 01c2ea8eb1270f5ecdfc2cdbb24c7a3c26349b50e13ff68d402aae1ae279904ca71a984f327858d8fde399502664c20ef6b10196f7a6f5467001424db7835e96
+MISC ChangeLog-2015 454 SHA256 cd5a948a454577e0303847db1a5f213950b186e76cc93e44abaeeaef3d7dc03b SHA512 e7cec22a6dd0bcf46e2affbcdf676a1b96cf67fa0f12cd95daf958737666ae7867c73030020fbe754f531fccc50f57ebe5eee37f8e2b09c96c494a5aaf6a496e WHIRLPOOL 5dee59f8b1e343f2e293d015b4b7086e849c4ed0042e7318193b82105f1d68c63d93052f8e47c6e2c9cf07296c15e73eb32d01038351e8617964ee0c94bdfa16
+MISC metadata.xml 481 SHA256 d5d0cfefe7e09cef1ee344b2dbfdd945953de8c4e13ceb425601f1f7331c4aca SHA512 5d48ebcf1bba0a93b1c6fbe03bab7262c75d8c23d8cb404261f51e3d242b3f906aeb780ce6dd3bae521f6d40bf22b3a383b7224bb8f0a5fe75eab94acddd2a22 WHIRLPOOL a4af9193e9250037435e8548352b6537b0cb5146798059e6b9e3eb96b0162140c7fc9b57c291a959fb6549d627fc7bfbfc0aa48453b1d0704c31bc15755d770f
diff --git a/media-sound/shnflacverify/metadata.xml b/media-sound/shnflacverify/metadata.xml
new file mode 100644
index 000000000000..3c4b72cedd85
--- /dev/null
+++ b/media-sound/shnflacverify/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		This program helps manage the verification of checksums related to
+		Shorten (SHN) and FLAC audio files. This script provides a convenient
+		way to verify shn/flac files in bulk. 
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">shnflacverify</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/shnflacverify/shnflacverify-0.3.ebuild b/media-sound/shnflacverify/shnflacverify-0.3.ebuild
new file mode 100644
index 000000000000..80e08a78f3bb
--- /dev/null
+++ b/media-sound/shnflacverify/shnflacverify-0.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Manage the verification of checksums related to Shorten and FLAC files"
+HOMEPAGE="https://sourceforge.net/projects/shnflacverify/"
+SRC_URI="http://downloads.sourceforge.net/project/${PN}/${PN}/${P}/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	app-arch/unzip
+	media-libs/flac
+	media-sound/shntool
+	sys-apps/coreutils"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	local X
+	edos2unix *.txt
+	for X in flac md5sum shntool metaflac; do
+		einfo "setting \$${X}_cmd to $(type -p ${X})"
+		sed -i -e "s|^\(\$${X}_cmd\s*=\s*'\)[^']*\('.*\)|\1$(type -p ${X})\2|g" shnflac*
+	done
+}
+
+src_install() {
+	local X
+	for X in *.pl; do newbin "${X}" "${X%.*}"; done
+	newdoc README.txt README
+}
diff --git a/media-sound/shntool/Manifest b/media-sound/shntool/Manifest
new file mode 100644
index 000000000000..0657effba292
--- /dev/null
+++ b/media-sound/shntool/Manifest
@@ -0,0 +1,5 @@
+DIST shntool-3.0.10.tar.gz 216061 SHA256 74302eac477ca08fb2b42b9f154cc870593aec8beab308676e4373a5e4ca2102 SHA512 2150d7123860abb54a56a1615bda991ed3713d73c338723f28b7d01a63c49a47809be16dc57b5b4edeee1567b003f9a4b54945c1cd08440f9503d22b91eaa06d WHIRLPOOL fb7c11c99482e043da2827ab682aadde4b7309d5e0739a176589de2ac8db0af01d62826eb8d8c6451c2c72876078f4147fa8712ce41acff785ac495350d17322
+EBUILD shntool-3.0.10-r1.ebuild 704 SHA256 fbdb3b8b681ebcc6dd5753970b0e4e9747a46c173e2610add551cd308edaace5 SHA512 74bacf40ffaf19f1bf4d9ff2762dfc8ccf8fec613e59d95d229e93fded3d41faf0ca7d5c39984befb11f8fc6af06b5eacfddf194abaec82a6e7799b56fa97054 WHIRLPOOL d9d14a7e0ef0106bb31665098a7380dad3ff144cb2865c1d1b18b85542ba9c0bbe37a9e3d32e458217ef6ed7737c1370f08d8a0c7fd17929ed50fa757b493fbb
+MISC ChangeLog 2438 SHA256 7d1057cdfd711cb883fc03fa6e0328c4f9cb0ace13b13ab51ddc825903dfebfd SHA512 c72749e6a0c1bb61b6a7e15dc8baaacae77b4f10e0ddb6b3fed08ccad044310455a3f2c5645544726319a23b85d460bdc77516976b5c2a862606df2e99d29041 WHIRLPOOL c1a6dc06100b8774aec239439a9e5b3c9acabd425970c44d8fc20553becf2988a44f0f3e66d9d5f42ad34bfaa052c166f4c08b01b4461ed451a54ee819f93190
+MISC ChangeLog-2015 3407 SHA256 1609f71d9d3a01fdf38ff513e192261197a0b0290fecaf9e303da2aa99db5c8b SHA512 c66b367e0a208181c860803b10d63eac95f93804d090c61561e45f732cdc836aba5e6056a54499ea66b422c3a841da315921ce6c070f035657ac571ba4422365 WHIRLPOOL 8c07e874d219f2d3f8daff1d10fe8b68cbfb1435a45cc7320be24a48bf48c3a2375cbd6a20d0fc7e9cc837208ad785a51c6462f3cdb3b68a29c3c92e54a99823
+MISC metadata.xml 419 SHA256 71cb3dd8d1ee75eb5884c3999381457387199bb5d0999766df67e9c9880af6a9 SHA512 6776c4523ec29fd9704ad9ae663d099d51eda469b2fe063bafa8c9a1f37da3ffe62f1e7f506534d28131db2fe0db98d815d81d8d0840e685a6f07449aecf65dc WHIRLPOOL 78f40711bb4776c5070d2efdd5c6f6ee91fa704252adca1688bbd33001cb33f801dfc11ebe772c6f15bd2407ea1a53d31fcb21722d8f3d3ea4a7c1ea0337ae72
diff --git a/media-sound/shntool/metadata.xml b/media-sound/shntool/metadata.xml
new file mode 100644
index 000000000000..a9eb444807a7
--- /dev/null
+++ b/media-sound/shntool/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="mac">Add support for Monkey's Audio files</flag>
+    <flag name="alac">Add support for Apple Lossless Audio Codec files</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/shntool/shntool-3.0.10-r1.ebuild b/media-sound/shntool/shntool-3.0.10-r1.ebuild
new file mode 100644
index 000000000000..16c9434f3ea4
--- /dev/null
+++ b/media-sound/shntool/shntool-3.0.10-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="A multi-purpose WAVE data processing and reporting utility"
+HOMEPAGE="http://www.etree.org/shnutils/shntool/"
+SRC_URI="http://www.etree.org/shnutils/shntool/dist/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="alac flac mac shorten sox wavpack"
+
+RDEPEND="flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	sox? ( media-sound/sox )
+	alac? ( media-sound/alac_decoder )
+	shorten? ( media-sound/shorten )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}"
+
+DOCS="NEWS README ChangeLog AUTHORS doc/*"
diff --git a/media-sound/shorten/Manifest b/media-sound/shorten/Manifest
new file mode 100644
index 000000000000..0aaa21c610ea
--- /dev/null
+++ b/media-sound/shorten/Manifest
@@ -0,0 +1,6 @@
+AUX shorten-tests.patch 548 SHA256 f9fd03c2e746aab77c1431f536ba66a355d59ad8a8f202894d3729dc0b06baf3 SHA512 0572b2bc84473cfc30c72c989035500942ed37eae3d9e3c770e9908606270fe0c52e03b8ac3ad42e2999798b9915a734400ebe1820ab1c7311d714dd66d370e2 WHIRLPOOL 4340f8e363cfa6873e839983559d6ce5f6a76f5810a34ad602363b2b694d3de8113458984774bd4fe42e071e6a3c9911e88098d39654a4e6a36602ffa87cb846
+DIST shorten-3.6.1.tar.gz 597581 SHA256 ce22e0676c93494ee7d094aed9b27ad018eae5f2478e8862ae1e962346405b66 SHA512 825f2c02fcc5f715eb20b2b4356a5334be9c3d55b9c7238e0a2a734b99b88d8fb23308647644506282fd03df4a8e51e2aafbc1b1a89982d45d042a05a01951b3 WHIRLPOOL 3554c2e5d81f656b4cfbc44f828289fcd3fcddb3e2e309c931624b194229c7604b4613efd010771bdb930d9a48e0bb7cd29228e3186318ccaae83ee5de62135c
+EBUILD shorten-3.6.1.ebuild 568 SHA256 48efbe1b5e78f36c0d99aacd29640c9ea50921e6c3d46178c936d852bbd18181 SHA512 0c024a43ae9d8e3c3af8464d2c3ba92b3e17b887a78dde43cce1a7f119f9cf64cc712b0370bd4c5ee99a0e7be4b9e375db511dc0a95cdb69bd960d4a848e9e66 WHIRLPOOL 52d79d49fd505db36fbd3a7ebc7a4dcd81c13f700c89cabb55c9ebbf003a6a375b6233bc5a6911d8bb48a6bb81fce209d1d24eb4b6cb834408dd7d88560b15a5
+MISC ChangeLog 2458 SHA256 80496f90d338b4df70f7080f6df21308bf3b807d6d536121419059a3b172a72a SHA512 ba12a9c0b0e918b726c876aa38ed0530b03891d8578b03807eaaa6b22a2dfae99639d134b3c775e051d23c15868a80e0bc9988c96ba90f1030b3fd47159d031c WHIRLPOOL 81cef895ee3a00297cc3d86307555186394607b3fd40f18734742ea9647d870a566e78930f80b05edf6cfe6f30529f3188d5e108ee7b2a3b4009683802bba9a1
+MISC ChangeLog-2015 3209 SHA256 6f3d426b3d4de1846f622fd2000916a0f0b0ee00f2f4fcef3acc2c04716d8510 SHA512 89ec0b7bd51a07ef6e4dea082b2b725c34897a4a2cfb8151ba8b7e63ccb90a53dde1b37fd36f52faf64856a994b776feed6c1287d509bf8b4ba31585908e302b WHIRLPOOL 2fe552d352dee757f9464c9e145798f7fb20314457f7abe785273fd421c41a4225d9236af0368098e4723fac701172e8e3658c7c6555e817c1be31d7ad9036bf
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/shorten/files/shorten-tests.patch b/media-sound/shorten/files/shorten-tests.patch
new file mode 100644
index 000000000000..9d067fe3b63c
--- /dev/null
+++ b/media-sound/shorten/files/shorten-tests.patch
@@ -0,0 +1,15 @@
+Index: shorten-3.6.1/tests/test-errors.sh
+===================================================================
+--- shorten-3.6.1.orig/tests/test-errors.sh
++++ shorten-3.6.1/tests/test-errors.sh
+@@ -36,8 +36,8 @@ for testdir in mono stereo; do
+   $SHORTEN - - && exit 1
+   $SHORTEN - test.shn && exit 1
+   $SHORTEN -x - test.wav && exit 1
+-  $SHORTEN test.wav - && exit 1
+-  $SHORTEN -x test.shn - && exit 1
++  #$SHORTEN test.wav - && exit 1
++  #$SHORTEN -x test.shn - && exit 1
+ 
+   # test missing filename with -S
+   $SHORTEN -S test.shn && exit 1
diff --git a/media-sound/shorten/metadata.xml b/media-sound/shorten/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/shorten/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/shorten/shorten-3.6.1.ebuild b/media-sound/shorten/shorten-3.6.1.ebuild
new file mode 100644
index 000000000000..08e58d8a0058
--- /dev/null
+++ b/media-sound/shorten/shorten-3.6.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DESCRIPTION="fast, low complexity waveform coder (i.e. audio compressor)"
+HOMEPAGE="http://shnutils.freeshell.org/shorten/"
+SRC_URI="http://shnutils.freeshell.org/shorten/dist/src/${P}.tar.gz"
+
+LICENSE="shorten"
+SLOT="0"
+KEYWORDS="alpha amd64 ~ppc sparc x86 ~x86-fbsd"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-tests.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-sound/sidplay/Manifest b/media-sound/sidplay/Manifest
new file mode 100644
index 000000000000..7d83cbdd292b
--- /dev/null
+++ b/media-sound/sidplay/Manifest
@@ -0,0 +1,7 @@
+AUX sidplay-2.0.9-gcc43.patch 1097 SHA256 0cc4fd75e6745048e9868039f559720d093a7ee7db99dcffde2f83043412bcd5 SHA512 4e2c717389e9fa7aa7a459138a42f411342def25fa6f236f64e4c306419402d7d9ece7e9376ad492d7a3fa4db9fee3c9bbffd2d3d13669a0366da990fa8e38c6 WHIRLPOOL 421443d91edfcc18be6b8dcc5edb114ce3695201fd98f7f947209420da5003eb55b259d0373201a61ab043663f48eeb0b5b8fbaefef5fd5237d81a6c09c83ed5
+AUX sidplay-2.0.9-gcc44.patch 3726 SHA256 e7cbc2166cfd2a725a3193b037304f01ac4c596b9b8429cfe2b4eb4a3745dea9 SHA512 41f319b4e232d199478d586b8a397493e1cc6a8eaa6b4eb5bec272b520ff8ffa078ac72b3eddf4f2865614bfe1f8e28df5ad3f2699bc74684c476a24b7795f75 WHIRLPOOL c12618c8eca242444e7951707103ffb3fedee5a208ae4b1c95e0650995cb34e7caf3bf98b9957f9347bd4fafc025d7f8682752f4ea2b823f4431aa2e8029aedd
+DIST sidplay-2.0.9.tar.gz 362140 SHA256 b850986ce9226cb6eecca50057967be313771b67aed721421e74e6c931e02215 SHA512 38d334b7e649d6043b48705edf3c4cd27d01283b95f42d1b46bb7cf266ca0d5f6fac4a7dfd398578a3278d293342e4d4d09cde8d443d60a8d50e4abbe127afe5 WHIRLPOOL 3ec493fdd57547c0c5400bfb2b7a142faa860480b0f4143fe487596a8cbfbea0798977b6a07a3fb9d8ffc8fe9238b1d0642c0ad0c3c9ffbf0cdb41eb9b0543cc
+EBUILD sidplay-2.0.9.ebuild 615 SHA256 35c2be095ef6c65c2003b7c5fd001f766b3db662e26be0648294f326af362f74 SHA512 2b194897a1245620f622bbabb8b6cce24bf6f56d5d21d42185b5446c3b8039e6e4fa961803948c9fce69a5459984f373c50e230ddfc8c8a1baf61797b9d8ee8b WHIRLPOOL 8db026c95f3a15d88b4a30b2b98e359155d4aff4b29d53896d41546883f4fc47f2c8d8c138413d200bef03316855f9f534e58dfefbbaf81b55a786516aeccd9a
+MISC ChangeLog 2500 SHA256 c51ebcb188e639b328f9c9fe5f6060b3e5f70ef7ab38299bc36439b0f7761d5d SHA512 f59375aacb3b58f1290aa726415fc72c3b9b717b4413d3bd060e7ee51e8adc652e18654578c7bbe99cf4abfcbd105b4ea4569d1988e4db976432c44996a67f50 WHIRLPOOL 90ad294557fa24be29ca502c52b63ce64a1bc4d184ba0fa3bfbeccf6876a0c011a515bd85afb99ab18879ad9a2823c1d8615cda59e31e48a7a18b36e50972c7a
+MISC ChangeLog-2015 3268 SHA256 2c20a3f80984d5a6a9d0ed48dd30966b8d2b7ecf0d12de54ee11fb36735b0523 SHA512 8057848d42105d1d6f217c678ca1b49fb8fe9c5e00f6647ab52f59195a33b60b438def62ece3ff976e5d7652a77caf12c5a164a728681652052286b2f94dcc37 WHIRLPOOL 2eef3d20118b8ad9ecbd9dfc60e0bc3ce75fc919fd02fd19336776b7ee89c72e3271810238f370d1bcc6718c8e54b0b975a83f4206453e7bfc30ca4c0b2d711d
+MISC metadata.xml 331 SHA256 c30b6228409b7dd2cc9fd1d07a6b785ba447763bf24178fda4bffa32825f8c16 SHA512 83c0e6c0f4c7a85a10c96db7cb2eadffab0ef5e4614b0a091a4e14bb9a37b90d0d509bec47bf75d03853ab39a06ca12bcb5cd89f89e09901340a76c7b5c392e8 WHIRLPOOL b482f09b269e567583bdfc7bc0d7f5448064702833a43169703ce17a85907f49de4419b6b0b4c0d1045fa643a2c14c9cf62548e0adf745e0bb52873614002f21
diff --git a/media-sound/sidplay/files/sidplay-2.0.9-gcc43.patch b/media-sound/sidplay/files/sidplay-2.0.9-gcc43.patch
new file mode 100644
index 000000000000..b1a24e59b9a7
--- /dev/null
+++ b/media-sound/sidplay/files/sidplay-2.0.9-gcc43.patch
@@ -0,0 +1,48 @@
+Index: sidplay-2.0.9/configure
+===================================================================
+--- sidplay-2.0.9.orig/configure
++++ sidplay-2.0.9/configure
+@@ -19985,11 +19985,11 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <new.h>
++#include <new>
+ int
+ main ()
+ {
+-char* buf = new(nothrow) char[1024];
++char* buf = new(std::nothrow) char[1024];
+   ;
+   return 0;
+ }
+@@ -20052,11 +20052,11 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <fstream.h>
++#include <fstream>
+ int
+ main ()
+ {
+-ifstream myTest(ios::in|ios::binary);
++std::ifstream myTest("test.txt", std::ios::in|std::ios::binary);
+   ;
+   return 0;
+ }
+@@ -20118,12 +20118,12 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <fstream.h>
+-             #include <iomanip.h>
++#include <fstream>
++             #include <iomanip>
+ int
+ main ()
+ {
+-ios::openmode myTest = ios::in;
++std::ios::openmode myTest = std::ios::in;
+   ;
+   return 0;
+ }
diff --git a/media-sound/sidplay/files/sidplay-2.0.9-gcc44.patch b/media-sound/sidplay/files/sidplay-2.0.9-gcc44.patch
new file mode 100644
index 000000000000..b5c4ab236007
--- /dev/null
+++ b/media-sound/sidplay/files/sidplay-2.0.9-gcc44.patch
@@ -0,0 +1,122 @@
+diff -Nur ori/src/IniConfig.cpp new/src/IniConfig.cpp
+--- ori/src/IniConfig.cpp	2004-02-29 15:28:28.000000000 +0100
++++ new/src/IniConfig.cpp	2009-07-20 21:17:56.926134851 +0200
+@@ -120,7 +120,7 @@
+ }
+ 
+ 
+-bool IniConfig::readInt (ini_fd_t ini, char *key, int &value)
++bool IniConfig::readInt (ini_fd_t ini, const char *key, int &value)
+ {
+     int i = value;
+     if (ini_locateKey (ini, key) < 0)
+@@ -134,7 +134,7 @@
+ }
+ 
+ 
+-bool IniConfig::readString (ini_fd_t ini, char *key, char *&str)
++bool IniConfig::readString (ini_fd_t ini, const char *key, char *&str)
+ {
+     char  *ret;
+     size_t length;
+@@ -165,7 +165,7 @@
+ }
+ 
+ 
+-bool IniConfig::readBool (ini_fd_t ini, char *key, bool &boolean)
++bool IniConfig::readBool (ini_fd_t ini, const char *key, bool &boolean)
+ {
+     int b = boolean;
+     if (ini_locateKey (ini, key) < 0)
+@@ -179,7 +179,7 @@
+ }
+ 
+ 
+-bool IniConfig::readChar (ini_fd_t ini, char *key, char &ch)
++bool IniConfig::readChar (ini_fd_t ini, const char *key, char &ch)
+ {
+     char *str, c = 0;
+     bool  ret = readString (ini, key, str);
+@@ -206,7 +206,7 @@
+ }
+ 
+ 
+-bool IniConfig::readTime (ini_fd_t ini, char *key, int &value)
++bool IniConfig::readTime (ini_fd_t ini, const char *key, int &value)
+ {
+     char *str, *sep;
+     int   time;
+diff -Nur ori/src/IniConfig.h new/src/IniConfig.h
+--- ori/src/IniConfig.h	2001-07-03 19:49:27.000000000 +0200
++++ new/src/IniConfig.h	2009-07-20 21:16:17.406144852 +0200
+@@ -98,11 +98,11 @@
+ protected:
+     void  clear ();
+ 
+-    bool  readInt    (ini_fd_t ini, char *key, int &value);
+-    bool  readString (ini_fd_t ini, char *key, char *&str);
+-    bool  readBool   (ini_fd_t ini, char *key, bool &boolean);
+-    bool  readChar   (ini_fd_t ini, char *key, char &ch);
+-    bool  readTime   (ini_fd_t ini, char *key, int  &time);
++    bool  readInt    (ini_fd_t ini, const char *key, int &value);
++    bool  readString (ini_fd_t ini, const char *key, char *&str);
++    bool  readBool   (ini_fd_t ini, const char *key, bool &boolean);
++    bool  readChar   (ini_fd_t ini, const char *key, char &ch);
++    bool  readTime   (ini_fd_t ini, const char *key, int  &time);
+ 
+     bool  readSidplay2  (ini_fd_t ini);
+     bool  readConsole   (ini_fd_t ini);
+diff -Nur ori/src/args.cpp new/src/args.cpp
+--- ori/src/args.cpp	2004-05-06 01:49:20.000000000 +0200
++++ new/src/args.cpp	2009-07-20 21:19:12.249460696 +0200
+@@ -77,6 +77,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <iostream>
++#include <string>
+ using std::cout;
+ using std::cerr;
+ using std::endl;
+@@ -95,7 +96,7 @@
+ // Convert time from integer
+ bool ConsolePlayer::parseTime (const char *str, uint_least32_t &time)
+ {
+-    char *sep;
++    const char *sep;
+     uint_least32_t _time;
+ 
+     // Check for empty string
+@@ -110,8 +111,7 @@
+     else
+     {   // Read in MM:SS format
+         int val;
+-        *sep = '\0';
+-        val  = atoi (str);
++        val  = atoi (std::string(str, sep - str).c_str());
+         if (val < 0 || val > 99)
+             return false;
+         _time = (uint_least32_t) val * 60;
+diff -Nur ori/src/audio/AudioBase.h new/src/audio/AudioBase.h
+--- ori/src/audio/AudioBase.h	2001-11-16 20:34:29.000000000 +0100
++++ new/src/audio/AudioBase.h	2009-07-20 21:06:15.619538393 +0200
+@@ -43,7 +43,7 @@
+ {
+ protected:
+     AudioConfig _settings;
+-    char       *_errorString;
++    const char *_errorString;
+     void       *_sampleBuffer;
+ 
+ public:
+diff -Nur ori/src/menu.cpp new/src/menu.cpp
+--- ori/src/menu.cpp	2004-02-29 15:28:28.000000000 +0100
++++ new/src/menu.cpp	2009-07-20 21:20:16.576120922 +0200
+@@ -353,7 +353,7 @@
+ {
+     if ((m_iniCfg.console ()).ansi)
+     {
+-        char *mode = "";
++        const char *mode = "";
+ 
+         switch (colour)
+         {
diff --git a/media-sound/sidplay/metadata.xml b/media-sound/sidplay/metadata.xml
new file mode 100644
index 000000000000..973cb291162c
--- /dev/null
+++ b/media-sound/sidplay/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sidplay2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/sidplay/sidplay-2.0.9.ebuild b/media-sound/sidplay/sidplay-2.0.9.ebuild
new file mode 100644
index 000000000000..4f38551f8ebd
--- /dev/null
+++ b/media-sound/sidplay/sidplay-2.0.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="C64 SID player"
+HOMEPAGE="http://sidplay2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sidplay2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ppc ~sparc x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libsidplay-2.1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc TODO AUTHORS ChangeLog
+}
diff --git a/media-sound/sidplayfp/Manifest b/media-sound/sidplayfp/Manifest
new file mode 100644
index 000000000000..6e125d1f8579
--- /dev/null
+++ b/media-sound/sidplayfp/Manifest
@@ -0,0 +1,9 @@
+DIST sidplayfp-0.3.3.tar.gz 454452 SHA256 b9f594dfffdd6ecbf95a64d23b859975bad46c6cb4b938ac92f7f1234cffd4d3 SHA512 f979af0c6ead38a9cd3a95cb27ebb26390506bbfbea192345f9873c62e064f18d7dc529ead22c35d46b4ebe8af6808d42f4d015d61ce48d7318daa1a7f613fbf WHIRLPOOL ffc2e9ac2c8687627cfc1b5edf8031659dcb541297f28804c162a5bf8cbbf5e3b4021e07e12867c3e9f99eacc1d9c3bd8f801f07b86a2b02580bc68e9c564b1f
+DIST sidplayfp-1.1.0.tar.gz 221706 SHA256 d0b4476b4a7c89eac87711de6c4a41cf1f41f963fafb81e2e0662798b19e7f17 SHA512 2e0986b9bb5b571e1e38c7e92b836a2e39f6dd84fd26161891b3117976c2d98e615e13819f68d0984094b085d50b53205a74a71b371ba005b1ddf3cb00d5274c WHIRLPOOL f15c6528a145f7b0349aa30ba44668fed1c84d8d5747ced48b5dbb2bbe7a2214bc671f812c30642f8ed44c7b3c1e36110ecdb3f2ca1c406f1b6db860d02f5968
+DIST sidplayfp-1.4.0.tar.gz 181746 SHA256 d88a05d999ec5bbd85932c89663b7b74eb06d7af55334e6960722f59bd242b62 SHA512 ac91cc26622b211408c50bcef14dcda78b8da81b43a8f334d91a02b89bd6dac0b3e3adaeb84545e6dbcef97354ba6c2dc555e4f0a2ff0298c6710fe1c6cbbd5f WHIRLPOOL af4afa448cdb29d53d7cd8273ea7ac643ac6cb20d068d72301debfbab42f2848703e2b8b86aba3fc2eeb4a1e9f421a277b30de17c953e541998d6650b3eeedbb
+EBUILD sidplayfp-0.3.3.ebuild 732 SHA256 1afce0bac00aa1b6c56d61cc0c8a76ff7a8c89945b1aee1000c07f9506aa96b3 SHA512 b3c8dd5128140efd0cb3c80be09a2947aafa7d1c5bd446f02130ad24b4fca6fc6d80c8d7731ab69c3027b564849b509364d29fb49c558deef1132c978744a925 WHIRLPOOL bb5fabdd0ca95d82ae32ca681f2c56e92daba9c34cc1a564f4225ddc27879d9199296f59d0bf05a86192bf0aa81fba0a0cec8edba5c6701c20af29741b3e39b6
+EBUILD sidplayfp-1.1.0.ebuild 841 SHA256 7bc61b1a5bde2ce91ae72d131f1203bf4eaa5dc427825735ca8752406e90498e SHA512 71904f83eb8679b3431329ad77cdb171cef0cd1a16f4cb86b8ee0b3a8428a563a2d4668c24ea0cbcc0c604873d52c3a91e5ecefbd331c50af5e6b540e4d575ad WHIRLPOOL bac57dc5fa24b59fa799a6d27d0d4bd86ecd56816356f83d63ff0212e9022beea613d071d29f2cf6cff469cc3aeddf9e5000a89308f982c72322a011aa6ad3e9
+EBUILD sidplayfp-1.4.0.ebuild 894 SHA256 d0588cc38129482ba886e6fc8effc4e929183e93e067b1ed5ec1c73f86d8e777 SHA512 cc2cddba953f2e6bc010072cdc4c279e6b0962a90bcc3348f6d91be67e07c1c5f54f98f43b3fac16d6656941bfb2797f78234318c6343759f1eb4f0a1c661db3 WHIRLPOOL f4bd37a703898aa895682e0f3688e1770537053006dab4b33cf989c695fd47b2f966f2a2077616cf791d51c57c288b0a1b742c8a79af91ada38f2239d9e5cb8c
+MISC ChangeLog 2712 SHA256 65f2ba2cd2b3c9de26af5060553bc29589bf218d7afdbb4ab7d311ca7de40c83 SHA512 865134a4f8b0e58ef6056e5b35838c4b4d42bfef978be71cd94c638a7ab734e5cd2f8c21614241ef9896771711e447dcdae9c3f0072e9f9c63a20ab7e7c54b68 WHIRLPOOL 38af16abf17bb079cf0edb24728ebb8267b1fa97a568ada7cef167514a636c771893e6b6c592d514abc54fc32a01cf7344cd162ed76537b206251b0edbf56de6
+MISC ChangeLog-2015 1171 SHA256 92b273a0f377b8f4fc30e0633303cb07125d901fbc386131b7aaf04cd2570a6c SHA512 ccf8f58d480e736d131e27b001cb6f15765f88e47ed87f9f12c7d7795841d20d3d741247fc2cb94be39c1e115ccab79b8f2d6a0b0490b268657e1cadba80187d WHIRLPOOL ea9b21e3409ccfc441e5b9dfc33a5bdcce80cf669b282650e44442937fa2b340704e1408172e78e9bb2cbbc1b08122d3ab49ba9ee47a5eecb808c9803d4ff165
+MISC metadata.xml 338 SHA256 6d41f40e162455e134823841aa11a6237bf8715848345b917f80a07a99d9c50a SHA512 8f2ffc3fd7b2b6af0143e4125cad702a68da198e0433fd3d22775ca1f64d8689acf3cc0fdbd205d7fc0815b95c1c88fa1cca71c3f5572f3aa3b25bb8b3a9b76e WHIRLPOOL 65c7bbb6f7356c075f26dddf0d434d8ebc17cc6ff71b689ca1151b9883f9cbb15ecfd88e1b96fbec251a30662577f8af236dd07b254624906711437a58fa8b78
diff --git a/media-sound/sidplayfp/metadata.xml b/media-sound/sidplayfp/metadata.xml
new file mode 100644
index 000000000000..cb5d4fa14508
--- /dev/null
+++ b/media-sound/sidplayfp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">sidplay-residfp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/sidplayfp/sidplayfp-0.3.3.ebuild b/media-sound/sidplayfp/sidplayfp-0.3.3.ebuild
new file mode 100644
index 000000000000..94a9199284b6
--- /dev/null
+++ b/media-sound/sidplayfp/sidplayfp-0.3.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A sidplay2 fork with resid-fp"
+HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
+SRC_URI="mirror://sourceforge/sidplay-residfp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa oss pulseaudio"
+
+RDEPEND=">=media-libs/libsidplayfp-0.3.8
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	oss? ( virtual/os-headers )"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_configure() {
+	local output=wav
+	use oss && output=oss
+	use alsa && output=alsa
+	use pulseaudio && output=pulse
+
+	econf --enable-driver=${output}
+}
diff --git a/media-sound/sidplayfp/sidplayfp-1.1.0.ebuild b/media-sound/sidplayfp/sidplayfp-1.1.0.ebuild
new file mode 100644
index 000000000000..eefcd503753a
--- /dev/null
+++ b/media-sound/sidplayfp/sidplayfp-1.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A sidplay2 fork with resid-fp"
+HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
+SRC_URI="mirror://sourceforge/sidplay-residfp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa oss pulseaudio"
+
+RDEPEND=">=media-libs/libsidplayfp-1.1.0
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	oss? ( virtual/os-headers )"
+
+DOCS=( AUTHORS README TODO )
+
+src_prepare() {
+	use alsa || { sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die; }
+	use pulseaudio || { sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die; }
+}
+
+src_configure() {
+	export ac_cv_header_linux_soundcard_h=$(usex oss)
+	econf
+}
diff --git a/media-sound/sidplayfp/sidplayfp-1.4.0.ebuild b/media-sound/sidplayfp/sidplayfp-1.4.0.ebuild
new file mode 100644
index 000000000000..997402d17402
--- /dev/null
+++ b/media-sound/sidplayfp/sidplayfp-1.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils versionator
+
+DESCRIPTION="A sidplay2 fork with resid-fp"
+HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
+SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa oss pulseaudio"
+
+RDEPEND=">=media-libs/libsidplayfp-1.8.0
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	oss? ( virtual/os-headers )"
+
+DOCS=( AUTHORS README TODO )
+
+src_prepare() {
+	use alsa || { sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die; }
+	use pulseaudio || { sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die; }
+}
+
+src_configure() {
+	export ac_cv_header_linux_soundcard_h=$(usex oss)
+	econf
+}
diff --git a/media-sound/skype-call-recorder/Manifest b/media-sound/skype-call-recorder/Manifest
new file mode 100644
index 000000000000..a919122cb4e1
--- /dev/null
+++ b/media-sound/skype-call-recorder/Manifest
@@ -0,0 +1,6 @@
+AUX skype-call-recorder-0.8-cmake.patch 588 SHA256 35440be55fd589426919aa4a5b10bce480c8b87c016a4660d2ff9c4e2fcb8bfe SHA512 ad496f67b3b834f2c99bb1a0bb97c5fc9848962ef4eea9701ee38d414a42e0e284ec95ad38c8d420df4e482ce83d35093f4e080065b4697ab88ca827d337f6a0 WHIRLPOOL 03461a5c976e039b47def5af134830503cec6c99e791108e12949df804ad4061f9d84c65bcfc46a58a0114278a988b327b485b4e4fd12de29e28dc4d8e9b8f3a
+DIST skype-call-recorder-0.11.tar.gz 88079 SHA256 284268dc9634b67eb2d991daa0e3954ecb93b383a20ac1e89586e0f35d6629c2 SHA512 b0de83bb9b6d3db953de3443db4ee79884df83cc0f03c606d932efe036f80f75232969e424df61e5b8c9d00cd748f3067d5209ff353b58440af711e9dff58e53 WHIRLPOOL 762fca3df340bffe3ba998a4aec66fd50000bc21b3a1f1844c90bc1f19f3865977d565c308ac7e1f0103d248d205d0e1948d6949551e3d106d093f6983e32a2c
+EBUILD skype-call-recorder-0.11.ebuild 642 SHA256 94c0fb22acad2a0e94d40556bf9841fa6a87ecffe0e1140b26da298559d34ef9 SHA512 ae8741c3bc121e79e72dc2fa42b1299e670667203498db8c7fb174a72498a244922611008fcf32549613dc8d2ade91100963cda9e24cec3d3365d4bec684d4bc WHIRLPOOL 78408248d9f8fc3e48634b194adab4a8a47e4e5d81b61548d5cdfb9395ba2ed8e9eab323cc4410126dcba40c80b60a19f1da32de0df9e613043dd5bb00f06631
+MISC ChangeLog 2457 SHA256 e1a68fd09cec7678c41c589ac6c43e95f83ece6f345730d614c6b3e2a8677fc4 SHA512 98eb774b9e8390a903dc47d3a4099aef480376e834b824c97b5ad94683dd6156065b90646d52e41d19a187d46cdbf2a4a534e99afdf1c7ddfba9233e3290c941 WHIRLPOOL 96b069a323cd942284e4f43d49fa8ed9d42bb50f598550fbb916a6b21a69206c3f5c213775487d26bbac452552b46263d77684d23ab5d8cf0880e75691c50c08
+MISC ChangeLog-2015 1356 SHA256 630d3e95f5ea55d97948cc54239611264b27f004297232fd2c47b09d0b554346 SHA512 d1afbbc4819b6cb8cde4600a439093165ca63b994f833a78367ad6a622bf76abf14d0d6d63ce7a84a42349be785a550c4803c2cb763699920a0c95f75690ccf0 WHIRLPOOL 4f063d606a4df5c9134651931606152a4f5d64fa301695a144a28044bde1d4cc1c5ea377870edc0b1825844262cd074d23161ac8e62859eaf61584a52f3f433b
+MISC metadata.xml 251 SHA256 9bcbd2bdc39a6b5e676839700a97c8bda16c1eb3c90fb31a8fae28c8588f5f04 SHA512 14f3538a99bd8d32654ef4630d0cc667d55b36b44701791eb42d98f8e958641188915d86c306d68c7c20a4587e53477a3f9e32aeba2e0ba51c63c903391c4277 WHIRLPOOL c5f80f443f16c3da297d4e3992c88190ce799bab94ae37c5c2151e3850cdc61a8f67c653a62f6de3c7db94918b63cfce2071bbe5ceb8978dc15d6903bd49163c
diff --git a/media-sound/skype-call-recorder/files/skype-call-recorder-0.8-cmake.patch b/media-sound/skype-call-recorder/files/skype-call-recorder-0.8-cmake.patch
new file mode 100644
index 000000000000..74989e025915
--- /dev/null
+++ b/media-sound/skype-call-recorder/files/skype-call-recorder-0.8-cmake.patch
@@ -0,0 +1,19 @@
+diff -ruN skype-call-recorder-0.8/CMakeLists.txt my/CMakeLists.txt
+--- skype-call-recorder-0.8/CMakeLists.txt	2008-11-18 23:39:18.000000000 +0100
++++ my/CMakeLists.txt	2011-07-23 15:39:56.456877971 +0200
+@@ -5,14 +5,9 @@
+ PROJECT(skype-call-recorder)
+ SET(TARGET skype-call-recorder)
+ 
+-SET(CMAKE_BUILD_TYPE RELEASE)
+-#SET(CMAKE_BUILD_TYPE DEBUG)
+-
+ # compiler flags
+ 
+-SET(CMAKE_CXX_FLAGS "-Wall -W -pipe -fno-exceptions")
+-SET(CMAKE_CXX_FLAGS_DEBUG "-ggdb")
+-SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -s")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -W -pipe -fno-exceptions")
+ 
+ # sources
+ 
diff --git a/media-sound/skype-call-recorder/metadata.xml b/media-sound/skype-call-recorder/metadata.xml
new file mode 100644
index 000000000000..613d45e5ffa8
--- /dev/null
+++ b/media-sound/skype-call-recorder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/skype-call-recorder/skype-call-recorder-0.11.ebuild b/media-sound/skype-call-recorder/skype-call-recorder-0.11.ebuild
new file mode 100644
index 000000000000..fccf74bc51af
--- /dev/null
+++ b/media-sound/skype-call-recorder/skype-call-recorder-0.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Records Skype calls to MP3/Ogg/WAV files"
+HOMEPAGE="http://atdot.ch/scr/"
+SRC_URI="http://atdot.ch/scr/files/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="
+	media-libs/id3lib
+	>=media-libs/libogg-1.2.0
+	>=media-libs/libvorbis-1.2.0
+	media-sound/lame
+	>=dev-qt/qtcore-4.4:4
+	>=dev-qt/qtdbus-4.4:4
+	>=dev-qt/qtgui-4.4:4
+"
+RDEPEND="${DEPEND}
+	net-im/skype[-qt-static(-)]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8-cmake.patch"
+)
diff --git a/media-sound/smixer/Manifest b/media-sound/smixer/Manifest
new file mode 100644
index 000000000000..ef8ab28ec58a
--- /dev/null
+++ b/media-sound/smixer/Manifest
@@ -0,0 +1,5 @@
+DIST smixer1.0.4.tgz 11245 SHA256 3b18b846711f0548a9d0e7563fcfc04195332feb54756b6f8785f7b15237e1b5 SHA512 3c589487cfd246b68d54abe9ce9dbddd9aae539b96a0d464f3194f5931819c85923e13b4fd5b947bab35d32403bd7609fef33ff966a1d20d3fb465eb0bb184aa WHIRLPOOL 2e7c6054819d154954ec0a541a950a90ad13508d93775092198e0e70c16f81640b90427b8934b1e239f31bff0f5a62169e5bb635753b4a8645f0bfeb6c02d326
+EBUILD smixer-1.0.4.ebuild 592 SHA256 f47b181a6542ed3e932c77fb0c0e9cb9d8b42afe70db7a221002d8a46d555420 SHA512 0a5422b7d8cb8a60167525844d9ccdc9c59469a24a8cf22556e65b888cae5522016ab1a9bff6b10fa5b019b8163061008685d45404aa2a1a2c0bc9fc9ab6a5eb WHIRLPOOL 4dd924c2083c50b9237e9fa7568e3f17972835e81b1de78e249b02ce4e3512ea817f6a77d20c9a0e8901ea6efba9147d02934b8429652b09655110495f95b874
+MISC ChangeLog 2427 SHA256 230da82dd5c6a2d9d9e4884a5cfc2461b87218d609082df2adbecf84328761a4 SHA512 6046b1eac64827239a5cf324f55a32afb02f5bdd2028b4d4be92078ecd0ae48466891b036c9152667b97136d6903c0cdd276c0992d413bfe30b1fc85fb861cff WHIRLPOOL 53f8c3afba96647e0a9ff56a86c74241f7211050c7573c6fad25ee83bf7f179cd27059fb432b827d7417ef5598c4a6cdb9b7dab1ce37cea59e606ef8f778797c
+MISC ChangeLog-2015 2355 SHA256 ee3fe3a3056d74bd540582284e803ea67526aa70eae293b661a50eb2a83ba806 SHA512 fec802dce96f6906c5dde0fecc7dc69fa1adfe823bdd80999451510a12f680a949a5cfc3ef9ea78fa91713193ac3334810f7d9c07ebdeec9ea047351c09e6897 WHIRLPOOL dfd804f5f973f68e12419fd934c1f01def3853cc2e01a60bc0a311b014d425acb24bb23a48f7eb87c432747a8969dc61b051a278aa71534ee33c1398667d9a51
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/smixer/metadata.xml b/media-sound/smixer/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/smixer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/smixer/smixer-1.0.4.ebuild b/media-sound/smixer/smixer-1.0.4.ebuild
new file mode 100644
index 000000000000..4cff0e5b2d1b
--- /dev/null
+++ b/media-sound/smixer/smixer-1.0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="command-line tool for setting and viewing mixer settings"
+HOMEPAGE="http://centerclick.org/programs/smixer"
+SRC_URI="http://centerclick.org/programs/${PN}/${PN}${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
+}
+
+src_install () {
+	insinto /etc
+	doins smixer.conf
+	dobin smixer
+	doman man/smixer.1
+	dodoc README
+}
diff --git a/media-sound/snd/Manifest b/media-sound/snd/Manifest
new file mode 100644
index 000000000000..9959e0bf64ed
--- /dev/null
+++ b/media-sound/snd/Manifest
@@ -0,0 +1,7 @@
+AUX snd-17.4-portaudio.patch 2154 SHA256 f37a861b312032ec544a79e40814d67b7dd63fce1099c2daada8b94c5e9c1ed8 SHA512 01f7d7f3bd315a8b372d81e2f5a96b9f1cd100eb4afe62a57c5b0422740892b80d504ab2774190814fde04849bc097817262f7bc96bda1f90a08f544caa439ce WHIRLPOOL c07878174acf02e08f98bf81f5fc39f73b4a736377775e559ecb5f250b9cd8536229ef4efd0e0d657642da6fc9a118d3cb1e61575424c635e7b7f85389e4ca14
+AUX snd-17.4-undefined-oss_sample_types.patch 372 SHA256 98999381eebb15846467bcc0bd49886ea52e7fa3603e7de410fbbeeae86eb51f SHA512 3b6a64eea622d77389edf754450a6ef1a5036b1ef0c5e02f7c84c4aa150fd0c30dd3e7855126dbbce1582a9ff1e02ddc2abfb5e7636feb71713e08c7b1bc0478 WHIRLPOOL 5aaccd99172d283135e406c6c52f3525d88a27b182cf47cc13b48a2c02d215be37343eb315706f3cd3306b36b53cbd3f6cda6f9a8f8b53d76075cd3a63118010
+DIST snd-17.4.tar.gz 15096338 SHA256 efa311586661a5e73bb0fe894a366e2320a494d975424928b563dab450d0fb48 SHA512 cbbc546fe4a3ef758c5372edbdae4db29457c559eafa08854819917e153ce850f5ab302da68dee826f99c26f10769aae8c6df6ea8434614f084f21d0dbbc5c88 WHIRLPOOL ec7fc7848edf84d91312fbb7316d5f96ba8fa30d7b39bc12a0b71f5bb771cb31cacf1044401177f35ae665df59513951166b7654c955e0cf53e2ae0e5d8847e2
+EBUILD snd-17.4.ebuild 2633 SHA256 b63faf1909f77ddeb1ba68eb96a2aa7d98e80ba5b6369e193b25f66e14b45e79 SHA512 5503254ec86f746dd67513f6e21a3db31a1298dc740a3b3ffd6a90be4b5a9f5a935444067508f5d216a188aaabd03b94b272e4adb1ef6ef9b9bcf9c599cd745f WHIRLPOOL 19f39a47c5cfbfee76bc820e1ea75fa7469fea018937b112679adbe8827c2d0b6096a5823102c3af546ae1caf76d1cbed6e6d79dadc04777e200e0d6e21c04ee
+MISC ChangeLog 2856 SHA256 e661b00e7c782a5f2264b29b8452fd61ffeca8f2c8b4fd381aea61c3ae23e782 SHA512 9d4e465c142c4a6ab09b4f592a8db7cb6c87a8ca7fd3831679868abfb5ce26c75fe95a0c7c1838644aacaad40a94cfa9bbee244c7117737d679013ee245b0a16 WHIRLPOOL 53b1a6241706e5592cf8243e7b6b32940d6cedc3b4826f2e6d898b02b2658a4cc89b0ec60254ff5e843ff4fcaeda164f0a88e34fd5d8d06770a7fb1b3638f6ac
+MISC ChangeLog-2015 8958 SHA256 a268cc271ce223410b8d477b6e2c85480ce16dd0f14d69b23ec003d686a89982 SHA512 98361ff384e6b7dc23939ac68df04a3e2f1e6cc78ffaed882bdbfe151f21fb30583195775753448ce7265af6946921457bca1bd6629a83b2eef0fa742cb84dd5 WHIRLPOOL 8eed7e3d623fd33399200f1254a0f97ab566e164472b64fb16f46665acaec406a68d8e7c708b8ba6266942ed5820c0889b4ef45959f024e795519bb2a67da11a
+MISC metadata.xml 344 SHA256 3676a938c60059124534f946c7c7f1df76c2aba915098e85bd166a12e29ae304 SHA512 42144ef636272ad14dee0131dd1181ddb6635aaecec547b1d4eb3e66ef00eebfbbd8a551ce33f041fe44fb2e1758fd46c24b5961f5a148e90d94c6825fd37c87 WHIRLPOOL 735c243bccccc5c9b450327f1328a28c1498061baadac80fd34b45d5cf20a271ccde142b3522692ee95d4557dc355fceb10aca6c1fab826e3a6500c6e33ccccc
diff --git a/media-sound/snd/files/snd-17.4-portaudio.patch b/media-sound/snd/files/snd-17.4-portaudio.patch
new file mode 100644
index 000000000000..8bdb1af01e8a
--- /dev/null
+++ b/media-sound/snd/files/snd-17.4-portaudio.patch
@@ -0,0 +1,49 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -521,8 +521,9 @@
+   
+   if test "$with_portaudio" = yes ; then
+     AC_DEFINE(MUS_PORTAUDIO)
++    PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0])
+     AUDIO_SYSTEM=portaudio
+-    AUDIO_LIB="-lportaudio"
++    AUDIO_LIB="${PORTAUDIO_LIBS}"
+   fi
+ 
+   if test "$with_jack" = yes ; then
+--- a/makefile.in
++++ b/makefile.in
+@@ -11,6 +11,7 @@
+ GL_FLAGS = @GL_FLAGS@
+ GSL_FLAGS = @GSL_CFLAGS@
+ JACK_FLAGS = @JACK_FLAGS@
++PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
+ 
+ ORIGINAL_LDFLAGS = @ORIGINAL_LDFLAGS@
+ LDFLAGS = @LDFLAGS@
+@@ -28,6 +29,7 @@
+ WEBSERVER_FILES = @WEBSERVER_FILES@
+ JACK_LIBS = @JACK_LIBS@
+ GMP_LIBS = @GMP_LIBS@
++PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
+ 
+ LDSO_FLAGS = @LDSO_FLAGS@
+ SO_FLAGS = @SO_FLAGS@
+@@ -53,7 +55,7 @@
+ .SUFFIXES: .c .o
+ 
+ .c.o:
+-	$(CC) -c $(DEFS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(GL_FLAGS) $(JACK_FLAGS) $(FFTW_CFLAGS) $<
++	$(CC) -c $(DEFS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(GL_FLAGS) $(JACK_FLAGS) $(FFTW_CFLAGS) $(PORTAUDIO_CFLAGS) $<
+ 
+ SND_SCRIPTS = *.scm *.fs *.rb *.fsm
+ SNDLIB_HEADERS = mus-config.h sndlib.h _sndlib.h sndlib-strings.h clm.h vct.h sndlib2xen.h clm2xen.h xen.h clm-strings.h
+@@ -84,7 +86,7 @@
+ main_target: @MAKE_TARGET@
+ 
+ snd: $(SNDLIB_HEADERS) $(SND_HEADERS) $(GX_HEADERS) $(S7_HEADERS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) $(WEBSERVER_FILES)
+-	$(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES)  $(WEBSERVER_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(WEBSERVER_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(GMP_LIBS) $(LIBS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES)  $(WEBSERVER_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(WEBSERVER_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(GMP_LIBS) $(PORTAUDIO_LIBS) $(LIBS)
+ 
+ xm: 	xen.h mus-config.h $(S7_HEADERS)
+ 	$(CC) -c xm.c -DUSE_SND=0 $(DEFS) $(SO_FLAGS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(JACK_FLAGS) $(GL_FLAGS)
diff --git a/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch b/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch
new file mode 100644
index 000000000000..6199a7b183fd
--- /dev/null
+++ b/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch
@@ -0,0 +1,21 @@
+Always compile the `oss_sample_types` function
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=621758
+
+--- a/audio.c
++++ b/audio.c
+@@ -743,7 +743,6 @@
+ }
+ 
+ 
+-#if (!HAVE_ALSA)
+ static int oss_sample_types(int ur_dev, mus_sample_t *val)
+ {
+   int fd, samp_types = 0, sys, ind;
+@@ -774,7 +773,6 @@
+   val[0] = (mus_sample_t)(ind - 1);
+   return(MUS_NO_ERROR);
+ }
+-#endif
+ 
+ 
+ 
diff --git a/media-sound/snd/metadata.xml b/media-sound/snd/metadata.xml
new file mode 100644
index 000000000000..45299bb81517
--- /dev/null
+++ b/media-sound/snd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+</maintainer>
+<use>
+  <flag name="s7">Enable the s7 extension language (a version of Scheme)</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/snd/snd-17.4.ebuild b/media-sound/snd/snd-17.4.ebuild
new file mode 100644
index 000000000000..5b746a352c8a
--- /dev/null
+++ b/media-sound/snd/snd-17.4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Snd is a sound editor"
+HOMEPAGE="http://ccrma.stanford.edu/software/snd/"
+SRC_URI="ftp://ccrma-ftp.stanford.edu/pub/Lisp/${P}.tar.gz"
+
+LICENSE="Snd BSD-2 HPND GPL-2+ LGPL-2.1+ LGPL-3+ ruby? ( free-noncomm ) s7? ( free-noncomm )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa doc fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio readline ruby +s7"
+
+RDEPEND="media-libs/audiofile
+	alsa? ( media-libs/alsa-lib )
+	fftw? ( sci-libs/fftw:3.0= )
+	gmp? (
+		dev-libs/gmp:0=
+		dev-libs/mpc
+		dev-libs/mpfr:0=
+	)
+	gsl? ( sci-libs/gsl:= )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-libs/cairo
+		opengl? ( x11-libs/gtkglext )
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	ladspa? ( media-libs/ladspa-sdk )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	opengl? ( virtual/opengl )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	readline? ( sys-libs/readline:* )
+	ruby? ( dev-lang/ruby:* )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="
+	?? ( portaudio pulseaudio )
+	?? ( ruby s7 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-17.4-portaudio.patch
+	"${FILESDIR}"/${PN}-17.4-undefined-oss_sample_types.patch
+)
+
+pkg_setup() {
+	if ! use gtk && ! use motif ; then
+		ewarn "Warning: no graphic toolkit selected (gtk or motif)."
+		ewarn "Upstream suggests to enable one of the toolkits (or both)"
+		ewarn "or only the command line utilities will be helpful."
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:-O2 ::" configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# Workaround executable sections QA warning (bug #348754)
+	append-ldflags -Wl,-z,noexecstack
+
+	local myconf
+	if ! use ruby && ! use s7 ; then
+		myconf+=" --without-extension-language"
+	fi
+
+	econf \
+		$(use_with alsa) \
+		$(use_with fftw) \
+		$(use_with gmp) \
+		$(use_with gsl) \
+		$(use_with gtk) \
+		$(use_with jack) \
+		$(use_with ladspa) \
+		$(use_with motif) \
+		$(use_with oss) \
+		$(use_with portaudio) \
+		$(use_with pulseaudio) \
+		$(use_with ruby) \
+		$(use_with s7) \
+		${myconf}
+}
+
+src_compile() {
+	emake snd
+
+	# Do not compile ruby extensions for command line programs since they fail
+	sed -i -e "s:HAVE_RUBY 1:HAVE_RUBY 0:" mus-config.h || die
+
+	local i
+	for i in sndplay sndinfo; do
+	   emake ${i}
+	done
+}
+
+src_install () {
+	dobin snd sndplay sndinfo
+
+	if use ruby ; then
+		insinto /usr/share/snd
+		doins *.rb
+	fi
+
+	if use s7 ; then
+		insinto /usr/share/snd
+		doins *.scm
+	fi
+
+	use doc && HTML_DOCS=( *.html pix/*.png )
+	einstalldocs
+	dodoc HISTORY.Snd
+}
diff --git a/media-sound/sndfile-tools/Manifest b/media-sound/sndfile-tools/Manifest
new file mode 100644
index 000000000000..53432d247bff
--- /dev/null
+++ b/media-sound/sndfile-tools/Manifest
@@ -0,0 +1,7 @@
+AUX sndfile-tools-1.03-remove-Werror.patch 660 SHA256 1cb26315a1e5fd60f9cee32e9c254d43bd33ec43557b9f671432d6119ac023ec SHA512 e16c01184b118f7a412f50f05470da41b73fad9258e0c8108ab8cc0c2eaf70e09f4832d4b060b90e5e189535f83cf18d62180d9496b30910669385467c6fa919 WHIRLPOOL 87c8ff9ea037eff8ca4574b54e35161caec11dd8630b01c64de267f881103cdcc800c8c1ffc7ab7f8897eaaa57697e690f6b7b26dbcd907a025baa85c8a8a231
+DIST sndfile-tools-1.03.tar.gz 474494 SHA256 f75df926a397d4dfa88748d51a3d3a9de1b5de85461bbeeb77edd8ef5b5fb14b SHA512 bc6ac7977a95ccf845c889db81452ae84b4f10a8f51c91ddd6fe4d926337a60cdbcb2859b0758816622554bf26a6e42b70f791f2c5158926c3f92ab2abbf14dc WHIRLPOOL 209c33344b14639622c02b6fb4e6784154681bb57fc3598bd218a35e4db4b7354da36c65e7348940a08049f1984801356439fdc12aaa9ce5f4fb8fd93f31a731
+EBUILD sndfile-tools-1.03-r1.ebuild 566 SHA256 e72174e77275d5614ef4d0a42d1234a349e63851e34083ff47a2d6af0f884da4 SHA512 2608ff60cc47f06c37955cd85c76ebfb698a86cfdf24bad580262a73ee465b187e7bd479760c7a74ec7d7a09694c8fc2f68ddc3fc8c9fa4176099e6b3f459c24 WHIRLPOOL e0e9ecc841f7d195dbb79f0b2064374623c79166419d2f12ba16651c2f418e328faccc8aacd5294dbc4cc92f76dd64b5572da526cfe9fe7c79e495cbc7c4e107
+EBUILD sndfile-tools-1.03.ebuild 648 SHA256 99b5b866e0e6083d4bfb63a53f1c723407953f3afba6e192192ae85ae57f7c0f SHA512 deb4e326d087cbae4ce5d1e7c725596321529e5b02cba885eacfee18eb01ca06c11f0dc4d1bac7d372f30a3ff28f63947fdeab1f6d2fb7d9a8dcd64cb3e67765 WHIRLPOOL 881d0f3e3f7b43b31a0d3d1c969b77911932b85a7b71d3beb4d85f6a0d35ccddaabbfce42f600750681032df861d5d84b176a0a2787a9e2ea06ecf79c8b9f305
+MISC ChangeLog 2727 SHA256 ddd7bcb4b9643694d9ee6a866ba9c464597094fcc563d019bb61856891e6917e SHA512 584e67dd1626e06cdaf47935fbddd17a91ff7174e2f79218a909552a5e6ea32aef2491c9249133d45cbdd2a2d469cccaa21456808c3a4d8885dbd6ae30ee745f WHIRLPOOL 893172e83f83587794b0a99fabd59d7e5c6407dcb71fd02fc5367f22b9ea01b76f3f6c5c99c58c1fc7be4027b3afc154a3eb73fbbba8ea97b29e3872a51b6c54
+MISC ChangeLog-2015 507 SHA256 382e098c859b24ecf43e9487c398351e222284315b7ad4e5710cbdbad780f607 SHA512 88863d5b40ec590e1a43c504284172f33973031e210bc255b1aaa14d5cc98574de3671af16f1d92fec0d6bfa370af93c9f0b56ff62aa16dc6dc01cafc21e424a WHIRLPOOL 3fe88bfa2a8a781eb29d313aced0c498330e8c0d0318a54fe652d0c2cb0667a1760e921cdb0336eaa1b695867f69d62bef61a2d6844141c9bc82f9484165fdca
+MISC metadata.xml 589 SHA256 99c4446bbba299a50be7f9356f51750f84af0f98065552b40aa42d09290caa97 SHA512 ad1a2f99f3e07e0319f5af7905845cd40e08c10f3ac246e6b0162125b55902d4c612ada31164890918894cd42761cf5418dad0f5225cb825bc652615a34cd5ea WHIRLPOOL 3a69aad202ae1f9427e520e42b82673cb3d002aa5033720b65800d1951144bb82dc6071cf45a2bcad4aa1d6c3358fafd8584df6550d5cee680bf8f2be56a53a5
diff --git a/media-sound/sndfile-tools/files/sndfile-tools-1.03-remove-Werror.patch b/media-sound/sndfile-tools/files/sndfile-tools-1.03-remove-Werror.patch
new file mode 100644
index 000000000000..11c71c79310a
--- /dev/null
+++ b/media-sound/sndfile-tools/files/sndfile-tools-1.03-remove-Werror.patch
@@ -0,0 +1,16 @@
+Remove -Werror from CFLAGS causing all sorts of havoc due to
+deprecated declarations in media-sound/jack-audio-connection-kit
+See also: https://bugs.gentoo.org/show_bug.cgi?id=542120
+
+--- sndfile-tools-1.03/configure
++++ sndfile-tools-1.03/configure
+@@ -11397,9 +11397,6 @@
+ 	CFLAGS="$CFLAGS -std=gnu99 -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wcast-qual -Wnested-externs -Wshadow -Wpointer-arith"
+ 	# -Wundef -Wbad-function-cast -Wmissing-declarations -Wconversion -Winline"
+ 
+-	if test x$ac_arg_gcc_werror = "xyes" ; then
+-		CFLAGS="-Werror $CFLAGS"
+-		fi
+ 
+ 
+ $as_echo "#define COMPILER_IS_GCC 1" >>confdefs.h
diff --git a/media-sound/sndfile-tools/metadata.xml b/media-sound/sndfile-tools/metadata.xml
new file mode 100644
index 000000000000..2b515eb87eeb
--- /dev/null
+++ b/media-sound/sndfile-tools/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Sndfile-tools is a small collection of programs that use libsndfile and
+		other libraries to do useful things. The collection currently includes
+		the following programs:
+
+		    * sndfile-generate-chirp
+		    * sndfile-jackplay
+		    * sndfile-spectrogram
+		    * sndfile-mix-to-mono 
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/sndfile-tools/sndfile-tools-1.03-r1.ebuild b/media-sound/sndfile-tools/sndfile-tools-1.03-r1.ebuild
new file mode 100644
index 000000000000..052ea1b02f8f
--- /dev/null
+++ b/media-sound/sndfile-tools/sndfile-tools-1.03-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A small collection of programs that use libsndfile"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/"
+SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=media-libs/libsndfile-1.0.19
+	>=x11-libs/cairo-1.4.0
+	sci-libs/fftw:3.0
+	media-sound/jack-audio-connection-kit"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+PATCHES=(
+	"${FILESDIR}/${P}-remove-Werror.patch"
+)
diff --git a/media-sound/sndfile-tools/sndfile-tools-1.03.ebuild b/media-sound/sndfile-tools/sndfile-tools-1.03.ebuild
new file mode 100644
index 000000000000..a64ae07e3b29
--- /dev/null
+++ b/media-sound/sndfile-tools/sndfile-tools-1.03.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+DESCRIPTION="A small collection of programs that use libsndfile"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/"
+SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=media-libs/libsndfile-1.0.19
+	>=x11-libs/cairo-1.4.0
+	sci-libs/fftw:3.0
+	media-sound/jack-audio-connection-kit"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+src_configure() {
+	econf --disable-gcc-werror
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README
+}
diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest
new file mode 100644
index 000000000000..faf54c095d96
--- /dev/null
+++ b/media-sound/sndpeek/Manifest
@@ -0,0 +1,8 @@
+AUX sndpeek-1.3-makefile.patch 7578 SHA256 fc7fcb83c2d8063b161dd73f0ba5255e2822250818ca9c3d11a78652ca6958e5 SHA512 4f89535d28a2e01b752b689513e67fdbaeab9b6aa03b62724e96bfafa4f49b9be310647268a43564b96686e20d52e7fd646a7a2e654eec1dd1c9e38e686e20e7 WHIRLPOOL 69a3d0c7a2f3a2a0f1e04d4f50b9ebfa36f45fa0171baa8ec950c812520a6861caccbeee18327569dbe2764596ef4de5ec066f78cf85351147dbfbab702d155a
+AUX sndpeek-1.4-gcc.patch 315 SHA256 e508f2546c0091dd63ead548ca7c9ed06b96791cb21870f4ce568f8c145aaef3 SHA512 184f4e39b033aed7f7ce49e5e15ee2bda016bc56b0f5fba05ab52a13f40e0c957a0a8c2754f0437b782556de9d0a5bb2a3694bb107261b4c80fda07a4b228d18 WHIRLPOOL 6fe3edce4d726c26c003fb9402ea09ccc9e710f6ccca236948664ce3f06e144b5192bb2f0940b732ed872cb890d1b04bf6b3f46fec68da8841b5c3cc66fb4441
+AUX sndpeek-1.4-ldflags.patch 2255 SHA256 aa8b396b029657724e957b3525a33feb3e4e588aead95bfbce2adcd91b449141 SHA512 36c8f4dd7a63c06a7cbefd66e1f2eca39cf7567ddfb8a76e6d50de7808086b17cdd3f4028e4d5ca458edbf6d257d75bce8d40538d865151d0ce11283b2cf3991 WHIRLPOOL 426c5ce48d7559981e2ea39092b6006bcbadb88a47d4568942ab6193fc94a1e180f601650b4de1dab974fe9cfeaa98e738dae67fe1536d9646f4b9a062f95092
+DIST sndpeek-1.4.tgz 311174 SHA256 2d86cf74854fa00dcdc05a35dd92bc4cf6115e87102b17023be5cba9ead8eedf SHA512 f44c2474828ccbd783d69cf14c5c63ab9c52e1f32fd3bdeb2b4e0c6c5dc83d5f88c2b4e27d48824b1acb29c730c1320953ccadf5635f61a9f93487bbcd821bcb WHIRLPOOL a11d2b75f0814643ad75b1b2da7bbd5876a2d1daececc776a3d562ecbdc3fe1c17957e1c479a6df7e8265ad862ed13615e80ada0beddd34c4b999e01b3f0abe0
+EBUILD sndpeek-1.4.ebuild 1681 SHA256 49902a817ddcba84bf48e1c90f0e7045af9875238f8c74622894480be9ca7182 SHA512 3c84228a75004a068078bca980413a6063c9ea7be10cb05a097abfaa0e8f1d960910fb13ebc0827ada5f2d6bb0cae193658b15215af9ab9dff2bdccc888871f6 WHIRLPOOL 3ae660ab140670818fe909bf04c610dfa29653365296670e66aa7fad381a8cbbd2f1fc7ddede30a2a99749c4a78f3766ef8c7702000a2af208f6b492d73351f9
+MISC ChangeLog 3552 SHA256 38422f747e80798814d1e8a0ea16b2e381c79daf7c52bdcd0047c93cd37cfcd0 SHA512 3dea5df1ab9791dfab784e704a09ee2b98ef40f69cbece9da4c38034e86296259546fc25300f3b4b2de70030b9950658db29a9673f47671324bc1f558389d98e WHIRLPOOL b22cedc4c1eedda84dce17f00bc4f2292587677b9e20e77cef1442d7bac1e971424bc9ad7ee5f36865e4ae1d76bf4d2fd008f0671052c1b912780aee00d8b623
+MISC ChangeLog-2015 1766 SHA256 1d1d0ebbe5ca2d46ad603b90e46944b4ddd7ad68403970498c24eab86399185f SHA512 3b2e05cb5137d9aa4ae3266e2240d1e25f94ac69fc4278051c9ad85ae2acc197ecae0e673891f058c58a239fd10d7d32f930780312250b382e0aa42cde6d1c43 WHIRLPOOL 094f67866586e54be966acfdfd88871d3f72066b1e0a335b0ade22a632ecdfda14d486b16b96ff861a0347bcaac232a2d9db91ca5610b3a7820cc8da894e366f
+MISC metadata.xml 334 SHA256 91326da175892e80d04cefd380330fd1f1382580048eb9c45f45beb91edc0417 SHA512 13ab3514fb82b417aa9b69680d3370a9f674c307a10a289de8b370c9cbd7e8a6b3aa14a00b2d69885e8805473940cf0dbf1606571827e021c5245c20e0078fa8 WHIRLPOOL 860214942313fcac7de333a5077a78e115628b2c04618f3bd6d73ff7d72c2a3f5d328666a08c421f7fbb4f2876a54ba33490bec5fb2e39e9666e7806c74e7b5c
diff --git a/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch b/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch
new file mode 100644
index 000000000000..9b17c99e146b
--- /dev/null
+++ b/media-sound/sndpeek/files/sndpeek-1.3-makefile.patch
@@ -0,0 +1,296 @@
+diff -ru sndpeek-1.3~/src/sndpeek/makefile.alsa sndpeek-1.3/src/sndpeek/makefile.alsa
+--- sndpeek-1.3~/src/sndpeek/makefile.alsa	2007-08-12 19:22:00.000000000 +0200
++++ sndpeek-1.3/src/sndpeek/makefile.alsa	2007-08-12 19:27:57.000000000 +0200
+@@ -1,10 +1,10 @@
+ 
+-CC=gcc
+-CPP=g++
++CC?=gcc
++CXX?=g++
+ INCLUDES=-I../marsyas/
+ MARSYAS_DIR=../marsyas/
+-CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
+-LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile
++CFLAGS+=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c
++LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile
+ 
+ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
+ 	Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \
+@@ -12,55 +12,55 @@
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CPP) -o $@ $(OBJS) $(LIBS)
++	$(CXX) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ DownSampler.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Flux.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ LPC.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MFCC.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ RMS.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Rolloff.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ System.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ fvec.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ AutoCorrelation.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Communicator.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Hamming.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MagFFT.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ NormRMS.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MarSignal.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ fmatrix.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ .o: $*.h
+ 
+@@ -68,7 +68,7 @@
+ 	$(CC) $(CFLAGS) $*.c
+ 
+ .cpp.o: $*.h $*.cpp
+-	$(CC) $(CFLAGS) $*.cpp
++	$(CXX) $(CFLAGS) $*.cpp
+ 
+ clean: 
+ 	rm -f sndpeek *~ *.o
+diff -ru sndpeek-1.3~/src/sndpeek/makefile.jack sndpeek-1.3/src/sndpeek/makefile.jack
+--- sndpeek-1.3~/src/sndpeek/makefile.jack	2007-08-12 19:22:00.000000000 +0200
++++ sndpeek-1.3/src/sndpeek/makefile.jack	2007-08-12 19:31:29.000000000 +0200
+@@ -1,9 +1,9 @@
+-CC=gcc
+-CPP=g++
++CC?=gcc
++CXX?=g++
+ INCLUDES=-I../marsyas/
+ MARSYAS_DIR=../marsyas/
+-CFLAGS=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
+-LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX11 -lXext -lXi -lm -lsndfile
++CFLAGS+=-D__LINUX_JACK__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c
++LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lasound -ljack -lXmu -lX11 -lXext -lXi -lm -lsndfile
+ 
+ OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \
+ 	Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \
+@@ -11,55 +11,55 @@
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CPP) -o $@ $(OBJS) $(LIBS)
++	$(CXX) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ DownSampler.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Flux.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ LPC.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MFCC.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ RMS.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Rolloff.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ System.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ fvec.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ AutoCorrelation.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Communicator.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Hamming.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MagFFT.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ NormRMS.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MarSignal.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ fmatrix.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ .o: $*.h
+ 
+@@ -67,7 +67,7 @@
+ 	$(CC) $(CFLAGS) $*.c
+ 
+ .cpp.o: $*.h $*.cpp
+-	$(CC) $(CFLAGS) $*.cpp
++	$(CXX) $(CFLAGS) $*.cpp
+ 
+ clean: 
+ 	rm -f sndpeek *~ *.o
+diff -ru sndpeek-1.3~/src/sndpeek/makefile.oss sndpeek-1.3/src/sndpeek/makefile.oss
+--- sndpeek-1.3~/src/sndpeek/makefile.oss	2007-08-12 19:22:00.000000000 +0200
++++ sndpeek-1.3/src/sndpeek/makefile.oss	2007-08-12 19:33:28.000000000 +0200
+@@ -1,8 +1,8 @@
+-CC=gcc
+-CPP=g++
++CC?=gcc
++CXX?=g++
+ INCLUDES=-I../marsyas/
+ MARSYAS_DIR=../marsyas/
+-CFLAGS=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c
++CFLAGS+=-D__LINUX_OSS__ -D__LITTLE_ENDIAN__ $(INCLUDES) -c
+ LIBS=-L/usr/X11R6/lib -lpthread -lstdc++ -lglut -lGL -lGLU -lXmu -lX11 -lXext -lXi -lm -lsndfile
+ 
+ TARGE=sndpeek
+@@ -12,55 +12,55 @@
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CPP) -o $@ $(OBJS) $(LIBS)
++	$(CXX) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ DownSampler.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Flux.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ LPC.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MFCC.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ RMS.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Rolloff.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ System.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ fvec.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ AutoCorrelation.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Communicator.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ Hamming.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MagFFT.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ NormRMS.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ MarSignal.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ fmatrix.o:
+-	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
++	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+ 
+ .o: $*.h
+ 
+@@ -68,7 +68,7 @@
+ 	$(CC) $(CFLAGS) $*.c
+ 
+ .cpp.o: $*.h $*.cpp
+-	$(CC) $(CFLAGS) $*.cpp
++	$(CXX) $(CFLAGS) $*.cpp
+ 
+ clean: 
+ 	rm -f sndpeek *~ *.o
diff --git a/media-sound/sndpeek/files/sndpeek-1.4-gcc.patch b/media-sound/sndpeek/files/sndpeek-1.4-gcc.patch
new file mode 100644
index 000000000000..524b0bd746af
--- /dev/null
+++ b/media-sound/sndpeek/files/sndpeek-1.4-gcc.patch
@@ -0,0 +1,12 @@
+Index: sndpeek-1.4/src/marsyas/LPC.cpp
+===================================================================
+--- sndpeek-1.4.orig/src/marsyas/LPC.cpp
++++ sndpeek-1.4/src/marsyas/LPC.cpp
+@@ -26,6 +26,7 @@ in Speech Recognition research.
+ */
+ 
+ 
++#include <cstdlib>
+ #include "LPC.h"
+ 
+ LPC::LPC( unsigned int inSize )
diff --git a/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch b/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch
new file mode 100644
index 000000000000..9822434b263a
--- /dev/null
+++ b/media-sound/sndpeek/files/sndpeek-1.4-ldflags.patch
@@ -0,0 +1,65 @@
+Index: sndpeek-1.4/src/sndpeek/makefile.alsa
+===================================================================
+--- sndpeek-1.4.orig/src/sndpeek/makefile.alsa
++++ sndpeek-1.4/src/sndpeek/makefile.alsa
+@@ -12,7 +12,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CXX) -o $@ $(OBJS) $(LIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+ 	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+Index: sndpeek-1.4/src/sndpeek/makefile.jack
+===================================================================
+--- sndpeek-1.4.orig/src/sndpeek/makefile.jack
++++ sndpeek-1.4/src/sndpeek/makefile.jack
+@@ -11,7 +11,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CXX) -o $@ $(OBJS) $(LIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+ 	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+Index: sndpeek-1.4/src/sndpeek/makefile.oss
+===================================================================
+--- sndpeek-1.4.orig/src/sndpeek/makefile.oss
++++ sndpeek-1.4/src/sndpeek/makefile.oss
+@@ -12,7 +12,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CXX) -o $@ $(OBJS) $(LIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+ 	$(CXX) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+Index: sndpeek-1.4/src/sndpeek/makefile.osx
+===================================================================
+--- sndpeek-1.4.orig/src/sndpeek/makefile.osx
++++ sndpeek-1.4/src/sndpeek/makefile.osx
+@@ -13,7 +13,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CPP) -o $@ $(OBJS) $(LIBS)
++	$(CPP) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+ 	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
+Index: sndpeek-1.4/src/sndpeek/makefile.win32
+===================================================================
+--- sndpeek-1.4.orig/src/sndpeek/makefile.win32
++++ sndpeek-1.4/src/sndpeek/makefile.win32
+@@ -12,7 +12,7 @@ OBJS=chuck_fft.o RtAudio.o Thread.o sndp
+ 	MagFFT.o NormRMS.o MarSignal.o fmatrix.o
+ 
+ sndpeek: $(OBJS)
+-	$(CPP) -o $@ $(OBJS) $(LIBS)
++	$(CPP) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ 
+ Centroid.o:
+ 	$(CC) $(CFLAGS) $(MARSYAS_DIR)$*.cpp
diff --git a/media-sound/sndpeek/metadata.xml b/media-sound/sndpeek/metadata.xml
new file mode 100644
index 000000000000..925b41262c7f
--- /dev/null
+++ b/media-sound/sndpeek/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription lang="en">
+		real-time audio visualization
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/sndpeek/sndpeek-1.4.ebuild b/media-sound/sndpeek/sndpeek-1.4.ebuild
new file mode 100644
index 000000000000..854e6e44670c
--- /dev/null
+++ b/media-sound/sndpeek/sndpeek-1.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="real-time audio visualization"
+HOMEPAGE="http://soundlab.cs.princeton.edu/software/sndpeek/"
+SRC_URI="http://soundlab.cs.princeton.edu/software/${PN}/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack oss"
+
+RDEPEND="media-libs/freeglut
+	virtual/opengl
+	virtual/glu
+	x11-libs/libXmu
+	x11-libs/libX11
+	x11-libs/libXext
+	media-libs/libsndfile
+	jack? ( media-sound/jack-audio-connection-kit )
+	alsa? ( media-libs/alsa-lib )
+	app-eselect/eselect-sndpeek"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="|| ( alsa jack oss )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3-makefile.patch \
+		"${FILESDIR}"/${P}-gcc.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
+}
+
+compile_backend() {
+	backend=$1
+	cd "${S}/src/sndpeek"
+	einfo "Compiling against ${backend}"
+	emake -f "makefile.${backend}" CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) || die "emake failed"
+	mv sndpeek{,-${backend}}
+	emake -f "makefile.${backend}" clean
+	cd -
+}
+
+src_compile() {
+	use alsa && compile_backend alsa
+	use jack && compile_backend jack
+	use oss && compile_backend oss
+}
+
+src_install() {
+	use alsa && dobin src/sndpeek/sndpeek-alsa
+	use jack && dobin src/sndpeek/sndpeek-jack
+	use oss && dobin src/sndpeek/sndpeek-oss
+	dodoc AUTHORS README THANKS TODO VERSIONS
+}
+
+pkg_postinst() {
+	elog "Sndpeek now can use many audio engines, so you can specify audio engine"
+	elog "with sndpeek-{jack,alsa,oss}"
+	elog "Or you can use 'eselect sndpeek' to set the audio engine"
+
+	einfo "Calling eselect sndpeek update..."
+	eselect sndpeek update --if-unset
+}
diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
new file mode 100644
index 000000000000..e945b7274a5f
--- /dev/null
+++ b/media-sound/solfege/Manifest
@@ -0,0 +1,5 @@
+DIST solfege-3.22.2.tar.gz 6890977 SHA256 e46a0960c83e4998d9dcf7bb07b8269e03fc81fab6c4485f8112c5a3e6488fe4 SHA512 7767d5747b324558fb5ebc82767fd592636acbea78d083992ae100a6b288bb3cc233745e9f12c66f5059a8531a85be2ec82aa856d9251206c737a090b1d42a26 WHIRLPOOL d506661fdff385484c63006a0ab1f92ec787d435e0f56d77a4a57e5cb4636995b1fe49eae5fb982731677f0716cb8fa0f09d2c9913a3ee68768d8f4bc0d7fc67
+EBUILD solfege-3.22.2.ebuild 1306 SHA256 5b1f0297b2b55d55b7c85bf3d8ee2bf1c1eaebacc1e8b11eb289e8d05b637cca SHA512 5679b894a4a1b6fefeeafa9bc91b49c43220f0d95d4e52b23b87cf34889e6984e13f0a77903fae4225e9052d1f2c4a79fb397d66a5df439acffcdfed3bca8368 WHIRLPOOL d0502458f3bf590d2da04b5d2e2d18ac175791465dee1af418ac4087fbc8ab86f3c37c471c6e8f82368cbcb87c54bc40169dfd86f9f2d05edc2ae30f2a7dac38
+MISC ChangeLog 2523 SHA256 71c502f28bfcb0735563583907d73559e77b3bbeea48525e9e495f3dae6c7998 SHA512 34bf7a9f113a65259bdfc1dccc19389c0a8f70ec7820af38fafe1d60b00db4d3ff75c869837c9b531bc701fdbf721d8e356c80c5d00147cd0b43d2f62385caca WHIRLPOOL 07c77a10e805b7c15555d13e18f67e7c5ca5de63fba9ea232a1e9b561abc0a056acc9fdfcfafd11ff64413df8ce8cddc28c946db42973fa4f359c0dbe5998a41
+MISC ChangeLog-2015 14840 SHA256 f6e3d2f2f2ea6513fbb5357f59183415da87cac16b367be31e29c0d56367ef4d SHA512 45c1ede044fbcc9259de59f487fbb03acc5e874b2184d8a70184e6044909256bae6665141521a0aae6aed2fc46e47bfc732cf9e36753a2f9aa28a8ed93c0b6f2 WHIRLPOOL 9402b960f67c03cd6f0d46f8af9cd5e581e1591b4e07d2bb0569bcc24f7d72d9ad22df93ad325dd3b8ceffd460c3f3bdc14aa4255c704536bded5179dcca4be5
+MISC metadata.xml 330 SHA256 8e2dcc6fe985d2bab8db99221bc433d25aeb9133268e53078c29853f4f2ea204 SHA512 8b9ec04258e5d3437339d00e9ce5e565b865b7f80230d78bd39cafcea569a4d5f413d0f251899842adbfc7583c77041aaa50e9ee101f2a0496b01393b0740c86 WHIRLPOOL 77c82a8184c97e140ce9ed7096a459acc425ed510ff17039a445d98b0a5d1b7347fdf2ead61fb78712d2e05618f494a99312530f859499997d9f5f127696381f
diff --git a/media-sound/solfege/metadata.xml b/media-sound/solfege/metadata.xml
new file mode 100644
index 000000000000..db2c9b8969ad
--- /dev/null
+++ b/media-sound/solfege/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">solfege</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/solfege/solfege-3.22.2.ebuild b/media-sound/solfege/solfege-3.22.2.ebuild
new file mode 100644
index 000000000000..4b2a288d34e1
--- /dev/null
+++ b/media-sound/solfege/solfege-3.22.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1
+
+DESCRIPTION="GNU Solfege is a program written to help you practice ear training"
+HOMEPAGE="https://www.gnu.org/software/solfege/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="alsa oss"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pygtk-2.12
+	gnome-base/librsvg
+	alsa? ( dev-python/pyalsa )
+	!oss? ( media-sound/timidity++ )"
+DEPEND="${PYTHON_DEPS}
+	dev-lang/swig
+	sys-devel/gettext
+	sys-apps/texinfo
+	virtual/pkgconfig
+	dev-libs/libxslt
+	app-text/txt2man
+	>=app-text/docbook-xsl-stylesheets-1.60"
+
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -e '/^CFLAGS/s:-I/usr/src/linux/include::' \
+		solfege/soundcard/Makefile || die
+}
+
+src_configure() {
+	local xslloc=$( xmlcatalog /etc/xml/catalog http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl | sed 's@file://@@' )
+
+	econf \
+		--enable-docbook-stylesheet=${xslloc} \
+		$(use_enable oss oss-sound)
+}
+
+src_compile() {
+	emake skipmanual=yes
+}
+
+src_install() {
+	emake DESTDIR="${ED}" nopycompile=YES skipmanual=yes install
+	dodoc AUTHORS *hange*og FAQ README
+}
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
new file mode 100644
index 000000000000..6e8586a26d3a
--- /dev/null
+++ b/media-sound/sonata/Manifest
@@ -0,0 +1,6 @@
+AUX sonata-1.6.2.1-mpd18-compat.patch 820 SHA256 c8d470a7b026434bc9a0983ff542396798e8d6ae257aa2c348f05232fd73db76 SHA512 b0d904edbb9d6e92408402d3b25b5e2dad452767d3030c2608335a86dd7242c135b121293a2f73b92a77a260d44806ffec99b309f4b394f558cd5f8ab318ac66 WHIRLPOOL 8000bb61c57efa3b10d461cfd56bdcc734fd091fc469a07b142a6d390cbb13e58b12837e466b833073f6098c513a533cb5e25a8669691d120286c9103c8226f9
+DIST sonata-1.6.2.1.tar.bz2 314333 SHA256 b0fe8ed37e197c2bd0d65441d43690490f2160e0630bc100d6a848950185b85b SHA512 8022b69380714e9c3c685c61d0f1e62be087fc2cbd77a55f32008edea53411f8493d416bd0a446ccb52b4b5603ba9f4a00b655af485d739932dc06af69345c27 WHIRLPOOL 78b427c0dd9e7376801c1ebcebf4ae8f6002605e37aab0370b7fe96d654917310b612457f66e9f880532f816992356fce7b8623ad82eb9bfe345fea7ab55bc36
+EBUILD sonata-1.6.2.1-r1.ebuild 966 SHA256 c443084946740a624fdd09753338c9996848e4d7abe9c0df7cc7c3a1834f8e05 SHA512 e21e1e906562b6a3d23a08ac0ecb2d3e05865a2a8ee931a106ec495c47694176bb78915baf6f3baa9df29beb60f4f36cd491e0e35280d79b0265cdc215ec7198 WHIRLPOOL 6baafb9c9e7769cf42ce1d999e701e98061c7a20c2d897077bfce57754c0d87171328ee53cbbc7de486358830000010dfe71c2898142467128255f58f797be91
+MISC ChangeLog 2746 SHA256 70393874241258e59daf838ce0cef79c356f1393bde3720e81e226cd0213a1ea SHA512 e298fa293bae716fd98fd3660fa51ccfaca035a8d73f329b770219e557753d9a4e06d0d6c31c1307086fa318d8b55af9710765b0048daa70501995a62b91c0a1 WHIRLPOOL 574d49ca7351fa380305c87b3e2e9a263c17b9ddef44151b236cb38e93e4f0f71a7e02cd7e968415564710158a7f2f19a9a119f0e3aa19728794e18ac9aeedec
+MISC ChangeLog-2015 8373 SHA256 4fc99aa6a097156c44799fa7d3b0410af08e6fd8fcc7699e7c0a0a0fb75ef68d SHA512 074387807a464c85c3c641e2eafb34f315c7c7d6cb46c10ae8678e2016204babe66b5cce47082967c834a8b0e01c7f59263bd4a0f1947203775be3c7ebcfb826 WHIRLPOOL 0cd174de0d83534dbdfe9eec81f0f22a5eb64740092cfd2b5d5dad146cecdbf77d86c1d67a23263cdf1e6a2c7e9b54d3952318a30cbb13928246604c6df3af4b
+MISC metadata.xml 615 SHA256 dcd726a70effd35597773285a70613c3f85775fecb3857e2d57c5e74183aa182 SHA512 bec106b2bd1a9ca9f55d833f822b0cd9eb9541989f030e7a6698c3428efe2d99ae7ad88d6ef572a4af4a07c1d1450e1a031842608b10f9891ca9fa40816affa4 WHIRLPOOL 8387cd6057f9cf8d4fb4b4e8fd0d3ef887a052129c8eda631d7d6a5c8ea5b0b133dde02c0522e889783be73ffbaadee1c6748d8195a42f2a5a2c080f5bd11055
diff --git a/media-sound/sonata/files/sonata-1.6.2.1-mpd18-compat.patch b/media-sound/sonata/files/sonata-1.6.2.1-mpd18-compat.patch
new file mode 100644
index 000000000000..8d10b07f4f8f
--- /dev/null
+++ b/media-sound/sonata/files/sonata-1.6.2.1-mpd18-compat.patch
@@ -0,0 +1,19 @@
+2014-06-08  Israel G. Lugo <israel.lugo@lugosys.com>
+
+	Compatibility fix for mpd 0.18.
+
+	* sonata/main.py (Base.update_status): Properly handle missing xfade
+	property.
+
+diff -durNp sonata-1.6.2.1/sonata/main.py sonata-1.6.2.1-mpd0.18/sonata/main.py
+--- sonata-1.6.2.1/sonata/main.py	2009-09-21 22:02:16.000000000 +0100
++++ sonata-1.6.2.1-mpd0.18/sonata/main.py	2014-06-08 15:10:08.586659487 +0100
+@@ -989,7 +989,7 @@ class Base(object):
+ 						self.repeatmenu.set_active(self.status['repeat'] == '1')
+ 					if not self.last_random or self.last_random != self.status['random']:
+ 						self.randommenu.set_active(self.status['random'] == '1')
+-					if self.status['xfade'] == '0':
++					if self.status.get('xfade', '0') == '0':
+ 						self.config.xfade_enabled = False
+ 					else:
+ 						self.config.xfade_enabled = True
diff --git a/media-sound/sonata/metadata.xml b/media-sound/sonata/metadata.xml
new file mode 100644
index 000000000000..6a30df2dc8cb
--- /dev/null
+++ b/media-sound/sonata/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <longdescription>
+    Sonata is a lightweight GTK+ music client for the Music Player Daemon
+    (MPD). It aims to be efficient (no toolbar, main menu, or statusbar),
+    user-friendly, and clean.
+  </longdescription>
+  <use>
+    <flag name="lyrics">Support for lyrics fetching</flag>
+    <flag name="trayicon">Enable support for trayicon</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/sonata/sonata-1.6.2.1-r1.ebuild b/media-sound/sonata/sonata-1.6.2.1-r1.ebuild
new file mode 100644
index 000000000000..8b9887bb4c3f
--- /dev/null
+++ b/media-sound/sonata/sonata-1.6.2.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=true
+inherit distutils-r1
+
+DESCRIPTION="An elegant GTK+ music client for the Music Player Daemon (MPD)"
+HOMEPAGE="http://www.nongnu.org/sonata/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+# now released at https://github.com/multani/sonata/releases
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="dbus lyrics taglib +trayicon"
+
+RDEPEND=">=dev-python/pygtk-2.12
+	|| ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )
+	>=dev-python/python-mpd-0.2.1
+	dbus? ( dev-python/dbus-python )
+	lyrics? ( dev-python/zsi )
+	taglib? ( >=dev-python/tagpy-0.93 )
+	trayicon? ( dev-python/egg-python )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="CHANGELOG README TODO TRANSLATORS"
+PATCHES=( "${FILESDIR}"/${P}-mpd18-compat.patch )
+
+src_install() {
+	distutils-r1_src_install
+	rm -rf "${D}"/usr/share/sonata
+}
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
new file mode 100644
index 000000000000..db05db035dce
--- /dev/null
+++ b/media-sound/sonic-visualiser/Manifest
@@ -0,0 +1,9 @@
+AUX notest.patch 1545 SHA256 e82867f09a9396d890df3fef53f35fe443ee8624fb95e203822cda3f6ee11e60 SHA512 c3e9fbb8f1844d9faa35b318ffebfe6c64672f329ac584a101bf1e3c5736916666e7c100863de7db50f89b8f98b8a2e267e82e4aad457cbbaa875da0322bb0f6 WHIRLPOOL 51796ce1ab7f1add3d404349721121698d4237ad65109e1292bbf3a568720e604c51eab0ef20e9724bf83be9fc1c8116c141ba2e39cc6a02de5e3f5e372d2483
+AUX piper.capnp 19756 SHA256 925234658b06e39ca4f5d13ef7310813366cb4c48bd56a2b3c369d6784d0d7a8 SHA512 c520116c978f8abbc747d3a465c006ec800cf1dd5f8f96f7c5879d88ae81fcc09f3a2640f9212b74f41f5b28269a17f35aac3521be946c66b599419c39a95720 WHIRLPOOL b8bd038322f0f204f5fa785936999250a893eb8b353d08f9b046f60ab275d79839a231c38d9a5c64705fcf40be5fad85dbce26618fb41360d2d5b45dcf3452d9
+DIST sonic-visualiser-2.5.tar.gz 4112133 SHA256 5a66f20bae002876c64bc26d79dcba4f4c96c3c71ae160b5aafb40cfeacecdbe SHA512 ec48456f5b089453ee9e8bdca5449da92b248a9278423b38a63dda4598b0496432337a152d8b296e8c5dcc2b434bc68c8d1dde225e398bf9bee1f4bbb6c8d7e6 WHIRLPOOL 0038c197a731e503c01d4f69b3b1aa6d347df95e84bc4ed75b7cd670bb50eeeb615e1ae9bfb357d6414fbc338fdfce6179635e8390cf835c37f7c5029767df9f
+DIST sonic-visualiser-3.0.2.tar.gz 5123229 SHA256 9ca9c37e1da5e6197bb61e5b05b29544cbf8389523467efbd465527f1dd6d8b3 SHA512 25259df72175e397c63e76dca25f0099139c6569153c1e5750f90bcf5d661f20dd8c02aba53272567e72e661bfc66ec19cb3b3066795f978a6b76c826a5bf825 WHIRLPOOL 15ce603c4d34ffb0783138d7408ab903a3b1d1d776a997bf69c3d1de02f916f4d96e980e15b431450c6177d1d4ba85031b927dc7bdc9577bf6bceba2d3b37635
+EBUILD sonic-visualiser-2.5.ebuild 2319 SHA256 dc64f3cc22920085ff0f2fd82eb0bcbf0da222f892bb86b38e985c65f9334d65 SHA512 1954864a4e49983bdc94300dc1cc090d3e723e43b7e3273237326066cec4eff4ef1e1c6f49b8cf45d276d2c019d96485fd656b22741f82d0c7afb7fa39d37803 WHIRLPOOL 454f265997c8e8326b7440078b5ba6b0e776c7556e8910016fca5698191691f021293ae0dd02039b263f0b92988ec000636b393c3662a6a1e52e3594bf269667
+EBUILD sonic-visualiser-3.0.2.ebuild 2642 SHA256 e078b1c0a42d6685f8586a88608b9f591a77c803e7cd4fb8aa5414d48731a226 SHA512 d25058c13a00475426d09c8c80cdf88c97d4ed0c010e9407e4718ad8aacd1797a1b859fbc783555a6b680b0c23e9c218a2cabe754cb32737728ffb8e8fb3f6d0 WHIRLPOOL d61150c083eeb1576f8338b905a49deaaa0491383d572a77334a233fdbe702321a01ddab10c269b24aec8f507373aa1582d7d6848cb543af732a03ae1e45c89f
+MISC ChangeLog 3011 SHA256 f0cdcc66d9966b829c641988f76c56664881b51900df1c64cc4759a8d405aa9c SHA512 3d92a488a7c8fc92492dd7dc5b98cc09320929a971b526980860aeea577df40b547f8ad3d4b7326a834cd03ba98bd9dd1034e98cfa8e9d311d1302c0e8a2439b WHIRLPOOL e9a1c75c0e6d35375700f400e2e5586445799672863f6086eccd82c80aeb29d5ae8ea77e6c596da917a6d8cd4ba906ccf06a330d24a8d0bafbb2c51a0457d519
+MISC ChangeLog-2015 4695 SHA256 64899cbed2e57a2cd0483aefd935c71e035aed93e4ea04a3175e33a463b38697 SHA512 519adadf71810130b647422b25119f1523d18944ba1fc9464fec7e53f421af79842353b515452d16285b5a4eee3b59a15b6c72e4c274d59af18ff51cbcd42adb WHIRLPOOL 76d22252b3811b53d9a6bac5b331835aa3279079644394216a5ac875514584b112d3a025a16905096b3a332736bd2c7bf8b77aee5b555bc25f56faade6e1a676
+MISC metadata.xml 353 SHA256 116f65c63f5df61cc84582152ff028ddf5646fb86ff7eaab7b15a7ec966950cc SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f WHIRLPOOL d5b6bf389deed51220851c84ec39468e3779180da3db163cfad65fe2a196d8890bc298b00a31bd4c00d30019ba1d387d532521aeec15eadb4c250abbab5ecff3
diff --git a/media-sound/sonic-visualiser/files/notest.patch b/media-sound/sonic-visualiser/files/notest.patch
new file mode 100644
index 000000000000..59b4d04f9336
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/notest.patch
@@ -0,0 +1,33 @@
+Index: sonic-visualiser-3.0.2/test-svcore-base.pro
+===================================================================
+--- sonic-visualiser-3.0.2.orig/test-svcore-base.pro
++++ sonic-visualiser-3.0.2/test-svcore-base.pro
+@@ -28,6 +28,3 @@ include(svcore/base/test/files.pri)
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) }
+ 
+-!win32* {
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
+Index: sonic-visualiser-3.0.2/test-svcore-data-fileio.pro
+===================================================================
+--- sonic-visualiser-3.0.2.orig/test-svcore-data-fileio.pro
++++ sonic-visualiser-3.0.2/test-svcore-data-fileio.pro
+@@ -28,6 +28,3 @@ include(svcore/data/fileio/test/files.pr
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) }
+ 
+-!win32* {
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
+Index: sonic-visualiser-3.0.2/test-svcore-data-model.pro
+===================================================================
+--- sonic-visualiser-3.0.2.orig/test-svcore-data-model.pro
++++ sonic-visualiser-3.0.2/test-svcore-data-model.pro
+@@ -28,6 +28,3 @@ include(svcore/data/model/test/files.pri
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) }
+ 
+-!win32* {
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
diff --git a/media-sound/sonic-visualiser/files/piper.capnp b/media-sound/sonic-visualiser/files/piper.capnp
new file mode 100644
index 000000000000..6e99ff6849d2
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/piper.capnp
@@ -0,0 +1,364 @@
+
+# Piper audio feature extraction: schema for low-level operation
+#
+# This file is formatted to 130 characters width, in order to fit the
+# comments next to the schema definitions.
+#
+# Copyright (c) 2015-2017 Queen Mary, University of London, provided
+# under a BSD-style licence. See the file COPYING for details.
+
+@0xc4b1c6c44c999206;
+
+using Cxx = import "/capnp/c++.capnp";
+$Cxx.namespace("piper");
+
+struct Basic {
+    # Basic metadata common to many Piper structures.
+
+    identifier         @0  :Text;                 # A computer-readable string. Must match the regex /^[a-zA-Z0-9_-]+$/.
+    name               @1  :Text;                 # A short human-readable name or label. Must be present.
+    description        @2  :Text;                 # An optional human-readable descriptive text that may accompany the name.
+}
+
+struct ParameterDescriptor {
+    # Properties of an adjustable parameter. A parameter's value is just a single
+    # float, but the descriptor explains how to interpret and present that value.
+    # A Piper feature extractor has a static list of parameters. The properties of
+    # a given parameter never change, in contrast to output descriptors, which
+    # may have different properties depending on the configuration of the extractor.
+
+    basic              @0  :Basic;                # Basic metadata about the parameter.
+    unit               @1  :Text;                 # Human-recognisable unit of the parameter (e.g. Hz). May be left empty.
+    minValue           @2  :Float32     = 0.0;    # Minimum value. Must be provided.
+    maxValue           @3  :Float32     = 0.0;    # Maximum value. Must be provided.
+    defaultValue       @4  :Float32     = 0.0;    # Default if the parameter is not set to anything else. Must be provided.
+    isQuantized        @5  :Bool        = false;  # True if parameter values are quantized to a particular resolution.
+    quantizeStep       @6  :Float32     = 0.0;    # Quantization resolution, if isQuantized.
+    valueNames         @7  :List(Text)  = [];     # Optional human-readable labels for the values, if isQuantized.
+}
+
+enum SampleType {
+    # How returned features are spaced on the input timeline.
+
+    oneSamplePerStep   @0;                        # Each process input returns a feature aligned with that input's timestamp.
+    fixedSampleRate    @1;                        # Features are equally spaced at a given sample rate.
+    variableSampleRate @2;                        # Features have their own individual timestamps.
+}
+
+struct StaticOutputDescriptor {
+
+    # Properties of an output, that is, a single stream of features
+    # produced in response to process and finish requests. A feature
+    # extractor may have any number of outputs, and it always
+    # calculates and returns features from all of them when
+    # processing; this is useful in cases where more than one feature
+    # can be easily calculated using a single method.
+    # 
+    # This structure contains the properties of an output that are
+    # static, i.e. that do not depend on the parameter values provided
+    # at configuration, excluding the Basic struct parameters like id
+    # and description.  The Basic struct properties are not included
+    # for historical reasons: they were already referenced separately
+    # in the OutputDescriptor and ExtractorStaticData before this
+    # struct was introduced.
+    
+    typeURI            @0  :Text;                 # URI indicating the sort of feature that this output returns (see docs).
+}
+
+struct ConfiguredOutputDescriptor {
+    # Properties of an output, that is, a single stream of features produced
+    # in response to process and finish requests. A feature extractor may
+    # have any number of outputs, and it always calculates and returns features
+    # from all of them when processing; this is useful in cases where more
+    # than one feature can be easily calculated using a single method.
+    # This structure contains the properties of an output that are not static,
+    # i.e. that may depend on the parameter values provided at configuration.
+
+    unit               @0  :Text;                 # Human-recognisable unit of the bin values in output features. May be empty.
+    hasFixedBinCount   @1  :Bool        = false;  # True if this output has an equal number of values in each returned feature.
+    binCount           @2  :Int32       = 0;      # Number of values per feature for this output, if hasFixedBinCount.
+    binNames           @3  :List(Text)  = [];     # Optional human-readable labels for the value bins, if hasFixedBinCount.
+    hasKnownExtents    @4  :Bool        = false;  # True if all feature values fall within the same fixed min/max range.
+    minValue           @5  :Float32     = 0.0;    # Minimum value in range for any value from this output, if hasKnownExtents.
+    maxValue           @6  :Float32     = 0.0;    # Maximum value in range for any value from this output, if hasKnownExtents.
+    isQuantized        @7  :Bool        = false;  # True if feature values are quantized to a particular resolution.
+    quantizeStep       @8  :Float32     = 0.0;    # Quantization resolution, if isQuantized.
+    sampleType         @9  :SampleType;           # How returned features from this output are spaced on the input timeline.
+    sampleRate         @10 :Float32     = 0.0;    # Sample rate (features per second) if sampleType == fixedSampleRate.
+    hasDuration        @11 :Bool        = false;  # True if features returned from this output will have a duration.
+}
+
+struct OutputDescriptor {
+    # All the properties of an output, both static (the basic metadata and static
+    # descriptor) and potentially dependent on configuration parameters (the
+    # configured descriptor).
+
+    basic              @0  :Basic;                # Basic metadata about the output.
+    configured         @1  :ConfiguredOutputDescriptor;    # Properties of the output that may depend on configuration parameters.
+    static             @2  :StaticOutputDescriptor;        # Properties (other than Basic) that do not depend on parameters.
+}
+
+enum InputDomain {
+    # Whether a feature extractor requires time-domain audio input (i.e.
+    # "normal" or "unprocessed" audio samples) or frequency-domain input
+    # (i.e. resulting from windowed, usually overlapping, short-time
+    # Fourier transforms).
+
+    timeDomain         @0;                        # The plugin requires time-domain audio samples as input.
+    frequencyDomain    @1;                        # The plugin requires input to have been pre-processed using windowed STFTs.
+}
+
+struct ExtractorStaticData {
+    # Static properties of a feature extractor. That is, metadata about the
+    # extractor that are the same regardless of how you configure or run it.
+
+    key                @0  :Text;                 # String that "globally" identifies the extractor, used to load it (see docs).
+    basic              @1  :Basic;                # Basic metadata about the extractor.
+    maker              @2  :Text;                 # Human-readable text naming the author or vendor of the extractor.
+    rights             @3  :Text;                 # Human-readable summary of copyright and/or licensing terms for the extractor.
+    version            @4  :Int32;                # Version number of extractor; must increase if new algorithm changes results.
+    category           @5  :List(Text);           # List of general->specific category labels for this extractor (see docs).
+    minChannelCount    @6  :Int32;                # Minimum number of input channels of audio this extractor can accept.
+    maxChannelCount    @7  :Int32;                # Maximum number of input channels of audio this extractor can accept.
+    parameters         @8  :List(ParameterDescriptor);    # List of configurable parameter properties for the feature extractor.
+    programs           @9  :List(Text);           # List of predefined programs. For backward-compatibility, not recommended.
+    inputDomain        @10 :InputDomain;          # Whether the extractor requires time-domain or frequency-domain input audio.
+    basicOutputInfo    @11 :List(Basic);          # Basic metadata about all of the outputs of the extractor.
+
+    struct SOPair {
+        # A mapping between output identifier and static descriptor for
+	# that output.
+	
+        output         @0  :Text;                 # Output id, matching the output's descriptor's basic identifier.
+        static         @1  :StaticOutputDescriptor;
+    }
+
+    staticOutputInfo   @12 :List(SOPair);         # Static descriptors for all outputs that have any static metadata.
+}
+
+struct RealTime {
+    # Time structure. When used as a timestamp, this is relative to "start
+    # of audio".
+    
+    sec                @0  :Int32       = 0;      # Number of seconds.
+    nsec               @1  :Int32       = 0;      # Number of nanoseconds. Must have same sign as sec unless sec == 0.
+}
+
+struct ProcessInput {
+    # Audio and timing input data provided to a process request.
+
+    inputBuffers       @0  :List(List(Float32));  # A single block of audio data (time or frequency domain) for each channel.
+    timestamp          @1  :RealTime;             # Time of start of block (time-domain) or "centre" of it (frequency-domain).
+}
+
+struct Feature {
+    # A single feature calculated and returned from a process or finish request.
+
+    hasTimestamp       @0  :Bool        = false;  # True if feature has a timestamp. Must be true for a variableSampleRate output.
+    timestamp          @1  :RealTime;             # Timestamp of feature, if hasTimestamp.
+    hasDuration        @2  :Bool        = false;  # True if feature has a duration. Must be true if output's hasDuration is true.
+    duration           @3  :RealTime;             # Duration of feature, if hasDuration.
+    label              @4  :Text;                 # Optional human-readable text attached to feature.
+    featureValues      @5  :List(Float32) = [];   # The feature values themselves (of size binCount, if output hasFixedBinCount).
+}
+
+struct FeatureSet {
+    # The set of all features, across all outputs, calculated and returned from
+    # a single process or finish request.
+
+    struct FSPair {
+        # A mapping between output identifier and ordered list of features for
+	# that output.
+	
+        output         @0  :Text;                 # Output id, matching the output's descriptor's basic identifier.
+        features       @1  :List(Feature) = [];   # Features calculated for that output during the current request, in time order.
+    }
+    
+    featurePairs       @0  :List(FSPair);         # The feature lists for all outputs for which any features have been calculated.
+}
+
+struct Framing {
+    # Determines how audio should be split up into individual buffers for input.
+    # If the feature extractor accepts frequency-domain input, then this
+    # applies prior to the STFT transform.
+    #
+    # These values are sometimes mandatory, but in other contexts one or both may
+    # be set to zero to mean "don't care". See documentation for structures that
+    # include a framing field for details.
+    
+    blockSize          @0  :Int32;                # Number of time-domain audio samples per buffer (on each channel).
+    stepSize           @1  :Int32;                # Number of samples to advance between buffers: equals blockSize for no overlap.
+}
+
+struct Configuration {
+    # Bundle of parameter values and other configuration data for a feature-
+    # extraction procedure.
+
+    struct PVPair {
+        # A mapping between parameter identifier and value.
+	
+        parameter      @0  :Text;                 # Parameter id, matching the parameter's descriptor's basic identifier.
+        value          @1  :Float32;              # Value to set parameter to (within constraints given in parameter descriptor).
+    }
+    
+    parameterValues    @0  :List(PVPair);         # Values for all parameters, or at least any that are to change from defaults.
+    currentProgram     @1  :Text;                 # Selection of predefined program. For backward-compatibility, not recommended. 
+    channelCount       @2  :Int32;                # Number of audio channels of input.
+    framing            @3  :Framing;              # Step and block size for framing the input.
+}
+
+enum AdapterFlag {
+    # Flags that may be used when requesting a server to load a feature
+    # extractor, to ask the server to do some of the work of framing and input
+    # conversion instead of leaving it to the client side. These affect the
+    # apparent behaviour of the loaded extractor.
+
+    adaptInputDomain   @0;                        # Input-domain conversion, so the extractor always expects time-domain input.
+    adaptChannelCount  @1;                        # Channel mixing or duplication, so any number of input channels is acceptable. 
+    adaptBufferSize    @2;                        # Framing, so the extractor accepts any blockSize of non-overlapping buffers.
+}
+
+const adaptAllSafe :List(AdapterFlag) =
+    [ adaptInputDomain, adaptChannelCount ];
+    # The set of adapter flags that can always be applied, leaving results unchanged.
+
+const adaptAll :List(AdapterFlag) =
+    [ adaptInputDomain, adaptChannelCount, adaptBufferSize ];
+    # The set of adapter flags that may cause "equivalent" results to be returned (see documentation).
+
+struct ListRequest {
+    # Request a server to provide a list of available feature extractors.
+    
+    from               @0  :List(Text);           # If non-empty, provide only extractors found in the given list of "libraries".
+}
+
+struct ListResponse {
+    # Response to a successful list request.
+    
+    available          @0  :List(ExtractorStaticData);    # List of static data about available feature extractors.
+}
+
+struct LoadRequest {
+    # Request a server to load a feature extractor and return a handle to it.
+    
+    key                @0  :Text;                 # Key as found in the extractor's static data structure.
+    inputSampleRate    @1  :Float32;              # Sample rate for input audio. Properties of the extractor may depend on this.
+    adapterFlags       @2  :List(AdapterFlag);    # Set of optional flags to make any framing and input conversion requests.
+}
+
+struct LoadResponse {
+    # Response to a successful load request.
+    
+    handle             @0  :Int32;                # Handle to be used to refer to the loaded feature extractor in future requests.
+    staticData         @1  :ExtractorStaticData;  # Static data about this feature extractor, identical to that in list response.
+    defaultConfiguration @2  :Configuration;      # Extractor's default parameter values and preferred input framing.
+}
+
+struct ConfigurationRequest {
+    # Request a server to configure a loaded feature extractor and prepare
+    # it for use. This request must be carried out on a feature extractor
+    # before any process request can be made.
+    
+    handle             @0  :Int32;                # Handle as returned in the load response from the loading of this extractor.
+    configuration      @1  :Configuration;        # Bundle of parameter values to set, and client's preferred input framing.
+}
+
+struct ConfigurationResponse {
+    # Response to a successful configuration request.
+
+    handle             @0  :Int32;                # Handle of extractor, as passed in the configuration request.
+    outputs            @1  :List(OutputDescriptor);       # Full set of properties of all outputs following configuration.
+    framing            @2  :Framing;              # Input framing that must be used for subsequent process requests.
+}
+
+struct ProcessRequest {
+    # Request a server to process a buffer of audio using a loaded and
+    # configured feature extractor.
+
+    handle             @0  :Int32;                # Handle as returned in the load response from the loading of this extractor.
+    processInput       @1  :ProcessInput;         # Audio in the input domain, with framing as in the configuration response.
+}
+
+struct ProcessResponse {
+    # Response to a successful process request.
+
+    handle             @0  :Int32;                # Handle of extractor, as passed in the process request.
+    features           @1  :FeatureSet;           # All features across all outputs calculated during this process request.
+}
+
+struct FinishRequest {
+    # Request a server to finish processing and unload a loaded feature
+    # extractor. This request may be made at any time -- the extractor does
+    # not have to have been configured or used. The extractor handle cannot
+    # be used again with this server afterwards.
+
+    handle             @0  :Int32;                # Handle as returned in the load response from the loading of this extractor.
+}
+
+struct FinishResponse {
+    # Response to a successful finish request.
+
+    handle             @0  :Int32;                # Handle of extractor, as passed in the finish request. May not be used again.
+    features           @1  :FeatureSet;           # Features the extractor has calculated now that it knows all input has ended.
+}
+
+struct Error {
+    # Response to any request that fails.
+
+    code               @0  :Int32;                # Error code. 
+    message            @1  :Text;                 # Error message.
+}
+
+struct RpcRequest {
+    # Request bundle for use when using Cap'n Proto serialisation without
+    # Cap'n Proto RPC layer. For Cap'n Proto RPC, see piper.rpc.capnp.
+
+    id :union {
+        # Identifier used solely to associate a response packet with its
+	# originating request. Server does not examine the contents of this,
+	# it just copies the request id structure into the response.
+	
+        number         @0  :Int32;
+        tag            @1  :Text;
+        none           @2  :Void;
+    }
+    
+    request :union {
+        # For more details, see the documentation for the individual
+	# request structures.
+	
+	list           @3  :ListRequest;          # Provide a list of available feature extractors.
+	load           @4  :LoadRequest;          # Load a feature extractor and return a handle to it.
+	configure      @5  :ConfigurationRequest; # Configure a loaded feature extractor, set parameters, and prepare it for use.
+	process        @6  :ProcessRequest;       # Process a single fixed-size buffer of audio and return calculated features.
+	finish         @7  :FinishRequest;        # Get any remaining features and unload the extractor.
+    }
+}
+
+struct RpcResponse {
+    # Response bundle for use when using Cap'n Proto serialisation without
+    # Cap'n Proto RPC layer. For Cap'n Proto RPC, see piper.rpc.capnp.
+
+    id :union {
+        # Identifier used solely to associate a response packet with its
+	# originating request. Server does not examine the contents of this,
+	# it just copies the request id structure into the response.
+	
+        number         @0  :Int32;
+        tag            @1  :Text;
+        none           @2  :Void;
+    }
+
+    response :union {
+        # For more details, see the documentation for the individual
+	# response structures.
+	
+        error          @3  :Error;                # The request (of whatever type) failed.
+	list           @4  :ListResponse;         # List succeeded: here is static data about the requested extractors.
+	load           @5  :LoadResponse;         # Load succeeded: here is a handle for the loaded extractor.
+	configure      @6  :ConfigurationResponse;# Configure succeeded: ready to process, here are values such as block size.
+	process        @7  :ProcessResponse;      # Process succeeded: here are all features calculated from this input block.
+	finish         @8  :FinishResponse;       # Finish succeeded: extractor unloaded, here are all remaining features.
+    }
+}
+
diff --git a/media-sound/sonic-visualiser/metadata.xml b/media-sound/sonic-visualiser/metadata.xml
new file mode 100644
index 000000000000..09c4d45f4670
--- /dev/null
+++ b/media-sound/sonic-visualiser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <use>
+    <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild
new file mode 100644
index 000000000000..b433f5baa1c5
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils qmake-utils autotools fdo-mime
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="http://www.sonicvisualiser.org/"
+SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/1675/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="id3tag jack mad ogg osc +portaudio pulseaudio"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtxml:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	dev-qt/qttest:5
+	media-libs/libsndfile
+	media-libs/libsamplerate
+	app-arch/bzip2
+	>=media-libs/dssi-0.9.1
+	media-libs/liblrdf
+	media-libs/ladspa-sdk
+	media-libs/speex
+	>=media-libs/vamp-plugin-sdk-2.0
+	media-libs/rubberband
+	dev-libs/sord
+	dev-libs/serd
+	sci-libs/fftw:3.0
+	osc? ( media-libs/liblo )
+	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	mad? ( media-libs/libmad )
+	id3tag? ( media-libs/libid3tag )
+	ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( jack pulseaudio portaudio )"
+
+sv_disable_opt() {
+	einfo "Disabling $1"
+	for i in . svapp svcore svgui ; do
+		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
+	done
+}
+
+src_prepare() {
+	use id3tag || sv_disable_opt id3tag
+	use jack || sv_disable_opt jack
+	use mad || sv_disable_opt mad
+	use ogg || sv_disable_opt fishsound
+	use ogg || sv_disable_opt oggz
+	use osc || sv_disable_opt liblo
+	use portaudio || sv_disable_opt portaudio
+	use pulseaudio || sv_disable_opt libpulse
+
+	eautoreconf
+}
+
+src_configure() {
+	export QMAKE="$(qt5_get_bindir)"/qmake
+	econf
+	eqmake5 -r sonic-visualiser.pro
+}
+
+src_compile() {
+	# de parallelize a bit otherwise it fails...
+	emake sub-dataquay-lib-pro
+	emake sub-svcore
+	emake sub-svgui
+	emake sub-svapp
+	emake sub-sv-pro
+}
+
+src_test() {
+	emake sub-svcore-base-test
+	emake sub-svcore-data-fileio-test
+}
+
+src_install() {
+	cd ${PN}
+	dobin ${PN}
+	dodoc README*
+	#install samples
+	insinto /usr/share/${PN}/samples
+	doins samples/*
+	# desktop entry
+	doicon icons/sv-icon.svg
+	domenu *.desktop
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
new file mode 100644
index 000000000000..b15eff6a3675
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qmake-utils autotools fdo-mime
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="http://www.sonicvisualiser.org/"
+SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2222/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="id3tag jack mad ogg osc +portaudio pulseaudio"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtxml:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	media-libs/libsndfile
+	media-libs/libsamplerate
+	app-arch/bzip2
+	>=media-libs/dssi-0.9.1
+	media-libs/liblrdf
+	media-libs/ladspa-sdk
+	media-libs/speex
+	>=media-libs/vamp-plugin-sdk-2.0
+	media-libs/rubberband
+	dev-libs/sord
+	dev-libs/serd
+	sci-libs/fftw:3.0
+	>=dev-libs/capnproto-0.6:=
+	osc? ( media-libs/liblo )
+	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	mad? ( media-libs/libmad )
+	id3tag? ( media-libs/libid3tag )
+	ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( jack pulseaudio portaudio )"
+
+sv_disable_opt() {
+	einfo "Disabling $1"
+	for i in . svapp svcore svgui ; do
+		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/notest.patch"
+
+	use id3tag || sv_disable_opt id3tag
+	use jack || sv_disable_opt jack
+	use mad || sv_disable_opt mad
+	use ogg || sv_disable_opt fishsound
+	use ogg || sv_disable_opt oggz
+	use osc || sv_disable_opt liblo
+	use portaudio || sv_disable_opt portaudio
+	use pulseaudio || sv_disable_opt libpulse
+
+	eautoreconf
+
+	# Those need to be regenerated as they must match current capnproto version
+	einfo "Regenerating piper capnproto files"
+	rm -f piper-cpp/vamp-capnp/piper.capnp.* || die
+	mkdir -p piper/capnp || die
+	cp "${FILESDIR}/piper.capnp" piper/capnp/ || die
+	cd piper-cpp
+	emake vamp-capnp/piper.capnp.h
+}
+
+src_configure() {
+	export QMAKE="$(qt5_get_bindir)"/qmake
+	econf
+	eqmake5 -r sonic-visualiser.pro
+}
+
+src_test() {
+	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model ; do
+		einfo "Running ${i}"
+		./${i} || die
+	done
+}
+
+src_install() {
+	dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
+	dodoc README*
+	#install samples
+	insinto /usr/share/${PN}/samples
+	doins samples/*
+	# desktop entry
+	doicon icons/sv-icon.svg
+	domenu *.desktop
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/media-sound/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest
new file mode 100644
index 000000000000..662a2a6245c5
--- /dev/null
+++ b/media-sound/sooperlooper/Manifest
@@ -0,0 +1,8 @@
+AUX sooperlooper-1.7.3-libsigc26.patch 3433 SHA256 4781ae65b1abd775152d3ae1edf5c4ce7074c5545827d618bd616f72ea67052d SHA512 1510cca7f336a181da752019f7572fceaa21c78317eb135f31ceddc4ea8d677ccdb11c1f36ded13f4313df89ffdde644b6b68be049a6efc98f50f22c82d03553 WHIRLPOOL 4272681a5e3bce4cf8413e5f0395526bf24de01c1f4aad2dad9bcef0efb68b2e68eb94631830992e03f673e988524c209668bc1f4da5d538cc1fcc742d56abeb
+AUX sooperlooper-1.7.3-wx3.0.patch 8149 SHA256 12543f6808c365457f264f9df91527180053c7c0834dcd832b4058453550124d SHA512 93e3630f2a7f839b282b04cd35cdfee025f91bd24b5e715c668ef0f63a675c1c57f53aaa1ead0d27c73a9a2323160217fd9d62c25a5da27c5ed361f527880381 WHIRLPOOL d731d70ac5033c03984b2df3d2ccebe7ea5055f54c3bf203fd79a2cb1f5edc2724f17897a74ac8e23ae2124d881678b223befef9181e4a3d4a66db5de82f3478
+DIST sooperlooper-1.6.5-m4.tar.bz2 1463 SHA256 ee8e3084c3d3d4db29f3d7b4dde0d260b9dfb72be8c9362c7fd711fb7784e0bb SHA512 01b4405dcd91e617c8dafb9fcfab99507d0a9637d9b0eec84276c348968e31159b68ce5c8b7f900ab8a830f2b5c91b798146d5272d006a2b866f149e485f228d WHIRLPOOL 8faddc39687193c643265c52ab2930f98094f4d2544e7d1e1005d5acffa00d6577d95484b51919aea4d810320ebef362ce9a9ab98ac3bc41aa0441a9666a4abc
+DIST sooperlooper-1.7.3.tar.gz 732406 SHA256 7a7dbdedb5dab28fb1f98ba5827d88df4c7327909ab87f6def167517786f4f58 SHA512 cbc9f6b3e4cafc6f18ddb2e2415d2bac274c8cc578b5dadc6ad878b1bed34e514208bc990c3a7dab0106cbf34ad16be12846851e446d724d77386e70d975e14b WHIRLPOOL 97df9fa8a8a57f4a1cf6929dd68628f72c12e755e9676f69062613456e7c01af0f83a11b01af8e14cd81740e09b26c23943af37f37c164fc61dd2adf4d167e08
+EBUILD sooperlooper-1.7.3-r1.ebuild 1363 SHA256 294739a593536de94f54782acc055176a45d8b68864f9eda2b2466e2fff61cbc SHA512 e2412107dd3b1b8cc1366dcbe8a3299b0db81a5931d53a9ccff70df70c8d24631e80d640f4fc8c9f5e571e3fd13f03a3a837853262a10027b7b5a96b16268412 WHIRLPOOL e40cc522109d9fa4bc2c3bad8c970b3fc61f599224e5a296728523900362fe5c94e8d1210e0da40f18390219c5323a39807243e7955d9170c877d6caa13af724
+MISC ChangeLog 3354 SHA256 b9bafa9c010649ca8fe261c9ce26a2ed301dd32178802f5b29803c88e3cd0cfa SHA512 f487696455d08708f81c82c27b03c8b7bf9c0eb7d3705c277f442e47df168ce65411ede06c1736966264332155598595124f169261e55a520ba35867ba7213ed WHIRLPOOL 5557a17ab1392bd99323ec9f762dd9cd9260119f87da54cef98c7dee22477799f42fcf3cc2e6ac756ca3f8df7b5695c64bc5fdf4e0dd39194ac5ee82ee4df874
+MISC ChangeLog-2015 4268 SHA256 dd7839f255d5b1a3beef0e974ea471191aae9d59cdee0d1d3489ee165950f5f9 SHA512 113a99cdea8dba360c848e346c542b9328fcfdb1e465d07fa5b73fdb5666aca1b526d471ef36583d78906219904a2b03799a89be60f23728cd85191f5a752644 WHIRLPOOL f973298bb58b6a1ff321bf1d69468f41cbd5dd14587e42b34f32495ccc8e51facf49af9112a4f29bfa5c1b0f943c19bdf4c246feef5b8a85aaa139ef67e79d65
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc26.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc26.patch
new file mode 100644
index 000000000000..51ac10c33789
--- /dev/null
+++ b/media-sound/sooperlooper/files/sooperlooper-1.7.3-libsigc26.patch
@@ -0,0 +1,96 @@
+diff -ur a/sooperlooper-1.7.3/src/control_osc.hpp b/sooperlooper-1.7.3/src/control_osc.hpp
+--- a/sooperlooper-1.7.3/src/control_osc.hpp	2013-10-18 18:37:39.000000000 +0300
++++ b/sooperlooper-1.7.3/src/control_osc.hpp	2015-12-05 01:40:01.848107565 +0200
+@@ -27,7 +27,7 @@
+ #include <list>
+ #include <utility>
+ 
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ 
+ #include "event.hpp"
+ #include "event_nonrt.hpp"
+diff -ur a/sooperlooper-1.7.3/src/gui/app_frame.hpp b/sooperlooper-1.7.3/src/gui/app_frame.hpp
+--- a/sooperlooper-1.7.3/src/gui/app_frame.hpp	2014-02-03 18:52:15.000000000 +0200
++++ b/sooperlooper-1.7.3/src/gui/app_frame.hpp	2015-12-05 01:40:01.844774250 +0200
+@@ -26,7 +26,7 @@
+ #include <string>
+ #include <vector>
+ 
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ #include <sigc++/signal.h>
+ #include <sigc++/connection.h>
+ 
+diff -ur a/sooperlooper-1.7.3/src/gui/config_panel.hpp b/sooperlooper-1.7.3/src/gui/config_panel.hpp
+--- a/sooperlooper-1.7.3/src/gui/config_panel.hpp	2013-10-18 18:37:39.000000000 +0300
++++ b/sooperlooper-1.7.3/src/gui/config_panel.hpp	2015-12-05 01:40:01.841440935 +0200
+@@ -26,7 +26,7 @@
+ 
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ 
+ class wxListCtrl;
+ class wxSpinCtrl;
+diff -ur a/sooperlooper-1.7.3/src/gui/keys_panel.hpp b/sooperlooper-1.7.3/src/gui/keys_panel.hpp
+--- a/sooperlooper-1.7.3/src/gui/keys_panel.hpp	2013-10-18 18:37:39.000000000 +0300
++++ b/sooperlooper-1.7.3/src/gui/keys_panel.hpp	2015-12-05 01:40:01.838107619 +0200
+@@ -26,7 +26,7 @@
+ 
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ 
+ class wxListCtrl;
+ 
+diff -ur a/sooperlooper-1.7.3/src/gui/latency_panel.hpp b/sooperlooper-1.7.3/src/gui/latency_panel.hpp
+--- a/sooperlooper-1.7.3/src/gui/latency_panel.hpp	2013-10-18 18:37:39.000000000 +0300
++++ b/sooperlooper-1.7.3/src/gui/latency_panel.hpp	2015-12-05 01:40:01.834774304 +0200
+@@ -26,7 +26,7 @@
+ 
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ 
+ class wxListCtrl;
+ 
+diff -ur a/sooperlooper-1.7.3/src/gui/main_panel.hpp b/sooperlooper-1.7.3/src/gui/main_panel.hpp
+--- a/sooperlooper-1.7.3/src/gui/main_panel.hpp	2014-02-04 18:39:55.000000000 +0200
++++ b/sooperlooper-1.7.3/src/gui/main_panel.hpp	2015-12-05 01:40:01.831440989 +0200
+@@ -26,7 +26,7 @@
+ #include <string>
+ #include <vector>
+ 
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ #include <sigc++/signal.h>
+ #include <sigc++/connection.h>
+ 
+diff -ur a/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp b/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp
+--- a/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp	2013-10-18 18:37:39.000000000 +0300
++++ b/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp	2015-12-05 01:40:01.828107674 +0200
+@@ -26,7 +26,7 @@
+ 
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ #include <list>
+ 
+ #include <midi_bind.hpp>
+diff -ur a/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp b/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp
+--- a/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp	2013-10-18 18:37:39.000000000 +0300
++++ b/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp	2015-12-05 01:40:01.824774358 +0200
+@@ -26,7 +26,7 @@
+ 
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ 
+ class wxListCtrl;
+ class wxSpinCtrl;
\ No newline at end of file
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch b/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch
new file mode 100644
index 000000000000..fee40e8f98be
--- /dev/null
+++ b/media-sound/sooperlooper/files/sooperlooper-1.7.3-wx3.0.patch
@@ -0,0 +1,177 @@
+Author: Jaromír Mikeš <mira.mikes@seznam.cz>, Olly Betts <olly@survex.com>
+Description: build against wx 3.0.
+Forwarded: yes
+
+Index: sooperlooper/src/gui/main_panel.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/main_panel.cpp
++++ sooperlooper/src/gui/main_panel.cpp
+@@ -448,7 +448,7 @@ MainPanel::init_loopers (int count)
+ 		while (count < (int)_looper_panels.size()) {
+ 			looperpan = _looper_panels.back();
+ 			_looper_panels.pop_back();
+-			_main_sizer->Remove(looperpan);
++			_main_sizer->Detach(looperpan);
+ 			looperpan->Destroy();
+ 		}
+ 	}
+@@ -1277,7 +1277,7 @@ void MainPanel::misc_action (bool releas
+ 		}
+ 
+ 
+-		wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"),  wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
++		wxString filename = do_file_selector (wxT("Choose file to save loop"), wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"),  wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
+ 		
+ 		if ( !filename.empty() )
+ 		{
+@@ -1296,7 +1296,7 @@ void MainPanel::misc_action (bool releas
+ 			index = 0;
+ 		}
+ 
+-		wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
++		wxString filename = do_file_selector (wxT("Choose file to open"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
+ 		
+ 		if ( !filename.empty() )
+ 		{
+@@ -1408,7 +1408,7 @@ void MainPanel::set_curr_loop (int index
+ 
+ void MainPanel::do_load_session ()
+ {
+-	wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
++	wxString filename = do_file_selector (wxT("Choose session to load"), wxT("*.slsess"), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
+ 	
+ 	if ( !filename.empty() )
+ 	{
+@@ -1419,7 +1419,7 @@ void MainPanel::do_load_session ()
+ 
+ void MainPanel::do_save_session (bool write_audio)
+ {
+-	wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
++	wxString filename = do_file_selector (wxT("Choose file to save session"), wxT("slsess"), wxT("*.slsess"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
+ 	
+ 	if ( !filename.empty() )
+ 	{
+Index: sooperlooper/src/gui/pix_button.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/pix_button.cpp
++++ sooperlooper/src/gui/pix_button.cpp
+@@ -250,7 +250,7 @@ PixButton::OnMouseEvents (wxMouseEvent &
+ 		pt.x += bounds.x;
+ 		pt.y += bounds.y;
+ 
+-		if (bounds.Inside(pt)) {
++		if (bounds.Contains(pt)) {
+ 			clicked (get_mouse_button(ev)); // emit
+ 
+ 			if (ev.MiddleUp() && ev.ControlDown()) {
+Index: sooperlooper/src/gui/looper_panel.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/looper_panel.cpp
++++ sooperlooper/src/gui/looper_panel.cpp
+@@ -1428,7 +1428,7 @@ LooperPanel::clicked_events (int button,
+ 	if (cmd == wxT("save"))
+ 	{
+ 		wxString filename = _mainpanel->do_file_selector (wxT("Choose file to save loop"),
+-											      wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"),  wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
++											      wxT("wav"), wxT("WAVE files (*.wav)|*.wav;*.WAV;*.Wav"),  wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
+ 		
+ 		if ( !filename.empty() )
+ 		{
+@@ -1442,7 +1442,7 @@ LooperPanel::clicked_events (int button,
+ 	}
+ 	else if (cmd == wxT("load"))
+ 	{
+-		wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxOPEN|wxCHANGE_DIR);
++		wxString filename = _mainpanel->do_file_selector(wxT("Choose file to open"), wxT(""), wxT("Audio files (*.wav,*.aif)|*.wav;*.WAV;*.Wav;*.aif;*.aiff;*.AIF;*.AIFF|All files (*.*)|*.*"), wxFD_OPEN|wxFD_CHANGE_DIR);
+ 		
+ 		if ( !filename.empty() )
+ 		{
+Index: sooperlooper/src/gui/keyboard_target.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/keyboard_target.cpp
++++ sooperlooper/src/gui/keyboard_target.cpp
+@@ -553,10 +553,10 @@ KeyboardTarget::keycode_from_name (const
+                         keycode = WXK_RETURN;
+                     }
+                     else if ( keyname == wxT("PGUP") ) {
+-                        keycode = WXK_PRIOR;
++                        keycode = WXK_PAGEUP;
+                     }
+                     else if ( keyname == wxT("PGDN") ) {
+-                        keycode = WXK_NEXT;
++                        keycode = WXK_PAGEDOWN;
+                     }
+                     else if ( keyname == wxT("LEFT") ) {
+                         keycode = WXK_LEFT;
+@@ -630,10 +630,10 @@ wxString KeyboardTarget::name_from_keyco
+ 	case WXK_RETURN:
+ 		text += wxT("return");
+ 		break;
+-	case WXK_PRIOR:
++	case WXK_PAGEUP:
+ 		text += wxT("pageup");
+ 		break;
+-	case WXK_NEXT:
++	case WXK_PAGEDOWN:
+ 		text += wxT("pagedown");
+ 		break;
+ 	case WXK_LEFT:
+Index: sooperlooper/src/gui/check_box.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/check_box.cpp
++++ sooperlooper/src/gui/check_box.cpp
+@@ -237,7 +237,7 @@ CheckBox::OnMouseEvents (wxMouseEvent &e
+ 	}
+ 	else if (ev.LeftUp())
+ 	{
+-		if (bounds.Inside(ev.GetPosition())) {
++		if (bounds.Contains(ev.GetPosition())) {
+ 			// toggle value
+ 			_value = !_value;
+ 		
+Index: sooperlooper/src/gui/midi_bind_panel.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/midi_bind_panel.cpp
++++ sooperlooper/src/gui/midi_bind_panel.cpp
+@@ -880,7 +880,7 @@ void MidiBindPanel::on_button (wxCommand
+ 	}
+ 	else if (ev.GetId() == ID_LoadButton)
+ 	{
+-		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR);
++		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to open"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR);
+ 		if ( !filename.empty() )
+ 		{
+ 			_parent->get_loop_control().load_midi_bindings(filename,  _append_check->GetValue());
+@@ -888,7 +888,7 @@ void MidiBindPanel::on_button (wxCommand
+ 	}
+ 	else if (ev.GetId() == ID_SaveButton)
+ 	{
+-		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxSAVE|wxCHANGE_DIR|wxOVERWRITE_PROMPT);
++		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to save"), wxT(""), wxT("*.slb"), wxFD_SAVE|wxFD_CHANGE_DIR|wxFD_OVERWRITE_PROMPT);
+ 
+ 		if ( !filename.empty() )
+ 		{
+Index: sooperlooper/src/gui/config_panel.cpp
+===================================================================
+--- sooperlooper.orig/src/gui/config_panel.cpp
++++ sooperlooper/src/gui/config_panel.cpp
+@@ -378,7 +378,7 @@ void ConfigPanel::on_button (wxCommandEv
+ 	else if (ev.GetId() == ID_MidiBrowseButton) {
+ 		
+ 		_parent->get_keyboard().set_enabled(false);
+-		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxOPEN|wxCHANGE_DIR);
++		wxString filename = _parent->do_file_selector(wxT("Choose midi binding file to use"), wxT(""), wxT("*.slb"), wxFD_OPEN|wxFD_CHANGE_DIR);
+ 		_parent->get_keyboard().set_enabled(true);
+ 		
+ 		if ( !filename.empty() )
+@@ -389,8 +389,8 @@ void ConfigPanel::on_button (wxCommandEv
+ 	else if (ev.GetId() == ID_SessionBrowseButton) {
+ 		
+ 		_parent->get_keyboard().set_enabled(false);
+-		wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
+-		//wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxOPEN|wxCHANGE_DIR);
++		wxString filename = _parent->do_file_selector(wxT("Choose session file to use"), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
++		//wxString filename = wxFileSelector(wxT("Choose session file to use"), wxT(""), wxT(""), wxT(""), wxT("*.slsess"), wxFD_OPEN|wxFD_CHANGE_DIR);
+ 		_parent->get_keyboard().set_enabled(true);
+ 		
+ 		if ( !filename.empty() )
diff --git a/media-sound/sooperlooper/metadata.xml b/media-sound/sooperlooper/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/sooperlooper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/sooperlooper/sooperlooper-1.7.3-r1.ebuild b/media-sound/sooperlooper/sooperlooper-1.7.3-r1.ebuild
new file mode 100644
index 000000000000..7364e6cd4648
--- /dev/null
+++ b/media-sound/sooperlooper/sooperlooper-1.7.3-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+WX_GTK_VER=3.0
+
+inherit autotools eutils flag-o-matic wxwidgets toolchain-funcs
+
+DESCRIPTION="Live looping sampler with immediate loop recording"
+HOMEPAGE="http://essej.net/sooperlooper/index.html"
+SRC_URI="http://essej.net/sooperlooper/${P/_p/-}.tar.gz
+	mirror://gentoo/${PN}-1.6.5-m4.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="wxwidgets"
+
+RDEPEND="
+	media-sound/jack-audio-connection-kit
+	>=media-libs/liblo-0.10
+	>=dev-libs/libsigc++-2.2.10:2
+	>=media-libs/libsndfile-1.0.2
+	>=media-libs/libsamplerate-0.0.13
+	dev-libs/libxml2
+	>=media-libs/rubberband-0.0.13
+	sci-libs/fftw:3.0
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P/_p*}
+
+DOCS=( OSC README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libsigc26.patch
+	epatch "${FILESDIR}"/${P}-wx3.0.patch
+
+	cp -rf "${WORKDIR}"/aclocal "${S}" || die "copying aclocal failed"
+
+	AT_M4DIR="${S}"/aclocal eautoreconf
+}
+
+src_configure() {
+	use wxwidgets && need-wxwidgets unicode
+	append-cppflags -std=c++11 # Its ugly build system honors CPPFLAGS instead of CXXFLAGS for this
+	econf \
+		$(use_with wxwidgets gui) \
+		--disable-optimize \
+		--with-wxconfig-path="${WX_CONFIG}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
new file mode 100644
index 000000000000..efb9deafc53c
--- /dev/null
+++ b/media-sound/sound-juicer/Manifest
@@ -0,0 +1,7 @@
+DIST sound-juicer-3.22.1.tar.xz 1015520 SHA256 adbbda063436ca2c4d04f2ccfe6e3a5ce4abb7e1c61bc9a47300665eed9e38ec SHA512 023bc24006930edc9c224e0d437d2c3dbd513af9c56737cca800e38e8f56d76686e5fdff13e9cdb81f27fe3dd87b274611484a8beb0f8705d4cde5d56a23f7a2 WHIRLPOOL 0d42e43a93f9bd3d06d5debf6f0562e27e601e0266483b6cdd73fdd53851dbc9fdd7057a951635880e0eb655f3a4f2a5a282989824d2b2eadfaf4b100e4477a7
+DIST sound-juicer-3.24.0.tar.xz 1019588 SHA256 de6ae3889e60a572221274517a90d29dd21023acf3a94cc9c033270776270fa7 SHA512 7bd158a4e3a7c3072513fc508f59cd70b6d9371cde142fdb58597e72b3687790b9368fc7e1a35fd8c7b49cb28703f8b2da4a789854f96cdc0af076278818a91f WHIRLPOOL 5bb8610767354cf96615e77c334685fb3d9e866473e835d09eab492fbed5ae410b0951bd58dd9075ce6fb13b9d5771d712f67e7e364813e166dbd39c3af06743
+EBUILD sound-juicer-3.22.1.ebuild 1519 SHA256 8676bf02b3c56b52d7efac27445bf678ed51bb42bd9d3098c3133cd1b36c76cc SHA512 122dac4f24e52c2ff263adf82c964248a2e94bfb0beacd96f66025ce42fea14b5fc6cd1853260d22f36f6df322dfb151cbd652a2d522a20f2ad4a69a157b3356 WHIRLPOOL 803ca7335c0ef5b462aa25c7bf610edc67621dabf0c274f5f44ada1a1ea100a467fa047eb2ce6ed78c30d17778aeb3b9a4b22988a25c3179e6fb09d2056261c6
+EBUILD sound-juicer-3.24.0.ebuild 1496 SHA256 b6c724d098c7e841c77860f7dac5e78b42a06f55375d5008a1591b874f62df89 SHA512 c31e7679d607b6fb81dc5809d006a4f0c27af1dfe3d069202da3d7944435e09cedd0d6d72272ca9a2733430376ccf59a60abfd85595f0954963154f7c68321bb WHIRLPOOL faa40183b0a7ae7e4acb942a2129e913d7eddd2d258de09791cf979cc2fb0f530f0973483f529e5ba53aa459644489d79582b27190e314d00ddb3d7be8bc6796
+MISC ChangeLog 5563 SHA256 8aa4496a555cb01ebb7b8c1bd4646b6c7ec9527f40ae85d6a625b6a0457a462f SHA512 fb9160165420280a57f0e10ae5254f618d5754044b5f8da985e2cf3b7fe4b1b5f53dde38361f3c881530fc4eddc98dc5b3e8572fa8cc550bb48b2693badaa1a9 WHIRLPOOL e0b75c81c18a77edafaf7105934b5623e714365bcd2022c47c77ba09b3bf7f45bc86461ee54273a781a0fd988f33ec2479dcd6c1472ccc15beee4498f8054766
+MISC ChangeLog-2015 34200 SHA256 8b5d6fd1e162fbd68e338e50b78062168e3fb08703b72f66c0cfd05273128b9a SHA512 f38562e2a31373eeb28ee838943f13091d70feaba15a1da2a18af0dcfd75fe4dbea98dfb3bd1452bc6ded7c0a4a16fa4adc43a4b5b392d0ca1c6b217b6b49b35 WHIRLPOOL 52035e41ebba021f4ae4f8175e7f4d7e282478e65e59d9227d72f3bc2ff42036df6856268ba3c4c2bc9fb0884ad9b6553c7c46865032db7848f8048fd65e81bf
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/media-sound/sound-juicer/metadata.xml b/media-sound/sound-juicer/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/media-sound/sound-juicer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/sound-juicer/sound-juicer-3.22.1.ebuild b/media-sound/sound-juicer/sound-juicer-3.22.1.ebuild
new file mode 100644
index 000000000000..408ea9179672
--- /dev/null
+++ b/media-sound/sound-juicer/sound-juicer-3.22.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="CD ripper for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="debug flac test vorbis"
+
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.49.5:2[dbus]
+	>=x11-libs/gtk+-3.21.6:3
+	media-libs/libcanberra[gtk3]
+	>=app-cdr/brasero-2.90
+	sys-apps/dbus
+	gnome-base/gsettings-desktop-schemas
+
+	>=media-libs/libdiscid-0.4.0
+	>=media-libs/musicbrainz-5.0.1:5=
+
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0[vorbis?]
+	flac? ( media-plugins/gst-plugins-flac:1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs[cdda,udev]
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0 )
+	media-plugins/gst-plugins-meta:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	gnome-base/gnome-common
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+	test? ( ~app-text/docbook-xml-dtd-4.3 )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: gst macros does not take GST_INSPECT override anymore but we need a
+	# way to disable inspection due to gst-clutter always creating a GL context
+	# which is forbidden in sandbox since it needs write access to
+	# /dev/card*/dri
+	sed -e "s|\(gstinspect=\).*|\1$(type -P true)|" \
+		-i configure || die
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ')
+}
diff --git a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
new file mode 100644
index 000000000000..21fcbaefd399
--- /dev/null
+++ b/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="CD ripper for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug flac test vorbis"
+
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.49.5:2[dbus]
+	>=x11-libs/gtk+-3.21.6:3
+	media-libs/libcanberra[gtk3]
+	>=app-cdr/brasero-2.90
+	sys-apps/dbus
+	gnome-base/gsettings-desktop-schemas
+
+	>=media-libs/libdiscid-0.4.0
+	>=media-libs/musicbrainz-5.0.1:5=
+
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0[vorbis?]
+	flac? ( media-plugins/gst-plugins-flac:1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs[cdda,udev]
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0 )
+	media-plugins/gst-plugins-meta:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+	test? ( ~app-text/docbook-xml-dtd-4.3 )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: gst macros does not take GST_INSPECT override anymore but we need a
+	# way to disable inspection due to gst-clutter always creating a GL context
+	# which is forbidden in sandbox since it needs write access to
+	# /dev/card*/dri
+	sed -e "s|\(gstinspect=\).*|\1$(type -P true)|" \
+		-i configure || die
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes ' ')
+}
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
new file mode 100644
index 000000000000..9956c0d0dea2
--- /dev/null
+++ b/media-sound/soundconverter/Manifest
@@ -0,0 +1,8 @@
+AUX soundconverter-2.1.5-files-dropping.patch 1012 SHA256 9faa0f5ab36f1bfd33b147a309964f99627c67b7624d54793115b01dc754f736 SHA512 bc23f24e7e6c1f37bd78509c78bfba77ed637fc726f4f154ba2a3439b43f6244be52c1f77a4c4e6e450dab79c8a161b9cda4a3450416780f14dbfc7ef4759ae1 WHIRLPOOL 7ebcb6ba3b40a4fa07d915343f90f79f4a1e4b3023ba825841253ac9f3706c5b3cb0e78757e874aa6cc8d020e35c2aaf2a2ffd14168f1ee3ca50d2ca7bdd76b9
+DIST soundconverter-2.1.5.tar.xz 195380 SHA256 cace2109b967744325e4ce8938d286b78b86f0615d4f145966f42decc7a74e06 SHA512 6d42bd2cfa200e7af8c69ce94580a4f96bdb0354623207e5d1c3beadee89920363b5b8cee4cdcfa6fcbd036860d50f739b05e34e9a34608fe3d6243876936c6a WHIRLPOOL e3f9ea4bbe012aa8b977321ee85601c69d67324b35654b494ffe6792af8043a21af7d7d429929cea28fe7273e08e11f93da9b00cb4f99c88f22266e6b0c3419d
+DIST soundconverter-2.1.6.tar.xz 195864 SHA256 2ffb6718d8e43a67be4d99e5a9c7b5cd82fce15d30b4861608b7d1666884a690 SHA512 d607d4c260f0b8d810f7251f9bbcd02359984dd2a8bf3340be14602e3392362b9a6bc54a9f0c20f16bfee2f971f784a4093f535307dfb2d6087fb4492511a9ba WHIRLPOOL cfabdedc4cda2ec36537ec95443d0735905c13c369a6916842959a831fcceb322f3a2dfc47d3be0897b3a982cc10797dd89145a51550e9e4ef0d809c01b246ef
+EBUILD soundconverter-2.1.5-r1.ebuild 1591 SHA256 82e0f6611ff9d9e295039d227a2214b585fd30906144f6e1bf14da40312e632a SHA512 643bef078b758c5b04eb4bff5b2e28ac9c6219fee5e11a58ee99ac9ddb71a528a710578e93f3b287d9961bc8a8b811df987d98bd2ced0d866631e35c2124f0bd WHIRLPOOL 2c8c2f6321a08b1f9c71006118f4c1deac6a5abbe95d3ac868a8c71dd184904ad5ca103911879e3371462c974443f6dafae1f05b8355b008039d954a35f506dc
+EBUILD soundconverter-2.1.6.ebuild 1490 SHA256 9a5d872711e901cd35933de942f0045c3c16b4c7033ddd06699d0b28bdcc80b4 SHA512 d74027db98593fcce85fa8a7a5ae965037ef53c5ac238a4f6a4457b87caa291907991badfecc35c3a9fb89d4128b662a3c61e6fa0b268e2b82c34f5e14f5f229 WHIRLPOOL 55fc8f706698341adc9f199b65aa503e4eab4e6177fd57a6fb07789c9f8e5860aed939f87738dda293033c7b82c9802a1f164007bd06fe98b0598abc9d1f19d8
+MISC ChangeLog 4231 SHA256 d21fadf44e63aacdcc31ad744c6311410192d88e478b88dddde5360a6ff852c0 SHA512 795a36be46451d3565bef39c135b45a47d1d7dfee6ca165bfc315b2f882081cf00101b746a8b7a8cc3be61b98534da5fde431d2a8656de3c1b433da7bfd9cf5a WHIRLPOOL 945d5deeb3e7e675bddd20875e40830357555c8efe0269d568c8f0f3cce2f31f1051a6518a6d90144bde8033572c83f3dfee5e56b1d652325383e290fdebc10a
+MISC ChangeLog-2015 5967 SHA256 ac6030abf072cc9b5ffc0d7de1dc2a12edcbd4df279c6a20574f7e57dac70456 SHA512 4a022889922c18adf2b4ae7cb3f55e07f55d5754ece32c4a34e1a18daa083d13b48ef46133e6fbdd50c6325cdec0e0e533695cd8188faa5912c3e0b1a77bf35b WHIRLPOOL 87cfe7c490242b6990a915adee3993827b6414ea7537a2a0fd9f2737f8c02705603dd1c73764607d0a4869d1c192b54cffbf7aa0ce1ed3cfaf8c773675452427
+MISC metadata.xml 422 SHA256 2443d745875f04e7416b9381fc0bf664c66252f64ceab35f538f0d30807c61c1 SHA512 5dc640470aea1b45a59fbc757c1fc57a287a733c7e924cecec2dfda988caf313aa9863e86bc4a538565d9e574207654e62ec2071d03f647d21ef6dff38d15732 WHIRLPOOL ddaa35a314ccf34f0dee74b579c58022148d6ac2b3c63b4d67c3d9ca63dda21ae77f3800eedd99fb4570a470d43042782ccbb4fca164229552896cd5d2d14da5
diff --git a/media-sound/soundconverter/files/soundconverter-2.1.5-files-dropping.patch b/media-sound/soundconverter/files/soundconverter-2.1.5-files-dropping.patch
new file mode 100644
index 000000000000..859151e805a2
--- /dev/null
+++ b/media-sound/soundconverter/files/soundconverter-2.1.5-files-dropping.patch
@@ -0,0 +1,25 @@
+From 8c0b59e4ba46d97916193d01be683d459e7fb0fb Mon Sep 17 00:00:00 2001
+From: kassoulet <gautier@soundconverter.org>
+Date: Sat, 7 Feb 2015 16:23:49 +0100
+Subject: [PATCH] Fix broken files dropping.
+
+The current folder was added to the list of dropped files.
+
+Closes lp:1419259
+---
+ soundconverter/ui.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/soundconverter/ui.py b/soundconverter/ui.py
+index c652254..a7656a1 100644
+--- a/soundconverter/ui.py
++++ b/soundconverter/ui.py
+@@ -174,7 +174,7 @@ def drag_data_received(self, widget, context, x, y, selection,
+                              mime_id, time):
+         widget.stop_emission('drag_data_received')
+         if mime_id >= 0 and mime_id < len(self.drop_mime_types):
+-            uris = [filename_to_uri(uri.strip()) for uri in selection.data.split('\n')]
++            uris = [filename_to_uri(uri.strip()) for uri in selection.data.split('\n') if uri]
+             self.add_uris(uris)
+             context.finish(True, False, time)
+ 
diff --git a/media-sound/soundconverter/metadata.xml b/media-sound/soundconverter/metadata.xml
new file mode 100644
index 000000000000..06978decb7f6
--- /dev/null
+++ b/media-sound/soundconverter/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="opus">Enable Opus audio codec support</flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">soundconverter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/soundconverter/soundconverter-2.1.5-r1.ebuild b/media-sound/soundconverter/soundconverter-2.1.5-r1.ebuild
new file mode 100644
index 000000000000..51460b4894bf
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-2.1.5-r1.ebuild
@@ -0,0 +1,59 @@
+# 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() {
+	# Fix broken files dropping, upstream bug #1419259
+	epatch "${FILESDIR}/${P}-files-dropping.patch"
+
+	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-2.1.6.ebuild b/media-sound/soundconverter/soundconverter-2.1.6.ebuild
new file mode 100644
index 000000000000..0636d6903f5c
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-2.1.6.ebuild
@@ -0,0 +1,56 @@
+# 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/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest
new file mode 100644
index 000000000000..7ecb7fa029f0
--- /dev/null
+++ b/media-sound/soundkonverter/Manifest
@@ -0,0 +1,8 @@
+AUX soundkonverter-3.0.0-deps.patch 471 SHA256 849072a6a6f0617a6bfaaf3f0645ea96375c97c7a6e7b65cbbc43cf0622193bd SHA512 936bbe4b157b5a0a500678b364889c6e080652c03fde19243111a866e8bfa58cd5edcd2c62ea997becf9ae3391f666b8011a56c9e82fe2b5942e28f9a742d542 WHIRLPOOL 366dcb6b2e38e00a83b3fd3bb0a3acdafc71284a28335924909727e32e6128d1e3567a5d270d2df82f5fee19f8bc3557b530e06388df0a4972bb55c72da8c3ea
+DIST soundkonverter-3.0.0.tar.gz 821111 SHA256 f6864a9f145100b721e176b1af8c44646201fcad0886614ea30790a0c3320aee SHA512 5120de077082cc7a760cd1d1f4a7dd804ce8f4190c94d8d2b14baa92c851c6f6338c6f075bfa5a8fed8891840938a790e3765465b49c8863166f0805b355506a WHIRLPOOL 2b5600db2072d780891753bda2cb43901920e2170238cca9cdcb562410caffa63faecc904c1ddce277a8d70e1efa376d28cc19540c8c24c636a61b62afa823d2
+DIST soundkonverter-3.0.1.tar.gz 821278 SHA256 92117f8aff85aac3a336cc0c94f3739aaa2d07ddd741d737dfd4b1571c60a0ce SHA512 db0f9ff7b8d229012d08bb8030c7f11c428632867d0eeb7de8717d47f651a7641240aa0df9c947653fe6a2ad7d4930421f69fff8d038d47f28ca563dfa720911 WHIRLPOOL 2dfe82c4400c0afd05dced2fb5b92f2f239a456ee87ebe6d3eb10c2474f70121d0d72700ee3fdbe2b31ea7f1a3d5fc78e65af0f89bb73c291467b5e698053e5c
+EBUILD soundkonverter-3.0.0.ebuild 1450 SHA256 2ebef5985f07ef6bfd1f98b0b7ae5b53cdb239b94746fd18627a0ad90f0c893b SHA512 4fb146ca846acea65cb49a493dbdc0919ffe1dee98c9ec9d9fd5a1333c5967c7a9870add8e76e8649a98ca6b23aa083d7b3820b7e3f429a567529e4be1aab7d2 WHIRLPOOL c39cf6c0b630e2308946a0a5a734ec138142b7f74dae0d93b81c5831ed7f241852ec3e80cde1136486479874f7657e2be7c95bc27117fe248c092d8c6b71dfb9
+EBUILD soundkonverter-3.0.1.ebuild 1457 SHA256 4db7f6bec62f84979de6479d8fcde0de13f9266bb047c71664df911accfd2085 SHA512 2aed2d8a11551ada66308b0ee9670331563bfd105047aefd643416812c4b2c2f1aa24f24cf9c93548f07bfc93f7344a3739c9d603656fed62e2bf6ab6dab64de WHIRLPOOL 42e4d68ecdc59e009a50c8723598db30bb40ff26db93817428b775deb5a3c402bf54c90462dd847dc91130e8610831de1d760f61d4403e88ee04e4b941b3a139
+MISC ChangeLog 4205 SHA256 0158c4ce2feabac7b3cd78c61b8311a0750b81dcfe7cf81d10d8345e860332bb SHA512 7e2a935af180093f1772d11fb59a65894a319774543aeda25171b686460a2a0a963c7e6ff4c47c1b7b45778aed455aea039b16179815d84c74addf08874ce043 WHIRLPOOL 01cd2311dad8185df33bf9b52fad46389c4685aa22e162e44008feb30e93952a11f13fd9ff5c83509e4dc01a57aee9df080a6bb7a2360ae949d32e366b587ff3
+MISC ChangeLog-2015 8408 SHA256 9a70a27906102f0680342b456761e5ceb3acd7b2c6fd4166c8a6078a622b8ef1 SHA512 bd0e1d8055f7c4a966e911fab5a2aac29e71910199bd2ea5f466500616c105c34a6a2bbe6a3030f6a0bf62be4c73c0e8bfb4adf62abf30678e20aca73e88bc5d WHIRLPOOL c8784a5fe53dc768d5226801c3f09cc5c78af48a41d5dd3b786ade2bb39632ecdcd69f8f9ee1d647461a09e179012c37afd89e12e6474176ed88340714f70c22
+MISC metadata.xml 363 SHA256 dfe82ea9fa0c10358c6e14bf185d918a3227901c0f4a27b535df62668113aa52 SHA512 e84860f5f638b72aa6ddd10eb3b0dcd2f9f8acc00b31fb31718454665ab808f65262b29258ae44517bd091caa5c0f328d678cd9b98652ec0aba80d0e2227f044 WHIRLPOOL a4e6335afd476f5049078fb46675b3d907bf2a941d332cd46d7ccb7668aed1f0bf188ef4f12375a6431265454688554dfa09e6736fe6817356e41ac96f1c91a4
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch
new file mode 100644
index 000000000000..aa5f68af9394
--- /dev/null
+++ b/media-sound/soundkonverter/files/soundkonverter-3.0.0-deps.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2017-09-12 23:39:15.648029711 +0200
++++ b/CMakeLists.txt	2017-09-12 23:44:47.944469934 +0200
+@@ -30,7 +30,7 @@
+ include(ECMInstallIcons)
+ include(FeatureSummary)
+ 
+-find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets)
++find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml)
+ find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support)
+ find_package(KF5Cddb)
+ find_package(Phonon4Qt5 REQUIRED)
diff --git a/media-sound/soundkonverter/metadata.xml b/media-sound/soundkonverter/metadata.xml
new file mode 100644
index 000000000000..bc8b1bfb8ae6
--- /dev/null
+++ b/media-sound/soundkonverter/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/soundkonverter/soundkonverter-3.0.0.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.0.ebuild
new file mode 100644
index 000000000000..9061189c8875
--- /dev/null
+++ b/media-sound/soundkonverter/soundkonverter-3.0.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Frontend to various audio converters"
+HOMEPAGE="https://www.linux-apps.com/search?projectSearchText=soundKonverter
+	https://github.com/dfaust/soundkonverter"
+SRC_URI="https://github.com/dfaust/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep libkcddb)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
+	>=media-libs/taglib-1.10
+	media-sound/cdparanoia
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+PATCHES=( "${FILESDIR}/${P}-deps.patch" )
+
+S="${WORKDIR}"/${P}/src
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	elog "soundKonverter optionally supports many different audio formats."
+	elog "You will need to install the appropriate encoding packages for the"
+	elog "formats you require. For a full listing, consult the README file"
+	elog "in /usr/share/doc/${PF}"
+}
diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1.ebuild
new file mode 100644
index 000000000000..6da7c224a693
--- /dev/null
+++ b/media-sound/soundkonverter/soundkonverter-3.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="Frontend to various audio converters"
+HOMEPAGE="https://www.linux-apps.com/search?projectSearchText=soundKonverter
+	https://github.com/dfaust/soundkonverter"
+SRC_URI="https://github.com/dfaust/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep libkcddb)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	media-libs/phonon[qt5]
+	>=media-libs/taglib-1.10
+	media-sound/cdparanoia
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.0-deps.patch" )
+
+S="${WORKDIR}"/${P}/src
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	elog "soundKonverter optionally supports many different audio formats."
+	elog "You will need to install the appropriate encoding packages for the"
+	elog "formats you require. For a full listing, consult the README file"
+	elog "in /usr/share/doc/${PF}"
+}
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
new file mode 100644
index 000000000000..9721020b9a28
--- /dev/null
+++ b/media-sound/sox/Manifest
@@ -0,0 +1,5 @@
+DIST sox-14.4.2.tar.gz 1134299 SHA256 b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca WHIRLPOOL dbed6c60eb96cf946168666d39d3310c669e22136a982dc3547125a30214916e8ab99542dee124d5dc570d32dda8921ff003e6bfe9fd6292d82df2344b9d5fdb
+EBUILD sox-14.4.2.ebuild 2162 SHA256 d4d5336599037b0760f58472510ba9a9fcaa559d83f8cdc095ff28d9527a6190 SHA512 8bacb2ece8bc4808ad1b5db0a854e3c4c7eb4febaabdc18675bec344c8454243ba0d5530d87c6ae7b0b8416bf726a1d392cc8d6f0ef936dbd4fea01fe02ef825 WHIRLPOOL f7af7219ecbeb7905f42b16c72b20a7ac66a4204602446ec209c1d178ccbd26e9b49cc631cc200cc93187ac3d83636fbb7c3b1c69f620c3ba1ebadb4c3de0922
+MISC ChangeLog 2961 SHA256 eb3abd327cef078c61e196366c60bf3ed3ebd7e8eab9ed04b6728e8c6ea29955 SHA512 d2220dce9669d35aa7bce417c00b290f6b3af27081e65692473844f20aa60d629ac1f391acfa4a1dea7ea66eff01fe6db9223acc16080f262e13796ab32c7cfe WHIRLPOOL 136e2900e4ad69922ea1e76decf9560926695c4210b200e325f975e1373b7478598e21c4fa543524588b0566fdec117a405d32d37dbe539f4c649169decb810b
+MISC ChangeLog-2015 21809 SHA256 c7cd04ddd3ac7d3f5dbc6efca427e4935621d7ee358da5ecd6a233f0c0a80cbf SHA512 210ef54ddb43dcbb3c70c7029d7cd7b757d53db43bc81da50c35829151ecc881294312baa011517d860906b1739e38f06e4c7e52778c17ba19f48927d6298d45 WHIRLPOOL 2456c47c27faed322e1d1f6b4dc6e4af501b5c326a649dbd1c6cf747050ec7f34be9241d4fd0497ec65075bf6cb4d37201c6c0271cf70bd3c3c70e01caa9bd8c
+MISC metadata.xml 640 SHA256 e7158b621ed98fd47ede8aaf4e737bbfd85f231c66467e5aca0c1b60c9995a91 SHA512 0c7363b16df0333f4496a8e2ecb8c267cd1b23b1d946964fd2ff096a98313384f4f9d94e30791464076fe318d6bf7e5f1d4ef6f6a41a020ef1c197988c811862 WHIRLPOOL 1a3a84612528b96ef1e9093ee8de833f78f94d8208334cdc76caf9da5b7b47246eb1cce0885fc06bf209f7144d6c27063c331195762c460480e6b4e8bc3dcc9e
diff --git a/media-sound/sox/metadata.xml b/media-sound/sox/metadata.xml
new file mode 100644
index 000000000000..75d285d5cb6a
--- /dev/null
+++ b/media-sound/sox/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
+    <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
+    <flag name="opus">Enables reading Ogg Opus files.</flag>
+    <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">sox</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/sox/sox-14.4.2.ebuild b/media-sound/sox/sox-14.4.2.ebuild
new file mode 100644
index 000000000000..ee37ee2ba2d5
--- /dev/null
+++ b/media-sound/sox/sox-14.4.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="The swiss army knife of sound processing programs"
+HOMEPAGE="http://sox.sourceforge.net"
+SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
+
+RDEPEND="
+	dev-libs/libltdl:0=
+	>=media-sound/gsm-1.0.12-r1
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	ao? ( media-libs/libao )
+	encode? ( >=media-sound/lame-3.98.4 )
+	flac? ( >=media-libs/flac-1.1.3 )
+	id3tag? ( media-libs/libid3tag )
+	ladspa? ( media-libs/ladspa-sdk )
+	mad? ( media-libs/libmad )
+	ogg? ( media-libs/libvorbis	media-libs/libogg )
+	opus? ( media-libs/opus media-libs/opusfile )
+	png? ( media-libs/libpng:0= sys-libs/zlib )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( >=media-libs/libsndfile-1.0.11 )
+	twolame? ( media-sound/twolame )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	sed -i -e 's:CFLAGS="-g":CFLAGS="$CFLAGS -g":' configure.ac || die #386027
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with alsa) \
+		$(use_with amr amrnb) \
+		$(use_with amr amrwb) \
+		$(use_with ao) \
+		$(use_enable debug) \
+		$(use_with encode lame) \
+		$(use_with flac) \
+		$(use_with id3tag) \
+		$(use_with ladspa) \
+		$(use_with mad) \
+		$(use_enable openmp) \
+		$(use_with ogg oggvorbis) \
+		$(use_with oss) \
+		$(use_with opus) \
+		$(use_with png) \
+		$(use_with pulseaudio) \
+		$(use_with sndfile) \
+		$(use_enable static-libs static) \
+		$(use_with twolame) \
+		$(use_with wavpack) \
+		--with-distro="Gentoo"
+}
+
+src_install() {
+	default
+	# libltdl is used for loading plugins, keeping libtool files with empty
+	# dependency_libs what otherwise would be -exec rm -f {} +
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
diff --git a/media-sound/specimen/Manifest b/media-sound/specimen/Manifest
new file mode 100644
index 000000000000..53dad4e4c6dc
--- /dev/null
+++ b/media-sound/specimen/Manifest
@@ -0,0 +1,8 @@
+AUX specimen-0.5.2_rc3-jackmidi.patch 1075 SHA256 f97a797b9dde8330e9b781822560fae23169060af046297516c49ed8fd9cf8cf SHA512 14f223e0f19cf0697529048f60b84324689983e5b2799d235e0257e2fdfe1e2698e2bbe5a32a90c372300f70869f4cd1f460d3731636a3b45f9424e3add3f2e5 WHIRLPOOL 4691cb7e02f6464bd688e11768f7f0888f4e1b813a1e46764e084a23f4ede4c71a0b441b1eea0726d1ac18842e6aa1629a5e2694ce9b589c3f1c69bd752a4d14
+AUX specimen-0.5.2_rc3-underlinking.patch 2324 SHA256 4869c9f5d7d9adcf7a2749e4e0d277de0156bc8cda1ccf8d1726fa19e1c38847 SHA512 012c0c08c2706ce11a97fb5a8919b9d72287119658a57151648aa7adf24b22ea6d552d18b4584c68a5077e236ae7653f8c54eaafac7b698015b5e93d9f5d587d WHIRLPOOL d976aa85e48f34ea7dec4b081be903c79ae673e6e46842aab0e31c696b5812da4acf72a95ad2f1d3a0b1be3de4e239b0ce38417ea01c1bf52429bdc881fff58c
+DIST specimen-0.5.2-rc3.tar.gz 267948 SHA256 249cf434ee81828b46c383dbf6b1873564f227f2461c9956b539be0a3c2feb72 SHA512 0fbe298ef9652b8f8535fc4382ec71457c882a7fb05412cb1621e7aa566a293b71f4a2600eaaa4336093ec73b9dd6bb53371565ef0f02d7e400d497718c384f4 WHIRLPOOL dbf93e766280d1f8459f1a08189ebe939c121d89771cab2d5127d8e352d3c143885d371b9c4c468a15b85ffdfa988c781e57671ff33386b757a86799dbda0e81
+EBUILD specimen-0.5.2_rc3-r1.ebuild 1026 SHA256 d2bc8e8fe03d78bf0909ec6d45c07d3121374721dd01ec1aac9d2ac63fd6ad11 SHA512 b0698454918e4e97a78e5e6cca4e59e5a76d96d26930d6ad87041059104373727db38b48057498fdc526f76ddb7dc941874536dacc7fbabbf024e6fd173d509c WHIRLPOOL 7b4ceac4a60056e2f08be0eff737b172d245de624630afad835b2500ed4efaf9ef3917a38794c32ce5e75642e8ff22ae413836e1863a1356f0d8560ccd100abd
+EBUILD specimen-0.5.2_rc3-r2.ebuild 1003 SHA256 ee6ba23a821a11a08b550f26629632144e7393d385997ee3788c0306dba75919 SHA512 0d2a2f30becb1bbbcb034e299616403d0478183407615dc9ba6116cb813b11de2a846a7200f07267062b7e3a965f481040098abfa2cf76cf0d7dcba44cc23de9 WHIRLPOOL ecedf4cc76815165206c14284908ab83c9b42419e7af076738cfaee548214c501376206de0ac4d7cadd85eb629d13bf9aaf6df39859be846a199ffb5735b46e8
+MISC ChangeLog 2826 SHA256 e2f18296fe554e85435a1fe6e9488e8852169318df26cb52d3909935a63fe8e7 SHA512 3c6afdb7f0c3394bc6df4be2b6178fa9389d462ab0b46e5fcc4641e02692956ded7377a269f5054e27499963b4763f3dd348ce1ce763b43fd645003bd0651e81 WHIRLPOOL 3350c1e22071ee0717b5312e88b6d49ef3540cd97fc9a371e51329bf9278dc99b99231c32c01559269c4eba7fbe3d13a1332efaef477e1b4784708bdbe3b508c
+MISC ChangeLog-2015 3408 SHA256 1a1464afece473117f01daad34f2062a10264ffd1f39eab3251152f532450802 SHA512 d169bb96e4c052b2dce41dce38430475e46ebc7f9eba7477106961ebae969b753d4bb3e0ddb0c168353d2caaf0c06f828cf57bcb67fa967455c0b9f0e9b72c58 WHIRLPOOL 28b6faea2a0be367d6c2fde3a7bd531753e71c35b58d652c612bc8f5ddd37877d27da5f0d1f52df85ad167165f79e0e5eb66f5400a485ae50f30a2e843e91bc8
+MISC metadata.xml 469 SHA256 e94c3f1e8bc5b58a4354eefb12f4107a2fa44360aa8892adfb47e7a38ff88156 SHA512 ba825914f15f4a5451e943a8973361ed42cd2206c589fd087b1e5b4ae5b797c428fa47ef2ef6f0229b242bcd8f02a90bb5f0a01779e1bb0495cd0f8a5dd86335 WHIRLPOOL f041f4cd365ee90bcd9c89bc5b4932aa7dd5a45e427ee22e3792b4a0e9c5701f5f173a911e8ca088679ef9139d990b3b3e7e6d33fe64489f2694e1f4e3d05225
diff --git a/media-sound/specimen/files/specimen-0.5.2_rc3-jackmidi.patch b/media-sound/specimen/files/specimen-0.5.2_rc3-jackmidi.patch
new file mode 100644
index 000000000000..2e3cf2ba9125
--- /dev/null
+++ b/media-sound/specimen/files/specimen-0.5.2_rc3-jackmidi.patch
@@ -0,0 +1,22 @@
+Index: specimen-0.5.2-rc3/src/jackdriver.c
+===================================================================
+--- specimen-0.5.2-rc3.orig/src/jackdriver.c
++++ specimen-0.5.2-rc3/src/jackdriver.c
+@@ -81,7 +81,7 @@ static int process (jack_nframes_t frame
+      jack_midi_event_t jack_midi_event;
+      jack_nframes_t event_index = 0;
+ #ifdef HAVE_JACK_MIDI
+-     jack_nframes_t event_count = jack_midi_get_event_count(midi_buf, frames);
++     jack_nframes_t event_count = jack_midi_get_event_count(midi_buf);
+ #endif /* HAVE_JACK_MIDI */
+ #ifdef HAVE_OLD_JACK_MIDI
+      jack_nframes_t event_count = jack_midi_port_get_info(midi_buf, frames)->event_count;
+@@ -123,7 +123,7 @@ static int process (jack_nframes_t frame
+      /* send the JACK MIDI events to the mixer */
+      while (event_index < event_count) {
+        
+-         jack_midi_event_get(&jack_midi_event, midi_buf,event_index, frames);
++         jack_midi_event_get(&jack_midi_event, midi_buf,event_index);
+ 	  midi_data = jack_midi_event.buffer;
+ 	  
+ 	  /* TODO: handle 14-bit controllers and RPNs and NRPNs */
diff --git a/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch b/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch
new file mode 100644
index 000000000000..db0df85debd7
--- /dev/null
+++ b/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch
@@ -0,0 +1,93 @@
+* Remove hardcoded CFLAGS
+* Fix underlinking issues
+  - missing -lm linkage (sin)
+  - missing -pthread linkage
+    -> https://bugs.gentoo.org/show_bug.cgi?id=561562
+
+--- specimen-0.5.2-rc3/configure.ac
++++ specimen-0.5.2-rc3/configure.ac
+@@ -1,10 +1,10 @@
+ # -*- autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT(configure.ac)
+-AM_INIT_AUTOMAKE(specimen, 0.5.2-rc3)
+-AM_CONFIG_HEADER(src/config.h)
+-
++AC_INIT([specimen], [0.5.2-rc3])
++AC_CONFIG_HEADERS([src/config.h])
++AM_INIT_AUTOMAKE
++m4_include([acx_pthread.m4])
+ 
+ # compilation
+ with_debug="no"
+@@ -13,9 +13,7 @@
+         [enable debugging information, accepting a performance penalty (default is NO)])],
+     [if test x$enable_debug = xyes; then with_debug=yes ; fi])
+ 
+-if test x$with_debug = xno; then
+-    CFLAGS="-O3"
+-else
++if test x$with_debug = xyes; then
+     AC_DEFINE(DEBUG, 1, [[whether to display debugging output or not]])
+ fi
+ 
+@@ -48,13 +46,14 @@
+ AC_FUNC_MALLOC
+ AC_CHECK_FUNCS([floor gettimeofday pow strchr strdup])
+ 
++dnl Check for libm for sin()
++AC_SEARCH_LIBS([sin], [m], [], [
++	AC_MSG_ERROR([unable to find the sin() function])
++])
++
+ # pthreads
+ ACX_PTHREAD
+ 
+-SPECIMEN_CFLAGS="-Wall -Werror"
+-AC_SUBST(SPECIMEN_CFLAGS)
+-CFLAGS="$SPECIMEN_CFLAGS $CFLAGS" 
+-
+ config_error="no"
+ 
+ # gtk			   
+@@ -122,7 +121,8 @@
+   fi
+ fi
+ 
+-CC="$PTHREAD_CC"
++CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++LIBS="$LIBS $PTHREAD_CFLAGS"
+ 
+ # print build summary
+ AC_CONFIG_COMMANDS_POST([
+--- specimen-0.5.2-rc3/src/gui/Makefile.am
++++ specimen-0.5.2-rc3/src/gui/Makefile.am
+@@ -12,14 +12,14 @@
+ paramselector.c paramselector.h patchlist.c patchlist.h midisection.c	\
+ midisection.h channelsection.c channelsection.h
+ 
+-INCLUDES = \
++AM_CPPFLAGS = \
+ 	-l.. \
+ 	@GTK_CFLAGS@ \
+ 	@LIBGNOMECANVAS_CFLAGS@ \
+ 	@PHAT_CFLAGS@
+ 
+ if HAVE_LASH
+-INCLUDES += @LASH_CFLAGS@
++AM_CPPFLAGS += @LASH_CFLAGS@
+ endif
+ 
+ libgui_a_CFLAGS = $(CFLAGS) -I.. -DINSTALLDIR=\"$(datadir)\"
+--- specimen-0.5.2-rc3/src/Makefile.am
++++ specimen-0.5.2-rc3/src/Makefile.am
+@@ -11,7 +11,7 @@
+ specimen_SOURCES += lashdriver.c lashdriver.h                                                                                                                           
+ endif
+ 
+-INCLUDES = \
++AM_CPPFLAGS = \
+ 	@ALSA_CFLAGS@ \
+ 	@JACK_CFLAGS@ \
+ 	@LIBSAMPLERATE_CFLAGS@ \
diff --git a/media-sound/specimen/metadata.xml b/media-sound/specimen/metadata.xml
new file mode 100644
index 000000000000..e85697c2a805
--- /dev/null
+++ b/media-sound/specimen/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<longdescription>
+		Specimen is a midi controlled audio sampler for GNU/Linux systems. It
+		allows you to create music using various sound files, or "samples", in
+		tandem with a midi sequencer.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild b/media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild
new file mode 100644
index 000000000000..e96807b02ab6
--- /dev/null
+++ b/media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="A Midi Controllable Audio Sampler"
+HOMEPAGE="http://zhevny.com/specimen"
+SRC_URI="http://zhevny.com/${PN}/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc sparc x86"
+IUSE="lash"
+
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
+	>=media-libs/alsa-lib-0.9
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	>=media-libs/phat-0.4
+	dev-libs/libxml2:2
+	x11-libs/gtk+:2
+	gnome-base/libgnomecanvas
+	lash? ( media-sound/lash )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-jackmidi.patch" \
+		"${FILESDIR}/${P}-underlinking.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable lash)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS BUGS ChangeLog NEWS PROFILE \
+		README ROADMAP TODO STYLE TODO WISHLIST
+	doicon pixmaps/${PN}.png
+	make_desktop_entry ${PN} Specimen ${PN}
+}
diff --git a/media-sound/specimen/specimen-0.5.2_rc3-r2.ebuild b/media-sound/specimen/specimen-0.5.2_rc3-r2.ebuild
new file mode 100644
index 000000000000..b664bba525c3
--- /dev/null
+++ b/media-sound/specimen/specimen-0.5.2_rc3-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools versionator
+
+MY_PV="$(replace_version_separator 3 -)"
+
+DESCRIPTION="A Midi Controllable Audio Sampler"
+HOMEPAGE="http://zhevny.com/specimen"
+SRC_URI="http://zhevny.com/${PN}/files/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="lash"
+
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
+	>=media-libs/alsa-lib-0.9
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	>=media-libs/phat-0.4
+	dev-libs/libxml2:2
+	x11-libs/gtk+:2
+	gnome-base/libgnomecanvas
+	lash? ( media-sound/lash )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-jackmidi.patch"
+	"${FILESDIR}/${P}-underlinking.patch"
+)
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable lash)
+}
+
+src_install() {
+	default
+	doicon pixmaps/${PN}.png
+	make_desktop_entry ${PN} Specimen ${PN}
+}
diff --git a/media-sound/spek/Manifest b/media-sound/spek/Manifest
new file mode 100644
index 000000000000..4daa7b0edb5b
--- /dev/null
+++ b/media-sound/spek/Manifest
@@ -0,0 +1,10 @@
+AUX spek-0.8.1-disable-updates.patch 273 SHA256 973125ff157a6b5b8f087652ba465ac30cefdb3c510a9a708de9a55b62d3e38e SHA512 90ca3adcf4fb677953ae4d7e50dc1bed62ba21e92f52dd9ec724b146244084bcde15da3317dab0feac9da522d0b3e49e5bad17c16209a3f0cc9b1b8780141040 WHIRLPOOL 21a3096cdeda443039588925938c62ddf56f7ea8b4aba58854a953ac295b9a3ce5b38f98a736ff12140149fbd380648effe2a4f6f363caefa64ced6b75cc0ef3
+AUX spek-0.8.3-ffmpeg3-1.patch 1314 SHA256 284eaf717a6998ed5b22fcc74b9046e99d2a0b79998dec9cbd3742b88896fe5b SHA512 86f3668bff3ae9475d5db10c69ebbf277c0d03b18da3a1e8abc5531c80ebd22c4124e2fa700d9dfa4afda42d3141fc5fb569e4f7f2d9be2c6986577a3285eaaa WHIRLPOOL d70b38012f541178c6c36ca1e97ea25b33e234c6683c1ad82d6145b57191b4bba9e8321b38e36e55dcca99afeda8ae1f09dd7320ba3f7cb58668a9ef75599d5b
+AUX spek-0.8.3-ffmpeg3.patch 1253 SHA256 50b6139bebfb342b69c7f168a0cf0e8e2a3fa6dbd33e2afe54396b2989b6f6ba SHA512 3e56b1965e0bd07f11089c8e09af1d12f03ca34244f74703a006e5bb420cbcb9ae5f4af4e984b0735198f68b74143486bcc27f07c14dce4780b05b57fb87ed86 WHIRLPOOL 455d21773b70a51afe1605a3235bdc37628fb2334ca08a4a4230cb69ea47489ef393184b852482c4ac1a56e52a12a5b75b0dfda969cd4e224fb037eea4d27d8f
+AUX spek-0.8.3-replace-gnu+11-with-c++11.patch 248 SHA256 83ed703310d93df57cf88d1d4a07c33e5e44fd1e9829936e16d4577bd59020b9 SHA512 5bb0ac9970656a03d0c7ab7ddbde59660a0b443ffda59bf3a0e9897d8705f0b49211b8fec52f218c25aa7764d646eb47c489eb7b992bc6f32c7f82382e8d17b3 WHIRLPOOL 94e9f585dca469acf3b39b608f2338423dd8123812e3cc99776724fa081df62f75f455a348091bb4cb9a9ffeb4d9f61b4955cb8e79f29f57dff533d7b2baae11
+AUX spek-0.8.3-stdlib.patch 472 SHA256 e560e20740447b9fc1b04abd04d17bcb9193bcc5696d7d8235056f22d80bb655 SHA512 d42906e7fbb0707fb8eefc3e3cc19a18c28f4af9b56995cdfa486fd3fab92c11cc313bc3b76fd115e99ada892e3191ff80f33020b0c4cc56fb26a0540b526ea4 WHIRLPOOL 6f89ef2ea375bcd50b89b09a97e551ae96ebea818ceea0bcc9d80fa2451903c6e6672eb6847a2ca2945e11c7a275817479d47acc5d308a09f4ec8d636009a126
+DIST spek-0.8.3.tar.gz 1349573 SHA256 f5c09d0062aaafe882e2e617f6d5db2ab540e2a657c1bee38260f7f0567bf175 SHA512 a4b54746316d295574bc963e650728b23b3730ee6bcc8d78b043a5678baac70a0e859870120de2b0e6a17059e9e3757075f4691e2abde98c083afc393e93e17c WHIRLPOOL f88082cbba6ca51d016034860c4908c5c94a993a9e820733f845afc97ef7af484d2d7ece9cb6c36008f1c3f9910986edf313e8e31557a97492d06baf8a2bbdfa
+EBUILD spek-0.8.3-r1.ebuild 1146 SHA256 ac5de07cf648290aad7f1109919a6a151ad652ec7cc112ca4c72077e24a8de2d SHA512 82acede7bcd11c44d2c86eb9c92e6c75780f99e34db96c928e99f216c218085fd99bb03b06063b320a9cb7fc7832f5371fd9f0f8513fd696c237d26afdcf16d6 WHIRLPOOL 7230b0d9bd6c303d424d0120807e65a472d38729ea05674edae097331b1177ad5e7d3c6cedac9bad73ec679cc11be936c1e68f4137a103e983b70fb152d2bdae
+MISC ChangeLog 2937 SHA256 ccfa932e6fae69f59ec91d25fd02c64221fbc9fec895d2144d5b920068a30791 SHA512 bcb019cfccddf400fcba7f74c4523283e62d89104d0cde6c30bfbea96976a7834b2317fa03c5180fe2590c7f6c475366b6e2aca5ccbfc1c70d552bca3f61b21a WHIRLPOOL 21ff4bfef81c77bc4927c0ea4f26e3974b61dd0ae5d778e0c95e75c871af29d1b30102340dcc997d6b998b474e7d6a450a743837cf68eb7140ef143975c3ee1a
+MISC ChangeLog-2015 2014 SHA256 72c94da710f0df02fdb555a67924288fcead297f2b703d979b3a0267afb0edee SHA512 d87ff4c741ed00dcb522ac4df220b01c20559a6aa6631c52dcff9ee6a1c3462f0da52e5db4e24c691a478468a77b6c88d884a8885fff48b211f83e68e17831bb WHIRLPOOL f44d3548b3c5ca981b7e4ef8d56081d70b4ae93c03d24190eff8c5e1d9df5a5bf2236b071aabbefc03d2e2124aad29f8d506bdd0629787b4bc268b1dabdeada1
+MISC metadata.xml 369 SHA256 31213ae819bbbc20afb271f0c9fcdefe9763be87e6d0a2673a2a3cf6402d3845 SHA512 004106612127320eb7094fbf59b4e0dda0eba73520c37e54094439a27c1bfe2705f2f89183712ac9bbebc268c625c407ecb0ab628ab598f8f1c7b30ec1fbde14 WHIRLPOOL 460805bcd4b16dec411bc461608dc1d14ff23eaeaf76233ba1947b3ce4f3dff1a6795218da9846a1251ae3ee134ceb2f0103b5faae677487c63cebd2e0c7290f
diff --git a/media-sound/spek/files/spek-0.8.1-disable-updates.patch b/media-sound/spek/files/spek-0.8.1-disable-updates.patch
new file mode 100644
index 000000000000..e035a4c60819
--- /dev/null
+++ b/media-sound/spek/files/spek-0.8.1-disable-updates.patch
@@ -0,0 +1,11 @@
+--- spek-0.8.1/src/spek-preferences.cc
++++ spek-0.8.1/src/spek-preferences.cc
+@@ -62,7 +62,7 @@
+ 
+ bool SpekPreferences::get_check_update()
+ {
+-    bool result = true;
++    bool result = false;
+     this->config->Read(wxT("/update/check"), &result);
+     return result;
+ }
diff --git a/media-sound/spek/files/spek-0.8.3-ffmpeg3-1.patch b/media-sound/spek/files/spek-0.8.3-ffmpeg3-1.patch
new file mode 100644
index 000000000000..dee0e3ca0f8f
--- /dev/null
+++ b/media-sound/spek/files/spek-0.8.3-ffmpeg3-1.patch
@@ -0,0 +1,33 @@
+https://github.com/alexkay/spek/commit/ee8bc49ed4a93a14a933ecb0eebfe424111f8413
+
+Index: spek-0.8.3/src/spek-audio.cc
+===================================================================
+--- spek-0.8.3.orig/src/spek-audio.cc
++++ spek-0.8.3/src/spek-audio.cc
+@@ -202,7 +202,7 @@ AudioFileImpl::AudioFileImpl(
+     this->packet.data = nullptr;
+     this->packet.size = 0;
+     this->offset = 0;
+-    this->frame = avcodec_alloc_frame();
++    this->frame = av_frame_alloc();
+     this->buffer_size = 0;
+     this->buffer = nullptr;
+     this->frames_per_interval = 0;
+@@ -218,7 +218,7 @@ AudioFileImpl::~AudioFileImpl()
+     if (this->frame) {
+         // TODO: Remove this check after Debian switches to libav 9.
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0)
+-        avcodec_free_frame(&this->frame);
++        av_frame_free(&this->frame);
+ #else
+         av_freep(&this->frame);
+ #endif
+@@ -258,7 +258,7 @@ int AudioFileImpl::read()
+ 
+     for (;;) {
+         while (this->packet.size > 0) {
+-            avcodec_get_frame_defaults(this->frame);
++	    av_frame_unref(this->frame);
+             auto codec_context = this->format_context->streams[this->audio_stream]->codec;
+             int got_frame = 0;
+             int len = avcodec_decode_audio4(codec_context, this->frame, &got_frame, &this->packet);
diff --git a/media-sound/spek/files/spek-0.8.3-ffmpeg3.patch b/media-sound/spek/files/spek-0.8.3-ffmpeg3.patch
new file mode 100644
index 000000000000..ad82a38c31c5
--- /dev/null
+++ b/media-sound/spek/files/spek-0.8.3-ffmpeg3.patch
@@ -0,0 +1,37 @@
+commit 1ef950dcbf89dd8adf816009b54009f487828a45
+Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
+Date:   Sun Mar 27 14:19:42 2016 -0700
+
+    Replace deprecated FFmpeg API
+
+diff --git a/src/spek-audio.cc b/src/spek-audio.cc
+index b7633bc..21ea7a4 100644
+--- a/src/spek-audio.cc
++++ b/src/spek-audio.cc
+@@ -222,7 +222,7 @@ AudioFileImpl::~AudioFileImpl()
+         this->packet.data -= this->offset;
+         this->packet.size += this->offset;
+         this->offset = 0;
+-        av_free_packet(&this->packet);
++        av_packet_unref(&this->packet);
+     }
+     if (this->format_context) {
+         if (this->audio_stream >= 0) {
+@@ -326,7 +326,7 @@ int AudioFileImpl::read()
+             this->packet.data -= this->offset;
+             this->packet.size += this->offset;
+             this->offset = 0;
+-            av_free_packet(&this->packet);
++            av_packet_unref(&this->packet);
+         }
+ 
+         int res = 0;
+@@ -334,7 +334,7 @@ int AudioFileImpl::read()
+             if (this->packet.stream_index == this->audio_stream) {
+                 break;
+             }
+-            av_free_packet(&this->packet);
++            av_packet_unref(&this->packet);
+         }
+         if (res < 0) {
+             // End of file or error.
diff --git a/media-sound/spek/files/spek-0.8.3-replace-gnu+11-with-c++11.patch b/media-sound/spek/files/spek-0.8.3-replace-gnu+11-with-c++11.patch
new file mode 100644
index 000000000000..624e969dba4a
--- /dev/null
+++ b/media-sound/spek/files/spek-0.8.3-replace-gnu+11-with-c++11.patch
@@ -0,0 +1,11 @@
+--- spek-0.8.3/configure.ac
++++ spek-0.8.3/configure.ac
+@@ -6,7 +6,7 @@
+ 
+ AC_LANG([C++])
+ AC_PROG_CXX
+-CXXFLAGS="$CXXFLAGS -std=gnu++11 -Wall -Wextra"
++CXXFLAGS="$CXXFLAGS -std=c++11 -Wall -Wextra"
+ AC_PROG_CXXCPP
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
diff --git a/media-sound/spek/files/spek-0.8.3-stdlib.patch b/media-sound/spek/files/spek-0.8.3-stdlib.patch
new file mode 100644
index 000000000000..c0ffa16b4d52
--- /dev/null
+++ b/media-sound/spek/files/spek-0.8.3-stdlib.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/519450
+
+--- spek-0.8.3/src/spek-fft.cc
++++ spek-0.8.3/src/spek-fft.cc
+@@ -17,6 +17,7 @@
+  */
+ 
+ #include <math.h>
++#include <stdlib.h>
+ 
+ #define __STDC_CONSTANT_MACROS
+ extern "C" {
+--- spek-0.8.3/src/spek-events.cc
++++ spek-0.8.3/src/spek-events.cc
+@@ -16,6 +16,7 @@
+  * along with Spek.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include <stdlib.h>
+ #include "spek-events.h"
+ 
+ //IMPLEMENT_DYNAMIC_CLASS(SpekHaveSampleEvent, wxEvent)
diff --git a/media-sound/spek/metadata.xml b/media-sound/spek/metadata.xml
new file mode 100644
index 000000000000..b809ea2b22b0
--- /dev/null
+++ b/media-sound/spek/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">spek</remote-id>
+		<remote-id type="github">alexkay/spek</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/spek/spek-0.8.3-r1.ebuild b/media-sound/spek/spek-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..8c09e95c5562
--- /dev/null
+++ b/media-sound/spek/spek-0.8.3-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+WX_GTK_VER="3.0"
+
+inherit autotools eutils toolchain-funcs wxwidgets
+
+DESCRIPTION="Analyse your audio files by showing their spectrogram"
+HOMEPAGE="http://www.spek-project.org/"
+SRC_URI="https://github.com/alexkay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libav"
+
+RDEPEND="
+	libav? ( media-video/libav:= )
+	!libav? ( media-video/ffmpeg:0= )
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	>=sys-devel/gcc-4.7
+	sys-devel/gettext
+"
+
+src_prepare() {
+	need-wxwidgets unicode
+
+	if [ $(gcc-major-version) -lt "4" ] ; then
+		die "You need to activate at least gcc:4.7"
+	fi
+	if [ $(gcc-major-version) -eq "4" -a $(gcc-minor-version) -lt "7" ] ; then
+		die "You need to activate at least gcc:4.7"
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.8.1-disable-updates.patch \
+		"${FILESDIR}"/${P}-replace-gnu+11-with-c++11.patch \
+		"${FILESDIR}"/${P}-stdlib.patch \
+		"${FILESDIR}"/${P}-ffmpeg3.patch \
+		"${FILESDIR}"/${P}-ffmpeg3-1.patch
+	eautoreconf
+}
diff --git a/media-sound/splay/Manifest b/media-sound/splay/Manifest
new file mode 100644
index 000000000000..e6d7b62c9628
--- /dev/null
+++ b/media-sound/splay/Manifest
@@ -0,0 +1,9 @@
+AUX splay-0.9.5.2-external-id3lib.diff 583 SHA256 93b98294d9baf6bfc12b974742e7ad0bfa9009323848e33db61f1cbf1fe90f05 SHA512 fe5db7a4a624c15dbcfff3c1b6087b33970ae09ecdc6f83348eb6da7cd3ead5df71fac6cbabe6f5b1d3389696676da390982216f53acf9450511bfd9dbfa097e WHIRLPOOL 4482db805f3fa09b05d447d66cea9be2727f752eb2039b38d41647b753f5acc956b509e14f358cf308bdf8498091652efc1ec9f39450fc2ee192613054637037
+AUX splay-0.9.5.2-fix-buildsystem.patch 6083 SHA256 692426a0cfbbb25bffacbb17f6525920bbb1c31de1db7dbdbdc31ed3aa0484b5 SHA512 135ff607f47322fc13d8d94277f24e4d844e04c9557e689e93d3bec80cb5806f631ebcb07f6b19be7724946592005359f558f0971fe62c5c3225f5c9cd274b95 WHIRLPOOL 677e3f4c878bee0396239caa733626ccc5a855f4604e8857e33df48d869a5178ddae3a5e004faa1eaedadbd31ac520dbcbc0ee067f9be8f5c4378060babc5f25
+AUX splay-0.9.5.2-fix-c++14.patch 953 SHA256 d3b2a169baab87812a8d42018cb721c964a740d93bf9e35e9dc6f5d44848c497 SHA512 150c4dbbb9f2f7dded871d245daffb25c4b3e67f6fe0db09a1f7c893dc2ef8a96eed70aefb32c4418aa83264b82d8a8504c29cb5561e0287fd448a0d398c360b WHIRLPOOL 11f1ec038dc62625e0b12df41c521300ff78dbf2d8c4acc3daf3a64d478a31d620eb4bb1ee9ecef37b51d25eac4cabac6266588b9fc38d5e82ac2734d3478cdc
+AUX splay-0.9.5.2-gcc43-2.patch 1838 SHA256 d05decb40351a2276f997160e1e0dc4d86ade71c929767d8d073303e8059efdd SHA512 41da577fd4fc7e28d99fd7dc4b340e5555cddef8965e05a2b166a776867a7ec610befe7e7231cd91fb695e438b6c9ba01b688e1030a0fe48d0636c72b6380cf2 WHIRLPOOL ed5cc1ee3153332f8272b6b798003d651e136fe99a3932b6a27a657e3f1326ccd5d48fffa222c89e4ab8a2a5e2501171a867e3cfcdf951872c14b640c33e560b
+DIST splay-0.9.5.2.tar.gz 105510 SHA256 38266b7620e8dde9ca39ace245ded4d9fadc3ea9e35772190fcfe90efe8d39bd SHA512 cab1fa2c753c0d7be58b29328db6c444872969b33b24191409efcf782201716d10b14109f23b2f2368909aa60a8a517ec894aeeb649ee0ac5811413a8ebeae09 WHIRLPOOL 335be0ac5b7ae970a4fde21e30dda5635f2bba5f4d8f9eb9543c7373bfeb69d4e99ca9722b616701ef11634419139114744e5743b67599324d794113aa3aefd7
+EBUILD splay-0.9.5.2-r2.ebuild 634 SHA256 edac55a6a1a3c946d1a701670f53d94698b83e2f0ab567783b48b63a5d46eb67 SHA512 6872f4e3c72b6af615a46b5888baf646749060811c85ad32ac6fadf2b4b305b7d77f77ef8f0d76720f08912eb79d2a82c2204ef64baf9d3d4b64c4931c3bf405 WHIRLPOOL eb0dafa0b1c3da2542d5c760c5031f7dcf27620fad36d4f3a85bd6dca22059f7d6aff9c1812c8b1137fbe9c7e60713bf7347dc0043ad897d31b1fe3b7e6ab32b
+MISC ChangeLog 4140 SHA256 4892cd16059d520be768706fddad5d81c4df96f751103c3ca70eaa1e047cc1a9 SHA512 b2b2c8f2df67aa3bc6e27e0c586f1dd53fccdc0f20480690366fb0bfbc52f6d8fc50941df8a76886ef4bb39f78411fac117a3dc9c1da90eead32980d38c4eaf4 WHIRLPOOL e3c2f581d0ed41f7b39c4ea150477017ebf0480ff10318541bbbe29dc265826d6f6a6ee0a5adac0b6e2b186fbb954e667da4b5d15cd4eac8596f8cfece65182c
+MISC ChangeLog-2015 1894 SHA256 527eddd7a5d660b0f58ed73f2fe11345503497153420371de6fd1167e892d25b SHA512 970761ac83fe917244c8b3c27a1107109f8c6b9afa46907bafc434d6dc13dbf013f8705b71fffecbc9b106882e1dadd1c3050e24eb82eb8382b169860652f6b2 WHIRLPOOL 542c71a21d46aa4d28827998c084e5618af2a445a47082db1270786f72058f4b407408bd52739bcc3e13f6a30c6a5cb1cd4f28bfd2d14b5a44734e4e761c2d04
+MISC metadata.xml 328 SHA256 e32f661e8747233c77e3721a592bd62eb167cb1a595bc1882f0ef3439652bbd0 SHA512 90224a6fed46fe48538837e0c6252b1b15f33231b9f639f6ab62e1104ebee98a540a831980920820bb4f00cb0bb5db02fddbb28c51ba68bd83613adf5782243a WHIRLPOOL 0e3bbd6e46c08f1e487e3bc729275b454622c94eadac6057b5b1f831a78533d396c15171ed72320482048ec154748a13362d52a829d294910681d2a9eaafe257
diff --git a/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff b/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff
new file mode 100644
index 000000000000..3a5335bdbb81
--- /dev/null
+++ b/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff
@@ -0,0 +1,17 @@
+--- splay-0.9.5.2/apps/splay.cc
++++ splay-0.9.5.2/apps/splay.cc
+@@ -184,9 +184,11 @@
+ 	delete mytag;
+ 	
+       }
+-      catch(ID3_Error &err){
+-	cout << err.GetErrorFile() << " (" << err.GetErrorLine() << "): "
+-	     << err.GetErrorType() << ": " << err.GetErrorDesc() << endl;
++//      catch(ID3_Error &err){
++      catch(...){
++	cout << "Error found (GetError functions disabled)" << endl;
++//	cout << err.GetErrorFile() << " (" << err.GetErrorLine() << "): "
++//	     << err.GetErrorType() << ": " << err.GetErrorDesc() << endl;
+       }
+ #endif /* HAVE_LIBID3 */        
+     }
diff --git a/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
new file mode 100644
index 000000000000..52cea88b89ed
--- /dev/null
+++ b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
@@ -0,0 +1,243 @@
+* Remove completely broken Qt handling, dating back to Qt3 days
+* Fix ancient C++ includes using '.h' suffixes
+* Fix warnings caused by not using 'const char*'
+
+--- splay-0.9.5.2/apps/Makefile.am
++++ splay-0.9.5.2/apps/Makefile.am
+@@ -1,4 +1,4 @@
+-bin_PROGRAMS = splay @XSPLAY@
++bin_PROGRAMS = splay
+ EXTRA_PROGRAMS =xsplay
+ splay_SOURCES =  common.cc splay.cc splay.h
+ xsplay_SOURCES = xsplay.cc functions.cc \
+@@ -17,7 +17,7 @@
+ INCLUDES = -I../libs  -I/usr/include/qt
+ xsplay_LDADD=-lqt $(LDADD)
+ 
+-man_MANS = splay.1 xsplay.1
++man_MANS = splay.1
+ EXTRA_DIST = $(man_MANS)
+ 
+ 
+--- splay-0.9.5.2/configure.ac
++++ splay-0.9.5.2/configure.ac
+@@ -15,7 +15,7 @@
+ AC_CHECK_LIB(id3, ID3Tag_New)
+ AC_CHECK_LIB(m, cos)
+ AC_CHECK_LIB(pthread,main,INCLUDEPTHREAD=1)
+-AC_CHECK_LIB(qt, main,XSPLAY=xsplay)
++
+ 
+ if test "$INCLUDEPTHREAD" = 1; then
+ 	LIBS="$LIBS -lpthread"
+--- splay-0.9.5.2/apps/common.cc
++++ splay-0.9.5.2/apps/common.cc
+@@ -34,7 +34,7 @@
+ int splay_threadnum=50;
+ #endif
+ 
+-char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
++const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
+ { "Failed to open sound device.",
+   "Sound device is busy.",
+   "Buffersize of sound device is wrong.",
+--- splay-0.9.5.2/apps/splay.cc
++++ splay-0.9.5.2/apps/splay.cc
+@@ -16,20 +16,23 @@
+ 
+ #include <sys/types.h>
+ #include <sys/wait.h>
+-#include <iostream.h>
++#include <iostream>
+ 
+ #ifdef HAVE_LIBID3
+ #include <id3/tag.h>
+ #include <id3/misc_support.h>
+ #endif /* HAVE_LIBID3 */
+ 
+-#include <iomanip.h>
++#include <iomanip>
++
++using std::cout;
++using std::endl;
+ 
+ #include "mpegsound.h"
+ 
+ #include "splay.h"
+ 
+-static char *help=
++static const char *help=
+ "\t-2 : playing with half frequency.\n"
+ "\t-e : exit when playing is done. (only XSPLAY)\n"
+ "\t-f : display frame and time info (played and remaining).\n"
+--- splay-0.9.5.2/apps/splay.h
++++ splay-0.9.5.2/apps/splay.h
+@@ -20,7 +20,7 @@
+             splay_forcetomonoflag,
+             splay_frameinfo;
+ 
+-extern char *splay_Sounderrors[];
++extern const char *splay_Sounderrors[];
+ 
+ #ifdef PTHREADEDMPEG
+ extern int  splay_threadnum;
+--- splay-0.9.5.2/apps/xsplay.cc
++++ splay-0.9.5.2/apps/xsplay.cc
+@@ -29,8 +29,8 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++#include <iomanip>
+ 
+ #include "mpegsound.h"
+ #include "xsplay.h"
+--- splay-0.9.5.2/libs/fileplayer.cc
++++ splay-0.9.5.2/libs/fileplayer.cc
+@@ -10,7 +10,7 @@
+ #endif
+ 
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+@@ -18,6 +18,10 @@
+ 
+ #include "mpegsound.h"
+ 
++using std::cout;
++using std::cerr;
++using std::endl;
++
+ // File player superclass
+ Fileplayer::Fileplayer()
+ {
+@@ -43,7 +47,7 @@
+   if(server)delete server;
+ }
+ 
+-bool Mpegfileplayer::openfile(char *filename,char *device)
++bool Mpegfileplayer::openfile(char *filename, const char *device)
+ {
+ // Player
+   if(device==NULL){
+@@ -188,7 +192,7 @@
+ 
+ void Mpegfileplayer::showverbose(int )
+ {
+-  static char *modestring[4]={"stereo","joint stereo","dual channel","mono"};
++  static const char *modestring[4]={"stereo","joint stereo","dual channel","mono"};
+ 
+   fprintf(stderr,"\tMPEG-%d Layer %d, %s,\n\t%dHz%s, %dkbit/s, ",
+ 	  server->getversion()+1,
+--- splay-0.9.5.2/libs/mpegsound.h
++++ splay-0.9.5.2/libs/mpegsound.h
+@@ -230,7 +230,7 @@
+   Soundplayer() {__errorcode=SOUND_ERROR_OK;};
+   virtual ~Soundplayer();
+ 
+-  virtual bool initialize(char *filename)                       =0;
++  virtual bool initialize(const char *filename)                       =0;
+   virtual void abort(void);
+   virtual int  getprocessed(void);
+ 
+@@ -255,7 +255,7 @@
+ public:
+   ~Rawtofile();
+ 
+-  bool initialize(char *filename);
++  bool initialize(const char *filename);
+   bool setsoundtype(int stereo,int samplesize,int speed);
+   bool putblock(void *buffer,int size);
+ 
+@@ -270,7 +270,7 @@
+ public:
+   ~Rawplayer();
+ 
+-  bool initialize(char *filename);
++  bool initialize(const char *filename);
+   void abort(void);
+   int  getprocessed(void);
+ 
+@@ -284,7 +284,7 @@
+   void setquota(int q){quota=q;};
+   int  getquota(void) {return quota;};
+ 
+-  static char *defaultdevice;
++  static const char *defaultdevice;
+   static int  setvolume(int volume);
+ 
+ private:
+@@ -573,7 +573,7 @@
+ 
+   int geterrorcode(void)        {return __errorcode;};
+ 
+-  virtual bool openfile(char *filename,char *device)=0;
++  virtual bool openfile(char *filename, const char *device)=0;
+   virtual void setforcetomono(bool flag)            =0;
+   virtual bool playing(int verbose,bool frameinfo, int startframe)                 =0;
+ 
+@@ -593,7 +593,7 @@
+   Mpegfileplayer();
+   ~Mpegfileplayer();
+ 
+-  bool openfile(char *filename,char *device);
++  bool openfile(char *filename, const char *device);
+   void setforcetomono(bool flag);
+   void setdownfrequency(int value);
+   bool playing(int verbose, bool frameinfo, int startframe);
+--- splay-0.9.5.2/libs/mpegtoraw.cc
++++ splay-0.9.5.2/libs/mpegtoraw.cc
+@@ -552,7 +552,7 @@
+ #endif
+ 
+ 
+-#include <iostream.h>
++#include <iostream>
+ // Convert mpeg to raw
+ bool Mpegtoraw::run(int frames)
+ {
+--- splay-0.9.5.2/libs/rawplayer.cc
++++ splay-0.9.5.2/libs/rawplayer.cc
+@@ -24,7 +24,7 @@
+ #define IOCTL(a,b,c)		(c = ioctl(a,b,c) )
+ #endif
+ 
+-char *Rawplayer::defaultdevice="/dev/dsp";
++const char *Rawplayer::defaultdevice="/dev/dsp";
+ 
+ /* Volume */
+ int Rawplayer::setvolume(int volume)
+@@ -57,7 +57,7 @@
+   close(audiohandle);
+ }
+ 
+-bool Rawplayer::initialize(char *filename)
++bool Rawplayer::initialize(const char *filename)
+ {
+   int flag;
+ 
+@@ -172,7 +172,7 @@
+ 
+   if(quota)
+     while(getprocessed()>quota)usleep(3);
+-  write(audiohandle,buffer,modifiedsize);
++  if(write(audiohandle,buffer,modifiedsize)) {}
+ 
+   return true;
+ }
+--- splay-0.9.5.2/libs/rawtofile.cc
++++ splay-0.9.5.2/libs/rawtofile.cc
+@@ -20,7 +20,7 @@
+   close(filehandle);
+ }
+ 
+-bool Rawtofile::initialize(char *filename)
++bool Rawtofile::initialize(const char *filename)
+ {
+   if(filename==NULL)filehandle=1;
+   else if((filehandle=creat(filename,0644))==-1)
diff --git a/media-sound/splay/files/splay-0.9.5.2-fix-c++14.patch b/media-sound/splay/files/splay-0.9.5.2-fix-c++14.patch
new file mode 100644
index 000000000000..328463aaa67b
--- /dev/null
+++ b/media-sound/splay/files/splay-0.9.5.2-fix-c++14.patch
@@ -0,0 +1,28 @@
+Fix building with C++14, which errors out due to narrowing conversions.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=594684
+
+--- a/libs/huffmantable.cc
++++ b/libs/huffmantable.cc
+@@ -550,11 +550,11 @@
+ 
+ const HUFFMANCODETABLE Mpegtoraw::ht[HTN]=
+ {
+-  { 0, 0-1, 0-1, 0,  0, htd33},
++  { 0, (unsigned int)(0-1), (unsigned int)(0-1), 0,  0, htd33},
+   { 1, 2-1, 2-1, 0,  7,htd01},
+   { 2, 3-1, 3-1, 0, 17,htd02},
+   { 3, 3-1, 3-1, 0, 17,htd03},
+-  { 4, 0-1, 0-1, 0,  0, htd33},
++  { 4, (unsigned int)(0-1), (unsigned int)(0-1), 0,  0, htd33},
+   { 5, 4-1, 4-1, 0, 31,htd05},
+   { 6, 4-1, 4-1, 0, 31,htd06},
+   { 7, 6-1, 6-1, 0, 71,htd07},
+@@ -564,7 +564,7 @@
+   {11, 8-1, 8-1, 0,127,htd11},
+   {12, 8-1, 8-1, 0,127,htd12},
+   {13,16-1,16-1, 0,511,htd13},
+-  {14, 0-1, 0-1, 0,  0, htd33},
++  {14, (unsigned int)(0-1), (unsigned int)(0-1), 0,  0, htd33},
+   {15,16-1,16-1, 0,511,htd15},
+   {16,16-1,16-1, 1,511,htd16},
+   {17,16-1,16-1, 2,511,htd16},
diff --git a/media-sound/splay/files/splay-0.9.5.2-gcc43-2.patch b/media-sound/splay/files/splay-0.9.5.2-gcc43-2.patch
new file mode 100644
index 000000000000..d07090743b5a
--- /dev/null
+++ b/media-sound/splay/files/splay-0.9.5.2-gcc43-2.patch
@@ -0,0 +1,42 @@
+diff -Nurpa splay-0.9.5.2.orig/apps/splay.cc splay-0.9.5.2/apps/splay.cc
+--- splay-0.9.5.2.orig/apps/splay.cc	2008-12-17 03:37:47.000000000 +0300
++++ splay-0.9.5.2/apps/splay.cc	2008-12-17 03:39:34.000000000 +0300
+@@ -150,16 +150,16 @@ ostream& operator<<(ostream& s, const ID
+   // Print just what we want...
+   s.setf(ios::left);  // The filled fields get the text to the left
+   s << 
+-    "Title : " << nn(ID3_GetTitle(tag)) << endl;
++    "Title : " << nn(ID3_GetTitle(tag)) << std::endl;
+   s << 
+-    "Artist: " << setw(30) << nn(ID3_GetArtist(tag)) << 
++    "Artist: " << std::setw(30) << nn(ID3_GetArtist(tag)) << 
+     "Album: " << nn(ID3_GetAlbum(tag)) << 
+-    endl ; 
++    std::endl ; 
+   
+   s << 
+-    "Genre : " << setw(18) << nn(ID3_gen_list[ID3_GetGenreNum(tag)]) << 
+-    "Track: " << setw(5) << ID3_GetTrackNum(tag) << 
+-    "Year: " <<  setw(6) << nn(ID3_GetYear(tag)); 
++    "Genre : " << std::setw(18) << nn(ID3_gen_list[ID3_GetGenreNum(tag)]) << 
++    "Track: " << std::setw(5) << ID3_GetTrackNum(tag) << 
++    "Year: " <<  std::setw(6) << nn(ID3_GetYear(tag)); 
+ //   if ( ID3_GetComment(tag) ){
+ //     s << endl << "Comment:" << nn(ID3_GetComment(tag)) <<
+ //       nn(ID3_GetLyricist(tag)) << nn(ID3_GetLyrics(tag));
+@@ -180,13 +180,13 @@ static void play(char *filename)
+       try {
+ 	const ID3_Tag*  mytag = new ID3_Tag(filename);
+ 	if ( mytag->HasV1Tag() || mytag->HasV2Tag()  )
+-	  cout << mytag << endl;
++	  std::cout << mytag << std::endl;
+ 	delete mytag;
+ 	
+       }
+ //      catch(ID3_Error &err){
+       catch(...){
+-	cout << "Error found (GetError functions disabled)" << endl;
++	std::cout << "Error found (GetError functions disabled)" << std::endl;
+ //	cout << err.GetErrorFile() << " (" << err.GetErrorLine() << "): "
+ //	     << err.GetErrorType() << ": " << err.GetErrorDesc() << endl;
+       }
diff --git a/media-sound/splay/metadata.xml b/media-sound/splay/metadata.xml
new file mode 100644
index 000000000000..0de8cce1131e
--- /dev/null
+++ b/media-sound/splay/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">splay</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/splay/splay-0.9.5.2-r2.ebuild b/media-sound/splay/splay-0.9.5.2-r2.ebuild
new file mode 100644
index 000000000000..2878aaf04bc3
--- /dev/null
+++ b/media-sound/splay/splay-0.9.5.2-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="An audio player, primarily for the console"
+HOMEPAGE="http://splay.sourceforge.net/"
+SRC_URI="http://splay.sourceforge.net/tgz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="media-libs/id3lib"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-external-id3lib.diff"
+	"${FILESDIR}/${P}-gcc43-2.patch"
+	"${FILESDIR}/${P}-fix-buildsystem.patch"
+	"${FILESDIR}/${P}-fix-c++14.patch"
+)
+
+src_prepare() {
+	mv configure.{in,ac} || die
+	default
+	eautoreconf
+}
diff --git a/media-sound/split2flac/Manifest b/media-sound/split2flac/Manifest
new file mode 100644
index 000000000000..4904b9152d8a
--- /dev/null
+++ b/media-sound/split2flac/Manifest
@@ -0,0 +1,6 @@
+DIST split2flac-122.tar.gz 9468 SHA256 96dd53c92935ae6cb1650bf92f989658d7909b691bbec12b639736f79f5b639c SHA512 3be5d8f5a55107a6230108bb49b422303504a1b16ebf458759122b27effb492353f92f95c00bcfa52b45fad24a4e08fa638df9922288bc2844e3a971d3734ed8 WHIRLPOOL 14c5252ba8c2fd56b580090797afdaae74a504c797775d309cce69c50ecf3af3a73f5d6ad8a82e2bd15ff87b18687c6a49f0c84b33bec7654d55303e50919f24
+EBUILD split2flac-122.ebuild 1374 SHA256 149407268a200cf38422ce67a314b6e82bffe52786bd037be9e2f041295dc482 SHA512 61bb802ec97594ec49853ebe37a3cd97ead2f5987e6c2a61196d52a5f4c89d442869d5878b1aacf993608343f6456560056c1c2e84a40d02be4d73576b3c3783 WHIRLPOOL 04d7bf8042fa5c4588284d94b935aa254a91e45ed4c9c1d07dea8cf3565159f6a2096ba841616f65418156eb85a2b590613c195c3aae5a667c2ae5989bff4eee
+EBUILD split2flac-9999.ebuild 1354 SHA256 f10c18a9cc4993aae2e1bfad40b72c0452d393053cee8f7784452e4f6ef5658e SHA512 273f804d359531b2158c3572a2e9a71f54437aa5274f2f2ac8c12c5a1518401360074d9edc2356bcdbddfea6bda35fe4c16c31264563630a15b1ac2da8b97d1b WHIRLPOOL ec78cc377656482dc25b607ab09d483a93a3e33629b9e87c8bbdd832ee1881b289fb777cbf8b2d4f6e0cd8be229079ad70e5b2f73b65e3d395e292c263a16d2e
+MISC ChangeLog 3442 SHA256 cd1b921e5215f249db49a8f12cee02831c2e5ffd8ee928618285cb303033b83a SHA512 0650ba13f48c624b8e7c04a6e694620dd8acab3da21579f3e3d8c7c157d059d3f70a56bdf7b4411388807c6e46502b5e698065d49ce1cc791eb66b162f0467fa WHIRLPOOL 51056aa10d8dbefe5fad95cddfdcb3dc0de5f71655495a62736f54e0e93062aa2420c7b75276bb298ea923cb6a9f781724101a8298e22ac711347c9016c3706e
+MISC ChangeLog-2015 2900 SHA256 2e9279f8d1f081615404893d666d6676b4b35f85c01afe0f1cef3f0c296980c2 SHA512 b86639500308df61d46f860641772bac8105688e668492ad77a9ebc232c39ab567f8fb29acadfa46a04e6052267f32633853a9864ad66400b9e30fcd92a3581a WHIRLPOOL fa18b89992a69a53c7cce863c258be0377a851610848d38f3de43404566c3c95bad7e9f52464d3fa24c561a2ec90bebada41160c733fb21977179e461babb83f
+MISC metadata.xml 1246 SHA256 c1e00f10370ecbe3be10139d2a3aca80a70debe56102dbcaf82b2a484f5d4ea7 SHA512 ee36cd39bb98e817542a6292f70e8867508eaae58e4b6a14fd1874bbeb8f21422385d07cfb1f9280852c40b3cdf87a1cde895fb327230e93a5c67a2e8f478cf4 WHIRLPOOL b114200bc96126a712085809c91de864d4aa61a34308cede4c3c4d01de6652a040beb24f409260130ec2f245da137ae8b7f2c6638da88602281c444cbaa7c08b
diff --git a/media-sound/split2flac/metadata.xml b/media-sound/split2flac/metadata.xml
new file mode 100644
index 000000000000..d20b4cebdc6c
--- /dev/null
+++ b/media-sound/split2flac/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>maksbotan@gentoo.org</email>
+    <name>Maxim Koltsov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Split2flac splits one big APE/FLAC/WV/WAV audio image (or a collection of
+    such files, recursively) with CUE sheet into FLAC/M4A/MP3/OGG_VORBIS/WAV
+    tracks with tagging, renaming, charset conversion of cue sheet, album cover
+    images. It also uses configuration file, so no need to pass a lot of
+    arguments every time, only an input file. Should work in any
+    POSIX-compliant shell.
+  </longdescription>
+  <use>
+    <flag name="enca">Try to guess the charset using enca</flag>
+    <flag name="flake">Add support for Flake, alternative FLAC encoder</flag>
+    <flag name="mac">Add support for Monkey's Audio files</flag>
+    <flag name="replaygain">Support for Replay Gain metadata, for relative
+      volume adjustment</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">ftrvxmtrx/split2flac</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/split2flac/split2flac-122.ebuild b/media-sound/split2flac/split2flac-122.ebuild
new file mode 100644
index 000000000000..16367b13e346
--- /dev/null
+++ b/media-sound/split2flac/split2flac-122.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+EGIT_REPO_URI="https://github.com/ftrvxmtrx/split2flac.git"
+
+inherit bash-completion-r1
+[[ ${PV} == *9999* ]] && inherit git-2
+
+DESCRIPTION="sh script to split an APE/FLAC/WV/WAV audio image with CUE sheet into tracks"
+HOMEPAGE="https://github.com/ftrvxmtrx/split2flac"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="https://github.com/ftrvxmtrx/split2flac/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="amd64 x86"
+IUSE="enca flake imagemagick mac mp3 mp4 ogg replaygain wavpack"
+
+RDEPEND="
+	app-cdr/cuetools
+	media-sound/shntool[mac?]
+	virtual/libiconv
+	media-libs/flac
+	enca? ( app-i18n/enca )
+	flake? ( media-sound/flake )
+	mp3? ( media-sound/lame || ( media-libs/mutagen media-libs/id3lib ) )
+	mp4? ( media-libs/faac media-libs/libmp4v2:0[utils] )
+	ogg? ( media-sound/vorbis-tools )
+	wavpack? ( media-sound/wavpack )
+	replaygain? (
+		mp3? ( media-sound/mp3gain )
+		mp4? ( media-sound/aacgain )
+		ogg? ( media-sound/vorbisgain )
+	)
+	imagemagick? ( media-gfx/imagemagick )
+"
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dobin ${PN}
+	newbashcomp ${PN}-bash-completion.sh ${PN}
+
+	dosym ${PN} /usr/bin/split2wav
+	for i in mp3 mp4 ogg
+	do
+		use $i && dosym ${PN} /usr/bin/split2${i/mp4/m4a}
+	done
+}
diff --git a/media-sound/split2flac/split2flac-9999.ebuild b/media-sound/split2flac/split2flac-9999.ebuild
new file mode 100644
index 000000000000..1f3c0218f1be
--- /dev/null
+++ b/media-sound/split2flac/split2flac-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+EGIT_REPO_URI="https://github.com/ftrvxmtrx/split2flac.git"
+
+inherit bash-completion-r1
+[[ ${PV} == *9999* ]] && inherit git-2
+
+DESCRIPTION="sh script to split an APE/FLAC/WV/WAV audio image with CUE sheet into tracks"
+HOMEPAGE="https://github.com/ftrvxmtrx/split2flac"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="https://rion-overlay.googlecode.com/files/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="enca flake imagemagick mac mp3 mp4 ogg replaygain wavpack"
+
+RDEPEND="
+	app-cdr/cuetools
+	media-sound/shntool[mac?]
+	virtual/libiconv
+	media-libs/flac
+	enca? ( app-i18n/enca )
+	flake? ( media-sound/flake )
+	mp3? ( media-sound/lame || ( media-libs/mutagen media-libs/id3lib ) )
+	mp4? ( media-libs/faac media-libs/libmp4v2:0[utils] )
+	ogg? ( media-sound/vorbis-tools )
+	wavpack? ( media-sound/wavpack )
+	replaygain? (
+		mp3? ( media-sound/mp3gain )
+		mp4? ( media-sound/aacgain )
+		ogg? ( media-sound/vorbisgain )
+	)
+	imagemagick? ( media-gfx/imagemagick )
+"
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dobin ${PN}
+	newbashcomp ${PN}-bash-completion.sh ${PN}
+
+	dosym ${PN} /usr/bin/split2wav
+	for i in mp3 mp4 ogg
+	do
+		use $i && dosym ${PN} /usr/bin/split2${i/mp4/m4a}
+	done
+}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
new file mode 100644
index 000000000000..3625cfa0907f
--- /dev/null
+++ b/media-sound/spotify/Manifest
@@ -0,0 +1,9 @@
+DIST spotify-client_1.0.49.125.g72ee7853-111_amd64.deb 73404932 SHA256 1d6d1cccfb7f996b835f21c8dbabc16ca4bd214878e06738dba7886640470050 SHA512 f6152f71fae3827e1f9dfb07cbe30319f090db151702ca02f3566f3deeec369da0c70f9995a548e0df92d655b593de520ab387a011201317753d3def70741e24 WHIRLPOOL b5111509c902068bd2559267bfd2febfab8b4464d73e54a302d23807338e796045901fe14b9c229e6a412553f7cfe84e903ddfc4c4c3e9a60609b23a7ecf2c3c
+DIST spotify-client_1.0.49.125.g72ee7853-22_i386.deb 74637938 SHA256 96c02fdc77991feb0797089d701744c2de4584322f966a1c070b559df27f9b04 SHA512 4a8aab47b6b0c2ac9b349c858e4728451e713c466bcff9c1eac9c6215259ad9325a51b0fc8bd2afcfa141a6ad518f97d408b5d779a126f2ac62c9e8be93f5f93 WHIRLPOOL 9bd02e73731cc4d2e55c43b08d1bea1d3fcfecb13ebdf8fe591aa5be6961423e3463a2fd625745561ebb7f33c902246a84f406bcc1dd3f7f47ffad6b98daa451
+DIST spotify-client_1.0.64.407.g9bd02c2d-26_amd64.deb 93425432 SHA256 8c97a95ade46ce9f8e2bbe565cd2e79396ed31fc4f0646a907a6f3e028db887d SHA512 78352ed0cd116b8ef8c2b9ffc3c186d2fecd3dd5f49f0f732ccf0a3a796b72faf60cd4997355bb4f34f450f8af0b7684e28e8e21a14b7902cba2ea49fe4a81eb WHIRLPOOL db9d74ce31d57704184e6a00b18b3cc417cdffeb6e582d0c41ddc0ba5c822fa4dfebad9d9cf151ebecc46d3b3892714e0fec91ced356d57f3c51dd94a8cce370
+DIST spotify-client_1.0.64.407.g9bd02c2d-26_i386.deb 97705428 SHA256 0e32bc8b21d591f8def932403b8ef3632e95eba4b5628506dfdf6d521dce7941 SHA512 43342faf26b7530dbb3fecafebcb7dac6ed6b7323c845f373bb63760ab309f4f01c6f4dd1cb4ab1bfd9a97b383fb863ba5f2aa7e73d32d1575bf8964dcdf30a5 WHIRLPOOL f3c42136e0682bddaec17829a05a9237d95b6d8f79b9ed27e2cdd77d011ea015fb4532d5f5878c03e15661207779a65e7e228a46821c13899b17513f12612863
+EBUILD spotify-1.0.49.ebuild 3277 SHA256 c27a70d3d8f4079135962604d88fc526ffec1e7e2d53c71014ff9a018a482cf3 SHA512 4136d24710c2ec3772e3a896b254eff5bc72db69ac250e823fd7d95a2d5b508707cc4420e8d7e505b7c1a0703f9d088c1f774e8172a0477d79634dbf4c5bb401 WHIRLPOOL f409ae1f35d78fa6c7d93f674aa87e553eac0b879a68a8299ca8d7d650f6d82ccef6e27e718cfdea8dbe1ba04ec14b665d406c751366d5be2462c5bcc0116660
+EBUILD spotify-1.0.64.ebuild 3270 SHA256 02e9f2085aa76b2e1a9c4bb641e86f295a7a6f0fdf9a515a6fa05c3de3ed296d SHA512 54c2ba6d0a6d0966e47ddeaf50dbe60d9085b7b6b95e2d391080493750e3e4ad591943ab56e848e3a23be89d53a6fa7004e12784e7070c4a3cbedeea81c4ed5d WHIRLPOOL e39299f32da24271e5c6ce99c064c7942396b7e8e8ed2aa52885880af6e6c4f036981334bfc2cd39bec6f6dd25449a3f4d61fed362ee7e7d77486cce180f84ea
+MISC ChangeLog 12081 SHA256 9e5c2f8b289533cca9ed5549d38602649a59d5c4a470b8dde4b75aedb5a26597 SHA512 b3af791f79c30a3010c6e8d767503b5d59ce858ecdda4e07bdb580a0c436b3b6b4bdf800805aca4d22aec09d89efb43a8ef1ca1c6c4907889d2e0f93ed96cf00 WHIRLPOOL 4341491bb2ec33effbf176fc4116d49751b353b4abb6499bcc69bc7085930b2fad446e82e7b716d9655e4268ea45f00e14e34e013b479af8a2529a76e65e858f
+MISC ChangeLog-2015 7294 SHA256 09f13a6ecc5fda5e12291f061eeb9ef9757017d91f9efbd8ccedf3d1262c5653 SHA512 030d4657a3c92c7311c96401e227f6b09a6c842a7935b1286c60e86cf85cfcf72acd8e80a7ebd15324ad7efe922c06cde6930757eeb70fb0682b6cf8219a8019 WHIRLPOOL 39e8775ef34231dfd628ff6d468d09bd114ac4da9c4365ad8a84b1391a757a064210e667464d102261e129163e36d53a48e35fe8001ee1d28ceedf0d4291018b
+MISC metadata.xml 349 SHA256 61c3a19b42a59b4881ec543958d205d86d441a0aefd68393de8c0d6de54812de SHA512 e39bca3abfb9169f633c009af54681a96b0d1f26d5edd9a0cb5c0a7b2aacfd70fdc4db317bde3273a1e37c04db520fcb0dcbb67167893a40a8fa6766a6637af1 WHIRLPOOL a68aa937b59e907ee396676089418d698948cd1780d15a56a1d0b1d805d530c44ec3ff308d859712fec2bd85cb9d0fefcc2cb70c39a76d184845a539575ac9da
diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
new file mode 100644
index 000000000000..9ce054e1b38b
--- /dev/null
+++ b/media-sound/spotify/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <use>
+    <flag name="pax_kernel">Triggers a paxmarking of the main Spotify binary</flag>
+  </use>
+<maintainer type="person">
+<email>prometheanfire@gentoo.org</email>
+<name>Matthew Thode</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/spotify/spotify-1.0.49.ebuild b/media-sound/spotify/spotify-1.0.49.ebuild
new file mode 100644
index 000000000000..061ed8fe0bc6
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.49.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils fdo-mime gnome2-utils pax-utils unpacker
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+BUILD_ID="125.g72ee7853"
+SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/"
+SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-111_amd64.deb )
+	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-22_i386.deb )"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gnome pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=""
+# zenety needed for filepicker
+RDEPEND="
+	${DEPEND}
+	dev-libs/nss
+	gnome-base/gconf
+	gnome-extra/zenity
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl[ssl,curl_ssl_openssl]
+	net-print/cups[ssl]
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	dev-python/pygobject:3
+	dev-python/dbus-python
+	pulseaudio? ( media-sound/pulseaudio )
+	gnome? ( gnome-extra/gnome-integration-spotify )"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
+	if use gnome ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+}
+
+src_install() {
+	dodoc usr/share/doc/spotify-client/changelog.gz
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+	ewarn
+	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
+	ewarn "Run"
+	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
+	ewarn "Then log out and log in back to KDE."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-sound/spotify/spotify-1.0.64.ebuild b/media-sound/spotify/spotify-1.0.64.ebuild
new file mode 100644
index 000000000000..d88f039e41f4
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.64.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils fdo-mime gnome2-utils pax-utils unpacker
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+BUILD_ID="407.g9bd02c2d"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-26_amd64.deb )
+	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-26_i386.deb )"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=""
+# zenety needed for filepicker
+RDEPEND="
+	${DEPEND}
+	dev-libs/nss
+	gnome-base/gconf
+	gnome-extra/zenity
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl[ssl,curl_ssl_openssl]
+	net-print/cups[ssl]
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	dev-python/pygobject:3
+	dev-python/dbus-python
+	pulseaudio? ( media-sound/pulseaudio )
+	gnome? ( gnome-extra/gnome-integration-spotify )"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
+	if use gnome ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+}
+
+src_install() {
+	dodoc usr/share/doc/spotify-client/changelog.gz
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+	ewarn
+	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
+	ewarn "Run"
+	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
+	ewarn "Then log out and log in back to KDE."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest
new file mode 100644
index 000000000000..007ef213c70c
--- /dev/null
+++ b/media-sound/streamripper/Manifest
@@ -0,0 +1,5 @@
+DIST streamripper-1.64.6.tar.gz 900205 SHA256 c1d75f2e9c7b38fd4695be66eff4533395248132f3cc61f375196403c4d8de42 SHA512 8477086d0099f6de861f1c47112476c427073b6e8127bbaaa2dd3e7930fe9a5c6d9b2c68d4a317f1bc0b20c625e665d5c245189049d35468aa83cf51828d4428 WHIRLPOOL dd53b9178b248d8d177cbc1af6fb94782bd648aa91be9f96d072e936068e3a9ad7b1491b00c4ce0e432c53553e491ca91208cb9a0ddb82814cf4d556169fe096
+EBUILD streamripper-1.64.6.ebuild 826 SHA256 08ba776ccc0a3a1099a08e0d01dd2873d9c9c4e5c6f28537746f14b86ff43fda SHA512 381949a9a8879a8484448970b6aa2a66dda727f838ee5fde694f51fb4e1e5e8f291f96ac938c5b981d3f235e0041374adbf1d8180e0dd4a69f58da50c585c399 WHIRLPOOL 1683ed450e52a616c66257841b15543b49ce2decf6e863085a83d3480378c80515c49a08409479de7d21996e07e5c3b7e1ab0feb3ead4a58f54b9f5e877721bf
+MISC ChangeLog 2447 SHA256 0872c4c36d07cb632af6c1e27b65fc4d7b758af595c2061af1136e4aedcedaf0 SHA512 74a7a933b9658ab930d2a4428b9f383715b1850b0597175ac03476c1f502c5725e5dbb36ea138a3d01259e361e0ed9ae1f17663781550a1e8df96d805e5c9a07 WHIRLPOOL 0981f69e1d7876aa2d8acd73dee3f629aceb4dab3a72239f73dd911853188cf85ad1426034885c5badeb3a01408ee666f65e0003e1105867bb2f8071c4204d9b
+MISC ChangeLog-2015 10629 SHA256 d9a63cfe22c3606915a78e3cf2077198731cf5a7fc9b12ee54eb5fd449c14a24 SHA512 99f8befc3f1902e8825a0569955cc45b35bb4a9b327ef352d20d67b5a857e138135e2f57cfe57421fc97f985f7047edb6344d95de67edb543a97a46cedf404b6 WHIRLPOOL 78c7da43eebd0cf1fd7a78aa79fcd6ad8261238c0960ccdd393f4de1785449f861c5b315c3f6bbab08d757f5be3547badd56d25ba0776465c7b3e983f843a2c2
+MISC metadata.xml 345 SHA256 438c7667cf32103759e7fd762b94f48b558321d9a81a1838c92dfc06716c86da SHA512 6830a4fe1eedf9577237eb166dd97594bfe9e19a5d95578992ba2f90de46ec62679dde5a60fb9abc5887e5e7374b0742676b63e25db0106ec4f84cdac85629f0 WHIRLPOOL 29c8416b7bdd26043420ed23c95a094bbf9ad03606feddae0c5b5af1dddf951d1d0ad839df8e8ae816eab7b9aa4bf96f73fbeebc715c69624fb2dc65ff8430ed
diff --git a/media-sound/streamripper/metadata.xml b/media-sound/streamripper/metadata.xml
new file mode 100644
index 000000000000..fc27a2d11134
--- /dev/null
+++ b/media-sound/streamripper/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">streamripper</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/streamripper/streamripper-1.64.6.ebuild b/media-sound/streamripper/streamripper-1.64.6.ebuild
new file mode 100644
index 000000000000..15242a2342ad
--- /dev/null
+++ b/media-sound/streamripper/streamripper-1.64.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+DESCRIPTION="Extracts and records individual MP3 file tracks from shoutcast streams"
+HOMEPAGE="http://streamripper.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="vorbis"
+
+RDEPEND="media-libs/libmad
+	media-libs/faad2
+	>=dev-libs/glib-2.16
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--without-included-libmad \
+		--without-included-argv \
+		$(use_with vorbis ogg)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc CHANGES parse_rules.txt README THANKS
+}
diff --git a/media-sound/streamtranscoder/Manifest b/media-sound/streamtranscoder/Manifest
new file mode 100644
index 000000000000..9bdf54c38827
--- /dev/null
+++ b/media-sound/streamtranscoder/Manifest
@@ -0,0 +1,8 @@
+AUX streamtranscoder-1.2.4-build.patch 1732 SHA256 56d597e54f88430a2ce272ec20255e2b228b109b2336d34bfc10b82a670fd60d SHA512 84d8a20b1157a927bb25c38c9cb9cb493b8b7b425545b2ac4ffaa7da379314ab7e5a9b95bb0595e2a98481100947839d3f5dba94aa1e8b737f49f895b55814f6 WHIRLPOOL 6981a7ae84ad5fe65d756d332c8674fa00c1dc99df8b571fbd106d9855ae245244a7bbe834f9ce74b56fc8d2c1f3ab7fde8646ccd6b300bc1826f55246c8def3
+DIST streamtranscoder-1.2.4.tar.gz 352873 SHA256 8cea5f0f4b27a31eb92b6e72c73d6bbf737f7a7ac6248399c591e44e1b280c71 SHA512 c2a4d866e65628777a15ac301bbd06bdc5cab1558747c07d4b12d2b007989ab871ee0e5109f503779bf8554897a2ff11aab0ea9c522979bdee540235d2054071 WHIRLPOOL ff1293a6b7acae736704b57f19c74f72282416c86b475d330f4ca1a365725e10860b65b6109b2414ddaa61571f621b40947238ead79b76fb98ec35f79230feb5
+DIST streamtranscoderv3-3.1.11.tar.gz 480731 SHA256 f69cf4b2d5a08c2cc4b6be63053954a55a6fe156877dca49abb37aa962d38e09 SHA512 5682d8bc8f93a85bd84ba4bba37d1613f3b53afea9499d9417daa40806b4fb7e4fd77c209df2e68ea5e102a783ad8c2424468022e71366114006d041d4e20b99 WHIRLPOOL 408f6dde24e61f20a574a95e5e840520a3b6bc0fb4561d31a63cc92d22176556d34823a4c0f4f422eb9d77af8f8a2a7420f8d5d633c962f26d2cf5a82d6bcfe0
+EBUILD streamtranscoder-1.2.4.ebuild 696 SHA256 82be1b824a51c0def745705625ad500d6b98d606828c5ff9ff260dc2d505ffe0 SHA512 29c58d989fb2a6afc584002d69c8e17db66aa12e6448eacad80ee112855cdb04e9f243479fdce98a9092c9d69a1904944191e7e6233947b6dba308201f092c54 WHIRLPOOL f6ec7dfaf25f7a8f2332055cffe6ddf6e7f69325684b8effb604a2a0837518affc10697bbf1322960c4f5b499056d46e5261f8b18c0de9106bfd4b0de344b134
+EBUILD streamtranscoder-3.1.11.ebuild 618 SHA256 ccaff62db75bb8aac6598320952dd30fc899119592b4e060f8f0ce1f2ebcc411 SHA512 a4b29964d0c4dc03fc5bb395d6b9c28a2b683013b408b5ac24e91fcf42939b1f353adbc8a880dff45e11c78dd8d5a086429552dfeddbc2797f216d9d15e8d99b WHIRLPOOL 2475c61d538c2b698cee79b28c47fdd99084a55b553f629a7c4017f8a4238245259f930f5c37d6abf8998c2244695c6a65a020832fc160a82f1bfd497bb90238
+MISC ChangeLog 2962 SHA256 21fb23412566242226fe8a57ff41d365ec4f5632f7333023cea32f7313c5c227 SHA512 d95e006f51773ff17945ffb5f961894e9c5fc013d9ec28084bfecdbb7440ea6417e4dbdf0bf791e20f9e6e3c1936004255a3890bf7d403bc168293f894bc4546 WHIRLPOOL 7f37173769345824a7a4a077d46c96e08d3c2c010c8784540b98c86461a7f32e378bdc139432be103a0fd44475f9dc2969d578f3d18cadca85afb6fa17984312
+MISC ChangeLog-2015 1907 SHA256 0747b5b6309cb69b8773fab5eaa9e18dd9a0b03351eaae8355e8035024d5cb6a SHA512 46e4594bf64382212ec8cb59f9bfa086f142d251f1bab86c0544b82624662a7b0120f02bbc401a1e330a6ac1f0731f8c3694ee570f57b06dc3807dc87973825e WHIRLPOOL 9c8cb358dd778ed0cdb097d0caa861366dcea705895a9b54bf0bf2bb81f75aecef9569ab1b1099ad935318ae0b3ea5e3f50762488afb348701e73821d276a196
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/streamtranscoder/files/streamtranscoder-1.2.4-build.patch b/media-sound/streamtranscoder/files/streamtranscoder-1.2.4-build.patch
new file mode 100644
index 000000000000..d79b074abd9d
--- /dev/null
+++ b/media-sound/streamtranscoder/files/streamtranscoder-1.2.4-build.patch
@@ -0,0 +1,59 @@
+--- a/configure.in
++++ b/configure.in
+@@ -83,22 +83,29 @@
+ 
+ dnl -- configure options --
+ 
+-XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!(Perhaps you need --with-ogg-prefix=/usr/local)))
+-XIPH_PATH_VORBIS(, AC_MSG_ERROR(must have Vorbis installed!(Perhaps you need --with-vorbis-prefix=/usr/local)))
+-AM_PATH_CURL(,,AC_MSG_ERROR(must have libcurl installed!))
+-AM_PATH_MAD(, AC_MSG_ERROR(must have libmad installed!))
+-AM_PATH_LAME(, AC_MSG_ERROR(must have libmp3lame installed!))
++PKG_CHECK_MODULES([OGG],[ogg])
++PKG_CHECK_MODULES([VORBIS],[vorbis])
++PKG_CHECK_MODULES([VORBISENC],[vorbisenc])
++PKG_CHECK_MODULES([VORBISFILE],[vorbisfile])
++PKG_CHECK_MODULES([CURL],[libcurl])
++PKG_CHECK_MODULES([MAD],[mad])
++
++AC_PATH_PROG([LAME],[lame])
+ 
+ dnl Make substitutions
+ 
+ AC_SUBST(MAD_CFLAGS)
+ AC_SUBST(MAD_LIBS)
+ AC_SUBST(LAME_CFLAGS)
+-AC_SUBST(LAME_LIBS)
++AC_SUBST([LAME_LIBS],[-lmp3lame])
+ AC_SUBST(OGG_CFLAGS)
+ AC_SUBST(VORBIS_CFLAGS)
++AC_SUBST(VORBISENC_CFLAGS)
++AC_SUBST(VORBISFILE_CFLAGS)
+ AC_SUBST(OGG_LIBS)
+ AC_SUBST(VORBIS_LIBS)
++AC_SUBST(VORBISENC_LIBS)
++AC_SUBST(VORBISFILE_LIBS)
+ AC_SUBST(LIBTOOL_DEPS)
+ AC_SUBST(OPT)
+ AC_SUBST(LIBS)
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -17,5 +17,6 @@
+  
+ INCLUDES = -I$(srcdir)/liboddcast -I$(srcdir)/libtranscoder
+ 
+-install-hook:
+-	cp transcoder.cfg $(DESTDIR)$(sysconfdir)/transcoder.cfg
++install-data-hook:
++	$(INSTALL) -d $(DESTDIR)$(sysconfdir)
++	$(INSTALL) -m644 transcoder.cfg $(DESTDIR)$(sysconfdir)/transcoder.cfg
+--- a/src/libtranscoder/transcurl.cpp
++++ b/src/libtranscoder/transcurl.cpp
+@@ -18,7 +18,6 @@
+ #include <winsock2.h>
+ #endif
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include "transcurl.h"
+ #include "cbuffer.h"
diff --git a/media-sound/streamtranscoder/metadata.xml b/media-sound/streamtranscoder/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/streamtranscoder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild b/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild
new file mode 100644
index 000000000000..3ad59e039eb8
--- /dev/null
+++ b/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Commandline program to transcode shoutcast/icecast streams to different bitrates"
+HOMEPAGE="http://www.oddsock.org"
+SRC_URI="http://www.oddsock.org/tools/streamTranscoder/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libogg-1.1
+	>=media-libs/libvorbis-1.0.1-r2
+	>=media-sound/lame-3.96
+	>=media-libs/libmad-0.15.1b
+	>=net-misc/curl-7.11.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
diff --git a/media-sound/streamtranscoder/streamtranscoder-3.1.11.ebuild b/media-sound/streamtranscoder/streamtranscoder-3.1.11.ebuild
new file mode 100644
index 000000000000..8e03e14c0175
--- /dev/null
+++ b/media-sound/streamtranscoder/streamtranscoder-3.1.11.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${PN}v3-${PV}
+
+DESCRIPTION="Commandline program to transcode shoutcast/icecast streams to different bitrates"
+HOMEPAGE="http://www.oddsock.org/tools/streamTranscoderV3"
+SRC_URI="http://www.oddsock.org/tools/streamTranscoderV3/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libogg-1.1
+	>=media-libs/libvorbis-1.0.1-r2
+	>=media-sound/lame-3.96
+	>=media-libs/libmad-0.15.1b
+	>=net-misc/curl-7.11.0"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
diff --git a/media-sound/subsonic-bin/Manifest b/media-sound/subsonic-bin/Manifest
new file mode 100644
index 000000000000..7f6210cfc38e
--- /dev/null
+++ b/media-sound/subsonic-bin/Manifest
@@ -0,0 +1,7 @@
+AUX subsonic.confd 420 SHA256 cc4b3a8dc7ffd6e77e91455f001ce6988952b0626f1e342f72d92eeb4b53692d SHA512 2e79c5a6fb12d0b8d4c5107175da8ca65bcc10e42c385b056ba5c5bb4c98c7d9995c391a5bddd726237a1f13bf37d1cbdc48f7fa7b9d3dd1e3aab20a212b00be WHIRLPOOL 5a53efeb87ba989f0e0907d002d598a013e03a6799e35e85f6f5fe6633b8671202cf2bd1692249e2437a27b0f86ac64daded7c1405e56393deee30e4e64e5908
+AUX subsonic.initd 1194 SHA256 7bdfd069c58333393bf8e9a6e423d708ff2f9ce70e6613c73fa27f08b0037d16 SHA512 7e99eaf2663d346d42e883f3501017e4da565f7b07ef390e370e097d13f4fd039ddccaa761562c2f43c28dbf3ad5c355dbfcef7b4e67ecccf3cd31819c86b14b WHIRLPOOL c55fcb29af11868286e4eee0821c98496b4e185116410d105768af84078a7ed7af121b9b217b493cb112ba65b4199bac37c8e64ee9e49c07ee5f13341a34f4f2
+DIST subsonic-5.2.1-standalone.tar.gz 43671795 SHA256 523fa8357c961c1ae742a15f0ceaabdd41fcba9137c29d244957922af90ee791 SHA512 1251b77cfbee80224d3e332945fecec981c79b27c129cb47f5880a82344db15d1f8d17b11dd272a4ad3d9794f4e3055d4a59826623d543b676de73fe1c83b936 WHIRLPOOL 72f5c38e59afab4cec95ff1b76b3b8be70f5f25508f4044dac4ba795382069ca54e01c1ff75e30c4220489bfe4c0958c5062168121e8f3e74a226d5a4863970d
+EBUILD subsonic-bin-5.2.1-r1.ebuild 1400 SHA256 304fd5d9fdda40e4e7f3a60a40ad0cb58a455ae391d196be3e727d0eee3a16d2 SHA512 6b11a68226344537b38591f5a5778af950021bcafbc3cecc3e9a376df9b327bc8dc1ebfb1a6f970026cd1fd238884ce4f2c2e0528c057551b64ee6836222a855 WHIRLPOOL e5b0d05af8706d96d3a7b213688f0444646b5b353ba8ead1ed705ef7fdcfb5b603c9cdaa7142ac0ee97b350579b273939ab539d5c67fc6ac2be59d336abf7b0f
+MISC ChangeLog 2246 SHA256 001c7b19fbdf6238730f4894be3090c24eaea78dd60a0b410b91635f30114125 SHA512 116823082270dc8ddf6def72ff1a7c266b5afbeebee00364a5e27854b9240e7d37919e0799aafb75ac182302fbe435ffbe65d7aec96b37a02c8a704e66b036da WHIRLPOOL 006eb1ac15e8f6df7582f249310b2d5392fba122a0f0a0fb07a8861f9d9b020d3d6e7527025b52bb58fb6baa8208edfd9e26567e49f2befb253a7865d56f5ccd
+MISC ChangeLog-2015 681 SHA256 c1586650dc9bf4c913aece052577126fa63e4d220851ec20cd66d26744cb3fb8 SHA512 acaeea401e211585ebcb3f39febec0da0607c5291f675f56135408b911b5a7bed5ba86fc8647286f2d5832aca29968f77bc47af5794bd60ffd965c70b983e0da WHIRLPOOL 12c060676b42a9047dca7f559342d10497dcf536e84a460af8997d014051e8b106c56c1bd1bd15645e1e8f296195ecf7289c33ceb72c371b534c4c60c5624c26
+MISC metadata.xml 325 SHA256 17390f7dd95b34e23ca75dd56910d8f4f113b6d7e696ad8f7ea4b9b2804cdf7e SHA512 f6fe0547df26e6c4f94b6b1e915a51731fa3d6f565c71adc64f2fc3d858dc67d4664e46fbb654fa982bf0ba5915d673e0891f20aabfaadc84c0df2c44df46865 WHIRLPOOL 2840aaa1f621283b914a3bbf05b982e89df2f18d3684a3a32d3e447fccc6604aa2193568dbdd5eaa5b8e338d55a2b116224e544a64e79979bf5a177f6ba31d62
diff --git a/media-sound/subsonic-bin/files/subsonic.confd b/media-sound/subsonic-bin/files/subsonic.confd
new file mode 100644
index 000000000000..63b303ae6a4e
--- /dev/null
+++ b/media-sound/subsonic-bin/files/subsonic.confd
@@ -0,0 +1,20 @@
+
+# Host and port to listen on
+SUBSONIC_HOST=0.0.0.0
+SUBSONIC_PORT=4040
+
+# To disable https, set to 0
+SUBSONIC_HTTPS_PORT=0
+
+SUBSONIC_CONTEXT_PATH=/
+SUBSONIC_MAX_MEMORY=100
+
+# Music directories
+SUBSONIC_DEFAULT_MUSIC_FOLDER=/var/music
+SUBSONIC_DEFAULT_PODCAST_FOLDER=/var/music/Podcast
+SUBSONIC_DEFAULT_PLAYLIST_FOLDER=/var/playlists
+
+NICELEVEL=0
+
+# Further subsonic start script options, if ever needed
+SUBSONIC_OPTS=""
diff --git a/media-sound/subsonic-bin/files/subsonic.initd b/media-sound/subsonic-bin/files/subsonic.initd
new file mode 100644
index 000000000000..cabd3604ac0f
--- /dev/null
+++ b/media-sound/subsonic-bin/files/subsonic.initd
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+SUBSONIC_HOME=${SUBSONIC_HOME:-/var/lib/${SVCNAME}}
+SUBSONIC_USER=${SUBSONIC_USER:-${SVCNAME}}
+PIDFILE=/run/subsonic/subsonic.pid
+
+depend() {
+	after net
+}
+
+start() {
+	checkpath -dq -o subsonic:subsonic -m 755 /run/subsonic/
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon \
+		--start --user "${SUBSONIC_USER}" --name subsonic \
+		--env HOME="${SUBSONIC_HOME}" --exec /usr/bin/subsonic \
+		--pidfile="${PIDFILE}" \
+		--nicelevel "${NICELEVEL}" \
+		-- \
+		--home="${SUBSONIC_HOME}" \
+		--host="${SUBSONIC_HOST}" \
+		--port="${SUBSONIC_PORT}" \
+		--https-port="${SUBSONIC_HTTPS_PORT}" \
+		--context-path="${SUBSONIC_CONTEXT_PATH}" \
+		--max-memory="${SUBSONIC_MAX_MEMORY}" \
+		--default-music-folder="${SUBSONIC_DEFAULT_MUSIC_FOLDER}" \
+		--default-podcast-folder="${SUBSONIC_DEFAULT_PODCAST_FOLDER}" \
+		--default-playlist-folder="${SUBSONIC_DEFAULT_PLAYLIST_FOLDER}" \
+		--pidfile="${PIDFILE}" --quiet \
+		${SUBSONIC_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --user "${SUBSONIC_USER}" \
+		--pidfile "${PIDFILE}" \
+		--wait 15000 \
+		--progress
+	eend $?
+}
diff --git a/media-sound/subsonic-bin/metadata.xml b/media-sound/subsonic-bin/metadata.xml
new file mode 100644
index 000000000000..207efe7b11ee
--- /dev/null
+++ b/media-sound/subsonic-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">subsonic</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/subsonic-bin/subsonic-bin-5.2.1-r1.ebuild b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r1.ebuild
new file mode 100644
index 000000000000..7c7c9f760f5d
--- /dev/null
+++ b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+MY_PN="${PN//-bin}"
+
+DESCRIPTION="Subsonic is a complete, personal media streaming solution"
+HOMEPAGE="http://www.subsonic.org/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_PN}-${PV}-standalone.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg lame selinux"
+
+DEPEND=""
+RDEPEND="virtual/jre
+	lame? ( media-sound/lame )
+	ffmpeg? ( virtual/ffmpeg )
+	selinux? ( sec-policy/selinux-subsonic )"
+
+S="${WORKDIR}/"
+SUBSONIC_HOME="/var/lib/${MY_PN}"
+USER_GROUP="subsonic"
+
+pkg_setup() {
+	enewgroup "${USER_GROUP}"
+	enewuser "${USER_GROUP}" -1 -1 ${SUBSONIC_HOME} "${USER_GROUP}"
+}
+
+src_install() {
+	local dir="/usr/libexec/${MY_PN}"
+
+	dodoc README.TXT "Getting Started.html"
+
+	insinto ${dir}
+	doins subsonic-booter-jar-with-dependencies.jar subsonic.war
+
+	exeinto ${dir}
+	doexe subsonic.sh
+
+	keepdir ${SUBSONIC_HOME}
+	fowners ${USER_GROUP}:${USER_GROUP} ${SUBSONIC_HOME}
+
+	newinitd "${FILESDIR}/subsonic.initd" subsonic
+	newconfd "${FILESDIR}/subsonic.confd" subsonic
+
+	make_wrapper ${MY_PN} "${dir}/subsonic.sh"
+
+	if use ffmpeg; then
+		dodir ${SUBSONIC_HOME}/transcode
+		dosym /usr/bin/ffmpeg ${SUBSONIC_HOME}/transcode/ffmpeg
+	fi
+
+	if use lame; then
+		dodir ${SUBSONIC_HOME}/transcode
+		dosym /usr/bin/lame ${SUBSONIC_HOME}/transcode/lame
+	fi
+}
diff --git a/media-sound/substract_wave/Manifest b/media-sound/substract_wave/Manifest
new file mode 100644
index 000000000000..8f7c3e1f4c95
--- /dev/null
+++ b/media-sound/substract_wave/Manifest
@@ -0,0 +1,7 @@
+AUX substract_wave-0.3-Makefile.patch 1112 SHA256 a1de0faa146f9686664357d6aed98d2c37301446f81359795e07cc96347cf66a SHA512 050562b55d1a45dbcba694df9f989be9ef7671b08c6bc9f9bf76f7650c5e3fecba0ddbcf9b77af07505e5504a2d0cba84a4fdc029d04ac83659930382ab8b429 WHIRLPOOL 5a9b2bc511478db8f72c929a5efa131bc5502b97a72bc08bd7579415bf2544a82f47552564b32aa44501438a6d8f2dc809bf7e627262bcddf8693e6e56a4d7c5
+AUX substract_wave-0.3-overflow.patch 884 SHA256 6d37c8022d9ccb3d8e3cd5cafc8e302d8c6cf66242476684adc7916e54e6a4d6 SHA512 384054cdfc029885dd4d3f7ada6d9838736c5cd375a936bbb785233b124157028c2690f7036afa940f6ff536e14105eeb02ec6b1581db9c9cea64279d50586bc WHIRLPOOL 21429ae9645291fddeca181e6f94f71b394bf41bdc0a080843bdfecb882e170a64684653aca793d50aca1e553e4073316918232acf683b4424d8df4f00dbdcec
+DIST substract_wave-0.3.tgz 14793 SHA256 c1f833eb892e9acaa48d47e395cbdb127325b7787c78383bf2623289157731e4 SHA512 f62c6c36e5cc69b4cc6afb28500b89284dc48e12b42643e9dca836dc48506a97444d6df032fb593329952d70e41e2a88963291bbb2c5a5d54db3a577ea7bb5fb WHIRLPOOL 2f528afd7f4ee42958174e7ed7f3dd172110ad73e135c96bac7146f95aa7e50346664ce87a02a34b066ccb33ea3bb8e98a63b6b9facccf58716e70cac537fe59
+EBUILD substract_wave-0.3-r1.ebuild 684 SHA256 e7e15c6b3bb4ea3863c0280e68475a2a5714b58fc690fbcbfc9d9beb9406d902 SHA512 ecb0326a12754f2e7f4a5be71f38be264fe228162d5fd06499c186c4f0066df51593bdcdc2603e5271bca9ee44e228b595e91af009f99e6ff54b7df4aa09b116 WHIRLPOOL 02410fe1da8fb9aa0e024e50cf1c6d5f30e4036befc137cc8c773d986efa5e2f5d3cad884b8617a80724a6afb9318f5f9a1fcfbcd4d757b025be36be2c7ec10a
+MISC ChangeLog 2541 SHA256 685c2091ac716151be828fba02b0f2cce78d870ce55760d3e6f75d5a93f45883 SHA512 5810612837c2101bb319f49df7ef0c66b09dbabbcda62dadd7f012efd05fe9af85ce3a0b497032707fb0d292e629371ebedaf2385887df8d85bb01397897d2cb WHIRLPOOL 4e4defbc00f7bd0f9b2341102a31ec9efeb361ddca91651fde45731c15158700d5414f2be6840183eb0c1fa94c6d2f25c6c20ccb52280ef77d60173d39bb7495
+MISC ChangeLog-2015 1054 SHA256 8f5e8d1375e71d9a2cb852d36e679ce06e911d316f910597f8953521b371420a SHA512 0bca92ad62ba747259f0372a4edbb92f9119121625a07bcc4d5cb80db8b4413fdb56550d431d51c581f8f10b14d3b38b9f09ce5a52511e19f1979cf09cd05222 WHIRLPOOL b39883c4302b860fbcf8168a9478618bb036ddee388c326b05ae88874adc76931da1779693934faed7cabfdb85ea27951ec567c1b00a96d6de5f856780bb58f2
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/substract_wave/files/substract_wave-0.3-Makefile.patch b/media-sound/substract_wave/files/substract_wave-0.3-Makefile.patch
new file mode 100644
index 000000000000..db99dc1f5fe0
--- /dev/null
+++ b/media-sound/substract_wave/files/substract_wave-0.3-Makefile.patch
@@ -0,0 +1,42 @@
+diff -ur substract_wave-0.3.orig/Makefile substract_wave-0.3/Makefile
+--- substract_wave-0.3.orig/Makefile	2005-10-06 17:23:42.000000000 +0300
++++ substract_wave-0.3/Makefile	2009-05-11 23:19:30.000000000 +0300
+@@ -1,27 +1,22 @@
+-#CC=gcc
+-#CC=/usr/local/bin/gcc
+-
+-
+-CFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
++CC ?= gcc
++CFLAGS += -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
++LIBRARY = -lm
+ 
+ .c.o:
+-	gcc $(CFLAGS) -c $<
++	$(CC) $(CFLAGS) -c $<
+ 
+-OBJECT =\
+-substract_wave.o
++OBJECT = substract_wave.o
+ 
+ a.out : $(OBJECT)
+-	gcc -o substract_wave  $(OBJECT) $(LIBRARY)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJECT) $(LIBRARY) -o substract_wave
+ 		
+-# DEPENDENCIES
+ substract_wave.o : substract_wave.c substract_wave.h wave_header.h
+ 
+-install: 
+-	cp substract_wave  /usr/local/bin/
+-
+-install.man:
+-	cp substract_wave.man /usr/local/man/man1/substract_wave.1
++install:
++	mkdir -p $(DESTDIR)/usr/bin
++	cp substract_wave $(DESTDIR)/usr/bin
++	mkdir -p $(DESTDIR)/usr/share/man/man1
++	cp substract_wave.man $(DESTDIR)/usr/share/man/man1/substract_wave.1
+ 
+ clean:
+ 	rm *.o
+-
diff --git a/media-sound/substract_wave/files/substract_wave-0.3-overflow.patch b/media-sound/substract_wave/files/substract_wave-0.3-overflow.patch
new file mode 100644
index 000000000000..991a4f6c5381
--- /dev/null
+++ b/media-sound/substract_wave/files/substract_wave-0.3-overflow.patch
@@ -0,0 +1,26 @@
+diff --git a/substract_wave.c b/substract_wave.c
+index a44e5e5..bef211b 100644
+--- a/substract_wave.c
++++ b/substract_wave.c
+@@ -545,9 +545,9 @@ for(i = 0; i < header_size; i++)
+ 	*ptr = 0;
+ 	ptr++;
+ 	}
+-strcpy(out_header -> main_chunk, "RIFF");
+-strcpy(out_header -> chunk_type, "WAVE"); 
+-strcpy(out_header -> sub_chunk, "fmt ");
++memcpy(out_header -> main_chunk, "RIFF", 4);
++memcpy(out_header -> chunk_type, "WAVE", 4);
++memcpy(out_header -> sub_chunk, "fmt ", 4);
+ out_header -> length_chunk = 16; //always 16
+ out_header -> format = 1; //PCM
+ 
+@@ -557,7 +557,7 @@ out_header -> byte_p_spl = main_header -> byte_p_spl;
+ 
+ out_header -> sample_fq = main_header -> sample_fq;
+ out_header -> bit_p_spl = 16; // main_header -> bit_p_spl;
+-strcpy(out_header -> data_chunk, "data");
++memcpy(out_header -> data_chunk, "data", 4);
+ 
+ main_offset = start_offset + (samples_offset * 2);
+ 
diff --git a/media-sound/substract_wave/metadata.xml b/media-sound/substract_wave/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/substract_wave/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/substract_wave/substract_wave-0.3-r1.ebuild b/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
new file mode 100644
index 000000000000..cd3e2c907b74
--- /dev/null
+++ b/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="substracts 2 mono wave files from each other by a factor specified on the command line"
+HOMEPAGE="http://panteltje.com/panteltje/dvd/"
+SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch \
+		"${FILESDIR}"/${P}-overflow.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc CHANGES mono-stereo.txt README
+}
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
new file mode 100644
index 000000000000..8115c83e1ee9
--- /dev/null
+++ b/media-sound/supercollider/Manifest
@@ -0,0 +1,3 @@
+DIST SuperCollider-3.8.0-Source-linux.tar.bz2 8866545 SHA256 a6ea1fab694f2247baf5598e1d9dffc0738a238b8607b2e8fe4c872e58176b14 SHA512 305898067cb323682ca3dc65b3f093658192dbad228632d928f2fbd4a635c651f49e2e4f32c338997aafd48a22b739cd80de4296f747c3f1810ddede0aff283a WHIRLPOOL c3516d03bb299274327fa3d5120524ecf20002df34286ae8db29057c8846a3baad5bad7985cc00cb3a70049d017ab7d4cfc935849fdd393dcaccadc5c580cadc
+EBUILD supercollider-3.8.0.ebuild 2668 SHA256 3f598d0b5f8024988bc31138fdb926bba4784f1f3e35c60feca742c4ba5878f2 SHA512 5e59afbce42cef844aca6ecd26d03af4489586acf1d89ddec5da1d10b5cb8b9a4bc0122a4a8cb44aba2468c1f58fb4011fbe9ad052467705184fa56a97235e3c WHIRLPOOL 2c248597924e892cee311024d3440d79060f188522e8de0e47859ad23b5e56e9d50de09c60d3ab80b967d8934619dc0251fa98cd09e3acf3963a5ca0db76cba9
+MISC metadata.xml 1114 SHA256 20ce3cfa7dfe94b44a5cb94d4a0afe56b6c935e6cddebd553f3d71c53232b6d2 SHA512 962457bd94fd44a8412bcb38fd248525898e851b68eb0d2344eff99ab4f7c9ccd1684f3496a5b41ba95d774b43920c5fd0a08aef17c105e47671dae5b6b217e0 WHIRLPOOL 0a36f49e3ef997ae4050b911bc787e0ead8f85242d86445ed09330e1d7988f01496a9c8492b8b56f65299c6d6e71fc558184d4dcffe5884a3294d0a80cb8a946
diff --git a/media-sound/supercollider/metadata.xml b/media-sound/supercollider/metadata.xml
new file mode 100644
index 000000000000..c082d3ea4ddf
--- /dev/null
+++ b/media-sound/supercollider/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>palipalo9@googlemail.com</email>
+		<name>Ingolf Wagner</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		SuperCollider is a platform for audio synthesis and algorithmic 
+		composition, used by musicians, artists, and researchers 
+		working with sound. It is free and open source software 
+		available for Windows, Mac OS X, and Linux.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">supercollider/supercollider</remote-id>
+	</upstream>
+	<use>
+		<flag name="vim">Enable the SCVIM user interface</flag>
+		<flag name="emacs">Enable the SCEL user interface</flag>
+		<flag name="gedit">Enable the SCED user interface</flag>
+		<flag name="gpl3">Build GPL-3 licensed code (recommended)</flag>
+		<flag name="server">Build with internal server</flag>
+		<flag name="wiimote">Build sclang with Wii Remote support</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/supercollider/supercollider-3.8.0.ebuild b/media-sound/supercollider/supercollider-3.8.0.ebuild
new file mode 100644
index 000000000000..172e0129d89a
--- /dev/null
+++ b/media-sound/supercollider/supercollider-3.8.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils readme.gentoo-r1
+
+DESCRIPTION="An environment and a programming language for real time audio synthesis."
+HOMEPAGE="https://supercollider.github.io/"
+SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source-linux.tar.bz2"
+
+LICENSE="GPL-2 gpl3? ( GPL-3 )"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack +portaudio qt5 server +sndfile static-libs vim wiimote"
+REQUIRED_USE="^^ ( jack portaudio )"
+RESTRICT="mirror"
+
+# Both alsa and readline will be automatically checked in cmake but
+# there are no options for these. Thus the functionality cannot be
+# controlled through USE flags. Therefore hard-enabled.
+RDEPEND="
+	media-libs/alsa-lib
+	sys-libs/readline:0=
+	x11-libs/libXt
+	avahi? ( net-dns/avahi )
+	fftw? ( sci-libs/fftw:3.0= )
+	jack? ( media-sound/jack-audio-connection-kit )
+	portaudio? ( media-libs/portaudio )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtpositioning:5
+		dev-qt/qtsensors:5
+		dev-qt/qtwebkit:5
+	)
+	sndfile? ( media-libs/libsndfile )
+	wiimote? ( app-misc/cwiid )"
+DEPEND="${RDEPEND}
+	dev-libs/icu
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	gedit? ( app-editors/gedit )
+	vim? ( app-editors/vim )"
+
+S="${WORKDIR}/SuperCollider-Source"
+
+src_configure() {
+	local mycmakeargs=(
+		AUDIOAPI=$(usex jack jack portaudio)
+		-DINSTALL_HELP=ON
+		-DNATIVE=ON
+		-DSYSTEM_BOOST=OFF
+		-DSYSTEM_YAMLCPP=OFF
+		-DNO_AVAHI=$(usex !avahi)
+		-DFFT_GREEN=$(usex !fftw)
+		-DNO_GPL3=$(usex !gpl3)
+		-DNO_LIBSNDFILE=$(usex !sndfile)
+		-DSC_QT=$(usex qt5)
+		-DSCLANG_SERVER=$(usex server)
+		-DLIBSCSYNTH=$(usex !static-libs)
+		-DSSE=$(usex cpu_flags_x86_sse)
+		-DSSE2=$(usex cpu_flags_x86_sse2)
+		-DSC_IDE=$(usex qt5)
+		-DSC_ED=$(usex gedit)
+		-DSC_VIM=$(usex vim)
+		-DSC_EL=$(usex emacs)
+		-DSC_WII=$(usex wiimote)
+	)
+
+	use debug && mycmakeargs+=(
+		-DSC_MEMORY_DEBUGGING=ON
+		-DSN_MEMORY_DEBUGGING=ON
+		-DGC_SANITYCHECK=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use vim && newdoc editors/scvim/README.md README.vim
+	use emacs && newdoc editors/scel/README.md README.emacs
+	use gedit && newdoc editors/sced/README.md README.gedit
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Notice: SuperCollider is not very intuitive to get up and running."
+	einfo "The best course of action to make sure that the installation was"
+	einfo "successful and get you started with using SuperCollider is to take"
+	einfo "a look through ${EROOT%/}/usr/share/doc/${PF}/README.md.bz2"
+	einfo
+}
diff --git a/media-sound/synaesthesia/Manifest b/media-sound/synaesthesia/Manifest
new file mode 100644
index 000000000000..95fe2501082a
--- /dev/null
+++ b/media-sound/synaesthesia/Manifest
@@ -0,0 +1,5 @@
+DIST synaesthesia-2.4.tar.gz 259531 SHA256 48505975e809ebadf416dc3e35a528ef87f01b117f2f1c5498d728ead8786493 SHA512 e48f210f055486aa0a7c9a03f6aa7ff6a3292a2b598bfd8536dd592c3934b7672ed0b9b7dfc20427b5ea2b4cd1dcd6e104bf2c41f80ec38ab0b4b0a9497ff905 WHIRLPOOL d27513a434c24472f64a0ef94ddc391b5fac3961753fba6efa0ec8749dd9a877a6c917ce39118c3d0705a8a2a7fdb8478d363104c54a512deec4aa04cc85c2ec
+EBUILD synaesthesia-2.4.ebuild 802 SHA256 843a71a849d2d88df9b4c7396573d813674216758a5bd342e32cc886e4d6c5a0 SHA512 46c1fb2f8845964116398368336f6ebbe72cdfd721638defcd9fdf354bec01e11065b9347e8f797ee6ba5e2a675dc830f61656def12fb86fd60bdfda11f8a734 WHIRLPOOL 84936be1416bcf7a968cbaecf1c5431e058427002ba7faaf421cb6a1185e8882a4dc23700d9e43eb9b735bb05d9a3d9b9ede9f1777d91cf68b194db0fe9b4341
+MISC ChangeLog 2441 SHA256 866df622dbc5cefc13c0c5784d81822af4593e5dd0164dd43678bf0d5e761071 SHA512 c50bbe44c06b228079525a64fa61979f81e69f373acb7966a68d4050b8d6228729a23980379526224acb5778ed6902c6a192e9d6247f52dbb79d0db1cda32e78 WHIRLPOOL ce7b39704253073371f92e760cf1de41a44b99cd1dbb163675937b867e5e75127db9389e2628d37f95fa165f0c0fdc346a6ac2dab72711ee8d47846424d79619
+MISC ChangeLog-2015 2912 SHA256 fb8e7c5f2aa0ab624ba3bf19e0ae2f871f7fbe15c231b4ab7e0b1578b9b33707 SHA512 fb14702cc7913c8839b426f4412d45ef94443c32f97ccb6059f99fa81ea5c476869b082ba1f6c9d68314f9ec27facf4422671b4f388328bdf3f20dedceba0861 WHIRLPOOL 5b257f85b8cd10508ca2c3419ae54e72f554531227c7e1ebb0f1dc61e83bf00402e90349a556804603387c97d599d6365357ddb3a51b91f2937fe539aed3f700
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/synaesthesia/metadata.xml b/media-sound/synaesthesia/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/synaesthesia/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/synaesthesia/synaesthesia-2.4.ebuild b/media-sound/synaesthesia/synaesthesia-2.4.ebuild
new file mode 100644
index 000000000000..d5c52c114d11
--- /dev/null
+++ b/media-sound/synaesthesia/synaesthesia-2.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+DESCRIPTION="a nice graphical accompaniment to music"
+HOMEPAGE="http://www.logarithmic.net/pfh/synaesthesia"
+SRC_URI="http://www.logarithmic.net/pfh-files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="sdl svga"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libSM
+	sdl? ( >=media-libs/libsdl-1.2 )
+	svga? ( >=media-libs/svgalib-1.4.3 )"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+src_prepare() {
+	sed -e '/CFLAGS=/s:-O4:${CFLAGS}:' \
+		-e '/CXXFLAGS=/s:-O4:${CXXFLAGS}:' -i configure || die "sed failed"
+	sed -e 's:void inline:inline void:' -i syna.h || die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README
+}
diff --git a/media-sound/taginfo/Manifest b/media-sound/taginfo/Manifest
new file mode 100644
index 000000000000..ae5572bf558a
--- /dev/null
+++ b/media-sound/taginfo/Manifest
@@ -0,0 +1,5 @@
+DIST taginfo-1.2.tar.bz2 8272 SHA256 a1669e3b5153e2a9e0bb453e937f448bf90764f4d2a7ecea2c9bb3d35ac9f2a6 SHA512 5e12d63ff3f7db2ed5bb877a3ab6e1a1a63793df30d0433ddb30e2630cab82bff4644331915e3cf80054a55435672b6b534c2550765ee4f88e1e0bf1859fd6e3 WHIRLPOOL df000ea62cc69d8fc45167ec0cd473962218df254d54ed46ed74a1d1f4c452556c8ae849bc2db121bd5772cb255295938b76aa2f96143d33eac9d9c81123b73c
+EBUILD taginfo-1.2-r1.ebuild 577 SHA256 8b706ed6978d9b2bdb428ce515a92382af99ad98301a3ac7d4969b507573c568 SHA512 a98fe5b92206e17024439b9f0b26bef2864edca3c9541c98eac63212585d7fd8f03b40dc3059416a31254e0a8aef87192d97cefa9e303ee3232633f483a7ef1b WHIRLPOOL fa2c27c37ec94a332bdfb3fd0ac37ac23b067c9a9d4db61ace5b62d4c7e9032963f643397bc306e6cf9397720e1f1279412694693e2e8accc5ed9dae93400918
+MISC ChangeLog 2432 SHA256 f20655525845c835fe8b85eddeea04704e405c2931392a19790cbdbbaa81ef62 SHA512 4fa7656c16e60682df9b5766122fd0b17c7f148c7c1007700eedcfcc2d82f382f0ac3718763d15d5eacbd2828aff5a8b64931965fe754f56bd17478ff2a22026 WHIRLPOOL 50f0113307e1e1b781ff0b1353ccb06418e8fd1daa90d669bcf0ebc5d7a03dda35a075f8a9f82770db3cc1fbd313e9e20fde1d11cb1da7ef29ff83a46bdfec0f
+MISC ChangeLog-2015 1136 SHA256 cf8f6e3e9f417e31cc28b481adfd21058d61e1db73a5248e77f5da18bf8dafaa SHA512 fa81b4697096afc5f8a0a877c6f68661ae727bb3d427b8abd75f9762152543d043aaf91ac645d76c44eb76d5c19a78677a260ef5bcffeeae0cb5563a73dd80ac WHIRLPOOL e803fb051a4a6227626e4b12486e8036947c4db97c13b0d68971ab96efafccbd50df7cc7f4cdf88dc1ff9296fde1ab22208462ffcbccdc9c4c59598ef27ab69c
+MISC metadata.xml 328 SHA256 272c9e76b4dd52b7911d96bf4e72c7ab3a0832f48c262c9cb979d4eec15f937e SHA512 4fbf91c2ea652085728af556f6cf66924dc9ba3efb50a28c5dd52240306e25f18c7c634988c57fe0a0f65647a9501a504e5bec290b75298b95b58d497ecbc79d WHIRLPOOL e98b9d27c21b3605ab01b12e0bad22abeba69bf080a61165975477bf1280b4e12e78b7e87ca6bc9d3b08c6922e1984aca5ddcf5c365f4eb42817e6db5d6dc90b
diff --git a/media-sound/taginfo/metadata.xml b/media-sound/taginfo/metadata.xml
new file mode 100644
index 000000000000..ec678cf53533
--- /dev/null
+++ b/media-sound/taginfo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="freshmeat">taginfo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/taginfo/taginfo-1.2-r1.ebuild b/media-sound/taginfo/taginfo-1.2-r1.ebuild
new file mode 100644
index 000000000000..47c6440ec433
--- /dev/null
+++ b/media-sound/taginfo/taginfo-1.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit toolchain-funcs
+
+DESCRIPTION="a simple ID3 tag reader for use in shell scripts"
+HOMEPAGE="http://freshmeat.net/projects/taginfo"
+SRC_URI="http://grecni.com/software/taginfo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-libs/taglib"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake CC="$(tc-getCXX) ${LDFLAGS} ${CXXFLAGS}" || die
+}
+
+src_install() {
+	dobin taginfo || die
+	dodoc ChangeLog contrib/mp3-resample.sh README
+}
diff --git a/media-sound/tagtool/Manifest b/media-sound/tagtool/Manifest
new file mode 100644
index 000000000000..e08864106490
--- /dev/null
+++ b/media-sound/tagtool/Manifest
@@ -0,0 +1,6 @@
+AUX tagtool-0.12.3-underlinking.patch 2714 SHA256 046da48a83bce6c77f3bc7269446678bfc1d4466cba876449a762e3c33ee25d2 SHA512 679754976a0bd4f8e64bce1363d74bb783265718ba7d76f5d4101df72214e740ca5e50af9bd0798230e57ec8647bb5c10f8a39b86bd57df4df52276cb59053f0 WHIRLPOOL 1d0ba948d367deadd9aa2327a8cfe04ae4841d3bb556735f02468dc23e83dd374f3adc53cada5057817a0d472a09a3585e6fcbca4501127bd4d545e31f5855de
+DIST tagtool-0.12.3.tar.bz2 303743 SHA256 273f41031dd2ad80c09d1865fdc71d9052831a5ce9cd8c53705cc518a9d3d411 SHA512 f32cf8ab072b9e8f52c5afd27e93f348a6d573085f71efedf81764a2d20941e580583c6536d420f25956eae84dcb6d1930229e60bc068ec7948247cfa64ff385 WHIRLPOOL 10664ec0ef45bc178ed02993162cc3a0986d3e8277888e7b65072122c32467247f2da10bba74ab808383ea1feedd51539a61f03f2743e4f78b83e67078c2e12a
+EBUILD tagtool-0.12.3-r1.ebuild 1050 SHA256 0e656495bcb3a22cf94e4fe3b51ce551e588a4e28c35e09ce25fd3f01c0758fe SHA512 26c3af16b805fd21a7231bd943d8861cc3eb5053f144456a8f6859f0660a7cdea2256000e21dfe1526f2e2d474fb488666bbd5e6db6936b833c17416be565b78 WHIRLPOOL 6b1b06ce6cca8032471a364b56c01da01a05690ae558f58a375de7b516c74dd2b66fdcce934d8a894494fc175a3fdfefe560049f0f9845287edd3cd5d8146709
+MISC ChangeLog 3920 SHA256 124113bb7c2cf2582673b85c5f8f4524bc5c26849d8a8782fa08f450c7cc732c SHA512 6e7c834db55984c7d6c083b4b31da1665e608398cb30a0b80fc775e4d48309b16c156acd2f8132266bcbe02e291ad6267819c065790b6da9073c172cf147a8e0 WHIRLPOOL b578c66eb2a5442fbb61b56e30d2af3bb95a5f2bfc56c3ef9f629ff1110b924cfe75fef898d503889a257191e22064c3520ba89afd07ba00918f124ee7d05743
+MISC ChangeLog-2015 4285 SHA256 5e324f0bc9191141ee1dd6f8d2cebb5c86aef91564341a25f33d133096eb67ba SHA512 a11c9ceabb8b1b0d393413167a4484b4f29204799cc1b2e0a32473d55a0654c0b8d22ab18773f1cff3a3c9b1d523c90df060af2eb8e28e57df6fa47ddfd16752 WHIRLPOOL 986db8cd1c9dd0636176997c514e9ef5d5b5ca55780b783a1a91170c9cd9a8b19344546b069a980e2ea7fe65dfa0d723bb4305b0b3034945fffa66c5b17ecd6b
+MISC metadata.xml 330 SHA256 b270a7552c99357dba579c31ee82d56461b9a9a9b47e4ccc4a1b470365e8a59a SHA512 2d15ce3d2800b1b4283be20f16d93d1a733ad4bc63e3f0338e2fb3f96e1a03c83c6a5fc9acb91b22f3c849ab65cb046a9d69032b04d916f9f2a1f56fb1da712b WHIRLPOOL 511f42f9d8d06c0f0137652b75ab2715cf2fa0fc61de47b55ab476a061dfda077e60b876b0efb6e8badf67132a3c4625ef95cb6e4e12f5a6f34f752be351a904
diff --git a/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch b/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch
new file mode 100644
index 000000000000..9569ad2fbaf5
--- /dev/null
+++ b/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch
@@ -0,0 +1,80 @@
+Fix underlinking issues caused by missing libm and libogg linking
+Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=513012
+
+In addition, fix nonidiomatic AC_ARG_ENABLE option handling.
+
+--- tagtool-0.12.3/configure.ac
++++ tagtool-0.12.3/configure.ac
+@@ -13,20 +13,16 @@
+ 
+ 
+ dnl Command line options
+-AC_ARG_ENABLE(mp3,
+-	AC_HELP_STRING([--disable-mp3], [Disable MP3 support (if enabled, id3lib is required)]),
+-	[enable_mp3=no;  disable_mp3_reason="(disabled)"],
+-	[enable_mp3=yes])
+-
+-AC_ARG_ENABLE(vorbis,
+-	AC_HELP_STRING([--disable-vorbis], [Disable Ogg Vorbis support (if enabled, libvorbis is required)]),
+-	[enable_vorbis=no;  disable_vorbis_reason="(disabled)"],
+-	[enable_vorbis=yes])
++AC_ARG_ENABLE([mp3],
++	AS_HELP_STRING([--disable-mp3], [Disable MP3 support (if enabled, id3lib is required)]))
+ 
+-if test "$enable_mp3" = "no" && test "$enable_vorbis" = "no"; then
+-	AC_MSG_ERROR([At least one of 'mp3' or 'vorbis' must be enabled. Try './configure --help' for a list of options.])
+-fi;
++AC_ARG_ENABLE([vorbis],
++	AS_HELP_STRING([--disable-vorbis], [Disable Ogg Vorbis support (if enabled, libvorbis is required)]))
+ 
++dnl Test for no flags being enabled
++AS_IF([test "x$enable_mp3" != "xyes" && test "x$enable_vorbis" != "xyes" ], [
++	AC_MSG_ERROR([At least one of 'mp3' or 'vorbis' must be enabled. Try './configure --help' for a list of options.])
++])
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+@@ -50,6 +46,12 @@
+ fi;
+ 
+ 
++dnl Check for libm for ceil()
++AC_SEARCH_LIBS([ceil], [m], [], [
++	AC_MSG_ERROR([unable to find the ceil() function])
++])
++
++
+ dnl Check for gtk and related libraries
+ PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.12.0
+ 		       gtk+-2.0 >= 2.8.0
+@@ -91,6 +93,9 @@
+ 	AC_CHECK_LIB(vorbisfile, main,,
+ 		[enable_vorbis=no;  disable_vorbis_reason="(missing vorbisfile library)"])
+ fi;
++if test "$enable_vorbis" = "yes"; then
++	PKG_CHECK_MODULES([OGG], [ogg])
++fi;
+ 
+ AM_CONDITIONAL(ENABLE_MP3,    test "$enable_mp3" = "yes")
+ AM_CONDITIONAL(ENABLE_VORBIS, test "$enable_vorbis" = "yes")
+--- tagtool-0.12.3/src/Makefile.am
++++ tagtool-0.12.3/src/Makefile.am
+@@ -28,7 +28,8 @@
+ vorbis_sources = vorbis_file.c vorbis_file.h vorbis_edit.c 		\
+ 	vorbis_edit.h vorbis_edit_field.c vorbis_edit_field.h vcedit.c 	\
+ 	vcedit.h
+-vorbis_cflags = -DENABLE_VORBIS
++vorbis_cflags = $(OGG_CFLAGS) -DENABLE_VORBIS
++vorbis_libs = $(OGG_LIBS)
+ else
+ vorbis_sources =
+ vorbis_cflags =
+@@ -39,7 +40,7 @@
+ 	${vorbis_cflags} -DDATADIR='"$(datadir)/${PACKAGE_NAME}"'
+ 
+ tagtool_LDFLAGS = -export-dynamic
+-tagtool_LDADD = $(GTK_LIBS)
++tagtool_LDADD = $(GTK_LIBS) ${vorbis_libs}
+ 
+ tagtool_SOURCES = file_list.c file_list.h file_util.c file_util.h	\
+ 	edit_tab.c edit_tab.h elist.c elist.h main.c math_util.c	\
diff --git a/media-sound/tagtool/metadata.xml b/media-sound/tagtool/metadata.xml
new file mode 100644
index 000000000000..12eb820c0950
--- /dev/null
+++ b/media-sound/tagtool/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tagtool</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/tagtool/tagtool-0.12.3-r1.ebuild b/media-sound/tagtool/tagtool-0.12.3-r1.ebuild
new file mode 100644
index 000000000000..be7039a613eb
--- /dev/null
+++ b/media-sound/tagtool/tagtool-0.12.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Audio Tag Tool Ogg/Mp3 Tagger"
+HOMEPAGE="https://sourceforge.net/projects/tagtool/"
+SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="mp3 +vorbis"
+REQUIRED_USE="|| ( mp3 vorbis )"
+
+RDEPEND="x11-libs/gtk+:2
+	>=gnome-base/libglade-2.6
+	mp3? ( >=media-libs/id3lib-3.8.3-r6 )
+	vorbis? ( >=media-libs/libvorbis-1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-underlinking.patch
+)
+
+src_prepare() {
+	# QA fix for wrong boolean value
+	sed -i -e 's/Terminal=False/Terminal=false/' data/tagtool.desktop.in || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable mp3) \
+		$(use_enable vorbis)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		GNOME_SYSCONFDIR="${D}/etc" \
+		sysdir="${D}/usr/share/applets/Multimedia" \
+		install
+
+	dodoc ChangeLog NEWS README TODO THANKS
+}
diff --git a/media-sound/takcd/Manifest b/media-sound/takcd/Manifest
new file mode 100644
index 000000000000..6444d8ce596f
--- /dev/null
+++ b/media-sound/takcd/Manifest
@@ -0,0 +1,6 @@
+AUX takcd-0.10-overflow.patch 367 SHA256 a3fdf3135bed765304a87d804b8459274c4e51ccdf626328c2e45a1cf41cf922 SHA512 0e1193d558c0c3af0d37d06b0dbacbd10491e0be3dc42e58bcdecdad3308ed19394a9ba3401996df8df5f9cba9186f727272fd9d51cc34ac4334778ec809b7f4 WHIRLPOOL 0b28b6d76dd7382fe9ee65f11dc63bf68279f6baed0e898ecd716c1350952f07dcfa3380043633ce27171de52b57edf725580c5895def615228817256876a7a8
+DIST takcd-0.10.tar.gz 95457 SHA256 2871ace2ec79b09ea8eff80a2074105fdde33d3fb0a0572dc8e2dd931c8d4802 SHA512 a7211ec32adac1a9caf278cdceef9b9daf1ae47fa8ccb1d10eda51ca95566d8d6693f2f635b36e6d78f8f6f9e0efa711bc7263bbdd0f23c3f3ad884682b01e33 WHIRLPOOL 4e64c05c170b086f2cc649f266c77040efc131cfe0a550a21d1b5d0ddccca4d0f9ce096f19d86ad2ae7b51a6c4604de8d8fe26f8ec57ea28836b5eac7d0b2e54
+EBUILD takcd-0.10-r1.ebuild 507 SHA256 98b88f970503eda92e1980cc21884a445ab40a5cacf07b7a8fd6f5ad012ac119 SHA512 d37132d7d87355dd7ba32aeb42a764c3e87fcbb0596f70e41dacbde03a3d1b83ca0c623b9a0b10bfd18bad73de3ca34f43ff7e797faf3fcd895e85475de181cf WHIRLPOOL 75682691278624f4c40ad7cf7e64e839a6f260baea0793de3e89ed95dd4ab3fed7de689670e97001ba0117b1276b1a995ae0e17ab45ac4c11536a220cbf83554
+MISC ChangeLog 2456 SHA256 1de935af9b15f3a42b0ce50c5205713cd90e839652d72a354f38f9cd4606cfa0 SHA512 5483a1c299a6296c82dbed5ab9f7841c17b65da38fd75696b045115863711f06c4b23446c9b69afddcb23e2b444908f063eca216e972f1866f401303c520e703 WHIRLPOOL eeeda6198952d7088d3cc4b8e48af34651b107b8367df82f78b17205e70e75d85e8f684e3f5e36ffbe508592c60396b0c02ecc009279a063a49bffb2e09718f1
+MISC ChangeLog-2015 2259 SHA256 3fd893c099587cf45b1f45fe99c2bcea947b9b49b01c9ad468ccedcdc658e28d SHA512 002d78f443165bc0d4f874bf5d8339f3c96d7a2c43a15cefa79262d2a05bca7b2dcd92021958bab6004e8052e8d20fcbd54335706ef1b49783be5bedfde98add WHIRLPOOL 8ba5067835d1a432e08487c5e6965aa4ffb639b2dd88bbee5a2a3dedcad0e69e343da1eb76fdcc50eba6a7044f04c80dced1db90e7c4fd3472d96e5d7ec3b809
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/takcd/files/takcd-0.10-overflow.patch b/media-sound/takcd/files/takcd-0.10-overflow.patch
new file mode 100644
index 000000000000..c3e7e16d286a
--- /dev/null
+++ b/media-sound/takcd/files/takcd-0.10-overflow.patch
@@ -0,0 +1,13 @@
+diff --git a/config_api.c b/config_api.c
+index b62e41c..2b6a6cf 100644
+--- a/config_api.c
++++ b/config_api.c
+@@ -41,7 +41,7 @@ static void on_change(config_t *conf)
+ int config_open(config_t *conf, const char *filename, int flag)
+ {
+ 	struct stat st;
+-	char mode[2];
++	char mode[3];
+ 	
+ 	/* set fopen() mode or return if flag is not valid */
+ 	if (flag == C_WRITE) {
diff --git a/media-sound/takcd/metadata.xml b/media-sound/takcd/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/takcd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/takcd/takcd-0.10-r1.ebuild b/media-sound/takcd/takcd-0.10-r1.ebuild
new file mode 100644
index 000000000000..db251f50f969
--- /dev/null
+++ b/media-sound/takcd/takcd-0.10-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Command line CD player"
+HOMEPAGE="http://bard.sytes.net/takcd/"
+SRC_URI="http://bard.sytes.net/takcd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc sparc x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-overflow.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	doman *.1
+}
diff --git a/media-sound/tap-reverbed/Manifest b/media-sound/tap-reverbed/Manifest
new file mode 100644
index 000000000000..534538f9d40b
--- /dev/null
+++ b/media-sound/tap-reverbed/Manifest
@@ -0,0 +1,7 @@
+AUX tap-reverbed-flags.patch 1549 SHA256 cc1a66dc3fe49d05a57c26bf46816a29f1339059eb822cf078f01b1f8b23910f SHA512 8bd6781d1dbe61231916f0294557b724532baefcbd04317e7483617482f640bc0b4a05e2b3d2b4062c4fb964347602dcb426df9dae96368f384b84e1970780e8 WHIRLPOOL 51ce197173954e3417d995aca0bc6150514e71390fc8f9ce32c195db75992f7c01dbad3523be943eb1025e639e63d8d719a7a6d3dd7fc2f9a4cbc0650e04a43c
+DIST tap-reverbed-r0.tar.gz 90703 SHA256 95593f47e5fc00178dc03fa8f83bef3d14a30ebe4b3bdb53ebeacf4e709b17e8 SHA512 72b3f1257cf5a7076a35afa92604b8df96051e6727f49b9b01192873e6cb3b21e3daaa9e70796966faa13d2e94b9fdf34cdb41b3e91805dbc9787897a7882cda WHIRLPOOL a90e3288d04b7b9a7ce72afca968c489eae301ca156ed3b30fd945344e26fc2b51eec664cc5a949c52916ff58475e0b1bc6e3a14da8f24b9d7788456a0f5e3dd
+EBUILD tap-reverbed-0-r1.ebuild 956 SHA256 224a9c9db3a43ad50285eded37a18160871e421dfac6e7282be562f7df1e6adf SHA512 9ab24ff89673a090eeb72ef3ef3da925fc10043acef46629637103aad80befd2182326b00df28681cfcd1daa80e524116700f205d2575d50165888ee1fd25301 WHIRLPOOL 24af6e0926999e750a35a3df325158ddd82fbc2df540b5c80b0e89fcf3a06dbd6f662f42c950da2ffc5637bc349baa7d43c592549d4ded57f8907484db3f21f7
+EBUILD tap-reverbed-0.ebuild 1073 SHA256 72d6602ca33522a7045aa1b8df2e72601dd7426f8785175f30fa76b7633b1a85 SHA512 3fa3888714d764c30d6999d39d3dda6f59d92791098086ff2678a9189907e62507271859265230d45377ad65ac72305daabf69cfe12ceca97925aaae1f859b8f WHIRLPOOL c5155f4903e1362186ad0bd61b05f4b55d53056842210a12ceec337caf97d080324de5deb4af53af85ea70015db5c5fca09b9f94328e98c2cae4ef6663709691
+MISC ChangeLog 2697 SHA256 c53ac05e22e421dd5e3b787deaeb636b317794bda8727e2dd9052969b6de84a8 SHA512 f4943800d2c3a6bd4dd829c9f609ae2a06b0113a83478cf9bbdff84467d33a36f6a9277e8270c12437fa90f5865b32c7f919bf414d7fb674d2540ceeb2355244 WHIRLPOOL 7ad13fb94b5876a1ff0bd8a39e0569a50d26c8f0c643bf686fcf25025e1041ee2b4c5920e8976ed86dc088de646fc230b06c51f114d7d5dcc8d239fcea7be7f9
+MISC ChangeLog-2015 1714 SHA256 20dbcfb63fc0a578aef1f2003c5230a289c03957361269de606375dac1813089 SHA512 2805df69b27b4b4e33306ba10adb75893a676db8e5f2dd343765e07f2290a8606d6d81ae0e5f68d89b5f15a394d3583746043a0108190fdf68466e9bed9bdf02 WHIRLPOOL f42c5eedc8bc0102897244e27a66f554fdec5cc98acc8bf245201006e94bde33759f06b568f6ff9e8186d93aea55b1cda8bf78796e49e219fa84a7edaa216185
+MISC metadata.xml 340 SHA256 eab3b9b2db693d82a361b5599ebcfd23f83a987d9f96aaa710451e1a55076bde SHA512 b9c58d0b65d68884a4945054cde9176b0ee6db20ff5d22cac318373c13b9b6b23d5c2cef3cd057ae1b244ec59c00ab1dd3e15f38adb0c577dc48d8aeaa7f722a WHIRLPOOL 43c122b59dcb8360fa5ab1c74720b2f78f848f681fca2c8d04ce1b0bd4df25e75333839bccf0d5c029166744a1064a6d36a61a66703a76b4b034e2bf18fe21e6
diff --git a/media-sound/tap-reverbed/files/tap-reverbed-flags.patch b/media-sound/tap-reverbed/files/tap-reverbed-flags.patch
new file mode 100644
index 000000000000..dbfe9b36a473
--- /dev/null
+++ b/media-sound/tap-reverbed/files/tap-reverbed-flags.patch
@@ -0,0 +1,52 @@
+Index: tap-reverbed-r0/configure.ac
+===================================================================
+--- tap-reverbed-r0.orig/configure.ac
++++ tap-reverbed-r0/configure.ac
+@@ -18,6 +18,10 @@
+ AC_C_INLINE
+ 
+ # Checks for libraries.
++AC_SEARCH_LIBS([powf], [m], [], [
++	AC_MSG_ERROR([unable to find the powf() function])
++])
++
+ PKG_CHECK_MODULES(JACK, jack >= 0.91.0)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.0)
+ 
+@@ -25,8 +29,7 @@
+ AC_FUNC_MALLOC
+ AC_CHECK_FUNCS([strdup])
+ 
+-CFLAGS="-O3 -Wall -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC $GTK_CFLAGS $JACK_CFLAGS"
+-LDFLAGS="-Wall $GTK_LIBS $JACK_LIBS"
++CFLAGS="$CFLAGS -Wall $GTK_CFLAGS $JACK_CFLAGS"
+ 
+ AC_CONFIG_FILES([Makefile src/Makefile])
+ AC_OUTPUT
+Index: tap-reverbed-r0/src/Makefile.am
+===================================================================
+--- tap-reverbed-r0.orig/src/Makefile.am
++++ tap-reverbed-r0/src/Makefile.am
+@@ -9,20 +9,7 @@
+ gui_ext.h gui_ext.c \
+ ports.h ports.c \
+ sound.h sound.c
++reverbed_LDADD = $(GTK_LIBS) $(JACK_LIBS)
+ 
+-EXTRA_DIST = .reverbed
++dist_pkgdata_DATA = .reverbed
+ 
+-INCLUDES =
+-LIBS =
+-#LIBS = $(LDFLAGS)
+-
+-install: all
+-	-mkdir -p $(bindir)
+-	cp reverbed $(bindir)
+-	@echo
+-	@echo "                   *** IMPORTANT NOTICE ***"
+-	@echo "Please don't forget to copy the src/.reverbed file to the home"
+-	@echo "directory of every user who will run the program. Also, don't"
+-	@echo "forget to set the permissions of the copied files so these users"
+-	@echo "have read/write access to their own copies."
+-	@echo
diff --git a/media-sound/tap-reverbed/metadata.xml b/media-sound/tap-reverbed/metadata.xml
new file mode 100644
index 000000000000..e450c6a8f182
--- /dev/null
+++ b/media-sound/tap-reverbed/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tap-plugins</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild b/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild
new file mode 100644
index 000000000000..cb0e9050ffb5
--- /dev/null
+++ b/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_P="${PN}-r0"
+DESCRIPTION="Standalone JACK counterpart of LADSPA plugin TAP Reverberator"
+HOMEPAGE="http://tap-plugins.sourceforge.net/reverbed.html"
+SRC_URI="mirror://sourceforge/tap-plugins/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/ladspa-sdk
+	media-plugins/tap-plugins
+	x11-libs/gtk+:2
+	media-sound/jack-audio-connection-kit"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}/${PN}-flags.patch" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+pkg_postinst() {
+	elog "TAP Reverb Editor expects the configuration file '.reverbed'"
+	elog "to be in the user's home directory.	The default '.reverbed'"
+	elog "file can be found in the /usr/share/tap-reverbed directory"
+	elog "and should be manually copied to the user's directory."
+}
diff --git a/media-sound/tap-reverbed/tap-reverbed-0.ebuild b/media-sound/tap-reverbed/tap-reverbed-0.ebuild
new file mode 100644
index 000000000000..4d4235868cc9
--- /dev/null
+++ b/media-sound/tap-reverbed/tap-reverbed-0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+
+inherit autotools eutils
+
+MY_P="${PN}-r0"
+DESCRIPTION="Standalone JACK counterpart of LADSPA plugin TAP Reverberator"
+HOMEPAGE="http://tap-plugins.sourceforge.net/reverbed.html"
+SRC_URI="mirror://sourceforge/tap-plugins/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/ladspa-sdk
+	media-plugins/tap-plugins
+	x11-libs/gtk+:2
+	media-sound/jack-audio-connection-kit"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-flags.patch"
+	eautoreconf
+}
+
+src_install() {
+	einstall
+
+	dodoc README AUTHORS
+	insinto /usr/share/tap-reverbed
+	insopts -m0644
+	doins src/\.reverbed
+}
+
+pkg_postinst() {
+	elog "TAP Reverb Editor expects the configuration file '.reverbed'"
+	elog "to be in the user's home directory.	The default '.reverbed'"
+	elog "file can be found in the /usr/share/tap-reverbed directory"
+	elog "and should be manually copied to the user's directory."
+}
diff --git a/media-sound/tapestrea/Manifest b/media-sound/tapestrea/Manifest
new file mode 100644
index 000000000000..620bd702c650
--- /dev/null
+++ b/media-sound/tapestrea/Manifest
@@ -0,0 +1,7 @@
+AUX tapestrea-0.1.0.5-gcc44.patch 1301 SHA256 8ed8f8413a5d3f9d72c6f366b6bd6a85dd42c19c916b9d119e1c257f24c0592f SHA512 d55c5fec518fc79686720a1c5b9fa01483aaaf22141e2a10de541a1cbf63daf37bebf8b653172990f34bc188f4064af9d3e266e0d103e0fef4fbd557c406b5a7 WHIRLPOOL 11dd6f2cb93065e2bd7a9d6ba0febf2bf124464584709742faa05e121c25e497ef742c66a06c614738448509632501cd63c0d191460d2247cd6bb59726d0ff4b
+AUX tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch 1280 SHA256 f8a29a595c6ff9de159739fbfbf20a7e6972ad6b2ee988db8a8b7b7ab6f3d0c1 SHA512 de4ff80ba5ca256d794ceff80fe956459e16261b1d786a87691d2736835839e177056ab9e4732c78ec0381c01324c483b27de310f8168269ebc04dd6e39af344 WHIRLPOOL ed73ec0fd65abd2770e1872f20efa7feb81371d493c200b3e10b8a18a6ede0b8c578d4fc4d8bc9ab625573f79a1c267cd56a4157e31596a95ecdd0dc8ae2f818
+DIST tapestrea-0.1.0.5.tgz 21987831 SHA256 85c57e642814c534a0bdb17d1d5c59d1292d3a681ae397a0c07234637a1ac254 SHA512 8df64cb31e85167afb78e4891192dde7d5476c637241e53f6218b013bb8c40e43a626cc2a2c1368498491f00451a719e1126a90ca2d67aa52137a9e1cd034656 WHIRLPOOL c1f0c0e947dbae4ee65fc00b1632a233d6907ec7d7b47debfff589c0d3701287b9ddd0dc6d4a3c441202928deb228d95ad43edf88d618761ffff3f12fed8adb0
+EBUILD tapestrea-0.1.0.5-r1.ebuild 2744 SHA256 15bdfbe8f9fde201c192ec336fbc6918ab26e58a747f8f3450ab964dbf742170 SHA512 feb4f626a575bf4a3a8fd6bc9cbd231e319d15f1e908694c63d9a46e9d9e2d75770c7f01f630aa175366be296639d92bc412046aaaeaef7b214bce8ce4bc254e WHIRLPOOL 4fc3b074c37cbfc142eac340c74532c5cb2c14ce3975ba04a8ef1a1e40ea9ca56889447f9e6e2398dad0ca2216ec9db66d1d81fb2379970e91178918d1ff4340
+MISC ChangeLog 2644 SHA256 a6b253d3abcca9d073700351f08895b0eb709e1521b18aee7ac9a5ac5e474881 SHA512 e771b68450306e3f665736d52c08d0b30676a743d5142d7ae478132cba634bbaf1753bb29349a5341f80f960e0b69bfd1fca035f80291c301aed168b641e08e6 WHIRLPOOL 53ed973f29cc07cf85de436d3bf04e446d0fb75c78ac08857cc15adb9e5f54895427a034fe1dc548fc8c820b9807c0cc7f14f1bd5bb00c92879e42820ba7e358
+MISC ChangeLog-2015 1378 SHA256 6d6f00947ddaa7d5b2a668d3d4ea836cc3024ecc9751ab063e9a8e655a986274 SHA512 75424d89aabaa836e38891fde6c5acbdf09756b420253b9bd878d6fa4f04184414d0db3aa7669ed0b03fcf4391f7b8b990fc8f7ca5b21242f0ce1eea10873d16 WHIRLPOOL acc3865510c400f81be4d4b289fc799f89d44c778ed2fcc1faca244e3b455c698f4bbb7de5aa5d83685474d4a8973f6b8ab759cd21dbe537a6dfdc7f7662b9c1
+MISC metadata.xml 269 SHA256 818fa1988dd381ac3dae9497067d93e68201ea69f0228f14f08ae3875f1920f0 SHA512 5f48ad801d958dab1f3a4a877bc7681180c3a37b27bd602527c34c005d2f384466bc04c61dcd1f80e7463d7bdb3acb5f457fb02b1549c0e2de9dca7b8a203d1c WHIRLPOOL 796c8c153f4545558fa2d159db3b44b55f7c4ed859beb21f6d5de2171745f5c45329e5cda90fc92b856ccdb0831538da238e944dea71da86a2b8de91ddb8b77a
diff --git a/media-sound/tapestrea/files/tapestrea-0.1.0.5-gcc44.patch b/media-sound/tapestrea/files/tapestrea-0.1.0.5-gcc44.patch
new file mode 100644
index 000000000000..ca6e0370c957
--- /dev/null
+++ b/media-sound/tapestrea/files/tapestrea-0.1.0.5-gcc44.patch
@@ -0,0 +1,33 @@
+diff -ur tapestrea-0.1.0.5-orig/scripting/chuck-1.2.1.2/src/util_string.h tapestrea-0.1.0.5/scripting/chuck-1.2.1.2/src/util_string.h
+--- tapestrea-0.1.0.5-orig/scripting/chuck-1.2.1.2/src/util_string.h	2009-06-27 19:06:03.000000000 -0400
++++ tapestrea-0.1.0.5/scripting/chuck-1.2.1.2/src/util_string.h	2009-06-27 19:06:54.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include "chuck_def.h"

+ #include <string>

+ #include <vector>

++#include <cstdio>

+ 

+ 

+ // itoa

+diff -ur tapestrea-0.1.0.5-orig/src/taps_birdbrain.cpp tapestrea-0.1.0.5/src/taps_birdbrain.cpp
+--- tapestrea-0.1.0.5-orig/src/taps_birdbrain.cpp	2009-06-27 19:06:18.000000000 -0400
++++ tapestrea-0.1.0.5/src/taps_birdbrain.cpp	2009-06-27 17:49:18.000000000 -0400
+@@ -35,6 +35,7 @@
+ #include "taps_birdbrain.h"

+ #include "util_thread.h"

+ #include <stdarg.h>

++#include <cstdio>

+ 

+ // for getcwd and chdir

+ #ifdef __PLATFORM_WIN32__

+diff -ur tapestrea-0.1.0.5-orig/src/ui_audiofx.cpp tapestrea-0.1.0.5/src/ui_audiofx.cpp
+--- tapestrea-0.1.0.5-orig/src/ui_audiofx.cpp	2009-06-27 19:06:18.000000000 -0400
++++ tapestrea-0.1.0.5/src/ui_audiofx.cpp	2009-06-27 17:49:18.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include "taps_birdbrain.h"

+ #include "ui_audiofx.h"

+ #include <iostream>

++#include <cstdio>

+ using namespace std;

+ 

+ // Start FxStk

diff --git a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch b/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
new file mode 100644
index 000000000000..3f866d5c88e5
--- /dev/null
+++ b/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
@@ -0,0 +1,34 @@
+--- a/src/makefile.alsa
++++ b/src/makefile.alsa
+@@ -3,7 +3,7 @@
+ CHUCK_DIR=../scripting/chuck-1.2.1.2/src

+ INCLUDES=-I$(CHUCK_DIR)

+ FLAGS=-D__LINUX_ALSA__ `pkg-config --cflags gtk+-2.0` $(CFLAGS) -c

+-LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0`

++LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0` -lpthread

+ 

+ TAPS_OBJS= taps_analysis.o taps_birdbrain.o taps_driver.o \

+ 	taps_featurelibrary.o taps_pvc.o taps_regioncomparer.o \

+--- a/scripting/chuck-1.2.1.2/src/makefile.alsa
++++ b/scripting/chuck-1.2.1.2/src/makefile.alsa
+@@ -5,7 +5,7 @@
+ INCLUDES=

+ CFLAGS?= -O3

+ FLAGS= -D__LINUX_ALSA__ -c $(CFLAGS)

+-LIBS=-lasound -lstdc++ -ldl -lm

++LIBS=-lasound -lstdc++ -lm -lpthread -ldl

+ SF_OBJ=util_sndfile.o

+ 

+ ifneq ($(CHUCK_DEBUG),)

+diff -Naur a/src/makefile.alsa b/src/makefile.alsa
+--- a/src/makefile.alsa	2014-01-30 02:21:02.173891275 +0100
++++ b/src/makefile.alsa	2014-01-30 02:21:23.026891253 +0100
+@@ -48,7 +48,7 @@
+ OBJS+=ui_scripting.o

+ # scripting disable needs most of chuck anyway due to includes 

+ # in latest rtaudio.cpp, so always keep this line:

+-LIBS+=$(CHUCK_OBJS)

++LIBS+=$(CHUCK_OBJS) -ldl

+ 

+ # uncomment to use preconfigured sndfile

+ #FLAGS+=-D__USE_SNDFILE_PRECONF__

diff --git a/media-sound/tapestrea/metadata.xml b/media-sound/tapestrea/metadata.xml
new file mode 100644
index 000000000000..d6fe65967ae6
--- /dev/null
+++ b/media-sound/tapestrea/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		A set of new tools and techniques for sound design
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
new file mode 100644
index 000000000000..02149b3021c7
--- /dev/null
+++ b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Expressive Synthesis, Transformation, Rendering of Environmental Audio"
+HOMEPAGE="http://taps.cs.princeton.edu/"
+SRC_URI="http://taps.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa doc jack oss"
+
+RDEPEND="jack? ( media-sound/jack-audio-connection-kit:0 )
+	alsa? ( >=media-libs/alsa-lib-0.9:0 )
+	media-libs/libsndfile:0
+	media-libs/freeglut:0
+	virtual/opengl:0
+	virtual/glu:0
+	x11-libs/gtk+:2"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison:0
+	sys-devel/flex:0"
+
+pkg_setup() {
+	if ! use alsa && ! use jack && ! use oss; then
+		eerror "One of the following USE flags is needed: jack, alsa or oss"
+		die "Please set at least one audio engine type"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+
+	# Respect LDFLAGS/CC
+	for bend in alsa jack oss; do
+		sed -i -e "s:gcc -o:\$(CC) \$(LDFLAGS) -o :" \
+			-e "s:-O3 -c:\$(CFLAGS) -c:" \
+			-e "s:make -C:\$(MAKE) -C :" \
+			"${S}/src/makefile.${bend}" || die
+	done
+
+	# Avoid "make jobserver unavailable" warning
+	sed -i -e "s:-make:\$(MAKE):g" \
+		"${S}/src/makefile" || die
+
+	sed -i -e "s:-make:\$(MAKE):g" \
+		"${S}/scripting/chuck-1.2.1.2/src/makefile" || die
+
+	epatch "${FILESDIR}"/${PF}-underlinking-alsa-pthread.patch
+}
+
+compile_backend() {
+	backend=$1
+	einfo "Compiling against ${backend}"
+
+	cd "${S}/scripting/chuck-1.2.1.2/src"
+	emake -f "makefile.${backend}" \
+		CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+
+	cd "${S}/src"
+	emake -f "makefile.${backend}" \
+		CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+
+	mv taps{,-${backend}} || die
+	emake -f makefile clean
+	cd "${S}/scripting/chuck-1.2.1.2/src"
+	emake -f makefile clean
+}
+
+src_compile() {
+	# When compiled with athlon or athlon-xp flags
+	# chuck crashes on removing a shred with a double free or corruption,
+	# it happens in Chuck_VM_Stack::shutdown() on the line
+	#   SAFE_DELETE_ARRAY( stack );
+	replace-cpu-flags athlon athlon-xp i686
+
+	use jack && compile_backend jack
+	use alsa && compile_backend alsa
+	use oss && compile_backend oss
+}
+
+src_install() {
+	use jack && dobin src/taps-jack
+	use alsa && dobin src/taps-alsa
+	use oss && dobin src/taps-oss
+
+	dodoc AUTHORS BUGS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
+
+	if use doc ; then
+		for tapedir in `find examples/* -type d -maxdepth 0`; do
+			docinto $tapedir
+			dodoc `find $tapedir/* -type f -maxdepth 0`
+			for tapedir2 in `find $tapedir/* -type d -maxdepth 0`; do
+				docinto $tapedir2
+				dodoc `find $tapedir2/* -type f -maxdepth 0`
+			done
+		done
+		docinto doc
+		dodoc doc/*
+	fi
+}
diff --git a/media-sound/tapiir/Manifest b/media-sound/tapiir/Manifest
new file mode 100644
index 000000000000..511e50dcd2ee
--- /dev/null
+++ b/media-sound/tapiir/Manifest
@@ -0,0 +1,7 @@
+AUX tapiir-0.7.2-ldflags.patch 422 SHA256 8145d4694cb59320adabb599e1d042af36bfb95d03bd08bfbe8e5ab1706a1d8b SHA512 5141831956322ef1df0909bc5e55124cb6367eae7a043a826843a9363b95f7d75fed8e0439eef66a0b7e3aa982a19da83fba80687a8451f9b3ed272082414cbf WHIRLPOOL 1ccbf89e80b88482f1380fd967f56de08dc5bf08165b1e7291afbf640b0a714a891cc47ad06f13f11650bbf004184895c99d066cca6ebf4824b55138acaf8240
+AUX tapiir-0.7.3-acinclude.m4 4975 SHA256 5527c63eec9ccde73a43d89b5e60f4a1901ed36e53d259ebd83d51a0d4d74970 SHA512 b97e115a2c113280dc7c3c705a8b2e4270259c05a0379cf94b4709b2744e6aafba048ce1c6dc00ba2a01df6861308e244749881f0159508bea61d7c73faea640 WHIRLPOOL be77deee37bfdb472d8fed1168a5eecf3c74074ad391b20a68b63719b27e92b8e7d6c035748e7bd4afb7b988375204fea1d2006765ca20622c9345ae59657138
+DIST tapiir-0.7.3.tgz 168651 SHA256 9b2f6f0c4f642c3b128f5dd5b3b8d44e80a6eb3310f8f59e0b7460f71cc36d5f SHA512 e9b935f775ddcaf9d6a2b963a1d002d400fc34220845122188b82f1d6075176afc195ae4320679d8990b57f71d0a44fb6ba0cee8a74cb732b92957596c13f4b3 WHIRLPOOL 20ea8a3d7e8b7afdea88278df4990fb5acdcb5224d95fb45fdbdbc3990abaf1ebf2f07e24b45e4f4e9ba371ce0575f20589a43d88712779aa2640282f9eda541
+EBUILD tapiir-0.7.3.ebuild 860 SHA256 38d256ac8ff9eba4ac4621513b0faeb2155895eb9f362010ac8017da9090f6d4 SHA512 ddc51f88eda721f87d0e25c1a6d7ac10efce4d3e39739f9994fe98524326b375ed3483a4a93456078dbe1cd1c22e01163942df2497df98cd112f044f3299f6d6 WHIRLPOOL ee261efa814bc9cc8d6f8ad7919ea8c9b58c211faf0c47f74c2dc38391338e628d9bda187cc02d4b4180b3dd6a27bfccf14fbbfc6ff9aa2cb1ce4c58b9763429
+MISC ChangeLog 3008 SHA256 787164c619ab3bf6a33e5bf3dccc70ea7f0a995e130681034a0db94308fdc034 SHA512 f486e152f7e28ccccc136819dcf59055ac14035e64029bc2b6d037f3922989ca1e7d899b3e0bf27d4f7370498f2bc5d69a41d6c35b276a2d6c5c3ad838fad9a9 WHIRLPOOL 3c7d4b3c49a746ed85883e158f29fc392c5cd023fba8108ebba24fc1456f34709904a626848fe97c2d1a519a94d37819599664ede45f5389f31550d6a30e919e
+MISC ChangeLog-2015 1668 SHA256 7f2ef02837d31e353beb5b13aea6ccf0519d9dfcf19a798e94f13e9f972801a6 SHA512 4168e059320f54f20f6fb07a056158702b0e80e7103c53628110764ffa04d0f15001463903f0eb2badae752b8a1c54e77a3602aff24f8546cb30f60386eb7553 WHIRLPOOL a6594edfb88a01d3b2b6d29f5500ce0f2055723fe3a7e91b639a2be1c46ccbb7ebbcf70dbec22b4f8f46496d9c8b558c6499b65edd96af9027effa83496cb000
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/tapiir/files/tapiir-0.7.2-ldflags.patch b/media-sound/tapiir/files/tapiir-0.7.2-ldflags.patch
new file mode 100644
index 000000000000..27b616e9b263
--- /dev/null
+++ b/media-sound/tapiir/files/tapiir-0.7.2-ldflags.patch
@@ -0,0 +1,15 @@
+Index: tapiir-0.7.2/configure
+===================================================================
+--- tapiir-0.7.2.orig/configure
++++ tapiir-0.7.2/configure
+@@ -3667,8 +3667,8 @@ See \`config.log' for more details." >&2
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-CXXFLAGS=`fltk-config --cxxflags`
+-LDFLAGS=`fltk-config --ldflags`
++CXXFLAGS="$CXXFLAGS `fltk-config --cxxflags`"
++LIBS="$LIBS `fltk-config --ldflags`"
+ 
+ 
+ ac_ext=c
diff --git a/media-sound/tapiir/files/tapiir-0.7.3-acinclude.m4 b/media-sound/tapiir/files/tapiir-0.7.3-acinclude.m4
new file mode 100644
index 000000000000..9442a32c8566
--- /dev/null
+++ b/media-sound/tapiir/files/tapiir-0.7.3-acinclude.m4
@@ -0,0 +1,173 @@
+AC_DEFUN([AM_PATH_ALSA],
+[dnl Save the original CFLAGS, LDFLAGS, and LIBS
+alsa_save_CFLAGS="$CFLAGS"
+alsa_save_LDFLAGS="$LDFLAGS"
+alsa_save_LIBS="$LIBS"
+alsa_found=yes
+
+dnl
+dnl Get the cflags and libraries for alsa
+dnl
+AC_ARG_WITH(alsa-prefix,
+[  --with-alsa-prefix=PFX  Prefix where Alsa library is installed(optional)],
+[alsa_prefix="$withval"], [alsa_prefix=""])
+
+AC_ARG_WITH(alsa-inc-prefix,
+[  --with-alsa-inc-prefix=PFX  Prefix where include libraries are (optional)],
+[alsa_inc_prefix="$withval"], [alsa_inc_prefix=""])
+
+dnl FIXME: this is not yet implemented
+AC_ARG_ENABLE(alsatest,
+[  --disable-alsatest      Do not try to compile and run a test Alsa program],
+[enable_alsatest="$enableval"],
+[enable_alsatest=yes])
+
+dnl Add any special include directories
+AC_MSG_CHECKING(for ALSA CFLAGS)
+if test "$alsa_inc_prefix" != "" ; then
+	ALSA_CFLAGS="$ALSA_CFLAGS -I$alsa_inc_prefix"
+	CFLAGS="$CFLAGS -I$alsa_inc_prefix"
+fi
+AC_MSG_RESULT($ALSA_CFLAGS)
+
+dnl add any special lib dirs
+AC_MSG_CHECKING(for ALSA LDFLAGS)
+if test "$alsa_prefix" != "" ; then
+	ALSA_LIBS="$ALSA_LIBS -L$alsa_prefix"
+	LDFLAGS="$LDFLAGS $ALSA_LIBS"
+fi
+
+dnl add the alsa library
+ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
+LIBS="$ALSA_LIBS $LIBS"
+AC_MSG_RESULT($ALSA_LIBS)
+
+dnl Check for a working version of libasound that is of the right version.
+min_alsa_version=ifelse([$1], ,0.1.1,$1)
+AC_MSG_CHECKING(for libasound headers version >= $min_alsa_version)
+no_alsa=""
+    alsa_min_major_version=`echo $min_alsa_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    alsa_min_minor_version=`echo $min_alsa_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    alsa_min_micro_version=`echo $min_alsa_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+AC_LANG_SAVE
+AC_LANG_C
+AC_TRY_COMPILE([
+#include <alsa/asoundlib.h>
+], [
+/* ensure backward compatibility */
+#if !defined(SND_LIB_MAJOR) && defined(SOUNDLIB_VERSION_MAJOR)
+#define SND_LIB_MAJOR SOUNDLIB_VERSION_MAJOR
+#endif
+#if !defined(SND_LIB_MINOR) && defined(SOUNDLIB_VERSION_MINOR)
+#define SND_LIB_MINOR SOUNDLIB_VERSION_MINOR
+#endif
+#if !defined(SND_LIB_SUBMINOR) && defined(SOUNDLIB_VERSION_SUBMINOR)
+#define SND_LIB_SUBMINOR SOUNDLIB_VERSION_SUBMINOR
+#endif
+
+#  if(SND_LIB_MAJOR > $alsa_min_major_version)
+  exit(0);
+#  else
+#    if(SND_LIB_MAJOR < $alsa_min_major_version)
+#       error not present
+#    endif
+
+#   if(SND_LIB_MINOR > $alsa_min_minor_version)
+  exit(0);
+#   else
+#     if(SND_LIB_MINOR < $alsa_min_minor_version)
+#          error not present
+#      endif
+
+#      if(SND_LIB_SUBMINOR < $alsa_min_micro_version)
+#        error not present
+#      endif
+#    endif
+#  endif
+exit(0);
+],
+  [AC_MSG_RESULT(found.)],
+  [AC_MSG_RESULT(not present.)
+   ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libasound not found.)])
+   alsa_found=no]
+)
+AC_LANG_RESTORE
+
+dnl Now that we know that we have the right version, let's see if we have the library and not just the headers.
+if test "x$enable_alsatest" = "xyes"; then
+AC_CHECK_LIB([asound], [snd_ctl_open],,
+	[ifelse([$3], , [AC_MSG_ERROR(No linkable libasound was found.)])
+	 alsa_found=no]
+)
+fi
+
+if test "x$alsa_found" = "xyes" ; then
+   ifelse([$2], , :, [$2])
+   LIBS=`echo $LIBS | sed 's/-lasound//g'`
+   LIBS=`echo $LIBS | sed 's/  //'`
+   LIBS="-lasound $LIBS"
+fi
+if test "x$alsa_found" = "xno" ; then
+   ifelse([$3], , :, [$3])
+   CFLAGS="$alsa_save_CFLAGS"
+   LDFLAGS="$alsa_save_LDFLAGS"
+   LIBS="$alsa_save_LIBS"
+   ALSA_CFLAGS=""
+   ALSA_LIBS=""
+fi
+
+dnl That should be it.  Now just export out symbols:
+AC_SUBST(ALSA_CFLAGS)
+AC_SUBST(ALSA_LIBS)
+])
+
+
+AC_DEFUN(AM_PATH_FLTK,
+[
+AC_MSG_CHECKING(fltk version)
+
+min_fltk_version=ifelse([$1], ,1.1.0,$1)
+cur_fltk_version=`fltk-config --version`
+
+fltk_min_major_version=`echo $min_fltk_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+fltk_min_minor_version=`echo $min_fltk_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+fltk_min_patch_version=`echo $min_fltk_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+
+fltk_cur_major_version=`echo $cur_fltk_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+fltk_cur_minor_version=`echo $cur_fltk_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+fltk_cur_patch_version=`echo $cur_fltk_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+fltk_version_ok=no
+
+if test x"$fltk_cur_major_version" != x -a x"$fltk_cur_minor_version" != x -a x"$fltk_cur_patch_version" != x; then
+  if test $fltk_cur_major_version -eq $fltk_min_major_version; then
+    if test $fltk_cur_minor_version -ge $fltk_min_minor_version; then
+      if test $fltk_cur_patch_version -ge $fltk_min_patch_version; then
+        fltk_version_ok=yes
+      fi
+    fi
+  fi
+fi
+
+if test $fltk_version_ok == yes; then
+	AC_MSG_RESULT([ok])
+else
+	AC_MSG_FAILURE([not ok])
+fi
+
+CXXFLAGS=`fltk-config --cxxflags`
+LIBS="$LIBS `fltk-config --ldflags`"
+])
+
+
diff --git a/media-sound/tapiir/metadata.xml b/media-sound/tapiir/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/tapiir/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/tapiir/tapiir-0.7.3.ebuild b/media-sound/tapiir/tapiir-0.7.3.ebuild
new file mode 100644
index 000000000000..b0640c8448a1
--- /dev/null
+++ b/media-sound/tapiir/tapiir-0.7.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A flexible audio effects processor, inspired by classical tape delay systems"
+HOMEPAGE="http://www.resorama.com/maarten/tapiir/"
+SRC_URI="http://www.resorama.com/maarten/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+
+RDEPEND="
+	media-sound/jack-audio-connection-kit
+	media-libs/alsa-lib
+	x11-libs/fltk:1
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.7.2-ldflags.patch )
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
+	eautoreconf
+}
+
+src_install() {
+	local HTML_DOCS=( doc/{*.html,images/*.png} )
+	default
+
+	doman doc/${PN}.1
+	dodoc doc/${PN}.txt
+
+	insinto /usr/share/${PN}/examples
+	doins doc/examples/*.mtd
+}
diff --git a/media-sound/teamspeak-client-bin/Manifest b/media-sound/teamspeak-client-bin/Manifest
new file mode 100644
index 000000000000..e7356886bba7
--- /dev/null
+++ b/media-sound/teamspeak-client-bin/Manifest
@@ -0,0 +1,10 @@
+AUX teamspeak3 258 SHA256 42a5e2a879af2b1f539240a75315f4ff65fdf20d90d8c3984f234ba5cf9869f3 SHA512 b587b3991e927922854f155ac61e8d923a6b84a1da88a040277d670203be7dc11b5fbf79508d3894e94a2686da1758781b158c7598c8a61b151798c6a7b1880e WHIRLPOOL 8c542bed81d5f04418b30a39ac63eb4a43f2ab9d339d7f197fd78e674e7908c8696b78c04fd5400916b30c849868adb948c79748f0ba8d1052d507fb6a9c6d3a
+DIST TeamSpeak3-Client-linux_amd64-3.0.19.1.run 37071678 SHA256 b0d8e208b95b3b3f13e53a7930482599d205e2b769876763ad40c5c9f266759c SHA512 6db1f21c104935bfbaf3936f22ad6c8da79d1c69816576651de49d0354fbbf0d744157983ee486a522b89d98e6436550ca3be6153c5dcda1209ad9a00e70d24d WHIRLPOOL acadd3686648fe4176944ca1d2e937ac4e8843d0334b28717dc1e96349157315d1fb5f6ff483f16b072cdc750a6733952673cde4140e0135111fd5e4b7f2d5f9
+DIST TeamSpeak3-Client-linux_amd64-3.0.19.4.run 37054436 SHA256 f74617d2a2f5cb78e0ead345e6ee66c93e4a251355779018fd060828e212294a SHA512 fca7303a9c75bbab4945c9336c78115b28b3f14b278ffccb8453d7b29eabf1cd7147697bf0042bc625a9108db653468e8f0ebc4b29cf00d48f5438c919efa8c7 WHIRLPOOL e979cbe22a4109aabffc9b77a9b6e625e1e9e819c248d18795967a007bc1b92fe726a1fb33063a1551e9853d5bd15473ed1fd311f413e33e451f8a4b5eeb001a
+DIST TeamSpeak3-Client-linux_x86-3.0.19.1.run 36646880 SHA256 ddfe07713e09e009d4268eb14c5802a0afffc1a1aed34c2da09153b5a8d456c5 SHA512 c8b9a3426ab0516ab0c63d72f63d03016e5abe4f03eae112d93fdb813d49c0170de6e8951acaec20a4f64c25cafc6a64f0c3122cba88553daa4aedcb49b4aaac WHIRLPOOL 7f14e0bcd9bc596b0a52eccc8ac839327dcd3e15a36d647b1554fedc801167a7a9baa17eb96dfe349a027b3f6b02eda3319927a483016bd87bba52ca9b38e722
+DIST TeamSpeak3-Client-linux_x86-3.0.19.4.run 36627204 SHA256 e11467dc1732ddc21ec0d86c2853c322af7a6b8307e3e8dfebc6b4b4d7404841 SHA512 ec52a78e5753716ba81602ecd60a2440a08ec4fc777d7d560dd714ae4b80fe7befceb5271c11d2eae46dbc3cbf71f0eca4976a44510bc66a51f5ebe39745d2db WHIRLPOOL f54b4a0ce97a2e24b4bd6873db89cbca15b47f992f390d66458e4ff00b5a0febb54a5d6402936019fb854c183739fab453a9909c8c1977593e712daf59bdb522
+EBUILD teamspeak-client-bin-3.0.19.1.ebuild 1951 SHA256 ce1a4bb6a3b6b9587ef1c115da5758040b165b5dd0aa69bd2350f539e6033664 SHA512 df52cd106b6ce4274fcc76793d7b6cf41a7203fd94b1daa66bf93dd4fece770dcc4bf711ed4ef7d7024701b3bb7558bfd3acea0fdbb2a50f7b7b47ca18e1c002 WHIRLPOOL aa7a98ea2e7c8ec15216f66b37dead6d9f99fcf2a2cb93d20bd19356c97f4312e9b9fee212684974438fbe91320a0586b511a76d70a7ba10bd7f43600790cb99
+EBUILD teamspeak-client-bin-3.0.19.4.ebuild 1929 SHA256 d2505d6bc07930c75eaf562bf4cc5be97db2e8a31258599b605121bbc7ec0058 SHA512 56d1cabf35c0a2f313dfc0d058819e2ae498305999111cc4c7bb061d6cf10a4b494aa5115bb9e6e75081e0425b5a1d232d6a528ef321f108c0e06773b1a0ff7a WHIRLPOOL c5a2ab4b6d850475477c353471a3160a7c098dcd2f0388822e2d8e875367caaf992ce3de570dc333889d1df05319c083ea46616353e9282ab738b7729c4d32f7
+MISC ChangeLog 4477 SHA256 92e758514817025c77a81ed16baae822590cb02488a954e834188b8334e306a7 SHA512 82dfa53cf87034ccb786916d5c38c9f6b1c484de6f7f98b8ed86a5f90fecc0b8ea473ffd5d6b417c641c0880f66751b09579ed1b1284d5473ac104ae765bd266 WHIRLPOOL e630502b76984f84ce13300cb869653da593cdf0f1bb72afad7091107c8780f195da70e47f7e7b7d5b9edac29b210739087710a33042835f9b4abb4b8a90c225
+MISC ChangeLog-2015 9115 SHA256 94c44f852c9f8e6e58c52b85cbea614bff3e2e4635dc2829605f7c57a5fbd246 SHA512 7e796ece90503c705c0bc3d7c0e3edc0b8359c4cca0f7e16b2690500adf24bff47c6167e35b65492694348033e584fe92813a7258809d9865afe5b5269a60fc8 WHIRLPOOL 3bff28dbea9d980f850454be28ae99175685bf4073a2bd0e2dc2660febc2aff4cc9ecb4d8601835c5845d9feee7f9ba7524afa4fef9f72a2ea7f6a8d7b643a61
+MISC metadata.xml 708 SHA256 ecf68ba8dd7bc1bf2610747d1530a550b251f319e0f4c717e7e6cbb6ff4e4981 SHA512 192cb133ecea4239ed304883cf71d6328b5926db9d9a513ad0cdb049205195f20fd480ba1228a7990ae26cd5761a3c36e39ce358f30456aa137d1247435ddd9b WHIRLPOOL 0b8016f8b778764ac6c9d7f674b90d108cf7d84dd9b42c7642528321c3c74b61ff895e7fc803fac675b8982538320227a967c15067fd5cd1da4ca40d2d0e5cd5
diff --git a/media-sound/teamspeak-client-bin/files/teamspeak3 b/media-sound/teamspeak-client-bin/files/teamspeak3
new file mode 100644
index 000000000000..d598f01dfcf3
--- /dev/null
+++ b/media-sound/teamspeak-client-bin/files/teamspeak3
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+BASEDIR="/opt/teamspeak3-client"
+
+export LD_LIBRARY_PATH="${BASEDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+
+# work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
+cd "${BASEDIR}"
+
+exec "${BASEDIR}/ts3client" "$@"
diff --git a/media-sound/teamspeak-client-bin/metadata.xml b/media-sound/teamspeak-client-bin/metadata.xml
new file mode 100644
index 000000000000..797f525b2757
--- /dev/null
+++ b/media-sound/teamspeak-client-bin/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gentoo@karolherbst.de</email>
+    <name>Karol Herbst</name>
+    <description>Proxy-Maintainer. Assign bugs to him</description>
+  </maintainer>
+  <maintainer type="person">
+    <email>dryatu@gmail.com</email>
+    <name>Sami Loone</name>
+    <description>Proxy-Maintainer. Assign bugs to him</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>TeamSpeak Client (Voice Communication Software)</longdescription>
+</pkgmetadata>
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.19.1.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.19.1.ebuild
new file mode 100644
index 000000000000..73b4f4f71bde
--- /dev/null
+++ b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.19.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils unpacker
+
+DESCRIPTION="TeamSpeak Client - Voice Communication Software"
+HOMEPAGE="http://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
+
+LICENSE="teamspeak3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa pulseaudio"
+
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+RDEPEND="
+	dev-libs/quazip[-qt4,qt5]
+	>=dev-qt/qtcore-5.5:5
+	>=dev-qt/qtgui-5.5:5[accessibility]
+	>=dev-qt/qtnetwork-5.5:5
+	>=dev-qt/qtsql-5.5:5[sqlite]
+	>=dev-qt/qtwidgets-5.5:5
+	sys-libs/glibc
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+RESTRICT="mirror strip"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	elog "Please download ${A}"
+	elog "from ${HOMEPAGE}?page=downloads and place this"
+	elog "file in ${DISTDIR}"
+}
+
+src_prepare() {
+	# Remove the qt-libraries as they just cause trouble with the system's Qt, see bug #328807.
+	rm libQt* || die "Couldn't remove bundled Qt libraries."
+
+	rm -r platforms sqldrivers qt.conf || die "Couldn't remove bundle Qt files."
+
+	# Remove unwanted soundbackends.
+	if ! use alsa ; then
+		rm soundbackends/libalsa* || die
+	fi
+
+	if ! use pulseaudio ; then
+		rm soundbackends/libpulseaudio* || die
+	fi
+
+	# Remove quazip
+	rm libquazip.so || die
+
+	# Rename the tsclient to its shorter version, required by the teamspeak3 script we install.
+	mv ts3client_linux_* ts3client || die "Couldn't rename ts3client to its shorter version."
+}
+
+src_install() {
+	insinto /opt/teamspeak3-client
+	doins -r *
+
+	fperms +x /opt/teamspeak3-client/ts3client
+
+	dobin "${FILESDIR}/teamspeak3"
+
+	make_desktop_entry teamspeak3 TeamSpeak3 \
+		"/opt/teamspeak3-client/pluginsdk/docs/client_html/images/logo.png" \
+		Network
+}
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.19.4.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.19.4.ebuild
new file mode 100644
index 000000000000..e49f55c3e3a3
--- /dev/null
+++ b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.19.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils unpacker
+
+DESCRIPTION="TeamSpeak Client - Voice Communication Software"
+HOMEPAGE="http://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${PV/_/-}.run )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${PV/_/-}.run )"
+
+LICENSE="teamspeak3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa pulseaudio"
+
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+RDEPEND="
+	dev-libs/quazip[-qt4,qt5]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[accessibility]
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	sys-libs/glibc
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+RESTRICT="mirror strip"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	elog "Please download ${A}"
+	elog "from ${HOMEPAGE}?page=downloads and place this"
+	elog "file in ${DISTDIR}"
+}
+
+src_prepare() {
+	default
+
+	# Remove the qt-libraries as they just cause trouble with the system's Qt, see bug #328807.
+	rm libQt* || die "Couldn't remove bundled Qt libraries."
+
+	rm -r platforms sqldrivers qt.conf || die "Couldn't remove bundle Qt files."
+
+	# Remove unwanted soundbackends.
+	if ! use alsa ; then
+		rm soundbackends/libalsa* || die
+	fi
+
+	if ! use pulseaudio ; then
+		rm soundbackends/libpulseaudio* || die
+	fi
+
+	# Remove quazip
+	rm libquazip.so || die
+
+	# Rename the tsclient to its shorter version, required by the teamspeak3 script we install.
+	mv ts3client_linux_* ts3client || die "Couldn't rename ts3client to its shorter version."
+}
+
+src_install() {
+	insinto /opt/teamspeak3-client
+	doins -r *
+
+	fperms +x /opt/teamspeak3-client/ts3client
+
+	dobin "${FILESDIR}/teamspeak3"
+
+	make_desktop_entry teamspeak3 TeamSpeak3 \
+		"/opt/teamspeak3-client/pluginsdk/docs/client_html/images/logo.png" \
+		Network
+}
diff --git a/media-sound/teamspeak-server-bin/Manifest b/media-sound/teamspeak-server-bin/Manifest
new file mode 100644
index 000000000000..2b885bae4683
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -0,0 +1,15 @@
+AUX server.conf 337 SHA256 5520d4d1a0be0fa416e1d4b15f69980cba75c082bf7ae94cefa695af6eb56771 SHA512 870acb2cc74b3a48fece9502cc09dcb8a63db8671721c642f1648a305b08b92cccdd883b08e33e28165bf52fa59b5b745f18401ca115deef8fd9f3b190bfc750 WHIRLPOOL e1bd3aedf729cc5d006cfa43aa41e48e9cf85937f03683352ceab5fcb15913b195c4cf7283b467b7e635cd4df89d72afb179d5e5a004cfeaae0c3be7479916e3
+AUX systemd/teamspeak3-r1.service 505 SHA256 8215b5423352f7d7a115fdbd09184acb009140dc4a41e6c1ef7983e7dca6cac0 SHA512 28b2b0b1d7fe0b0ccb185446711e98ddb464360061597a90283513f122076fecac47198bc08c4c12e920f008472a4e8f6db7d79a27c711202a7167f05bed78ad WHIRLPOOL cfd2179ecc85e4106ff3529ef529d46196de183dec1bf6ee7a63a5c5c6bb4afd35bccbdac1cdc240fb4c0da75e004d27b0f740d5b6e336fca12615199cdfcf1c
+AUX systemd/teamspeak3.conf 133 SHA256 a3851323891a304e6fc5c53740c0e239f167a7c9251cfc8c7e8a4e1b1ac8a1d8 SHA512 49dab025ab37bb29e14a14fb070568c5710fe257a35fe6b887aa404847fc828e9ffecad7c5d10e987128934c433c3b464b8da0e4891ba3b48868b73abb4b9a4c WHIRLPOOL b7980faa9d5c0b83fa1d72eeb14745c050b01bec70a8cd0974157ce02eef06faafb4f7b35a0c4cff496b102817a9d8245237808557472f9452108f46ac9362ab
+AUX teamspeak-server-bin-init-r1 1025 SHA256 daeed2007cfcd365abc875b757405fc54dd864cf9c53ceb04f37cc745b32659e SHA512 8aed2b27a658ad62389b445cf8ce4b6215ca106d58ebad378a0c403b4a2b9c41f2b0f3129ba020289b878bb96dc65b50974fd30f56e90435fc8a0903f1557f48 WHIRLPOOL 98526ed589575fb59e24f6d18cf0b80926a374acf7bd7df24c1184bcdfe8249985a9b72dfffc83b5383ec0949bf4763e024ad5fe69f243cb6c9a1b3848941c57
+AUX ts3db_mariadb.ini 98 SHA256 5b4cde4ed06bf831d6d3ed4bdffa2fd92fd47536a3d0f94352d01df91dcb7c76 SHA512 d2d1ef64c90638fde3cc587d351987b16e96d8cfc83672dee43c0294ab297b83106e682d834008f0213b67b975dadcd4f77c63332c39d155a4125a28206ba7d4 WHIRLPOOL fe8b108a563afafa57aa463b638353277f756ab3bfe858d742ab172cd0ea75d361a07f34f0d65e982e76022d7ce25aabe6c59c04b22958a66969b3c0fa68a7bd
+AUX ts3server 267 SHA256 fd5fb5e2fa508b84b85d84794bc1d5436828fc4cd0729c6cf70c3739e999d0bb SHA512 632297afee021b1603efff9c4070ddeaa10531cab4faa21bc61e259e9109f4d9bc338347da2a435492f509628baf7a8876b3bc7c5a91cb5f81f0c97f8d634c57 WHIRLPOOL 876f82672c0360f65ce87273273952d0f27df4bc37ab030cd575e2d176236fd7790d76879227de7a5e2df495996839df938fc91ef61611641bc4a9fc48d0d015
+DIST teamspeak3-server_linux_amd64-3.0.13.6.tar.bz2 6492488 SHA256 19ccd8db5427758d972a864b70d4a1263ebb9628fcc42c3de75ba87de105d179 SHA512 95271e5a44c7a14b8fbe134b855973c1af53ac76e6ba01089116b1f63c03bae25f5abfd176f9e26207aa4da8501d646298128078ab5b475458a7ccaba2a48e9c WHIRLPOOL 348356570a45d00d4e98ebfa01c8acc3ea7f3bfcf5b74a4b459999715d836b0feef0eefff50534fca2f034505814187fd8b3037b22452aff159e940ed184e871
+DIST teamspeak3-server_linux_amd64-3.0.13.8.tar.bz2 6916065 SHA256 460c771bf58c9a49b4be2c677652f21896b98a021d7fff286e59679b3f987a59 SHA512 d8985f5850602660a6c037c1768a97c79b5842640d618ad00d242035a12820b52ba959545f3e668eb3d6079b1a228ff648c569e7d1fc64be6743ee77995ab0be WHIRLPOOL a9863eb89200b7de89775112ccf8d47f5dad08b6c06f39cbac1d09810c45dbeebd08265982e9e2b0ceea6bc9eb616b86e6cc632533a41591e391b7338c2672a2
+DIST teamspeak3-server_linux_x86-3.0.13.6.tar.bz2 6367104 SHA256 2f70b3e70a3d9bf86106fab67a938922c8d27fec24e66e229913f78a0791b967 SHA512 a35e0fffe320206f2ca19153bd46a910bd1690541c83ec3c784fe1f4aaf8dbe430556990f6ebe0efbe71e52d3887b725da4e659db9d1e3c96fd6fd46e6dcd40d WHIRLPOOL 16d35b684f2f3af540464d80158778c62e19bd3c6ae29c791cfec4e509b5d38118b6a34ef113d0f73999adbd2d0cc35c043475866c122d243aa950fb59b99bd7
+DIST teamspeak3-server_linux_x86-3.0.13.8.tar.bz2 6772664 SHA256 c1be39df7ee136c87e0ea1eff4e3aa84074e2d141c66d23f9a66eb5afa2b1876 SHA512 7ef5d5d0fa2a1244011c2a68662481e4859aa1660e967b203a508497a4fd3c54db44a9f33116ed4932745942df4b5e4c646658346f288ce6191e3e5629d9638f WHIRLPOOL 6246446439b676f69e56168df445c6f7b6956212e0330e4b541a84c1a2e3466273f60b26298bf7c41b0f8157d1b70c165a2e5a9feb96b3d9651463073adbca46
+EBUILD teamspeak-server-bin-3.0.13.6.ebuild 2589 SHA256 056d80b49070921b6417aea37a85ba6cabba3c47a1d0018c3d23c920134ac732 SHA512 52c6c4cd6eab65c1354887024e45875e975effbe003a60b49c21b101df7abc90ada71984f8000af4221b897a71734fb8274a392527e555245d715c6d972224f0 WHIRLPOOL 8660a482c615629d316b8e8e509e11396c992d4cb5ac8d551b9abc0b04bdffaa27c1add1776a5f895ed761dd801a634cb3bb085e2b22f26d068b2db741689d0f
+EBUILD teamspeak-server-bin-3.0.13.8.ebuild 2589 SHA256 101b0b4f1059d845bf64fa246fc5688e26a402aa007525b88fb599cf5148d5dd SHA512 26688cca026f2d9aa6c5bad4bb540b4f0bf85ca267c3a67e6d702d9e73a8d227b86c68a6bdda966ca4aea9025c99ad09bbfd280bd2e6dc866a9ee3cd0912f35c WHIRLPOOL f331532d126f3f2e50f44658ec0837c0e4fe068e398ba12ce4b02d68404280d255b32c18dc6e0a7be02f496400f45c123cb3d66d5646520466a736b662029c03
+MISC ChangeLog 4788 SHA256 41c1fb4ecc56232a227aaa68114cbac9e3ed223fa7435806fcdc5d2eb89ec7a7 SHA512 7e80bc6b4e5090c3987f011bc334d6ad1562d9dbe68e8b3cfb787db281a05d02f18100cab7596907b79e53adee148d71892c724c906814e05641aba8f87cf5eb WHIRLPOOL 717c9e4062e51abed4791a295b4938ef4226c091c3b2de40b3afdf8218dbf2740c5a59e80fd86e1efd4fa5618765586b62dc5610bcd7afb34fbb29dc752a94b0
+MISC ChangeLog-2015 9076 SHA256 3b38900a1320290aa6dfc701416a4ae16de33dc9c1db92a6cf680deccbca26a9 SHA512 44a845a8000e9c9980e6e6065e5111514265778f23da7ed950b1cb543a998a9d862b17ff37fbd8aab8712a707182bae71181f4dd12909a3160365eb836a409ec WHIRLPOOL c8f0d26e700847c00b2e7eeda9983482f43fc5bad4d08247c0b2369ddc211e5599c41adc5068d045d484713b8932154d90a3f9bfa44bca55c6c93513e723c158
+MISC metadata.xml 589 SHA256 f10e5af392c6f55d29855b7213d12c290f260c1eabc63bdd3e1469ffa3197777 SHA512 ab4a822863d5003cd578f37c0c3d5d40df49bdbdfb7384353ca9090e79279fc0f941438528081d626aedcd1f0357000ef615d49e674a1bae6d241db8ee1aedf6 WHIRLPOOL 33744c40b8d206724bde347792a683c745cca3596a0b72f5fb7af973dcdbf4b5fbea70387ac987943e7a687b40e9052d1c1183596629df41c83076449e861f96
diff --git a/media-sound/teamspeak-server-bin/files/server.conf b/media-sound/teamspeak-server-bin/files/server.conf
new file mode 100644
index 000000000000..0fd2db66c508
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/server.conf
@@ -0,0 +1,14 @@
+machine_id=
+default_voice_port=9987
+voice_ip=0.0.0.0
+licensepath=/opt/teamspeak3-server/
+filetransfer_port=30033
+filetransfer_ip=0.0.0.0
+query_port=10011
+query_ip=0.0.0.0
+dbplugin=ts3db_sqlite3
+dbpluginparameter=
+dbsqlpath=/opt/teamspeak3-server/sql/
+dbsqlcreatepath=create_sqlite/
+logpath=/var/log/teamspeak3-server/
+logquerycommands=0
diff --git a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-r1.service b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-r1.service
new file mode 100644
index 000000000000..435325bb89f7
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3-r1.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=TeamSpeak 3 Server
+After=network.target
+
+[Service]
+Type=simple
+Environment=LD_LIBRARY_PATH=/opt/teamspeak3-server
+WorkingDirectory=/opt/teamspeak3-server
+ExecStartPre=/bin/rm -f /dev/shm/7gbhujb54g8z9hu43jre8
+ExecStart=/opt/teamspeak3-server/sbin/ts3server-bin inifile=/etc/teamspeak3-server/server.conf
+ExecStop=/bin/kill -15 $MAINPID
+StandardOutput=syslog
+StandardError=syslog
+User=teamspeak3
+Group=teamspeak3
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+
+# vim:syntax=dosini
diff --git a/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf
new file mode 100644
index 000000000000..c83afe3137cd
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.conf
@@ -0,0 +1,4 @@
+# systemd tmpfile settings for teamspeak3-server
+# See tmpfiles.d(5) for details
+
+d /var/run/teamspeak3 0755 teamspeak3 teamspeak3 -
diff --git a/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1 b/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1
new file mode 100644
index 000000000000..44b7b7c6f946
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1
@@ -0,0 +1,42 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+name="TeamSpeak Server"
+command="/usr/sbin/ts3server"
+pidfile="/run/teamspeak3-server/server.pid"
+command_background="true"
+
+depend() {
+	need net
+	use mysql
+}
+
+start_pre() {
+	# ensure, that the TS3-server finds all custom supplied shared objects on startup.
+	LD_LIBRARY_PATH="/opt/teamspeak3-server:$LD_LIBRARY_PATH"
+	export LD_LIBRARY_PATH
+
+	# temporay fix for EPERM bug (we still leave it here to make sure it is *really* not there)
+	rm -f /dev/shm/7gbhujb54g8z9hu43jre8
+
+	checkpath -d --owner teamspeak3:teamspeak3 --mode 0700 /run/teamspeak3-server
+}
+
+start() {
+	ebegin "Starting ${name}"
+
+	start-stop-daemon --start --quiet --background \
+		--pidfile "/run/teamspeak3-server/server.pid" --make-pidfile \
+		--user "teamspeak3" --chdir "/opt/teamspeak3-server" \
+		--exec "/usr/sbin/ts3server" -- \
+		inifile="/etc/teamspeak3-server/server.conf"
+
+	eend $?
+}
+
+restart() {
+	stop
+	sleep 3
+	start
+}
diff --git a/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini b/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini
new file mode 100644
index 000000000000..7cdc6d6075ab
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/ts3db_mariadb.ini
@@ -0,0 +1,7 @@
+[config]
+host=localhost
+port=3306
+username=teamspeak
+password=teamspeak
+database=teamspeak
+socket=
\ No newline at end of file
diff --git a/media-sound/teamspeak-server-bin/files/ts3server b/media-sound/teamspeak-server-bin/files/ts3server
new file mode 100644
index 000000000000..261b47171b3d
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/ts3server
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+BASEDIR="/opt/teamspeak3-server"
+
+export LD_LIBRARY_PATH="${BASEDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+
+# work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
+cd "${BASEDIR}"
+
+exec "${BASEDIR}/sbin/ts3server-bin" $*
diff --git a/media-sound/teamspeak-server-bin/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml
new file mode 100644
index 000000000000..d7b0d764fc26
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+		<description>Proxy maintainer, assign bugs to him</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>TeamSpeak Server (Voice Communication Software)</longdescription>
+	<use>
+		<flag name="tsdns">Make use of TeamSpeak DNS.</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.6.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.6.ebuild
new file mode 100644
index 000000000000..8f9f1fcb9fb1
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.6.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib systemd user
+
+DESCRIPTION="Crystal Clear Cross-Platform Voice Communication Server"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )"
+
+SLOT="0"
+LICENSE="teamspeak3 GPL-2"
+IUSE="doc tsdns"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="installsources fetch mirror strip"
+
+S="${WORKDIR}/teamspeak3-server_linux_${ARCH}"
+
+QA_PREBUILT="opt/*"
+
+pkg_nofetch() {
+	elog "Please download ${A}"
+	elog "from ${HOMEPAGE}downloads and place this"
+	elog "file in ${DISTDIR}"
+}
+
+pkg_setup() {
+	enewuser teamspeak3
+}
+
+src_install() {
+	# Install wrapper
+	dosbin "${FILESDIR}"/ts3server
+
+	# Install TeamSpeak 3 server into /opt/teamspeak3-server.
+	local opt_dir="/opt/teamspeak3-server"
+	into ${opt_dir}
+	insinto ${opt_dir}
+	exeinto ${opt_dir}
+	newsbin ts3server ts3server-bin
+	doexe *.sh
+	doins *.so
+	doins -r sql
+
+	# Install documentation and tsdns.
+	dodoc -r CHANGELOG doc/*.txt
+	use doc && dodoc -r serverquerydocs doc/serverquery && \
+		docompress -x /usr/share/doc/${PF}/serverquerydocs && \
+		docompress -x /usr/share/doc/${PF}/serverquery && \
+		dosym ../../../usr/share/doc/${PF}/serverquery ${opt_dir}/doc/serverquery && \
+		dosym ../../usr/share/doc/${PF}/serverquerydocs ${opt_dir}/serverquerydocs
+
+	if use tsdns; then
+		newsbin tsdns/tsdnsserver tsdnsserver
+		newdoc tsdns/README README.tsdns
+		newdoc tsdns/USAGE USAGE.tsdns
+		dodoc tsdns/tsdns_settings.ini.sample
+	fi
+
+	# Install the runtime FS layout.
+	insinto /etc/teamspeak3-server
+	doins "${FILESDIR}"/server.conf "${FILESDIR}"/ts3db_mariadb.ini
+	keepdir /{etc,var/{lib,log}}/teamspeak3-server
+
+	# Install the init script and systemd unit.
+	newinitd "${FILESDIR}"/${PN}-init-r1 teamspeak3-server
+	systemd_newunit "${FILESDIR}"/systemd/teamspeak3-r1.service teamspeak3-server.service
+	systemd_newtmpfilesd "${FILESDIR}"/systemd/teamspeak3.conf teamspeak3-server.conf
+
+	# Fix up permissions.
+	fowners teamspeak3 /{etc,var/{lib,log}}/teamspeak3-server
+	fowners teamspeak3 ${opt_dir}
+
+	fperms 700 /{etc,var/{lib,log}}/teamspeak3-server
+	fperms 755 ${opt_dir}
+}
+
+pkg_postinst() {
+	einfo "Starting with version 3.0.13, there are two important changes:"
+	einfo "- IPv6 is now supported."
+	einfo "- Binding to any address (0.0.0.0 / 0::0),"
+	einfo "  instead of just the default ip of the network interface."
+}
diff --git a/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.8.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.8.ebuild
new file mode 100644
index 000000000000..60875a3cb837
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.13.8.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib systemd user
+
+DESCRIPTION="Crystal Clear Cross-Platform Voice Communication Server"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_amd64-${PV}.tar.bz2 )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux_x86-${PV}.tar.bz2 )"
+
+SLOT="0"
+LICENSE="teamspeak3 GPL-2"
+IUSE="doc tsdns"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="installsources fetch mirror strip"
+
+S="${WORKDIR}/teamspeak3-server_linux_${ARCH}"
+
+QA_PREBUILT="opt/*"
+
+pkg_nofetch() {
+	elog "Please download ${A}"
+	elog "from ${HOMEPAGE}downloads and place this"
+	elog "file in ${DISTDIR}"
+}
+
+pkg_setup() {
+	enewuser teamspeak3
+}
+
+src_install() {
+	# Install wrapper
+	dosbin "${FILESDIR}"/ts3server
+
+	# Install TeamSpeak 3 server into /opt/teamspeak3-server.
+	local opt_dir="/opt/teamspeak3-server"
+	into ${opt_dir}
+	insinto ${opt_dir}
+	exeinto ${opt_dir}
+	newsbin ts3server ts3server-bin
+	doexe *.sh
+	doins *.so
+	doins -r sql
+
+	# Install documentation and tsdns.
+	dodoc -r CHANGELOG doc/*.txt
+	use doc && dodoc -r serverquerydocs doc/serverquery && \
+		docompress -x /usr/share/doc/${PF}/serverquerydocs && \
+		docompress -x /usr/share/doc/${PF}/serverquery && \
+		dosym ../../../usr/share/doc/${PF}/serverquery ${opt_dir}/doc/serverquery && \
+		dosym ../../usr/share/doc/${PF}/serverquerydocs ${opt_dir}/serverquerydocs
+
+	if use tsdns; then
+		newsbin tsdns/tsdnsserver tsdnsserver
+		newdoc tsdns/README README.tsdns
+		newdoc tsdns/USAGE USAGE.tsdns
+		dodoc tsdns/tsdns_settings.ini.sample
+	fi
+
+	# Install the runtime FS layout.
+	insinto /etc/teamspeak3-server
+	doins "${FILESDIR}"/server.conf "${FILESDIR}"/ts3db_mariadb.ini
+	keepdir /{etc,var/{lib,log}}/teamspeak3-server
+
+	# Install the init script and systemd unit.
+	newinitd "${FILESDIR}"/${PN}-init-r1 teamspeak3-server
+	systemd_newunit "${FILESDIR}"/systemd/teamspeak3-r1.service teamspeak3-server.service
+	systemd_newtmpfilesd "${FILESDIR}"/systemd/teamspeak3.conf teamspeak3-server.conf
+
+	# Fix up permissions.
+	fowners teamspeak3 /{etc,var/{lib,log}}/teamspeak3-server
+	fowners teamspeak3 ${opt_dir}
+
+	fperms 700 /{etc,var/{lib,log}}/teamspeak3-server
+	fperms 755 ${opt_dir}
+}
+
+pkg_postinst() {
+	einfo "Starting with version 3.0.13, there are two important changes:"
+	einfo "- IPv6 is now supported."
+	einfo "- Binding to any address (0.0.0.0 / 0::0),"
+	einfo "  instead of just the default ip of the network interface."
+}
diff --git a/media-sound/tempest_for_eliza/Manifest b/media-sound/tempest_for_eliza/Manifest
new file mode 100644
index 000000000000..da47ebf97ad2
--- /dev/null
+++ b/media-sound/tempest_for_eliza/Manifest
@@ -0,0 +1,5 @@
+DIST tempest_for_eliza-1.0.5.tar.gz 45046 SHA256 c10e40b62e65cfd3862c99b31e8996b6c48b8eeb727efb741db5da041c2c1420 SHA512 f14aec8427f1f9a7cfe59e2165e2d7b1a5d963c807755ec2299a0fa2f36492b3fb4240b0b4fce54cc9957cf4d3709839bc40035594fcb2568247bcb62b4614f9 WHIRLPOOL f06e475de46d77d1b58a3b7f4845e394cdf0b5fc386b50961bf79bc266216d7fcaa035a303e2ab430d10d2fe4426ec2453b87e727fa7c9ba74b760b4609b32d1
+EBUILD tempest_for_eliza-1.0.5-r1.ebuild 795 SHA256 4381d461e9d2c1eb18a237883acf50298ec398b1a9870394937491a8038bfb04 SHA512 539ed37510b41e3e9105e7db06bd62788f1f2a95c6d669fe3f071b1244334b30e3fd9346dc179cfad8e147c4a00c86d6b63a18a946bdf948dd7d76b9c5866d4d WHIRLPOOL 8e876a648c0e0886da78d355c8a31cfd62313c2039f6de2766647f2978cfcf08f69ba6ce837747186398953fdbf34f7c4f7e8e7e3f8aabf1b02835aa5b8c44f1
+MISC ChangeLog 2466 SHA256 01986090e04a32555ee061b46006a49ad95d4eb347cbd78a22e988e24f4f8018 SHA512 8d5281e18137ff39458d680b0bd57404814a2a6af979e42c2ee7eff89cc74d9750d663116d7e7606c861e7649bf93ee4c30a54be60aeac63f1f14eeffdf6ac57 WHIRLPOOL 757eef651917bbea87c73f248dda6fdea9882e7dab5d637d5a12fd5e6710607188914d64c3b9f51bba834d21bc13af44b85b13bdefa68b7e064b28e66a448958
+MISC ChangeLog-2015 1701 SHA256 5990c063a0fb987b264fe282a910df3a0b93c275c0dc23ccfce0edf3e70a388a SHA512 8033f911ca7f29ac88f910b7d38ff3641d789a94efdf0c0625d628460c54c26dd3bce27888c655ed228a90e803d3f21fbe5f909dfd01c570e71fa84e104ee3f4 WHIRLPOOL f77d6336197840644e809867683ec4c17db51d973c54ec6cb53a3a82a53719e01a05575adfe4e157d8ae04a17a75c6e0a6604d37c1c3ab48b21ea0c326eee15a
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/tempest_for_eliza/metadata.xml b/media-sound/tempest_for_eliza/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/tempest_for_eliza/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r1.ebuild b/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..2ab5ed9d6b60
--- /dev/null
+++ b/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit toolchain-funcs
+
+DESCRIPTION="listen to music on the radio generated by images on your screen"
+HOMEPAGE="http://www.erikyyy.de/tempest/"
+SRC_URI="http://www.erikyyy.de/tempest/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	tc-export CXX
+	econf \
+		--enable-debug \
+		--enable-nowarnerror
+}
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README
+
+	rm songs/Makefile*
+	insinto /usr/share/${PN}
+	doins songs/* || die "doins failed"
+}
diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
new file mode 100644
index 000000000000..0541709cd3c9
--- /dev/null
+++ b/media-sound/terminatorx/Manifest
@@ -0,0 +1,10 @@
+AUX terminatorx-3.84-includes.patch 733 SHA256 b040db6bf7f67d123be78ae2b57150df018a1be223906f187dbc8ce1887466a6 SHA512 3322ba169a741158c2459e1fbb41b311b4ddf4839e770174a43eda6dd51917a87c963bacb393c613e655fe55b58ed0075c3bda84464cf1b7edb18854dbfc4243 WHIRLPOOL 756d2dcd6dd032cd35c78e2d1352de3d16b96c057fb8f5a0381ed0edf887c8cc9940318ccec7445a5e1604cec17e96aca93529c9d20c63b96226bb3aa613cfef
+AUX terminatorx-3.84-new-zlib.patch 524 SHA256 7b20f30847cedc25652645665ed074ac691e1fef47b80ad53e7d6e95cef1c9fd SHA512 e7d4062e61343a2177d6a2938c321f91e7923d2ef6a9e71febbe3b93190fa3ed8d1d05576b0b7b4fef1c604fe704fb8e8c75f16505354e8f9093f7309f516499 WHIRLPOOL e51ef277e6cf73e8c4eaa707f0c1225c8ae792319f85eb6d8bda6ba75ecf902eef47f079b26d7ae4fd735e8d2227446a2b008abdbe9a4d7f17c8ba9f222a58c2
+AUX terminatorx-4.0.1-gtkcombotext.patch 437 SHA256 7b7e40c43d030215fe282382476bac108f9ee561d011d030cceaeede350f8a13 SHA512 d801d60deb2d18444979791246c9eac7b41f2e7f8ecf5fa25a9b4d9294b0c0bd5dc107ac63aab04a85962efdea316f43df9736ef6009a174f1e8d6a7eb53c1c3 WHIRLPOOL 9a76b01de249f0d1d34211dfda1caa666deb7d805dc68c09e98e0f8960b825419cf504643aa10ed9c4f10a0e7e819808166ca3a3c7bae844b57059c85e7808b1
+DIST terminatorX-3.84.tar.gz 572143 SHA256 0680b94aa3cbe77d1f1193be2b84a7d7b250c213cfa2da68241a2294ac5dfc37 SHA512 9b538007acc98b1dd7bb2e310be53bcf1971a94e5c03ea8ca48c59b05f1a0bddd75bf30ab4cfb03d49165098ba63643eaa3bda117cdf833df2438c29a774db6c WHIRLPOOL 1cf156623ff6ea410a701ac3b5613740b6d55ce9cd40ad22bd75e44fc404241fd6737705beeb75ff7631be0615ab84938f88d6fcb62cc5561be978be66d73290
+DIST terminatorX-4.0.1.tar.bz2 1832692 SHA256 96e2e7910d96b9bdadb315727c4127cfda579bd68d2b25d99cd9d35e9fbea56a SHA512 06128633e128f2158367dcde0e913dafc68d62644e7a5182a2391829dadcb9c46430d0cac16cb17113939623266f32cb4624a8548a51b8c01bdfa2860a6c0093 WHIRLPOOL d7bdf09d8d588e91f7a94c4fa679e5f7bff3363fff75b8ef7a29fbefee180b66eae37521f28d299fc8ab8a0f8843c76fb9c421f76e0dc488653e3489be19ef5b
+EBUILD terminatorx-3.84-r1.ebuild 1458 SHA256 6e9fcc41413161e3315db48f782319eb77dc632644e705f3615ce07180ef0bb2 SHA512 8a872bf1af96f6a8f6e1836bb6c32454a885993da86a478281ceb45813b99e887fec831df5d3f5058bcc53870ab5962ed31d56a49039877127537e6bfb8a079e WHIRLPOOL 94a7e7fcd75af6a814917f85d16d4702ba24a7a5adff69f0296d2f315f2e6b94d287a7d182a09f4d443c38a815dd7319ecb4a97531ff91809e808e7c8f47cdd8
+EBUILD terminatorx-4.0.1.ebuild 1357 SHA256 5f28be5370024bc4fe9846d09daf3a680e8d1369154e666144c15be4e87529e5 SHA512 8dda0a9853f245434cfcc9d8b6954c836eea219dc3d4a4854ce4186f3359868ffcf694beb078c7fe8caf862d9d3dd0ffa0bfc7a878fd3ce5ca750fa59bfc5ab9 WHIRLPOOL a50ad9991b6e68166fb737c436183e04fa561e2de1f672d7270f91ba3bdb3c560cb513277c356d45760e7f417f5cdf0bac12df8b95dd07291bba74de2524f44e
+MISC ChangeLog 2910 SHA256 37d1f25e880d194a7c1c3a6d8b0cb560c789f118346797cf418097b5657705cc SHA512 db6064132d5b0e836e3e13372a009e3aee3b44737aaaeea3d370ea14fab07226a0b5c2e0e566c346901369a2c83229073a552cccad9423b3109ae743b140ab5c WHIRLPOOL 83441deebf217b7d92932bbeb393ab298763428381ae34ff50b5bc300f2d2e7c2a6ca65a7116af86dc1e28dcaeb015775a29659ebe409123ce75f3ce8e17b56c
+MISC ChangeLog-2015 5549 SHA256 4096297653143b9ff0be2fc165b6392a71b42236eb72e37846a4f9f48e50f2ae SHA512 e53fb10b9339b8e3d6f9a7fd71c0660af04b59fceb5dba1a25ace0d0111a85510f6e1904eb6a7246e9caca8afc0609c6ca4d8e3204dc9193cddc131040c3bc0b WHIRLPOOL d74db83e15df334f284653d9e986776f9e45e2f0f76e28bad205e433976adf8acd171dd875461eb6bacc835ff744d98194ca463b838df3a9f784b041b959f038
+MISC metadata.xml 255 SHA256 fc6dd027d0011f9f42d437ea0687857760a11bf2137f8822ec8692186d0bcbe3 SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 WHIRLPOOL de03966b13986c67a61f862755281e80740260a9031e5e34cbee88a3053e66f705df0f36499b154744ff447c94e19a28b8649535e08819216569e78eb4ce9a38
diff --git a/media-sound/terminatorx/files/terminatorx-3.84-includes.patch b/media-sound/terminatorx/files/terminatorx-3.84-includes.patch
new file mode 100644
index 000000000000..792ac1db5f00
--- /dev/null
+++ b/media-sound/terminatorx/files/terminatorx-3.84-includes.patch
@@ -0,0 +1,28 @@
+diff --git a/src/tX_mouse.cc b/src/tX_mouse.cc
+--- a/src/tX_mouse.cc
++++ b/src/tX_mouse.cc
+@@ -50,2 +50,3 @@
+ #include <stdlib.h>
++#include <string.h> /* strcmp() */
+ 
+diff --git a/src/tX_mouse.h b/src/tX_mouse.h
+--- a/src/tX_mouse.h
++++ b/src/tX_mouse.h
+@@ -38,2 +38,3 @@
+ #include <gdk/gdkkeysyms.h>
++#include <gtk/gtk.h> /* GtkWidget */
+ 
+diff --git a/src/tX_vttgui.cc b/src/tX_vttgui.cc
+--- a/src/tX_vttgui.cc
++++ b/src/tX_vttgui.cc
+@@ -61,2 +61,3 @@
+ #include <stdio.h>
++#include <string.h> /* strrchr() */
+ #include <ctype.h>
+diff --git a/src/tX_global.h b/src/tX_global.h
+--- a/src/tX_global.h
++++ b/src/tX_global.h
+@@ -37,2 +37,3 @@ extern "C" {
+ #include <stdio.h>
++#include <string.h> /* strcpy() */
+ #include "tX_types.h"
diff --git a/media-sound/terminatorx/files/terminatorx-3.84-new-zlib.patch b/media-sound/terminatorx/files/terminatorx-3.84-new-zlib.patch
new file mode 100644
index 000000000000..87b9ca85378c
--- /dev/null
+++ b/media-sound/terminatorx/files/terminatorx-3.84-new-zlib.patch
@@ -0,0 +1,19 @@
+Description: Fix FTBFS errors with newer zlib.
+Author: Moritz Muehlenhoff <muehlenhoff@univention.de>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663053
+Forwarded: no
+---
+ src/tX_midiin.cc |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/tX_midiin.cc
++++ b/src/tX_midiin.cc
+@@ -447,7 +447,7 @@ gboolean tX_midiin::midi_learn_destroy(G
+ 
+ void tX_midiin::store_connections(FILE *rc, char *indent) 
+ {
+-	gzFile *rz=NULL;
++	gzFile rz=NULL;
+ 	
+ 	tX_store("%s<midi_connections>\n", indent);
+ 
diff --git a/media-sound/terminatorx/files/terminatorx-4.0.1-gtkcombotext.patch b/media-sound/terminatorx/files/terminatorx-4.0.1-gtkcombotext.patch
new file mode 100644
index 000000000000..566dfecc210b
--- /dev/null
+++ b/media-sound/terminatorx/files/terminatorx-4.0.1-gtkcombotext.patch
@@ -0,0 +1,17 @@
+Description: Fix build failure on kfreebsd
+Author: Sebastian Ramacher <sramacher@debian.org>
+Bug-Debian: https://bugs.debian.org/741623
+Forwarded: yes
+Last-Update: 2014-04-25
+
+--- a/src/tX_dialog.cc
++++ b/src/tX_dialog.cc
+@@ -244,7 +244,7 @@ void append_alsa_device_list(GtkComboBox
+ 	}
+ }
+ #else
+-void append_alsa_device_list(GtkComboBoxText *combo) {
++void append_alsa_device_list(GtkComboBoxText *combo, char* current) {
+ }
+ #endif
+ 
diff --git a/media-sound/terminatorx/metadata.xml b/media-sound/terminatorx/metadata.xml
new file mode 100644
index 000000000000..f79bb67acbd9
--- /dev/null
+++ b/media-sound/terminatorx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>proaudio@gentoo.org</email>
+	<name>Gentoo ProAudio Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/terminatorx/terminatorx-3.84-r1.ebuild b/media-sound/terminatorx/terminatorx-3.84-r1.ebuild
new file mode 100644
index 000000000000..45ee96f9e99d
--- /dev/null
+++ b/media-sound/terminatorx/terminatorx-3.84-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils
+
+MY_P=${P/terminatorx/terminatorX}
+
+DESCRIPTION="Realtime audio synthesizer allowing you to 'scratch' on sampled audio data"
+HOMEPAGE="http://www.terminatorx.org/"
+SRC_URI="http://www.terminatorx.org/dist/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="alsa debug mad vorbis sox"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	mad? ( media-sound/madplay )
+	vorbis? ( media-libs/libvorbis )
+	sox? ( media-sound/sox
+		media-sound/mpg123 )
+	>=x11-libs/gtk+-2.2:2
+	>=dev-libs/glib-2.2:2
+	x11-libs/libXi
+	x11-libs/libXxf86dga
+	dev-libs/libxml2
+	media-libs/audiofile
+	media-libs/ladspa-sdk
+	media-libs/ladspa-cmt
+	app-text/scrollkeeper
+	media-libs/liblrdf
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/xf86dgaproto
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Patch from debian to compile with recent zlib
+	epatch "${FILESDIR}"/${PN}-3.84-new-zlib.patch
+	epatch "${FILESDIR}"/${PN}-3.84-includes.patch
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable alsa) \
+		$(use_enable debug) \
+		$(use_enable mad) \
+		$(use_enable vorbis) \
+		$(use_enable sox)
+}
+
+src_install() {
+	gnome2_src_install
+	newicon gnome-support/terminatorX-app.png terminatorX.png
+	make_desktop_entry terminatorX terminatorX terminatorX AudioVideo
+}
diff --git a/media-sound/terminatorx/terminatorx-4.0.1.ebuild b/media-sound/terminatorx/terminatorx-4.0.1.ebuild
new file mode 100644
index 000000000000..745580ace2d4
--- /dev/null
+++ b/media-sound/terminatorx/terminatorx-4.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+MY_P=${P/terminatorx/terminatorX}
+
+DESCRIPTION="Realtime audio synthesizer allowing you to 'scratch' on sampled audio data"
+HOMEPAGE="http://www.terminatorx.org/"
+SRC_URI="http://www.terminatorx.org/dist/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X alsa debug mad pulseaudio vorbis sox"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	mad? ( media-sound/madplay )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	sox? ( media-sound/sox
+		media-sound/mpg123 )
+	x11-libs/gtk+:3
+	>=dev-libs/glib-2.2:2
+
+	X? (
+		x11-libs/libXi
+		x11-libs/libXxf86dga
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/xf86dgaproto )
+	dev-libs/libxml2:2
+	media-libs/audiofile:=
+	media-libs/ladspa-sdk
+	media-libs/ladspa-cmt
+	media-libs/liblrdf
+"
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Fails to build with USE="X vorbis -alsa -debug -mad -pulseaudio
+	# -sox", bug #604288
+	"${FILESDIR}"/${P}-gtkcombotext.patch
+)
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable alsa) \
+		$(use_enable debug) \
+		$(use_enable mad) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable vorbis) \
+		$(use_enable sox) \
+		$(use_enable X x11)
+}
diff --git a/media-sound/timemachine/Manifest b/media-sound/timemachine/Manifest
new file mode 100644
index 000000000000..6fef4e206441
--- /dev/null
+++ b/media-sound/timemachine/Manifest
@@ -0,0 +1,6 @@
+AUX timemachine-0.3.3-underlinking.patch 713 SHA256 834c13f18f001d1bba02e1faceb8fc8e3439f06a188040329bedd6f83e43b0dd SHA512 dc7e8c11e0633012a61d6a20a94046d624024b47e45ac32b1ec90740d4fbca9ba9928eaf6caab1a4e3dd4cb42bad41743e0481e91f41551b0ec5b89e7fa386a2 WHIRLPOOL 25566a2e83cadf82d9a2f4341e6e2ac6795365f2dacd9cb9b976b1f487f729d80078c416726a7eb706be523bb81df27dc46cde6322d5038d384e5e6ef207628d
+DIST timemachine-0.3.3.tar.gz 169021 SHA256 3e798a952b83874e3d60642ca4a7e0c2e2990c4659561009087da95044b21f9d SHA512 9fd079d3be2a22ebd7a8afe6eebef9d2adab743c8d3c0124adcbaed78fb1863c5a087e95763185745f1d2767a939583814d0c889147c29742c39ab860c96748f WHIRLPOOL 1d14fe4ef4711703cce893eb350825114a0d5471bc9d6c4969cc0d0292dc51d71c8543d2ca1c614ab11b93ffa7e093419e6491236da3248a628f28080ca5329a
+EBUILD timemachine-0.3.3-r1.ebuild 817 SHA256 be0e5d90927557ab0c463a4161416ffc5c56e9deb40e7994bbf912f5a5e5cfe4 SHA512 3d2c293a55f1d96af7921ed9fc73561c00354d0983079c80eccf9f21d5eed76174cbc2633cb6b0befbe97106a59d82888dca84db5ad5413ad58dd0884cf51373 WHIRLPOOL 556c03f1a0bbbb6bd08c9bec57387eeaf8fae1610cbe471779cd9f313164fd0cdd63f6bebefbc46a020501b4200b78127bc6f4b3a1825cf32115c7cd6f51d94e
+MISC ChangeLog 3210 SHA256 8d9736386d5158f32f2270f12cf77c78d60e88ce1a19af207cbfff48d0011b3e SHA512 b2bef0b055a22112bbefe295b8a7a6b8058b89b24852e4703bb2b1bea818eb5e0234ede8215bc87ece59d97e67ee65b622696ede3f4355f40fc84c6eff17b86d WHIRLPOOL db628c4d0648897e69c0c63c3d23943a4a2d4d520e830f55bd35d874dd43c49e37a91403a62bdb45f64b56629d007c97f06ac422d0d465ea9aee39cb79dcc491
+MISC ChangeLog-2015 2918 SHA256 21a2b0db4d1299ff372ff04efaa7bc57e2a9b90b7283b3ea1727d301ec72344d SHA512 94112bd8e2d171dbbaff498e3a8e69c8c0313777ca9884898963987746a356c520d7db3eec3fe49a2c16c68820b74f7903875fd60a40954c95b9d20914394c89 WHIRLPOOL 03da89492351c6c0b3de70a550e53f277540d38796df7c967f729031caaf4a1b00e1e40f800d8dd9fce4acb810a8d9170fdd147546c7f971f2e60d05725ea5da
+MISC metadata.xml 408 SHA256 96e8eb2836bd5234e0a7964ad449af0e696724f0cdc8e7292d9e2dbb7d6f2355 SHA512 76c92f4068084f4e9f3112236d2b9161d64a2d8de33e17347a34d7b1e1453e7a0d599a6255e23fdf71b7ea625be7e4f54129b05ecc9f181ab7a2c3ef183097b9 WHIRLPOOL d1023ffec319601fe1b3dfe141e17b4b308ccb5a980b416fb2308ffd3c35543f7880d39e549e35e69fdff1218650d43f31f1d216e9aabac5c14816552d5fbb92
diff --git a/media-sound/timemachine/files/timemachine-0.3.3-underlinking.patch b/media-sound/timemachine/files/timemachine-0.3.3-underlinking.patch
new file mode 100644
index 000000000000..033484e593d0
--- /dev/null
+++ b/media-sound/timemachine/files/timemachine-0.3.3-underlinking.patch
@@ -0,0 +1,25 @@
+Fix libm underlinking.
+Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=508132
+
+--- timemachine-0.3.3/configure.ac
++++ timemachine-0.3.3/configure.ac
+@@ -1,6 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT(configure.in)
++AC_INIT(configure.ac)
+ AM_INIT_AUTOMAKE(timemachine, 0.3.3)
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+@@ -10,6 +10,11 @@
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ 
++dnl Check for libm for log10()
++AC_SEARCH_LIBS([log10], [m], [], [
++	AC_MSG_ERROR([unable to find the log10() function])
++])
++
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0])
+ PKG_CHECK_MODULES(JACK, [jack >= 0.80.0])
+ PKG_CHECK_MODULES(LIBLO, liblo >= 0.24, LO_FOUND="yes", LO_FOUND="no")
diff --git a/media-sound/timemachine/metadata.xml b/media-sound/timemachine/metadata.xml
new file mode 100644
index 000000000000..225c525448a1
--- /dev/null
+++ b/media-sound/timemachine/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<longdescription>
+		Timemachine is a simple jack client record button remembering the last
+		ten seconds of audio when pressed.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/timemachine/timemachine-0.3.3-r1.ebuild b/media-sound/timemachine/timemachine-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..b6483d46ab41
--- /dev/null
+++ b/media-sound/timemachine/timemachine-0.3.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="JACK client record button remembering the last 10 seconds when pressed"
+HOMEPAGE="http://plugin.org.uk/timemachine/"
+SRC_URI="http://plugin.org.uk/timemachine/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="lash"
+
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.80
+	x11-libs/gtk+:2
+	>=media-libs/libsndfile-1.0.5
+	media-libs/liblo
+	lash? ( >=media-sound/lash-0.5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-underlinking.patch" )
+
+src_prepare() {
+	mv configure.{in,ac} || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable lash)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog
+}
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
new file mode 100644
index 000000000000..81ee16c57e3c
--- /dev/null
+++ b/media-sound/timidity++/Manifest
@@ -0,0 +1,18 @@
+AUX 50timidity++-gentoo.el 180 SHA256 a5ca92074ec2b79251bf33a1fb9c4007f528c036f951c6e4fa87311d7acc11a0 SHA512 21df87bf47d56c1072fc3942f3c988293106028dd0473dd1a03b66edc4e7586a3cf5150abdf3c932e44dc32a97ce9cbaa8016dcb28e5e60195f1fe9418ab3bd6 WHIRLPOOL 6b48cab95dc59524d11972ce36e81ac1b3bc13f38a4a45eb9e1098b3c2a47ee300ba82e618edb7f518544477ff5d34de1a47a7fc4bfe1659d5308ef6ae5f1764
+AUX conf.d.timidity.2 972 SHA256 a3a6fc74fc1353f2c5e7eda51a244fb3212cd5f33b407fe5ce1245ca2757593e SHA512 67668a6a00408ecc1e467be8f372b78be318e940d75c0fb856fadc5e5446e5d1a461c004856ab851968d6c146e662e766c09da6b815fd14b7675b92b975cabd9 WHIRLPOOL fe67d80414a6b4a88eae3bc3ae35a466f8e66378aa9190b804852d613392ba765d0e02b7743ee890ac37cdcb986fbf1b868c6f1cabf640e66cdd7b91c2b12c2c
+AUX init.d.timidity.4 510 SHA256 fb7eb433af9fa7e9df6eede45e748a0f42c425d6945f63d9085c8e3c140f4b5f SHA512 597b79bbeac3c3365cf3b0d6defe7b3f031bf1acbefd33094e76f07394a4d5b21a79ce62c276928fed68de1eb02a30ec1eb8204be6d034d8c2dd92145e82faa3 WHIRLPOOL 3fa4980d8036e5953383a9d823c8dc0098b46ebf628731b94471072881cc89106e21344e457c9ca7d7b27786276444611d17df28edd3165416f0434b36199459
+AUX timidity++-2.14.0-ar.patch 822 SHA256 83008c1c49e712de73d5757da950afb61f576aa40db75b6861e014737a8e50dd SHA512 b0c26daa94361bc471034431c0632052ceb2a8e001caabfb7e08bd3f401932724981dc2c903132f9319d16038f7bac05843ca8da1112a5a3bab626c88244514b WHIRLPOOL 2bfec4e128f58aa8cc14cce6070d19f79ca014cffd16597eb5fc73ad0970436c4125c016658cb4c694060c0375b5f52d64770ce5db9dc214ac168ab61d0e8424
+AUX timidity++-2.14.0-configure-flags.patch 4241 SHA256 4f3f9f2b3c652e61726eda54c43a18d32dca5322b996b4e27d8e44f0b202504c SHA512 be9ca5a580a47af5eb29e180c81b141628692e2cb538113b3ec596e4b800fb6d4792fa4c72921414ba41a8e6932ae655e9b9a1428021333471e2929fdab07b17 WHIRLPOOL ae0316647291b4081290ca491ef544c8bd073c10d344fce92dfe7af5618b58b7f2c1ca72e5e5d57b7ebfd87f82ce418e58bff95d43e4cac545d19deed11a371b
+AUX timidity++-2.14.0-params.patch 712 SHA256 cf78561c620f55c6dfc21f3650e9d0e55603aa991aef9c2179363bd3d608191f SHA512 63e2a1be6fec715680230de158d1fb09d5288a068288ac33b37320491ac29ec1c66f60d05ffb352c4a192540163e9c93369115fe606aa25295b727332e92874c WHIRLPOOL a6de7b97de6282980a2850636fc72a4ca47efc79afabe81417426015126d1e4f2cabbf040ca6b559b924d4ae44fe3ca930fb3a3042d54845d0c0095b0b7371d0
+AUX timidity++-2.14.0-pkg-config.patch 3836 SHA256 a2daa38a4da6240e76c52c19e02ea5ccca1419ab45950c8df37248c0e5c4dd1c SHA512 2dba5ca948d31d4498f44f8b4c67d59294e7cf722652b62f9502222867f1c93fa491b9741c049bde7ac976c74e52639bfc359a88e2c7f3728b723e272e40692d WHIRLPOOL f05b9476760061b7663e3aa12ef187e4466c26abab96d24d7c6f74d5f8b818dbc5cf2d399111e70310be1da74858c65499885ca3dbbf670d741b61cbaac1d498
+AUX timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch 697 SHA256 1c0c5f672679750289b65bd8bfb42bd6ced489c2b085b2a4024351548499e9b5 SHA512 d5716b7977f5c013c61da2e9f3e233b17e3b4b95cb14b2e459bae3c69316440be899278b44566a1640d8d82b683811348c22f5e859512c523baee4939bc2a497 WHIRLPOOL 58e2ac706564baa1520c586420dd3ac044eb468812d74b35455c0469b36c7c9a6581d5db26c2b2c0ee66f919708f55e1b352de3696ab77ef6ef33a665ff4f504
+AUX timidity++-2.14.0-tcltk86.patch 308 SHA256 aae1aa02206ffa62e1e48746d59d965ba0d3eec4096c4e7ab70afc2628871505 SHA512 37e8a97fe1a09382234011ab253443ba9e9be78cdb7bb4dd03ee5756bda8e614bc627a091d10b480a3ef5bca9e3961c2f14e92a548782145d2bb61da991d5f62 WHIRLPOOL 2efae14055ce713ee8f5079c5829b8a06e4cfa1af8ddda9ec620d328d00ac53817795ef393f6d661b2f60b859cde3a4d8a14f8773906c497f5069cb09f4a0792
+AUX timidity.cfg-r1 669 SHA256 50fb27ea57cc225fcb8e8368e8afc130f2bba22d0787ebb6beacd2112550f9ce SHA512 98f0690bda6deed6022e97e74a6114334d5f965d646d7c7d150ac177f6eb78277e931ed0b4c5613ef16ba648eaad66a3ed72ed933ca936698ca81365151b223b WHIRLPOOL d2e0e504275c59177b936591c703b5ad1f75e9e00ed0331d3c5a2c720bf6b85f39e4e531b5639f83be74f24144c3dd00b897e51de07d2248c268f342b8b52475
+AUX timidity.desktop.2 257 SHA256 9e9d89fe6c03067d90d2786f0c41415cfa379b6d8635e1b206fffd7dd68e65aa SHA512 34312594866d77244d0eb77b4111a8e7998bd20bcb3542b036b1626d73bf4672eef677a926badceaaee517f1d32752b3e3b1ea4d3f2cc0703d66c1c740e0dc2e WHIRLPOOL 8fe3b0df3377c9146399c6b2cad7c9fa497dfae433cd903843caef1eb21ac2bc1b39631d5334ab4bc033e1e3e4525bfaecefe4c8f73b1a32d42b98d2b7fb8a55
+AUX timidity.service 190 SHA256 e0490abaded5d7a7d6c82e6a61669f486461c1e39c7d64ddd63b056f7b888c2f SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49 WHIRLPOOL 895c0bc5f8a6f0730f4c24fb7a4c68dee6a1e72abf4c9252a912752c047fae22ef14523a6a83d664e5faeb96cc8534d95dde000382519a9fb7f9bd741901964f
+AUX timidity.xpm 1522 SHA256 4b085a4b8af1648495dccc36bcb7b7637318ffb3e9c2011cc8ac43119a8b4db6 SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e WHIRLPOOL 8d1279dac550131b15639602972861b90e724f5391eefa7f72b3c190681b2e5a081ab2380e3717e94ed0b05b4738bad627021588d872d76ff48ff8e8a142f56a
+DIST TiMidity++-2.14.0.tar.xz 1356476 SHA256 abf0c8367959e85c9e635b8fbd5183fc27bd380e0ef5e45de4158784538c86fc SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3 WHIRLPOOL 0031a0e6519ead34c73ed3383d1d74b91b3e25c257854bd3325d25ec9c00bb55c036936ef4ef162ad13c255fefc4e46b802173e93b7ed575c92cf076ab03929b
+EBUILD timidity++-2.14.0-r2.ebuild 5145 SHA256 a55845edcb600fb09f35ff3edb2333887382fb6804cdaf2092d0a16247f487df SHA512 2e1d66fb2550d4b86faedf802abd8eda33e32a60da473d5448acc36d8e08e50d507d68aceee8690fa8aed090fff60da50ae3ed6a92c5f608be7228877596ba0f WHIRLPOOL b7746c51201828494efd9bd526f0cd4f431eae2a19c98ba32b5ff5f2b9940349e6c6df75f9ab69486d12d607f63c2afe9c1bdc4a9d5ea6af145e5f4476016bbf
+MISC ChangeLog 3601 SHA256 731963cdb0bf759b388e0e2edbefb330baa2a37918b63861741e15e90889eb29 SHA512 939366c7931460e090e9f02245ec4d37f1a92382bbaa49b08f1c6933c82bac911d1b3a75d05ba88aa740d58d1fa7ce33ecd5918f9d3d18ee6e7da7b5e70ce9bc WHIRLPOOL 85056c804e932a7b98106761a318ec0247639a2257db4cd8eaf2feb0aac5bc36ebd2a71bb517c959d3adb6b4f3ca6897dc9d21528d31762ceec388db0aa5d821
+MISC ChangeLog-2015 27242 SHA256 fdb56c4f1047f754cdf3d36ed979664bb51c52137290ba05b4f0d2376806577d SHA512 f3d7b1918bf666175943420e226a1ce8b10183d8ea61e67bcbf4ffa38f92a40b69791678573486176b52e2de6625f765b22a48fe5aaee2700b572348115cb72d WHIRLPOOL d464a48c4d5b068e51a33f08187e8402e8268db9103a2189f7f000f4fb0372f62f44e9f0e6b1230ac8725bde6028c521bdcbb300417ef3ad8d1519186a196c3f
+MISC metadata.xml 331 SHA256 8c8628641af5f30b12e441fd2ec4adf08f9e5a534e95993fdd103a6e6ef2cc20 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3 WHIRLPOOL a452fd1eede4307554e273fb7ff4eb6f82d368608cf44f54eab986ba7c7777d3fa78d150b5ed936e3f11b3d8c0b70952cbe8c0bdb860955dd054c31d2cf182be
diff --git a/media-sound/timidity++/files/50timidity++-gentoo.el b/media-sound/timidity++/files/50timidity++-gentoo.el
new file mode 100644
index 000000000000..3f9e35ca106c
--- /dev/null
+++ b/media-sound/timidity++/files/50timidity++-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; timidity++ site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'timidity "timidity" "TiMidity Interface" t)
+(setq timidity-prog-path "/usr/bin/timidity")
diff --git a/media-sound/timidity++/files/conf.d.timidity.2 b/media-sound/timidity++/files/conf.d.timidity.2
new file mode 100644
index 000000000000..0a153cad6a9e
--- /dev/null
+++ b/media-sound/timidity++/files/conf.d.timidity.2
@@ -0,0 +1,27 @@
+# TIMIDITY_OPTS
+# Command line arguements to be passed to timidity. -iA is always used
+# Common options:
+# -Os : Output to ALSA pcm device
+# -Oe : Output to esd
+# -On : Output to NAS
+#
+# -B<n>,<m> :  Set number of buffer fragments(n), and buffer size(2^m)
+#
+# -EFreverb=0         : Disable MIDI reverb effect control
+# -EFreverb=1[,level] : Enable MIDI reverb effect control
+#                       `level' is optional to specify reverb level [0..127]
+#                       This effect is only available in stereo
+#                       (default)
+# -EFreverb=2         : Global reverb effect
+
+TIMIDITY_OPTS="-B2,8 -Os -EFreverb=0"
+
+# TIMIDITY_PCM_NAME
+# This option can be used to choose an alternate ALSA pcm device.  This will
+# be most useful for users of the dmix alsa plugin or those with multiple
+# cards.  If you don't know what this is, chances are you want the default.
+
+#TIMIDITY_PCM_NAME="default"
+
+#LADSPA plugins library path
+LADSPA_PATH="/usr/lib/ladspa"
diff --git a/media-sound/timidity++/files/init.d.timidity.4 b/media-sound/timidity++/files/init.d.timidity.4
new file mode 100644
index 000000000000..1863a0197bf8
--- /dev/null
+++ b/media-sound/timidity++/files/init.d.timidity.4
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+ 
+depend() {
+	after alsasound esound
+}
+ 
+start() {
+	ebegin "Starting TiMidity++ Virtual Midi Sequencer"
+	test -n "$TIMIDITY_PCM_NAME" && export TIMIDITY_PCM_NAME
+	start-stop-daemon --start --background --chdir /usr/share/timidity \
+	--user timidity --group audio --make-pidfile --pidfile /var/run/timidity.pid \
+	--exec /usr/bin/timidity -- -iA ${TIMIDITY_OPTS}
+	eend $?
+}
+ 
+stop() {
+	ebegin "Stopping TiMidity++"
+	start-stop-daemon --stop --quiet --pidfile /var/run/timidity.pid
+	eend $?
+}
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-ar.patch b/media-sound/timidity++/files/timidity++-2.14.0-ar.patch
new file mode 100644
index 000000000000..5c58cfcb89f3
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.14.0-ar.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/468176
+
+--- a/configure.in
++++ b/configure.in
+@@ -167,6 +167,7 @@ AC_PROG_CC
+ AC_PROG_GCC_TRADITIONAL
+ AC_PROG_INSTALL
+ AC_PROG_AWK
++AC_CHECK_TOOL([AR], [ar], :)
+ AC_PROG_RANLIB
+ AC_PROG_LN_S
+ CHECK_COMPILER_OPTION(rdynamic)
+--- a/timidity/Makefile.am
++++ b/timidity/Makefile.am
+@@ -417,7 +417,7 @@ calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES)
+ 	$(LINK) $(calcnewt_LDFLAGS) $(calcnewt_OBJECTS) $(calcnewt_LDADD) $(LIBS)
+ timidity$(EXEEXT): $(timidity_OBJECTS) $(timidity_DEPENDENCIES) 
+ 	@rm -f timidity$(EXEEXT)
+-	ar -cru timidity.exe $(timidity_LDFLAGS) $(timidity_OBJECTS) $(timidity_LDADD) 
++	$(AR) -cru timidity.exe $(timidity_LDFLAGS) $(timidity_OBJECTS) $(timidity_LDADD) 
+ else
+ calcnewt$(EXEEXT): $(calcnewt_OBJECTS) $(calcnewt_DEPENDENCIES) 
+ 	@rm -f calcnewt$(EXEEXT)
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-configure-flags.patch b/media-sound/timidity++/files/timidity++-2.14.0-configure-flags.patch
new file mode 100644
index 000000000000..e2e77e44f2ae
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.14.0-configure-flags.patch
@@ -0,0 +1,140 @@
+do not add -L/-I flags pointing to the paths given by --prefix.
+there's no need and it breaks multilib and cross-compiling.
+
+patch by Mike Frysinger <vapier@gentoo.org>
+
+--- a/autoconf/libFLAC.m4
++++ b/autoconf/libFLAC.m4
+@@ -25,24 +25,8 @@ AC_ARG_ENABLE(libFLACtest,
+ 	      		     [Do not try to compile and run a test libFLAC program]),,
+ 	      		     [enable_libFLACtest=yes])
+ 
+-  if test "x$libFLAC_libraries" != "x" ; then
+-    LIBFLAC_LIBS="-L$libFLAC_libraries"
+-  elif test "x$libFLAC_prefix" != "x" ; then
+-    LIBFLAC_LIBS="-L$libFLAC_prefix/lib"
+-  elif test "x$prefix" != "xNONE" ; then
+-    LIBFLAC_LIBS="-L$prefix/lib"
+-  fi
+-
+   LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
+ 
+-  if test "x$libFLAC_includes" != "x" ; then
+-    LIBFLAC_CFLAGS="-I$libFLAC_includes"
+-  elif test "x$libFLAC_prefix" != "x" ; then
+-    LIBFLAC_CFLAGS="-I$libFLAC_prefix/include"
+-  elif test "$prefix" != "xNONE"; then
+-    LIBFLAC_CFLAGS="-I$prefix/include"
+-  fi
+-
+   AC_MSG_CHECKING(for libFLAC)
+   no_libFLAC=""
+ 
+--- a/autoconf/libOggFLAC.m4
++++ b/autoconf/libOggFLAC.m4
+@@ -25,24 +25,8 @@ AC_ARG_ENABLE(libOggFLACtest,
+ 	      		     [Do not try to compile and run a test libOggFLAC program]),,
+ 	      [enable_libOggFLACtest=yes])
+ 
+-  if test "x$libOggFLAC_libraries" != "x" ; then
+-    LIBOGGFLAC_LIBS="-L$libOggFLAC_libraries"
+-  elif test "x$libOggFLAC_prefix" != "x" ; then
+-    LIBOGGFLAC_LIBS="-L$libOggFLAC_prefix/lib"
+-  elif test "x$prefix" != "xNONE" ; then
+-    LIBOGGFLAC_LIBS="-L$prefix/lib"
+-  fi
+-
+   LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm"
+ 
+-  if test "x$libOggFLAC_includes" != "x" ; then
+-    LIBOGGFLAC_CFLAGS="-I$libOggFLAC_includes"
+-  elif test "x$libOggFLAC_prefix" != "x" ; then
+-    LIBOGGFLAC_CFLAGS="-I$libOggFLAC_prefix/include"
+-  elif test "$prefix" != "xNONE"; then
+-    LIBOGGFLAC_CFLAGS="-I$prefix/include"
+-  fi
+-
+   AC_MSG_CHECKING(for libOggFLAC)
+   no_libOggFLAC=""
+ 
+--- a/autoconf/ogg.m4
++++ b/autoconf/ogg.m4
+@@ -26,24 +26,8 @@ AC_ARG_ENABLE(oggtest,
+ 	      		     [Do not try to compile and run a test Ogg program]),,
+ 	      [enable_oggtest=yes])
+ 
+-  if test "x$ogg_libraries" != "x" ; then
+-    OGG_LIBS="-L$ogg_libraries"
+-  elif test "x$ogg_prefix" != "x" ; then
+-    OGG_LIBS="-L$ogg_prefix/lib"
+-  elif test "x$prefix" != "xNONE" ; then
+-    OGG_LIBS="-L$prefix/lib"
+-  fi
+-
+   OGG_LIBS="$OGG_LIBS -logg"
+ 
+-  if test "x$ogg_includes" != "x" ; then
+-    OGG_CFLAGS="-I$ogg_includes"
+-  elif test "x$ogg_prefix" != "x" ; then
+-    OGG_CFLAGS="-I$ogg_prefix/include"
+-  elif test "x$prefix" != "xNONE"; then
+-    OGG_CFLAGS="-I$prefix/include"
+-  fi
+-
+   AC_MSG_CHECKING(for Ogg)
+   no_ogg=""
+ 
+--- a/autoconf/vorbis.m4
++++ b/autoconf/vorbis.m4
+@@ -27,27 +27,10 @@ AC_ARG_ENABLE(vorbistest,
+ 			     [Do not try to compile and run a test Vorbis program]),
+ 	      , [enable_vorbistest=yes])
+ 
+-  if test "x$vorbis_libraries" != "x" ; then
+-    VORBIS_LIBS="-L$vorbis_libraries"
+-  elif test "x$vorbis_prefix" != "x" ; then
+-    VORBIS_LIBS="-L$vorbis_prefix/lib"
+-  elif test "x$prefix" != "xNONE"; then
+-    VORBIS_LIBS="-L$prefix/lib"
+-  fi
+-
+   VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
+   VORBISFILE_LIBS="-lvorbisfile"
+   VORBISENC_LIBS="-lvorbisenc"
+ 
+-  if test "x$vorbis_includes" != "x" ; then
+-    VORBIS_CFLAGS="-I$vorbis_includes"
+-  elif test "x$vorbis_prefix" != "x" ; then
+-    VORBIS_CFLAGS="-I$vorbis_prefix/include"
+-  elif test "x$prefix" != "xNONE"; then
+-    VORBIS_CFLAGS="-I$prefix/include"
+-  fi
+-
+-
+   AC_MSG_CHECKING(for Vorbis)
+   no_vorbis=""
+ 
+--- a/configure.in
++++ b/configure.in
+@@ -91,21 +91,6 @@ else
+   x_config_flag=yes
+ fi
+ 
+-# Checking gcc environment
+-for i in `echo $LIBRARY_PATH|sed -e 's,:, ,g'`; do
+-  LDFLAGS="$LDFLAGS -L${i}"
+-done
+-for i in `echo $C_INCLUDE_PATH|sed -e 's,:, ,g'`; do
+-  CPPFLAGS="$CPPFLAGS -I${i}"
+-done
+-
+-# add $prefix if specified.
+-if test "x$prefix" != xNONE -a "x$prefix" != "x$ac_default_prefix" -a "x$prefix" != "x/usr"; then
+-  LDFLAGS="-L$prefix/lib $LDFLAGS"
+-  SHLDFLAGS="-L$prefix/lib $SHLDFLAGS"
+-  CPPFLAGS="-I$prefix/include $CPPFLAGS"
+-fi
+-
+ dnl add --with-includes, --with-libraries
+ AC_ARG_WITH(includes,
+   AS_HELP_STRING([--with-includes=DIR], [Specify include directories (colon separated)]),
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-params.patch b/media-sound/timidity++/files/timidity++-2.14.0-params.patch
new file mode 100644
index 000000000000..d56448b8761b
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.14.0-params.patch
@@ -0,0 +1,22 @@
+--- configure.in
++++ configure.in
+@@ -2245,10 +2245,15 @@
+ 
+ AM_CONDITIONAL(W32READDIR, test "x$W32READDIR" = "xyes")
+ 
+-SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS)
+-SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
+-SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS)
+-SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
++# These break flags like --param wrt #276433
++# SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS)
++# SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
++# SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS)
++# SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
++LDFLAGS="$LDFLAGS"
++SHLDFLAGS="$SHLDFLAGS"
++CFLAGS="$EXTRACFLAGS $CFLAGS"
++CPPFLAGS="$CPPFLAGS $EXTRADEFS"
+ 
+ if test "x$oss_device" != x; then
+   AC_DEFINE_UNQUOTED(OSS_DEVICE,"$oss_device", oss device name)
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-pkg-config.patch b/media-sound/timidity++/files/timidity++-2.14.0-pkg-config.patch
new file mode 100644
index 000000000000..15d6a4ec43f4
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.14.0-pkg-config.patch
@@ -0,0 +1,109 @@
+use $PKG_CONFIG rather than `pkg-config`
+
+https://bugs.gentoo.org/497362
+get ncurses info via pkg-config while we're at it
+
+patch by Mike Frysinger <vapier@gentoo.org>
+
+--- a/configure.in
++++ b/configure.in
+@@ -148,6 +148,7 @@ AC_SUBST(xawresdir)
+ 
+ # Checks for programs.
+ AM_PATH_LISPDIR
++PKG_PROG_PKG_CONFIG
+ AC_PROG_CC
+ AC_PROG_GCC_TRADITIONAL
+ AC_PROG_INSTALL
+@@ -1318,8 +1319,8 @@ AC_MSG_CHECKING(enable_audio=jack)
+ if test "x$au_enable_jack" = xyes; then
+   AC_MSG_RESULT(yes)
+   SYSEXTRAS="$SYSEXTRAS jack_a.c"
+-  EXTRALIBS="$EXTRALIBS $(pkg-config --libs jack)"
+-  EXTRADEFS="$EXTRADEFS -DAU_JACK $(pkg-config --cflags jack)"
++  EXTRALIBS="$EXTRALIBS $(${PKG_CONFIG} --libs jack)"
++  EXTRADEFS="$EXTRADEFS -DAU_JACK $(${PKG_CONFIG} --cflags jack)"
+ else
+   AC_MSG_RESULT(no)
+ fi
+@@ -1635,60 +1636,8 @@ dnl ncurses
+ AM_CONDITIONAL(ENABLE_NCURSES, false)
+ CONFIG_INTERFACE(ncurses,NCURSES,n,
+   AS_HELP_STRING([--enable-ncurses], [Enable ncurses interface        (default is no)]),
+-  [ AC_CHECK_HEADERS(ncurses.h ncurses/curses.h curses.h)
+-
+-dnl #include <ncurses/curses.h> is failure on Plamo Linux 1.3/ncurses 1.9.9e
+-dnl because <ncurses/curses.h> includes <unctrl.h>:
+-dnl /usr/include/ncurses/curses.h:34: unctrl.h: No such file or directory
+-dnl But surely there is unctl.h at /usr/include/ncurses/unctrl.h.
+-dnl configure must check ncurses header with -I/usr/include/ncurses option.
+-
+-  case "$ac_cv_header_curses_h$ac_cv_header_ncurses_curses_h$ac_cv_header_ncurses_h" in
+-    *yes*);;
+-    *)	for i in /usr/include /usr/local/include; do
+-	  if test -f "$i/ncurses/curses.h" -a -f "$i/ncurses/unctrl.h"; then
+-	    AC_MSG_WARN(ncurses test is failure.  Please check config.h and common.makefile later)
+-	    CPPFLAGS="$CPPFLAGS -I$i/ncurses"
+-	    break
+-	  fi
+-	done
+-	;;
+-    esac
+-
+-    AC_CHECK_LIB(ncurses,initscr,lib_curses_opt=-lncurses,
+-      [ dnl checking pdcurses
+-	AC_CHECK_LIB(curses,PDC_set_ctrl_break,
+-          [ lib_curses_opt=-lcurses
+-	    AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses)
+-	    lib_user32_opt="$lib_user32_test"
+-	  ],
+-	  [ dnl checking libpdcurses
+-	    AC_CHECK_LIB(pdcurses,PDC_set_ctrl_break,
+-	    [ lib_curses_opt=-lpdcurses
+-	      AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses)
+-	      lib_user32_opt="$lib_user32_test"
+-	    ],
+-	    [ dnl OpenBSD use -lcurses instead of -lncurses.
+-	      case "$target" in
+-		*openbsd*)
+-		  AC_CHECK_LIB(curses,initscr,lib_curses_opt=-lcurses,
+-		    [ AC_MSG_WARN(ncurses interface is not enabled)
+-		      enable_ncurses=no ])
+-		  ;;
+-		*)
+-		  if test "x$VCPP" = xyes || test "x$BORLANDC" = xyes || test "x$WATCOM_C" = xyes || test "x$DMC" = xyes || test "x$POCC" = xyes; then
+-		    lib_curses_opt=libpdcurses.lib
+-		    AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses)
+-		  else
+-		    AC_MSG_WARN(ncurses interface is not enabled)
+-		    enable_ncurses=no
+-		  fi
+-		  ;;
+-	      esac
+-	    ])
+-	],
+-	$lib_user32_test)
+-      ])
++  [ CPPFLAGS="$CPPFLAGS $(${PKG_CONFIG} --cflags ncurses)"
++    lib_curses_opt=$(${PKG_CONFIG} --libs ncurses)
+   ],
+   [ LIBS="$LIBS $lib_curses_opt"
+     case "$target" in
+@@ -1855,7 +1804,7 @@ CONFIG_INTERFACE(xaw,XAW,a,
+     lib_xmu_opt=-lXmu
+     lib_xt_opt=-lXt
+     if test "x$enable_xft" = "xyes" && test "x$have_xaw" != "xno"; then
+-      XFT_CFLAGS="$(pkg-config --cflags xft)";
++      XFT_CFLAGS="$(${PKG_CONFIG} --cflags xft)";
+       EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$XFT_CFLAGS)
+       lib_xft_opt="-lXft";
+     fi
+@@ -1909,7 +1858,7 @@ CONFIG_INTERFACE(xaw,XAW,a,
+ 	;;
+     esac
+     if test "x$enable_xft" = "xyes" && test "x$have_xaw" != "xno"; then
+-      XFT_CFLAGS="$(pkg-config --cflags xft)";
++      XFT_CFLAGS="$(${PKG_CONFIG} --cflags xft)";
+       EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$XFT_CFLAGS)
+       a_so_libs="$a_so_libs -lXft";
+     fi
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch b/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch
new file mode 100644
index 000000000000..a83a7db993f8
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch
@@ -0,0 +1,28 @@
+This will revert part of the commit from:
+
+http://timidity.git.sourceforge.net/git/gitweb.cgi?p=timidity/timidity;a=commit;h=e73b53437dbc1e57e61dd4d0c1407784797b08d9
+
+Because otherwise TiMidity++ simply won't build as per:
+
+../interface/libinterface.a(xskin_c.o): In function `ctl_event':
+xskin_c.c:(.text+0x17c): undefined reference to `ctl_speana_data'
+collect2: error: ld returned 1 exit status
+
+--- interface/xskin_c.c
++++ interface/xskin_c.c
+@@ -228,7 +228,6 @@
+     }
+ }
+ 
+-#if 0
+ static void ctl_speana_data(double *val, int size) {
+ 
+   /* 0 <= val[n] <= (AMP*NCOLOR) */
+@@ -280,7 +279,6 @@
+ 
+   return;
+ }
+-#endif
+ 
+ /*ARGSUSED*/
+ static int ctl_open(int using_stdin, int using_stdout) {
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch b/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch
new file mode 100644
index 000000000000..ea2c0eec6c7d
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/451296
+
+--- interface/tk_c.c
++++ interface/tk_c.c
+@@ -913,7 +913,7 @@
+ 	vsnprintf(buf, sizeof(buf), fmt, ap);
+ 	Tcl_Eval(my_interp, buf);
+ 	va_end(ap);
+-	return my_interp->result;
++	return Tcl_GetStringResult(my_interp);
+ }
+ 
+ static const char *v_get2(const char *v1, const char *v2)
diff --git a/media-sound/timidity++/files/timidity.cfg-r1 b/media-sound/timidity++/files/timidity.cfg-r1
new file mode 100644
index 000000000000..3923fb206204
--- /dev/null
+++ b/media-sound/timidity++/files/timidity.cfg-r1
@@ -0,0 +1,24 @@
+##############################################################################
+#
+# timidity-update core configuration file
+#
+# Easy process:
+#
+#  1.  Change directory to patch directory
+#  2.  Source current/timidity.cfg
+#
+# Current patch set will always be symlinked to current, so make sure that the
+# proper timidity.cfg is in there
+#
+# 
+#  - source /usr/share/timidity
+#  - source ~/.timidity/current
+#  - Make ~/.timidity/current point to the current patch set, or to whatever
+#    the individual user sets
+#  - If ~/.timidity/current isn't found, it will try
+#    /usr/share/timidity/current
+#
+
+dir /usr/share/timidity
+dir ~/.timidity
+source current/timidity.cfg
diff --git a/media-sound/timidity++/files/timidity.desktop.2 b/media-sound/timidity++/files/timidity.desktop.2
new file mode 100644
index 000000000000..00c7f1db2c2d
--- /dev/null
+++ b/media-sound/timidity++/files/timidity.desktop.2
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Comment=Software sound renderer (MIDI sequencer, MOD player)
+Name=TiMidity++ MIDI sequencer
+Terminal=true
+NoDisplay=true
+Type=Application
+Exec=timidity %F
+Categories=AudioVideo;Audio;Sequencer;
+Icon=timidity
+MimeType=audio/midi;audio/x-mod;
diff --git a/media-sound/timidity++/files/timidity.service b/media-sound/timidity++/files/timidity.service
new file mode 100644
index 000000000000..420d88813fd3
--- /dev/null
+++ b/media-sound/timidity++/files/timidity.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=TiMidity++ Daemon
+After=sound.target
+
+[Service]
+EnvironmentFile=-/etc/conf.d/timidity
+ExecStart=/usr/bin/timidity -iA $TIMIDITY_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-sound/timidity++/files/timidity.xpm b/media-sound/timidity++/files/timidity.xpm
new file mode 100644
index 000000000000..dc56a6d1cf6a
--- /dev/null
+++ b/media-sound/timidity++/files/timidity.xpm
@@ -0,0 +1,56 @@
+/* XPM */
+static char * timidity_xpm[] = {
+"32 32 21 1",
+" 	c None",
+".	c #333399",
+"+	c #000000",
+"@	c #666699",
+"#	c #FFFFFF",
+"$	c #DDDDDD",
+"%	c #888888",
+"&	c #999999",
+"*	c #7777A4",
+"=	c #4949A4",
+"-	c #BBBBBB",
+";	c #111111",
+">	c #444444",
+",	c #2B2B2B",
+"'	c #555555",
+")	c #FF9999",
+"!	c #FF9966",
+"~	c #666666",
+"{	c #333333",
+"]	c #FF0000",
+"^	c #00FF00",
+"      .   ..                    ",
+"      .  ...     +              ",
+"      .  ..@    +#+  +          ",
+"      .@@..    +#$#+%#+         ",
+"      ....@   +#$#$#+$#+        ",
+"      ....   +#$#$#$#+$#+       ",
+"     @...@  +#$#$#$#$#+$#+      ",
+"    @....  +#$#$#$#$#$#+$#+     ",
+"   @...@. %#$#$#$#$#$#$#&$#&    ",
+"  @...@ +++++++$#++$+++++&$++   ",
+"  ...@  ++$++#++$++#++$$++$++$  ",
+" @..@  %++#++$++#++$++$&++$++   ",
+" ...  %#++$++#++$++#++&$++#++   ",
+"*..@  .&++#++$++#++$++++++&++   ",
+"=..  ...&#$#$#$#$#$#&-$#$&      ",
+"=..  ...+++++$++#+$+++++++ ++   ",
+"=..  ..  .&#$#$#$$&-$#&&        ",
+"=..  ..  . +&$#$&+-$#&+         ",
+" ;;;;;;;;;;;;;;;;;;;>;;;;;;;    ",
+",#%%%%%%%%%%%%%%%%%';#%%%%%'+   ",
+",%+++++++++++++++''>;%'''''>+   ",
+",%+#)))))))))))!;''>;%'%~+'>+   ",
+",'+);;!;!!;!!!!!;>>>;'>+++>>+   ",
+",'+)>!!;!!;!;!;!;>>>;'>>>>>>+   ",
+",'+!!!!!!!!!!!!!;>>{;'>%~+>>+   ",
+",'+;;;;;;;;;;;;;'>>{;'>+++>>+   ",
+",'>>>>>>>>>>>>>>>>>{;'>>>>>>+>  ",
+",'%~'>>%~'>>'>'>'>>{;'>%~+>{++> ",
+",']++>>^++>>+>+>+>>{;'>+++>{++>>",
+",'>>>>>>>>>>>>>>{{{';'>>{{{'+>>~",
+" +++++++++++++++++++>+++++++>>~ ",
+"                                "};
diff --git a/media-sound/timidity++/metadata.xml b/media-sound/timidity++/metadata.xml
new file mode 100644
index 000000000000..99d0e78559d8
--- /dev/null
+++ b/media-sound/timidity++/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">timidity</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/timidity++/timidity++-2.14.0-r2.ebuild b/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
new file mode 100644
index 000000000000..fe45d20fa484
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils elisp-common user systemd toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=TiMidity++-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
+HOMEPAGE="http://timidity.sourceforge.net/"
+SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="motif oss nas X gtk vorbis tk slang alsa jack emacs ao selinux speex flac ncurses"
+
+DEPEND="ncurses? ( >=sys-libs/ncurses-5 )
+	emacs? ( virtual/emacs )
+	gtk? ( x11-libs/gtk+:2 )
+	tk? ( >=dev-lang/tk-8.5.13 )
+	nas? ( >=media-libs/nas-1.4 )
+	alsa? ( media-libs/alsa-lib )
+	slang? ( sys-libs/slang )
+	jack? ( media-sound/jack-audio-connection-kit )
+	vorbis? ( media-libs/libvorbis )
+	flac? ( media-libs/flac )
+	speex? ( media-libs/speex )
+	ao? ( >=media-libs/libao-0.8.5 )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 )"
+RDEPEND="${DEPEND}
+	alsa? ( media-sound/alsa-utils )
+	app-eselect/eselect-timidity
+	selinux? ( sec-policy/selinux-timidity )"
+
+PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	enewgroup audio 18 # Just make sure it exists
+	enewuser timidity -1 -1 /var/lib/timidity audio
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-params.patch \
+		"${FILESDIR}"/${P}-revert-for-required-ctl_speana_data-function.patch \
+		"${FILESDIR}"/${P}-tcltk86.patch \
+		"${FILESDIR}"/${P}-ar.patch \
+		"${FILESDIR}"/${P}-configure-flags.patch \
+		"${FILESDIR}"/${P}-pkg-config.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	export EXTRACFLAGS="${CFLAGS}" #385817
+
+	local myconf=()
+	local audios
+
+	use flac && audios+=",flac"
+	use speex && audios+=",speex"
+	use vorbis && audios+=",vorbis"
+	use oss && audios+=",oss"
+	use jack && audios+=",jack"
+	use ao && audios+=",ao"
+
+	if use nas; then
+		audios+=",nas"
+		myconf+=( --with-nas-library="/usr/$(get_libdir)/libaudio.so" --with-x )
+		use X || ewarn "Basic X11 support will be enabled because required by nas."
+	fi
+
+	if use alsa; then
+		audios+=",alsa"
+		myconf+=( --with-default-output=alsa --enable-alsaseq )
+	fi
+
+	# We disable motif by default and then only enable it if it's requested.
+	if use motif; then
+		myconf+=( --enable-motif --with-x )
+		use X || ewarn "Basic X11 support will be enabled because required by motif."
+	fi
+
+	econf \
+		--localstatedir=/var/state/timidity++ \
+		--with-module-dir="${EPREFIX}/usr/share/timidity" \
+		--with-lispdir="${SITELISP}/${PN}" \
+		--with-elf \
+		--enable-audio=${audios} \
+		--enable-server \
+		--enable-network \
+		--enable-dynamic \
+		--enable-vt100 \
+		--enable-spline=cubic \
+		$(use_enable emacs) \
+		$(use_enable slang) \
+		$(use_enable ncurses) \
+		$(use_with X x) \
+		$(use_enable X spectrogram) \
+		$(use_enable X wrd) \
+		$(use_enable X xskin) \
+		$(use_enable X xaw) \
+		$(use_enable gtk) \
+		$(use_enable tk tcltk) \
+		--disable-motif \
+		"${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog*
+	dodoc NEWS README* "${FILESDIR}"/timidity.cfg-r1
+
+	# these are only for the ALSA sequencer mode
+	if use alsa; then
+		newconfd "${FILESDIR}"/conf.d.timidity.2 timidity
+		newinitd "${FILESDIR}"/init.d.timidity.4 timidity
+
+		systemd_dounit "${FILESDIR}"/timidity.service
+	fi
+
+	insinto /etc
+	newins "${FILESDIR}"/timidity.cfg-r1 timidity.cfg
+
+	dodir /usr/share/timidity
+	dosym /etc/timidity.cfg /usr/share/timidity/timidity.cfg
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	diropts -o timidity -g nobody -m 0700
+	keepdir /var/lib/timidity
+
+	doicon "${FILESDIR}"/timidity.xpm
+	newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop
+
+	# Order of preference: gtk, X (Xaw), ncurses, slang
+	# Do not create menu item for terminal ones
+	local interface="-id"
+	local terminal="true"
+	local nodisplay="true"
+	if use gtk || use X; then
+		interface="-ia"
+		terminal="false"
+		nodisplay="false"
+		use gtk && interface="-ig"
+	elif use ncurses || use slang; then
+		local interface="-is"
+		use ncurses && interface="-in"
+	fi
+	sed -e "s/Exec=timidity/Exec=timidity ${interface}/" \
+		-e "s/Terminal=.*/Terminal=${terminal}/" \
+		-e "s/NoDisplay=.*/NoDisplay=${nodisplay}/" \
+		-i "${D}"/usr/share/applications/timidity.desktop || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "A timidity config file has been installed in /etc/timidity.cfg."
+	elog "Do not edit this file as it will interfere with the eselect timidity tool."
+	elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
+
+	if use alsa; then
+		elog "An init script for the alsa timidity sequencer has been installed."
+		elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
+		elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
+	fi
+
+	if use sparc; then
+		elog "Only saving to wave file and ALSA soundback has been tested working."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/timidity-eawpatches/Manifest b/media-sound/timidity-eawpatches/Manifest
new file mode 100644
index 000000000000..e538711c9339
--- /dev/null
+++ b/media-sound/timidity-eawpatches/Manifest
@@ -0,0 +1,5 @@
+DIST eawpats12_full.tar.gz 32047230 SHA256 0a1b7368e6e525d62900b34bd061ccc830e6fe1747601ede703e3eb0d1d968b6 SHA512 fb5532c85653e624ed310cd5607d1e24231bcaa9bf966548e9383daf463b9221b21945d2786db0bc44dbabc5342b224a4cbb6c9329f1eee1ee8137d56b3cf71a WHIRLPOOL 0ec4d5df7d7b35bf3a66a208f6cf7e35ff76f1fd5adee7665a9bdbeb647f42421b28b23b8f999349cbf12794ca92a1e0e63d2695321b9bfa224cb514c5e9dc45
+EBUILD timidity-eawpatches-12-r5.ebuild 1329 SHA256 749666219bc8269a3861ffa597cde59a878d857839341eb826eb2a7ee63557f6 SHA512 2cb597a10b79a742c20db2a835f70f54d682599ce0e8cedaf576a97a3a87c4eb133c8bcf39715360aa81b408d2b49514c926d905cb79ba571c8858ddc918da22 WHIRLPOOL c3ca50f1ac66d29b992052b07a6e70afbedf76056f947dc317c037ede840c2ba4142d26b52959de2ff6d9a1dec85dc4a96de0abd8ef8ad9bdd0d2d554bc0be4d
+MISC ChangeLog 2466 SHA256 a312daf25cc70c22777db2ebd95e8de75cfd61b5263368c0f34f6c1566521442 SHA512 a802178d21ef26217825e6bdbc6d4a2ead9723b22a5b94c186cb397aa997686d8eda66686d70913dc8ece3e82e8c0d1502b6a26ed9bec6d7d0ba44f3597334e6 WHIRLPOOL 1134b3c1ab18d0493fca4fdd721af243de36493f810688a0d0b836aef36ef0b2e2352e300fe6aa0977e1730f09ab29a8b17d8add97265443002de2edc10d7220
+MISC ChangeLog-2015 6009 SHA256 ba7dbcb7d9c9ed20096ccdbe77c0f42c36569dff8931c5389385bf4ef2c809df SHA512 635482d172c265b6ace9ce55d3a6d1a8f1e3e4c94bd10561a4b6a4b33d9e0be6129829f73f125b4eaf4ff34f97d387c29867cb2fed0f7937b890bc7cdc20cc03 WHIRLPOOL 6437c4a54c62552c777a9550c74b248385e47ec9c0af00ccebef84e5b07f7c4057a8730fdfdc80167b7245c81525925e601aa0bc444a6bb3789bc40851b14392
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/timidity-eawpatches/metadata.xml b/media-sound/timidity-eawpatches/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/timidity-eawpatches/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild
new file mode 100644
index 000000000000..eae7931c2d65
--- /dev/null
+++ b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+S=${WORKDIR}/eawpats
+
+DESCRIPTION="Eric Welsh's GUS patches for TiMidity"
+HOMEPAGE="http://www.stardate.bc.ca/eawpatches/html/default.htm"
+SRC_URI="http://5hdumat.samizdat.net/music/eawpats${PV}_full.tar.gz"
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+# These can be used for libmodplug too, so don't depend on timidity++
+DEPEND="app-eselect/eselect-timidity"
+RDEPEND=""
+
+RESTRICT="binchecks strip"
+
+src_unpack() {
+	unpack ${A}
+	sed -i -e "s:dir /home/user/eawpats/:dir /usr/share/timidity/eawpatches:" "${S}/linuxconfig/timidity.cfg"
+}
+
+src_install() {
+	local instdir=/usr/share/timidity
+
+	# Set our installation directory
+	insinto ${instdir}/eawpatches
+
+	# Install base timidity configuration for timidity-update
+	doins linuxconfig/timidity.cfg
+	rm -rf linuxconfig/ winconfig/
+
+	# Install base eawpatches
+	doins *.cfg *.pat
+	rm *.cfg *.pat
+
+	# Install patches from subdirectories
+	for d in `find . -type f -name \*.pat | sed 's,/[^/]*$,,' | sort -u`; do
+		insinto ${instdir}/eawpatches/${d}
+		doins ${d}/*.pat
+	done
+
+	# Install documentation, including subdirs
+	dodoc $(find . -name \*.txt)
+}
+
+pkg_postinst() {
+	eselect timidity update --global --if-unset
+}
diff --git a/media-sound/timidity-freepats/Manifest b/media-sound/timidity-freepats/Manifest
new file mode 100644
index 000000000000..1c5cfd560ab9
--- /dev/null
+++ b/media-sound/timidity-freepats/Manifest
@@ -0,0 +1,5 @@
+DIST freepats-20060219.tar.bz2 25791733 SHA256 0261ea1057b232183fa472432d5cedb0dca33698a5319328cdf193d4b2193c8a SHA512 6b24bf387a52fac9906906cb52fd5f9d02decdfcecb8d88acea136b200db962ba9beeb3e78bccdd6024b47453d7f093980b01cb0661e1b8d29fedc45ed61cb4f WHIRLPOOL 699d97bde866ad4772a10bd484e3812bf7e1a3f419e2effdb45a72eb4bca5d6ae70e128773a255c90525e85daa3d6f28671dd23eb23770e14e8b41fa09d915cb
+EBUILD timidity-freepats-20060219-r1.ebuild 791 SHA256 277dc8f74da89d033abf75cd86635530fc1b52979cb97c4b724f76203dd3f735 SHA512 c533b764053456e563cf995ed5c98b9af70f76b4a38b01e8a4406b44619ee245fc69cd28bb050a9bca23eff69dc6bc6bc348697a59fd0f2bbb463aeaeb40c48b WHIRLPOOL b9908dee453fe4cc353c7cb64f6f19ab5a29641f939d59c903d57b9685a2fbb9e6f3ca1a8eb5233fd03f79f9a3c97f0e8a7ca9121af08e109ffaff9ed0d2e6dc
+MISC ChangeLog 2472 SHA256 32b808655bade581343bf24a21872dda3e484bbbdac63c0d4d3323151b3a9f9d SHA512 c127dfd8745adad9f9091cf8ab85c3475e0439b3389ddb43c2c5912b9acdb836a35891e260bce8a1bfcffb91259421c479189e7103ad7466b5a02fd59dbb80ad WHIRLPOOL a7df4578fa84dbabeabdbd47a33d3ba9e4cfdd35be837840e49d010fddf52f3f96b46cb99e1ca1931cc2dcc04c2ff2dc1e02043ef8c2cff561d1c123bbf23aa0
+MISC ChangeLog-2015 3295 SHA256 9f9452bb01a20363e1ed4e1fb28f0d0734b445e23185a6e22384991c2257568c SHA512 a9b824fad485122ff832947b7f0618db4fd3897ceefab58770fccebc1cddf1e1dad2196d73cf2d23ef371894969bc3235047da455752dd2366a9f7d5eb3e6284 WHIRLPOOL bfc3c546e7d0eb57ed549db6874c9d8a56bba621248ba55bbffe0c97c609a00e9c2996ef96ecd4d9456b16ec2f4bd0d3361ca0e95477d8b7109560c1a008e57b
+MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/media-sound/timidity-freepats/metadata.xml b/media-sound/timidity-freepats/metadata.xml
new file mode 100644
index 000000000000..39626a990be5
--- /dev/null
+++ b/media-sound/timidity-freepats/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
new file mode 100644
index 000000000000..52ec79eab505
--- /dev/null
+++ b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN=${PN/timidity-/}
+
+DESCRIPTION="Free and open set of instrument patches"
+HOMEPAGE="http://freepats.opensrc.org/"
+SRC_URI="${HOMEPAGE}/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+RESTRICT="binchecks strip"
+
+RDEPEND=""
+DEPEND=">=app-eselect/eselect-timidity-20061203"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+	echo "dir ${EPREFIX}/usr/share/timidity/${MY_PN}" > timidity.cfg || die
+	cat freepats.cfg >> timidity.cfg || due
+}
+
+src_install() {
+	insinto /usr/share/timidity/${MY_PN}
+	doins -r timidity.cfg Drum_000 Tone_000
+	dodoc README
+}
+
+pkg_postinst() {
+	eselect timidity update --global --if-unset
+}
diff --git a/media-sound/tk707/Manifest b/media-sound/tk707/Manifest
new file mode 100644
index 000000000000..d87bb404fa5e
--- /dev/null
+++ b/media-sound/tk707/Manifest
@@ -0,0 +1,8 @@
+AUX tk707-0.8-asneeded.patch 644 SHA256 57f0247254bbcdeb4c46639a98c4f640acec5e5ab1b4cbee1cdeb659a23afd3e SHA512 eeb595cec305420eebeb01c10d7ecab8ae5b429e96470004c27da802f28fcd221064efe1d72fd67073f73b7d19238beb5b2619e18d568858d78f5858de0c3431 WHIRLPOOL 7f22fa4d43345a81438d7eb9893767ce907b25ced43436875e08f08882fb2dbe4731ba92e8e390a84dc37b980103827a01669f2eda5a91b6db700c74e25017eb
+AUX tk707-0.8-nostrip.patch 501 SHA256 8931c6c8294f6cf70a607806e799c49b383cba4b494d7cdb082daa18d0b9f66a SHA512 bb652d71029a74c3b487e40aeb1dcac66333033235ad4cf60a4ce1e0c515728792528364c35fae0ae6b071e028173c0f42bf794fa36855be1e1531deb02e5915 WHIRLPOOL b4168d27fced559e04fb9deef6dace1b2784159749fe2cba0938234033807163025e0a79c75c3e8611e58aa97b0c9f46ab35e361d623d6e7ae0d94ba50a38bc7
+DIST tk707-0.8-updated_tcl2c.patch.gz 7368 SHA256 b8b50e392645d3cbdc4d79fd2916f5d0d994e6c235e8de7954409f8d3937dd15 SHA512 b64a0303ad338863591993696bec1e8ad89473d20be5c08b8935ff8f577684af03f9bed46f0873c4a6d7839cfab583b918d0113ab12341e3b662560385720736 WHIRLPOOL ef87e67b965fd73f8d08c7c3174dd5c1a4fd2d13d5edf3ad666e0bc6be8cfb2a3f2adea49e5cb739d23b320b842818ae184fefd7d07110e73a201d5c7fb4a520
+DIST tk707-0.8.tar.gz 404862 SHA256 11de4001d19737f7f094ccc9d34b98fe9129714e0cb1f13f995c70775a37b539 SHA512 af5a6958d3ae3fe5e53be5251ba2b3038447b898a3ec40e866a7a0c4d025e450effee7adfc528f01a581b3f7186a269480a4cc6104378f5fdff46ebe277c44c6 WHIRLPOOL 070da17a028a6775a87bf661db9b3d22b542abed96143cf5ce0a5f29c8a0dcc6d9c9acdddd62e11484ceb429b56dcc0170a2cec2bc517b3364c46a63ec93259a
+EBUILD tk707-0.8-r1.ebuild 740 SHA256 7c3509a22c4af10901e86e1691a9edbc3dcc48e9a15b4464d7a4f8a66a6fa0e9 SHA512 331ecafe2fd4daec12e89f03cfe1f3b766da092c95b08ad0d8f40404b630a6e07152e87d10045700ba57bfa9ffd56ddc6f0fc8d0af6ac65b3137068e2e7761e7 WHIRLPOOL 0cdc68eb5bd7c84e9b1b2b87a8927e01e1787c193616bfb8e5e9e6735d0334ea093d184380e028e8ad5f60c26bf131e25ece697fd14a237707e43d24def465f0
+MISC ChangeLog 2493 SHA256 3e2b6866b8cfa922f71fc2fec07225bf98cfe412657b0b7f0e83ed7306df091e SHA512 c5824d9e33e1a7fa3dfec31ae16559c31a6b4b0289fb6c42bcdbfaae3adea4817c85438be441bad60ed18b9a6b1e5e3c13fe9f248bf9c7c2c80693c7e5786480 WHIRLPOOL a4cc48788f3318ca902f3a0f5c7e9ade8b7145870bce2b50e797a498ca353f7da9e1109a8adfb01e949d887022d6c73733e9dfe1dd800ff99a07e899fa167a17
+MISC ChangeLog-2015 1579 SHA256 f3744ec12e6cbff4873759502af4fdfa8aacaa7745fcadc76959384a40568524 SHA512 ab8596fa853e74cd8f9c8298c6c45bc5ce0262d2188ac8c30cd5a3cd5fecd110ccc1f65c911a1c0ce7edb2f54b6ca2d0def854a9741c2c0fc4a71fce7849df3b WHIRLPOOL 1837c2dc6d2ef9c21b5dcc84794e87cc9823293fe0cbbac13187e63d337f289699a8a73c453fd97cdd40ac36a5b97d7ea2d4bc8fd34d345081e4123ac7699c36
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/tk707/files/tk707-0.8-asneeded.patch b/media-sound/tk707/files/tk707-0.8-asneeded.patch
new file mode 100644
index 000000000000..a7833fd31d32
--- /dev/null
+++ b/media-sound/tk707/files/tk707-0.8-asneeded.patch
@@ -0,0 +1,15 @@
+Index: tk707-0.8/Makefile.am
+===================================================================
+--- tk707-0.8.orig/Makefile.am
++++ tk707-0.8/Makefile.am
+@@ -42,8 +42,8 @@ tk707tcl_SOURCES  = util707.c util707.h 
+ tcl2c_SOURCES     = tcl2c.c 
+ texi2help_SOURCES = texi2help.l 
+ 
+-tk707bin_LDFLAGS  = $(ALSA_LIBS)   $(TCLTK_LIBS)   $(X_LIBS)
+-tk707tcl_LDFLAGS  = $(ALSA_LIBS)   $(TCLTK_LIBS)   $(X_LIBS)
++tk707bin_LDADD  = $(ALSA_LIBS)   $(TCLTK_LIBS)   $(X_LIBS)
++tk707tcl_LDADD  = $(ALSA_LIBS)   $(TCLTK_LIBS)   $(X_LIBS)
+ INCLUDES          = $(ALSA_CFLAGS) $(TCLTK_CFLAGS) $(X_CFLAGS)
+ 
+ pkgdata_DATA      = 707.map 727.map 7b7.map 7c7.map \
diff --git a/media-sound/tk707/files/tk707-0.8-nostrip.patch b/media-sound/tk707/files/tk707-0.8-nostrip.patch
new file mode 100644
index 000000000000..f0c35fa89702
--- /dev/null
+++ b/media-sound/tk707/files/tk707-0.8-nostrip.patch
@@ -0,0 +1,13 @@
+Index: tk707-0.8/Makefile.am
+===================================================================
+--- tk707-0.8.orig/Makefile.am
++++ tk707-0.8/Makefile.am
+@@ -191,7 +191,7 @@ $(srcdir)/texi2help.c: texi2help.l
+ 
+ install-exec-local: tk707bin tk707.sh
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
+-	sh $(srcdir)/install-sh -s -c tk707bin $(DESTDIR)$(bindir)/tk707bin
++	sh $(srcdir)/install-sh -c tk707bin $(DESTDIR)$(bindir)/tk707bin
+ 	$(INSTALL_SCRIPT) tk707.sh $(DESTDIR)$(bindir)/tk707
+ 
+ uninstall-local:
diff --git a/media-sound/tk707/metadata.xml b/media-sound/tk707/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/tk707/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/tk707/tk707-0.8-r1.ebuild b/media-sound/tk707/tk707-0.8-r1.ebuild
new file mode 100644
index 000000000000..e7118d0be032
--- /dev/null
+++ b/media-sound/tk707/tk707-0.8-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils autotools
+
+DESCRIPTION=" An \"7x7\" type midi drum sequencer for Linux"
+HOMEPAGE="http://www-lmc.imag.fr/lmc-edp/Pierre.Saramito/tk707"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	mirror://gentoo/${P}-updated_tcl2c.patch.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+RDEPEND=">=media-libs/alsa-lib-0.9.0
+		>=dev-lang/tcl-8.4
+		>=dev-lang/tk-8.4"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_SOURCE=${S} epatch ${P}-*.patch
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	epatch "${FILESDIR}/${P}-nostrip.patch"
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
new file mode 100644
index 000000000000..21b891abfeb3
--- /dev/null
+++ b/media-sound/tomahawk/Manifest
@@ -0,0 +1,8 @@
+AUX tomahawk-liblastfm-cmake.patch 3722 SHA256 a472cf76c7f9ffb3e9c159e5007a7fd179ebc5bedf846e226b5f6694e8de168f SHA512 3e65d70d274abeee63cf98f1ee390157a95d82884678251f77b3257e3f7f042a778c6f346b47b3c5c5a0cfff9ac12e4d05d6bf5de818f0c1f1d433f8cce00e53 WHIRLPOOL caf37635ccb197449509b5b2e4a11c4db6e6c92ec82620a9b5be56fa3c8755476e90d5b9cf59b0c833cab2bcdc75562e6f73678627c900a69a3f5f9676dbccb9
+AUX tomahawk-qtkeychain-cmake.patch 1262 SHA256 efa0558274dcb4c4e6470bd801ff51195998ad32e0d178cdaf3d71c3d04e1417 SHA512 925a67398e1d61fd4b4682307ad2a3e961becd2c3440305e4551fb4209dc6b875aef62e93fee663a1b2028e318424ee01825dcca0d040f9532d9a1d0618a338c WHIRLPOOL cde6047da5c5e547e283bbc89e7150a4a538b87c63f9c666864b1e469f17a23f11690b481b128d99a1bc57f566e2cd5694977e2aa0f280441ff15b96f5acf868
+DIST tomahawk-0.9.0_pre20161029.tar.xz 7945264 SHA256 de4005fd68dfb11380419829e009f19b901c4b14ccec6dd63400b21612886271 SHA512 fcfe810f167de936ed5457b3f30d7e17ef5708389800c6be85a1f867fc75a6973fcc04181719910c127dcc226619bd7ea31e0273b981f84c8122a2e1709fbcf9 WHIRLPOOL b914df1f2a26cc18af021ef6fce5511b2a103d7243340bcaec3d0c98fa90fc2fcda32cabc8022c2106d9bd9dffa777765e17433dc268f2c317537716c31928f6
+EBUILD tomahawk-0.9.0_pre20161029-r1.ebuild 1826 SHA256 4eaa729ea8666fe8e366a74f06abdfd82692b5f28722dc415220340430e3b942 SHA512 c1c408a48caa137cc03b9af082d0d8813126ca513c9c8b7fee1cab6ede3af68448b7df981113c523b24df89c767d8eeac0fe336b51a48f2d4a07d80d21899f62 WHIRLPOOL 2b10c37aeaf9019a1297d3715339501356d88aff9552bf4d4c66bc83b1391fa6215e6e7409efb68a8b0beefdbfb44227c39beb95699e62b30c0a591125933cc9
+EBUILD tomahawk-9999.ebuild 1717 SHA256 ff9f53e3ca5bf52263544adaac93018a135ffe177388352ead96446c8c715c9b SHA512 bd1b68fbc523560f089e3e2a33b6cd60fb1de4ff15e2678a696cd21edc7b1dfc21b3a5ea81672f47d35d927a7463a82d205974e302f906a1a470b09671cdb9bd WHIRLPOOL 147c9e57c7e14d4ceab06a59de9dcfde454237b0faffc998d642fcdf3e921e4ac7bc7b9cb13fb316da6bd93f879b7234db9ca828795f68ba09cf06770928e09b
+MISC ChangeLog 6816 SHA256 18154889bfd318e654877c474897faba5a8019056e08c1a0a7c0b29233cb5b05 SHA512 e076cf849c18072c4e3092abb2f9a93b2c8cf4fc78b7e04d0d23fefef72c5dc54b55a409f64025fb5c5a25193a820af96df4d0c3245f91a19c65304d89fae1e7 WHIRLPOOL 5d028d1cd2090118a3b4db9e98bbcced92f20eb3198797d3d78742e677d90c1656a9fee8252a770dc357eaf374f24e63fa035146e78fb08e2ae568d77de6e775
+MISC ChangeLog-2015 8170 SHA256 ef08376b3756e02356dc68f0ce72af660ae34fa6d6f6479f9bab8497977453e4 SHA512 0d1fb474d3cd11fee9895cb873f8f1bbcb3eee72fe483945bd2ea43c6c2afaa3d2f57eb5859ca21d6e9a7c55852605354971495c8c6ac2a962e2b98dce4990a7 WHIRLPOOL ff68893537e3dc3a83a8fbf8d0477cb710fc086b2f23bf5ef566ed6fb05398c3e2975be947ae14ea0203eeee6d9b14869aee3dcd421d5cac512da66b3e7814ba
+MISC metadata.xml 554 SHA256 309d4166868558b37050ae75eb377faa3c13fd35e08120f4b33bb25507f758bb SHA512 25fb52f0a1c11c21f841e68d1485c4e1bcb8194ef16b414f71caa7d378fcea31461f73b0bd064049435d09baf4c90ebb85113f248232c5a933b54f7c971ef017 WHIRLPOOL 7a500992f4783f96988eaad11bf888ba3145359dfaaa17900f7db19dc137353fd5b65088485e11100910a435ad41da276f467bb715838237f6090343f71b4219
diff --git a/media-sound/tomahawk/files/tomahawk-liblastfm-cmake.patch b/media-sound/tomahawk/files/tomahawk-liblastfm-cmake.patch
new file mode 100644
index 000000000000..763397c613b7
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-liblastfm-cmake.patch
@@ -0,0 +1,126 @@
+diff --git a/CMakeModules/FindLibLastFm.cmake b/CMakeModules/FindLibLastFm.cmake
+index a348835..545e39f 100644
+--- a/CMakeModules/FindLibLastFm.cmake
++++ b/CMakeModules/FindLibLastFm.cmake
+@@ -14,7 +14,7 @@ endif()
+ # Include dir
+ find_path(LIBLASTFM_INCLUDE_DIR
+   # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then
+-  NAMES lastfm${LASTFM_LIB_SUFFIX}/Track.h
++  NAMES lastfm/Track.h
+   PATHS ${KDE4_INCLUDE_DIR}
+ )
+ 
+diff --git a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
+index 85b747b..098e460 100644
+--- a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
++++ b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp
+@@ -29,17 +29,10 @@
+ #include "utils/Closure.h"
+ #include "utils/NetworkAccessManager.h"
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include <lastfm5/ws.h>
+-#include <lastfm5/User.h>
+-#include <lastfm5/XmlQuery.h>
+-#include <lastfm5/Track.h>
+-#else
+ #include <lastfm/ws.h>
+ #include <lastfm/User.h>
+ #include <lastfm/XmlQuery.h>
+ #include <lastfm/Track.h>
+-#endif
+ 
+ using namespace Tomahawk::Accounts;
+ 
+diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
+index 277a62e..cea29a1 100644
+--- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
++++ b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp
+@@ -34,13 +34,8 @@
+ #include "TomahawkSettings.h"
+ #include "utils/NetworkAccessManager.h"
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include <lastfm5/ws.h>
+-#include <lastfm5/XmlQuery.h>
+-#else
+ #include <lastfm/ws.h>
+ #include <lastfm/XmlQuery.h>
+-#endif
+ 
+ using namespace Tomahawk::Accounts;
+ using namespace Tomahawk::InfoSystem;
+diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
+index 0eb3b07..6e202b2 100644
+--- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
++++ b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h
+@@ -24,15 +24,9 @@
+ #include "infosystem/InfoSystemWorker.h"
+ #include "DllMacro.h"
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include <lastfm5/Track.h>
+-#include <lastfm5/Audioscrobbler.h>
+-#include <lastfm5/ScrobblePoint.h>
+-#else
+ #include <lastfm/Track.h>
+ #include <lastfm/Audioscrobbler.h>
+ #include <lastfm/ScrobblePoint.h>
+-#endif
+ 
+ #include <QObject>
+ 
+diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp
+index 0baa27c..cf808d9 100644
+--- a/src/libtomahawk/utils/TomahawkUtils.cpp
++++ b/src/libtomahawk/utils/TomahawkUtils.cpp
+@@ -32,11 +32,7 @@
+ #include "Track.h"
+ 
+ #ifdef LIBLASTFM_FOUND
+-    #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-    #include <lastfm5/ws.h>
+-    #else
+     #include <lastfm/ws.h>
+-    #endif
+ #endif
+ 
+ #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+diff --git a/src/tomahawk/Scrobbler.h b/src/tomahawk/Scrobbler.h
+index 01c2695..fab0ca6 100644
+--- a/src/tomahawk/Scrobbler.h
++++ b/src/tomahawk/Scrobbler.h
+@@ -20,15 +20,10 @@
+ #ifndef TOMAHAWK_SCROBBLER_H
+ #define TOMAHAWK_SCROBBLER_H
+ 
++#include "lastfm/ScrobblePoint.h"
+ #include "Result.h"
+ #include "infosystem/InfoSystem.h"
+ 
+-
+-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-#include <lastfm5/ScrobblePoint.h>
+-#else
+-#include <lastfm/ScrobblePoint.h>
+-#endif
+ #include <QObject>
+ 
+ /**
+diff --git a/src/tomahawk/TomahawkApp.h b/src/tomahawk/TomahawkApp.h
+index 953140b..c161d07 100644
+--- a/src/tomahawk/TomahawkApp.h
++++ b/src/tomahawk/TomahawkApp.h
+@@ -64,11 +64,7 @@ namespace Tomahawk
+ }
+ 
+ #ifdef LIBLASTFM_FOUND
+-    #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
+-    #include <lastfm5/NetworkAccessManager.h>
+-    #else
+     #include <lastfm/NetworkAccessManager.h>
+-    #endif
+     #include "Scrobbler.h"
+ #endif
+ 
diff --git a/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch b/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch
new file mode 100644
index 000000000000..e4b3bf0304c9
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-qtkeychain-cmake.patch
@@ -0,0 +1,28 @@
+From 00f602e10203b76fc28b4615868c567e6bd4ced4 Mon Sep 17 00:00:00 2001
+From: Dominik Schmidt <dev@dominik-schmidt.de>
+Date: Tue, 8 Aug 2017 14:34:49 +0200
+Subject: [PATCH] Fix #619: Correctly detect qt5keychain
+
+---
+ CMakeLists.txt | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ad5d918ecf..7004e1b700 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -376,12 +376,8 @@ macro_optional_find_package(LibLastFm 1.0.0)
+ macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm webservices" "https://github.com/lastfm/liblastfm" TRUE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
+ 
+ if( NOT APPLE )
+-if( TOMAHAWK_QT5 )
+-    macro_optional_find_package(Qt5Keychain 0.1.0)
+-else()
+-    macro_optional_find_package(QtKeychain 0.1.0)
+-endif()
+-macro_log_feature(QTKEYCHAIN_FOUND "QtKeychain" "Provides support for secure credentials storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
++macro_optional_find_package(Qt5Keychain 0.1.0)
++macro_log_feature(Qt5Keychain_FOUND "QtKeychain" "Provides support for secure credentials storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
+ endif()
+ 
+ if( UNIX AND NOT APPLE )
diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
new file mode 100644
index 000000000000..a36075aeec6a
--- /dev/null
+++ b/media-sound/tomahawk/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="hatchet">Enable support for the synchronisation through Hatchet</flag>
+		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
new file mode 100644
index 000000000000..39c73c56872a
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-0.9.0_pre20161029-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	# SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
+	SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="https://github.com/tomahawk-player/${PN}.git"
+fi
+
+DESCRIPTION="Multi-source social music player"
+HOMEPAGE="https://www.tomahawk-player.org/"
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+IUSE="+hatchet telepathy xmpp"
+
+CDEPEND="
+	$(add_frameworks_dep attica)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5]
+	dev-cpp/lucene++
+	dev-cpp/sparsehash
+	dev-libs/boost:=
+	dev-libs/qtkeychain:=[qt5(+)]
+	>=dev-libs/quazip-0.7.2[qt5]
+	media-libs/liblastfm[qt5]
+	>=media-libs/taglib-1.8.0
+	media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
+	>=net-libs/gnutls-3.2:=
+	x11-libs/libX11
+	hatchet? ( dev-cpp/websocketpp )
+	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
+	xmpp? ( net-libs/jreen[qt5] )
+"
+DEPEND="${CDEPEND}
+	$(add_qt_dep designer)
+	$(add_qt_dep linguist-tools)
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${CDEPEND}
+	app-crypt/qca:2[ssl]
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-liblastfm-cmake.patch"
+	"${FILESDIR}/${PN}-qtkeychain-cmake.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CRASHREPORTER=OFF
+		-DBUILD_TESTS=OFF
+		-DBUILD_TOOLS=OFF
+		-DBUILD_WITH_QT4=OFF
+		-DWITH_KDE4=OFF
+		-DBUILD_HATCHET=$(usex hatchet)
+		-DWITH_TelepathyQt=$(usex telepathy)
+		-DWITH_Jreen=$(usex xmpp)
+	)
+
+	if [[ ${KDE_BUILD_TYPE} != live ]]; then
+		mycmakeargs+=( -DBUILD_RELEASE=ON )
+	fi
+
+	kde5_src_configure
+}
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
new file mode 100644
index 000000000000..e433366a995b
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="https://github.com/tomahawk-player/${PN}.git"
+fi
+
+DESCRIPTION="Multi-source social music player"
+HOMEPAGE="https://www.tomahawk-player.org/"
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+IUSE="+hatchet telepathy xmpp"
+
+CDEPEND="
+	$(add_frameworks_dep attica)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	app-crypt/qca:2[qt5]
+	dev-cpp/lucene++
+	dev-cpp/sparsehash
+	dev-libs/boost:=
+	dev-libs/qtkeychain:=[qt5(+)]
+	>=dev-libs/quazip-0.7.2[qt5]
+	media-libs/liblastfm[qt5]
+	>=media-libs/taglib-1.8.0
+	media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
+	>=net-libs/gnutls-3.2:=
+	x11-libs/libX11
+	hatchet? ( dev-cpp/websocketpp )
+	telepathy? ( net-libs/telepathy-qt[qt5(+)] )
+	xmpp? ( net-libs/jreen[qt5] )
+"
+DEPEND="${CDEPEND}
+	$(add_qt_dep designer)
+	$(add_qt_dep linguist-tools)
+	$(add_qt_dep qtconcurrent)
+"
+RDEPEND="${CDEPEND}
+	app-crypt/qca:2[ssl]
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+PATCHES=( "${FILESDIR}/${PN}-liblastfm-cmake.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CRASHREPORTER=OFF
+		-DBUILD_TESTS=OFF
+		-DBUILD_TOOLS=OFF
+		-DBUILD_WITH_QT4=OFF
+		-DWITH_KDE4=OFF
+		-DBUILD_HATCHET=$(usex hatchet)
+		-DWITH_TelepathyQt=$(usex telepathy)
+		-DWITH_Jreen=$(usex xmpp)
+	)
+
+	if [[ ${KDE_BUILD_TYPE} != live ]]; then
+		mycmakeargs+=( -DBUILD_RELEASE=ON )
+	fi
+
+	kde5_src_configure
+}
diff --git a/media-sound/toolame/Manifest b/media-sound/toolame/Manifest
new file mode 100644
index 000000000000..6924fb02ca71
--- /dev/null
+++ b/media-sound/toolame/Manifest
@@ -0,0 +1,8 @@
+AUX toolame-02l-gentoo.diff 2188 SHA256 a7d2b7524c52a68952cd060e67a61cd78e9ecb25e63af480347f81652d3b95de SHA512 1d2c19fa4607f67f2fc8b6384d80fdf52e21438ecfecc6b2e2a0cbb84abd7019b340196324f1e43f81f698be96a2cccf970890908d8c05415b82ecb516da2484 WHIRLPOOL d629c63414de05255342d7ecc2c30cb4271687f43d6f66991de8f253234733de7205ca16f313bbb4f8098831637b27c384eec31a4fb1c1cf96b751f89d95d1af
+AUX toolame-02l-uint.patch 950 SHA256 d45a1564663337b0f7b50120f3491542b9ceaf6a003b73d786f9f41f01d78dfa SHA512 ef81fd06b5371ab9fa16037a3cb06ae4dbc9cf7f74c2c1553a06d40a9974ee509ec4f63f6dd5c7b21edb6763c5ea8e43273e98699c73013df430d7e008049f1d WHIRLPOOL e57d6847d07bb19a72ec440eb341b7c9f91db650c0b30fa4987ace6c89460c5078cdc62fdeab48439bdeaf5430cfc2036649aee7e26f89162e5ac72459cb81e5
+AUX toolame-02l-uint32_t.patch 624 SHA256 e76d347149cb0df2b75d65c448070b04c9f9e7c876d4b54131ef8deeb2ec23cb SHA512 cfde68fe55830f97caf38defc186aa6e95ee3c513e22af4aa06c89e1e071d2caadf22479e260c631442647c43b733aa13bedfca885f68cccf1187fad8aeccb05 WHIRLPOOL 44f9789acdc490b818312f1f78a7cdf3fced34cbf43233d421fc36333ce3309f0e64500e7f2d93738a8832d67cd04610936be4de0660678c585c85f244871dca
+DIST toolame-02l.tgz 127493 SHA256 3b95cd2504bceac4aab2fca03bb3b5974d1d44b5afdd8eb4cc0f0899521bffc4 SHA512 b88c524e1ad65ef30cfcffb53ab0d3552c916714dbde447d714e90ddf048e481d3b1a33f64081c4accc64a776b009d2737c7ab0863695652f2b0743f44a8055e WHIRLPOOL 95b7dd571d9d3a2243f7e90647560d755838c95f9bbbf982bcecc33c18b0b10ba387f8957667ca5c204fd0c94ac7b443a47bee1123fe625d9507210bc6f6266f
+EBUILD toolame-02l-r4.ebuild 758 SHA256 e70034567054d23feace76f2469512be825534927f3e6fe501909a74da5c0d54 SHA512 97ded645a563dcb5fcc84f29b705b66ed20492784d1a1ffcc6dd0ab36702296892a4b26b6b888d640eddb2822b753ed3f8b560288450110bfbf9d075eeff663b WHIRLPOOL 11b19427a3c8a3b89a910d47dea8aa92c1b2dd68f25829fae38afc2d2f17d8f03e947e34e9b631dda1647810f1021ad2545164e0c5c421584a5c381dec9f0bab
+MISC ChangeLog 2848 SHA256 46fd39375ed45a30db496ee897c619cfe4e6e219633a99bbfbd914037784da36 SHA512 e1f220fbb64f3d69cad96cdf85d2d14b02f4264d9890d820e4497ddb6cbb16c5cbea4a8ae64ae9fb540cfbf6c7e83a8a13be10aecb672aa7acf517f8f65175e6 WHIRLPOOL ae91a5eeb981402bccb467799194366c9eca202bc7efc4d811fb74d01953d3c6de81ca9750a32c946e97281d8cbb14fc21dc72d7311cf76ee4df2aadb9aaa491
+MISC ChangeLog-2015 4034 SHA256 dc08f42bd769a612edffcaa092c93cd4378c48749816927b9e32874e4b41bac6 SHA512 217e3afce18bcd91c8548b86ad8aa518782f535c53f8c9b03f30bd11d8ec2064c5e012c49590d2abe7eb800043868c6496ccf14d30b9f37eb5dfada5b6ceb859 WHIRLPOOL 0d9e9a0f642ebf1ff41dc138a0ce599609f3bb878a9f7bfa22e6120dae94f70f3d67e14791bb5e8c2bdd1801ffb101a0e99274685a46a208a100b6cd45cce36c
+MISC metadata.xml 330 SHA256 55df7138e4f74f20b036fbe83f24355c450994809c50b3769751d749e4dff8d6 SHA512 e4b6308fa4241c592a768a0a21629e0b0de427c39c8d0ef9c26e093e029de51e55a28ae547b93a584c373a1f29034069198cff2667d647238e20bd4b4f7b8b2e WHIRLPOOL 94820accf0e2c931e06ad00a0ed964664a75970330368d6ecc292cb6548bb2ca70b09df2e23271b849a30cb48c4917ba476e1a01ed09ab9dc4f904b97fde6a13
diff --git a/media-sound/toolame/files/toolame-02l-gentoo.diff b/media-sound/toolame/files/toolame-02l-gentoo.diff
new file mode 100644
index 000000000000..f96020f0a815
--- /dev/null
+++ b/media-sound/toolame/files/toolame-02l-gentoo.diff
@@ -0,0 +1,69 @@
+--- toolame-02l/Makefile	2003-03-02 08:07:02.000000000 +0100
++++ toolame-02l/Makefile.new	2003-04-14 14:00:10.000000000 +0200
+@@ -1,6 +1,3 @@
+-
+-CC = gcc
+-
+ c_sources = \
+ 	common.c \
+ 	encode.c \
+@@ -26,37 +23,16 @@
+ 
+ OBJ = $(c_sources:.c=.o)
+ 
+-#Uncomment this if you want to do some profiling/debugging
+-#PG = -g -pg
+-PG = -fomit-frame-pointer
+-
+-# Optimize flag. 3 is about as high as you can sanely go with GCC3.2.
+-OPTIM = -O3
+-
+ # These flags are pretty much mandatory
+ REQUIRED = -DNDEBUG -DINLINE=inline
+ 
+-#pick your architecture
+-ARCH = -march=pentium
+-#Possible x86 architectures
+-#gcc3.2 => i386, i486, i586, i686, pentium, pentium-mmx
+-#          pentiumpro, pentium2, pentium3, pentium4, k6, k6-2, k6-3,
+-#          athlon, athlon-tbird, athlon-4, athlon-xp and athlon-mp.
+-
+-#TWEAK the hell out of the compile. Some of these are real dodgy
+-# and will cause program instability
+-#TWEAKS = -finline-functions -fexpensive-optimizations -ffast-math \
+-#	-malign-double \
+-#	-mfancy-math-387 -funroll-loops -funroll-all-loops -pipe \
+-#	-fschedule-insns2 -fno-strength-reduce
+-
+ #Set a stack of warnings to overcome my atrocious coding style . MFC.
+ WARNINGS = -Wall
+ WARNINGS2 = -Wstrict-prototypes -Wmissing-prototypes -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wredundant-decls
+ 
+ NEW_02L_FIXES = -DNEWENCODE -DNEWATAN
+ 
+-CC_SWITCHES = $(OPTIM) $(REQUIRED) $(ARCH) $(PG) $(TWEAKS) $(WARNINGS) $(NEW_02L_FIXES)
++CC_SWITCHES = $(CFLAGS) $(REQUIRED) $(WARNINGS) $(NEW_02L_FIXES)
+ 
+ PGM = toolame
+ 
+@@ -75,16 +51,16 @@
+ 	$(CC) $(CC_SWITCHES) -c $< -o $@
+ 
+ $(PGM):	$(OBJ) Makefile
+-	$(CC) $(PG) -o $(PGM) $(OBJ) $(LIBS)
++	$(CC) $(LDFLAGS) -o $(PGM) $(OBJ) $(LIBS)
+ 
+ clean:
+-	-rm $(OBJ) $(DEP)
++	-rm $(OBJ) $(DEP) 2>/dev/null
+ 
+ megaclean:
+-	-rm $(OBJ) $(DEP) $(PGM) \#*\# *~
++	-rm $(OBJ) $(DEP) $(PGM) \#*\# *~ 2>/dev/null
+ 
+ distclean:
+-	-rm $(OBJ) $(DEP) $(PGM) \#* *~ gmon.out gprof* core *shit* *.wav *.mp2 *.c.* *.mp2.* *.da *.h.* *.d *.mp3 *.pcm *.wav logfile
++	-rm $(OBJ) $(DEP) $(PGM) \#* *~ gmon.out gprof* core *shit* *.wav *.mp2 *.c.* *.mp2.* *.da *.h.* *.d *.mp3 *.pcm *.wav logfile 2>/dev/null
+ 
+ tags: TAGS
+ 
diff --git a/media-sound/toolame/files/toolame-02l-uint.patch b/media-sound/toolame/files/toolame-02l-uint.patch
new file mode 100644
index 000000000000..619c98bb4547
--- /dev/null
+++ b/media-sound/toolame/files/toolame-02l-uint.patch
@@ -0,0 +1,27 @@
+diff -aur toolame-02l/audio_read.c toolame-02l-fixed/audio_read.c
+--- toolame-02l/audio_read.c	2003-03-01 17:18:30.000000000 -0800
++++ toolame-02l-fixed/audio_read.c	2005-04-19 22:32:41.288998770 -0700
+@@ -436,7 +436,7 @@
+ 
+   if (pcm_aiff_data->sampleSize != sizeof (short) * BITS_IN_A_BYTE) {
+     fprintf (stderr, "Sound data is not %d bits in \"%s\".\n",
+-	     sizeof (short) * BITS_IN_A_BYTE, file_name);
++	     (int)(sizeof (short) * BITS_IN_A_BYTE), file_name);
+     exit (1);
+   }
+ 
+diff -aur toolame-02l/fft.c toolame-02l-fixed/fft.c
+--- toolame-02l/fft.c	2003-03-01 23:14:45.000000000 -0800
++++ toolame-02l-fixed/fft.c	2005-04-19 22:47:49.019986989 -0700
+@@ -1190,9 +1190,9 @@
+   static FLOAT atan_t[ATANSIZE];
+ 
+ INLINE FLOAT atan_table(FLOAT y, FLOAT x) {
+-  int index;
++  unsigned int index;
+ 
+-  index = (int)(ATANSCALE * fabs(y/x));
++  index = (unsigned int)(ATANSCALE * fabs(y/x));
+   if (index>=ATANSIZE)
+     index = ATANSIZE-1;
+ 
diff --git a/media-sound/toolame/files/toolame-02l-uint32_t.patch b/media-sound/toolame/files/toolame-02l-uint32_t.patch
new file mode 100644
index 000000000000..624c342781d4
--- /dev/null
+++ b/media-sound/toolame/files/toolame-02l-uint32_t.patch
@@ -0,0 +1,18 @@
+diff -ur toolame-02l.orig/audio_read.c toolame-02l/audio_read.c
+--- toolame-02l.orig/audio_read.c	2003-03-02 03:18:30.000000000 +0200
++++ toolame-02l/audio_read.c	2009-05-30 15:24:41.000000000 +0300
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include "common.h"
+@@ -329,7 +330,7 @@
+       }
+     }
+     if (NativeByteOrder == order_littleEndian) {
+-      samplerate = *(unsigned long *) (&wave_header_buffer[24]);
++      samplerate = *(uint32_t *)(&wave_header_buffer[24]);
+     } else {
+       samplerate = wave_header_buffer[27] +
+ 	(wave_header_buffer[26] << 8) +
diff --git a/media-sound/toolame/metadata.xml b/media-sound/toolame/metadata.xml
new file mode 100644
index 000000000000..b24fd1523aab
--- /dev/null
+++ b/media-sound/toolame/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">toolame</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/toolame/toolame-02l-r4.ebuild b/media-sound/toolame/toolame-02l-r4.ebuild
new file mode 100644
index 000000000000..685ff590e1c3
--- /dev/null
+++ b/media-sound/toolame/toolame-02l-r4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="tooLAME - an optimized mpeg 1/2 layer 2 audio encoder"
+HOMEPAGE="http://www.planckenergy.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo.diff"
+	"${FILESDIR}/${P}-uint.patch"
+	"${FILESDIR}/${P}-uint32_t.patch"
+)
+
+src_prepare() {
+	# fix #571774 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	append-lfs-flags
+	tc-export CC
+
+	default
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README HISTORY FUTURE html/* text/*
+}
diff --git a/media-sound/traverso/Manifest b/media-sound/traverso/Manifest
new file mode 100644
index 000000000000..ac9a7c509cfb
--- /dev/null
+++ b/media-sound/traverso/Manifest
@@ -0,0 +1,7 @@
+AUX traverso-0.49.2-desktop.patch 397 SHA256 dffce77c86cbffa38ccfbe5cda4885864f9018ab22271558eb67b38bb3b099f0 SHA512 36b617b837afa2b690433c34cc124fe43b0e5fff585288d279b52070ec0892996ad108c1fdfda0d370b3051b20b5f6238a08c2eb3023313661ceef0bfa5205b7 WHIRLPOOL c1ecf1ac6faf30a27d049b594c64a368fd8bdd510daec7efaa38502a60feb9994da462630001863ab61a74d82447e8af384dbe4666d4830e3e22746695e02fbf
+AUX traverso-0.49.3-gcc6.patch 358 SHA256 8b1d0b45fb920088a97ea663197b3939ad7da4a136916778f657e4a80a6d7743 SHA512 f877f503ae05e76d653a0021db31ee84ef9e7aac7592ba241b9dfb558e6cd248a758001b817203cf00c81e7012a968c75081b3cdd1948bd5ba2db8e0cbad1eb9 WHIRLPOOL aed400501a365582e12068cf99d3d3f582e06979eac699205cadc55c6dbcf4b01f52ff2b05e35f2ab97bef7c23e588bf7f9118037cd8acdfb477b9b2376b9fef
+DIST traverso-0.49.3.tar.gz 1391101 SHA256 9e94b9b082c6891d5eaa5a8addb80b88f18bb7864899028eddf91a114a4b7382 SHA512 3db1dbc99ef3b0a9597959a6a3ce93909ec32d5f00648659debe1e8c5cec58ac6ab2108d5c66a1fc4145c2fe110c7db801fda8914664127653457132eac94ef2 WHIRLPOOL 3a44a45d9415071f80b8a788f28fcb38f489449d09dd5a93878f23af95eba1c1e8831db5ca6970ea97df91685051764d9ff21eeafeb3822cf29e478adb7c5a9f
+EBUILD traverso-0.49.3.ebuild 1852 SHA256 0327c436d4d24cd7afa27aef1a730421d7a0d5b75902dbd0f6d12e212cb1ae17 SHA512 45bf52ea2428cf035672c7752be55368a8b08113efccfa396dc80289bb663d124c944d349abbbf093f73bb19f2a0c8b8e8d098796a85ed84e1b1b35dd340779c WHIRLPOOL d05126161541b14f3b1273531ed1d0013b8db705e5d5780224a67a8eac1475ae598ecc3a8d68347a5aeccaca7e4c4b88e2428a5eacd2a7088cc9afe6bd414b0c
+MISC ChangeLog 2645 SHA256 566f296acd4d6763087235d571af051bc0ea9303babc7c50fe2effaaa233d6d9 SHA512 e92f345e9864ee34d8df2871b5ce9d6699f5bd1780527785d16aeb67a55ae5ebfad120e862ab3c3a5567af53bfa577685fbcb8df599959d296fabeea931987a7 WHIRLPOOL 44a8e0295afae20382f08b63634949aad00a184b896cc2e4a77a245f31d268fb1feb0e193b2ad5bb8bd8c5ff7eb5a462514b0dadf5852dab6c0f72258b4c925a
+MISC ChangeLog-2015 5799 SHA256 29bf9d6c5f9d8ee9661d0ef7bcf2a2288ee9ab587e18fba2da5d043ed62298b0 SHA512 d1f318c20ee5163e7ebb4bfb24c69f83196211be4f156e1b22189dc24cbb05df419d2678038be76b879aa1ac2b45043034b7bd61b71a2757dbc6769a694421a4 WHIRLPOOL c4e290b1e8fd77f68dbdaef80328626e867f2f4f652a414d4ac837dfe827ab140caaae8d18f27e280c770b392c1115b1b2fb728ea584e162a527f3dba321a88c
+MISC metadata.xml 560 SHA256 a50bad6ad5d39ab889c38e00da216cb468d49e888b9fc36f83b30d823b0bf6d0 SHA512 90118acc778dce7042e3ac52517f7ca246ea6a7228e3f847c55a75ddda82a4d4ea46456681d06c1e88b0a7369e3c2b601408264b118eb55f56854918c48e1184 WHIRLPOOL 8a5f519216db45d15ed13d0badfe3e1d7fe8bb894f87dc8ed9e4955a570f5ec5eabdcb4a21b73dab8571a500eda553ba588c9b9cfc151e85fb6f89f0b4c25cc3
diff --git a/media-sound/traverso/files/traverso-0.49.2-desktop.patch b/media-sound/traverso/files/traverso-0.49.2-desktop.patch
new file mode 100644
index 000000000000..a6584b644d31
--- /dev/null
+++ b/media-sound/traverso/files/traverso-0.49.2-desktop.patch
@@ -0,0 +1,16 @@
+--- a/resources/traverso.desktop
++++ b/resources/traverso.desktop
+@@ -1,12 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+-MimeType=text/plain
++MimeType=text/plain;
+ GenericName=Multitrack Recorder
+ GenericName[de]=Multitrack Recorder
+ GenericName[ru]=Многодорожечная запись и сведение
+ Exec=traverso
+ Icon=traverso
+-Path=
+ Type=Application
+ Terminal=false
+ Name=Traverso
diff --git a/media-sound/traverso/files/traverso-0.49.3-gcc6.patch b/media-sound/traverso/files/traverso-0.49.3-gcc6.patch
new file mode 100644
index 000000000000..d8ce1e581c8d
--- /dev/null
+++ b/media-sound/traverso/files/traverso-0.49.3-gcc6.patch
@@ -0,0 +1,12 @@
+Index: traverso-0.49.3/src/common/Tsar.h
+===================================================================
+--- traverso-0.49.3.orig/src/common/Tsar.h
++++ traverso-0.49.3/src/common/Tsar.h
+@@ -63,7 +63,6 @@ struct TsarEvent {
+ 	QObject* 	caller;
+ 	void*		argument;
+ 	int		slotindex;
+-	void*		_a[];
+ 
+ // Used for the signal emiting stuff
+ 	int signalindex;
diff --git a/media-sound/traverso/metadata.xml b/media-sound/traverso/metadata.xml
new file mode 100644
index 000000000000..a7183fbcec8f
--- /dev/null
+++ b/media-sound/traverso/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>proaudio@gentoo.org</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
+  <longdescription lang="en">
+		Traverso is a multitrack audio recording and editing program for GNU/Linux with
+		special emphasis to create an easy to use program with a clean and
+		intuitive interface.
+	</longdescription>
+  <use>
+    <flag name="lv2">Add support for Ladspa V2</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/traverso/traverso-0.49.3.ebuild b/media-sound/traverso/traverso-0.49.3.ebuild
new file mode 100644
index 000000000000..b41d0605b8db
--- /dev/null
+++ b/media-sound/traverso/traverso-0.49.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils flag-o-matic gnome2-utils
+
+DESCRIPTION="Professional Audio Tools for GNU/Linux"
+HOMEPAGE="http://traverso-daw.org/"
+SRC_URI="http://traverso-daw.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack lame lv2 mad pulseaudio"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	>=media-libs/flac-1.1.2
+	>=media-libs/libogg-1.1.2
+	media-libs/libsamplerate
+	>=media-libs/libsndfile-1.0.12
+	>=media-libs/libvorbis-1.1.2
+	>=media-sound/wavpack-4.40.0
+	>=sci-libs/fftw-3
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( virtual/jack )
+	lame? ( media-sound/lame )
+	lv2? ( media-libs/lilv )
+	mad? ( >=media-libs/libmad-0.15.0 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README resources/help.text )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.49.2-desktop.patch
+	"${FILESDIR}"/${PN}-0.49.3-gcc6.patch
+)
+
+src_configure() {
+	use lv2 && append-cppflags "$($(tc-getPKG_CONFIG) --cflags slv2)" #415165
+
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_TRAVERSO_DEBUG=$(usex debug)
+		-DWANT_JACK=$(usex jack)
+		-DWANT_MP3_ENCODE=$(usex lame)
+		-DWANT_LV2=$(usex lv2)
+		-DWANT_MP3_DECODE=$(usex mad)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local res
+	for res in 16 24 48 64 128; do
+		doicon -s ${res} resources/freedesktop/icons/${res}x${res}/apps/${PN}.png
+	done
+	doicon -s scalable resources/freedesktop/icons/scalable/apps/${PN}.svg
+
+	domenu resources/traverso.desktop
+
+	insinto /usr/share/${PN}
+	doins -r resources/themes
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/ttaenc/Manifest b/media-sound/ttaenc/Manifest
new file mode 100644
index 000000000000..27a7330d744b
--- /dev/null
+++ b/media-sound/ttaenc/Manifest
@@ -0,0 +1,5 @@
+DIST ttaenc-3.4.1-src.tgz 20835 SHA256 b2c9c8b015acc5864f082a0157f2e09c5117d1445321cb6178e925b448be3dc6 SHA512 489f9a2e0f94a82f12302f076e33062104e58688ffde97e742ad3c8c226bd0000133c539e9111e10f2d24c176e0b7ddd0a76e60bd3baafa53c29b3cd89ada06d WHIRLPOOL 60401b41df9f71f1daebaf5beab51782c6885fa16c5051136b50e3f69f1d00097d17659b27e99464e7a1bf379890777bdd8c4a282df409bac21d77ce426e9099
+EBUILD ttaenc-3.4.1-r1.ebuild 585 SHA256 21770dd5ca5a661f33f184e36687e218a27cf4ab71fe2020767e048eeb5f4710 SHA512 8deda5e07a81c5007e7b69eb58a3e27a3af2108ef053cbbb7469ef9102ae88e38a1da596aa4a7ea028cc8824d4bd38509fa9860661302df7a4dfdf1baced8ed4 WHIRLPOOL 7f91e843231ea69ecdc3da2e7c5e95bdd2dcddb199bf693d27f681e0f76e4b285963113ed36b3d6f366477329c77422e67112d7d5f23e89ae97d3d1e5703bf54
+MISC ChangeLog 2433 SHA256 1a506e2fb9c7f17984f422a800fb9c7a039df823ab53bb13f3a33bcf0b7778e1 SHA512 ab6eb0f097dc595de380d2282144836eaaeb7d36dbc6ae20549b846d82fdef1111ab675b994d848e87dc540bdbb303cf41f86d13e87ff4262add53e17a386aa5 WHIRLPOOL 59a1f0fe1577756817e267a02b785ddd0b008c6c24487daaca98d31836770997323412f563638c35a2640dd135ea4ed9675de25831d4a66a1a291dcbfac9ea04
+MISC ChangeLog-2015 1527 SHA256 348fea59fdf430f86f0553fd637517034d4682fa072aa0b9d41b5599a0c0d11d SHA512 98b2ff62d37680033ccbd3f2640574963387b9df2334f3ced2e6b3fc68caa7a2467e5e3279c5101f7a53e67440dd07239df6f68487dbef6e84b5f0cac128d6ab WHIRLPOOL 32edb1064295176ea606cd38bb13351d4b22a0790c207876e7e3ee6555349b2b21d2cd3304f2cfa7daa392bcd5e7809ffc711f0b176ecf80d69d8db202a4a896
+MISC metadata.xml 326 SHA256 17f94f8f44058d9814eeb5892c3148dd3116344f7da48173eb6d775b5052256d SHA512 cbf753d8944172edfe707a17f07936cf5af413721a7f657262fd4a4c65d001a39ea13069fc16d6ea5248e0025ad7c5b1852b36baeb1e1be53787ae1f4d9f8536 WHIRLPOOL 33cea017781ad8000d5ebf67c786cf5c16dc5f6d74551e4254851a3dde8543bbbd9d1a5352d839caa58f446434ddf547a9683a5bf5035a7a96a88cea6d5de08d
diff --git a/media-sound/ttaenc/metadata.xml b/media-sound/ttaenc/metadata.xml
new file mode 100644
index 000000000000..1952b25ee908
--- /dev/null
+++ b/media-sound/ttaenc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tta</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
new file mode 100644
index 000000000000..d7697469bc3e
--- /dev/null
+++ b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="True Audio Compressor Software"
+HOMEPAGE="http://tta.sourceforge.net"
+SRC_URI="mirror://sourceforge/tta/${P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+
+S=${WORKDIR}/${P}-src
+
+src_prepare() {
+	sed -i -e "s:gcc:$(tc-getCC):g" \
+		-e "s:-o:${LDFLAGS} -o:g" \
+		Makefile || die
+}
+
+src_compile () {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install () {
+	dobin ttaenc
+	dodoc ChangeLog-${PV} README
+}
diff --git a/media-sound/tudor-volumed/Manifest b/media-sound/tudor-volumed/Manifest
new file mode 100644
index 000000000000..a9d146fb3eec
--- /dev/null
+++ b/media-sound/tudor-volumed/Manifest
@@ -0,0 +1,6 @@
+AUX tudor-volumed-0_pre20110427-build.patch 829 SHA256 8aad034f0640c3cae01b7e930877bf4e96101fc1171f0053e4e20191d6ab14be SHA512 3cba0bd7ebf2a08e3fd44cca80436c1c4884f014759f0cb770d9af1612340795c282455be8b6cf9822fa746998ac1b4a28374dc88767d5e350d5036c7d9d6829 WHIRLPOOL 6392118f0ec1facaa19b1a2e7c61fc0b1c4296b60226f886a0bbe7c72fca3d9942284b39e78deaad7724f7d5b8c0c2e601f0b9559717a584746602e803f5afd0
+DIST tudor-volumed-0_pre20110427.tar.gz 5651 SHA256 e531a8ddab8910ebe0e639167f9cb81210426b3665eab6da2e36710be774124c SHA512 e05e8fef96985355b2e12b34a8858b98fd508e1849bff377c96593a5fee6cdf542decae2b9f1292c25b886cdd44545d99350c4c614553665fa3c7ea21ce5bd51 WHIRLPOOL 259374ddb24809c4ea99f2dd0cfc7859c7b9fc2aebbdcf0b9ede2999e3ec81fb594c5105506962f32c16cb482668f9505c9835dcf54297470765125d08574107
+EBUILD tudor-volumed-0_pre20110427.ebuild 644 SHA256 b3d15c09d81ed62c3d170adc6f4e1b89b2a6518d4ba7e0d6b1f7e45b0f21f564 SHA512 5975061da042e54c623c923c381e928a365054c641de7a27c1ddca6709c9aeecc62c074d821b024625c41794c39a913ad0f367714bf56977e6359a5432e1711f WHIRLPOOL ed8b623fc673c54834b94948d5d4331cbbe810b41ff45cd68803efa2ff127b39fe093727be0b8740fcbd5967ffd6cd027a4d67837ff796d31631cd0134ac33d8
+MISC ChangeLog 2514 SHA256 8c69e1b128633b4d193f8c0c7bec4d1dbd8cd93133200c3c58a30c30152230cc SHA512 bf978f778cb9051df6ae774b603b59596c058f03012f13365f51ccc2e0705ddec859ec9bbf3af924f2321036afc4456fdc8246a7550c3a2674299cf100d265e7 WHIRLPOOL 0b555634100d4cf869d316a9ed3c2d72580faa6f33c134ece3370e49b5cae25866edc20fe8e6ae205b5010acfdfc82d2feade788d33b7f088c87b340921e06b8
+MISC ChangeLog-2015 774 SHA256 500ff836da3bba3c3e04daf2135ce692cb8a999ed56fd7a1ea8e9a54d91710a8 SHA512 7dd74fafb8cbd2480529799610be1a7c6e6571e2696a237a4acb0d38a7e7425d76a828073a1f88d3d954a54c125b4695195b80fec0144bad85b6990a7db4e1ed WHIRLPOOL a0e35d4c692f5363356bcd623355a4c3fe872f953bd43577da939135e0165a4f6ade5527b73f0b6bf6a73c93100e0064072e62c5b5f58a25a6dd206ec34c1ed7
+MISC metadata.xml 338 SHA256 e13fc70e9a2a5758737ab9098a7f41f02c1223682aff817fa16da6331e621d6e SHA512 9ea28dbca9978bead16d9d0d0292ed5a6791af0d6a0e7a2608fa165762436bfa6649f304c032c0e51bd6cd7cfd28ec60c25660f1f78191686f4bf381b0bf9641 WHIRLPOOL 73272260cd4589408fe6c3b488120eb98fc7ea1b23dd6da268a220a681f60bc725322ca8507952c381ab7ebdddaa6ca87a235af129e5b353450866cf77dd30c6
diff --git a/media-sound/tudor-volumed/files/tudor-volumed-0_pre20110427-build.patch b/media-sound/tudor-volumed/files/tudor-volumed-0_pre20110427-build.patch
new file mode 100644
index 000000000000..73a5090665e7
--- /dev/null
+++ b/media-sound/tudor-volumed/files/tudor-volumed-0_pre20110427-build.patch
@@ -0,0 +1,43 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue May 29 11:49:50 UTC 2012
+Subject: build system
+
+respect LDFLAGs, CXXFLAGs and CXX
+
+--- Makefile
++++ Makefile
+@@ -3,12 +3,12 @@
+ all: $(BIN)
+ 
+ $(BIN): $(OBJECTS)
+-	$(CXX) $(CXXFLAGS) $^ -o $(BIN) $(LIBS) -ggdb
++	$(CXX) $(CXXFLAGS) $^ -o $(BIN) $(LDFLAGS) $(LIBS)
+ 
+ %.o: %.cpp
+-	$(CXX) $(CXXFLAGS) -c $^ -o $@ -ggdb
++	$(CXX) $(CXXFLAGS) -c $^ -o $@
+ 
+ clean:
+ 	rm -f $(BIN) $(OBJECTS)
+ 
+-.PHONY: clean all
+\ No newline at end of file
++.PHONY: clean all
+--- config.mk
++++ config.mk
+@@ -2,7 +2,7 @@
+ 
+ NAME := tudor-volumed
+ OS   := $(shell uname -o)
+-CXX  := gcc
++CXX  ?= gcc
+ 
+ LIBS    := -lX11 -lstdc++
+ BIN     := $(NAME)
+@@ -17,4 +17,4 @@
+ ifdef OSSLIBDIR
+ 	CXXFLAGS += -DUSE_OSS -I${OSSLIBDIR}/include/sys
+ 	OBJECTS  += ossmixer.o
+-endif
+\ No newline at end of file
++endif
diff --git a/media-sound/tudor-volumed/metadata.xml b/media-sound/tudor-volumed/metadata.xml
new file mode 100644
index 000000000000..fbda2a228105
--- /dev/null
+++ b/media-sound/tudor-volumed/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">darvid/tudor-volumed</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild b/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild
new file mode 100644
index 000000000000..8723f7c1e47a
--- /dev/null
+++ b/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils vcs-snapshot
+
+DESCRIPTION="Lightweight, desktop environment agnostic volume management daemon"
+HOMEPAGE="https://github.com/darvid/tudor-volumed"
+SRC_URI="https://github.com/darvid/${PN}/tarball/7fc04cb2fb71e6f8815ddd87fd7ef5d02022edeb -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+pkg_setup() {
+	tc-export CXX
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/media-sound/tunapie/Manifest b/media-sound/tunapie/Manifest
new file mode 100644
index 000000000000..2dfa52d4ffea
--- /dev/null
+++ b/media-sound/tunapie/Manifest
@@ -0,0 +1,7 @@
+DIST tunapie-2.1.17.tar.gz 50165 SHA256 d3cf0d102df52da37ee50125fbaa8f9709b18d9f8bc13dd9fa3932e4f28828f6 SHA512 62215f99b863f3db24b78048302f8b2f54aa5b969e9ba09034e98227dcada3f561a1afcf5babd65dca7f251aeeba816352b252f9f8f22fdec77272d7583f7ce9 WHIRLPOOL d1ee2991c1f0f77ede710c9eadcfa003c359a262988f9599ac1740b412182b2e588a9e417f9cdb0e807a00715ea2e163dddde58fe9fb2c3d96cfe2d3808078a3
+DIST tunapie-2.1.19.tar.gz 48459 SHA256 2b83c146dd54478a7b35e58b21b7cef52efaa2431b92cd10d97715eeaa7dcb85 SHA512 6a53034e4172f8c96d6e1c92433a3d94c3e8b8bceb9587ff39bad5e7b97937ac000419c683474427ea293b7ba10d5e9dd845b4aa7eaad1a3bcc5b980d57e5669 WHIRLPOOL 79f5663b9d76aa74754be281f29e99a3db70d19a4192b14f40907b3957ca2971c4f32c0f534a9fa843dc017cc1cc130392e2515b3b36ff65c5cea17e82ad6920
+EBUILD tunapie-2.1.17-r1.ebuild 1063 SHA256 91d7e3fa65fb0fc9160a35bc2d020c621f6eaabb0969fab1ec9a84d5ca273b18 SHA512 23ca1269bf8768e4cb397df7052c9785986de230d994ede06ab7f0bbffc60f2701a5db0b57911b27fd8e00c286858b38d2fdb619432c1f3c4fd97633461e1ec3 WHIRLPOOL c442cc50f9068580ce1b86f79d37552bb7f4de7394d1ca7681d75f7d8dbf2d1a95b1ea1007f4f19fb3d083d075a1d8383992e1cc6af68e3f6e034216bbf44b41
+EBUILD tunapie-2.1.19.ebuild 1063 SHA256 91d7e3fa65fb0fc9160a35bc2d020c621f6eaabb0969fab1ec9a84d5ca273b18 SHA512 23ca1269bf8768e4cb397df7052c9785986de230d994ede06ab7f0bbffc60f2701a5db0b57911b27fd8e00c286858b38d2fdb619432c1f3c4fd97633461e1ec3 WHIRLPOOL c442cc50f9068580ce1b86f79d37552bb7f4de7394d1ca7681d75f7d8dbf2d1a95b1ea1007f4f19fb3d083d075a1d8383992e1cc6af68e3f6e034216bbf44b41
+MISC ChangeLog 2432 SHA256 510cb42fc9349a1d0aef67b46c3a55e5895bdfd615da80cec6b1fde7622286f1 SHA512 7bb4514f2a29efaa08deaef5620ee980f342cda462ceaf69b5ed03430d895c6fd85cecdafe38ed3560c773de8a4f0350697b7cfcb4621a1ba7250aecb7e37bb7 WHIRLPOOL f0d6dadf61aae8a1fd31642b68b4c9c6feac06546ca85b09c1b05f5fbedd94a558c8dc25cf123b014c60c3b259bde9ac1153f522c2e2a67897aa53294750f996
+MISC ChangeLog-2015 1481 SHA256 e45460b4c805799c9cad1a37ebe0b27dac122495f3ec8a06e6fdab456b8448af SHA512 4894bcd17718c608dc1f38213d21cc0f8f5f4cfc10bdba01b4bd420b9ac2c1e5ead8b732acd20446c7e3fa895c5268ffe29ecd6718ef43a483e7096f2ef25f1f WHIRLPOOL 481620547f11e43791ecbd6ca3981a485dc947fbf3d20d1482aed060a26a03b58ea76fdcf353b88563e6054b5c5f66399b45ee17ab0dd4d84d444c6cbae664ce
+MISC metadata.xml 330 SHA256 df9529bda4d97387809f6cd458d560feac49b1e2a33c81fe2db761a79816b7e7 SHA512 cad1cb083e186bb3b2b34a0d061611a48a85ff7e4295fa5bde40cf7f17d27ea89cb5c09e92a8c4049bd02118215253f7648e1cde5741a7b89260fb9f1fa229a2 WHIRLPOOL f0a4f3f2f900b4cabdf505cde4bb76aeccb4a0a26e00d331b7c7ac7af5f944c000561d052a7db5b8564bbe173e6b22abb2526b7717d79cb161d69edba7e15dcb
diff --git a/media-sound/tunapie/metadata.xml b/media-sound/tunapie/metadata.xml
new file mode 100644
index 000000000000..7df63bcb5d2d
--- /dev/null
+++ b/media-sound/tunapie/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tunapie</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/tunapie/tunapie-2.1.17-r1.ebuild b/media-sound/tunapie/tunapie-2.1.17-r1.ebuild
new file mode 100644
index 000000000000..db38951688e3
--- /dev/null
+++ b/media-sound/tunapie/tunapie-2.1.17-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1
+
+DESCRIPTION="Directory browser for Radio and TV streams"
+HOMEPAGE="http://tunapie.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="offensive"
+
+RDEPEND=">=dev-python/wxpython-2.6[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	default
+
+	# fix pixmap lookup
+	sed -i -e 's@../pixmaps@../../share/pixmaps@' \
+		src/tunapie2_main.py || die
+
+	# the original script requires more sed than code,
+	cat > tunapie <<-_EOF_ || die
+		#!/bin/sh
+		exec ${EPYTHON} /usr/lib/tunapie/Tunapie.py
+	_EOF_
+}
+
+src_install() {
+	dobin tunapie
+	doman tunapie.1
+	dodoc CHANGELOG README
+
+	python_moduleinto /usr/lib/tunapie
+	python_domodule src/{*.py,*.png}
+
+	doicon src/tplogo.xpm
+	domenu tunapie.desktop
+
+	dodir /etc
+	usex offensive 1 0 > "${ED%/}"/etc/tunapie.config || die
+}
diff --git a/media-sound/tunapie/tunapie-2.1.19.ebuild b/media-sound/tunapie/tunapie-2.1.19.ebuild
new file mode 100644
index 000000000000..db38951688e3
--- /dev/null
+++ b/media-sound/tunapie/tunapie-2.1.19.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-single-r1
+
+DESCRIPTION="Directory browser for Radio and TV streams"
+HOMEPAGE="http://tunapie.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="offensive"
+
+RDEPEND=">=dev-python/wxpython-2.6[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	default
+
+	# fix pixmap lookup
+	sed -i -e 's@../pixmaps@../../share/pixmaps@' \
+		src/tunapie2_main.py || die
+
+	# the original script requires more sed than code,
+	cat > tunapie <<-_EOF_ || die
+		#!/bin/sh
+		exec ${EPYTHON} /usr/lib/tunapie/Tunapie.py
+	_EOF_
+}
+
+src_install() {
+	dobin tunapie
+	doman tunapie.1
+	dodoc CHANGELOG README
+
+	python_moduleinto /usr/lib/tunapie
+	python_domodule src/{*.py,*.png}
+
+	doicon src/tplogo.xpm
+	domenu tunapie.desktop
+
+	dodir /etc
+	usex offensive 1 0 > "${ED%/}"/etc/tunapie.config || die
+}
diff --git a/media-sound/tuxguitar/Manifest b/media-sound/tuxguitar/Manifest
new file mode 100644
index 000000000000..aecf670be1f5
--- /dev/null
+++ b/media-sound/tuxguitar/Manifest
@@ -0,0 +1,5 @@
+AUX tuxguitar-fixed-ant-files.patch 10154 SHA256 1937c6e4d04f0245c6de8258c62ab389586b0c297305e15598cedfd2dfe7d349 SHA512 90b732cddf4684fb99a91e581903e64cd039ef9b9d8ec7bc9629ce8da889a6b2961f8f5dafd6cce21eb0c67e2e5501586580081f28c702de88ddd1d229769013 WHIRLPOOL f298b51f8a69bb8e99dd8de97f982e5105d968f9e31c383b6906d83301e928185547448c6d753bb152e6d5ceca4bddfaf25bd6e82de582967534b728fec98016
+DIST tuxguitar-1.3.2-src.tar.gz 82294553 SHA256 1295cded91a76e4310648036578a6631faaa7231cd5524786891fbfdc3a0b551 SHA512 fb94472df25578d94ad11cd385cfc9347bfefcdd8ebedd2e785f3645d6b2e0d6d87d3fc457af159865b3fae77ad443ac4246b3c6fbe42397f4d15908dd3b7149 WHIRLPOOL 35e538692ca546d045c607347d57a7f4601f7444753a208065458efc40d24060dfc5aca2d5b3a66869136a42e143676366334c5d49ef6913b2ad15583b2a3e3f
+EBUILD tuxguitar-1.3.2.ebuild 3490 SHA256 aa602898052ffd690554f23cf7a383e2b5b47dfd71ee439f6da3dd4172233649 SHA512 0167d7e111e7452cd6a5ad2b05b6d50b23078f4e6bdf11cc4e97ef4eeb7c281567b36eb0eb37e3f22b6592d2d3e8d39493d859cc3270da507c16ca4ed6c9b9f4 WHIRLPOOL 39a4a2707501e74900a3966e6d245b907048be99efd886b0814b3247c8f47cfd4934c7a17e71ad7471687cb045d7ba5a3ccc9a7244321754aabf211187fb5099
+MISC ChangeLog 1197 SHA256 b9d4bac0034003af9f10279ad530780cdc6a0a9934fc502cff1d1bb4a755dce4 SHA512 a7c702afe9c84e12b6dfa630595046e04bc04dd16a11d1aaecc509c5bc3b8896453df43a7cb506625c1a251cb022f2e58008b3d5ac2f256b2496ee971f136af4 WHIRLPOOL 9b003f6145de27465df76a1ee36b405be7db7b6153093014b15a8f4e642db8a72d7ccc42151329f9037a9a52277682d307efb450cf8e491074855f974b9f1d8a
+MISC metadata.xml 1404 SHA256 83deac5809544cdb746be8d07d5b15033f1e8ec7588013ac726f26f68c6b8497 SHA512 da3655093bab58b616e68e772fcac63750cc8e87817f2d62d50bf2c159c3b7c86e585cf3bce0a523ddeaedf87613e675628a5c6e8145e3f2841f9b098157b929 WHIRLPOOL 80d7083529105fa02c2a8974a0f81ef0c31fe00db8b27efc0ece7bbe387bf233fcc57e6deb2b3817aae6fd1120b148dea827a8c9c690604998c2f5e27a12d510
diff --git a/media-sound/tuxguitar/files/tuxguitar-fixed-ant-files.patch b/media-sound/tuxguitar/files/tuxguitar-fixed-ant-files.patch
new file mode 100644
index 000000000000..9e1cbf778e57
--- /dev/null
+++ b/media-sound/tuxguitar/files/tuxguitar-fixed-ant-files.patch
@@ -0,0 +1,237 @@
+diff -purN a/TuxGuitar/build.properties b/TuxGuitar/build.properties
+--- a/TuxGuitar/build.properties	2016-03-16 21:26:23.000000000 +0000
++++ b/TuxGuitar/build.properties	2016-08-23 10:55:06.271917712 +0100
+@@ -5,4 +5,5 @@ ant.build.javac.source=1.5
+ ant.build.javac.target=1.5
+ 
+ path.tuxguitar-lib=../TuxGuitar-lib/tuxguitar-lib.jar
++path.tuxguitar-editor-utils=../TuxGuitar-editor-utils/tuxguitar-editor-utils.jar
+ path.swt=../TuxGuitar/lib/swt.jar
+diff -purN a/TuxGuitar/build.xml b/TuxGuitar/build.xml
+--- a/TuxGuitar/build.xml	2016-03-16 21:26:23.000000000 +0000
++++ b/TuxGuitar/build.xml	2016-08-23 08:59:03.987797193 +0100
+@@ -12,6 +12,7 @@
+ 	
+ 	<path id="class.path">
+ 		<pathelement location="${path.tuxguitar-lib}"/>
++		<pathelement location="${path.tuxguitar-editor-utils}"/>
+ 		<pathelement location="${path.swt}"/>
+ 	</path >
+ 	
+diff -purN a/TuxGuitar-awt-graphics/build.properties b/TuxGuitar-awt-graphics/build.properties
+--- a/TuxGuitar-awt-graphics/build.properties	1970-01-01 01:00:00.000000000 +0100
++++ b/TuxGuitar-awt-graphics/build.properties	2016-08-23 09:11:06.737851049 +0100
+@@ -0,0 +1,7 @@
++### ANT Flags
++#
++# build.compiler=gcj
++ant.build.javac.source=1.5
++ant.build.javac.target=1.5
++
++path.tuxguitar-lib=../TuxGuitar-lib/tuxguitar-lib.jar
+diff -purN a/TuxGuitar-awt-graphics/build.xml b/TuxGuitar-awt-graphics/build.xml
+--- a/TuxGuitar-awt-graphics/build.xml	1970-01-01 01:00:00.000000000 +0100
++++ b/TuxGuitar-awt-graphics/build.xml	2016-08-23 12:40:24.005858183 +0100
+@@ -0,0 +1,45 @@
++<?xml version="1.0" encoding="iso-8859-1"?>
++
++<project name="TuxGuitar-awt-graphics" basedir="." default="all">
++	<description>
++		TuxGuitar AWT Graphics
++	</description>
++	
++	<property file="build.properties" />
++	<property name="build.src.path" value="src" />
++	<property name="build.path" value="build" />
++	<property name="build.jar" value="tuxguitar-awt-graphics.jar" />
++	
++	<path id="class.path">
++		<pathelement location="${path.tuxguitar-lib}"/>
++	</path >
++	
++	<target name="init" depends="clean">
++		<mkdir dir="${build.path}" />
++	</target>
++	
++	<target name="build" depends="init">
++		<echo>+-------------------------------------------------+</echo>
++		<echo>|          B U I L D I N G   P L U G I N          |</echo>
++		<echo>+-------------------------------------------------+</echo>
++		
++		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
++			<classpath refid="class.path"/>
++			<include name="**/*.java"/>
++		</javac>
++		
++		<echo>+-----------------------------------------------+</echo>
++		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
++		<echo>+-----------------------------------------------+</echo>
++		
++		<jar destfile="${build.jar}" basedir="${build.path}" />
++		<delete quiet="true" dir="${build.path}" />
++	</target>
++	
++	<target name="clean">
++		<delete quiet="true" dir="${build.path}" />
++		<delete quiet="true" file="${build.jar}" />
++	</target>
++	
++	<target name="all" depends="build" />
++</project>
+diff -purN a/TuxGuitar-editor-utils/build.properties b/TuxGuitar-editor-utils/build.properties
+--- a/TuxGuitar-editor-utils/build.properties	1970-01-01 01:00:00.000000000 +0100
++++ b/TuxGuitar-editor-utils/build.properties	2016-08-23 08:46:42.164749665 +0100
+@@ -0,0 +1,7 @@
++### ANT Flags
++#
++# build.compiler=gcj
++ant.build.javac.source=1.5
++ant.build.javac.target=1.5
++
++path.tuxguitar-lib=../TuxGuitar-lib/tuxguitar-lib.jar
+diff -purN a/TuxGuitar-editor-utils/build.xml b/TuxGuitar-editor-utils/build.xml
+--- a/TuxGuitar-editor-utils/build.xml	1970-01-01 01:00:00.000000000 +0100
++++ b/TuxGuitar-editor-utils/build.xml	2016-08-23 10:51:44.533478977 +0100
+@@ -0,0 +1,45 @@
++<?xml version="1.0" encoding="iso-8859-1"?>
++
++<project name="TuxGuitar-editor-utils" basedir="." default="all">
++	<description>
++		TuxGuitar Editor Utils
++	</description>
++	
++	<property file="build.properties" />
++	<property name="build.src.path" value="src" />
++	<property name="build.path" value="build" />
++	<property name="build.jar" value="tuxguitar-editor-utils.jar" />
++
++	<path id="class.path">
++		<pathelement location="${path.tuxguitar-lib}"/>
++	</path >
++
++	<target name="init" depends="clean">
++		<mkdir dir="${build.path}" />
++	</target>
++	
++	<target name="build" depends="init">
++		<echo>+-------------------------------------------------+</echo>
++		<echo>|         B U I L D I N G   L I B R A R Y         |</echo>
++		<echo>+-------------------------------------------------+</echo>
++		
++		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
++			<classpath refid="class.path"/>
++			<include name="**/*.java"/>
++		</javac>
++		
++		<echo>+-----------------------------------------------+</echo>
++		<echo>|       P A C K A G I N G   L I B R A R Y       |</echo>
++		<echo>+-----------------------------------------------+</echo>
++		
++		<jar destfile="${build.jar}" basedir="${build.path}" />
++		<delete quiet="true" dir="${build.path}" />
++	</target>
++	
++	<target name="clean">
++		<delete quiet="true" dir="${build.path}" />
++		<delete quiet="true" file="${build.jar}" />
++	</target>
++	
++	<target name="all" depends="build" />
++</project>
+diff -purN a/TuxGuitar-gtp-ui/build.xml b/TuxGuitar-gtp-ui/build.xml
+--- a/TuxGuitar-gtp-ui/build.xml	2016-03-16 21:26:23.000000000 +0000
++++ b/TuxGuitar-gtp-ui/build.xml	2016-08-23 15:21:38.068032721 +0100
+@@ -9,7 +9,7 @@
+ 	<property name="build.src.path" value="src${file.separator}" />
+ 	<property name="build.share.path" value="share${file.separator}" />
+ 	<property name="build.path" value="build${file.separator}" />
+-	<property name="build.jar" value="tuxguitar-gtp.jar" />
++	<property name="build.jar" value="tuxguitar-gtp-ui.jar" />
+ 	
+ 	<path id="class.path">
+ 		<pathelement location="${path.tuxguitar-lib}"/>
+diff -purN a/TuxGuitar-jsa/build.properties b/TuxGuitar-jsa/build.properties
+--- a/TuxGuitar-jsa/build.properties	2016-03-16 21:26:23.000000000 +0000
++++ b/TuxGuitar-jsa/build.properties	2016-08-23 12:45:00.324325595 +0100
+@@ -7,4 +7,5 @@ ant.build.javac.target=1.5
+ path.tuxguitar=../TuxGuitar/tuxguitar.jar
+ path.tuxguitar-lib=../TuxGuitar-lib/tuxguitar-lib.jar
+ path.tuxguitar-gm-utils=../TuxGuitar-gm-utils/tuxguitar-gm-utils.jar
++path.tuxguitar-editor-utils=../TuxGuitar-editor-utils/tuxguitar-editor-utils.jar
+ path.swt=../TuxGuitar/lib/swt.jar
+diff -purN a/TuxGuitar-jsa/build.xml b/TuxGuitar-jsa/build.xml
+--- a/TuxGuitar-jsa/build.xml	2016-03-16 21:26:23.000000000 +0000
++++ b/TuxGuitar-jsa/build.xml	2016-08-23 12:46:07.932440095 +0100
+@@ -14,6 +14,7 @@
+ 	<path id="class.path">
+ 		<pathelement location="${path.tuxguitar-lib}"/>
+ 		<pathelement location="${path.tuxguitar-gm-utils}"/>
++		<pathelement location="${path.tuxguitar-editor-utils}"/>
+ 		<pathelement location="${path.tuxguitar}"/>
+ 		<pathelement location="${path.swt}"/>
+ 	</path >
+diff -purN a/TuxGuitar-pdf/build.properties b/TuxGuitar-pdf/build.properties
+--- a/TuxGuitar-pdf/build.properties	2016-03-16 21:26:23.000000000 +0000
++++ b/TuxGuitar-pdf/build.properties	2016-08-23 13:37:17.230856507 +0100
+@@ -7,5 +7,7 @@ ant.build.javac.target=1.5
+ path.tuxguitar=../TuxGuitar/tuxguitar.jar
+ path.tuxguitar-lib=../TuxGuitar-lib/tuxguitar-lib.jar
+ path.tuxguitar-gm-utils=../TuxGuitar-gm-utils/tuxguitar-gm-utils.jar
++path.tuxguitar-editor-utils=../TuxGuitar-editor-utils/tuxguitar-editor-utils.jar
++path.tuxguitar-awt-graphics=../TuxGuitar-awt-graphics/tuxguitar-awt-graphics.jar
+ path.itext=../TuxGuitar/lib/itext.jar
+ path.swt=../TuxGuitar/lib/swt.jar
+diff -purN a/TuxGuitar-pdf/build.xml b/TuxGuitar-pdf/build.xml
+--- a/TuxGuitar-pdf/build.xml	2016-03-16 21:26:23.000000000 +0000
++++ b/TuxGuitar-pdf/build.xml	2016-08-23 13:37:40.843895665 +0100
+@@ -17,6 +17,8 @@
+ 		<pathelement location="${path.tuxguitar}"/>
+ 		<pathelement location="${path.tuxguitar-lib}"/>
+ 		<pathelement location="${path.tuxguitar-gm-utils}"/>
++		<pathelement location="${path.tuxguitar-editor-utils}"/>
++		<pathelement location="${path.tuxguitar-awt-graphics}"/>
+ 	</path >
+ 	
+ 	<target name="init" depends="clean">
+diff -purN a/TuxGuitar-tray/build.properties b/TuxGuitar-tray/build.properties
+--- a/TuxGuitar-tray/build.properties	2016-03-16 21:26:23.000000000 +0000
++++ b/TuxGuitar-tray/build.properties	2016-08-23 13:41:10.241259782 +0100
+@@ -6,4 +6,6 @@ ant.build.javac.target=1.5
+ 
+ path.tuxguitar=../TuxGuitar/tuxguitar.jar
+ path.tuxguitar-lib=../TuxGuitar-lib/tuxguitar-lib.jar
++path.tuxguitar-gm-utils=../TuxGuitar-gm-utils/tuxguitar-gm-utils.jar
++path.tuxguitar-editor-utils=../TuxGuitar-editor-utils/tuxguitar-editor-utils.jar
+ path.swt=../TuxGuitar/lib/swt.jar
+diff -purN a/TuxGuitar-tray/build.xml b/TuxGuitar-tray/build.xml
+--- a/TuxGuitar-tray/build.xml	2016-03-16 21:26:23.000000000 +0000
++++ b/TuxGuitar-tray/build.xml	2016-08-23 13:41:41.262315895 +0100
+@@ -15,6 +15,8 @@
+ 	<property name="service.provider" value="org.herac.tuxguitar.tray.TGTrayPlugin" />
+ 	
+ 	<path id="class.path">
++		<pathelement location="${path.tuxguitar-editor-utils}"/>
++		<pathelement location="${path.tuxguitar-gm-utils}"/>
+ 		<pathelement location="${path.tuxguitar-lib}"/>
+ 		<pathelement location="${path.tuxguitar}"/>
+ 		<pathelement location="${path.swt}"/>
+diff -purN a/TuxGuitar-tuner/build.properties b/TuxGuitar-tuner/build.properties
+--- a/TuxGuitar-tuner/build.properties	2016-03-16 21:26:14.000000000 +0000
++++ b/TuxGuitar-tuner/build.properties	2016-08-23 13:42:25.501396719 +0100
+@@ -6,4 +6,5 @@ ant.build.javac.target=1.5
+ 
+ path.tuxguitar=../TuxGuitar/tuxguitar.jar
+ path.tuxguitar-lib=../TuxGuitar-lib/tuxguitar-lib.jar
++path.tuxguitar-gm-utils=../TuxGuitar-gm-utils/tuxguitar-gm-utils.jar
+ path.swt=../TuxGuitar/lib/swt.jar
+diff -purN a/TuxGuitar-tuner/build.xml b/TuxGuitar-tuner/build.xml
+--- a/TuxGuitar-tuner/build.xml	2016-03-16 21:26:14.000000000 +0000
++++ b/TuxGuitar-tuner/build.xml	2016-08-23 13:42:50.180442190 +0100
+@@ -12,6 +12,7 @@
+ 	<property name="build.jar" value="tuxguitar-tuner.jar" />
+ 	
+ 	<path id="class.path">
++		<pathelement location="${path.tuxguitar-gm-utils}"/>
+ 		<pathelement location="${path.tuxguitar-lib}"/>
+ 		<pathelement location="${path.tuxguitar}"/>
+ 		<pathelement location="${path.swt}"/>
diff --git a/media-sound/tuxguitar/metadata.xml b/media-sound/tuxguitar/metadata.xml
new file mode 100644
index 000000000000..fcffe09fdb56
--- /dev/null
+++ b/media-sound/tuxguitar/metadata.xml
@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>j.scruggs@gmail.com</email>
+		<name>Jonathan Scruggs</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		A multitrack tablature editor and player that allows you to
+		compose music using the following features:
+		- Tablature editor
+		- Score Viewer
+		- Multitrack display
+		- Autoscroll while playing
+		- Note duration management
+		- Various effects (bend, slide, vibrato, hammer-on/pull-off)
+		- Support for triplets (5,6,7,9,10,11,12)
+		- Repeat open and close
+		- Time signature management
+		- Tempo management
+		- Imports and exports gp3,gp4 and gp5 files
+	</longdescription>
+	<use>
+		<flag name="fluidsynth">
+			Enables Fluidsynth MIDI software synthesis (with external sound fonts). 
+			JSA must be disabled in the plug-ins menu to use this.
+		</flag>
+		<flag name="lilypond">
+			Exports the score in a lilypond compatible format.
+		</flag>
+		<flag name="pdf">
+			Exports the score as a PDF file using <pkg>dev-java/itext</pkg>.
+		</flag>
+		<flag name="tray">
+			Adds an icon to the tray that controls midi playback.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">tuxguitar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
new file mode 100644
index 000000000000..fe46d5c4a8fc
--- /dev/null
+++ b/media-sound/tuxguitar/tuxguitar-1.3.2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $id$
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs flag-o-matic fdo-mime gnome2-utils
+
+MY_P="${P}-src"
+DESCRIPTION="TuxGuitar is a multitrack guitar tablature editor and player written in Java-SWT"
+HOMEPAGE="http://tuxguitar.herac.com.ar/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="alsa fluidsynth jack lilypond oss pdf timidity tray"
+
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/swt:3.7[cairo]
+	alsa? ( media-libs/alsa-lib )
+	pdf? ( dev-java/itext:5 )
+	fluidsynth? ( media-sound/fluidsynth )
+	lilypond? ( media-sound/lilypond )"
+
+RDEPEND=">=virtual/jre-1.5
+	timidity? ( media-sound/timidity++[alsa?,oss?] )
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-fixed-ant-files.patch )
+
+LIBRARY_LIST=()
+PLUGIN_LIST=()
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	default_src_prepare
+
+	sed -e "s|../TuxGuitar/lib/swt.jar|$(java-pkg_getjar swt-3.7 swt.jar)|" \
+		-i TuxGuitar*/build.properties || die "sed TuxGuitar*/build.properties failed"
+
+	if use pdf; then
+		sed -e "s|../TuxGuitar/lib/itext.jar|$(java-pkg_getjar itext-5 itext.jar)|" \
+		-i TuxGuitar-pdf/build.properties || die "sed TuxGuitar-pdf/build.properties failed"
+	fi
+
+	LIBRARY_LIST=( TuxGuitar-lib TuxGuitar-awt-graphics TuxGuitar-editor-utils
+		TuxGuitar-gm-utils TuxGuitar
+	)
+
+	PLUGIN_LIST=( $(usev alsa) ascii browser-ftp community compat
+		converter $(usev fluidsynth) gm-settings gpx gtp gtp-ui image
+		$(usev jack) $(usex jack jack-ui "") jsa $(usev lilypond) midi
+		musicxml $(usev oss) $(usev pdf) ptb svg tef $(usev tray) tuner
+	)
+}
+
+src_compile() {
+	local build_order=( ${LIBRARY_LIST[@]} ${PLUGIN_LIST[@]/#/TuxGuitar-} )
+	local directory
+
+	append-flags -fPIC $(java-pkg_get-jni-cflags)
+
+	for directory in ${build_order[@]}; do
+		cd "${S}"/${directory} || die "cd ${directory} failed"
+		eant
+		if [[ -d jni ]]; then
+			CC=$(tc-getCC) emake -C jni
+		fi
+	done
+}
+
+src_install() {
+	local tuxguitar_inst_path="/usr/share/${PN}"
+	local library
+	local plugin
+
+	for library in ${LIBRARY_LIST[@]}; do
+		cd "${S}"/${library} || die "cd ${library} failed"
+		java-pkg_dojar ${library,,}.jar
+		use source && java-pkg_dosrc src/org
+	done
+
+	java-pkg_dolauncher ${PN} \
+		--main org.herac.tuxguitar.app.TGMainSingleton \
+		--java_args "-Xmx512m  -Dtuxguitar.share.path=${tuxguitar_inst_path}/share"
+
+	# Images and Files
+	insinto ${tuxguitar_inst_path}
+	doins -r share
+
+	java-pkg_sointo ${tuxguitar_inst_path}/lib
+	insinto ${tuxguitar_inst_path}/share/plugins
+	for plugin in ${PLUGIN_LIST[@]/#/TuxGuitar-}; do
+		cd "${S}"/${plugin} || die "cd ${plugin} failed"
+		doins ${plugin,,}.jar
+
+		#TuxGuitar has its own classloader. No need to register the plugins.
+		if [[ -d jni ]]; then
+			java-pkg_doso jni/lib${plugin,,}-jni.so
+		fi
+	done
+
+	insinto ${tuxguitar_inst_path}/share
+	doins -r "${S}"/TuxGuitar-resources/resources/soundfont
+	doman "${S}/misc/${PN}.1"
+	insinto /usr/share/mime/packages
+	doins "${S}/misc/${PN}.xml"
+	doicon "${S}/misc/${PN}.xpm"
+	domenu "${S}/misc/${PN}.desktop"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	if use fluidsynth; then
+		ewarn "Fluidsynth plugin blocks behavior of JSA plugin."
+		ewarn "Enable only one of them in \"Tools > Plugins\""
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
new file mode 100644
index 000000000000..ea5794f3db51
--- /dev/null
+++ b/media-sound/twolame/Manifest
@@ -0,0 +1,7 @@
+AUX 0.3.13-perl-tests.patch 779 SHA256 cbdfd45f30ab87bbf3cd5f33d0c2b99f2a64f353f9c13b7aa0f0a377a5495b60 SHA512 1c483daf75991fa6d390360d9108803f65fa894745140d3955f73ce8e87eb813a068efa810988ac462ed22ae0bf3d0f95b63feb5c823ce3bfa3a0dc9b9a8f413 WHIRLPOOL c0e30298a11f4af773d89787c99f7ffae470d7926fab08fe41c94a2d4e38b7b8e925271c73d90c9f8a94d363698feee203d1b25b63bd4a1b138465003ea0110c
+DIST twolame-0.3.13.tar.gz 660415 SHA256 98f332f48951f47f23f70fd0379463aff7d7fb26f07e1e24e42ddef22cc6112a SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7 WHIRLPOOL 489943692b60fbb5b63c9c4b95730ce854dcaab278023bb9fb472e0b84755bcfe7d71097bcbb4555a1181b3c27a6e8f2cf0cff2eddd5d515b4a0fa8a19c9a532
+EBUILD twolame-0.3.13-r1.ebuild 1278 SHA256 21e5d2f1b68b3ff32c12a3cdaaacbefb936e1af2c10a3fa4e24aa59dd9836d95 SHA512 7bd73ac55b501c24bd9d46946412bdd784e3d11036863b185f81f8a91d1ebdbbc0a12ab9567e8dc5cd1335f61aa6276c976db34464d474905192835cb2a4e8c3 WHIRLPOOL f68c1d307db520cb482298d75032b08185ea33bbfa68e748dad8b71c17a78fa892578880b00aeb18694adbccdc83daeb969346978e981ce581240ede69d14504
+EBUILD twolame-0.3.13-r2.ebuild 1402 SHA256 406e6b7f3123eb69e4448d036908c61b6982a80a511f23f6a3a4121bcea426f4 SHA512 31f74520758c88099e465b30fc9e7f1a97142005671b0e732bf4e9912461b1d2878e17abb0c14a87b78d69556f9ee2f818fc04659dec8dc799287ae5e6c61858 WHIRLPOOL 80780bca34b04e5f1674dd9da826e9f4cb1712efeb3d67ca7e9ed395cb5863ca7f1dcf278a014333e3ae88a9d1d00bffbba5d3e6bc0cc037b0121595b9871624
+MISC ChangeLog 2715 SHA256 b996eb54678863cec6503bad987fcd634c3316d45d2151fb731bcee94f9d902b SHA512 e45ed23e52eb1d378afee3c91cefb8a9fde6070ecb5cb35a1a4763faf26e973beb7ba56431018c429394827d336b90b67742e56fc58d16a35baf7c7316e51d92 WHIRLPOOL 0b9493b0b1a77a30604b3aed4a264425556e00674bf5e2a97dcb598d812499cd0b0da99b3d6b526f76741eb62cbcd9ed6715cf75e93567e13d2072b02e8f74cd
+MISC ChangeLog-2015 6884 SHA256 383fbd13f6c5acd03565ae83a70fa98bda2fc357374eea0c57616c9f87e960ae SHA512 4c8ab343b7355c20628e40df5bb7866faf0f3bb358e979312067bff8bb952b460ea9530f764f788ecb38c7f9709436ea989a6a8bb7435383b402744267490af8 WHIRLPOOL 3a6fc6df6aca9994b70b74a9a89b14ec58b87473fa762ad7726bd4bc6e2d794db57d0839ad57996aa02940dcbf482979dfd980ef7e11fa3db6ea66ce009631f9
+MISC metadata.xml 330 SHA256 64c1b8ba850abc84fcae7d98c727bb903e24242817c4e4c0b2b0e7c510e91e91 SHA512 4ef98f0ddd18034ac0ea2e93a84560e62b02c3ee6186f980b20733d88f68e36f3724f2b2b8c138393f9c6da1b4b943f318fcc85b5f57817fbaac33d68e4b6ea8 WHIRLPOOL 134bfe16581bdb3071ff81982afcce78564d3302740ea2b488729ec7419ce73a0ce3c2a1e533c8dc5bd3099b900d5eaca84d7339b37b2199f5b2938fe26a7b29
diff --git a/media-sound/twolame/files/0.3.13-perl-tests.patch b/media-sound/twolame/files/0.3.13-perl-tests.patch
new file mode 100644
index 000000000000..5ec5b6601770
--- /dev/null
+++ b/media-sound/twolame/files/0.3.13-perl-tests.patch
@@ -0,0 +1,32 @@
+From 11a5ecb89de1e61b016f3d7f358b09a4e611f1ad Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Tue, 17 Jan 2017 12:18:10 +1300
+Subject: [PATCH] tests/test.pl: stat the right file
+
+stat(@_) is effectively stat scalar @_
+
+becasue "stat" has a signature of "$" which coerces arrays to
+scalars, which here, returns the length of the array.
+
+This is going to be number 1, instead of the desired argument,
+     the filename.
+---
+ tests/test.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test.pl b/tests/test.pl
+index 658eadf..5513d6e 100755
+--- a/tests/test.pl
++++ b/tests/test.pl
+@@ -185,7 +185,7 @@ sub input_filepath {
+ }
+ 
+ sub filesize {
+-  return (stat(@_))[7];
++  return (stat($_[0]))[7];
+ }
+ 
+ sub md5_file {
+-- 
+2.11.0
+
diff --git a/media-sound/twolame/metadata.xml b/media-sound/twolame/metadata.xml
new file mode 100644
index 000000000000..9a145f2f8a0c
--- /dev/null
+++ b/media-sound/twolame/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">twolame</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/twolame/twolame-0.3.13-r1.ebuild b/media-sound/twolame/twolame-0.3.13-r1.ebuild
new file mode 100644
index 000000000000..72f6a6d3ffdc
--- /dev/null
+++ b/media-sound/twolame/twolame-0.3.13-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+inherit autotools-multilib
+
+DESCRIPTION="An optimised MPEG Audio Layer 2 (MP2) encoder"
+HOMEPAGE="http://www.twolame.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	sed -i -e '/CFLAGS/s:-O3::' configure || die
+
+	if [[ ${CHOST} == *solaris* ]]; then
+		# libsndfile doesn't like -std=c99 on Solaris
+		sed -i -e '/CFLAGS/s:-std=c99::' configure || die
+		# configure isn't really bourne shell (comment 0) or dash (comment 6)
+		# compatible, bug #388885
+		export CONFIG_SHELL=${BASH}
+	fi
+
+	autotools-multilib_src_prepare
+}
+
+src_install() {
+	autotools-multilib_src_install \
+		pkgdocdir="${EPREFIX}/usr/share/doc/${PF}"
+}
diff --git a/media-sound/twolame/twolame-0.3.13-r2.ebuild b/media-sound/twolame/twolame-0.3.13-r2.ebuild
new file mode 100644
index 000000000000..1660d631865f
--- /dev/null
+++ b/media-sound/twolame/twolame-0.3.13-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="An optimised MPEG Audio Layer 2 (MP2) encoder"
+HOMEPAGE="http://www.twolame.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${PV}-perl-tests.patch" )
+
+src_prepare() {
+	sed -i -e '/CFLAGS/s:-O3::' configure || die
+	# remove -Werror, bug 493940
+	sed -i -e '/WARNING_CFLAGS/s:-Werror::' configure || die
+
+	if [[ ${CHOST} == *solaris* ]]; then
+		# libsndfile doesn't like -std=c99 on Solaris
+		sed -i -e '/CFLAGS/s:-std=c99::' configure || die
+		# configure isn't really bourne shell (comment 0) or dash (comment 6)
+		# compatible, bug #388885
+		export CONFIG_SHELL=${BASH}
+	fi
+
+	default
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+		econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-sound/umix/Manifest b/media-sound/umix/Manifest
new file mode 100644
index 000000000000..5f41c355d43b
--- /dev/null
+++ b/media-sound/umix/Manifest
@@ -0,0 +1,5 @@
+DIST umix-1.0.2.tar.gz 225866 SHA256 ee5425f8f08f6b34fa8785f14a100682b05b8ad8a86c7aec5329c594300d7055 SHA512 9e59a26c0b6cd60bbcfa715694ed58e023c119840080ccb46d9e6b17a9613fd42c1346233a5185d02ece77e3f3e456e18be25573fd34e2f265c5b0b3dc593468 WHIRLPOOL 6ea64e2e3018afd1753c669534e5596223ca50bad873fb2e643290738db57b1c1469d419513d198be27161440f664088c5cf75072ef0eb4fde87307a7d44bfdd
+EBUILD umix-1.0.2.ebuild 619 SHA256 a3c3cf1d95d50271b426710deb3bfb6c3a4e4a1089454576511e1a86e3732709 SHA512 f214255a8ebb1704abe450b155b15a563563368e1328a821ab46b61690cb1394d35c73fb479a41347ea488722c11c3abceb4b7e70c3fc802068d6455da76b9c1 WHIRLPOOL 2dca72c2472d06f3da011f5ba08e1ed11511f6ae17f01ffd7c88dbc4768fab1e7341abc9ce886c511243e3883d6a2eb701efcc0d988d9c6454e1ef5a6ac9295b
+MISC ChangeLog 2421 SHA256 b66b5e5bbcdd7fe305dcb9c7ca041e12e81afae9b0daac4f930b40fb29aacd43 SHA512 7d23e85d0e129fd5948f1ee4860177e9b860982b741551556cd12b9a6e609b2ec7a6ce176eb731a33879a921a73646addf6d9bf0e19559bff93776f9a900631b WHIRLPOOL 0766562dcf046e9299bffd411db0633c3f746f0910aad7cc29f1fd8bb9904e90c0b3a6c622bf3c1edf461b746265dbc6bd4cfb2d0f9f9b8a0152d1e879aa6ba8
+MISC ChangeLog-2015 2642 SHA256 12520ef228b71bb058611522064c4e52b4e099845af970c848ba2bad96531530 SHA512 d4fcc241d97a0399f6199d19386375f80ea7e3bcb6b639e4689c88cc6c80a5711aca0e63150773a5a9a90288b943358edb813c6d09e0f01ec59679a982e7c972 WHIRLPOOL 9c6fbe1c0f56957b87d92ef469e2cf6a9fac1d4101d1f15971e5e67ab4e654c3a3cb486f890e0e71a3f98727acf2d8e6550e130eda67a52704a5aa3a3a8fa5d1
+MISC metadata.xml 327 SHA256 452e0bb9d5f78b3004da87edbca2c631954d31d772bc6765aefe5b0523fbc806 SHA512 e46843a6b8a9feb294b713eb1766900dbebf7211212423c9e791f0ffa59faeb9fb0c909c4268d13d737d80818fc343d6c067b8dc3bf369515083e7f1fc3abb71 WHIRLPOOL e28cce5ee1c4c0b69b7096b96bedda968a9cd44b010d827c1b4f2f2554926f4032e84cb4ff4138eb5770dbd5eb43f0a8354b2f9628afc146533210666d1e3cd9
diff --git a/media-sound/umix/metadata.xml b/media-sound/umix/metadata.xml
new file mode 100644
index 000000000000..3ebfdeab3689
--- /dev/null
+++ b/media-sound/umix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">umix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/umix/umix-1.0.2.ebuild b/media-sound/umix/umix-1.0.2.ebuild
new file mode 100644
index 000000000000..959d3b10f057
--- /dev/null
+++ b/media-sound/umix/umix-1.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+IUSE="ncurses oss"
+
+DESCRIPTION="Program for adjusting soundcard volumes"
+HOMEPAGE="http://umix.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ppc sparc x86"
+
+DEPEND="ncurses? ( >=sys-libs/ncurses-5.2 )"
+
+src_compile() {
+	local myconf
+	use ncurses || myconf="--disable-ncurses"
+	use oss || myconf="${myconf} --disable-oss"
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
new file mode 100644
index 000000000000..d1a158ae925b
--- /dev/null
+++ b/media-sound/umurmur/Manifest
@@ -0,0 +1,11 @@
+AUX umurmur.conf 1637 SHA256 6d34c8915d7d2cbd21cdb9d3ff1f9227c48d458046481c785a260e1faeae233f SHA512 563573c405013bdf9d76003d68eb9619064659dc1e1b8b1fde24c0e587a807202bf62efe7f227cc95ff8b6db68a2ace3f0f359cef74c1bf5f1582815dd623501 WHIRLPOOL 25ee26eaf988b4897213e682c77c69ae74987f4de284f1497b77199c3b585a26d5eaa31f1f5161f3d0b90112a5dc11030729407bb58e9aacf413ca77528adf5e
+AUX umurmurd.confd 64 SHA256 f7738665b9c7799df2b805f8570d4307f40c5fd3c84316e4773215b87fd57f67 SHA512 4af070ab4d8f4a9a2d5b59b8be95cfb49c22faae809843d9c8ede954bdf39f1224bb31cc53e5cf0f771a2033dfe904890345a6031055c9e79fdd315447e54840 WHIRLPOOL 334350adfc793a9b9f7681510b7aeb4c6e76d145bb01437124e76049e256ff8224c2f4edb9e3729e6651f699ae71c838c5ecd47fca9a150941db0c8f7c9fa6ba
+AUX umurmurd.initd 458 SHA256 0faf8c62c0314f66e92ff1c7c3126579477756f18ac3548c107311a5a05c0731 SHA512 d60c700bf0bb54c904faff658e09dc37a6cd79edb69e4aa54f46872f474c8f673a91ebe022a47dc0d6b4f624a86f70be99f661a1e80a672b04dff6af3328b28d WHIRLPOOL 71cd4bf0cbd2e7e8ba0cedfa5bb9a7b795a748eaa3d409f2d7dd6073d8e9a49c6539477966480f58933a2904d67fe6d1485ec8d45ec99e3131396e44b41f68d8
+AUX umurmurd.service 363 SHA256 24d268fa74f7cd3523df1827d8ef2d429a2e5d40e8746b97f55ef55728639e8d SHA512 3366dc2b35623daf4704e30bc6207cf795e31cb4c9cd0c7e19f64fa9d92da772fcc309e5799261b6c07c95cfeacd2d9b898ec4a4be7b5acc46efda7a98308913 WHIRLPOOL 5a865c97f0639c8a8392df0df8fb8c0092eb6c028f62fced4eb1f452992abec9543c7b6737faf407997d7eb54d69931946cc7d88409de6f750a45df12ac6b175
+DIST umurmur-0.2.16a.tar.gz 91187 SHA256 d64df8f77ceaa4951d7f2adbb2dcc173841d1e387ef4cd2082c42150a84349a5 SHA512 432a85e93cb7d53c505caf8b97c1bb7c173c8f625127510de61cc0a1e3abaea9abcf96ab1c0a8c5039ba82af5d29710e4973f70c1438bfd44ba00fa0c3f64c9e WHIRLPOOL 98a01a25dad0427bda0379711f9702ee8ed70bbeb50daa439a9e8c40bfec174f79bfe6ed02e07ff20a4f0f8614de83cbd4806ccbacc0066c769d9e43678b508e
+DIST umurmur-0.2.17.tar.gz 93786 SHA256 e77b7b6616768f4a1c07442afe49a772692f667b00c23cc85909d4dd0ce206d2 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15 WHIRLPOOL 37420b8969118f028eb20f36de9b22c366898ee4874ed47fc1b64ef73d02ade1139a8dcb0de2e83ea9447eaa442fa3921c1161d957b77e47e094973814c5c28e
+EBUILD umurmur-0.2.16a-r1.ebuild 2135 SHA256 3d83f6950cbe498c2b58814a293554b88cfbf8b4ebce1ba2a87a4d31e0ad5370 SHA512 33849901fc0e7d8dcf7592e95be1f73a5309c8dcd98d07340d48c37889cec1b5759616f6de5591ad5a5c94450fd71512f796a44ca20b5188e5d4a9b0f19aefc4 WHIRLPOOL 6ea1ec70612a6d6270f0b015a03a8ac5b3d20c253f379754a9286b299c51c225ab98f35b0f96b69ac7c2a145f1335cb306abf332e3b9064dfc40ac28ca096c4a
+EBUILD umurmur-0.2.17-r1.ebuild 2162 SHA256 5fdd9c9ecfd07a827617876f22e219eac54949f7df709249072ebd348957defd SHA512 d48f9b896acf82d0fbc727d07ad694d174274f26da4316cb36af623e588df96724cc1e3765a03e647b649466370f34b3bf3bb7a143702a7b96676121aeb6b827 WHIRLPOOL 2df6e3f0e092d3be84dc2cbfbbaf7a5eec063e6f69b8251210255b82743f08abd79feb7ba1b873251aba8248cb5d3a2c22ad55aec0e0bce4b7fc0c18d93284dd
+MISC ChangeLog 3376 SHA256 6fafe01e500ecb7f3ddf81ffffadb8d0b5dd6f3ff6969c6e12bad87e5d017b2f SHA512 360d63c5e092b7d83780de5e842a1ba618b07675b2acb06c2ce2f4355a156975db2e856aad79a2eaeb756e249aaea89e8a75e0a88a3496620f118752218ff183 WHIRLPOOL f35cb8dc49e9decc7ba957cbca2892330ca0a36f6461993a22d6b7bb41d5cb8ad5bffe72a70ffd4656cdc1e6386c7a68302621717abdc297c4cfd7a755a592f9
+MISC ChangeLog-2015 4126 SHA256 d04414417c33fdc0bdc1cb993c16b3e3e3f5dfc393ab4600de38882939d68c7d SHA512 fabb3aaf41c86f2069afd2e3aa6e7750bcbd07e352256b2ae0da0934ea2a21fd6b64d5f30efcc3a500834e41b7c59d3135057ef7cc70f3c14036d5339b7e4419 WHIRLPOOL e13e505357a57afa5f5687d94e4ce9bc1e29c5f363d7f40e94a1b039c6d90e41eac8ad7e6e843930385ef63395536ed87853a479e48f34af5a9ee9d81420903d
+MISC metadata.xml 1284 SHA256 046ccc55eaf83c6e7b4ff35866a7ae09c966aac99d2d347dfd9eef574231e8d5 SHA512 f248722f232774e18e238b0f5ed8692b660f8d111c4db68881afbfac1d1419b28e64a8da97da04b22f2a977b34d144480f1f65cf331a8a9bd249ee4d6addcae5 WHIRLPOOL 0d2e886ba13f2fcbba7ee7d1824cf11dad450ff899b10a6433777ab276bff8a3c837d5c882647a93aaa1a0e98b06c25c461333e384ac96e33a0a1e3f8b9a9d23
diff --git a/media-sound/umurmur/files/umurmur.conf b/media-sound/umurmur/files/umurmur.conf
new file mode 100644
index 000000000000..cebcca28a583
--- /dev/null
+++ b/media-sound/umurmur/files/umurmur.conf
@@ -0,0 +1,58 @@
+# This configuration is based on the official example configuration. More information can be found
+# at http://code.google.com/p/umurmur/wiki/Configuring02x
+
+max_bandwidth = 48000;
+welcometext = "Welcome to uMurmur!";
+certificate = "/etc/umurmur/cert.crt";
+private_key = "/etc/umurmur/key.key";
+password = "";
+max_users = 10;
+
+# Specify port and/or address to bind to. Typically not needed.
+# Default is '*' for address and 64738 for port. 
+# Can also be specified on the command line, which takes precedence if
+# both are specified.
+# bindport = 64738;
+# bindaddr = "192.168.1.1";
+
+# Specify this for privilege dropping. If username is specified but not 
+# the groupname, the user's login group is used.
+username = "murmur";
+groupname = "murmur";
+
+# Root channel must always be defined first.
+# If a channel has a parent, the parent must be defined before the child channel(s).
+channels = ( {
+         name = "Root";
+         parent = "";
+         description = "The Root of all channels";
+         noenter = true;
+         },
+         {
+         name = "Lobby";
+         parent = "Root";
+         description = "Lobby channel";
+         },
+         {
+         name = "Red team";
+         parent = "Lobby";
+         description = "The Red team channel";
+         },
+         {
+         name = "Blue team";
+         parent = "Lobby";
+         description = "The Blue team channel";
+         }
+);
+# Channel links configuration.
+channel_links = ( {
+         source = "Lobby";
+         destination = "Red team";
+         },
+         {
+         source = "Lobby";
+         destination = "Blue team";
+         }
+);
+
+default_channel = "Lobby";
diff --git a/media-sound/umurmur/files/umurmurd.confd b/media-sound/umurmur/files/umurmurd.confd
new file mode 100644
index 000000000000..d83461ce725d
--- /dev/null
+++ b/media-sound/umurmur/files/umurmurd.confd
@@ -0,0 +1,3 @@
+# Additional flags to be passed to umurmurd
+UMURMURD_OPTS="-r"
+
diff --git a/media-sound/umurmur/files/umurmurd.initd b/media-sound/umurmur/files/umurmurd.initd
new file mode 100644
index 000000000000..d0dd5517d626
--- /dev/null
+++ b/media-sound/umurmur/files/umurmurd.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="umurmurd - A minimalistic mumble server"
+pidfile="/run/umurmurd/umurmurd.pid"
+command="/usr/bin/umurmurd"
+command_args="-c /etc/umurmur/umurmur.conf -p ${pidfile} ${UMURMURD_OPTS}"
+start_stop_daemon_args="-p ${pidfile} -w 100"
+
+depend() {
+	need net
+	use logger
+}
+
+start_pre() {
+	checkpath -d -o murmur ${pidfile%/*}
+}
diff --git a/media-sound/umurmur/files/umurmurd.service b/media-sound/umurmur/files/umurmurd.service
new file mode 100644
index 000000000000..12ad2aec6459
--- /dev/null
+++ b/media-sound/umurmur/files/umurmurd.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=A minimalistic Mumble server
+After=network.target
+
+[Service]
+Type=simple
+User=murmur
+Group=murmur
+PIDFile=/run/umurmurd.pid
+ExecStartPre=/usr/bin/umurmurd -t -c /etc/umurmur/umurmur.conf
+ExecStart=/usr/bin/umurmurd -d -r -p /run/umurmurd.pid -c /etc/umurmur/umurmur.conf
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/media-sound/umurmur/metadata.xml b/media-sound/umurmur/metadata.xml
new file mode 100644
index 000000000000..7ea309183ac3
--- /dev/null
+++ b/media-sound/umurmur/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>alex_y_xu@yahoo.ca</email>
+		<name>Alex Xu</name>
+		<description>Co maintainer, CC bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		uMurmur is a minimalistic Mumble server primarily targeted to
+		run on routers with an open OS like OpenWRT. The server part
+		of Mumble is called Murmur, hence the name uMurmur.
+	</longdescription>
+	<use>
+		<flag name="shm">Enable shared memory support</flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<email>fatbob.snack@gmail.com</email>
+			<name>Martin Johansson</name>
+		</maintainer>
+		<bugs-to>https://code.google.com/p/umurmur/issues/list</bugs-to>
+		<changelog>
+			https://code.google.com/p/umurmur/wiki/Changelog</changelog>
+		<doc lang="en">https://code.google.com/p/umurmur/w/list</doc>
+		<remote-id type="google-code">umurmur</remote-id>
+		<remote-id type="github">umurmur/umurmur</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
new file mode 100644
index 000000000000..348df9a213b0
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd eutils readme.gentoo-r1 user
+
+DESCRIPTION="Minimalistic Murmur (Mumble server)"
+HOMEPAGE="https://github.com/umurmur/umurmur"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gnutls libressl shm"
+
+# ssl-provider precendence: gnutls, libressl
+# and openssl if none specified
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
+	dev-libs/libconfig
+	gnutls? ( >=net-libs/gnutls-3.0.0 )
+	libressl? ( !gnutls? ( dev-libs/libressl ) )
+	!gnutls? ( !libressl? ( dev-libs/openssl:0 ) )"
+
+RDEPEND="${DEPEND}"
+
+DOC_CONTENTS="
+	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
+	may	want to review it. See also\n
+	https://github.com/umurmur/umurmur/wiki/Configuration "
+
+pkg_pretend() {
+	local ssl_provider=(  )
+	use gnutls && ssl_provider+=( gnutls )
+	use libressl && ssl_provider+=( libressl )
+
+	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
+		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
+		ewarn "defaulting to ${ssl_provider[0]}."
+	fi
+}
+
+pkg_setup() {
+	enewgroup murmur
+	enewuser murmur "" "" "" murmur
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	econf \
+		--with-ssl=$(usev gnutls || echo openssl) \
+		$(use_enable shm shmapi)
+}
+
+src_install() {
+	local confdir
+
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
+	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
+	systemd_dounit "${FILESDIR}"/umurmurd.service
+
+	dodoc AUTHORS ChangeLog
+	newdoc README.md README
+
+	confdir="/etc/umurmur"
+	insinto "${confdir}"
+	doins "${FILESDIR}"/umurmur.conf
+
+	# Some permissions are adjusted as the config may contain a server
+	# password, and /etc/umurmur will typically contain the cert and the
+	# key used to sign it, which are read after priveleges are dropped.
+	fperms 0750 "${confdir}"
+	fowners -R root:murmur "${confdir}"
+	fperms 0640 "${confdir}"/umurmur.conf
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/umurmur/umurmur-0.2.17-r1.ebuild b/media-sound/umurmur/umurmur-0.2.17-r1.ebuild
new file mode 100644
index 000000000000..fd839fd58312
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.17-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd eutils readme.gentoo-r1 user
+
+DESCRIPTION="Minimalistic Murmur (Mumble server)"
+HOMEPAGE="https://github.com/umurmur/umurmur"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gnutls libressl shm"
+
+# ssl-provider precendence: gnutls, libressl
+# and openssl if none specified
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
+	dev-libs/libconfig
+	gnutls? ( >=net-libs/gnutls-3.0.0 )
+	libressl? ( !gnutls? ( dev-libs/libressl ) )
+	!gnutls? ( !libressl? ( dev-libs/openssl:0 ) )"
+
+RDEPEND="${DEPEND}"
+
+DOC_CONTENTS="
+	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
+	may	want to review it. See also\n
+	https://github.com/umurmur/umurmur/wiki/Configuration "
+
+S="${WORKDIR}/${P/_}"
+
+pkg_pretend() {
+	local ssl_provider=(  )
+	use gnutls && ssl_provider+=( gnutls )
+	use libressl && ssl_provider+=( libressl )
+
+	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
+		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
+		ewarn "defaulting to ${ssl_provider[0]}."
+	fi
+}
+
+pkg_setup() {
+	enewgroup murmur
+	enewuser murmur "" "" "" murmur
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	econf \
+		--with-ssl=$(usev gnutls || echo openssl) \
+		$(use_enable shm shmapi)
+}
+
+src_install() {
+	local confdir
+
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
+	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
+	systemd_dounit "${FILESDIR}"/umurmurd.service
+
+	dodoc AUTHORS ChangeLog
+	newdoc README.md README
+
+	confdir="/etc/umurmur"
+	insinto "${confdir}"
+	doins "${FILESDIR}"/umurmur.conf
+
+	# Some permissions are adjusted as the config may contain a server
+	# password, and /etc/umurmur will typically contain the cert and the
+	# key used to sign it, which are read after priveleges are dropped.
+	fperms 0750 "${confdir}"
+	fowners -R root:murmur "${confdir}"
+	fperms 0640 "${confdir}"/umurmur.conf
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/vb2rip/Manifest b/media-sound/vb2rip/Manifest
new file mode 100644
index 000000000000..e899e3479470
--- /dev/null
+++ b/media-sound/vb2rip/Manifest
@@ -0,0 +1,5 @@
+DIST vb2rip14.zip 22254 SHA256 aa321e078deca1507b2b670b4a71d48435e80f5ba1375bf33eb26f467f5cc9b3 SHA512 f84c8bb826a319cb0e0bc6118bc270ace18f52cc73b918ca5ef8d8f674bd7922d23d36fe6034a189f18ac4fb9e6a8f0c460dd407ec350fd1185c1088757678ea WHIRLPOOL e749f836dc5d585eb5faa1953b46964c172e539b67cc21620ce6d1418f3b03a87d89ed464446d57da96ef6d94ff0407ff0adf535c97ffa6b3781e33363415279
+EBUILD vb2rip-1.4.ebuild 755 SHA256 b2fda635e7311f6009018d2ef6fa5c30174e8e621faf03668d908f27c2418406 SHA512 6c0ad89e52d1c4baca8deee873bf87fa0c3c4468735d95526231a03d6abd9c4af27e826dfc84901965aa057bc52e817e971cb45cc3136f8fb9a65c5e1b9c4349 WHIRLPOOL 5fa403f006fe7bf829fa89be4c412b5155eecb5aa0bc4d015aff2a4e40a4293aaf1f23eabe6a5b656cfe4cd6691a7c77ac83d78d65ae1ece56f080cacc51e67f
+MISC ChangeLog 2423 SHA256 c6dd876cdcd934c85e8d777846395a3676d11ed384d856b34d9a717a0b332177 SHA512 0e2d751d00574db14a91a7dfa78ba560c4832fc63ca47812f6fd7751c212154b49719adc6bbd89d4a480b595481ca8425ce138bed9051ec49543d16f046d152d WHIRLPOOL 7446c94b3cb9c609f872a7dafc78f142888d7f0ceafba34615ed0fc021d8859f88f85828c3e69b31a5fb53ccd181a7aafb56d8428df3dee4925360df5f41be89
+MISC ChangeLog-2015 844 SHA256 cc2174f66652091bf04625e502e74a98f6d04d6c770edb18b4c0ce3d5cdd4e42 SHA512 8b1f6c3d9ca9f9e275d3a3fdf14530296bebf03ad9565a696f16a91eb0d94dd8b537e176b489ea883e7ada42e4697e5c45c4e979cc09f7dba35d909a2a4b4cc1 WHIRLPOOL 818a019ba86ac375540b91ff0dcdc007155fc3ca4de1ff28d5850ebde4ed5228af8e7319b5fd53560258238203697098e5e54a62e4b387c666c5114fabd604fa
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/vb2rip/metadata.xml b/media-sound/vb2rip/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/vb2rip/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/vb2rip/vb2rip-1.4.ebuild b/media-sound/vb2rip/vb2rip-1.4.ebuild
new file mode 100644
index 000000000000..00678f566df4
--- /dev/null
+++ b/media-sound/vb2rip/vb2rip-1.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit versionator toolchain-funcs
+
+MY_PV=$(replace_version_separator '')
+
+DESCRIPTION="Konami VB2 sound format ripping utility"
+HOMEPAGE="http://www.neillcorlett.com/vb2rip"
+SRC_URI="http://www.neillcorlett.com/vb2rip/${PN}${MY_PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/src
+
+src_compile() {
+	tc-export CC
+	echo "vb2rip: main.o decode.o wav.o lsb.o rip.o fmt.o fmt_raw.o fmt_vb2.o fmt_8.o fmt_msa.o fmt_xa2.o" > Makefile
+	echo '	$(CC) $(LDFLAGS) $^ -o $@' >> Makefile
+	emake || die
+}
+
+src_install() {
+	dobin vb2rip || die
+	dodoc "${WORKDIR}/games.txt" "${WORKDIR}/vb2rip.txt"
+}
diff --git a/media-sound/vbrfixc/Manifest b/media-sound/vbrfixc/Manifest
new file mode 100644
index 000000000000..c47980d36270
--- /dev/null
+++ b/media-sound/vbrfixc/Manifest
@@ -0,0 +1,6 @@
+AUX vbrfixc-0.24-gcc43.patch 489 SHA256 7907b35008574fba7d7a794df796fecd934b728932e8454834a172b4b2dfc5c9 SHA512 c79a4cb19016a055d2bc460f312798ae2e4626b0151f0f026a1ba0697cc5d3079c79f4e7d131c893f810c5f27ce835625e4533e172b96f0e811aecc7f02dbd9f WHIRLPOOL cb9a78958b7893d6af3f1d36c7e4487db5bff933baf523ced434ce4eafcc5e99351e761251771f388bdba601697c7c7410877640af3f9e6d82d4ef546983d714
+DIST vbrfixc-0.24.tar.gz 656877 SHA256 02d6363949407ac0e4b39ed76c60e49de0c286dbdce4f15363f771320430b364 SHA512 afc6db7ba53999de9b601c0cf65583ae0d0c3ca5177ea0da04d53fdb41d3dd75492b75ec5d7ddf37ec9447888c2afde03d07fb5d090a495f8a51507a2aede745 WHIRLPOOL 07ee81d39bafa85daed11858526d766977d7ca7deba8659fbdb51fc8246d95a1f09497bcfcd492f651900281f224dcf65ce474f2bdf7c791e90f62a00bec9218
+EBUILD vbrfixc-0.24.ebuild 648 SHA256 da9cf32aa77681a392945928c0c67677ccc9807942c714bc90129a61331c15c9 SHA512 213c4c9f491f1ae2f8add4422b77a6c2642b22ee956f1f968c7c6e37c652b504e352246b287bae8a0d9b6a70c9db6bbb12e4268325e4f4c0798d5ffe301f446c WHIRLPOOL bbe6f0c1ea67c5e57ce33892c6ebf6d3040b9d37d43f41306dbdd349ba71e20e9a3f692ed01bad91a4f2ee933fbb20c733d31221b89ad491f833cefc6777ee61
+MISC ChangeLog 2556 SHA256 eef8f2591ccd95663b74ac62dab45942113765c54ab7f83755fb8e73783195ad SHA512 5502145a093cb2f7eb80a09d12b943928880e63c2fe81a963a771d9d359e17082c1052451f746e16a5d50da2e28cb3312b427a2a4cc8703cd83868ea035930d0 WHIRLPOOL 5cb49eb3293ab1470420f6b5f9721d922f532c9e345d7b4682f73ee5f4cfa722be6852b0ab965f81923f89429d9ab57cce7d0bdb59d476a6fc42e99e8c30aa1e
+MISC ChangeLog-2015 1082 SHA256 6a2a4f71ac8fcf30f66379c366963d49a4c3d10f32806510ce216fcd014ad405 SHA512 7c45ece882d9ad6e96381400d1bc52fb4d03eed5239e53be6a60b5a842fa6638224b8238d84ef973122b860197163663a73f7fa7cc72c7c911878c4de1e5f8d2 WHIRLPOOL 1154984d89a9ae2a1b56599d8501bfe9dd80dd72742552cb7d14cb463413b60611833814dea3b8f68038207949c8b965965ea845083a712b77f6ba55617ba46f
+MISC metadata.xml 438 SHA256 74aa8359e69ac83a6d37a4e557f84426d22949509fa274fe600b9bf7223ae96d SHA512 8619707e6dfbfd175d328a2d0b68deb28b3b5ac4dbee2f36d5d5295c239176f6534931d7e57949e7aea27d8a1c187132faeb2c2eb04072e59e098ca1888ae77c WHIRLPOOL c3ed6aafef3f4b75d1a859227c9083e736c6b88752bb67eb179a78d0d202bf2de8e2f4a999ab52939e0661dffde7c9c89d7b05131db78fdcba56b146ef58cedc
diff --git a/media-sound/vbrfixc/files/vbrfixc-0.24-gcc43.patch b/media-sound/vbrfixc/files/vbrfixc-0.24-gcc43.patch
new file mode 100644
index 000000000000..89e20e3aade0
--- /dev/null
+++ b/media-sound/vbrfixc/files/vbrfixc-0.24-gcc43.patch
@@ -0,0 +1,11 @@
+diff -ur vbrfixc-0.24/vbrfixc/vbrfix.cpp vbrfixc-0.24.dmd/vbrfixc/vbrfix.cpp
+--- vbrfixc-0.24/vbrfixc/vbrfix.cpp	2003-07-17 13:58:21.000000000 -0400
++++ vbrfixc-0.24.dmd/vbrfixc/vbrfix.cpp	2008-06-11 11:26:42.000000000 -0400
+@@ -16,6 +16,7 @@
+  ***************************************************************************/
+ #include "vbrfix.h"
+ //#include "stdafx.h"//include in mfc version
++#include <cstring>
+ int getXHpos(int ver,int chan);
+ VbrFix::VbrFix(){
+   frameptrs=NULL;flags=0;
diff --git a/media-sound/vbrfixc/metadata.xml b/media-sound/vbrfixc/metadata.xml
new file mode 100644
index 000000000000..5e46f4547c73
--- /dev/null
+++ b/media-sound/vbrfixc/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		Reconstructs MP3 files removing unwanted data, recreates VBR Tag with
+		seek information if it is VBR, can remove ID3v1/ID3v2/FHG/VBRI tags, can
+		keep the LAME part of the VBR tag while replacing the seek/bitrate info.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/vbrfixc/vbrfixc-0.24.ebuild b/media-sound/vbrfixc/vbrfixc-0.24.ebuild
new file mode 100644
index 000000000000..aee720fb1983
--- /dev/null
+++ b/media-sound/vbrfixc/vbrfixc-0.24.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Vbrfix fixes MP3s and re-constructs VBR headers"
+HOMEPAGE="http://home.gna.org/vbrfix/"
+SRC_URI="ftp://mirror.bytemark.co.uk/gentoo/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# bin endian ones need vbrfixc-0.24-bigendian.diff from gentoo-x86 cvs Attic
+KEYWORDS="amd64 x86"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS README TODO
+	dohtml vbrfixc/docs/en/*.html
+}
diff --git a/media-sound/vdramgw/Manifest b/media-sound/vdramgw/Manifest
new file mode 100644
index 000000000000..ccfa3f565533
--- /dev/null
+++ b/media-sound/vdramgw/Manifest
@@ -0,0 +1,7 @@
+AUX vdramgw-0.0.2-gcc43.patch 997 SHA256 39a8847a0b69e5878627e6578195c5fa26880a8430c1639cc4dc34e82de90bbc SHA512 8daf61dab69325189952d652108fac8ed5505a0a04065a0e8531f07f5e7eaf0d63afc4c91b0fdc1e4d6e7c5b114805051ea98572d896264ba6a6720968a44c10 WHIRLPOOL 6e72efb1823c1a3ce323a79014cc0232ab278d75ca245359199b508075ee817f8886a24edd165a4714c2193131a0d828807d5560ad25ac3381abfbe03fc8a878
+AUX vdramgw-0.0.2_gcc-4.7.diff 2297 SHA256 fb63e72bc449ba4e54a6289a7f9c81faff7388390b9bdc5b5dddc675a112f4b4 SHA512 4891c2bcb18e49f26765c15daf1abacc69afc6a347c95dd1e047184cdeafef8c886c142132864f74c743a82598ea6e91d544ab7a9fe9a65c66c27092e570e67d WHIRLPOOL fad9838e33bb241c75df945e40dba56ca9fe070e2399e08c41b0eb0db2f1d20203dbaf4e6b4447961f38872e3aba24c84ca5c14753b657123582567a445f813c
+DIST vdr-amarok-0.0.2.tar.bz2 51816 SHA256 b96b6845eba17d500eeccc85f97cc0480e057801657133302ed7271167372a91 SHA512 217eadf28174c0bafc610068a784bdce0a8657c9a11690f0ac52da265271e601f3e48c8654930c693e6ca869307e68046093f7a88a024574e3cc2804a2f60ca3 WHIRLPOOL 7bf3b96771a3dbcd9a0b4cf1d55d1d38dfcb5b5f6ad8cda5ec729787827f817879100eaca5cff3ad200bfba0a7f64e5e35db47e8b9bc82a8bfa37df5f7725cfc
+EBUILD vdramgw-0.0.2.ebuild 901 SHA256 d7c8c68e1484f65db1c543f119ddfbe89b36880132b42d76122cce444c0ceec5 SHA512 22ddd42819cfb902f29387a8e4ccad14e22f75bbb480747256577cc16a44bae0e52428f288d40a6291156ebf9e13a72bf00a2a36ddfe87ace9240bed68084660 WHIRLPOOL a6ee1a25b43b89ecf2d64b55f86ef420dccb4a510e35d621cbce657272076125e900026d495d0976eb1983517a9c97ef6c3766b61ff6955b736d0da6effc02e1
+MISC ChangeLog 2894 SHA256 7f8baf529cc17a134cf31ff4c026095ffeefa2b232e3f4b5546435952b41d4d8 SHA512 1ab6ca07f4abf8810430a8ef5031d882067d3295566dcbe2134d6a318aa1b7bbb8e210c91fa6a2948ae7fba70aa467f3edc03829fc45679c3b9548591425d853 WHIRLPOOL 03cc856adef4ace50778168bc461c9381b79934f432ef522cff172beda3b2507a106e89a3848161406401ed82d79fa148a59050e188c746c7fcb32c5df28565e
+MISC ChangeLog-2015 1066 SHA256 731a4cc492cead5ab014be77de594c1ae8fb916418bb23cb780c3c79b95f99a0 SHA512 cf322bef3e2d10f7702f9eac5dfea384fca05eae35651112df49fc1096d39acd12a6e3896f3dfd6ac3a9b8e480ed1f48009c3c01ee0aabd56daf5323dcd7baa3 WHIRLPOOL 79d60f8888503eb6cefc58bb21794b9ab84280d81c0a053fa681f1fa294bcb1ff9f38e37067c9173aa38915d07c12d39407b9c7c38998d2140b2bc48d8810bb1
+MISC metadata.xml 249 SHA256 d3b08f4769529a48cdedb9decab34312707ed6d65d2577d079e3f4cd953d545a SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3 WHIRLPOOL 594ba2bdfe29531c638cc624a9e7690bf0c6dfb38b76fa26f1a1fc341a8c1c48a8777a40a63473289746d318f1e363c26a627784cef2241c10e75f023f43dc1a
diff --git a/media-sound/vdramgw/files/vdramgw-0.0.2-gcc43.patch b/media-sound/vdramgw/files/vdramgw-0.0.2-gcc43.patch
new file mode 100644
index 000000000000..8c3ac7452aae
--- /dev/null
+++ b/media-sound/vdramgw/files/vdramgw-0.0.2-gcc43.patch
@@ -0,0 +1,34 @@
+diff -ur amarok-0.0.2.orig/Sockets.cpp amarok-0.0.2/Sockets.cpp
+--- amarok-0.0.2.orig/Sockets.cpp	2006-05-15 14:03:23.000000000 +0300
++++ amarok-0.0.2/Sockets.cpp	2009-07-30 14:02:49.000000000 +0300
+@@ -15,6 +15,7 @@
+ 
+ #include "Sockets.h"
+ 
++#include <cstring>
+ #include <sstream>
+ 
+ #ifndef WIN32
+diff -ur amarok-0.0.2.orig/vdramgw/Sockets.cpp amarok-0.0.2/vdramgw/Sockets.cpp
+--- amarok-0.0.2.orig/vdramgw/Sockets.cpp	2006-05-15 12:52:44.000000000 +0300
++++ amarok-0.0.2/vdramgw/Sockets.cpp	2009-07-30 14:02:57.000000000 +0300
+@@ -15,6 +15,7 @@
+ 
+ #include "Sockets.h"
+ 
++#include <cstring>
+ #include <sstream>
+ 
+ #ifndef WIN32
+diff -ur amarok-0.0.2.orig/vdramgw/vdramgw.cpp amarok-0.0.2/vdramgw/vdramgw.cpp
+--- amarok-0.0.2.orig/vdramgw/vdramgw.cpp	2006-12-14 01:25:52.000000000 +0200
++++ amarok-0.0.2/vdramgw/vdramgw.cpp	2009-07-30 14:02:40.000000000 +0300
+@@ -23,7 +23,7 @@
+ #include <config.h>
+ #endif
+ 
+-
++#include <cstring>
+ #include <unistd.h>
+ #include <getopt.h>
+ #include <iostream>
diff --git a/media-sound/vdramgw/files/vdramgw-0.0.2_gcc-4.7.diff b/media-sound/vdramgw/files/vdramgw-0.0.2_gcc-4.7.diff
new file mode 100644
index 000000000000..c5182cfd33d6
--- /dev/null
+++ b/media-sound/vdramgw/files/vdramgw-0.0.2_gcc-4.7.diff
@@ -0,0 +1,92 @@
+gcc-4.7 compile fix
+https://bugs.gentoo.org/show_bug.cgi?id=424101
+
+signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2012/30/06)
+diff -Naur amarok-0.0.2.orig/Sockets.h amarok-0.0.2/Sockets.h
+--- amarok-0.0.2.orig/Sockets.h	2012-06-30 17:40:27.000000000 +0200
++++ amarok-0.0.2/Sockets.h	2012-06-30 17:43:21.000000000 +0200
+@@ -182,8 +182,8 @@
+ 	{
+ 		if (this->gptr() == NULL)
+ 		{
+-			setg(s, s + n, s + n);
+-			setp(s, s + n);
++			this->setg(s, s + n, s + n);
++			this->setp(s, s + n);
+ 			inbuf_ = s;
+ 			outbuf_ = s;
+ 			bufsize_ = n;
+@@ -215,9 +215,9 @@
+ 		{
+ 			_flush();
+ 		}
+-		setp(outbuf_, outbuf_ + bufsize_);
++		this->setp(outbuf_, outbuf_ + bufsize_);
+ 		if (c != traits::eof())
+-			sputc(traits::to_char_type(c));
++			this->sputc(traits::to_char_type(c));
+ 		return 0;
+ 	}
+ 
+@@ -225,7 +225,7 @@
+ 	{
+ 		// just flush the put area
+ 		_flush();
+-		setp(outbuf_, outbuf_ + bufsize_);
++		this->setp(outbuf_, outbuf_ + bufsize_);
+ 		return 0;
+ 	}
+ 
+@@ -256,7 +256,7 @@
+ 			return traits::eof();
+ 
+ 		size_t totalbytes = readn + remained_;
+-		setg(inbuf_, inbuf_,
++		this->setg(inbuf_, inbuf_,
+ 			inbuf_ + totalbytes / sizeof(char_type));
+ 
+ 		remained_ = totalbytes % sizeof(char_type);
+diff -Naur amarok-0.0.2.orig/vdramgw/Sockets.h amarok-0.0.2/vdramgw/Sockets.h
+--- amarok-0.0.2.orig/vdramgw/Sockets.h	2012-06-30 17:40:27.000000000 +0200
++++ amarok-0.0.2/vdramgw/Sockets.h	2012-06-30 17:41:52.000000000 +0200
+@@ -182,8 +182,8 @@
+ 	{
+ 		if (this->gptr() == NULL)
+ 		{
+-			setg(s, s + n, s + n);
+-			setp(s, s + n);
++			this->setg(s, s + n, s + n);
++			this->setp(s, s + n);
+ 			inbuf_ = s;
+ 			outbuf_ = s;
+ 			bufsize_ = n;
+@@ -215,9 +215,9 @@
+ 		{
+ 			_flush();
+ 		}
+-		setp(outbuf_, outbuf_ + bufsize_);
++		this->setp(outbuf_, outbuf_ + bufsize_);
+ 		if (c != traits::eof())
+-			sputc(traits::to_char_type(c));
++			this->sputc(traits::to_char_type(c));
+ 		return 0;
+ 	}
+ 
+@@ -225,7 +225,7 @@
+ 	{
+ 		// just flush the put area
+ 		_flush();
+-		setp(outbuf_, outbuf_ + bufsize_);
++		this->setp(outbuf_, outbuf_ + bufsize_);
+ 		return 0;
+ 	}
+ 
+@@ -256,7 +256,7 @@
+ 			return traits::eof();
+ 
+ 		size_t totalbytes = readn + remained_;
+-		setg(inbuf_, inbuf_,
++		this->setg(inbuf_, inbuf_,
+ 			inbuf_ + totalbytes / sizeof(char_type));
+ 
+ 		remained_ = totalbytes % sizeof(char_type);
diff --git a/media-sound/vdramgw/metadata.xml b/media-sound/vdramgw/metadata.xml
new file mode 100644
index 000000000000..984a01fab265
--- /dev/null
+++ b/media-sound/vdramgw/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/vdramgw/vdramgw-0.0.2.ebuild b/media-sound/vdramgw/vdramgw-0.0.2.ebuild
new file mode 100644
index 000000000000..8dbabdf71fa1
--- /dev/null
+++ b/media-sound/vdramgw/vdramgw-0.0.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+MY_P=vdr-amarok-${PV}
+
+DESCRIPTION="vdr to amarok gateway - allows vdr-amarok to access amarok"
+HOMEPAGE="http://irimi.ir.ohost.de/"
+SRC_URI="http://irimi.ir.ohost.de/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+RDEPEND="media-sound/amarok"
+
+S="${WORKDIR}/${MY_P#vdr-}/${PN}"
+
+src_prepare() {
+	# Respect CC,CXXFLAGS, LDFLAGS
+	sed -i -e "/^CXX /s:?=.*:= $(tc-getCXX):" \
+		-e "/^CXXFLAGS/s:?=.*:= ${CFLAGS}:" \
+		-e "s:\$(CXXFLAGS):& \$(LDFLAGS) :" "${S}"/Makefile
+
+	cd "${WORKDIR}/${MY_P#vdr-}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}/${P}_gcc-4.7.diff"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+	newdoc ../README README.vdr-amarok
+
+	insinto /etc
+	doins ${PN}.conf
+}
diff --git a/media-sound/ventrilo-server-bin/Manifest b/media-sound/ventrilo-server-bin/Manifest
new file mode 100644
index 000000000000..8643ab7e7b78
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/Manifest
@@ -0,0 +1,11 @@
+AUX 3.0.3-conf.d.ventrilo 84 SHA256 1528e26ff109192480a3e75f1f7b45291de77d543874bf881493ced7c808e867 SHA512 cd4a8bcf8c18d5cc0871e0ed53749fe84bc65be57e51bd4faa79430dd0baa9d394cdf205fcd4259bd92580edf7fb8eb94545a307f7bd11514b7ad4bce33efb9a WHIRLPOOL dc6f57f9180eac8f9cc6470abf2088fbbbb0108db1f5e0c6ed90d74ea6de815748ad5834db41db9b16b5dec7b66caabce5451a04ac8732ea22c2c04123f97ca4
+AUX 3.0.3-init.d.ventrilo 654 SHA256 7a8ca2136d1fbe09f0d6ab9a0454a27180422f287013f709246af723aabc883e SHA512 55c4245de9045b012ff85fe3b025318522c7eb01f96671d5b8c48ad2ea4ba5778d25320ea7b9bec86d64cbfa8d13aaae88b0080d5547c43792ce5427b5ac6917 WHIRLPOOL 8ce05c2cedf30d5c10801285d5685e2bb688fcb297332fb20fc12fbe4d44fd0e2fdcf53d667d9bcbd40cdbed7f36c2ef96413826ce18e8a4fbdfe9b33f8645fe
+AUX conf.d.ventrilo 82 SHA256 4339d08a6ccde4b63581ec2fa827aeaf13be3dc5bf9b3485116b113ef88e72a4 SHA512 ada8c5fa3bb6a80cb31f8ce220527e91e9e70e39e12ef3db28ab42a0b2327e89684cb825b4e6d6ddaaf439c0797f3509eb6f5fc587226a967e9f2fcfc54eba45 WHIRLPOOL b4dfd428ba46ed1634be61a24652899694c72bd45a93210ffe3717685961a8614adb89e59794d1f9a6ac632fcac43b7a1c3f2213cfc084ca435acb9c8c1db9b3
+AUX init.d.ventrilo 601 SHA256 e13e45222e1ebace727292a6da05f2dcaaffc29bcdd48e2fbdf132b401e22fc1 SHA512 5d3821e9dfc25709cbf54bd73ce2a4f44bbe2e73590f8b9349840a5bf235e375efa80966e25c92a8f79d38652cdf4d9a074e43c248a1e8ce02f50735bfbc09a1 WHIRLPOOL 06ea45ad57768f6787d39830031b2521df67c522f714f588187ff88fd8a41e4576cfa5ba7d70a4a185b3b288558034f5766f64367d27bee396d694f548d46747
+DIST ventrilo_srv-2.3.1-Linux-i386.tar.gz 166862 SHA256 5fd929056be6e44e61617080b157680cd3cd3432721a237076c01651ec2bb32f SHA512 01e8bce092f8b1ef0f08e736040871e221f4e039d21671d451abfcaf077be104e1f3488b90661e4895118d971f5e56040a01290734a02a4d5e67d183dc91cd5d WHIRLPOOL bcb226d07e8b52e82260b35c0d08dbe2ed06468519e596bdd1a0854b14050aba124a661181c7e697e75060eb1504b8806bbd77dbe1ea83dc378fcc69fc0abb6d
+DIST ventrilo_srv-3.0.3-Linux-i386.tar.gz 211494 SHA256 702a0cf88234e229b68e7a1f2624e23879541cb4e2c2b2f5f88591a85b364e56 SHA512 ac4b38d7ee5cb66b88507e5cfb810d28b98252dfbabdb8d3777ae4b4dfd7a793ae8e0ee0a4d3a03cf7d0d1b1b34162e5f026c7217d296201e48607e44f04e79f WHIRLPOOL 0fdfee56ac1457dc892033bd8de4b7d12628ecb62b1f0e06c083a87ae45b339356429879dfb5d080b1427572027722643db9aec2cfacc48fc48d710f3586a86e
+EBUILD ventrilo-server-bin-2.3.1.ebuild 894 SHA256 db5e7bdd0f04c26eb86f631e17b8818fd7f2ab42acdbba8c3b010128eef6e7e2 SHA512 5b58199a0ee8d844905593671cb228e0bc917a604329bcf0daed1d312c59225b564c05de144738d8c8ca1e341400fd0bdc5dc6448bccc2aed74a94efd39d8dd0 WHIRLPOOL fac187431161e3d4348bac647b042d24c91bb4f497530283b106d6d8b6d8dba7c93a41b7bb3b71a8afae46d25816198e0e065b6c555d1afeb83f748c6424d02e
+EBUILD ventrilo-server-bin-3.0.3.ebuild 1081 SHA256 f026ab16a763f2125534069a5c1b224dc9cabe62df6ceba7292db604c3d9ea7b SHA512 687a6e67981d7125d4d36e9f383290a0c60bf1a8b535de8aad85d9eef8e3fea69deb73d73851ceb32fc388a92474d9f80e7b5f418dd6da335c2a4bac773a6b19 WHIRLPOOL 8c21ea1c3a10e977520eba6f48042629f6ca35cdde2234a5cc6f19ba68f23f962e92dbb6e96f8a4eac096b879ec1c1ae0a80c725dac5ba9fda4a33b01ff3df69
+MISC ChangeLog 2817 SHA256 9c56eb63879f3f32a02569ecd8e2386924b68b447bf3e3dcef00bfc09fb717f6 SHA512 1fe60d92c7b8520ecc5fd36599f2ff9d4aa5f570d94b2f3ba37ac71ea12da42c364c81b6a214eb8f17e26fd0e848be3b18fba1455ae9f00f77d880e08a69e66e WHIRLPOOL 77f2b1b176b86c5210e1a25eb85a9495e7d242b34017f30de985b19bbea3f32de547a7dfc6b8adc1118b80e40eed166ad6f6cea381250e88e8bc02c4ac776c28
+MISC ChangeLog-2015 3076 SHA256 da60c27659421bd3782130784413752077842f7ca1455aa227cc44e886256fe9 SHA512 8b9d1272d9ba21d18115b8dbd030cdde8949c106f1e8ee31c94ddf5cd3859b6ea2ab47990ba6ff12ec908d83926146c3319812759d70cb13800494521e8d83e3 WHIRLPOOL 86beeeb30b0831e17b64ac487294e80863732856db8a1526561e3bb063ca7afb48b5421facf0a7a74cc1cfaa735788673a49656612746ea607b196caeec5866f
+MISC metadata.xml 372 SHA256 cfeb2ab93aa79762879559e1c9c84681c9c4399cd96650861e3f65c1a0beea14 SHA512 53e71d78ef4609a60a0f11d5579197455abf9fe5a050d387e92a0e1c2af50721cfd5b4756dfe61064b59d69c097650a94af5232fc9027fd62f9ca1a0e3977277 WHIRLPOOL 4b017149ba4f6cc9bc8aa95f7fe311c1e70ab58a42cef7590a5b692b9d63c33ea7d7ba2d8db73b5fdf451706e5fc41ad41815cb215614f00baa7bd60a00b17f8
diff --git a/media-sound/ventrilo-server-bin/files/3.0.3-conf.d.ventrilo b/media-sound/ventrilo-server-bin/files/3.0.3-conf.d.ventrilo
new file mode 100644
index 000000000000..673f2bf5a258
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/files/3.0.3-conf.d.ventrilo
@@ -0,0 +1,2 @@
+# Set the default nice priority level.  See NICE(1) for more information.
+NICE="-5"
diff --git a/media-sound/ventrilo-server-bin/files/3.0.3-init.d.ventrilo b/media-sound/ventrilo-server-bin/files/3.0.3-init.d.ventrilo
new file mode 100644
index 000000000000..328374467c8e
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/files/3.0.3-init.d.ventrilo
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+
+depend() {
+        # the daemon needs the internet to function
+	# Not sure if net is needed to start but it is required for it to work properly.
+        need net   
+}
+
+start() {
+        # display to the user what you're doing
+        ebegin "Starting Ventrilo VoIP Server"
+	start-stop-daemon --start --chuid ventrilo --nicelevel "${NICE}" \
+		--exec /opt/ventrilo-server/ventrilo_srv -- -f/opt/ventrilo-server/ventrilo_srv -d
+	eend $?
+}
+
+stop() {
+        # display a message to the user
+        ebegin "Stopping Ventrilo VoIP Server"
+        start-stop-daemon --stop --pidfile /opt/ventrilo-server/ventrilo_srv.pid
+        eend $?
+}
+
diff --git a/media-sound/ventrilo-server-bin/files/conf.d.ventrilo b/media-sound/ventrilo-server-bin/files/conf.d.ventrilo
new file mode 100644
index 000000000000..88632d732fe0
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/files/conf.d.ventrilo
@@ -0,0 +1,2 @@
+# Set the default nice priority level.  See NICE(1) for more information.
+NICE=-5
diff --git a/media-sound/ventrilo-server-bin/files/init.d.ventrilo b/media-sound/ventrilo-server-bin/files/init.d.ventrilo
new file mode 100644
index 000000000000..e265109ada0a
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/files/init.d.ventrilo
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+
+depend() {
+        # the daemon needs the internet to function
+	# Not sure if net is needed to start but it is required for it to work properly.
+        need net   
+}
+
+start() {
+        # display to the user what you're doing
+        ebegin "Starting Ventrilo VoIP Server"  
+        nice -n ${NICE} /opt/ventrilo-server/ventrilo_srv -f/opt/ventrilo-server/ventrilo_srv -d 
+	eend $?
+}
+
+stop() {
+        # display a message to the user
+        ebegin "Stopping Ventrilo VoIP Server"
+        start-stop-daemon --stop --pidfile /opt/ventrilo-server/ventrilo_srv.pid
+        eend $?
+}
+
diff --git a/media-sound/ventrilo-server-bin/metadata.xml b/media-sound/ventrilo-server-bin/metadata.xml
new file mode 100644
index 000000000000..7f14d8fcefb8
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gurligebis@gentoo.org</email>
+		<name>Bjarke Istrup Pedersen</name>
+	</maintainer>
+<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.3.1.ebuild b/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.3.1.ebuild
new file mode 100644
index 000000000000..73d2c83184b5
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+IUSE=""
+DESCRIPTION="The Ventrilo Voice Communication Server"
+HOMEPAGE="http://www.ventrilo.com/"
+SRC_URI="ventrilo_srv-${PV}-Linux-i386.tar.gz"
+
+LICENSE="ventrilo"
+SLOT="0"
+KEYWORDS="-* x86 amd64"
+RESTRICT="fetch"
+
+S=${WORKDIR}
+
+RDEPEND="sys-libs/glibc"
+DEPEND=""
+
+QA_PRESTRIPPED="opt/ventrilo-server/ventrilo_srv
+	opt/ventrilo-server/ventrilo_status"
+
+pkg_nofetch() {
+	einfo "Please visit http://www.ventrilo.com/download.php"
+	einfo "and download the Linux i386 - 32bit ${PV} server."
+	einfo "Just save it in ${DISTDIR} !"
+}
+
+src_install() {
+	exeinto /opt/ventrilo-server
+	doexe ventrilo_{srv,status}
+
+	newinitd "${FILESDIR}"/init.d.ventrilo ventrilo
+	newconfd "${FILESDIR}"/conf.d.ventrilo ventrilo
+
+	insinto /opt/ventrilo-server
+	doins ventrilo_srv.ini
+
+	dohtml ventrilo_srv.htm
+}
diff --git a/media-sound/ventrilo-server-bin/ventrilo-server-bin-3.0.3.ebuild b/media-sound/ventrilo-server-bin/ventrilo-server-bin-3.0.3.ebuild
new file mode 100644
index 000000000000..1ff31e136448
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/ventrilo-server-bin-3.0.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils user
+
+IUSE=""
+DESCRIPTION="The Ventrilo Voice Communication Server"
+HOMEPAGE="http://www.ventrilo.com/"
+SRC_URI="ventrilo_srv-${PV}-Linux-i386.tar.gz"
+
+LICENSE="ventrilo"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+RESTRICT="fetch"
+
+S=${WORKDIR}
+
+RDEPEND="sys-libs/glibc"
+DEPEND=""
+
+QA_PRESTRIPPED="opt/ventrilo-server/ventrilo_srv
+	opt/ventrilo-server/ventrilo_status"
+
+pkg_setup() {
+	enewgroup ventrilo 3784
+	enewuser ventrilo 3784 -1 /dev/null ventrilo
+}
+
+pkg_nofetch() {
+	elog "Please visit http://www.ventrilo.com/download.php"
+	elog "and download the Linux i386 - 32bit ${PV} server."
+	elog "Just save it in ${DISTDIR} !"
+}
+
+src_install() {
+	cd "${S}/ventsrv"
+
+	exeinto /opt/ventrilo-server
+	doexe ventrilo_{srv,status}
+
+	newinitd "${FILESDIR}"/${PV}-init.d.ventrilo ventrilo
+	newconfd "${FILESDIR}"/${PV}-conf.d.ventrilo ventrilo
+
+	insinto /opt/ventrilo-server
+	doins ventrilo_srv.ini
+
+	dohtml ventrilo_srv.htm
+
+	fowners ventrilo:ventrilo /opt/ventrilo-server
+}
diff --git a/media-sound/vimpc/Manifest b/media-sound/vimpc/Manifest
new file mode 100644
index 000000000000..256eb5b27f1a
--- /dev/null
+++ b/media-sound/vimpc/Manifest
@@ -0,0 +1,6 @@
+AUX vimpc-0.09.1-tinfo.patch 186 SHA256 927fe3c5e4be7d3d177b8a58ded2965bacc2ec3434b3e7a4ebd2cfa303250fab SHA512 05581e2cec907ec8b194d7d097498ebdc6d84774e74ebc5dc521d99b55e880f1b130ab919ac7fc6257537e37599f0797fe2fedded35f94517ddf4e58e8ce9556 WHIRLPOOL d2d0b3a90af2bae840f978da0c5bbd358da2cdfaef81be48f70d40fce9b363ca5b55722ed091dab390adf48e84b67e3031ba7654f805e3473cceacadd40ca1e4
+DIST vimpc-0.09.1.tar.gz 583073 SHA256 082fa9974e01bf563335ebf950b2f9bc129c0d05c0c15499f7827e8418306031 SHA512 cf40ae43ac21af80e1b5897f1fa83b4d730fb7dfa4c21b80c296a8e6f2c40e643325fd2aa96bd4dda1abca0ccd2d12545cf91ffcdb8017e5b9cd88917ca96222 WHIRLPOOL 5c1a4213275ae0df06a8e18274df12079f53f8042ee465d19ec776a4d181121f884dfd914dff27cb65ec88751a224bb8a5e4440fa34163b47bd5a3e1f9e93c25
+EBUILD vimpc-0.09.1.ebuild 908 SHA256 235e711b98fe8cc25703a838332a35523d7a8c1d496c00767721b9a7e19f4fc3 SHA512 fc13626f2ea70f2f2c7bc82d239e4646bd2b076569bc5481e41e3187100454cde82815bd97e9ae2d3ba3baa09d211214125394d78a3ea676abba720b1df556ea WHIRLPOOL 9e2e40df33207631dae836b53775f0385c2636db8c598c0c731a0cef757b789be4f4288ed862b61617006b042848d6033116b5b37b50c060648073753f92dbd6
+MISC ChangeLog 2765 SHA256 47b9317d98a3551a564996eac928a9c521c6066153dc49d03a9c10fd0e5a461b SHA512 433b8bc1341d52d0cc3cef4357e3ccbcb9bcd66c35e3f20fbf491dc5753f45a9d275fe20c74c8a205f2343586b9d0c9b2cdcebecac07a8650e756c4ee288589b WHIRLPOOL d053983c9b61deca05d018bde1899887e9191670709f5d737d81cab2b893b06432bd132472f5434f1f1e36469497cb87c92fb8c8567179880d7d2be9389bcf21
+MISC ChangeLog-2015 3106 SHA256 5cb7fadf0b2f0bd9348d1b8f560281641138b173783c5a7ec384df441898ec4e SHA512 68607165ffdb92b6038b47436ff322317ef494baafcc798ab51b664fe2daf14bd01424e62b8eab301266b02dcc6682e09710970074460a525f68ef76d00de4ab WHIRLPOOL f7163c54321b89b42b3be50c4a7ca3b32cc7eb3f133026df9472f298a4a0be98c487462880782fe35a81ae59a391c4015a70aece654613f0ad5860681924b5a3
+MISC metadata.xml 408 SHA256 dd3e19d999dbea5844f7a0f6c906588b8cffceb878ab1845f30f0092bf5245db SHA512 b728c8239a4c105fb9077d96def0fbf08ac34a565cfcad92621577c917b21c1656c65a690f35d209c0f249e63a7a56885990173791631e1e1109357214de8969 WHIRLPOOL e19452d61923ef290bad3f83f030c3bd9556cb963fb05fffe6d87db3e3a7145f6cc027e8c088e06f39438a94067a82c961f1ceaba7643c30981024799442aab4
diff --git a/media-sound/vimpc/files/vimpc-0.09.1-tinfo.patch b/media-sound/vimpc/files/vimpc-0.09.1-tinfo.patch
new file mode 100644
index 000000000000..55729b1a7f4a
--- /dev/null
+++ b/media-sound/vimpc/files/vimpc-0.09.1-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -97,6 +97,8 @@
+ 
+ LIBS="$LIBS $CURSES_LIB"
+ 
++AC_SEARCH_LIBS([keypad],[tinfow tinfo])
++
+ PKG_CHECK_MODULES(pcre, libpcre)
+ 
+ AC_SUBST(pcre_LIBS)
diff --git a/media-sound/vimpc/metadata.xml b/media-sound/vimpc/metadata.xml
new file mode 100644
index 000000000000..936e40a0e753
--- /dev/null
+++ b/media-sound/vimpc/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="boost">Use boost instead of C++11 libraries</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">vimpc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/vimpc/vimpc-0.09.1.ebuild b/media-sound/vimpc/vimpc-0.09.1.ebuild
new file mode 100644
index 000000000000..832b0849f58a
--- /dev/null
+++ b/media-sound/vimpc/vimpc-0.09.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="An ncurses based mpd client with vi like key bindings"
+HOMEPAGE="http://vimpc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/Release%20${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="boost taglib"
+
+RDEPEND="dev-libs/libpcre
+	media-libs/libmpdclient
+	boost? ( dev-libs/boost )
+	taglib? ( media-libs/taglib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( AUTHORS README.md doc/vimpcrc.example )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable boost) \
+		$(use_enable taglib) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	# vimpc will look for help.txt
+	docompress -x /usr/share/doc/${PF}/help.txt
+}
diff --git a/media-sound/vitunes/Manifest b/media-sound/vitunes/Manifest
new file mode 100644
index 000000000000..b72c63fbe415
--- /dev/null
+++ b/media-sound/vitunes/Manifest
@@ -0,0 +1,7 @@
+AUX vitunes-2.3-asneeded.patch 571 SHA256 db551a9aeaa08e9a63450cc5aaf675afd64c46aeed3ad9b5bb92523f5a3161ee SHA512 fb776fdd39fceca384a805c8ac0eae43c563a2799ce18adcd083534822f98fa00e5320266f9177f452ba63e8cab3bb709df50d027b31eb408eff2fde1b96af0b WHIRLPOOL 4e4cc6ec314e97f4e2a121555d87b3c9da0693769b052c2d99850cd618b40e374586fb63360099b144455fd1f2c5f7ea586f8d1cafb4be94c254d57dcc2c9bbc
+AUX vitunes-2.3-time-header.patch 222 SHA256 f87295a287a244d8f80d8ffc9b4057f6346d527cdccb6c6a0150bac21096d1c6 SHA512 555b360cb82e5700ddabe0a6bfc1b50b5662fcbec1d24eb56679b146863e41fd9caf478261c103b1669bf08697c2490cf68b2a014ee6f930c5ae4957ad95e2d7 WHIRLPOOL 77f9dcdcfbd3d4c46f1a2d8bdaca8e444d3790b55a194930b2e4870c8d41c5ac10c3b73a5a98d23f8b7c18063e2c74b028c5018cbd60d938d28e778ae561e9ce
+DIST vitunes-2.3.tar.gz 77978 SHA256 52f96e3db94f845cd280c5fd2b35bd53ec97cf0cdb7e4b44d936a77d467eba36 SHA512 5e795d802937e2f529421b3c0c3df333298608b419fcf955f4ec32ff47b915f1b82082f283ded1879869d7ae9875e2699e70fde6ee5d953d13c2e39cc12b7a53 WHIRLPOOL 4e7c430d1ce74f3dbe0850526d083730fa3530a53ab73301e1bda004e249b6235b98a36d86e42b6cb89d66bc18df53707dac6136bcd71b34709521215ddd548b
+EBUILD vitunes-2.3.ebuild 702 SHA256 0b81e207d8b4dd4b0a82423f6b131279d7cf472fccaef0a4d7ba5b5d1225c638 SHA512 0debd8a719b66ddae7bd4f658a1bad6a83e134b0d8ea5ec8d8b235a4bfbcfee66ac079007be82552fe4912da8322d809a2719189a55c0e63e5c70a14bfe82034 WHIRLPOOL f5ef06a6008d2ecbe35de9384948ee7889d8e1341d1293ac17d5e98747240c50a5dbb591e5f7e01d9a35a2c062505a424d6ce47d8b7634fe6726363e60fdef22
+MISC ChangeLog 2501 SHA256 719852b35ca94bb2b89521a8da030b3db38bb23eb8992dc720b02d79feaf538f SHA512 1a317c038179a91f66bdb96a3457a7f0b35429768de5de0760bf25dda2f6a8c535516fbc362c8d78f268ceffa37e064342dde4c08b9a6cb5cd91020951d21129 WHIRLPOOL ab226052c3b53f5cb1e524b7df181eecbd571d8e9cb4f3a6488609c1304c8eb72ca0c2d37ae5946349f9f38f6c0d59353692ae0b53258fc787febdbf65a4ab2d
+MISC ChangeLog-2015 518 SHA256 947d9e78fb569eed351d16ea0d62b042e62a4104f0842346b4d529c433791e5e SHA512 0254ecd06b846fcb4e291b8d264633ee5ac959ca82df7a34ef07931e6fea711d77346ab2dc4399b170e841ea71f26cbc0e9c4ae7be5364a5b013b8cf0d0ad9ba WHIRLPOOL 4a3cc63a3b4054b5ab12068096bcebddc12e024906f3a379e7f65c86380e477da7925687d7d0c86e10dfdb69c24f56b4a44c38c293c199307af0fb720fb3b711
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/vitunes/files/vitunes-2.3-asneeded.patch b/media-sound/vitunes/files/vitunes-2.3-asneeded.patch
new file mode 100644
index 000000000000..ec152f395377
--- /dev/null
+++ b/media-sound/vitunes/files/vitunes-2.3-asneeded.patch
@@ -0,0 +1,20 @@
+--- vitunes-2.3/Makefile.linux.orig
++++ vitunes-2.3/Makefile.linux
+@@ -12,7 +12,7 @@
+ # build info
+ CC?=/usr/bin/cc
+ CFLAGS+=-c -std=gnu99 -D_GNU_SOURCE -Wall -Wextra -Wno-unused-value $(CDEPS) $(CDEBUG)
+-LDFLAGS+=-lm -lncurses -lutil $(LDEPS)
++LIBS=-lm -lncurses -lutil $(LDEPS)
+ 
+ OBJS=commands.o compat.o e_commands.o \
+ 	  keybindings.o medialib.o meta_info.o \
+@@ -27,7 +27,7 @@
+ .PHONY: debug clean install uninstall publish-repos man-debug
+ 
+ vitunes: $(OBJS)
+-	$(CC) -o $@ $(LDFLAGS) $(OBJS)
++	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $<
diff --git a/media-sound/vitunes/files/vitunes-2.3-time-header.patch b/media-sound/vitunes/files/vitunes-2.3-time-header.patch
new file mode 100644
index 000000000000..169ff0516584
--- /dev/null
+++ b/media-sound/vitunes/files/vitunes-2.3-time-header.patch
@@ -0,0 +1,10 @@
+--- vitunes-2.3/players/mplayer.h.orig
++++ vitunes-2.3/players/mplayer.h
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ #include <unistd.h>
+ 
+ #include "player_utils.h"
diff --git a/media-sound/vitunes/metadata.xml b/media-sound/vitunes/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/vitunes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/vitunes/vitunes-2.3.ebuild b/media-sound/vitunes/vitunes-2.3.ebuild
new file mode 100644
index 000000000000..3d7c9a5bacc5
--- /dev/null
+++ b/media-sound/vitunes/vitunes-2.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A curses media indexer and player for vi users"
+HOMEPAGE="http://vitunes.org/"
+SRC_URI="http://vitunes.org/files/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/taglib
+	sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	|| ( media-video/mplayer media-video/mplayer2 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-time-header.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake -f Makefile.linux
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc DEVELOPERS.txt add_urls.sh
+}
diff --git a/media-sound/vkeybd/Manifest b/media-sound/vkeybd/Manifest
new file mode 100644
index 000000000000..fa2072b6f862
--- /dev/null
+++ b/media-sound/vkeybd/Manifest
@@ -0,0 +1,6 @@
+AUX vkeybd-0.1.18c-desktop_entry.patch 498 SHA256 e1a8e46f5de882a9e75589070423b737a30e5998557a65b2a858cd53b1495236 SHA512 5bb4d0a1b47e1e3390f927c1c8394da12c3058d68b43a5b46b4c3d91659aa720abd2fff2cdd1a8827c90512a116010d8d023b35214f6ec696a34857eb547b6a9 WHIRLPOOL 0212238b41a557e4f11adad158bb2ade0e644501724a479adb2b5f6af83641c203527e14b043304a2bc354fd4aa0c6bc48daf4725dfc59987d3313ba1d0055fc
+DIST vkeybd-0.1.18d.tar.bz2 38918 SHA256 aa683ed57592489e05fdd898368abe3ee245a4d5829385cfe5edb81764590704 SHA512 d26766e80b598af12e3962d043896f7737685a04dc5bd466be6902cc14a8bf5727900e0dfe66e443169a2539f22a110d1fbbc514a621a4a7cb8aa0e9d38be583 WHIRLPOOL 317d7fa02e0712c9c4924d9705ba5d6580e42b099271078bf219c5f65a48b96f1ac3b69a69a26f69166f35f87c64bb0f89098238b0ae6220e50e4f7373b25d38
+EBUILD vkeybd-0.1.18d.ebuild 1507 SHA256 c031c134bb92782de965fb79ff331fe554b8d87f587def04cefd06ae920e4365 SHA512 5e981b29b014343a43215c06a1cdc1866c452dee76106b49484e655cc7a4c4c59e3a88bd88e640f90a17be401019646d3b0f3a0d3983597221ea767e94b1ae4e WHIRLPOOL bc7fb263fd175e01f92ba6160abb37f5ad87162e6e9ff2e86660e041b3beecb12f26cb14b46ae39b26f12166b9ee7189c05dd15fa00b050fc2969d9da1ebca0d
+MISC ChangeLog 2501 SHA256 f4b8c127810a8f2471ccb2ceec34d35c5b78e31ee6b1b3536ec719e881a68e03 SHA512 6dc2af75b006d07b913df0eb863eb8f8be90445b3b29f2844a81a50f818b2fb9873d11d81da89271394f546c99ebff5b3ef55e8a5f5343816c3ef4256244e4d5 WHIRLPOOL c3411d7801e9fb6091b4746637fedc554a0b57e32c123997071110b527e380c9875d7bfc8d289d748dc77acddd0378ef9b80ba969b6a7a73eb71a0b4b274f0c4
+MISC ChangeLog-2015 5934 SHA256 0a4e40968712d70ea5fc2f36b28dc81327114657a08822848233900cbe2d0e85 SHA512 42dfcf3b07b640301532fa35c71abeab25b145a67adc5a8a09fec7e00eece24fdefd110ec47323e5532eae313d045c672c3d8fe43554297c6880e666c3e299ce WHIRLPOOL d98a684dc66af8ce8254e42141e6c67b4ca9ddde727438f167251a2cb9206359b5aac54fd3103f07bbbf24cf51b8fba5fefc2065bf8efc52e1f3e275064d48c6
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/vkeybd/files/vkeybd-0.1.18c-desktop_entry.patch b/media-sound/vkeybd/files/vkeybd-0.1.18c-desktop_entry.patch
new file mode 100644
index 000000000000..7baaa7cd7a06
--- /dev/null
+++ b/media-sound/vkeybd/files/vkeybd-0.1.18c-desktop_entry.patch
@@ -0,0 +1,15 @@
+diff -ur vkeybd.orig/vkeybd.desktop vkeybd/vkeybd.desktop
+--- vkeybd.orig/vkeybd.desktop	2008-04-17 14:00:15.000000000 +0300
++++ vkeybd/vkeybd.desktop	2009-07-16 19:22:41.000000000 +0300
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=vkeybd
+ Name[xh]=i-vkeybd
+ Name[ta]=பெயர்(vkeybd.டெஸ்க்டாப்): vkeybd
+@@ -42,4 +41,4 @@
+ Icon=vkeybd_48x48
+ Terminal=false
+ StartupWMClass=vkeybd.tcl
+-Categories=Application;AudioVideo;Audio;Music
++Categories=AudioVideo;Audio;
diff --git a/media-sound/vkeybd/metadata.xml b/media-sound/vkeybd/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/vkeybd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/vkeybd/vkeybd-0.1.18d.ebuild b/media-sound/vkeybd/vkeybd-0.1.18d.ebuild
new file mode 100644
index 000000000000..cdf69d35b90a
--- /dev/null
+++ b/media-sound/vkeybd/vkeybd-0.1.18d.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A virtual MIDI keyboard for X"
+HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html"
+SRC_URI="http://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~sparc x86"
+IUSE="alsa lash oss"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	>=dev-lang/tk-8.3
+	lash? ( media-sound/lash )
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xf86bigfontproto
+	x11-proto/bigreqsproto
+	x11-proto/xextproto
+	x11-proto/xcmiscproto"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	TCL_VERSION=`echo 'puts [info tclversion]' | tclsh`
+
+	vkeybconf="PREFIX=/usr"
+
+	if use alsa; then
+		vkeybconf+=" USE_ALSA=1"
+		use oss || vkeybconf+=" USE_AWE=0 USE_MIDI=0"
+	else
+		vkeybconf+=" USE_ALSA=0 USE_AWE=1 USE_MIDI=1"
+	fi
+
+	use lash && vkeybconf+=" USE_LASH=1"
+
+	vkeybconf+=" TCL_VERSION=${TCL_VERSION}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.1.18c-desktop_entry.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake ${vkeybconf} COPTFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	emake ${vkeybconf} DESTDIR="${D}" install-all || die
+	dodoc ChangeLog README
+}
+
+pkg_postinst() {
+	elog "The system-wide keymap is locale-sensitive now. A file"
+	elog "vkeybdmap-\$LANG is searched in prior. For example, /etc/vkeybdmap-de"
+	elog "can be used for the german locale. See the localization guide:"
+	elog
+	elog "https://wiki.gentoo.org/wiki/Localization/Guide"
+}
diff --git a/media-sound/vlevel/Manifest b/media-sound/vlevel/Manifest
new file mode 100644
index 000000000000..5341633e74a6
--- /dev/null
+++ b/media-sound/vlevel/Manifest
@@ -0,0 +1,6 @@
+AUX vlevel-0.5-makefile.patch 996 SHA256 27788b3dd9c2c10e18d9e66b085ad21a9a677b3cd0725c34e7756deaeed69a61 SHA512 fad6590578cc4727c61e423260028369f0e44feafc8634d8ac25b5de259eb82c6471d31bb6c4da6008a42bf25e10352b5b395cbbbb1afced000d15f3968feb14 WHIRLPOOL 27c75fb9f25213bbee9d84b4883d2dbf7e0c2f0becb3742ae473ba66a6874170d1344200e5d4e19c26416e4bea4b013ca510e9ee2b121f7fef926110acaef862
+DIST vlevel-0.5.tar.gz 25873 SHA256 50322c5bb8942aa3a3cf8a65e83d96b8ef3ecdaedb4dabbaa3f912601df09d10 SHA512 b84a989f7493f6f008134408fcdc235980c2ef71069125399c67a6144a6f86863d795f1c7b8c10ac21d126e2e819ba117578f3da9bcac29025cfc6580ff3e8f4 WHIRLPOOL c4abd9f2e34e0f4540b77dc53b38790f066b71732efd3ba84a5d03aff1168cc4c2e014f1393b4b450574b903ff13f8df1fcd3bcb591b670a92f86b2bdf4d9bee
+EBUILD vlevel-0.5-r1.ebuild 900 SHA256 bca419d834777ce507080562da93564bc0360bd0b36f10d9cc2dff867847379d SHA512 575a5a5871949c5d58616473ea9e27552438281ca84ffc13856e92938537f1fad60993b4ee5ea6a71f92e8d0c6bfaa1770edb34bcbc42e94a18de832e13638b9 WHIRLPOOL 21c8f6291c7bf188feaf8b700933621bcb48266edab12ee0c597800d8371f7ea7f79ac91a3cde6604efc17973cf61c3ea92a458a05cad37ec33286144354a576
+MISC ChangeLog 2463 SHA256 3b3d8ebbc210af555bda81345aa2561db85c0c000e631723ceebec9f553aef83 SHA512 ce11aec145fb830c81e2d6f2bc2cb7c48ed56f3e8c34381fe830f47665bab949389209fd6b9c0278735fc018d8291f627fe20cb3eb2c7fadd37285e3a59729fd WHIRLPOOL 8ae8bea1d121c9b31e931444665b2ab3f58da216120017185734ea4fa33d0ed43edfd97cc2a166cea744b9ea355e68a833707a2cd2488a5d516a160eba2aff25
+MISC ChangeLog-2015 1847 SHA256 233963f0ae16bdc474b496d6df1b01104211884af7701184e2b632328d21bc2e SHA512 ca7468208e68099293fcfe3ad46bc20e86bb8207a297ab489ab105ec25a0d5271073122e8b8e21f06bb9c956f9f0f0d850adb747edc77593f19e8c04b767d04c WHIRLPOOL d094cd6fcffa08edb3f612d42d1acd53a0e9a5cbc9128a080a59908463547ef5a46bd18671f1ce24461b83c82a12ca5fe780c6cb8e211ef9be94ea1b4c5ced4f
+MISC metadata.xml 329 SHA256 49ee6ab64b80146756dccdcf48b76310eef397068407eb9b50b684bc17034d98 SHA512 d3272d4cc86186bfc2b08cee68f27cdbb139ea2eb04557977aa9d4088716e1a6d0755bca4ec63363fe83d333198eb9b249359bd191847021438b962548266fcc WHIRLPOOL ffd243d3cc891320dfe9f961e2f799a67bbd8483b63b395df7c1ad23bb0d2f7c19c775c2dd37565601c43005947680c5ed5d3a494ce74c77f5b4265ed64fd9ac
diff --git a/media-sound/vlevel/files/vlevel-0.5-makefile.patch b/media-sound/vlevel/files/vlevel-0.5-makefile.patch
new file mode 100644
index 000000000000..af50f1e3c08c
--- /dev/null
+++ b/media-sound/vlevel/files/vlevel-0.5-makefile.patch
@@ -0,0 +1,26 @@
+--- vlevel-0.5/Makefile.orig
++++ vlevel-0.5/Makefile
+@@ -30,6 +30,7 @@
+ all: vlevel-bin vlevel-ladspa.so
+ 
+ install: all
++	mkdir -p $(PREFIX)
+ 	cp -f vlevel-bin $(PREFIX)
+ 	mkdir -p $(LADSPA_PREFIX)
+ 	cp -f vlevel-ladspa.so $(LADSPA_PREFIX)
+@@ -38,13 +39,13 @@
+ 	rm -f *.o vlevel-bin vlevel-ladspa.so
+ 
+ vlevel-ladspa.so: vlevel-ladspa.o volumeleveler.o
+-	$(CXX) $(CXXFLAGS) -shared -o vlevel-ladspa.so vlevel-ladspa.o volumeleveler.o
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o vlevel-ladspa.so vlevel-ladspa.o volumeleveler.o
+ 
+ vlevel-ladspa.o: vlevel-ladspa.cpp volumeleveler.h vlevel-ladspa.h vlevel.h ladspa.h
+ 	$(CXX) $(CXXFLAGS) -c vlevel-ladspa.cpp
+ 
+ vlevel-bin: volumeleveler.o commandline.o vlevel-bin.o vlevel.h
+-	$(CXX) $(CXXFLAGS) -o vlevel-bin vlevel-bin.o volumeleveler.o commandline.o
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o vlevel-bin vlevel-bin.o volumeleveler.o commandline.o
+ 
+ volumeleveler.o: volumeleveler.cpp volumeleveler.h vlevel.h
+ 	$(CXX) $(CXXFLAGS) -c volumeleveler.cpp
diff --git a/media-sound/vlevel/metadata.xml b/media-sound/vlevel/metadata.xml
new file mode 100644
index 000000000000..25aad767d276
--- /dev/null
+++ b/media-sound/vlevel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">vlevel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/vlevel/vlevel-0.5-r1.ebuild b/media-sound/vlevel/vlevel-0.5-r1.ebuild
new file mode 100644
index 000000000000..d25eb4ec8439
--- /dev/null
+++ b/media-sound/vlevel/vlevel-0.5-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Dynamic compressor to amplify quiet parts of music"
+HOMEPAGE="http://vlevel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vlevel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="media-libs/ladspa-sdk"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	emake CXX=$(tc-getCXX) CXXFLAGS="$CXXFLAGS -fPIC -DPIC"
+}
+
+src_install() {
+	emake PREFIX="${D}/usr/bin/" LADSPA_PREFIX="${D}/usr/$(get_libdir)/ladspa/" install
+
+	dodoc README TODO docs/*
+
+	exeinto /usr/share/doc/${PF}/examples
+	doexe utils/{levelplay,raw2wav,vlevel-dir}
+	docinto examples
+	dodoc utils/README
+	docompress -x /usr/share/doc/${PF}/examples/{levelplay,raw2wav,vlevel-dir}
+}
diff --git a/media-sound/vlorb/Manifest b/media-sound/vlorb/Manifest
new file mode 100644
index 000000000000..e57727bbe0a7
--- /dev/null
+++ b/media-sound/vlorb/Manifest
@@ -0,0 +1,5 @@
+DIST vlorb-1.2.tar.gz 23935 SHA256 9eedd394cebab8ccd328f5df8e10d7baff6bcb368562e412db04eb63746f73c4 SHA512 b0f7a2fd757c98a4cc70b3a74612553986a42edc38df69e3b52df787fc32770cf98e1931c2f524cdcaf32da403193bba2ca2b4e178a1a757ebc9660067c10b05 WHIRLPOOL acabada9312a99ec890289ce8bbe8616949cc78ca974fb8f5cd955bfb9b6d20739ff3bf2ae002ccbbee64b32ee7730335150aa8ea99e613cca2814d6fd82818d
+EBUILD vlorb-1.2.ebuild 548 SHA256 7c4b29507bc680d8bce66115a91c298ef59110f585d6f0bae5ce3b2c3d8cfdca SHA512 ac6d835fd46b6e2a605eab28681e88dff9abe1c6cf3318a23b295c3030f72be844c087ee7cc884f03021e2ae29e192c822f6b5a930e4592ec0f95a89a8914cca WHIRLPOOL ba5d579f55d833b734c9911b0d740a83b9a1b059549b4e60fbd1af1b1069e981e2e83c8aa8cdc2039c3e2888a8172ad52570c0fa443463e85f5d529816a49e94
+MISC ChangeLog 2420 SHA256 f0d5824faff173ab2df98ea990aa38785572a9a51574e00fc4842913abfd3ca6 SHA512 2a2720813573c68f8287dee4439a88fb1687e86a6c6096dce4e3f9b10caaf989db876ab2300f68f95995af79b70fcf60175bbb2a14d9e9c7e7363b720db6c342 WHIRLPOOL ec756bf4ed7dc7ebfc6f381315d0680dfac28a4b5b92eb8e5ab7c0cd68e778e41bd89433bd68857ba603baae792c0d0099f9230310e8a48f4cc3a07fac11814c
+MISC ChangeLog-2015 1004 SHA256 b931281838ae6b97d21b4f4c709542b6b68fd739ac1eb39605dbe143a6305867 SHA512 d995fa3dc0137747b2309aba16a2e642d8b745fdf33d6b1b2afa7f23bef35d58c4a19125ca7eec70d19e1e935dc464783657e9b2e1500cfdc86d9956424ff9c4 WHIRLPOOL 26ba09003e5bf260825203e81253eb1c16e844838c2c17921ae5894cec86ab071bfde6dda076fdb2d4e9354fdd345486ee49fc70fe97a2aa62262a0c92832fb0
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/vlorb/metadata.xml b/media-sound/vlorb/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/vlorb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/vlorb/vlorb-1.2.ebuild b/media-sound/vlorb/vlorb-1.2.ebuild
new file mode 100644
index 000000000000..22d9f8cfd936
--- /dev/null
+++ b/media-sound/vlorb/vlorb-1.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="a high quality Audio CD to audio file encoder"
+HOMEPAGE="http://jk.yazzy.org/projects/vlorb/"
+SRC_URI="http://jk.yazzy.org/projects/vlorb/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="ogg"
+
+DEPEND=">=media-sound/cdparanoia-3.9.8
+	>=dev-perl/CDDB-1.12
+	ogg? ( >=media-sound/vorbis-tools-1.0.1 )"
+
+src_compile() { :; }
+
+src_install() {
+	dodoc ChangeLog README
+	dobin vlorb
+	doman vlorb.1
+}
diff --git a/media-sound/vmpk/Manifest b/media-sound/vmpk/Manifest
new file mode 100644
index 000000000000..c2d6c463566a
--- /dev/null
+++ b/media-sound/vmpk/Manifest
@@ -0,0 +1,5 @@
+DIST vmpk-0.6.2a.tar.bz2 452963 SHA256 d1453497690bf4df9155a3414b149b79c6ce5e474f00985d8ccdd9be678ca908 SHA512 89ba161c3ca7ae260d02c175d1116bea7cdfdfddb0f303d8b9177eeb3d77ded8f6126bed43efa6c279daec0a987d0be30c280d59f42a7c145167fb54a7b8db16 WHIRLPOOL 87b954041d89dd3aa18647fc7a7005cd60171897a54644c4cafdfcba3c233ad0b2429cd159a475e274d9ffae78d642ef55d17d3418515fc20250c763c40f0295
+EBUILD vmpk-0.6.2a.ebuild 815 SHA256 23461bb7c663ac49eba2831f894f4356e38342571fcc88dde901d97d20a0e45f SHA512 c13c575df4d08c4bb139245c9c0874de9f517d7a5c3338cc645e2b723cb92afe0b0b9ae1a3c8e5e73eaf574aa4d7ea8f2914f949f39386398843a5e025ab80d2 WHIRLPOOL 511dca5a5d5686567ece02a813630789af5bb8251fc3bc37c4b021a0a3cecd7f098d1d5139691b5d36db43babead538f507917c58bb81c5a95b1354490b86a0e
+MISC ChangeLog 2945 SHA256 f816796ea099f5b6e27d33c2054f18a931ed7f6e1d90292f7e16e404dc077e81 SHA512 50859a4444d37b42ef8cf8d63c2b6520d5692cd4e138ee1ca9b5aa7c4e7590e5896a12d037b6583eec8815b820aa808a5b1271e0caae8876a57818b6024dbeea WHIRLPOOL 0a0e47bd7386207d4bd53dd7b87c9684c9cfb6abc96e038d3ee7e7612bb1e9109c53bf7500a3c5632d04b97c54139726ba7c762f027ac0f3e86cfc64d5e03f92
+MISC ChangeLog-2015 2929 SHA256 8d90f045f228af28bde9b0ed1a03688badf5b4b6e7c0b6da4b418e8beab62b5e SHA512 134e485d61c2ffc7e71b180466f423edafa4ffbb260ee1cfd87a1894ccec9c2190a4c2145db8a4131fd41d260c788fb900363aa4e5301648346e37272d134b1f WHIRLPOOL 48c5ab42715871879963dfd2577e2e09a8b6586c68d3beb3d2f66d48db21fa1a774ef13ebb9ee8422f95ce358320d5e3ffbe033ca9a1a6f4cbb53c402affd2b1
+MISC metadata.xml 856 SHA256 024c9aa167e9fdcdbff96ee66b443ec7750178c63770d2cf1c0740b3bf74d1a6 SHA512 2186fd4b256c33f617fef45833bacba660d536141b77e520ad811c02363d1238765c13ec8bd125cf12b0e77589ad7c4f189747553c956ff9d2590e8a84b345d0 WHIRLPOOL 3cd03c84ce49208a81bbce084892693256e6b98e41461e24aded5cad57178da527d255bae1ca676e1aebf0c149c45c162d4330d28ecf86449c5cb6d0c4e4aa6b
diff --git a/media-sound/vmpk/metadata.xml b/media-sound/vmpk/metadata.xml
new file mode 100644
index 000000000000..8e297e92c1a6
--- /dev/null
+++ b/media-sound/vmpk/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<longdescription lang="en">
+	Virtual MIDI Piano Keyboard is a MIDI event generator and receiver. It
+	doesn't produce any sound by itself, but can be used to drive a MIDI
+	synthesizer (either hardware or software, internal or external). You can use
+	the computer's keyboard to play MIDI notes, and also the mouse. You can use
+	the Virtual MIDI Piano Keyboard to display the played MIDI notes from
+	another instrument or MIDI file player. To do so, connect the other MIDI
+	port to the input port of VMPK.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">vmpk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/vmpk/vmpk-0.6.2a.ebuild b/media-sound/vmpk/vmpk-0.6.2a.ebuild
new file mode 100644
index 000000000000..d79c1b766b02
--- /dev/null
+++ b/media-sound/vmpk/vmpk-0.6.2a.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Virtual MIDI Piano Keyboard"
+HOMEPAGE="http://vmpk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vmpk/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=media-sound/drumstick-1.0.0
+	x11-libs/libxcb
+	dbus? ( dev-qt/qtdbus:5 )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DBUS=$(usex dbus)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -rf "${D}/usr/share/doc/packages" || die
+}
diff --git a/media-sound/volti/Manifest b/media-sound/volti/Manifest
new file mode 100644
index 000000000000..b23003663c76
--- /dev/null
+++ b/media-sound/volti/Manifest
@@ -0,0 +1,5 @@
+DIST volti-0.2.3.tar.gz 164833 SHA256 216ca23cd4e8921ea73922125048e4f23fd3146045c0ef17cc4e10108dbd80dc SHA512 a2af2ad8c5475e6c2a08e5382748e7b5ed64130c6ac988afc8800ec505abf80ef1f73b3506ad4de2fc5177968aee806b779d0f0924ee92b1b734cf662f4266a3 WHIRLPOOL 91b6189ab6e8520244f0f919173aad6663a8bf6ea0d8665ce95c2fdf2b3e8ef3b7e682edcb3aa522e8f160530fdd0f67b368c279f6746f27172531450b6d06a5
+EBUILD volti-0.2.3-r1.ebuild 645 SHA256 ab48ef228ce092c30a9792fc32e32b15b266ff4cc0f4ec5615620b144d0503d4 SHA512 387ba8feedb6c9fe1d0b05e175f6f0a0e718a4784a42a47a058db73af2e677cb7e959336a99338cc346298bc49742d55bd4c7bc528e570175490c843c6a880ac WHIRLPOOL 569af95cceb93cae5b0f2b8a2d8de981884ed1991eca67e624edf591660d5fda50c997ddb2d4a305d3ba1f8c42839a1a78eb77a10a90024c84054ec0428e9241
+MISC ChangeLog 3276 SHA256 e83d0586648dedc94a7627be84ec89b283866da2997add507dc3c8daa5f6e249 SHA512 8436a8dcae6a7b765b43c53179c4fdf652354090d9aee64616b55233a89f2a93b56f86ccdda1aa9c7af8399097d030a9082e3a14bc0a83f8f3b8af90d950bc36 WHIRLPOOL 3020fce5ae1e39f95eb10cd20defdaae8e79bc84d19840ceabded7ea5ce95d76fe9782c0104c3803209940db1d0d90416a3d15279669411de5be711ac0808613
+MISC ChangeLog-2015 1413 SHA256 685520655eb9d988120a39f56dac75c24384a103287f92aa43c3478072d19997 SHA512 e67b0583ec34694a3f77682bdddcd57c370b73264259867997da14b6d8f6bf2a99ccca045f9c3a50917ca7fa9c006077015a2a5d845ef7be27401043b3ae4e78 WHIRLPOOL 38a6acb20f8b405c5b441b59b1783a70c3a0fbe099ef20ad8040faec328693baf9b57bf1f625352fd9eb4af2d011d5ed869c7c2e3551b85247b5f9320df511fc
+MISC metadata.xml 383 SHA256 2c50fb365016e6338d0c00937e7a94396015ca36a7b1b72f94acf253d5680c27 SHA512 7a66ca43950416fb68ee6cb246a35c2b5e4c70449ed1cec4f86c57fba132014c202af54e6204f4ea3c86a39a9fd8d0e95f9d0335c8942ae361320c69585aefd8 WHIRLPOOL 08debc321fa77de6ef20fd584c26a40f304f71138e866da392e5bedbc920bd7d8c656aa16bb1e74e281ac5e702cad1851ed500619eebc70d1b80143c1dad5e8f
diff --git a/media-sound/volti/metadata.xml b/media-sound/volti/metadata.xml
new file mode 100644
index 000000000000..921e2b3a5536
--- /dev/null
+++ b/media-sound/volti/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">volti</remote-id>
+		<remote-id type="github">gen2brain/volti</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/volti/volti-0.2.3-r1.ebuild b/media-sound/volti/volti-0.2.3-r1.ebuild
new file mode 100644
index 000000000000..a84d6b68eb81
--- /dev/null
+++ b/media-sound/volti/volti-0.2.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="GTK+ application for controlling audio volume from system tray/notification area"
+HOMEPAGE="https://github.com/gen2brain/volti"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libnotify X"
+
+RDEPEND=">=dev-python/pygtk-2.16
+	>=dev-python/pyalsaaudio-0.7-r1
+	dev-python/dbus-python
+	X? ( >=dev-python/python-xlib-0.15_rc1 )
+	libnotify? ( x11-libs/libnotify )"
+DEPEND=""
+
+DOCS=( AUTHORS ChangeLog README )
diff --git a/media-sound/volumeicon/Manifest b/media-sound/volumeicon/Manifest
new file mode 100644
index 000000000000..291b573e2a2b
--- /dev/null
+++ b/media-sound/volumeicon/Manifest
@@ -0,0 +1,10 @@
+AUX volumeicon-0.4.6-glib-2.31.patch 649 SHA256 158ebd665cc841cda4e44f4031a700c7923a0909e06f3e69b61f1ca540b1574a SHA512 6b11df00cbe09d5152a111dc3788e2f9acae83879cb81277265c5ad727e454f00014aaa9d75d0cd1ffe402a2a85801fab9d3ccce1399a8ba1bc5752997f0c65b WHIRLPOOL 2eac42b69a42fe44cd598496d2b9ff1e1227077d2baf68443349222b58bbf9f4c084e90ac911d11ac2ad53e55248c1c45b710ee72e9c6d48ae50efcfd5d5ecd9
+DIST volumeicon-0.4.6.tar.gz 136769 SHA256 32f94adc5f346404ae564405dd483ae4bd04212df08e46f18d369b4ba2cb6590 SHA512 f5b649a113270a417046532ec9b80e738afe1275ce919a8a7adafbac05cdf58f9454a5386d3304cce652a90e63bc5297fa8cd5b369e0f1149c898483cbfe2f71 WHIRLPOOL 8bd5cf2ce0dd8409fd6c6ae3a4d6963fe154c821ec0c393938f948378eb23d0cf14b5cc6bc5fbcb03ca91d3880a3290a401cf943dbd6b1829539558ce1599b60
+DIST volumeicon-0.5.0.tar.gz 160089 SHA256 e5f1179f9ec5ab25e3740e4f6bbe0baa75368f0ae87d370197b3fbefb61bd782 SHA512 26c4973a600495886222920e6eea80a7d54ebecf9b9fa46dea6808e25bf3b5edc5b37ff0740da270e77faac687d2151d8cc53259b356e17ce99ed0e38b7fbe38 WHIRLPOOL 1f319c1a671be3677f02272683a36b4714d728d5022f1e640c2b0d130d80dc1958c07a8a5d28637ba47d7ac91d021676774cba90bae050d726c6d05132b980cc
+DIST volumeicon-0.5.1.tar.gz 172401 SHA256 24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0 SHA512 a96c79f91a8a0ec96f3297af659cf738547bb33e5908edb6b499bcc5081c61339ceaccc3a854a2f953a6f177fe6d8be1578cacab522d8be63a9dda8cf7c7a452 WHIRLPOOL 7dc58c6bc00cc53edb5ba6b945ad9fb328ad6e1a52beea3fe85d7afddafdd21fc6ddeb6807442491bf7784563d5c85fc48fa67bb21f607ee31aec76b90fd3d82
+EBUILD volumeicon-0.4.6.ebuild 774 SHA256 661da8ab6af370dec4fd885fd395170df73fc713ba45e99344cc086a719032d1 SHA512 0d8635e822f5053b0cfd1ab15e045eaa787d179fe7311145cc839b437507ff88304e55e185a5ce78a510f0af25e677f2e6a35b0045869457334dd8b3f813b33a WHIRLPOOL 408242943a23e34612ce3d18d0d86b2a5d2a1d6a25f9ea5e41d8eccf252eddb0f20ab2dbf66225b48f18fc8a9ca969dcb98df43cf934fe358d71448dd0651f26
+EBUILD volumeicon-0.5.0.ebuild 695 SHA256 20debbcee1d8a348cc36139d5716135d3731d4fc7af096a68918e1d78de0e64a SHA512 6430deeadbe230e172f245b2df236dce7814f5bb65e0752bf0e9cff2c68b2ada2929a3d3286223f275f286409744f9423312e1f84e5e6ea3e3acd7e7fc5720c9 WHIRLPOOL a3a84c3e96853e6904bbf1d31dd247f254300c79339ec5e1d935bc6ac5c772e535663c5849a2445dbb2dfb4ecc956224bbfe8f4e4e8dad07929af7ea49cbd602
+EBUILD volumeicon-0.5.1.ebuild 695 SHA256 20debbcee1d8a348cc36139d5716135d3731d4fc7af096a68918e1d78de0e64a SHA512 6430deeadbe230e172f245b2df236dce7814f5bb65e0752bf0e9cff2c68b2ada2929a3d3286223f275f286409744f9423312e1f84e5e6ea3e3acd7e7fc5720c9 WHIRLPOOL a3a84c3e96853e6904bbf1d31dd247f254300c79339ec5e1d935bc6ac5c772e535663c5849a2445dbb2dfb4ecc956224bbfe8f4e4e8dad07929af7ea49cbd602
+MISC ChangeLog 2706 SHA256 201c3c473bd7d9f3a9e30f945493d5604c79e84705605e59c221117fd957af13 SHA512 0139b54d39aea021ab6e0c6221aaf0fc90256f018f47a2ebdd669753acc2a90a291548a3b5bb934e2edf352141983f5f4cfb45f3f79081a2189ae6356f10447f WHIRLPOOL 613ab2840b232e678fe7a66016beab4106530fd7d7c7554afc31578cc533b5098fc1e716fec7956a3cc611b5d4983660deace7d01a3bd2b360eb2be19df6f9e6
+MISC ChangeLog-2015 1487 SHA256 d1991c22452a2b16f3526615495fcddbff6a9ad59120089df8c8253fa05466a7 SHA512 133fa3ae89cf19171d50e02ca9e5a1773dafd87196e52b1e6634005c457782984ccbeedda383724524b04a952d4eb5c5e9209cd67573c40903b03cbe5f7987c6 WHIRLPOOL f9eea5d834285eea0fc5d7035ace985fa8b513c7dc1f7cd9564fa49e649060627214486f2899340fe559006623cd3f2cb5007dc079f0530e8489ff627aec262e
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/volumeicon/files/volumeicon-0.4.6-glib-2.31.patch b/media-sound/volumeicon/files/volumeicon-0.4.6-glib-2.31.patch
new file mode 100644
index 000000000000..6eeda5135f34
--- /dev/null
+++ b/media-sound/volumeicon/files/volumeicon-0.4.6-glib-2.31.patch
@@ -0,0 +1,30 @@
+http://bugs.gentoo.org/412473
+
+--- src/alsa_backend.c
++++ src/alsa_backend.c
+@@ -22,10 +22,8 @@
+ //##############################################################################
+ 
+ #include <alsa/asoundlib.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <glib/gstdio.h>
+-#include <glib/glist.h>
+-#include <glib/giochannel.h>
+ 
+ #include "alsa_backend.h"
+ 
+--- src/oss_backend.c
++++ src/oss_backend.c
+@@ -26,10 +26,8 @@
+ #include <fcntl.h>
+ #include <assert.h>
+ #include <stdlib.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <glib/gstdio.h>
+-#include <glib/glist.h>
+-#include <glib/giochannel.h>
+ 
+ #include "oss_backend.h"
+ 
diff --git a/media-sound/volumeicon/metadata.xml b/media-sound/volumeicon/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/volumeicon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/volumeicon/volumeicon-0.4.6.ebuild b/media-sound/volumeicon/volumeicon-0.4.6.ebuild
new file mode 100644
index 000000000000..9abb83f16dcc
--- /dev/null
+++ b/media-sound/volumeicon/volumeicon-0.4.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="A lightweight volume control that sits in your systray"
+HOMEPAGE="http://softwarebakery.com/maato/volumeicon.html"
+SRC_URI="http://softwarebakery.com/maato/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libnotify"
+
+RDEPEND=">=dev-libs/glib-2
+	media-libs/alsa-lib
+	>=x11-libs/gtk+-2.16:2
+	x11-libs/libX11
+	libnotify? ( >=x11-libs/libnotify-0.7 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glib-2.31.patch
+}
+
+src_configure() {
+	# --enable-oss --with-oss-include-path=/usr/include/sys #419891
+	econf $(use_enable libnotify notify)
+}
diff --git a/media-sound/volumeicon/volumeicon-0.5.0.ebuild b/media-sound/volumeicon/volumeicon-0.5.0.ebuild
new file mode 100644
index 000000000000..cce7ca83a323
--- /dev/null
+++ b/media-sound/volumeicon/volumeicon-0.5.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A lightweight volume control that sits in your systray"
+HOMEPAGE="http://softwarebakery.com/maato/volumeicon.html"
+SRC_URI="http://softwarebakery.com/maato/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND=">=dev-libs/glib-2
+	media-libs/alsa-lib
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	libnotify? ( >=x11-libs/libnotify-0.7 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog"
+
+src_configure() {
+	# $(use_enable !alsa oss) fails wrt #419891, is likely only for OSS4
+	econf $(use_enable libnotify notify)
+}
diff --git a/media-sound/volumeicon/volumeicon-0.5.1.ebuild b/media-sound/volumeicon/volumeicon-0.5.1.ebuild
new file mode 100644
index 000000000000..cce7ca83a323
--- /dev/null
+++ b/media-sound/volumeicon/volumeicon-0.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A lightweight volume control that sits in your systray"
+HOMEPAGE="http://softwarebakery.com/maato/volumeicon.html"
+SRC_URI="http://softwarebakery.com/maato/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND=">=dev-libs/glib-2
+	media-libs/alsa-lib
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	libnotify? ( >=x11-libs/libnotify-0.7 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog"
+
+src_configure() {
+	# $(use_enable !alsa oss) fails wrt #419891, is likely only for OSS4
+	econf $(use_enable libnotify notify)
+}
diff --git a/media-sound/volwheel/Manifest b/media-sound/volwheel/Manifest
new file mode 100644
index 000000000000..1c6c7ea481fe
--- /dev/null
+++ b/media-sound/volwheel/Manifest
@@ -0,0 +1,6 @@
+AUX volwheel-0.2.8-perl516.patch 1086 SHA256 442692649af53cd89305100adfcf360c19310cecd55bc97df7cfd530f0f2e45c SHA512 388c57bcce988b78adb5b5e66d0d896650ad57338df79f90876596ea4d8493839d8c818f0889463adcff8f2fe61730429b8c21c9065ba7d5c8f6b4986e01cc14 WHIRLPOOL 3b2807444051d041a7f58a1b40aa6d418156047e0b62d875e0aac11d321a6e903e86ffb6b1812f78d19f1bb0d5d7d51f8fe5f5ca5f9294a6d6afd1b02a0e5df5
+DIST volwheel-0.2.8.tar.gz 43140 SHA256 a14e9b3fb831677937396488466ebbb2a7030f76cf2cc404d63dd0ea8d5b9948 SHA512 ee2d121d2a9e2c987407a30187a313db128f1557932d003421e0fbda683cf80d52b5fb3c4c4ab2d07b642e86bb580bb3764a1c091ea57f5068660a035e78721b WHIRLPOOL ba982fac83ef42ae9403fd326b6aab6d330022c8b0c70f684e35fc620271469b2c11622bd9c5b9f733522f6493bfe9a3a892f63db9db3262f27be5b5b6734243
+EBUILD volwheel-0.2.8-r1.ebuild 804 SHA256 0802cd50592cc2951f5a1da7aa0574e3d6f23282cfef8bcc1a52906c43e98bbb SHA512 87c4a280a5d06dbaeb9b5c73fa0b132372c8e1ae04bbc83f9142231f43022531cd75f9e7dbdf580f01c72ce2562479dbd63185ad6d52277737e4e9da289d5b22 WHIRLPOOL 77f876dcc02b7ab756a87645d9bd54080eef51e896ca2ac687f6fed6e2682ee6b4162993dc6713056941bea96d6af2da510a158825f7758cac72f722e00b2dff
+MISC ChangeLog 2645 SHA256 f11605ea32e2f48ddf02279a5bbefa4521319c7b6c3ba47ce6659a19acbbfa0f SHA512 e8f182f4e4c0812255a59013bca6ba48029f942226bbcaf89d9cc55e2f19b93c6f22a6e7f851f3ddbfc435d0f8d6392307688373d0ad063cfe44494858bb415f WHIRLPOOL 17918afec6b5036a0a1ee9daf55dacc5368e691da098f2255e7f7786b7a470439e139d4afd9347f17d0d5bb825a92e510efc39e81a2bc8e88b2aa90289a5fa53
+MISC ChangeLog-2015 1449 SHA256 7bccf0a0d1f453087c6c7f1cd5fe9bd171a06921220a5ec0b9c31e030dd9b8e2 SHA512 de36f6c76a13b84c12fc513bc6b5c941bd3ab9b2fd872c65b33cc216ca84b1bea4cf64f3344c7320f9e52574bcbc8d3c78e5ed070f681373f1d46c0297383d2f WHIRLPOOL 5680c6012ca6c3861fede742b37e8fcbedd85684b1f89f8d23543a250726c7cff8a81dbf4394ef0c7941668b83e203b5eeca0b45100293aaf4a6d762b9cc3d7a
+MISC metadata.xml 331 SHA256 b14c583c7ea6d71b3fabe261cd768a35d49ff4d407ccacdc91c043d15081c8d2 SHA512 4a10f6540d114212e21102d1daca1e58043e637300573475be33369de01373e64041be84cecea9138bf2cebb39a5c26242a05820bfa58673e90698a4dca45fea WHIRLPOOL 1e6d01d5698874fea45223f0c8527e35a01f398a62f0de3cb816f63f57a0f5b8e70d7df90e76ed32912e00d210bcccd94f8c82c3392d13d9b4c243bf053abe54
diff --git a/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch b/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
new file mode 100644
index 000000000000..130d9b7c331f
--- /dev/null
+++ b/media-sound/volwheel/files/volwheel-0.2.8-perl516.patch
@@ -0,0 +1,36 @@
+http://code.google.com/p/olwtools/issues/detail?id=8
+
+--- install.pl
++++ install.pl
+@@ -2,7 +2,6 @@
+ 
+ use strict;
+ use warnings;
+-use Shell qw(install cp);
+ 
+ my $package = "volwheel";
+ 
+@@ -33,17 +32,17 @@
+ 	system("sed -i 's|/usr/local|$prefix|g\' volwheel");
+ }
+ 
+-my $output = install ("-v -d {$bindir,$libdir,$datadir,$hicolor,$desktop}");
++my $output = qx|install -v -d {$bindir,$libdir,$datadir,$hicolor,$desktop}|;
+ print $output;
+-$output = install ("-v -m755 volwheel $bindir");
++$output = qx|install -v -m755 volwheel $bindir|;
+ print $output;
+-$output = install ("-v -m644 lib/* $libdir");
++$output = qx|install -v -m644 lib/* $libdir|;
+ print $output;
+-$output = cp      ("-v -r icons $datadir/");
++$output = qx|cp -v -r icons $datadir/|;
+ print $output;
+-$output = install ("-v -m644 icons/volwheel.svg $hicolor");
++$output = qx|install -v -m644 icons/volwheel.svg $hicolor|;
+ print $output;
+-$output = install ("-v -m644 volwheel.desktop $desktop");
++$output = qx|install -v -m644 volwheel.desktop $desktop|;
+ 
+ print "\nVolWheel has been succesfully installed.\n\n";
+ 
diff --git a/media-sound/volwheel/metadata.xml b/media-sound/volwheel/metadata.xml
new file mode 100644
index 000000000000..87c2a98ca835
--- /dev/null
+++ b/media-sound/volwheel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">olwtools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/volwheel/volwheel-0.2.8-r1.ebuild b/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
new file mode 100644
index 000000000000..cf495d5fa7bf
--- /dev/null
+++ b/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils gnome2-utils
+
+DESCRIPTION="A volume control trayicon with mouse wheel support"
+HOMEPAGE="http://oliwer.net/b/volwheel.html"
+SRC_URI="https://olwtools.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~mips x86"
+IUSE="alsa"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-perl/Gtk2
+	alsa? ( media-sound/alsa-utils )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-perl516.patch
+	sed -i -e '/^Encoding/d' ${PN}.desktop || die
+}
+
+src_install() {
+	./install.pl prefix=/usr destdir="${D}" || die
+	dodoc ChangeLog README TODO
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
new file mode 100644
index 000000000000..8df72927374e
--- /dev/null
+++ b/media-sound/vorbis-tools/Manifest
@@ -0,0 +1,12 @@
+AUX vorbis-tools-1.4.0-CVE-2014-9638.patch 2572 SHA256 9188d4b2a8f61763647575f74b2b5a1c0dd06cf8d56a33f47b48967633b5aed7 SHA512 da79f329d4d28c597b1efe734c75bbc4176337173b4a9d7d8e54c48cc99655300db8674ce617fc5327480dd91d464c1a0d7a22ebabacb87e99933aecf7f21d27 WHIRLPOOL df09c5c03e49aa794b07243705bafdac0435bf49afc087bdf26d1276553857ac4cd54c3f4428bb86cc657e5896e7c86658eef78c436d9f3fc26c6ec91e29eb1f
+AUX vorbis-tools-1.4.0-CVE-2014-9640.patch 691 SHA256 d8be0913e71ef560ba5c8f05c1f78ec79f6671347f2e5b24acbafc7bfab5eca4 SHA512 f9dd54fa2d09f2ad1a45bbf576884aa00148334452c478914566713bd149572f9c4e05b301aa8bd2aeb299a095cbae5cde09dcb762eaa6c2e8bbd33c91fec2f0 WHIRLPOOL 19ef44bfcb258031d77d24b56e65969702163d99fd1e3d559c0e67961114c7cd04b9c6a3c363b337bd257f1e665a12f9c29d0243953e6c3cca6eb1f4f99e4cf2
+AUX vorbis-tools-1.4.0-aiff-buffer-overflow.patch 1039 SHA256 2eb38f0d7397de67a83c02a7b00d9f6efdc1bd56415d165d64aab82f231410cd SHA512 6a411e0857a6b4a56ef82db6e0a22ebf5dd5ff4695e7a4f6bb652f5bdda62e9f18ca60c68d97724932d692bd6ec23c3017edf7e52cb72d0a965e1c45b59e3506 WHIRLPOOL 2c2292897c367b9e944a9c0f1cd2797bf3e67ba2b896ddbaad8a33c079471e224b642bcf1ddfadb2943e1970c432aa242b2843d9c5d50b33b2f6c6fa921a7a96
+AUX vorbis-tools-1.4.0-format-security.patch 367 SHA256 5c1faf937af7afb02ded5191c844a37d5e35d1fba501d3442e0be095993d1068 SHA512 319451c4317e2224cb56c791528c8ba4722a142b5c85f63fd606e3a1acadc95904cfab3bee7ad4634fa982f59a92ebeb30d8698d8f697640d6579b6a80eadd93 WHIRLPOOL 7c24c92fb0b8c6414604d504305e99d5725b73f2b24b1380cf21993263f69eb45adf744630427265b0293af89a0e41fbeedc2d33722bfe94cf8b5e6b83700f44
+AUX vorbis-tools-1.4.0-underlinking.patch 2360 SHA256 cf13f27ce70bfc56f0d78d9c15bfd68832887501502c5279e641fa99532aae36 SHA512 9d93d6bd39ccdcdd90870388022d7c2eea8263cced4d6f140321bee0100215d6db1eef3d379d6a80168c6b1c1703eb0553f976b8fa3b275f663114ede35cca9a WHIRLPOOL 1f7817adb43d6caffc4c7ec734492bda44bd4e385543976f820418a546e40a3ef1b3ac9df48852d69e461e5dcbb5ff60a0e6bdd7bf37c93b8df5688b9515537b
+DIST vorbis-tools-1.4.0.tar.gz 1346532 SHA256 a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99 WHIRLPOOL 7f9116957dc06dbc40db0cba6a3147cdf575cd0939021fe44c984a7fde0ff9a495ed8b51275001266404e14db5e814d9e1dcc5bc57f4d3e9eaeb06b76be67a08
+EBUILD vorbis-tools-1.4.0-r2.ebuild 1120 SHA256 21dd46b2e3dd89ae418e2f3261c97cbd88846ed70034138e74df6afe9f96dd92 SHA512 227e31d34142798d7b25c01448f3c00d61315b287360d22d073f1d46ffde22423615fd667b525306957b956b8ec6bd644d84780784017d4bb23e86d3afa650cf WHIRLPOOL 23ce3b21146e76e0171915290b0eb5369c6f2287ccd5f48924f59afe220ae26073f94b3e3c0c06a6bfd6678eb397802820b47a8ef26be28b13aec12c38cd4e9d
+EBUILD vorbis-tools-1.4.0-r3.ebuild 1175 SHA256 e90f6fe8534dc71bca79dd879a399ab049b0ec7b1128f34ce5682f9b0767df10 SHA512 0a04e8f1b084499bb697782a19a2472ebc8fdf5fd85e18d6d231db63c5945a8dddf3f8c6a600944d85db4af31150c77dff7d54961335d60bea7450771d036c3a WHIRLPOOL d69c0dd553d4d1d98aa106186073a771b39a8a9d2c266628f4e0bbd53f4f1fdcf222a5af1994941c2ee4bf4c76e7769d1255b5c3de8de6b51f1d3e4859d591ab
+EBUILD vorbis-tools-1.4.0-r4.ebuild 1223 SHA256 3f84947d47461f0bc80538a2bffd280210e02bfc87f24544e0661d4a133e7a78 SHA512 d6946f5cf257dab774405329951cc1282083e80ac117e7aff12bab421c0fc06e827c0c4de195786fe727d04913966413715b63aa2272367166698ba931ad8abc WHIRLPOOL 35eb3449dffa2a7eb87d09d27b9f0ff4e53030239d4857a6e7e09b8b817c56aaf904254d6f59f84828e260c88293abf0aba85bacd343ca95486dbe442ddeb3d3
+MISC ChangeLog 2806 SHA256 2d8d60944fd614f156920d24de77149211138c9618b5a3685048881c515e132e SHA512 c6924898bfdae85aba5a99205cd9a038f16c7eeebee0eb8b67fc93308ab500011977a809b46e09644f69e95558e233ab88fded93579769d11b9e124a9dd6c4ad WHIRLPOOL f42ed83f4706140558dc17f8e2e27fcdb855eac57988a14571a9704cc186c37140e2384f56bb4020f52230cdb1b9215b858152f7805a4df370323af962922666
+MISC ChangeLog-2015 15500 SHA256 d856ad70db28a7c0c9cacb6cafe7ef74b574c51f80ac95e3c9144c3ab7225b99 SHA512 5f0f9dd1aa725444a0d26c6e21036d67f0f088e36d2366e7a313cc86551e590798bc54f9390f29055c6ba7bfa74f99fb6bd39658d299cc61156d11cb8c159ac7 WHIRLPOOL a9a2afc0751ffcde59ca3b7eeec036c8befe207124516c4d1f763c5d93634c3fe456c3e7acaf2cb4b66b5526fcdc9c7ba1e58c13d8de884a7731f9876eea2332
+MISC metadata.xml 427 SHA256 41126e7adad0e82b0b7b5a6c6b4bcd546f14700a80ecfbcdcd4dec0c9d1b0dae SHA512 fe38791f10b0312286c49042e5c24303418ab755d5300b64b7dc406be5dfda993bbe804eae1124c2484d6a1f2e823895e174a522f8710e4b12129e856674d65c WHIRLPOOL 06607c58e62cbe5b9fc9cab69e354c7afa7062f1b1704f3ad334e11eecaa61152194f350831ae133c0c47fb1f2703d3d48cca7e8abf7e18f834b4a0f016319a0
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch
new file mode 100644
index 000000000000..79859df0274f
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch
@@ -0,0 +1,92 @@
+Patches taken as references: 
+https://github.com/mark4o/opus-tools/commit/8c412e619b83eb6dd32191909cf6672e93e5802e
+https://trac.xiph.org/attachment/ticket/2212/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
+To fix bug report:
+http://www.openwall.com/lists/oss-security/2015/08/29/1
+    https://bugs.gentoo.org/show_bug.cgi?id=559170
+https://bugs.gentoo.org/show_bug.cgi?id=537422
+--- oggenc/audio.h
++++ oggenc/audio.h
+@@ -25,7 +25,7 @@
+ 
+ typedef struct {
+     short format;
+-    short channels;
++    unsigned short channels;
+     int samplerate;
+     int bytespersec;
+     short align;
+@@ -44,7 +44,7 @@
+ } wavfile;
+ 
+ typedef struct {
+-    short channels;
++    unsigned short channels;
+     int totalframes;
+     short samplesize;
+     int rate;
+--- oggenc/audio.c	
++++ oggenc/audio.c
+@@ -245,8 +245,8 @@
+ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
+ {
+     int aifc; /* AIFC or AIFF? */
+-    unsigned int len;
+-    unsigned char *buffer;
++    unsigned int len,readlen;
++    unsigned char buffer[22];
+     unsigned char buf2[8];
+     aiff_fmt format;
+     aifffile *aiff = malloc(sizeof(aifffile));
+@@ -269,9 +269,9 @@
+         return 0; /* Weird common chunk */
+     }
+
+-    buffer = alloca(len);
+-
+-    if(fread(buffer,1,len,in) < len)
++    readlen = len < sizeof(buffer) ? len : sizeof(buffer);
++    if(fread(buffer,1,readlen,in) < readlen ||
++        (len > readlen && !seek_forward(in, len-readlen)))
+     {
+         fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
+         return 0;
+@@ -277,11 +277,18 @@
+         return 0;
+     }
+ 
+-    format.channels = READ_U16_BE(buffer);
++    format.channels = (short)READ_U16_BE(buffer);
+     format.totalframes = READ_U32_BE(buffer+2);
+     format.samplesize = READ_U16_BE(buffer+6);
+     format.rate = (int)read_IEEE80(buffer+8);
+ 
++    if(format.channels <=0)
++    {
++    	fprintf(stderr, _("ERROR: Invalid channel count in AIFF header\n"));
++	return 0;
++
++    }
++
+     aiff->bigendian = 1;
+ 
+     if(aifc)
+@@ -449,11 +449,17 @@
+     }
+
+     format.format =      READ_U16_LE(buf);
+-    format.channels =    READ_U16_LE(buf+2);
++    format.channels =    (short)READ_U16_LE(buf+2);
+     format.samplerate =  READ_U32_LE(buf+4);
+     format.bytespersec = READ_U32_LE(buf+8);
+     format.align =       READ_U16_LE(buf+12);
+     format.samplesize =  READ_U16_LE(buf+14);
++
++    if(format.channels == 0)
++    {
++      fprintf(stderr, _("ERROR: Zero channels in WAV header\n"));
++      return 0;
++    }
+
+     if(format.format == -2) /* WAVE_FORMAT_EXTENSIBLE */
+     {
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch
new file mode 100644
index 000000000000..51c23b062aff
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9640.patch
@@ -0,0 +1,24 @@
+Patch taken from: 
+https://trac.xiph.org/changeset/19117
+To fix bug report:
+https://bugs.gentoo.org/show_bug.cgi?id=537422
+--- vorbis-tools-1.4.0/oggenc/oggenc.c	
++++ vorbis-tools-1.4.0/oggenc/oggenc.c
+@@ -97,6 +97,8 @@
+               .3,-1,
+               0,0,0.f,
+               0, 0, 0, 0, 0};
++    input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
++        N_("RAW file reader")};
+ 
+     int i;
+ 
+@@ -239,8 +241,6 @@
+ 
+         if(opt.rawmode)
+         {
+-            input_format raw_format = {NULL, 0, raw_open, wav_close, "raw", 
+-                N_("RAW file reader")};
+ 
+             enc_opts.rate=opt.raw_samplerate;
+             enc_opts.channels=opt.raw_channels;
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-aiff-buffer-overflow.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-aiff-buffer-overflow.patch
new file mode 100644
index 000000000000..f8b66a90e7cd
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-aiff-buffer-overflow.patch
@@ -0,0 +1,31 @@
+Patch taken from: 
+https://trac.xiph.org/attachment/ticket/2212/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch
+To fix bug report:
+http://www.openwall.com/lists/oss-security/2015/08/29/1
+    https://bugs.gentoo.org/show_bug.cgi?id=559170
+--- oggenc/audio.c
++++ oggenc/audio.c
+@@ -245,8 +245,8 @@
+ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
+ {
+     int aifc; /* AIFC or AIFF? */
+-    unsigned int len;
+-    unsigned char *buffer;
++    unsigned int len,readlen;
++    unsigned char buffer[22];
+     unsigned char buf2[8];
+     aiff_fmt format;
+     aifffile *aiff = malloc(sizeof(aifffile));
+@@ -269,9 +269,9 @@
+         return 0; /* Weird common chunk */
+     }
+ 
+-    buffer = alloca(len);
+-
+-    if(fread(buffer,1,len,in) < len)
++    readlen = len < sizeof(buffer) ? len : sizeof(buffer);
++    if(fread(buffer,1,readlen,in) < readlen ||
++        (len > readlen && !seek_forward(in, len-readlen)))
+     {
+         fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n"));
+         return 0;
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-format-security.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-format-security.patch
new file mode 100644
index 000000000000..501300ca6171
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-format-security.patch
@@ -0,0 +1,11 @@
+--- vorbis-tools-1.4.0.orig/ogg123/status.c
++++ vorbis-tools-1.4.0/ogg123/status.c
+@@ -148,7 +148,7 @@
+ 
+     switch (stats->type) {
+     case stat_noarg:
+-      len += sprintf(str+len, stats->formatstr);
++      len += sprintf(str+len, "%s", stats->formatstr);
+       break;
+     case stat_intarg:
+       len += sprintf(str+len, stats->formatstr, stats->arg.intarg);
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch
new file mode 100644
index 000000000000..aaa10fbb54f9
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch
@@ -0,0 +1,47 @@
+http://bugs.gentoo.org/513942
+
+Fix building with `./configure --enable-ogg123 --without-flac --without-speex --without-kate` and `make`:
+
+libtool: link: gcc -Wall -ffast-math -fsigned-char -O2 -pipe -march=native -Wl,-O1 -Wl,--hash-style=gnu -o oggenc oggenc.o audio.o encode.o platform.o resample.o skeleton.o  -Wl,--as-needed ../share/libutf8.a ../share/libgetopt.a -lvorbisenc -lvorbis -logg
+resample.o:resample.c:function res_init: error: undefined reference to 'sin'
+collect2: error: ld returned 1 exit status
+
+libtool: link: gcc -Wall -ffast-math -fsigned-char -O2 -pipe -march=native -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -o ogg123 audio.o buffer.o callbacks.o cfgfile_options.o cmdline_options.o file_transport.o format.o http_transport.o ogg123.o oggvorbis_format.o playlist.o status.o remote.o transport.o vorbis_comments.o vgfilter.o  ../share/libutf8.a ../share/libgetopt.a -lvorbisfile -lvorbis -logg -lao -lnsl -lcurl -lpthread
+vgfilter.o:vgfilter.c:function vg_init: error: undefined reference to '__pow_finite'
+vgfilter.o:vgfilter.c:function vg_init: error: undefined reference to '__pow_finite'
+vgfilter.o:vgfilter.c:function vg_filter: error: undefined reference to 'tanh'
+vgfilter.o:vgfilter.c:function vg_filter: error: undefined reference to 'tanh'
+collect2: error: ld returned 1 exit status
+
+This is using the new GNU gold linker:
+
+$ ld -v
+GNU gold (GNU Binutils 2.24) 1.11
+
+Happens because -lm gets appended to the libraries list only with, for example, --with-flac but vgfilter.c and resample.c are always
+using functions from the mathlib.
+
+Therefore, always link to mathlib:
+
+--- ogg123/Makefile.am
++++ ogg123/Makefile.am
+@@ -30,7 +30,7 @@
+ ogg123_LDADD = @SHARE_LIBS@ \
+ 	       @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
+                @SOCKET_LIBS@ @LIBICONV@ @CURL_LIBS@ @PTHREAD_CFLAGS@ \
+-               @PTHREAD_LIBS@ @I18N_LIBS@ @FLAC_LIBS@ @SPEEX_LIBS@
++               @PTHREAD_LIBS@ @I18N_LIBS@ @FLAC_LIBS@ @SPEEX_LIBS@ -lm
+ 
+ ogg123_DEPENDENCIES = @SHARE_LIBS@
+ ogg123_SOURCES = audio.c buffer.c callbacks.c \
+--- oggenc/Makefile.am
++++ oggenc/Makefile.am
+@@ -23,7 +23,7 @@
+ 
+ oggenc_LDADD = @SHARE_LIBS@ \
+ 	       @VORBISENC_LIBS@ @VORBIS_LIBS@ @KATE_LIBS@ @OGG_LIBS@ \
+-	       @LIBICONV@ @I18N_LIBS@ @FLAC_LIBS@
++	       @LIBICONV@ @I18N_LIBS@ @FLAC_LIBS@ -lm
+ 
+ oggenc_DEPENDENCIES = @SHARE_LIBS@
+ 
diff --git a/media-sound/vorbis-tools/metadata.xml b/media-sound/vorbis-tools/metadata.xml
new file mode 100644
index 000000000000..fb45cda8412c
--- /dev/null
+++ b/media-sound/vorbis-tools/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
+    <flag name="ogg123">Build ogg123 player, needs libao and curl</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..d126eb2230ca
--- /dev/null
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="tools for using the Ogg Vorbis sound file format"
+HOMEPAGE="http://www.vorbis.com"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac kate nls +ogg123 speex"
+
+RDEPEND=">=media-libs/libvorbis-1.3.0
+	flac? ( media-libs/flac )
+	kate? ( media-libs/libkate )
+	ogg123? (
+		>=media-libs/libao-1.0.0
+		net-misc/curl
+	)
+	speex? ( media-libs/speex )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS="AUTHORS CHANGES README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	epatch "${FILESDIR}"/${P}-format-security.patch
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #515220
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable ogg123) \
+		$(use_with flac) \
+		$(use_with speex) \
+		$(use_with kate)
+}
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild
new file mode 100644
index 000000000000..b5a666c3046d
--- /dev/null
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="tools for using the Ogg Vorbis sound file format"
+HOMEPAGE="http://www.vorbis.com"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac kate nls +ogg123 speex"
+
+RDEPEND=">=media-libs/libvorbis-1.3.0
+	flac? ( media-libs/flac )
+	kate? ( media-libs/libkate )
+	ogg123? (
+		>=media-libs/libao-1.0.0
+		net-misc/curl
+	)
+	speex? ( media-libs/speex )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS="AUTHORS CHANGES README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	epatch "${FILESDIR}"/${P}-format-security.patch
+	epatch "${FILESDIR}"/${P}-aiff-buffer-overflow.patch
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #515220
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable ogg123) \
+		$(use_with flac) \
+		$(use_with speex) \
+		$(use_with kate)
+}
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild
new file mode 100644
index 000000000000..7f85f35db517
--- /dev/null
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="tools for using the Ogg Vorbis sound file format"
+HOMEPAGE="http://www.vorbis.com"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac kate nls +ogg123 speex"
+
+RDEPEND=">=media-libs/libvorbis-1.3.0
+	flac? ( media-libs/flac )
+	kate? ( media-libs/libkate )
+	ogg123? (
+		>=media-libs/libao-1.0.0
+		net-misc/curl
+	)
+	speex? ( media-libs/speex )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS="AUTHORS CHANGES README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	epatch "${FILESDIR}"/${P}-format-security.patch
+	epatch "${FILESDIR}"/${P}-CVE-2014-9640.patch
+	epatch "${FILESDIR}"/${P}-CVE-2014-9638.patch
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #515220
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable ogg123) \
+		$(use_with flac) \
+		$(use_with speex) \
+		$(use_with kate)
+}
diff --git a/media-sound/vorbisgain/Manifest b/media-sound/vorbisgain/Manifest
new file mode 100644
index 000000000000..59399dc73b70
--- /dev/null
+++ b/media-sound/vorbisgain/Manifest
@@ -0,0 +1,6 @@
+AUX vorbisgain-0.37-fix-errno-and-warnings.patch 2111 SHA256 5fadf6c9147a882de462896baa43b5df188b2de019a443def4024dc173b67cfe SHA512 f42aecb99865f60c91814daaa615dd55e84f391d622d41310c12c5f570bbe7628e903802590a6866ae10a02c7f6982bdac208b5a1b191bb49efcd3ea66a86062 WHIRLPOOL c837a307b57724d9af3634c82545683899b311532f414f786047d9ac42354ce7346aefa069b531cd451cfa8a294b103c3b1e9e2fa3b76d11c406183eecb1fa9a
+DIST vorbisgain-0.37.tar.gz 208977 SHA256 dd6db051cad972bcac25d47b4a9e40e217bb548a1f16328eddbb4e66613530ec SHA512 67181834e1a0d7c6e1ccd984e2d30ebf1dcdff84caa77f75e5e771de8414904810e966a43852b7184e075d2428fd8b431124835efc370ce6504b8b2756746e04 WHIRLPOOL 4001229f39bb17b3e283f941d589cf4358fa8d41948c1b70ccf01af7500e19d87067c73eadf51e244e64e852fbc3a8374a6d4f628850a30d9ca533da2820230e
+EBUILD vorbisgain-0.37-r2.ebuild 587 SHA256 0fbc6023ce0a11dabca3b9a0f736d317713981eaf7b85758f50adeba949df631 SHA512 2551b794c90c82a7af36cac324bdd8ed81dbd477e4a241eee3a09d0876669d82e533885402890369d7c7f7705b8310cd30e3da60a6451634764822215967809d WHIRLPOOL 5a4ebdb0454253e3c55d59518044091a7dbf199dec31f8b30caced260553147f187a6faab33b4cd44e97e3b37d57bbfe10ee6c3eed7b64ed5bfd52095c786ba0
+MISC ChangeLog 2498 SHA256 a0640ac75b0dd701bbde1c848c7415e42cd8f4de2b66cfb58e01f1201f7d45c8 SHA512 c16d4cd2a1178a0a8b17846688ff5b43a2338175d02f4476302fcf878295626fb1529518e34a3eb0b2bde35f3f2f74420f5a1bfe65bded3fc96ea1a8641e3986 WHIRLPOOL 45adbf74c0cb12cc24491eb20912221e66e7aea87d4a2fe9865d8b9a1662b4381bac56ca543e0f815aac676ffbd57fabf689874253c34a2108b2dbb904795c7e
+MISC ChangeLog-2015 3810 SHA256 09fbd2a1dc1822dbb7ba0bf986288fe721686d214d8a43eb8bc4b5917dc755e5 SHA512 cf82c11dc418c47604e91e220fb01a36af510fcb47d1e72836f93b984016cefb000260dc6dee8e42f4b1d15354b0bb83e1dd23afd8933f0f7f047d77116de79d WHIRLPOOL af5c00e309f1abf7058d5df102a6e18412e8654368853267c4a512a4e9c4b4a616338a37477ddfb402301a2cdd32cfa1224180b0db57b5bb51656697650ce2c6
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/vorbisgain/files/vorbisgain-0.37-fix-errno-and-warnings.patch b/media-sound/vorbisgain/files/vorbisgain-0.37-fix-errno-and-warnings.patch
new file mode 100644
index 000000000000..7d2efb63f33c
--- /dev/null
+++ b/media-sound/vorbisgain/files/vorbisgain-0.37-fix-errno-and-warnings.patch
@@ -0,0 +1,80 @@
+diff -ur vorbisgain-0.37.orig/misc.c vorbisgain-0.37/misc.c
+--- vorbisgain-0.37.orig/misc.c	2004-01-03 23:17:28.000000000 +0200
++++ vorbisgain-0.37/misc.c	2008-03-22 09:32:49.000000000 +0200
+@@ -23,6 +23,7 @@
+ #else /* WIN32 */

+ #include <errno.h>

+ #include <ctype.h>

++#include <unistd.h>

+ 

+ #ifndef DISABLE_WINSIZE

+ 

+diff -ur vorbisgain-0.37.orig/recurse.c vorbisgain-0.37/recurse.c
+--- vorbisgain-0.37.orig/recurse.c	2004-01-02 14:49:38.000000000 +0200
++++ vorbisgain-0.37/recurse.c	2008-03-22 09:31:52.000000000 +0200
+@@ -377,6 +377,7 @@
+ 
+         if (result->dir != NULL)
+         {
++            errno = 0;
+             result->entry = readdir(result->dir);
+ 
+             if (result->entry != NULL)
+@@ -408,6 +409,7 @@
+  */
+ static int read_dir(DIRECTORY *directory)
+ {
++    errno = 0;
+     directory->entry = readdir(directory->dir);
+ 
+     if (directory->entry != NULL)
+diff -ur vorbisgain-0.37.orig/vorbis.c vorbisgain-0.37/vorbis.c
+--- vorbisgain-0.37.orig/vorbis.c	2005-07-15 01:49:05.000000000 +0300
++++ vorbisgain-0.37/vorbis.c	2008-03-22 09:32:25.000000000 +0200
+@@ -572,6 +572,9 @@
+     int result = -1;
+     int delete_temp = 0;
+     int i;
++#if _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE >= 500
++    int fd;
++#endif
+ 
+     infile = fopen(filename, "rb");
+ 
+@@ -699,6 +702,16 @@
+     strcpy(temp_name, filename);
+     strcpy((char *) last_path(temp_name), TEMP_NAME);
+ 
++#if _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE >= 500
++    fd = mkstemp(temp_name);
++    if (fd == -1)
++    {
++        fprintf(stderr, _("Couldn't create temporary file for processing.\n"));
++        goto exit;
++    }
++
++    outfile = fdopen(fd, "wb");
++#else /* #if _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE >= 500 */
+ #ifdef WIN32
+     temp_name = _mktemp(temp_name);
+ #else
+@@ -712,6 +725,7 @@
+     }
+     
+     outfile = fopen(temp_name, "wb");
++#endif /* #if _BSD_SOURCE || _SVID_SOURCE || _XOPEN_SOURCE >= 500 */
+ 
+     if (outfile == NULL)
+     {
+@@ -824,7 +838,10 @@
+         }
+     }
+ 
+-    free(temp_name);
++    if (temp_name != NULL)
++    {
++        free(temp_name);
++    }
+ 
+     return result;
+ }
diff --git a/media-sound/vorbisgain/metadata.xml b/media-sound/vorbisgain/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/vorbisgain/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/vorbisgain/vorbisgain-0.37-r2.ebuild b/media-sound/vorbisgain/vorbisgain-0.37-r2.ebuild
new file mode 100644
index 000000000000..10a011e6ace6
--- /dev/null
+++ b/media-sound/vorbisgain/vorbisgain-0.37-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Calculator of perceived sound level for Ogg Vorbis files"
+HOMEPAGE="http://sjeng.org/vorbisgain.html"
+SRC_URI="http://sjeng.org/ftp/vorbis/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libogg
+	media-libs/libvorbis"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# bug 200931
+	"${FILESDIR}"/${P}-fix-errno-and-warnings.patch
+)
+DOCS=( NEWS README vorbisgain.txt )
+
+src_configure() {
+	econf --enable-recursive
+}
diff --git a/media-sound/vsound/Manifest b/media-sound/vsound/Manifest
new file mode 100644
index 000000000000..d245831abcbd
--- /dev/null
+++ b/media-sound/vsound/Manifest
@@ -0,0 +1,6 @@
+AUX vsound-0.6-stdout.patch 466 SHA256 69939826f7f7807acf516480907bcba8dbce746aca267528063606ba9edc9444 SHA512 da3c03794a655ab55e03f158e7249871115936d45a7a535caa5311e0fddbf53b896d367032f2762b7fd721df829da42764a31b1cfe273c245139b09959d9e21f WHIRLPOOL 3248a79a31d51e8659a6a225b3cda43d9f7d5e2ddf03636a45455dad1a7510984f1357dfee4a7ec8ad1f8220822eae9bab6d59c092d7dc9e6226415f8685851b
+DIST vsound-0.6.tar.gz 118026 SHA256 80711f2495f0faffd8b2d46afbdc3623e6701fcc20e6b85be82b6c4fdf467197 SHA512 82ce11aa98310eafd999d24ec1d060518fa4adc68c949e5c612ec36a340e29304c6f6d6be36fef2b45599bd5134b5c949a1b282268fee25792da4c7a68ff3d6d WHIRLPOOL ca579aebc7d427edc8be879c206e22fd331a14fa4797f8b0d9b41aacbe97836d6acedefc408661c990437efb522c1314ad5d04fb5f869aa0b989008798bce411
+EBUILD vsound-0.6-r1.ebuild 949 SHA256 4611519dfdf30f0f92edefbd4bb03e2037371020b61e181944bb54a6686f4129 SHA512 b381453788e3adfdf00cc373cde36b2b6729d77b292ce98992777b25e4e3edb73d613f98bc1ac7f2fee9ee7954c15ea7ac06fdcb5d185e1fae8bdcba7e766694 WHIRLPOOL 2ee1f09d42974344cc2836cf4c97e9bd1424d8792d792590f841f5f8208453a2b942047172e9c0c9023ff519476cc21da064ed4ecaf24791bfe5ee70d94766f9
+MISC ChangeLog 2461 SHA256 f17da93b73abcd5f27f202dbcef9f23589624d3dd54e30e467f864c0e4d7cfce SHA512 86bd2746b0059b2112cb009281f1cd9cab4bf1d1ad08f232f00159ad164ffab793490e0ca26e84db38ff0ef5e587af4fb59271865bb2d01a38ebc2c40d25056b WHIRLPOOL dbc96b16d782c1cab38fda13c870849b9cca93e4a5fd25894bd21da113846b53c11a9a25842e177c4bb3fbb3195d0e167d4cb00a09cb0a8e269d865cb30fd31c
+MISC ChangeLog-2015 2352 SHA256 85f4d45d99658fb26e0e09cb138c41bc39b14d3bc18417667570bdf1b59abdc0 SHA512 4b30851f2d50a77de3f98642f14df5ad5f89c2ec1a2456fe097c62a6dab19f3c26643673ee390a381437453639bcbbc241926f0f4428b2b62cc109a6071b392a WHIRLPOOL e6d38ca7cba8cc2b752e06d78c5435a6ecb490d3975aa7dd6e60baabea311e76e895b917967ce498faef0666021a89811b900ebedaebbcc9ddade4bad295a359
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/vsound/files/vsound-0.6-stdout.patch b/media-sound/vsound/files/vsound-0.6-stdout.patch
new file mode 100644
index 000000000000..86cc6eb16c61
--- /dev/null
+++ b/media-sound/vsound/files/vsound-0.6-stdout.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/show_bug.cgi?id=117320
+diff -Naur vsound-0.6-orig/vsound.in vsound-0.6/vsound.in
+--- vsound-0.6-orig/vsound.in	2004-07-11 04:08:43.000000000 -0600
++++ vsound-0.6/vsound.in	2007-03-11 22:05:20.000000000 -0600
+@@ -153,7 +153,7 @@
+ 
+ export VSOUND_DATA=./vsound$$.au
+ 
+-if [ "$verbose" ] && [ "$VSOUND_STDOUT" ]; then
++if [ "$verbose" = 1 ] && [ "$VSOUND_STDOUT" ]; then
+ 	echo "Error : cannot specify both --verbose and --stdout."
+ 	exit 1
+ fi
diff --git a/media-sound/vsound/metadata.xml b/media-sound/vsound/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/vsound/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/vsound/vsound-0.6-r1.ebuild b/media-sound/vsound/vsound-0.6-r1.ebuild
new file mode 100644
index 000000000000..fad961ebbceb
--- /dev/null
+++ b/media-sound/vsound/vsound-0.6-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs autotools
+
+DESCRIPTION="A virtual audio loopback cable"
+HOMEPAGE="http://www.vsound.org/"
+SRC_URI="http://www.vsound.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
+
+RDEPEND=">=media-sound/sox-14.2.0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-stdout.patch
+	AT_M4DIR="." eautoreconf
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete
+}
+
+pkg_postinst() {
+	elog
+	elog "To use this program to, for instance, record audio from realplayer:"
+	elog "vsound realplay realmediafile.rm"
+	elog
+	elog "Or, to listen to realmediafile.rm at the same time:"
+	elog "vsound -d realplay realmediafile.rm"
+	elog
+	elog "See ${HOMEPAGE} or /usr/share/doc/${PF}/README.bz2 for more info"
+	elog
+}
diff --git a/media-sound/waheela/Manifest b/media-sound/waheela/Manifest
new file mode 100644
index 000000000000..f70148a61f55
--- /dev/null
+++ b/media-sound/waheela/Manifest
@@ -0,0 +1,5 @@
+DIST waheela_0.3.tar.gz 799802 SHA256 c984ea3ef647172d96393b054d738966f26dc5147b109db28d2a1a950f9e2fd8 SHA512 0145463f4a2059b88bd652c6125a1189358941ddb026a3055e1f3cb2e5bf1cb81f754cdb4f981abeec09cc2f7522a1b05d0ca162f4f686b781d42be4386eb18b WHIRLPOOL db8ab5e62b8788f7c038d33b2759ffe171b0de6622dad7f9fa0f98200aa69e4ceab4497c12f028ceea9034f0767d319b77514bb89c67fab9003e2274d85506d3
+EBUILD waheela-0.3.ebuild 437 SHA256 ff63593d73e231563b09dc59fb5206b96c29446b084cf8dd2d4b3844bfdd480b SHA512 3068880001b7720942b30213aaa7698ed2dbf42f6a183d68b588605512f37ab42bb8de0ab8587926a573cf582603afd0091697bbe625bdbab91ec09ae8f2cf04 WHIRLPOOL f3af3edd3e659ea1464d083b1c99fd1d8ff42feaa17ce8783c957985e4146f1c17827cfa0d0109bffa67df5a4508a590195933b3d54d4dcae6ef56bd9c0cf30c
+MISC ChangeLog 2426 SHA256 a76f497931c13cf386f0ff0b7c2a6671b0d6468ffa7505a48962517327c4fc3a SHA512 c44d89e30b0b0c4070f584cff2d94ec9d2ea79236a5656d0f2eb9885a2e05399ae1a3137ae73dd142f598bf812dd8a615ee882d52801e5d09b8222ef6f02caee WHIRLPOOL d30f6da8f7e33e8cf5b6b8b9ab2ff0c9e373c3de785c9b221c70765d9656107999305cf125bdf45dd0f83641030a9afcb6683b63afe75b1ec0afdb5b86d9b151
+MISC ChangeLog-2015 604 SHA256 2bbdf7dcde11318ee884ad0cd8a91ccd06085c9481eadd9bc1c13046b02e33bd SHA512 b1ab23aee696cc3506a6bab8ed2a6af52134d9437cfca6a8044a65a34082edb8dfb71c17cde458b5cf60179f94166446b65927717ff21067299a42f18ea79f2a WHIRLPOOL 3b54696da374dc51b53fa3488b28ff5ca824042bcc1462c7193111a5d64ed0137854c63dc7049f396abb1b6dab9094d8ae6d5a372c8530fafab90dfe32cb7c72
+MISC metadata.xml 245 SHA256 ae3610b0005f668b7174e8c49c0170e7642e895c8e13e7e2fedcfefee6940e1a SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e WHIRLPOOL 7abb1ad699d5aa3a0a0ebb0e8704df297ad9a662698cb59d1b48700aeb787e6208540e1e84f583a46bdd9975e27a75f04f7463585790b4e7865d0edfdb1e13ae
diff --git a/media-sound/waheela/metadata.xml b/media-sound/waheela/metadata.xml
new file mode 100644
index 000000000000..0cf59224b009
--- /dev/null
+++ b/media-sound/waheela/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/waheela/waheela-0.3.ebuild b/media-sound/waheela/waheela-0.3.ebuild
new file mode 100644
index 000000000000..41771f2bc6bb
--- /dev/null
+++ b/media-sound/waheela/waheela-0.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit kde4-base
+
+MY_P=${P/-/_}
+
+DESCRIPTION="Amarok Fullscreen Player"
+HOMEPAGE="http://kde-apps.org/content/show.php?content=108863"
+SRC_URI="http://linux.wuertz.org/dists/sid/main/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="media-sound/amarok:4"
+
+S=${WORKDIR}/${PN}
diff --git a/media-sound/wav2json/Manifest b/media-sound/wav2json/Manifest
new file mode 100644
index 000000000000..5ed40759f581
--- /dev/null
+++ b/media-sound/wav2json/Manifest
@@ -0,0 +1,4 @@
+DIST wav2json-0.4.tar.gz 742606 SHA256 ad1b1aff4fa7c026ae715681afd39620d1b468bbdfa64f00541d4b6d10b36044 SHA512 0bfac4dbd5c2535616fcf09e00914eb06fbf042dab6e69133c9ad6494328ff0bcb849d694499946cc6e8e6ac6dc0f1c68ef462c0a264c93da2c2a7aaea4281a0 WHIRLPOOL d0e83d64a882cf13e1df9e9b5a1c94a2601890dd2977fa704cc276319a405cd4cde239b6a3128af777c5500e3fddef07a5a2fa93470689d4f538c2c1a66b4312
+EBUILD wav2json-0.4.ebuild 600 SHA256 1c7bd173903d7406091b1269ed74ec851af45440af000757f3b1dfb513a4a97a SHA512 b3e87fb2ee9a1d7156d0da56659cc150b890e27d42cba0cfbc589ef4f460cedfae644b601433bcac451a204c3a565ebc5702dcd1cfb361342092e2d28836f6a4 WHIRLPOOL cd335129ecf14b85ed73927a7cd7f6e054729f4fdadcce75a23f75c54dee110734ea11fc6e56718cac4637772626d41a803fde0f0451e2a3d80f6de97bed91b0
+MISC ChangeLog 373 SHA256 025165378032031de69ed87aa8fdb0fa72f6592c7ce6ce93632ced7f6f26d3aa SHA512 e79156b9855b054e7b69855a95e6a86bd5c037dba9b25bfd8e7eece6bd75ebf419474591dc9f668a28ad872e66636f1ccbd8d7e84c474e291e0bee6f683ca05d WHIRLPOOL 30ae8cab9a254e60524c3c7abd8bbfd75a1df8adeb72d284cdbde9f3337e046f7513e5849d38fbb9a512b3f1e9f5e796453b0aa9ecab066d6a91e4f4e21aafad
+MISC metadata.xml 548 SHA256 c8ecfde8ef0ce91058c5a1ebfd89ad479f67f12a90825496632e436d132a6be6 SHA512 012a5561a943c3c64c2854a2cbc9412eb3e6bb250aa0e083e0889a481a6d806136c9e10e4c41995f9fd485fb704b3388b8cc4bc31810854ecbc589847dabbd3a WHIRLPOOL 44b6fd53df2a3b83f103a4909eb849b6db3c88f377d7df0c3dbb0967458b546816bdfcb397310733e663991f344837495810279e291446f59ba41c51b28db88b
diff --git a/media-sound/wav2json/metadata.xml b/media-sound/wav2json/metadata.xml
new file mode 100644
index 000000000000..41e34520996a
--- /dev/null
+++ b/media-sound/wav2json/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>pavel.a.denisov@gmail.com</email>
+    <name>Pavel Denisov</name>
+    <description>Proxied maintainer; set to assignee in all bugs</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">beschulz/wav2json</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/wav2json/wav2json-0.4.ebuild b/media-sound/wav2json/wav2json-0.4.ebuild
new file mode 100644
index 000000000000..6907ef34757d
--- /dev/null
+++ b/media-sound/wav2json/wav2json-0.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT_ID="e412923f1f792408e8ae1096ca40fb5307ddfc74"
+DESCRIPTION="Generate waveformjs.org compatible json data out of wav files"
+HOMEPAGE="https://github.com/beschulz/wav2json"
+SRC_URI="https://github.com/beschulz/wav2json/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
+
+S=${WORKDIR}/${PN}-${COMMIT_ID}/build
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/boost:=
+	media-libs/libsndfile
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ../bin/Linux/wav2json
+}
diff --git a/media-sound/wavbreaker/Manifest b/media-sound/wavbreaker/Manifest
new file mode 100644
index 000000000000..7d1617594c06
--- /dev/null
+++ b/media-sound/wavbreaker/Manifest
@@ -0,0 +1,6 @@
+AUX wavbreaker-0.10-pkgconfig.patch 350 SHA256 d56f01450a26b09bf9af3d44594a9808be8ea6d09182ac8666837dd4b1fb2fb4 SHA512 a8f75bc1592b4aab528175a055936fc23d50a266b8aaee317fa6039c5ccebed2e02db0454b2b4d6494fc8705ecd39bf04dfa485de6921961e53347dead9d0d45 WHIRLPOOL 3dc5f3576aa3b759ad4fc911abbf37fbb98595b250083655ae2163e50edc20ced6d958a242c5dda049887e667a2be75bd072c90ff0e7e847b8c1244fc3946817
+DIST wavbreaker-0.11.tar.gz 496733 SHA256 a1d70fc54f92f20fb4cc2ef01beb8f60bc5e8d1cedde6b1e5f8f453b14ead2d1 SHA512 3dee23ef7c0db651cd1ebae78db3f950b5b22ae4f0a323f66e1243a88c0e41390f9f4abde663ef7a1d1c841e0cbb779612d6078cd327a0f1d48e6a812c8ce4e1 WHIRLPOOL e8072cfec4597a1e1ff9da6d65422d96c3586efdfc2829acf5f23e850b66bdf9f0113bd5140a7d69b0d8c352eefc5ee39f814fdaa9a6d8e54c6eaa92b7e4d98d
+EBUILD wavbreaker-0.11.ebuild 843 SHA256 a8e35356922fca908f9f6e9912cb2a66fd5b20a0f3f46dc46c57822f4db6a7e7 SHA512 3f7ca2662350449372db81125d22646f4bb4a8fa1dc70d5194b4202a3ab196bea349ff25e2705ad1c6db81558002b98aef6e1cfda288cfced6455f396712f1a6 WHIRLPOOL afd97118ba7a2cdb7fd4cf57364da2421ba8fa65e336065e1cda4929290f4115a44c68985ea1688f04f2d51c8c4821f74562d4b87200b8f98862a13fec44c56e
+MISC ChangeLog 2479 SHA256 a935be0c78011168b71dc2acaca55170b97b070570b87e27aa7833b90129d0c0 SHA512 a1c8397139145d7522d7e81aa07065e61f60082749e9c07eea02a6c065f102a5c54b2e324bd31761d2cbea57c888cde4eeb1962b4d919126257616be5f8842f6 WHIRLPOOL eeb282b77bfcd44a6ff96eceef82ab8d4effd53724378d721757569485c6d250ddba1d69cd671151180f809321ea199dfc585e72a8594d9a740254a021e81d28
+MISC ChangeLog-2015 4816 SHA256 2f5210dfe04f1a6540d4b7ba27298c1f40ca48288829fc39e580eb56cd71f8f5 SHA512 010b893d7485267053469e04ffc78a95d16d17f81c1aacab9a2c8ac2bead6c1fac639b77db62a26a1f555465adfcc9439b05e727a76701cbbba7cb1d007e8143 WHIRLPOOL 056802d529f1d4648c32fb3cce677ce2dd229b03884231db504134c9da294ce6dc1e27099faaf45e4731a7470cde414dfb97eee436f3e2be27ceb2001ac814b3
+MISC metadata.xml 333 SHA256 18b7ea4eda8272a642f9fc72613e6530a59a5b8a3d94dfb4f8e56f838e5dccf5 SHA512 d96b3c68abb0afe8c0821d0c9d5b48089e201dcdffffedcc41ee93d44fa3cc11b22eb782b13ded1fde4bfe2187aa2b371a2167d7305ade2bfeff0d201657ac98 WHIRLPOOL d93289543132a4c92a58619204614c2d8bff1579f6f9fd811db5e6e8bc9ef346c711b55f8d319795fa34c6a9c9343afe0b00b1f58a0f6f80fa7faec2683da038
diff --git a/media-sound/wavbreaker/files/wavbreaker-0.10-pkgconfig.patch b/media-sound/wavbreaker/files/wavbreaker-0.10-pkgconfig.patch
new file mode 100644
index 000000000000..06a3d04adcba
--- /dev/null
+++ b/media-sound/wavbreaker/files/wavbreaker-0.10-pkgconfig.patch
@@ -0,0 +1,11 @@
+diff -ur wavbreaker-0.10.orig/configure.in wavbreaker-0.10/configure.in
+--- wavbreaker-0.10.orig/configure.in	2008-06-02 09:44:27.000000000 +0300
++++ wavbreaker-0.10/configure.in	2008-06-14 15:28:26.000000000 +0300
+@@ -30,6 +30,7 @@
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
++PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB([m], [cos])
diff --git a/media-sound/wavbreaker/metadata.xml b/media-sound/wavbreaker/metadata.xml
new file mode 100644
index 000000000000..66ce1ead9f22
--- /dev/null
+++ b/media-sound/wavbreaker/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wavbreaker</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/wavbreaker/wavbreaker-0.11.ebuild b/media-sound/wavbreaker/wavbreaker-0.11.ebuild
new file mode 100644
index 000000000000..482c8096fc2d
--- /dev/null
+++ b/media-sound/wavbreaker/wavbreaker-0.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="wavbreaker/wavmerge GTK+ utility to break or merge WAV files"
+HOMEPAGE="http://wavbreaker.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="alsa nls oss pulseaudio"
+
+RDEPEND="dev-libs/libxml2
+	>=x11-libs/gtk+-2:2
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog CONTRIBUTORS NEWS README* TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.10-pkgconfig.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable alsa) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable oss)
+}
diff --git a/media-sound/wavegain/Manifest b/media-sound/wavegain/Manifest
new file mode 100644
index 000000000000..8d469f5a48c7
--- /dev/null
+++ b/media-sound/wavegain/Manifest
@@ -0,0 +1,5 @@
+DIST wavegain-1.3.1srcs.zip 72180 SHA256 773aaa8e18a0c130714f4bf21afb9ee0ba29d6c5742002191bfdf52f25b48da0 SHA512 5d0d589259e362a415a5cd5e42464b5e7c7e79c62082ebd423457b6e2d9c3d15300d854e57e2c51c66f1579394bbcdc3d754bb8363d809c2d8d5f03b09dce054 WHIRLPOOL 2a36c8b8b076e0250547041ff7fff01c240677376992aab1edb7a2e09971c39c5b33aa6731d8d34b108a55cdbb666f0bebf165daffcd6ebff59f4cdcbff271d4
+EBUILD wavegain-1.3.1.ebuild 583 SHA256 ca6a36fe2e6fe8b8109bc5f4d3822bc749d1c409368c2b4f6faaf34938e1616d SHA512 a1f1bd47e7f79b04182b522359bb4b611fd8679d94995f570499989cf30c6764ae1fbc9445b43d11be9b5aecb14c8e4b25b53877c66cb916468ded1a4804fa6a WHIRLPOOL 7e14eebd01fa51a3dedfb6b4b355ed5dcd3596c931dfecaecda6267de12ad15d811e13493de996c157ad49484f65857f61d43d017c88a640d3433c06acd2dc4c
+MISC ChangeLog 2608 SHA256 d717731cddef6a7459a5caaab6bcf79c8244e530f91807c56683630c701bb757 SHA512 66d39c3cdf86094b12c6d1ba3471fb419e217f894b193ca80a17716b65d99b4babf5a0a73f9836fa4176524800833cc3b8fbd37b46bd25ba31e377c8aad219ec WHIRLPOOL 2370a41b772484d579852fbd358dfe06412d18bce8b1cf1953192a24023d592b223821ce583f2316517868a8fd45e46bdce7dcac7e4a90ab754eca8e9939df98
+MISC ChangeLog-2015 2455 SHA256 bd5e0664bef6fad6a53e66fd897a7e760f63515a430f57d0d050ce6c8819362c SHA512 cdcabae5f8e4a2f6f0304d5f11e09f6054c902f857bec05f30209e3addcceb3aa04d9f487ce07591279e7b33406e1cfe6afda1c8a912c27565720b45baa09a94 WHIRLPOOL d7726e1231c23d39144a161b59dcb3ccdfe79a55d2fe82adaee3fa0c759807e66edd692aa8b7a58a042131286670cf0818468308721088e67623e95c9e046e85
+MISC metadata.xml 259 SHA256 1321ae0a7e2232e5201f0537a1a6a49bd4fa5f03c1224a00e3edfb71d02bd29a SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360 WHIRLPOOL a2363e099d54512fba9b48dab9ebf3cb1346857aff3fedb1b318c5942093ee1fc6a5492f11faf5713e934dfa0fbbc70eab52e5319b5afc3d0e17ff56caa7c3fa
diff --git a/media-sound/wavegain/metadata.xml b/media-sound/wavegain/metadata.xml
new file mode 100644
index 000000000000..39626a990be5
--- /dev/null
+++ b/media-sound/wavegain/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/wavegain/wavegain-1.3.1.ebuild b/media-sound/wavegain/wavegain-1.3.1.ebuild
new file mode 100644
index 000000000000..82d8dd18cfcc
--- /dev/null
+++ b/media-sound/wavegain/wavegain-1.3.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="ReplayGain for WAVE audio files"
+HOMEPAGE="http://www.rarewares.org/files/others/"
+SRC_URI="http://www.rarewares.org/files/others/${P}srcs.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${P/wavegain/WaveGain}
+
+src_compile(){
+	$(tc-getCC) ${LDFLAGS} ${CFLAGS} *.c -o ${PN} \
+		-DHAVE_CONFIG_H -lm || die "build failed"
+}
+
+src_install(){
+	dobin ${PN}
+}
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
new file mode 100644
index 000000000000..08cc672633a3
--- /dev/null
+++ b/media-sound/wavpack/Manifest
@@ -0,0 +1,6 @@
+AUX wavpack-5.1.0-armv7.patch 805 SHA256 a849bdf12f7efa0dcf016ef2e7046efb530545f8274446050dbb45bc278a9b2d SHA512 b152f8081b712c24ae8db641f4755798ab4c7412a298054449883255fa76571ffbd0c580848a274ce1c44401f69102a0b2c66137ae36d9323e9e5330ee20856e WHIRLPOOL c634d0925b22338f2193b5682351b7801c1714171c9b8b176e7e5ed85482076ba95b4c1e0eee46f0f791ba600d9c376d1de12515f230e09bb3a44e3a54587e64
+DIST wavpack-5.1.0.tar.bz2 824331 SHA256 1939627d5358d1da62bc6158d63f7ed12905552f3a799c799ee90296a7612944 SHA512 4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54 WHIRLPOOL 4f90a2c63c3dbcbde42b4e0f42b3b0ea871e705189c4ccd3bc247c5370f8008c062f5513c7dcfd3b258002125f688c091d37eec4f16685698bb3cae747044617
+EBUILD wavpack-5.1.0.ebuild 884 SHA256 3fddc7cd1e31c5e6471ad2a9fc1cbf9ef107ea23acfa2cf83f1cf7936adfc61f SHA512 fd4076f6c43c366065059ae0184a8e067cb7e532a9a70b90e51988fe4d95f944db3c1c33d203c4e5146be6e9652d8bf170d909374886792151c5e773ab0bc040 WHIRLPOOL 9f53aa6967366eccbe18aaa4e3e5748fc1376847b0f33c45d1bfe13140d6a13a67a067fd2bd944a37ce1765bd12a25571e0880c888929939da8649a6c1727b37
+MISC ChangeLog 3072 SHA256 65e6645aa3e9952e11b9be7c7d72d5e401161bbd80decf66a49e3176f88666f8 SHA512 e0dcbb63f2f590a5ad5534cfd2e10ebc9ea6a4b29d17bd152807e0c5d06088dbdf8db196c3cdd5c3500af226d9377168b9c194d09ce34ae6e89f6063a0b7e7ca WHIRLPOOL 3178a46301810ad168629b9bba684c518aac109f2a7978ed8b31db30d88d5680c19b0adc34ac50a76654ab89820820aec55c6e8eb9e452f8b200cb0956c2d9a0
+MISC ChangeLog-2015 10671 SHA256 0c3b9afbfe32d6ac8aa03032f0d1c239ca0a193d74b88f3e2d2cf93351dd63ae SHA512 ea64ad3bfb91b51b734acc1159ccee73c43d70765f16adc533b86ade6d9cf6b30fa7b79a1e6d5a06207fc5ddf16d4d5b80f1f91424a07a825b3c9e2ac5f182d8 WHIRLPOOL 5ab212d20c20de337d0771cb8fbe5d3db0dcc5b156f6e4b2108813f3c93ef42064a15148bfaf20fbd8ed5ec42a2827eaff77c0b25d8bb24ef9d400ef68b6c6e9
+MISC metadata.xml 253 SHA256 6b992cbf9f9d479cdf83d3f9a1ec920aa0be988f39ee4f1f41fd12b917f1b36b SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 WHIRLPOOL 73df5c8f06d7079d8407b50207f0c217cf57ae161fbaf3c39e168b6f11b2bfac4f61b6191a5b9beecc981c003191844660c330dc8679580e1d2d336ff4e38e00
diff --git a/media-sound/wavpack/files/wavpack-5.1.0-armv7.patch b/media-sound/wavpack/files/wavpack-5.1.0-armv7.patch
new file mode 100644
index 000000000000..f6e6f66280fa
--- /dev/null
+++ b/media-sound/wavpack/files/wavpack-5.1.0-armv7.patch
@@ -0,0 +1,19 @@
+ARM asm is armv7 only in wavpack. Restrict based on host cpu.
+https://bugs.gentoo.org/show_bug.cgi?id=609168
+
+Upstream PR:
+https://github.com/dbry/WavPack/pull/20
+
+Index: wavpack-5.1.0/configure.ac
+===================================================================
+--- wavpack-5.1.0.orig/configure.ac
++++ wavpack-5.1.0/configure.ac
+@@ -159,7 +159,7 @@ AS_IF([test "x$enable_asm" != "xno"],[
+   AS_CASE([$host_cpu],
+     [i386|i486|i586|i686|i786], [AC_DEFINE([OPT_ASM_X86]) asm_selected=x86],
+     [x86_64], [AC_DEFINE([OPT_ASM_X64]) asm_selected=x64],
+-    [arm*], [AC_DEFINE([OPT_ASM_ARM]) asm_selected=arm],
++    [armv7*], [AC_DEFINE([OPT_ASM_ARM]) asm_selected=arm],
+     [AS_IF([test "x$enable_asm" = "xyes"],[AC_MSG_ERROR(no assembly code for CPU $host_cpu)])]
+   )
+   AC_MSG_RESULT($asm_selected)
diff --git a/media-sound/wavpack/metadata.xml b/media-sound/wavpack/metadata.xml
new file mode 100644
index 000000000000..ee7258ac28eb
--- /dev/null
+++ b/media-sound/wavpack/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/wavpack/wavpack-5.1.0.ebuild b/media-sound/wavpack/wavpack-5.1.0.ebuild
new file mode 100644
index 000000000000..90e2d630992f
--- /dev/null
+++ b/media-sound/wavpack/wavpack-5.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+AUTOTOOLS_AUTORECONF=yes
+inherit autotools-multilib
+
+DESCRIPTION="Hybrid lossless audio compression tools"
+HOMEPAGE="http://www.wavpack.com/"
+SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=virtual/libiconv-0-r1
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README )
+PATCHES=( "${FILESDIR}/${P}-armv7.patch" )
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(multilib_native_enable apps)
+	)
+	autotools-utils_src_configure
+}
diff --git a/media-sound/wavplay/Manifest b/media-sound/wavplay/Manifest
new file mode 100644
index 000000000000..fdce9107e449
--- /dev/null
+++ b/media-sound/wavplay/Manifest
@@ -0,0 +1,5 @@
+DIST wavplay-2.0.tar.gz 368945 SHA256 256ea0b581d587b482e0c928869e3896845a5299b8e124c01749b4b9edfeb552 SHA512 f0edfac9bee534da00bf10cb1c07a15ba2df92a680b4632b7e721345c0e6644ddb090d29e23735a020d454de1d559ef2e053f2e481818ec56dd6afd8db009e15 WHIRLPOOL e517bcf02bfa3b63ae7235292a6d5bf7f73c9683e6a7573399ce53cd46d22ccb3c98fd136ea862fe728e14cb08b76953fcacc87219adef9090140ae73eafcb50
+EBUILD wavplay-2.0.ebuild 470 SHA256 57f9f28a649ee3aafbbee610b18caca4438f9774e67328a3f04857b8e89b734c SHA512 8c47144e257ac97b2c93874de8c7cbe1f36b3df4a32a0785a8c72f54e25c20598eb62bb71d7b600c7f0dd1b44dca05e6bbb92d3d7904355f372870bcbc963e88 WHIRLPOOL a1000d005eba2d98bb9f2433fdff28f3dd612187eb2c839bd7a0b76ba88851ae85b312a94b5e21ef6a7134a1ba637dd7428874abcb0e157172098f214f21e05b
+MISC ChangeLog 2536 SHA256 5eba3e548e9a0cd7dc06e637bbb56978119c1891cbeb4e35ae9ebbe171bd827d SHA512 25f6704d1ab5d690a4ce36c1bf2561f67dcaa23eef5f29c3e510f09c674b9b19e3e953af9c0d57ff67cd09022271d5e256cec8ca6e622722827619ef1ad7a54d WHIRLPOOL 87769630346e7204dfe6a99fa4f599c4e7a9c99d02b1ab67f5b12e2e20c9e36b402807fcc9ced8b7999e83ed69199a2c8ee5f69e17abbd9839be90ac10b64372
+MISC ChangeLog-2015 1991 SHA256 95cedeb64a35b95149c4ace0e5ac28e8d4794906f68a0938e3f98cd78da4235e SHA512 a301f30a557d220cc49c329876ec8f92d99f9b8e59f5c2e555ddcb1539f12d484e5c8502cde18602b63459bce1e4c65cbd258132e7f4c373b8a8d07dfdc0a820 WHIRLPOOL 8730b559a5bd47ccf66ed3740a346fda383a3d2d49ab483ad46eabcf65ccd7e49012b895d3a3606599ac9fbe806c34af837e94ac62798da9e2aaea5638836c00
+MISC metadata.xml 330 SHA256 5cdbc9544bbf511cbe209b5bb4a53585a24e16d109ebed071eafe18d8d811b14 SHA512 2a64a5c1a4c2905d1debb8b24c2c04e77112f253edb247b53c3fdd8d26cc530473f7af20d86c70eae8a7da79ad8a2a0c6d00b4727ca17f64a9af209c2ee0609c WHIRLPOOL 6d823c274621f6ab4b09c58207915301c740d44cf83f769590a46df307f6fc9c37ea684860595fb1ebf830fbcf5b1d5e2b21d06d2fbebb4cde22459120958534
diff --git a/media-sound/wavplay/metadata.xml b/media-sound/wavplay/metadata.xml
new file mode 100644
index 000000000000..9967d62bd156
--- /dev/null
+++ b/media-sound/wavplay/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wavplay</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/wavplay/wavplay-2.0.ebuild b/media-sound/wavplay/wavplay-2.0.ebuild
new file mode 100644
index 000000000000..a60eb094a6de
--- /dev/null
+++ b/media-sound/wavplay/wavplay-2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools
+
+DESCRIPTION="A command line player/recorder for wav files"
+HOMEPAGE="https://sourceforge.net/projects/wavplay/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+src_prepare() {
+	sed -i -e "/dist_pkgdata/d" src/Makefile.am
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-nox
+}
diff --git a/media-sound/wavsplit/Manifest b/media-sound/wavsplit/Manifest
new file mode 100644
index 000000000000..040325512e96
--- /dev/null
+++ b/media-sound/wavsplit/Manifest
@@ -0,0 +1,8 @@
+AUX wavsplit-1.2.1-64bit.patch 1929 SHA256 00a57a379d9e46853ea0489300abe0011e179cb15184795e45f15016b6014ad7 SHA512 801fdabbb89c19899b20b15b87ff412d33ee37dacd78b8fd62683bcbdb97b3945ae549aaa041bcf93442eb9f023feacb537c1c9763cd80900620c23ea99e7038 WHIRLPOOL b9d93340df8eb6e61223cb8deb6610adf9e97730e89147e261fa36808e133f72f4addb2a07b982b5b61cff96d52923304bb7c23b50fe0c2cc35517ca394fcaca
+AUX wavsplit-1.2.1-Makefile.patch 495 SHA256 969e09af86f71b9d35008ac564d1ec1818b090205fe279e57c931ddb6a3d0007 SHA512 3e72e39a8ece459d9acf3079231d20da99f9091c0215e7ca0ac27105bdde27caba05bb78666d97bc2dd06a276a63aa0cebccd567b1b72b6e8c5d8c230d94de81 WHIRLPOOL 6fd6aa80b940b7496cbee5ff2ea62415c4cc55387ff73a85178ece57fa4a6b1dc2c115c1e8cb564aa21dbc2d9a5b457c286b07163432b4523eb807bf06b7b894
+AUX wavsplit-1.2.1-large-files.patch 6265 SHA256 00598bfa0530ae841dedf708b802b4ee20aac3d30712ba0f556ee816fb9590e7 SHA512 8a2db26a87396eb57f16b379575949784e0ddca8d64b8c91d4478e38603dd351e957c4271499e8ef9f9e10710f7f6f0b01a82c517d808b224b9a5b3db5317b35 WHIRLPOOL c1881df6e7d7dc086fd0c78011dfcbdae53e424cd445b8b133349fb8053329a0ebc20817f283d4df05b492f7b399a2ad31fea497cf44bb3d3d7058a4df19f77f
+DIST wavsplit-1.2.1.tar.gz 32246 SHA256 266970b06888a9030573de07adf85c316bd0850eb663ed3a65248b6f64107e8a SHA512 df0e4bf867fb19e50a8be10f13ed6f4c40e848106c6053661f7226e9893715f0318af4b19bf289b840dbf72768b8508af38351c24725cf3eb81a9f3dbcd27a19 WHIRLPOOL c016c12c16c8ba2992c77fbc63814924a1d01d1ccdb8ab33e513922816d4127a4dfce0551a2dea2e988843524c5d8062f43cc9e84763c75bc971a748c5e7a49f
+EBUILD wavsplit-1.2.1-r1.ebuild 812 SHA256 708faba0204287ee3231bcfc2ad627194704c6cbf9469cb603353a39559767a2 SHA512 a5dc805776a23e54bcdde8057503ffc00bf4c78fb34a4870eb2d2338b6c55861d113b06b066ce8036527d0bbfc8f0f57fabcd138f9c29f092084654e14e9f2e8 WHIRLPOOL abfe299483e52c4a0f15505e2cd02fcedab62cb84108f9605ed426dbf6b0b957f8e31b0197094f358c9d8251e48d1e63602fe1a3590159ec0acddaef29922bbc
+MISC ChangeLog 2673 SHA256 449864df5c048c37de9d7ac1b50c2d3a31f5053c0255e68ff0b5971bddd20b64 SHA512 7a6d2370692fdc093fc4c55dc3fe6334cffc5c3d046274091d259a3a58ebedca918b5d4e40c9667f6e439f02d84d2390bdf0f712d5dce90fa0f94c983571dbab WHIRLPOOL c17b795dc625bfc038ad84dedeee9ed160b0c4ae14c741a8a7cf6b2f09c81418cd8797b6f88969d555a52b685cdf1333c3d564674f495997f732e7138232df0b
+MISC ChangeLog-2015 2017 SHA256 fa0175935446d3c9e1d4d7da20fe0a25361b4523faa29297122da6bcd2e7a5ca SHA512 4e7a5f93e61647def3d3b9e369cd50def0bbddff51451cebf78c5780bb6890919a4828204cfd2286dcdf63ab8efb73b47cd8fac9eaef699eb37ff3900a7c993b WHIRLPOOL 409001e798421555492fd3a366a0b59aa1550b10cc32f4c04db85d587a0512cbec5aaa5e8afba1b3129155f272d791b581c28ea6b2e4ec3772311be1c80d468c
+MISC metadata.xml 331 SHA256 4da8eb92d02b15808dfecad03e82fe6a42f8efe48e3fa660597d564314d5eace SHA512 c9839a79cbe27caf7ce682e8b6db6e6b0abda1b1ee643820272f78026f6f7695e641980cbed35d8a89a050ff778d715bc7e7960bdef04fd4e1a29b355fba08f2 WHIRLPOOL 0bbf927e8dc88b1c142ca32cf59213e80750c4d10b2c5cd1cab12052670d5c4e06d2a4130ea753a622fe31419c139f727771b9a0508292b02bfc10174984937a
diff --git a/media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch b/media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch
new file mode 100644
index 000000000000..abfaf424113b
--- /dev/null
+++ b/media-sound/wavsplit/files/wavsplit-1.2.1-64bit.patch
@@ -0,0 +1,69 @@
+--- bak/wavsplit.c	2006-11-24 17:53:36.056883000 +0100
++++ wavsplit.c	2006-11-24 17:52:38.345276250 +0100
+@@ -403,7 +403,7 @@
+   ptr += 4;                     /* we move past fmt_ */
+   memcpy (&waveformat, ptr, sizeof (WAVEFORMAT));
+ 
+-  if (waveformat.dwSize < (sizeof (WAVEFORMAT) - sizeof (u_long))) {
++  if (waveformat.dwSize < (sizeof (WAVEFORMAT) - sizeof (u_int))) {
+     fprintf (stderr, "Bad format: Bad fmt size\n");
+     return 1;
+   }
+@@ -423,7 +423,7 @@
+   }
+ 
+   ptr += 4;                     /* we move past data */
+-  memcpy (&databytes, ptr, sizeof (u_long));
++  memcpy (&databytes, ptr, sizeof (u_int));
+ 
+   struct stat stat_buf;
+ 
+@@ -446,7 +446,7 @@
+ 
+   if (verbose) {
+     printf ("Channels: %d\n", waveformat.wChannels);
+-    printf ("Samplerate: %ldHz\n", waveformat.dwSamplesPerSec);
++    printf ("Samplerate: %dHz\n", waveformat.dwSamplesPerSec);
+     printf ("Samplebits: %d\n", waveformat.wBitsPerSample);
+     printf ("Databytes: %llu\n\n", databytes);
+     printf ("Split         Hours  Mins   Seconds         Bytes         %%\n");
+--- bak/wavsplit.h	2006-11-24 17:53:36.056883000 +0100
++++ wavsplit.h	2006-11-24 17:43:58.648797250 +0100
+@@ -46,29 +46,29 @@
+ } TIMEFORMAT;
+ 
+ typedef struct {
+-  u_long dwSize;
++  u_int dwSize;
+   u_short wFormatTag;
+   u_short wChannels;
+-  u_long dwSamplesPerSec;
+-  u_long dwAvgBytesPerSec;
++  u_int dwSamplesPerSec;
++  u_int dwAvgBytesPerSec;
+   u_short wBlockAlign;
+   u_short wBitsPerSample;
+ } WAVEFORMAT;
+ 
+ typedef struct {
+   char RiffID[4];
+-  u_long RiffSize;
++  u_int RiffSize;
+   char WaveID[4];
+   char FmtID[4];
+-  u_long FmtSize;
++  u_int FmtSize;
+   u_short wFormatTag;
+   u_short nChannels;
+-  u_long nSamplesPerSec;
+-  u_long nAvgBytesPerSec;
++  u_int nSamplesPerSec;
++  u_int nAvgBytesPerSec;
+   u_short nBlockAlign;
+   u_short wBitsPerSample;
+   char DataID[4];
+-  u_long nDataBytes;
++  u_int nDataBytes;
+ } WAVE_HEADER;
+ 
+ typedef struct {
diff --git a/media-sound/wavsplit/files/wavsplit-1.2.1-Makefile.patch b/media-sound/wavsplit/files/wavsplit-1.2.1-Makefile.patch
new file mode 100644
index 000000000000..a4b35a64fefe
--- /dev/null
+++ b/media-sound/wavsplit/files/wavsplit-1.2.1-Makefile.patch
@@ -0,0 +1,23 @@
+--- Makefile.old	2006-03-30 08:54:03.000000000 +0200
++++ Makefile	2006-03-30 08:55:04.000000000 +0200
+@@ -6,16 +6,16 @@
+ version = 1.2.1
+ 
+ CC = gcc
+-CFLAGS = -Wall
+-LDFLAGS = -lm
++CFLAGS += -Wall
++LIBS = -lm
+ 
+ all: wavsplit wavren
+ 
+ wavsplit:  wavsplit.c wavsplit.h
+-	gcc $(CFLAGS) wavsplit.c $(LDFLAGS) -o $@
++	$(CC) $(CFLAGS) wavsplit.c $(LIBS) $(LDFLAGS) -o $@
+ 
+ wavren: wavren.c
+-	gcc $(CFLAGS) wavren.c -o $@
++	$(CC) $(CFLAGS) wavren.c $(LDFLAGS) -o $@
+ 
+ install:
+ 	cp wavsplit $(BIN)
diff --git a/media-sound/wavsplit/files/wavsplit-1.2.1-large-files.patch b/media-sound/wavsplit/files/wavsplit-1.2.1-large-files.patch
new file mode 100644
index 000000000000..ff27231be65e
--- /dev/null
+++ b/media-sound/wavsplit/files/wavsplit-1.2.1-large-files.patch
@@ -0,0 +1,193 @@
+--- Makefile	2004-11-17 23:19:17.000000000 +0100
++++ Makefile	2005-01-16 21:23:33.000000000 +0100
+@@ -6,7 +6,7 @@
+ version = 1.2.1
+ 
+ CC = gcc
+-CFLAGS += -Wall
++CFLAGS += -Wall -D_FILE_OFFSET_BITS=64
+ LIBS = -lm
+ 
+ all: wavsplit wavren
+--- wavsplit.c	2004-11-17 23:19:17.000000000 +0100
++++ wavsplit.c	2005-01-16 22:04:39.000000000 +0100
+@@ -269,9 +269,9 @@
+            timepos * split)
+ {
+   char *buf, *bp_out;
+-  long to_write, to_read, n_read, pos;
++  off_t to_write, to_read, n_read, pos;
+   int fnr = 0;
+-  unsigned long in_blk_size;
++  off_t in_blk_size;
+   struct stat stat_buf;
+ 
+   /* Buffer reservieren */
+@@ -282,8 +282,8 @@
+   in_blk_size = stat_buf.st_blksize;
+   buf = malloc (in_blk_size + 1);
+   if (buf == NULL) {
+-    fprintf (stderr, "Could not allocate %ld bytes of memory.\n",
+-             in_blk_size + 1);
++    fprintf (stderr, "Could not allocate %llu bytes of memory.\n",
++             (in_blk_size + 1));
+     return 1;
+   }
+   /* if (verbose) printf("Allocated %ld bytes for buffer.\n", in_blk_size+1); */
+@@ -295,7 +295,7 @@
+     return 1;
+ 
+   do {
+-    n_read = (long) stdread (buf, in_blk_size + 1);
++    n_read = stdread (buf, in_blk_size + 1);
+     if (n_read < 0) {
+       fprintf (stderr, "Error while reading.\n");
+       return 1;
+@@ -336,7 +336,7 @@
+           else {
+             if (verbose)
+               printf
+-                ("[%02d]\tuntil the end                %12ld   100.00%%\n",
++                ("[%02d]\tuntil the end                %12llu   100.00%%\n",
+                  fnr + 1, databytes);
+           }
+         }
+@@ -374,7 +374,7 @@
+ int readheader ()
+ {
+   char ibuffer[BUFFERSIZE];
+-  u_long offset;
++  off_t offset;
+ 
+   if (lseek (ifd, 0L, SEEK_SET)) {
+     fprintf (stderr, "Could not locate beginning of input file\n");
+@@ -425,9 +425,22 @@
+   ptr += 4;                     /* we move past data */
+   memcpy (&databytes, ptr, sizeof (u_long));
+ 
+-  offset = (u_long) ptr + 4 - (u_long) ibuffer;
++  struct stat stat_buf;
++
++  /* Buffer reservieren */
++  if (fstat (ifd, &stat_buf) < 0) {
++    fprintf (stderr, "Could not read input file state.\n");
++    return 1;
++  }
++  if(stat_buf.st_size > databytes)  {
++    printf("Actual size of file (%llu) is larger than the databytes (%llu), setting to actual size: %llu!\n", 
++      stat_buf.st_size, databytes + (ptr - ibuffer) + 4, stat_buf.st_size - (ptr - ibuffer) - 4  );
++    databytes = stat_buf.st_size - (ptr - ibuffer) - 4 ;
++  }
++  
++  offset = ptr + 4 - ibuffer;
+   if (lseek (ifd, offset, SEEK_SET) == -1) {
+-    fprintf (stderr, "Error seeking to WAV data at %lu\n", offset);
++    fprintf (stderr, "Error seeking to WAV data at %llu\n", offset);
+     return 1;
+   }
+ 
+@@ -435,7 +448,7 @@
+     printf ("Channels: %d\n", waveformat.wChannels);
+     printf ("Samplerate: %ldHz\n", waveformat.dwSamplesPerSec);
+     printf ("Samplebits: %d\n", waveformat.wBitsPerSample);
+-    printf ("Databytes: %ld\n\n", databytes);
++    printf ("Databytes: %llu\n\n", databytes);
+     printf ("Split         Hours  Mins   Seconds         Bytes         %%\n");
+     //printf("Blocks: %ld\n",databytes/waveformat.wBlockAlign);
+   }
+@@ -473,7 +486,7 @@
+   return NULL;
+ }
+ 
+-int createout (int num, long datasize)
++int createout (int num, off_t datasize)
+ {
+   char ofile[MAX_PATH + 1];
+   sprintf (ofile, "%s/%02d.wav", basename, num);
+@@ -517,7 +530,7 @@
+     TimeFloat = hr* 3600.0 + min * 60.0 + sek + (frames/fps);
+ 
+ */
+-long calcsplit (unsigned int UseHours, unsigned int UseFrames,
++off_t calcsplit (unsigned int UseHours, unsigned int UseFrames,
+                 unsigned int fps, unsigned int UseTrackLens,
+                 int splitnr, timepos * split)
+ {
+@@ -526,7 +539,7 @@
+ 
+   double TimeFloat = 0.0;
+   double SplitTimeFloat = 0.0;
+-  long pos;
++  off_t pos;
+   unsigned int Opt = 2 * UseHours + UseFrames;
+ 
+   switch (Opt) {
+@@ -569,7 +582,7 @@
+   /* first calculate to the nearest sample, then scale by the  */
+   /* block size to avoid getting e.g. half a block */
+ 
+-  pos = (long) ((SplitTimeFloat * (double) waveformat.dwSamplesPerSec));
++  pos = (off_t) ((SplitTimeFloat * (double) waveformat.dwSamplesPerSec));
+   pos = pos * waveformat.wBlockAlign;
+ 
+   if (verbose) {
+@@ -581,24 +594,24 @@
+     }
+   }
+   if (UseFrames)
+-    printf ("%5d  %8.3f  %12ld    %3.2f%%\n",
++    printf ("%5d  %8.3f  %12llu    %3.2f%%\n",
+             split[splitnr].min,
+             (double) split[splitnr].seki +
+             ((double) split[splitnr].frames / (double) fps), pos,
+             (float) pos / (float) databytes * 100);
+ 
+   else
+-    printf ("%5d  %8.3f  %12ld    %3.2f%%\n",
++    printf ("%5d  %8.3f  %12llu    %3.2f%%\n",
+             split[splitnr].min,
+             split[splitnr].sek, pos, (float) pos / (float) databytes * 100);
+ 
+   return pos;
+ }
+ 
+-long stdread (char *buf, long nchars)
++off_t stdread (char *buf, off_t nchars)
+ {
+-  int n_read;
+-  int to_be_read = nchars;
++  off_t n_read;
++  off_t to_be_read = nchars;
+ 
+   while (to_be_read) {
+     n_read = read (ifd, buf, to_be_read);
+--- wavsplit.h	2004-11-17 23:19:17.000000000 +0100
++++ wavsplit.h	2005-01-16 21:23:33.000000000 +0100
+@@ -121,15 +121,15 @@
+ static int split (unsigned int UseHours, unsigned int UseFrames,
+                   unsigned int fps, unsigned int UseTrackLens,
+                   int splits, timepos * splitpos);
+-static long calcsplit (unsigned int UseHours, unsigned int UseFrames,
++static off_t calcsplit (unsigned int UseHours, unsigned int UseFrames,
+                        unsigned int fps, unsigned int UseTrackLens,
+                        int splitnr, timepos * split);
+-static int createout ();
++static int createout (int num, off_t datasize);
+ int closeout ();
+ void display (unsigned char avgleft, unsigned char avgright,
+               unsigned char avgloud);
+ static void usage ();
+-static long stdread (char *buf, long nchars);
++static off_t stdread (char *buf, off_t nchars);
+ #ifdef __powerpc__
+ static _ConvertHeaderFromNative (WAVE_HEADER * hdr);
+ static _ConvertHeaderToNative (WAVE_HEADER * hdr);
+@@ -137,7 +137,7 @@
+ 
+ static char *ptr;
+ static WAVEFORMAT waveformat;
+-static u_long databytes, b;
++static off_t databytes, b;
+ static int ifd, ofd;
+ static int verbose;
+ static char basename[MAX_PATH + 1], ifile[MAX_PATH + 1];
diff --git a/media-sound/wavsplit/metadata.xml b/media-sound/wavsplit/metadata.xml
new file mode 100644
index 000000000000..ab322105f25c
--- /dev/null
+++ b/media-sound/wavsplit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wavsplit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild b/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..18b9dbcd2bb3
--- /dev/null
+++ b/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="WavSplit is a simple command line tool to split WAV files"
+HOMEPAGE="https://sourceforge.net/projects/wavsplit/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-sparc, -amd64: 1.0: "Only supports PCM wave format" error message.
+KEYWORDS="~amd64 -sparc x86"
+IUSE=""
+
+src_prepare() {
+	emake clean || die
+	epatch "${FILESDIR}"/${P}-Makefile.patch \
+		"${FILESDIR}"/${P}-large-files.patch \
+		"${FILESDIR}"/${P}-64bit.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_test() { :; } #294302
+
+src_install() {
+	dobin wav{ren,split} || die
+	doman wav{ren,split}.1 || die
+	dodoc BUGS CHANGES CREDITS README{,.wavren}
+}
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
new file mode 100644
index 000000000000..d8ee12249c32
--- /dev/null
+++ b/media-sound/wildmidi/Manifest
@@ -0,0 +1,12 @@
+AUX wildmidi.cfg 4670 SHA256 f91e8060ff9e2e1e3b27d321a77c954f3f5ad19b4b105393da5fbb22680f640d SHA512 978d8aeec23430cc0fbd0d625795a63f0876375e168f3be3294553de4d63c0e930775154c8dfa3a925c87010bb83e9e96b9e897de2166f3dbd40c4c14cd3f3c1 WHIRLPOOL 4cf29c013609d811f729bd568eff5f6d0f9d800a01127473ad056060562b1d399fc1978e6b995bd4d4677a83b87a77317a903b7d0e7102ead5a283161770aad7
+DIST wildmidi-0.2.3.5.tar.gz 375792 SHA256 00642702d3475d134596b19531c9e589043dcac482011494e42b035b4739e554 SHA512 20bce7c551239944d2f6cd27a0963628e13624e651aabfae62380fe953ac3fc67eb27551a427c41ef2b057ec00903128d6afeccfc2688aefd46709d1f941befc WHIRLPOOL 60e1867ff572d1762915dddd6e5470826020b73f0257bbd08a411d94959cee58e6eee90c8113b43f5e7e80c35cd2ce7f815bee8ffecd0831a8e3bcb0df737b18
+DIST wildmidi-0.3.6.tar.gz 105534 SHA256 eefe56f51220fd727093e3774e2e7313cd21dc89f62f2e15c53241e444401979 SHA512 e7efb9e9e67ee518dd0cdabbe8d701ec3c0762ea007e52533b82f4a4984e0600f7ba1cd9f9b79dda9e553fa04ca861b0b8d4b21ceb35ed0c8f5a4fe6de66d1d0 WHIRLPOOL e601acd23384ee5803fabbb60bc354ff575de3a4b852a9108a62d5e2424abb03197898b2cd49d2f59ebee132c61ac3a4f97e381962bdda123f767c608c741cdd
+DIST wildmidi-0.3.7.tar.gz 121501 SHA256 372a4cb19ee78fbb2ed6d032cb9b67dd81259449cfaf2a1631a870bee7bb3dc6 SHA512 b4d40404891161cb55a71dd790e2dbd2c4ec21730c8aaa6f3a68eeacd36d939f859b55ab535bee2feb9ffed04337332ef1eedcffbff6ae02d7499fec97f7a42b WHIRLPOOL a7cb89aa0cf1356951969650bab78e6c350103d5f15da838a145a4ed430aa3ab3b549b78f69e229e139da7b1f42d81e6165883dd28b477cb36c7d0be25fc2c8a
+DIST wildmidi-0.3.8.tar.gz 121690 SHA256 efd8c5194d066b93057bfb892e6c44f13048998f71d7aadc5514b859272762fc SHA512 883c5b2db84bee85f14a98729496aa9e15f5c1414dbaed6108d07e649b34937cbd3e8a8823a2b6519fcc7fdd354219c0667615c7b31e8952e13f8635e5284f50 WHIRLPOOL 056ceb005ba20ddce03c00e17e7dcd4aafe69af14c4dedc772d554e429a0940f61c1457a945200a584896d5daee97e51eba34bcaec1bc85200d574a333e7ecbc
+EBUILD wildmidi-0.2.3.5.ebuild 1108 SHA256 336ba50e188f6b4da3700dfe7acd3d64333abe219982857ad70818df42dcc83f SHA512 3937c9b2f532cd09dfcd656b516d396ec0acaeed010ca09ecf8f3609f71b67591e6aae5b009b8810d2f5684040e64de2ca0000b1404666b844dff78888eebb53 WHIRLPOOL a81a2a6a11d149f26074c2bace878015f105cff43f5b4aae9c39220020e534326a2e7b8e7a0a69c9051258e4afaf5dfa3b44cfdab7bdce8eb113d05b29393a42
+EBUILD wildmidi-0.3.6.ebuild 1870 SHA256 a252f4d851126d037bb58d6cb9f13fffd7b5804d1b9e8e8aae2f01973f871c4e SHA512 a15e48e3141a238c4237b7c080234f24b27dbadbc22b26cdb957939a94dd257f0bc21c6f98030881b3d6a477050c2a77b12c57dfe1a1ff6b0be5944be82c2738 WHIRLPOOL 82c72492466d0bc09176f99ee5fdd065116fb0c21caf8c09de34e247650cbd68b13d65a08d900c3dfebc1a7084de6cac911e7054253584e76385f34375ba2bcc
+EBUILD wildmidi-0.3.7.ebuild 1843 SHA256 5798b3c4e83918450e7e61e3193b9ca9a46d015c0ef480dd8137c5e6a74988a9 SHA512 d16c4718fdfeaf13ab6893a8617a9cae136ed2e2639b5649f038b65a588ca0f25b6e1ef247a4572e3cc96130a2eb82c4133956adb425c7266c986136b76f8092 WHIRLPOOL 3db1be88a5cd2a9380a7df3e28b23d5d11503cfb551deb9c17366075083096cd5db542b9fcec78a1dec6312bc6b48911d7b7025f323a2dbc008df263536e1570
+EBUILD wildmidi-0.3.8.ebuild 1870 SHA256 9ff60de4e622996126cd8a30ede5bf85ad07b41ddf22a76b654d2d9d1a4ea831 SHA512 85d8692fc01977a7358a11d88ad05bda7ef90bb378d49d17020599eb5e542d36f5d72b68c7b13f6b1d6c6266fa166d894b2813d3328f6027becd2364f3df6a5a WHIRLPOOL 2f3e6e0da1420ae02760a2d5de50034cf7083b29e52084782cd136b3be73394a93fac896cb016026db73f34718efe3030030a2d330fcaa8bebe87527621b3a89
+MISC ChangeLog 3109 SHA256 66899b0d320682569ffd9ab78019fa8db09c6060caa7ab33fb0b4049574b82fa SHA512 493f32fbc0b4b9aa1c5d517e07f8411da78eae9cef2235a5f6250b5b17c5d9f354bb8cbaaca62110a7ac29eecc3a1284198fe83dc8e33e1ec4be9f3d7515d405 WHIRLPOOL 926227c161889ee968bed569a35c194da396cae9eb7f44c90727d09ea5f61eb96ded37ec492bab93f5fbffd2abcec24e3e0476d18c1e53aca36b992edaae0c9b
+MISC ChangeLog-2015 4336 SHA256 22563776eab19c718fc46fdab30a0585cd608f730ef3b38b909ff7fd8b12e39e SHA512 1f3b5389bf35650e7ae368735603d6fe86dc6abd72f38d6c0e07c26765052946db5c7c3cb5c89c404bd6d2b9c4d1440e87c6a7bb52aacd8d4393256e8db93b6c WHIRLPOOL 075c44dd47befee29d54c4d70d4512dde75d3a3ccfb2dcaadc81823e12ea1c3fd7ca8a8d5183555f551a1b4cc8c5640d568a9e2566f4081001ce0deff55ab97d
+MISC metadata.xml 458 SHA256 b049865d89e480684453bb11e69b03c10a28f0cc4d3e151c43957da537603e8a SHA512 f6560b9f1bfb0996f631b9f01ec5d2ef94c5a5cc60026c1c6175ec777b46574e4c7fb7b90a48aa0b63e89a0da3dcbd39a729693783d54f6ea3a8fa9d9b1fe85c WHIRLPOOL 9adc9a6c790d099b8df8250fabeca1fb532a49010e2b3a316cf4c1f894047993f679df74f84401235af772251a50155dd5a1f4de3999ad58deb400fff75fb1af
diff --git a/media-sound/wildmidi/files/wildmidi.cfg b/media-sound/wildmidi/files/wildmidi.cfg
new file mode 100644
index 000000000000..3cdfbd3c1445
--- /dev/null
+++ b/media-sound/wildmidi/files/wildmidi.cfg
@@ -0,0 +1,138 @@
+# Automatically generated on Πεμ 26 Αύγ 2010 09:01:08 μμ EEST
+# by http://freepats.opensrc.org/mkcfg.sh.txt
+
+dir /usr/share/timidity/freepats
+drumset 0
+
+ 25	Drum_000/025_Snare_Roll.pat 
+ 26	Drum_000/026_Snap.pat 
+ 27	Drum_000/027_High_Q.pat 
+ 31	Drum_000/031_Sticks.pat 
+ 32	Drum_000/032_Square_Click.pat 
+ 33	Drum_000/033_Metronome_Click.pat 
+ 34	Drum_000/034_Metronome_Bell.pat 
+ 35	Drum_000/035_Kick_1.pat amp=100
+ 36	Drum_000/036_Kick_2.pat amp=100
+ 37	Drum_000/037_Stick_Rim.pat 
+ 38	Drum_000/038_Snare_1.pat 
+ 39	Drum_000/039_Clap_Hand.pat amp=100
+ 40	Drum_000/040_Snare_2.pat 
+ 41	Drum_000/041_Tom_Low_2.pat amp=100
+ 42	Drum_000/042_Hi-Hat_Closed.pat 
+ 43	Drum_000/043_Tom_Low_1.pat amp=100
+ 44	Drum_000/044_Hi-Hat_Pedal.pat 
+ 45	Drum_000/045_Tom_Mid_2.pat amp=100
+ 46	Drum_000/046_Hi-Hat_Open.pat 
+ 47	Drum_000/047_Tom_Mid_1.pat amp=100
+ 48	Drum_000/048_Tom_High_2.pat amp=100
+ 49	Drum_000/049_Cymbal_Crash_1.pat 
+ 50	Drum_000/050_Tom_High_1.pat amp=100
+ 51	Drum_000/051_Cymbal_Ride_1.pat 
+ 52	Drum_000/052_Cymbal_Chinese.pat 
+ 53	Drum_000/053_Cymbal_Ride_Bell.pat amp=100
+ 54	Drum_000/054_Tombourine.pat 
+ 55	Drum_000/055_Cymbal_Splash.pat 
+ 56	Drum_000/056_Cow_Bell.pat 
+ 57	Drum_000/057_Cymbal_Crash_2.pat 
+ 58	Drum_000/058_Vibra-Slap.pat 
+ 59	Drum_000/059_Cymbal_Ride_2.pat 
+ 60	Drum_000/060_Bongo_High.pat 
+ 61	Drum_000/061_Bongo_Low.pat 
+ 62	Drum_000/062_Conga_High_1_Mute.pat 
+ 63	Drum_000/063_Conga_High_2_Open.pat 
+ 64	Drum_000/064_Conga_Low.pat 
+ 65	Drum_000/065_Timbale_High.pat 
+ 66	Drum_000/066_Timbale_Low.pat 
+ 67	Drum_000/067_Agogo_High.pat 
+ 68	Drum_000/068_Agogo_Low.pat 
+ 69	Drum_000/069_Cabasa.pat amp=100
+ 70	Drum_000/070_Maracas.pat 
+ 71	Drum_000/071_Whistle_1_High_Short.pat 
+ 72	Drum_000/072_Whistle_2_Low_Long.pat 
+ 73	Drum_000/073_Guiro_1_Short.pat 
+ 74	Drum_000/074_Guiro_2_Long.pat 
+ 75	Drum_000/075_Claves.pat amp=100
+ 76	Drum_000/076_Wood_Block_1_High.pat 
+ 77	Drum_000/077_Wood_Block_2_Low.pat 
+ 78	Drum_000/078_Cuica_1_Mute.pat amp=100
+ 79	Drum_000/079_Cuica_2_Open.pat amp=100
+ 80	Drum_000/080_Triangle_1_Mute.pat 
+ 81	Drum_000/081_Triangle_2_Open.pat 
+ 82	Drum_000/082_Shaker.pat 
+ 84	Drum_000/084_Belltree.pat 
+
+bank 0
+
+ 0	Tone_000/000_Acoustic_Grand_Piano.pat amp=120 pan=center
+ 1	Tone_000/001_Acoustic_Brite_Piano.pat 
+ 2	Tone_000/002_Electric_Grand_Piano.pat 
+ 4	Tone_000/004_Electric_Piano_1_Rhodes.pat 
+ 5	Tone_000/005_Electric_Piano_2_Chorused_Yamaha_DX.pat 
+ 6	Tone_000/006_Harpsichord.pat 
+ 7	Tone_000/007_Clavinet.pat 
+ 8	Tone_000/008_Celesta.pat 
+ 9	Tone_000/009_Glockenspiel.pat 
+ 13	Tone_000/013_Xylophone.pat 
+ 14	Tone_000/014_Tubular_Bells.pat 
+ 15	Tone_000/015_Dulcimer.pat 
+ 16	Tone_000/016_Hammond_Organ.pat 
+ 19	Tone_000/019_Church_Organ.pat 
+ 21	Tone_000/021_Accordion.pat 
+ 23	Tone_000/023_Tango_Accordion.pat 
+ 24	Tone_000/024_Nylon_Guitar.pat 
+ 25	Tone_000/025_Steel_Guitar.pat 
+ 26	Tone_000/026_Jazz_Guitar.pat 
+ 27	Tone_000/027_Clean_Electric_Guitar.pat 
+ 28	Tone_000/028_Muted_Electric_Guitar.pat 
+ 29	Tone_000/029_Overdriven_Guitar.pat 
+ 30	Tone_000/030_Distortion_Guitar.pat 
+ 32	Tone_000/032_Acoustic_Bass.pat 
+ 33	Tone_000/033_Finger_Bass.pat 
+ 34	Tone_000/034_Pick_Bass.pat 
+ 35	Tone_000/035_Fretless_Bass.pat 
+ 36	Tone_000/036_Slap_Bass_1.pat 
+ 37	Tone_000/037_Slap_Bass_2.pat 
+ 38	Tone_000/038_Synth_Bass_1.pat 
+ 40	Tone_000/040_Violin.pat 
+ 42	Tone_000/042_Cello.pat 
+ 44	Tone_000/044_Tremolo_Strings.pat 
+ 45	Tone_000/045_Pizzicato_Strings.pat 
+ 46	Tone_000/046_Harp.pat 
+ 47	Tone_000/047_Timpani.pat 
+ 48	Tone_000/048_String_Ensemble_1_Marcato.pat 
+ 53	Tone_000/053_Voice_Oohs.pat 
+ 56	Tone_000/056_Trumpet.pat 
+ 57	Tone_000/057_Trombone.pat 
+ 58	Tone_000/058_Tuba.pat 
+ 59	Tone_000/059_Muted_Trumpet.pat 
+ 60	Tone_000/060_French_Horn.pat 
+ 61	Tone_000/061_Brass_Section.pat 
+ 64	Tone_000/064_Soprano_Sax.pat 
+ 65	Tone_000/065_Alto_Sax.pat 
+ 66	Tone_000/066_Tenor_Sax.pat 
+ 67	Tone_000/067_Baritone_Sax.pat 
+ 68	Tone_000/068_Oboe.pat 
+ 69	Tone_000/069_English_Horn.pat 
+ 70	Tone_000/070_Bassoon.pat 
+ 71	Tone_000/071_Clarinet.pat 
+ 72	Tone_000/072_Piccolo.pat 
+ 73	Tone_000/073_Flute.pat 
+ 74	Tone_000/074_Recorder.pat 
+ 75	Tone_000/075_Pan_Flute.pat 
+ 76	Tone_000/076_Bottle_Blow.pat 
+ 79	Tone_000/079_Ocarina.pat 
+ 80	Tone_000/080_Square_Wave.pat 
+ 84	Tone_000/084_Charang.pat 
+ 88	Tone_000/088_New_Age.pat 
+ 94	Tone_000/094_Halo_Pad.pat 
+ 95	Tone_000/095_Sweep_Pad.pat 
+ 98	Tone_000/098_Crystal.pat 
+ 101	Tone_000/101_Goblins--Unicorn.pat 
+ 102	Tone_000/102_Echo_Voice.pat 
+ 104	Tone_000/104_Sitar.pat 
+ 114	Tone_000/114_Steel_Drums.pat 
+ 115	Tone_000/115_Wood_Block.pat 
+ 120	Tone_000/120_Guitar_Fret_Noise.pat 
+ 122	Tone_000/122_Seashore.pat 
+ 125	Tone_000/125_Helicopter.pat 
+
diff --git a/media-sound/wildmidi/metadata.xml b/media-sound/wildmidi/metadata.xml
new file mode 100644
index 000000000000..18425761078b
--- /dev/null
+++ b/media-sound/wildmidi/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<use>
+		<flag name="player">Install the wildmidi player</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Mindwerks/wildmidi</remote-id>
+		<remote-id type="sourceforge">wildmidi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild b/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild
new file mode 100644
index 000000000000..965c76bff307
--- /dev/null
+++ b/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit base autotools readme.gentoo
+
+DESCRIPTION="Midi processing library and a midi player using the gus patch set"
+HOMEPAGE="http://wildmidi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 x86"
+IUSE="alsa debug"
+
+DEPEND="alsa? ( media-libs/alsa-lib )"
+RDEPEND="${DEPEND}
+	media-sound/timidity-freepats"
+
+src_prepare() {
+	DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
+		A default configuration file was placed on /etc/${PN}.cfg.
+		For more information please read the ${PN}.cfg manpage."
+
+	# Workaround for parallel make
+	sed -i -e "/^wildmidi_libs/s:=.*:= libWildMidi.la:" "${S}"/src/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use alsa || echo --with-oss)
+}
+
+src_install() {
+	base_src_install
+	find "${D}" -name '*.la' -exec rm -f {} +
+	insinto /etc
+	doins "${FILESDIR}"/${PN}.cfg
+	readme.gentoo_create_doc
+}
diff --git a/media-sound/wildmidi/wildmidi-0.3.6.ebuild b/media-sound/wildmidi/wildmidi-0.3.6.ebuild
new file mode 100644
index 000000000000..a2e39896724d
--- /dev/null
+++ b/media-sound/wildmidi/wildmidi-0.3.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit cmake-utils readme.gentoo
+
+DESCRIPTION="Midi processing library and a midi player using the gus patch set"
+HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
+SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+alsa openal oss +player"
+
+DEPEND="player? (
+	alsa? ( media-libs/alsa-lib )
+	openal? ( media-libs/openal )
+	)"
+RDEPEND="${DEPEND}
+	media-sound/timidity-freepats"
+
+REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
+
+DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
+	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
+	For more information please read the ${PN}.cfg manpage."
+
+S="${WORKDIR}"/${PN}-${P}
+
+src_prepare() {
+	# alsa openal oss only make sense if player is enabled. See CMakeLists.txt
+	if ! use player && (use alsa || use openal || use oss); then
+		ewarn
+		ewarn "The 'alsa', 'openal' and 'oss' use flags only make sense if"
+		ewarn "the 'player' use flags is selected and as a result they will be"
+		ewarn "ignored in this build"
+		ewarn
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_want alsa)
+		$(cmake-utils_use_want openal)
+		$(cmake-utils_use_want oss)
+		$(cmake-utils_use_want player)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	find "${D}" -name '*.la' -exec rm -f {} +
+	insinto /etc/${PN}/
+	doins cfg/${PN}.cfg
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/${PN}.cfg ]]; then
+		elog
+		elog "Old /etc/${PN}.cfg detected!"
+		elog "Please migrate your configuration file to"
+		elog "/etc/${PN}/ directory which is now the default"
+		elog "location for the ${PN} configuration file."
+		elog
+	fi
+}
diff --git a/media-sound/wildmidi/wildmidi-0.3.7.ebuild b/media-sound/wildmidi/wildmidi-0.3.7.ebuild
new file mode 100644
index 000000000000..f580f035724e
--- /dev/null
+++ b/media-sound/wildmidi/wildmidi-0.3.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit cmake-utils readme.gentoo
+
+DESCRIPTION="Midi processing library and a midi player using the gus patch set"
+HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
+SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+alsa openal oss +player"
+
+DEPEND="player? (
+	alsa? ( media-libs/alsa-lib )
+	openal? ( media-libs/openal )
+	)"
+RDEPEND="${DEPEND}
+	media-sound/timidity-freepats"
+
+REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
+
+DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
+	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
+	For more information please read the ${PN}.cfg manpage."
+
+src_prepare() {
+	# alsa openal oss only make sense if player is enabled. See CMakeLists.txt
+	if ! use player && (use alsa || use openal || use oss); then
+		ewarn
+		ewarn "The 'alsa', 'openal' and 'oss' use flags only make sense if"
+		ewarn "the 'player' use flags is selected and as a result they will be"
+		ewarn "ignored in this build"
+		ewarn
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_want alsa)
+		$(cmake-utils_use_want openal)
+		$(cmake-utils_use_want oss)
+		$(cmake-utils_use_want player)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	find "${D}" -name '*.la' -exec rm -f {} +
+	insinto /etc/${PN}/
+	doins cfg/${PN}.cfg
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/${PN}.cfg ]]; then
+		elog
+		elog "Old /etc/${PN}.cfg detected!"
+		elog "Please migrate your configuration file to"
+		elog "/etc/${PN}/ directory which is now the default"
+		elog "location for the ${PN} configuration file."
+		elog
+	fi
+}
diff --git a/media-sound/wildmidi/wildmidi-0.3.8.ebuild b/media-sound/wildmidi/wildmidi-0.3.8.ebuild
new file mode 100644
index 000000000000..cf8aa4a65dce
--- /dev/null
+++ b/media-sound/wildmidi/wildmidi-0.3.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit cmake-utils readme.gentoo
+
+DESCRIPTION="Midi processing library and a midi player using the gus patch set"
+HOMEPAGE="http://www.mindwerks.net/projects/wildmidi/"
+SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+alsa openal oss +player"
+
+DEPEND="player? (
+	alsa? ( media-libs/alsa-lib )
+	openal? ( media-libs/openal )
+	)"
+RDEPEND="${DEPEND}
+	media-sound/timidity-freepats"
+
+REQUIRED_USE="player? ( ^^ ( alsa oss openal ) )"
+
+DOC_CONTENTS="${PN} is using timidity-freepats for midi playback.
+	A default configuration file was placed on /etc/${PN}/${PN}.cfg.
+	For more information please read the ${PN}.cfg manpage."
+
+S="${WORKDIR}"/${PN}-${P}
+
+src_prepare() {
+	# alsa openal oss only make sense if player is enabled. See CMakeLists.txt
+	if ! use player && (use alsa || use openal || use oss); then
+		ewarn
+		ewarn "The 'alsa', 'openal' and 'oss' use flags only make sense if"
+		ewarn "the 'player' use flags is selected and as a result they will be"
+		ewarn "ignored in this build"
+		ewarn
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_want alsa)
+		$(cmake-utils_use_want openal)
+		$(cmake-utils_use_want oss)
+		$(cmake-utils_use_want player)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	find "${D}" -name '*.la' -exec rm -f {} +
+	insinto /etc/${PN}/
+	doins cfg/${PN}.cfg
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/${PN}.cfg ]]; then
+		elog
+		elog "Old /etc/${PN}.cfg detected!"
+		elog "Please migrate your configuration file to"
+		elog "/etc/${PN}/ directory which is now the default"
+		elog "location for the ${PN} configuration file."
+		elog
+	fi
+}
diff --git a/media-sound/wmsound-data/Manifest b/media-sound/wmsound-data/Manifest
new file mode 100644
index 000000000000..8be4a05504f1
--- /dev/null
+++ b/media-sound/wmsound-data/Manifest
@@ -0,0 +1,8 @@
+AUX WMSound 548 SHA256 7ca8a7506aa888df7bfcb4bc8d184f42281e8e132038c8dadd3e06d62e0d1fd3 SHA512 1ff66ed7dfa94723a5b500c1f507911594048657f9c30ba2231db71ed0c4749e113491cf5b4ee753c33d51226ab229940b481058ed08776474bdbd6a62a5fb17 WHIRLPOOL 0fca607dbcbd616086fe7caa250832f3955275f702dab24d301c1b215af330a5a780ba2af81dcd08c9f660e0767618b53e9b7cc3375330cec98faf84ad8b8378
+AUX wmsound-soundset 312 SHA256 a10a22f9f81fb90f75b699d2b0095acb73b4ecb218a59c95503dd8d7f9aaf576 SHA512 c8822f4ab1621159b07f2f412dcabb128bebb85fd01eea1b6dd329605f4202c6d65d300f48adec6706854bee9655901851d8c92ad487620d0c20cd0232900a70 WHIRLPOOL 54d737710af1dcc2001009606209e33dfc01487dfcd50cce20ac9fcd01b91b0143956773467e54f13e611b05a6ad75072134a65605564433c9c036c6864a95d4
+DIST wmsdefault.tar.gz 711376 SHA256 f21433c6a2139dd143ce5d6cb40311fca5378e18794f04a9f9fb72c9bc5d0f7d SHA512 7fce83906f675ab8426fc4c2440a39dc9b658c93e99c515c4cec02c89df99097545931591358a33adb3dfc7c73b28cd9698d8e071b7b019511aa5edc5d51f62b WHIRLPOOL 6f698a0e361392e48165d23c15bf4d0803523532ff9e1c2f0ddf58881de82730c18398305f9121a12bc92f1183e2e8b457edcba3fb555d04f4d3e20063e87c07
+DIST worms2sounds.tar.gz 356608 SHA256 d6646a2d03019db7465bf6f068b76efec601bd49ae30c275a1b249623da21510 SHA512 7fe60511e7f457ea398d6d5456bac90d6303ede645c73a527551e44008e09b8f1f343f5622a49b365bcd93674b9f2ee6a91f9774dadf770cd71daec69400e5da WHIRLPOOL 81d765fb24afd15334aff1d836906301b3666e36d1416314410cc413b2c485aff07fbf29621f2917ad4f41bb57f8f2e008eb954ace3d276d13527f30940f708e
+EBUILD wmsound-data-1.0.0.ebuild 937 SHA256 2ffadc2fb09fc2a2621990a77cba10f0190d7dd6979aedc57c214f3dbf005e2c SHA512 35db6db0a8c64d57f75cd309671647192326d603c8533c35183ebf8be704d8120a8da176c9ba35d90d146ce670b4d8719b74a06a65789e8ec0b3150ce3f10b9b WHIRLPOOL cbffaef012f9790b13d45c7e8476373450916f4ab9743d1c9111475fb2f7c3b3ea0cd384270c14d96104a7bda1aff7f402ce09edbdc2cde56a4fa0760001eca4
+MISC ChangeLog 2486 SHA256 03f7067c2ff0a60fff6dcc9465f2b6ee27ebbf98fae585cdc6e0229cd6ee87eb SHA512 9b0c9c1df8b72821a6169bfecc3b495f1e7973ae4fe7ac0a15379def001d0f7e74ed0c944e8e8e2a5d606290a2e0172b8aac4a091ecee4e1be48f78e1345065c WHIRLPOOL 1a26c63067a55a4891442c75ff550a10c78ca7a444da8d71eecda6ed216d2e9c5c4ce0f138e809c15604f81bdbb9b710f8bb0e08c24a4d6c484e95669995ac5f
+MISC ChangeLog-2015 1091 SHA256 09fe6cbc8ab22c5d7997154d2bc579faadd8120397ec51a25da79a95e74aabca SHA512 1d903ece573be0d9ec4d120c1d6bf008dedb7a88f5fc0b82b1d90cdb94a458a1f2605aac37d468261b69d3c58a5680634949f6611da991b89c2ee9adac4f4a1b WHIRLPOOL 9462f60dc0203e1b2479a3f408fb574a8d26fa5fef5168136dd3be5b4bbba8ad4fa7a3c4ee5a50c3402bb5a4f89c990ba6a44b75ad7fc8ddf4666b20f9471d6e
+MISC metadata.xml 249 SHA256 a591aa91a9c413e7f7e24fd25b924ce2dfef686da8b4ce38bebb088ebfdba9db SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343 WHIRLPOOL ae5b0c583f3a07ed1ccf651b5b9c8d6c8c637fba2d505fc4b028ea60239fc0a84e37a169b5114f879712ae74f7f41960a2cc6b59e67cacc7f964b105b5fb8723
diff --git a/media-sound/wmsound-data/files/WMSound b/media-sound/wmsound-data/files/WMSound
new file mode 100644
index 000000000000..9166fc5757c2
--- /dev/null
+++ b/media-sound/wmsound-data/files/WMSound
@@ -0,0 +1,19 @@
+{
+  SoundPath = ("~/GNUstep/Library/WindowMaker/Sounds",
+              "/usr/share/WindowMaker/Sounds");
+  SoundSetPath = ("~/GNUstep/Library/WindowMaker/SoundSets",
+              "/usr/share/WindowMaker/SoundSets");
+  Device = /dev/dsp;
+  AppExit = appexit.wav;
+  AppStart = appstart.wav;
+  Hide = hide.wav;
+  Iconify = iconify.wav;
+  Maximize = maximize.wav;
+  UnMaximize = unmaximize.wav;
+  Shade = shade.wav;
+  Startup = startup.wav;
+  UnHide = unhide.wav;
+  DeIconify = deiconify.wav;
+  UnShade = unshade.wav;
+  UserDefined = replaceme.wav;
+}
diff --git a/media-sound/wmsound-data/files/wmsound-soundset b/media-sound/wmsound-data/files/wmsound-soundset
new file mode 100644
index 000000000000..dcb902fe936b
--- /dev/null
+++ b/media-sound/wmsound-data/files/wmsound-soundset
@@ -0,0 +1,14 @@
+{
+  AppExit = appexit.wav;
+  AppStart = appstart.wav;
+  Hide = hide.wav;
+  Iconify = iconify.wav;
+  Maximize = maximize.wav;
+  UnMaximize = unmaximize.wav;
+  Shade = shade.wav;
+  Startup = appstart.wav;
+  UnHide = unhide.wav;
+  DeIconify = deiconify.wav;
+  UnShade = unshade.wav;
+  UserDefined = replaceme.wav;
+}
\ No newline at end of file
diff --git a/media-sound/wmsound-data/metadata.xml b/media-sound/wmsound-data/metadata.xml
new file mode 100644
index 000000000000..c870d0eef0ab
--- /dev/null
+++ b/media-sound/wmsound-data/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild b/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild
new file mode 100644
index 000000000000..1ec21eb8311e
--- /dev/null
+++ b/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+IUSE=""
+
+DESCRIPTION="A bunch of sounds for WindowMaker Sound Server"
+SRC_URI="http://largo.windowmaker.org/files/worms2sounds.tar.gz
+		http://largo.windowmaker.org/files/wmsdefault.tar.gz"
+HOMEPAGE="http://largo.windowmaker.org/"
+
+DEPEND=">=x11-wm/windowmaker-0.80.2-r2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc amd64 sparc"
+
+S1=${WORKDIR}/Sounds
+S2=${WORKDIR}/SoundSets
+
+src_install() {
+	insinto /usr/share/WindowMaker/Defaults
+	doins "${FILESDIR}"/WMSound
+
+	insinto /etc/X11/WindowMaker
+	doins "${FILESDIR}"/WMSound
+
+	insinto /usr/share/WindowMaker/SoundSets
+	doins "${FILESDIR}"/wmsound-soundset
+
+	insinto /usr/share/WindowMaker/SoundSets/Default
+	doins "${FILESDIR}"/wmsound-soundset
+
+	cd "${S1}"
+	insinto /usr/share/WindowMaker/Sounds
+	doins *.wav
+
+	cd "${S2}"
+	insinto /usr/share/WindowMaker/SoundSets
+	doins Worms2
+}
diff --git a/media-sound/xfmpc/Manifest b/media-sound/xfmpc/Manifest
new file mode 100644
index 000000000000..220e0aa18bb1
--- /dev/null
+++ b/media-sound/xfmpc/Manifest
@@ -0,0 +1,7 @@
+DIST xfmpc-0.2.2.tar.bz2 404906 SHA256 ed0cc2940bd5928bb30fab1531c22185a97bd0cc5beacd9e3be4d4cd994a6862 SHA512 a90697bcd86e7f3952faa4d37800755a49a09886de7a95ae69b4e8a59b7750b1098d372b1734eadf3bb1d2c74fc5447707fc0203de435cfa51423530c663f6c7 WHIRLPOOL 69e43254f37dba722cc2e17864f8079a831a028f2af95deeaa88fcbd236fed533d5a5a83f59c07f86a18ce956299c4c340b25968069ef0843edcef69d4724c57
+DIST xfmpc-0.2.3.tar.bz2 414680 SHA256 4189c0c82b66b758a6d5bc651493b675d3d46329e5f1a76ff26c448125f4fcb0 SHA512 3f592fdd559817051f7720bafc07fc66b39f682cc20286c12d54c4bd607e85bb0a722c567264a29224971b4ac14db51b0b44b233a16cccd9d17579a50549a3be WHIRLPOOL c39b986e333b8ad0e59703bf2caf6c556388f75c81b6d300fdfbcd21fc118dff7ad8906afc7980e1db50455d46e3254892d0ffae38c48d51efb6d7be900b616d
+EBUILD xfmpc-0.2.2.ebuild 693 SHA256 08fc9d6be17cb1dd4bca8560bbff3b24f8edf47efd8e4c50985cc35fea953cc7 SHA512 5db626e67a68842a15ee1f49680bfb977fa64ed0382e336db94a9c915d7d3546a7a288735e7f70628019e78de9766dfb62d141c53b3cd589b35844d8b9415387 WHIRLPOOL bfee89542f00b1f934a294493109288fc049e9902d4dc82a73357774f304c46aec42c8dca39f216224cb30096280030cf218ac986823ee1cb2d41cd8d1e48010
+EBUILD xfmpc-0.2.3.ebuild 703 SHA256 aaa32a6f84f41ccad66790824fc8993dae178f67e35121b7099c7263937b4097 SHA512 5e667066d598c0088306c2c5188f97cd8ae642551183304cb478ba20dbff722748a4a9fd0d5b9314a41863f6dbcc90c60d90d6fdecefe92a16c3c3c803d14070 WHIRLPOOL a06ac08c0436def3fa9752bc15dcdc6ec33e5004dfb0da0d65b911b302e926f419cfbedc85ebc08cdfea61b56afcbeeca0a4d246bc3774f3131fe95df8d9e591
+MISC ChangeLog 2289 SHA256 a8c8289190a70b6f58c62af7f04862365dae016b1d6582dc39a48bfab1b27c3a SHA512 902fb208773df7facdc058de0c00ac6d6fd6dc55c76960a933f303601fc73d7fbe36331ba9f3fa9cf7226966d96743de526ef606b4934f175f23a910a7880763 WHIRLPOOL bc2829136aec3196b6b0b4febb112b95f9351e216567a40b3df300f03023f41267aa8117cc2ecdec0b5867c63cc0e31ac768c1751e24ed48a1b24de80fa2bb01
+MISC ChangeLog-2015 3179 SHA256 af7098309e95823e308f7b8b04774d92ac21c8b1534964d5815081d31114ce27 SHA512 000b738e9b74846d8943aec3188e5fcde19536eb6962415b81681a644f9ab2f4c3d91302905e6d2107a45f7f2c772ca6a584197c0cf343321bb48457859dc023 WHIRLPOOL d08a23af7b08ac0dcf90623f519cf58c62ad582f9db62565c20f711817c7008d4f494819739f631f12eb4f8b3eacfe78301f2c82dcb0d3eed47fd6e1ec450f77
+MISC metadata.xml 247 SHA256 5e270543b0f1e81148a19b29d77d40191169f37a8b3e34c7c08bdca376150864 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203 WHIRLPOOL 15305f8aec1b5f5e255d6378d5b44652a3958e808017fd8ba00350b667528753ff0466bcf5b9b28b683fd3341d25bf8884396730003f071515ad28146d33893b
diff --git a/media-sound/xfmpc/metadata.xml b/media-sound/xfmpc/metadata.xml
new file mode 100644
index 000000000000..359901b31db4
--- /dev/null
+++ b/media-sound/xfmpc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/xfmpc/xfmpc-0.2.2.ebuild b/media-sound/xfmpc/xfmpc-0.2.2.ebuild
new file mode 100644
index 000000000000..965667bd7bdc
--- /dev/null
+++ b/media-sound/xfmpc/xfmpc-0.2.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfmpc"
+SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+	>=media-libs/libmpd-0.15
+	>=x11-libs/gtk+-2.16:2
+	>=xfce-base/libxfce4ui-4.8
+	>=xfce-base/libxfce4util-4.8"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+pkg_setup() {
+	XFCONF=( $(xfconf_use_debug) )
+	DOCS=( AUTHORS ChangeLog IDEAS NEWS README THANKS )
+}
diff --git a/media-sound/xfmpc/xfmpc-0.2.3.ebuild b/media-sound/xfmpc/xfmpc-0.2.3.ebuild
new file mode 100644
index 000000000000..2b973c294102
--- /dev/null
+++ b/media-sound/xfmpc/xfmpc-0.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfmpc"
+SRC_URI="mirror://xfce/src/apps/${PN}/0.2/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2.18:2=
+	>=media-libs/libmpd-0.15:=
+	>=x11-libs/gtk+-2.16:2=
+	>=xfce-base/libxfce4ui-4.8:=
+	>=xfce-base/libxfce4util-4.8:="
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+pkg_setup() {
+	XFCONF=( $(xfconf_use_debug) )
+	DOCS=( AUTHORS ChangeLog IDEAS NEWS README THANKS )
+}
diff --git a/media-sound/xineadump/Manifest b/media-sound/xineadump/Manifest
new file mode 100644
index 000000000000..85a71f7ab786
--- /dev/null
+++ b/media-sound/xineadump/Manifest
@@ -0,0 +1,7 @@
+AUX xineadump-0.1-gcc-4.3.patch 625 SHA256 9455c28ab2a3288b9c946dc7d477b11f256b33a7b0316b30f6f562c7f105395b SHA512 8c1b8b6d1e356438dc201064d9b1355ceb3e83f26b32e7d659d68b06a538b2eeccd6549f9e58f9c60330e523f1fa07e706ba58b4c1807fc9ec499e4b57b6924b WHIRLPOOL 0ee118be0a71d64b20ab6c2fa265efba92ed1c4ac9a227f222cf781f1bcc7de449ac811be949aff4081fb595e4bd5a3684a69d31bbe21b8d8b5a6f325379e6bf
+AUX xineadump-0.1-gcc-4.4.patch 436 SHA256 d4a169d2799d7914ef8f31447377e49678acf7b7163e8f5fe9439ccd6af4851f SHA512 f37f5c68fe1bd7b3d60fdf769122eb8bf5187c736d9b330b143603cf82845b95f1cfcc8ba4f8f817f6b5fb647bed1e19f698362459272ac6e12f05ec217f69ac WHIRLPOOL 52e8ce1a161d1bfe581293d4d73278d4ec7f993148561f6354584d527a79e4fcfc49d8cd3b543b7cc93fc98ed767b221250c664a09b9b35f2b7bb951fb78f460
+DIST xineadump-0.1.tar.bz2 233413 SHA256 a00a3377be2df8bcb2639f7e9d40faaf531362e67bd13130764042611a2067eb SHA512 879d147a451133e78835fb367a99f58ab9516746eec2a748fc11913db43f87f89af09649a7ae5e43362b44d97187a5ee58e41a6776894d8f2dfcd188c67c29e9 WHIRLPOOL b04bd61c362fa311341443af613405e50a3a7c4420781cebea4e59e1aa38c244268da8f5afcb122ee1689423de59c7d4cc4422fbd5e1d8198004273af1b67a57
+EBUILD xineadump-0.1-r1.ebuild 642 SHA256 a5fa7a56bac46aaf14ac9b3402229533b4308202785701c617942b6ca771a5a5 SHA512 cee6c720df9747090c33dd677f99225d0f8d07bae4b32badbcaba9fc92edc049b4004e96c14fcf993513774bb84a38be3227e4bba4cbd0db91a87f192cd94808 WHIRLPOOL c81edecd5337993292f5d0bae4ae3524365425a15b2da8d422dd7a627356e2d8e234e17a5b4c224de151c905c4393ae707382e5348d3457aff2a0d36d99e7ccc
+MISC ChangeLog 2627 SHA256 88d4de558b61fe31619e8da9eabd0ad4b00672babcfb8209fb76001fc1882e51 SHA512 f7bfc6070b341ee54d4adc055a57e5036979e7bc956becf68dc7c95fa3d3c1a94b4cc51f6442acea16e45bd38ac846c9aed9fbd9f7690e19e2ae0987f1dc8314 WHIRLPOOL 03dda5c07b053c4b7fb5e8ed1f649827d0f0d7349c8e4a8d2c3211a1db7ee5c08d948067cc87fcdd05ed395cc2fe8d13f14773bda2413eb20f13eab98cf38739
+MISC ChangeLog-2015 1094 SHA256 57bf58b69a7864bf9a6bcb1d6111e8b71f8054f4f492c6121153643384829f73 SHA512 664c1c5550aa949041acb9d5474dc3fdd28e15a9f793be8397ba296a5876266dc8f0e080b4a3a39ebda96409ecf808c026528780da4e446ffefaf200abf720b6 WHIRLPOOL e16b241892f3e1a86026bb72cfd98b32a0753a6cd5eb8319cf29d445e0a47964e69a1f221ba6a002cc481ee21eab6d318d194b84ca25948176758940d1b06476
+MISC metadata.xml 342 SHA256 827e155ed6de4f81f228b43fb41bb07e987891f4b6f7b73f0887bbdc3f3db204 SHA512 58249d2892a19a51995fee018a69b66575e245eb719a6ba04ca4cc3e4e2f7f07e3866cc22ea89d9b4175ab066850e3b93d4f335e2a2dd28c7f9ff9d1c4880414 WHIRLPOOL b7d4c539fe5d26b2e052d0e58fe1fbb24e28517c594a851449e8cd58e2a8a31528012efb89c4b1a2e2b2557c147649938ab28b5a4253300641b8101471d761f3
diff --git a/media-sound/xineadump/files/xineadump-0.1-gcc-4.3.patch b/media-sound/xineadump/files/xineadump-0.1-gcc-4.3.patch
new file mode 100644
index 000000000000..ac3a879fa4fd
--- /dev/null
+++ b/media-sound/xineadump/files/xineadump-0.1-gcc-4.3.patch
@@ -0,0 +1,20 @@
+--- xineadump-orig/src/xineinput.cpp	2008-06-14 04:15:30.829493854 +0200
++++ xineadump/src/xineinput.cpp	2008-06-14 04:22:13.181493796 +0200
+@@ -19,6 +19,7 @@
+  ***************************************************************************/
+ 
+ #include "xineinput.h"
++#include <cstring>
+ 
+ static xine_t* xine;
+ static xine_audio_port_t* audio_port;
+--- xineadump-orig/src/zeroinput.cpp	2008-06-14 04:15:39.153496528 +0200
++++ xineadump/src/zeroinput.cpp	2008-06-14 04:21:54.993493742 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include "zeroinput.h"
+ #include <math.h>
++#include <cstring>
+ 
+ ZeroInput::ZeroInput(
+ 	unsigned long timeLimitMS,
diff --git a/media-sound/xineadump/files/xineadump-0.1-gcc-4.4.patch b/media-sound/xineadump/files/xineadump-0.1-gcc-4.4.patch
new file mode 100644
index 000000000000..f8e1ca1ef848
--- /dev/null
+++ b/media-sound/xineadump/files/xineadump-0.1-gcc-4.4.patch
@@ -0,0 +1,11 @@
+diff -ur xineadump.orig/src/waveencoder.cpp xineadump/src/waveencoder.cpp
+--- xineadump.orig/src/waveencoder.cpp	2007-08-05 02:39:36.000000000 +0300
++++ xineadump/src/waveencoder.cpp	2009-07-05 18:57:47.000000000 +0300
+@@ -19,6 +19,7 @@
+  ***************************************************************************/
+ 
+ #include "waveencoder.h"
++#include <cstdio>
+ 
+ #define WAVE_HEADER_SIZE 44
+ #define PCM_BUFFER_SIZE  0x10000 // 64KB
diff --git a/media-sound/xineadump/metadata.xml b/media-sound/xineadump/metadata.xml
new file mode 100644
index 000000000000..394a1171eb6c
--- /dev/null
+++ b/media-sound/xineadump/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">transkode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/xineadump/xineadump-0.1-r1.ebuild b/media-sound/xineadump/xineadump-0.1-r1.ebuild
new file mode 100644
index 000000000000..44abf590ccd6
--- /dev/null
+++ b/media-sound/xineadump/xineadump-0.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Utility for Xine decoding support in transKode"
+HOMEPAGE="https://sourceforge.net/projects/transkode"
+SRC_URI="mirror://sourceforge/transkode/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="media-libs/xine-lib
+	media-libs/alsa-lib"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-gcc-4.4.patch
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS
+}
diff --git a/media-sound/xmms2-scrobbler/Manifest b/media-sound/xmms2-scrobbler/Manifest
new file mode 100644
index 000000000000..557aa8054ffc
--- /dev/null
+++ b/media-sound/xmms2-scrobbler/Manifest
@@ -0,0 +1,10 @@
+AUX xmms2-scrobbler-0.4.0-gcc-7.patch 209 SHA256 0812b5736ffb5e88968834551e9dc258eda2a63d341a7817164b8276dad8ba76 SHA512 a6d44d0dcbe0804623a8f528e87ab41b159d28dd8ce0a1514f42710fd7677b14f3074d6c0368b4d65091773217fd6ea29ad630ca6c21942e36225405d96ac9ed WHIRLPOOL d335440dc13698ac58345f201eb1811e614285e40f784f19b3b6cfaee7ecebe026d1f990c04d0ec95730747e18274cee8b0fccf22bff5e362ce1f53becbc2648
+AUX xmms2-scrobbler-0.4.0-ld-order.patch 1662 SHA256 421c2f9c3a8439e1cd7f9d898d85a879cc421c0f4bfec9da3e205c2f97233fa0 SHA512 c233a2c49e641b4030a250c660d883b5cbb14ab7996d35e58da2681a46ea181587ad576aa2d3b9ba78508e938fef2870b7874f8401162e27bde209c11f8178c7 WHIRLPOOL cfa896e4d16f145e8ac11c92d391d968413c24de50d9b521486fcb819bc4bb2e01606ac7f43fc89beee025f63855437ca8b39ba9071766834ef76e997b0600e4
+AUX xmms2-scrobbler-0.4.0-ldflags.patch 685 SHA256 62dfca24030fbac99d39e8a33530b07ef24f1b8ded77c102625ba0efb29f714d SHA512 8c954180d35360193eb13a91992d6112696b4cf7b6714597c3b73585f3358b66da00ce9fa8a4d8cd0d521d111de78ee63dee3f8aa30e40569474918aa6e4474a WHIRLPOOL a411ff1314a35d9a89359e5b632f533b54e94981ed32ad7b2357f2255138e9bbb2ca6d06dd4b3ab83cbc58f47ede24231f94d2a4517054c0af6e6de9216c6131
+AUX xmms2-scrobbler-0.4.0-libs.patch 621 SHA256 62f3ebd5db9c93d5db728fc3ebd650feeb1dd86c934e57a1214abb6aeb9f7f4c SHA512 7156685a51aa4283dbc584b04c0c68925a5720cb92c3dd1b7d4356336e946d2e162d17a5408e45eebaf9ec2878f77c162f3a540c225a0d27f5662c58edb2e407 WHIRLPOOL 50d43c863256a54534d8e317a8427c536c7e8a47206d3418274b4e45cc6197cca3bd5decf7a908623a378358929374323efedff0f839d6759b4fe28ab66ea17d
+AUX xmms2-scrobbler-0.4.0-no-XPTR.patch 618 SHA256 61a95d19558e2ef885228d4b1e563f53b1b9df72b9196073e6c63ef5767570c6 SHA512 24b7e3b0472cfd277ba3bba8f0bd3fd11de43c7c6d3cfb117d142d4950fd820acfafec7df0a3f17889f847437a29521a786441272a59d599986c5d0a6179fe09 WHIRLPOOL ec681770169c05699fc50acf081aa289f67996320521faf5097bdf0ae00285fb20c8f253fb67612fe09428051276e7b6944b21c87c89cb5ea1d836b4d8b643d6
+DIST xmms2-scrobbler-0.4.0.tar.gz 19831 SHA256 7aed1670f381463e44466083f2e49119636e96005b9b93899edf79d613a2d2bc SHA512 2df20693479413a18e487f16e87f0a711866221dcbc8f96c970be55aac2c495fcb84e9e3ea754473c747d33d5d1ef54823f6a050d5054581454f956c86f6236b WHIRLPOOL ee569f034e6ddfdf3b26b8a5d1185ea8af894275ea573d871460ec0eefe75774cf081196cf1e9ad21bfb640043cf10e4a181edb23798aaf3c89505945c377666
+EBUILD xmms2-scrobbler-0.4.0.ebuild 1346 SHA256 c5e2fe539afec5acdf8ee8517d3f7f7bcb8a4f500604d7a75e1837d5f3ca0ba0 SHA512 f5b5c31346396da50ec9231d4f4e7d51a1001e09df2eae0cf70bff27f41633360c4e2887c1a275fc1c10c07cf27b4a61807804b76252e7b1252001d5b7dd2cf3 WHIRLPOOL 0f5c8951345b5b9bf97c801a07ce4bf9235939bb0f6a4f5a0d2de2a39f4ae6b322510f11307eb240e159c2adb2896a5f33d3ed699bdecf9ca68177ac82778780
+MISC ChangeLog 2339 SHA256 b836aa97c3ed02b8041604887b369c8f7d569e4506dcd9c11bf5af898c4b14ae SHA512 ba7def874b6b5ae7da91b9a155683f628ef34c25880be44a074a581064765c6bfb657eaae070c161ab600e00809ebce8507b92e569a5da5836d440f357339224 WHIRLPOOL c6cc9a3144efd3b69831a74cb6e629b708a31527104ab590d3c2108720aabde43dc6e671985ca152b22b5b5ced9dddca0b5f33e8a85c1b1fd4b85a630358ca76
+MISC ChangeLog-2015 752 SHA256 65e91f18ff1e072868b41180d280cf55796c1edafdc5665e1f45da6168e91fe2 SHA512 e50e1c339b713d9cc9698c4723dcda1ca9edb6fa33c658e9b82f4c05d660e448bf18fdb22d1408daa8396171d235fed8bb94d184337d31e6a7eb2a15f076840c WHIRLPOOL d2dc065ec0251f19dd9473890003d085fa83d2cdac788191f59c0414ee6478c54a4b7a4006ccc3e55c6e4563790ce79cdb396174ccdda3c8c0b21b5cf0062704
+MISC metadata.xml 582 SHA256 f8085e97cdc7b904862233cf063bad000bf02b8485862ad6cd4ac1cac80fa404 SHA512 1b5c7f9c32c7d7c419d456d38ece8c12597d0b39b13aea8ed289e745a3b6d8c1a6d8b1ab2dbcc4fbd2c18264dba208689421c41470ef9e3cff85a69db6679c02 WHIRLPOOL a8d2d948c53b0d17218bb26dd66883925bea49ace90580f067a14a95c0b6f7a19949dcd322b6052900e8779e103d0e287912e95f9a5b14cff1bb306a46137676
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch
new file mode 100644
index 000000000000..383bb0596eb9
--- /dev/null
+++ b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-gcc-7.patch
@@ -0,0 +1,8 @@
+diff --git a/src/submission.c b/src/submission.c
+index 422db0a..326b003 100644
+--- a/src/submission.c
++++ b/src/submission.c
+@@ -24,2 +24,3 @@
+ #include <stdlib.h>
++#include <stdio.h>
+ #include "submission.h"
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch
new file mode 100644
index 000000000000..1ba5443a9264
--- /dev/null
+++ b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ld-order.patch
@@ -0,0 +1,32 @@
+commit 096ee717070bdde9c1adc29f02fcb537920daca9
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date:   Sat Mar 3 20:24:21 2012 +0300
+
+    Makefile: set proper link order for libraries
+    
+    '-Wl,--as-needed' enforces libraries to go in proper dependency order:
+    
+        $ x86_64-pc-linux-gnu-gcc -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -Wl,--hash-style=gnu `pkg-config xmms2-client --libs` `pkg-config libcurl --libs` src/xmms2-scrobbler.o src/list.o src/queue.o src/strbuf.o src/md5.o src/submission.o -o bin/xmms2-scrobbler
+        src/xmms2-scrobbler.o: In function `save_profile_submissions_queue':
+        xmms2-scrobbler.c:(.text+0x281): undefined reference to `xmmsc_userconfdir_get'
+        src/xmms2-scrobbler.o: In function `load_config':
+        xmms2-scrobbler.c:(.text+0x3e2): undefined reference to `xmmsc_userconfdir_get'
+        src/xmms2-scrobbler.o: In function `maybe_submit_to_profile':
+        xmms2-scrobbler.c:(.text+0x7e3): undefined reference to `xmmsc_medialib_get_info'
+        xmms2-scrobbler.c:(.text+0x7f7): undefined reference to `xmmsc_result_notifier_set'
+    
+    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+diff --git a/Makefile b/Makefile
+index 7693bd2..4207cda 100644
+--- a/Makefile
++++ b/Makefile
+@@ -36,7 +36,7 @@ install: $(BINARY)
+ 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
+ 
+ $(BINARY): $(OBJECTS) bin
+-	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@ $(LIBS)
++	$(QUIET_LINK)$(CC) $(OBJECTS) -o $@ $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(LIBS)
+ 
+ src/%.o : src/%.c
+ 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch
new file mode 100644
index 000000000000..a570548ed4e9
--- /dev/null
+++ b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-ldflags.patch
@@ -0,0 +1,19 @@
+commit 8b97319c1a03acecc21b5608516859daaf5bca75
+Author: James Le Cuirot <chewi@aura-online.co.uk>
+Date:   Fri Mar 26 20:10:54 2010 +0100
+
+    Fixed the build if the --as-needed linker option is enabled.
+
+diff --git a/Makefile b/Makefile
+index dad3fcb..3331e30 100644
+--- a/Makefile
++++ b/Makefile
+@@ -35,7 +35,7 @@ install: $(BINARY)
+ 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
+ 
+ $(BINARY): $(OBJECTS) bin
+-	$(QUIET_LINK)$(CC) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) $(OBJECTS) -o $@
++	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@
+ 
+ src/%.o : src/%.c
+ 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch
new file mode 100644
index 000000000000..959f1232e6d5
--- /dev/null
+++ b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-libs.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile b/Makefile
+index 3331e30..7693bd2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,5 @@
+ CFLAGS += -std=gnu99 -Wall -Wwrite-strings -pthread
++LIBS = -lrt -lpthread
+ ENDIAN_CFLAGS=
+ PREFIX ?= /usr/local
+ 
+@@ -35,7 +36,7 @@ install: $(BINARY)
+ 	install -m 755 $(BINARY) $(DESTDIR)$(PREFIX)/bin
+ 
+ $(BINARY): $(OBJECTS) bin
+-	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@
++	$(QUIET_LINK)$(CC) $(OBJECTS) $(LDFLAGS) $(XMMS_LDFLAGS) $(CURL_LDFLAGS) -o $@ $(LIBS)
+ 
+ src/%.o : src/%.c
+ 	$(QUIET_CC)$(CC) $(CFLAGS) $(XMMS_CFLAGS) $(CURL_CFLAGS) $(ENDIAN_CFLAGS) -o $@ -c $<
diff --git a/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch
new file mode 100644
index 000000000000..950509b3d2d7
--- /dev/null
+++ b/media-sound/xmms2-scrobbler/files/xmms2-scrobbler-0.4.0-no-XPTR.patch
@@ -0,0 +1,14 @@
+diff --git a/src/xmms2-scrobbler.c b/src/xmms2-scrobbler.c
+index 244fccb..8cd06ed 100644
+--- a/src/xmms2-scrobbler.c
++++ b/src/xmms2-scrobbler.c
+@@ -534,3 +534,3 @@ on_medialib_get_info2 (xmmsv_t *val, void *udata)
+ {
+-	bool reset_current_id = XPOINTER_TO_INT (udata);
++	bool reset_current_id = (bool)(uintptr_t)(udata);
+ 
+@@ -572,3 +572,3 @@ maybe_submit_to_profile (bool reset_current_id)
+ 	                           on_medialib_get_info2,
+-	                           XINT_TO_POINTER (reset_current_id));
++	                           (void*)(uintptr_t)(reset_current_id));
+ 	xmmsc_result_unref (mediainfo_result);
diff --git a/media-sound/xmms2-scrobbler/metadata.xml b/media-sound/xmms2-scrobbler/metadata.xml
new file mode 100644
index 000000000000..af872c8a772b
--- /dev/null
+++ b/media-sound/xmms2-scrobbler/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<longdescription>
+		XMMS2-Scrobbler is a client for XMMS2 that feeds information about the songs
+		you played to last.fm, formerly known as AudioScrobbler.
+		XMMS2-Scrobbler supports "multi-scrobbling", i.e. it can talk to more than
+		one AudioScrobbler server.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0.ebuild b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0.ebuild
new file mode 100644
index 000000000000..6c784004bb5a
--- /dev/null
+++ b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="XMMS2 AudioScrobbler client"
+HOMEPAGE="http://code-monkey.de/pages/xmms2-scrobbler"
+SRC_URI="ftp://ftp.code-monkey.de/pub/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-sound/xmms2
+	net-misc/curl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}-libs.patch
+	epatch "${FILESDIR}"/${P}-ld-order.patch
+	epatch "${FILESDIR}"/${P}-gcc-7.patch
+	epatch "${FILESDIR}"/${P}-no-XPTR.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" VERBOSE=1
+}
+
+src_install() {
+	emake PREFIX="${EROOT}/usr" DESTDIR="${D}" install
+	dodoc README AUTHORS
+}
+
+pkg_postinst() {
+	einfo "xmms2-scrobbler will fail to start until you create a configfile"
+	einfo ""
+	einfo "mkdir -p ~/.config/xmms2/clients/xmms2-scrobbler/lastfm"
+	einfo "echo 'user: foo' >> ~/.config/xmms2/clients/xmms2-scrobbler/lastfm/config"
+	einfo "echo 'password: bar' >> ~/.config/xmms2/clients/xmms2-scrobbler/lastfm/config"
+	einfo "echo 'handshake_url: http://post.audioscrobbler.com' >> ~/.config/xmms2/clients/xmms2-scrobbler/lastfm/config"
+	einfo ""
+	einfo "More info and configuration-options can be found in xmms2-scrobbler's README file"
+}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
new file mode 100644
index 000000000000..8f16a6372c16
--- /dev/null
+++ b/media-sound/xmms2/Manifest
@@ -0,0 +1,28 @@
+AUX xmms2-0.8-audio4-p1.patch 4453 SHA256 910845476e01339cfc4c637b55fa2a2a908cfb45be095efaa7d08146f413209b SHA512 4490e0729b2d048da17b0c9537dbd31de240f918f9be1de808609c473365a2f905b5fb3e6912beb500b668b53121764c171ef7978d4ed842d45578c50c7f78c8 WHIRLPOOL 3fc9f24ae32e86d55eba295808b608ce42b3b24bea1fd13dda7d8a98d35fe7a10662c3eca115f66daba326df2056e48c54519738c4709f3798f7931dfdfe6ae9
+AUX xmms2-0.8-audio4-p2.patch 6191 SHA256 cb682cd935ba39d7ccd131a56712f0234210709d8db2af0b193a3b68d5d9a8f3 SHA512 7e3a443812f6ad3f05bb5cec3ed60a0b1134ce76e32e5123ee8fc86b4da70ec8a26bbfeb62ecc4aee62c9c30efdc929faf82e71bdaa7128f52a265ee6561da25 WHIRLPOOL f026fe348b6d9af082235049d165d70f8f8cdb8494abec31ffadeb05f0280424f8fdc4eb95ce6781f01f6cbcfaf8c35674c5484cb3491f1d38f6b3e64416ddb4
+AUX xmms2-0.8-audio4-p3.patch 11107 SHA256 09161ae6a6a929f4ab7f748c78329c080bcf20c6d173290ccd4329e64d940085 SHA512 cf40f6c1b8b501ec3deb9808836abdf2afd03602d77a783b6be1e667c9c2664f4ca25ad9da8c0249f3aee4562ebc86d8156db0a5504ceb786528c37dc6e07d0c WHIRLPOOL 8e945f7cd4b2f3515fa01bfd065428c0252f9c918d95f0dca4d68974c5c44ad84b399ca5a0313c2eccbfb79f80727a5dae6cd2cfe76cee5471743b34d95116a9
+AUX xmms2-0.8-audio4-p4.patch 10088 SHA256 974966585e1bb963798fd3ff0b74612168786165b8ac949e4d1281f81a1c480f SHA512 a326eecdf6bb207ce367917f63edffa602bf8817ca2471f7ae1f70afbc86559769c91c6bd3477a236bc5061ba8ff92b566074f92a37541bec523195b6a97f71f WHIRLPOOL bffcd4c86a0e84c1365fa43208f67a9f25668d553246aab07eeec24b012f8a0ad97dc80968b7ab3ff9d6dbda4dde80d30a13d1a29c20f8818ec2b9b8c3eda46c
+AUX xmms2-0.8-audio4-p5.patch 5021 SHA256 97f5450828310fb618fed206bafb9a6fc64e94ec1204698a933f2855e15c5bcb SHA512 b6b7ff8fb1f9378c1ded3b56f1d5e4347fa468054d2da5e8862a58e31f1e4233b4cedf52ed6fdbc0121297f8691a7f9aa15ddfd20414bf24f6815ee7e6d1bbac WHIRLPOOL 007598ff2ddecd8e6297e5d25dc8937242385596fdba640319a425d8af4aee8d18d98d959bd22b78e07761281b6ba723bba35395548c588a9b9151b71c62d343
+AUX xmms2-0.8-audio4-p6.patch 3895 SHA256 b8023827abd97cedaaf9a3795638568ba1903b7b5da42e28f8c2a5c1f06534cb SHA512 28ba0b69018c9b36ccf66dfcf88ba11105840eb3e688dc1c7da9a2804cc0bb0335d20c48793c9492aa5fcfee514f576a0bce375b0b42858a37ac192bad40d1a5 WHIRLPOOL dd703b3295a014e60ae15b2d0aad7c134ed5d8b2c586b883734189375b623c1f31e7a53b46b774b66c4338cd4a967bc27f58ce4d2870df1d9120eafe1042f949
+AUX xmms2-0.8-audio4-p7.patch 5263 SHA256 4c8cf20328c5003fdd945e9ededd1d11b917e776eeb04ac19cfa6263fa46b2eb SHA512 b2e3615b0e2a20490ffbc6de307f3dc0cfc87e913170ef6a94f5673f1bd7ba3e92741a04b24068df7a8746dba52dc558b41f59eed67d9f89890825bb125f263d WHIRLPOOL b53e1c94f66f8a093aeeec681a331d9b0b2c478b88534635b005802b635dfd7ef990dc38507cdca1ffe192e6b4ee303a4bf7b79ba192d152268c7faf54edd42b
+AUX xmms2-0.8-cpython.patch 471 SHA256 99f357d96e0e45fa9e1b74b313427c0c09f7a9f881fc7105e9e2cf7fa29d958b SHA512 7beca90f3af10c49399c2b996d7f3b11b2c55232ec2231877c841da31b29b94dfa9dfc2eb91f3529b8a37f9a01c00bc1727af1ba8850fc7d050a94ef841656ca WHIRLPOOL c170784db9ed44837136cce7f6735261caf7443f14a6721e01cc4f2584857cc41e5ce79bb2393b678b6fe9e2c8757d94af9e8eaa3db609e01f14c026e589f8cb
+AUX xmms2-0.8-cython-0.19.1.patch 1726 SHA256 be06ffe3ffa6d78381e0b81426ae192493a73e6131e17b577f2f5842102a5114 SHA512 8ecfc40196bf8643bde54aaaf21197746dcc31930da68deb7dce48ff0285640bd57a7218788e7dde937af434080a7aaf7cf900193e129cc1b4f6a077b53a2494 WHIRLPOOL a94421a30880dbaad8dc7113f0a091f2b6d097b4deb89490b145ac38000dabf7c0db371c5bfd77a3502bb126ecdd1dc698f7c59fbd135cd689f1249cce49233d
+AUX xmms2-0.8-ffmpeg-0.11.patch 638 SHA256 3fccbf6d730f56a88fb570715b424759b7d2767aa0fc51053a75dbf34606947f SHA512 5b54c9284577f57da5b1ab6f51f620fe20a2815cc38dfca2437aaac9424917ddbba2d174576d619d36c18ec5ffa194dcff7333e1e68c27bf8abe48f3c6a464a7 WHIRLPOOL de4e6337292d115cf127ae9aecaed5e4bbb840dbf30eb577a75db95df43e648ba7e5f835ca8a4924c890473df0cb52308319262802dc6c97213053542f23c3cb
+AUX xmms2-0.8-ffmpeg2.patch 455 SHA256 5fa4f735ef74a2de49150520fa3ba62abff9aca2ac7f84d18b51a55e73cd7e53 SHA512 6aa567c3d823780c7fc8951735f59bcbe3345989e077d3ea6d8100acedd3ebf30523f05152fb80827c236ff83674bb47ca0917b5d2331c4d79c4502e41b365a3 WHIRLPOOL 92101bff32090216545a226c2d76f342931a5cfc9478e568b92cae0a3565ee5940e6f532ef9ebcd689af44a85d171486a659d05a449a5f36073592c145458a08
+AUX xmms2-0.8-libav-9-p2.patch 1823 SHA256 107b2c23e71bf06c8d304808cb97fed44776c57d7a0b3600652ea610c162a290 SHA512 fef46159dc8d40ee05d091076e78f5ffa8d1c93ee2e476110fa96f4f52f79c05c5177192828258ab6e4ec75118ea382458546325692110c819a5fed3cf2c198c WHIRLPOOL cf57cd221c0963212d2699f23dd965db7d77d6aaccde44cadc3f6149f29ef43a152ba672900be0c475614b19416713c5b35e3478fd6fd33c38b0e1e543a0c2df
+AUX xmms2-0.8-libav-9.patch 526 SHA256 43bcee24cb163524519d8abc07b2729e20628ef9d25ed21cadae6f6d653baff5 SHA512 2a6218fb8a27c89321c08025c110425ed1deae0f498bca9a9b306f2848c605a964aef05adcb1f3fd006786fda0b88d8a6d701c4fc8834cb7fb0fe561d8f9e5fb WHIRLPOOL 0c06b8bd2fbab37054bc3063f97ec4f8812c9ad324e9655eca8c398c2e58fc13628ffe751328efa17fd4f953b3ced177f4040a406e8c096010b1290d145dd2b4
+AUX xmms2-0.8-memset.patch 685 SHA256 dd85003c15c4ff0e122422b154d4a8fa5f3371ae3673b23a89c77848e43d47d0 SHA512 aa45c8f4e04e7b5edae131ac60baad265d2fdbc6297fc2595d2caedc0205956ae551408ea208daec857d1cb44a1698c663f8fc6dcb16d3f1a998b12380a562e4 WHIRLPOOL 78c4df892814ee857fff81b8c3357c83f932521a5f17c86999dc066e13a7dd7bd406f9521be5dd133ec93e851e7d34cbd5e30a446169543c57011137ead2f42e
+AUX xmms2-0.8-modpug.patch 361 SHA256 b604238fab805b465522e4aba344518a3cf357cf65566f78fa756b32c763c7b8 SHA512 a86b764526a82a719751f0cf2a10f22086f75d5efde6e4a1afd19c6dd4132d8770b7db2d6b46c3c7f0b7ff319ab11bef64a812d5a13164438d7f1a4595ec9f49 WHIRLPOOL 67ac32908653edb5c7914c6787c32012e46d2d0172bd11e92e00f4f3d0009aac102f10b576d154c33ce7d444075d06cc82fbbb0382f9b53d0344bb6275016673
+AUX xmms2-0.8-rtvg.patch 1539 SHA256 a5486f791ee431171c3bf3a813165279f3218b2f2c6293f1e564ef606ddd9fb7 SHA512 b8c6b908f48ab239c2c734452eebd2b9a4a2f4f2b98278bb0951d9a97e0d3df03b5443bc3a6bb92ff3133894d7b6239373b3323251f34c6852eee988aae5205f WHIRLPOOL bf9381f3f6a121f06d1ba3309cd4107e26f39db0f83772cc7d42a6dc85d27ad25f51b2c98be0a304d77e62e06e157c35f7b8304e32761319f11321da787f0696
+AUX xmms2-0.8-samba-4.patch 1125 SHA256 e453c2d3ecea7d95da393fce2d246a3372351cf25a60c0f1dedd61eb0ebf9d38 SHA512 f6a3ef39188b077217becc7317253e7ab652d6bd603bf26239a8398d8de6d34c62415f42baed78720fce9048f2499de90f0cca07d7219f281df8a441b16a7e01 WHIRLPOOL c3d2219eb5aa4979d5319776a14afb2a700d0a6d1e1249005dab057bbfa1e31776daba54812367b5657e8f18631a8ab9d5516c26810ca2c06aa7929f00ebb4e9
+AUX xmms2-0.8DrO_o-waflib-fix-perl.patch 1693 SHA256 92677d5cd31efa55cad5a0c9918b50be274f7de65065c3f491482ee95fb77b92 SHA512 0f7f86cebd0ff75ed53366776f8c93abb54adf5942f53d7424183a4bd6913b73493882d4d3caadba6a959ddf22da0a22fa53d0fc18ce5b8508eb5670482e8c92 WHIRLPOOL a7259c7071f70082f23044743302f96aa403e428fe93f4854f63ac900c7da948ebf1cc1332d8adbfd72a3862e888cb5d6b56481e8ec1e4e299e19c50c14bf34b
+AUX xmms2-0.8_p20161122-be-hash.patch 1075 SHA256 0a5a5bdef85c3169c0b0761b6b3e4b3ae1e27dcf506210501598cfee32c4a7c0 SHA512 051e22907315bb6bda201497e1c2ef84d919fc7d39aefac187b3616c5f6c41e768cdd79cfe197fbadfdda3863f9e9c96b5f72fa07d5e1655451328cde8ba5781 WHIRLPOOL a7e82bd247c7630dabcb95425a2db7b18feeafe90b5e613fce6baa7495bef09699b7dff18e74c902963bb06696f6561f6fe65525c1a1f59f2e3699a3d8bd0080
+AUX xmms2-0.8_p20161122-tarball.patch 2764 SHA256 3de2d3c0cc8cf0a0ca28c4d51082c55fc7fe19839a54b8f2787335ff2f9bd7ba SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac WHIRLPOOL 48567b17881749e0ebb933dd445c663b89ebb005d8e8c5c55ad97edfa3ebb249d69cd8812588a5a62e4272064375447940be04fca6259b9428b543a53954f9a3
+DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 SHA256 58bd62f1e3ca83d4d82ad6854ee769b97238fc1c89967262c0e9e9e20e35092e SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb WHIRLPOOL 438d33793b808dd151b27ac51af9998b819ffc03cbc0ce789d693192f8aa5cab3c48402ef83f2b8fe1442dd9130248f561b1fe466168c0569c2e017ee1a0ede3
+DIST xmms2-0.8DrO_o.tar.bz2 1670726 SHA256 c77e41e7bd5788889d5a2f78331ca8c748b8721bd2e59f36c36ad4c7cae8694a SHA512 478103d80264c0cb32912e828f74d0f5b2f10fe310f530a87ebecda7ca547a69e238cd572788f90bda29494494160d459fa6d1356b4fb87c7a8f0bf02e3b75f8 WHIRLPOOL 741dd85b8c065eea799675588a8d4c389c47fa3dcf129a9fd799bb5da0ffcb1eeffa45cfaca40af7c505908818b5e7960c1a54e947f53358edeb43841f2eaa5c
+EBUILD xmms2-0.8-r4.ebuild 7874 SHA256 471384c64f1a54c2dc421a44c6673f9d18b4b0841ed2459639aa18ba08efa2ad SHA512 529fb2aa5655d0acc7b8c76c50e51e336771eec912dd5b5c3c469c6f32942eab15c1ca6aa9716c06b5103a2e852729b295d1b3f862d4e8e1c3c24918fa7550ae WHIRLPOOL 378209b1ae3bbdbc31c891ee47a92c87bee5fc714854bdec209e9ed3afb66b5d29a2f0063f72c8d5b53c26817c3beeae214e01f461b40a2a1321cec33e0f11a2
+EBUILD xmms2-0.8_p20161122-r1.ebuild 7492 SHA256 ac947dea9d870ed6a876a37bcb222cea492eda3a0adc3f4a08417df77a9313c1 SHA512 a05b1284416709210ed396a95ee66e53687e3ed957c21827d7e9274efa3ba79e4522ede456ce07eb447d366898bfb66f5c056c7d6d110e3593a14535b7e096a1 WHIRLPOOL 147afe919b4e09803f7479caec286f74caa0d6596ec4787bb50da63fd1db20770eea462677b0a6963f90c1e80aed44e8a032451749d9caae77d74e601d577bf8
+EBUILD xmms2-0.8_p20161122.ebuild 7395 SHA256 3606e852697e31ca64d8888441ccad3f270ec4bff3fe0eb80453c8015d62a7ca SHA512 3b1afecead61985d6ff70bf85252fbfba891c07d14cf2557cd992b42a04b69c79d44a48d2a55768d77c2cee85079e5dac132c71d94859f775ce28d593a8acf98 WHIRLPOOL f82ff2cfe21680175049af774a636020d7befc28f70dcfb9305507fcfbc435e8bb44f96b1e6ad869265a68b32f002e2052db7fbfde94d8861f64ac0fd1a0d032
+MISC ChangeLog 6165 SHA256 38f2d2683f2a7fc4c39fa78ee02ebae2589538d80cc195efc5183a157772bf3c SHA512 1c47e67574b722dbc4363c9a5bcf7292bd062b72abb53eb3e20dc7de5e2e4ed6715ddf5110c4aa9f04f66d0364a1cb66f7affee15f6940671a4db24ff713b92d WHIRLPOOL cf953aa3bfd0f1d054773c09ef961d084d8d5466612079a63811b258b31ca59d68dbdb50cd69d4a419309a5bf1d771789f4fd3eb5986ca2368e20320916d3270
+MISC ChangeLog-2015 7596 SHA256 a519587f0ed0529ca29d316c0e958984ccc5c02887219ca49de1d5a69c34e49d SHA512 22539404663febb287ecc813a8655256c2696864e7cd99409a957aa5c665b3a348a3744666621dfa8ce775eda08077b36a0f721f754c42957bb97305625d86a4 WHIRLPOOL a08bedf3739615df0c51931df17507be30792afe66f9353460db786648dbb91504449b30bd4c12a9adc95fbadc42f3bee9f1d85645aafdb511ba9e5b238290d8
+MISC metadata.xml 2711 SHA256 e4aefd014be07da17cabbb1487cf5c0918438988321e7b2c384fe5d809a26946 SHA512 001f334780da23cfc8d3c2ae2ce01e9268b4171d01cdae868f0d67296444ee64d27f0819cf431279269413f22227265dc1ea4dbf87b6ff86b7f00426f70cb044 WHIRLPOOL 8d6cbb8f1f1d9ec1efabc2c96874cc4420b738e7288b3bd7ccd41276fd2b33adfb64fa27418901d39b27359632dfd65d59b815dc5126431f8eb74d86c16ff08c
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch
new file mode 100644
index 000000000000..21ed6492a44d
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-audio4-p1.patch
@@ -0,0 +1,123 @@
+commit 8831bc77d705c03b3f8081de0520dd10afa85c69
+Author: Uli Franke <cls@nebadje.org>
+Date:   Tue Jan 17 23:23:46 2012 +0100
+
+    BUG(2509): Avoid unaligned reads in avcodec xform.
+
+diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
+index fe58fc5..1b4a659 100644
+--- a/src/plugins/avcodec/avcodec.c
++++ b/src/plugins/avcodec/avcodec.c
+@@ -36,6 +36,9 @@ typedef struct {
+ 	guint buffer_size;
+ 	gboolean no_demuxer;
+ 
++	gchar *read_out_buffer;
++	gint read_out_buffer_size;
++
+ 	guint channels;
+ 	guint samplerate;
+ 	xmms_sample_format_t sampleformat;
+@@ -107,6 +110,7 @@ xmms_avcodec_destroy (xmms_xform_t *xform)
+ 
+ 	avcodec_close (data->codecctx);
+ 	av_free (data->codecctx);
++	av_free (data->read_out_buffer);
+ 
+ 	g_string_free (data->outbuf, TRUE);
+ 	g_free (data->buffer);
+@@ -132,6 +136,9 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 	data->buffer_size = AVCODEC_BUFFER_SIZE;
+ 	data->codecctx = NULL;
+ 
++	data->read_out_buffer = av_malloc (AVCODEC_MAX_AUDIO_FRAME_SIZE);
++	data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++
+ 	xmms_xform_private_data_set (xform, data);
+ 
+ 	avcodec_init ();
+@@ -196,7 +203,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 		} else {
+ 			/* A demuxer plugin forgot to give decoder config? */
+ 			xmms_log_error ("Decoder config data not found!");
+-			return FALSE;
++			goto err;
+ 		}
+ 	}
+ 
+@@ -220,7 +227,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 
+ 		/* some codecs need to have something read before they set
+ 		 * the samplerate and channels correctly, unfortunately... */
+-		if ((ret = xmms_avcodec_read (xform, buf, 42, &error)) > 0) {
++		if ((ret = xmms_avcodec_read (xform, buf, sizeof (buf), &error)) > 0) {
+ 			g_string_insert_len (data->outbuf, 0, buf, ret);
+ 		} else {
+ 			XMMS_DBG ("First read failed, codec is not working...");
+@@ -251,6 +258,9 @@ err:
+ 	if (data->codecctx) {
+ 		av_free (data->codecctx);
+ 	}
++	if (data->read_out_buffer) {
++		av_free (data->read_out_buffer);
++	}
+ 	g_string_free (data->outbuf, TRUE);
+ 	g_free (data->extradata);
+ 	g_free (data);
+@@ -263,8 +273,7 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len,
+                    xmms_error_t *error)
+ {
+ 	xmms_avcodec_data_t *data;
+-	char outbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE];
+-	gint outbufsize, bytes_read = 0;
++	gint bytes_read = 0;
+ 	guint size;
+ 
+ 	data = xmms_xform_private_data_get (xform);
+@@ -330,9 +339,9 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len,
+ 		packet.data = data->buffer;
+ 		packet.size = data->buffer_length;
+ 
+-		outbufsize = sizeof (outbuf);
+-		bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) outbuf,
+-		                                    &outbufsize, &packet);
++		data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++		bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) data->read_out_buffer,
++		                                    &data->read_out_buffer_size, &packet);
+ 
+ 		/* The DTS decoder of ffmpeg is buggy and always returns
+ 		 * the input buffer length, get frame length from header */
+@@ -354,8 +363,8 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len,
+ 
+ 		data->buffer_length -= bytes_read;
+ 
+-		if (outbufsize > 0) {
+-			g_string_append_len (data->outbuf, outbuf, outbufsize);
++		if (data->read_out_buffer_size > 0) {
++			g_string_append_len (data->outbuf, data->read_out_buffer, data->read_out_buffer_size);
+ 		}
+ 
+ 		size = MIN (data->outbuf->len, len);
+@@ -371,8 +380,7 @@ static gint64
+ xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples, xmms_xform_seek_mode_t whence, xmms_error_t *err)
+ {
+ 	xmms_avcodec_data_t *data;
+-	char outbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE];
+-	gint outbufsize, bytes_read = 0;
++	gint bytes_read = 0;
+ 	gint64 ret = -1;
+ 
+ 	g_return_val_if_fail (xform, -1);
+@@ -396,9 +404,9 @@ xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples, xmms_xform_seek_mode_t w
+ 		packet.data = data->buffer;
+ 		packet.size = data->buffer_length;
+ 
+-		outbufsize = sizeof (outbuf);
+-		bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) outbuf,
+-		                                    &outbufsize, &packet);
++		data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++		bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) data->read_out_buffer,
++		                                    &data->read_out_buffer_size, &packet);
+ 
+ 		if (bytes_read < 0 || bytes_read > data->buffer_length) {
+ 			XMMS_DBG ("Error decoding data!");
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p2.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p2.patch
new file mode 100644
index 000000000000..46b5b1d3b926
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-audio4-p2.patch
@@ -0,0 +1,171 @@
+commit b614459dc1ea353d6c24b4a77c7f92a5577d5bc3
+Author: Uli Franke <cls@nebadje.org>
+Date:   Thu Jan 19 11:53:57 2012 +0100
+
+    BUG(2510): Add more bitrates/samplerates to AAC/ALAC.
+
+diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
+index 1b4a659..b32de4d 100644
+--- a/src/plugins/avcodec/avcodec.c
++++ b/src/plugins/avcodec/avcodec.c
+@@ -60,6 +60,7 @@ static gint xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len
+                                xmms_error_t *error);
+ static gint64 xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples,
+                                  xmms_xform_seek_mode_t whence, xmms_error_t *err);
++static xmms_sample_format_t xmms_avcodec_translate_sample_format (enum AVSampleFormat av_sample_format);
+ 
+ /*
+  * Plugin header
+@@ -168,12 +169,12 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 		data->channels = ret;
+ 	}
+ 
+-	/* bitrate required for WMA files */
++	/* Required by WMA xform. */
+ 	xmms_xform_auxdata_get_int (xform,
+ 	                            "bitrate",
+ 	                            &data->bitrate);
+ 
+-	/* ALAC and MAC require bits per sample field to be 16 */
++	/* Required by tta and apefile xforms. */
+ 	xmms_xform_auxdata_get_int (xform,
+ 	                            "samplebits",
+ 	                            &data->samplebits);
+@@ -238,12 +239,17 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 
+ 	data->samplerate = data->codecctx->sample_rate;
+ 	data->channels = data->codecctx->channels;
++	data->sampleformat = xmms_avcodec_translate_sample_format (data->codecctx->sample_fmt);
++	if (data->sampleformat == XMMS_SAMPLE_FORMAT_UNKNOWN) {
++		avcodec_close (data->codecctx);
++		goto err;
++	}
+ 
+ 	xmms_xform_outdata_type_add (xform,
+ 	                             XMMS_STREAM_TYPE_MIMETYPE,
+ 	                             "audio/pcm",
+ 	                             XMMS_STREAM_TYPE_FMT_FORMAT,
+-	                             XMMS_SAMPLE_FORMAT_S16,
++	                             data->sampleformat,
+ 	                             XMMS_STREAM_TYPE_FMT_CHANNELS,
+ 	                             data->channels,
+ 	                             XMMS_STREAM_TYPE_FMT_SAMPLERATE,
+@@ -428,3 +434,23 @@ xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples, xmms_xform_seek_mode_t w
+ 
+ 	return ret;
+ }
++
++static xmms_sample_format_t
++xmms_avcodec_translate_sample_format (enum AVSampleFormat av_sample_format)
++{
++	switch (av_sample_format) {
++	case AV_SAMPLE_FMT_U8:
++		return XMMS_SAMPLE_FORMAT_U8;
++	case AV_SAMPLE_FMT_S16:
++		return XMMS_SAMPLE_FORMAT_S16;
++	case AV_SAMPLE_FMT_S32:
++		return XMMS_SAMPLE_FORMAT_S32;
++	case AV_SAMPLE_FMT_FLT:
++		return XMMS_SAMPLE_FORMAT_FLOAT;
++	case AV_SAMPLE_FMT_DBL:
++		return XMMS_SAMPLE_FORMAT_DOUBLE;
++	default:
++		XMMS_DBG ("AVSampleFormat (%i) not supported.", av_sample_format);
++		return XMMS_SAMPLE_FORMAT_UNKNOWN;
++	}
++}
+diff --git a/src/plugins/mp4/mp4.c b/src/plugins/mp4/mp4.c
+index 7c915c4..3ee9357 100644
+--- a/src/plugins/mp4/mp4.c
++++ b/src/plugins/mp4/mp4.c
+@@ -186,9 +186,6 @@ xmms_mp4_init (xmms_xform_t *xform)
+ 	xmms_xform_auxdata_set_bin (xform, "decoder_config", tmpbuf, tmpbuflen);
+ 	g_free (tmpbuf);
+ 
+-	/* This is only for ALAC to set 16-bit samples, ignored for AAC */
+-	xmms_xform_auxdata_set_int (xform, "samplebits", 16);
+-
+ 	xmms_mp4_get_mediainfo (xform);
+ 
+ 	XMMS_DBG ("MP4 demuxer inited successfully!");
+@@ -288,7 +285,7 @@ xmms_mp4_get_mediainfo (xmms_xform_t *xform)
+ 	data = xmms_xform_private_data_get (xform);
+ 	g_return_if_fail (data);
+ 
+-	if ((temp = mp4ff_get_sample_rate (data->mp4ff, data->track)) >= 0) {
++	if ((temp = mp4ff_get_sample_rate (data->mp4ff, data->track)) > 0) {
+ 		glong srate = temp;
+ 
+ 		if ((temp = mp4ff_get_track_duration_use_offsets (data->mp4ff,
+@@ -492,7 +489,7 @@ xmms_mp4_get_track (xmms_xform_t *xform, mp4ff_t *infile)
+ 		case 0x69: /* MPEG-2 audio */
+ 		case 0x6B: /* MPEG-1 audio */
+ 			continue;
+-		case 0xff:
++		case 0xff: /* ALAC */
+ 			chans = mp4ff_get_channel_count (infile, i);
+ 			rate = mp4ff_get_sample_rate (infile, i);
+ 			if (chans <= 0 || rate <= 0) {
+diff --git a/src/plugins/mp4/mp4ff/README.xmms2 b/src/plugins/mp4/mp4ff/README.xmms2
+index c2737c5..8021618 100644
+--- a/src/plugins/mp4/mp4ff/README.xmms2
++++ b/src/plugins/mp4/mp4ff/README.xmms2
+@@ -12,3 +12,4 @@ Changes:
+  * Add value_length variable to tag type and use it when adding new item-value pairs,
+    necessary for cover art since it's binary data and can't be handled as a string
+  * Add support for Apple Lossless audio files
++ * Add a workaround for supporting higher samplerates.
+diff --git a/src/plugins/mp4/mp4ff/mp4ff.c b/src/plugins/mp4/mp4ff/mp4ff.c
+index ee7f7fb..b6f0a37 100644
+--- a/src/plugins/mp4/mp4ff/mp4ff.c
++++ b/src/plugins/mp4/mp4ff/mp4ff.c
+@@ -32,6 +32,8 @@
+ #include <string.h>
+ #include "mp4ffint.h"
+ 
++static uint32_t mp4ff_normalize_flawed_sample_rate (uint16_t samplerate);
++
+ mp4ff_t *mp4ff_open_read(mp4ff_callback_t *f)
+ {
+     mp4ff_t *ff = malloc(sizeof(mp4ff_t));
+@@ -304,12 +306,39 @@ int32_t mp4ff_num_samples(const mp4ff_t *f, const int32_t track)
+     return total;
+ }
+ 
++static uint32_t
++mp4ff_normalize_flawed_sample_rate (uint16_t samplerate)
++{
++	/* A list of common rates can be found at
++	 * http://en.wikipedia.org/wiki/Sampling_rate */
++	uint32_t rates[] = {8000, 11025, 16000, 22050, 32000, 44056, 44100,
++	                  47250, 48000, 50000, 50400, 88200, 96000, 176400,
++	                  192000, 352800, 384000, 0};
++	uint32_t* rate;
++
++	/* First check standard rates. */
++	for (rate = rates; *rate; rate++) {
++		if (*rate == samplerate) {
++			return *rate;
++		}
++	}
++
++	/* No standard rates matching - check if sample rate got truncated when
++	 * added to MP4 container */
++	for (rate = rates; *rate; rate++) {
++		if ((*rate & 0x0000FFFF) == samplerate) {
++			return *rate;
++		}
++	}
+ 
++	/* Failed to find a standard rate - we give up returning the original rate */
++	return samplerate;
++}
+ 
+ 
+ uint32_t mp4ff_get_sample_rate(const mp4ff_t *f, const int32_t track)
+ {
+-	return f->track[track]->sampleRate;
++	return mp4ff_normalize_flawed_sample_rate (f->track[track]->sampleRate);
+ }
+ 
+ uint32_t mp4ff_get_channel_count(const mp4ff_t * f,const int32_t track)
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p3.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p3.patch
new file mode 100644
index 000000000000..a9145c0d3d26
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-audio4-p3.patch
@@ -0,0 +1,388 @@
+commit 4d0682030e20a8ed218f4ff924554f93d276d9ee
+Author: Anthony Garcia <lagg@lavabit.com>
+Date:   Thu Apr 22 16:59:37 2010 -0700
+
+    OTHER: Cleanup
+    
+    Re-enabled nellymoser (ffmpeg appears to be okay with it now)
+    
+    Fixed possible infinite loop in the code that handles the data (if any)
+    between the header and tag data.
+
+diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
+index 6c9fea8..5554056 100644
+--- a/src/plugins/avcodec/avcodec.c
++++ b/src/plugins/avcodec/avcodec.c
+@@ -90,7 +90,7 @@ xmms_avcodec_plugin_setup (xmms_xform_plugin_t *xform_plugin)
+ 	xmms_magic_add ("A/52 (AC-3) header", "audio/x-ffmpeg-ac3",
+ 	                "0 beshort 0x0b77", NULL);
+ 	xmms_magic_add ("DTS header", "audio/x-ffmpeg-dca",
+-	                "0 belong 0x7ffe8001", NULL); 
++	                "0 belong 0x7ffe8001", NULL);
+ 
+ 	xmms_xform_plugin_indata_add (xform_plugin,
+ 	                              XMMS_STREAM_TYPE_MIMETYPE,
+@@ -197,7 +197,8 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 		    !strcmp (data->codec_id, "adpcm_swf") ||
+ 		    !strcmp (data->codec_id, "pcm_s16le") ||
+ 		    !strcmp (data->codec_id, "ac3") ||
+-		    !strcmp (data->codec_id, "dca")) {
++		    !strcmp (data->codec_id, "dca") ||
++		    !strcmp (data->codec_id, "nellymoser")) {
+ 			/* number 1024 taken from libavformat raw.c RAW_PACKET_SIZE */
+ 			data->extradata = g_malloc0 (1024);
+ 			data->extradata_size = 1024;
+diff --git a/src/plugins/flv/flv.c b/src/plugins/flv/flv.c
+index 440010c..266fea6 100644
+--- a/src/plugins/flv/flv.c
++++ b/src/plugins/flv/flv.c
+@@ -25,29 +25,41 @@
+  * and other info, then data
+  */
+ #define FLV_TAG_SIZE 11
+-/* random constant */
+ #define FLV_CHUNK_SIZE 4096
+ 
+-/* let libavcodec take care of swapping sample bytes */
+-static const gchar *mime_pcm_s16le = "audio/x-ffmpeg-pcm_s16le";
+-static const gchar *fmt_mime[11] = {
+-	/* Supported when samples are 8 bit
+-	 * (otherwise there's no way of knowing endianness)
+-	 */
+-	"audio/pcm",
+-	"audio/x-ffmpeg-adpcm_swf",
+-	"audio/mpeg",
+-	/* if bps is 8 bit u8
+-	 * if bps is 16 bit sle16
+-	 */
+-	"audio/pcm",
+-	/* libavcodec can't handle nelly without dying yet */
+-	/*"audio/x-ffmpeg-nellymoser",
+-	"audio/x-ffmpeg-nellymoser",
+-	"audio/x-ffmpeg-nellymoser",*/
+-	"", "", "",
+-	"", "", "",
+-	"audio/aac"
++typedef enum {
++	/* Only u8 bit samples since
++	   there's no way to determine endianness
++	*/
++	CODEC_PCM_HOST,
++	CODEC_ADPCM,
++	CODEC_MP3,
++	/* 8 bps: unsigned
++	   16 bps: signed
++	*/
++	CODEC_PCM_LE,
++	CODEC_NELLYMOSER_16K,
++	CODEC_NELLYMOSER_8K,
++	/* Uses the sample rate in
++	   the tag as normal
++	*/
++	CODEC_NELLYMOSER,
++	CODEC_AAC = 10
++} xmms_flv_codec_id;
++
++struct xmms_flv_codec_table {
++	xmms_flv_codec_id id;
++	const gchar *mime;
++} static flv_codecs[] = {
++	{CODEC_PCM_HOST, "audio/pcm"},
++	{CODEC_ADPCM, "audio/x-ffmpeg-adpcm_swf"},
++	{CODEC_MP3, "audio/mpeg"},
++	/* Will be audio/x-ffmpeg-pcm_s16le if bps is 16 */
++	{CODEC_PCM_LE, "audio/pcm"},
++	{CODEC_NELLYMOSER_16K, "audio/x-ffmpeg-nellymoser"},
++	{CODEC_NELLYMOSER_8K, "audio/x-ffmpeg-nellymoser"},
++	{CODEC_NELLYMOSER, "audio/x-ffmpeg-nellymoser"},
++	{CODEC_AAC, "audio/aac"}
+ };
+ 
+ typedef struct {
+@@ -111,23 +123,26 @@ static gboolean
+ xmms_flv_init (xmms_xform_t *xform)
+ {
+ 	xmms_sample_format_t bps;
+-	gint readret;
++	gint readret, i;
+ 	guint8 channels, flags, format;
+-	guint8 header[FLV_TAG_SIZE + 5];
+-	const gchar *mime;
++	guint8 header[FLV_TAG_SIZE + 1];
+ 	guint32 dataoffset, samplerate;
+ 	xmms_error_t err;
+ 	xmms_flv_data_t *flvdata;
++	struct xmms_flv_codec_table *codec = NULL;
++
++	flvdata = g_new0 (xmms_flv_data_t, 1);
++	xmms_xform_private_data_set (xform, flvdata);
+ 
+ 	readret = xmms_xform_read (xform, header, FLV_HDR_SIZE, &err);
+ 	if (readret != FLV_HDR_SIZE) {
+ 		xmms_log_error ("Header read error");
+-		return FALSE;
++		goto init_err;
+ 	}
+ 
+ 	if ((header[4] & HAS_AUDIO) != HAS_AUDIO) {
+ 		xmms_log_error ("FLV has no audio stream");
+-		return FALSE;
++		goto init_err;
+ 	}
+ 
+ 	dataoffset = get_be32 (&header[5]) - FLV_HDR_SIZE;
+@@ -140,7 +155,7 @@ xmms_flv_init (xmms_xform_t *xform)
+ 		                           dataoffset : FLV_HDR_SIZE, &err);
+ 		if (readret <= 0) {
+ 			xmms_log_error ("Error reading header:tag body gap");
+-			return FALSE;
++			goto init_err;
+ 		}
+ 
+ 		dataoffset -= readret;
+@@ -148,86 +163,99 @@ xmms_flv_init (xmms_xform_t *xform)
+ 
+ 	if (next_audio_tag (xform) <= 0) {
+ 		xmms_log_error ("Can't find first audio tag");
+-		return FALSE;
++		goto init_err;
+ 	}
+ 
+-	if (xmms_xform_peek (xform, header, FLV_TAG_SIZE + 5, &err) < FLV_TAG_SIZE + 5) {
++	if (xmms_xform_read (xform, header, FLV_TAG_SIZE + 1, &err) < FLV_TAG_SIZE + 1) {
+ 		xmms_log_error ("Can't read first audio tag");
+-		return FALSE;
++		goto init_err;
+ 	}
+ 
+-	flags = header[FLV_TAG_SIZE + 4];
++	flags = header[11];
+ 	XMMS_DBG ("Audio flags: %X", flags);
+ 
+-	switch (flags&12) {
+-		case 0: samplerate = 5512; break;
+-		case 4: samplerate = 11025; break;
+-		case 8: samplerate = 22050; break;
+-		case 12: samplerate = 44100; break;
+-		default: samplerate = 8000; break;
++	format = flags >> 4;
++	for (i = 0; i < G_N_ELEMENTS (flv_codecs); i++) {
++		if (flv_codecs[i].id == format) {
++			codec = &flv_codecs[i];
++			break;
++		}
+ 	}
+ 
+-	if (flags&2) {
+-		bps = XMMS_SAMPLE_FORMAT_S16;
++	if (flags & 1) {
++		channels = 2;
+ 	} else {
+-		bps = XMMS_SAMPLE_FORMAT_U8;
++		channels = 1;
+ 	}
+ 
+-	if (flags&1) {
+-		channels = 2;
++	if (flags & 2) {
++		bps = XMMS_SAMPLE_FORMAT_S16;
+ 	} else {
+-		channels = 1;
++		bps = XMMS_SAMPLE_FORMAT_U8;
+ 	}
+ 
+-	format = flags >> 4;
+-	mime = (format <= 10)? fmt_mime[format] : NULL;
+-	switch (format) {
+-		case 0:
+-			/* If the flv has an HE PCM audio stream, the
+-			 * samples must be unsigned and 8 bits long
+-			 */
+-			if (bps != XMMS_SAMPLE_FORMAT_U8) {
+-				xmms_log_error ("Only u8 HE PCM is supported");
+-				return FALSE;
+-			}
+-			break;
+-		case 3:
+-			if (bps == XMMS_SAMPLE_FORMAT_S16) {
+-				mime = mime_pcm_s16le;
+-			}
+-			break;
++	switch ((flags & 12) >> 2) {
++		case 0: samplerate = 5512; break;
++		case 1: samplerate = 11025; break;
++		case 2: samplerate = 22050; break;
++		case 3: samplerate = 44100; break;
++		default: samplerate = 8000; break;
+ 	}
+ 
+-	if (mime && *mime) {
+-		flvdata = g_new0 (xmms_flv_data_t, 1);
++	if (codec) {
++		switch (codec->id) {
++			case CODEC_PCM_HOST:
++				if (bps != XMMS_SAMPLE_FORMAT_U8) {
++					xmms_log_error ("Only u8 HE PCM is supported");
++					goto init_err;
++				}
++				break;
++			case CODEC_PCM_LE:
++				if (bps == XMMS_SAMPLE_FORMAT_S16) {
++					codec->mime = "audio/x-ffmpeg-pcm_s16le";
++				}
++				break;
++			case CODEC_NELLYMOSER_16K:
++				samplerate = 16000;
++				break;
++			case CODEC_NELLYMOSER_8K:
++				samplerate = 8000;
++				break;
++			default:
++				break;
++		}
++
+ 		flvdata->format = format;
++		flvdata->last_datasize = get_be24 (&header[1]) - 1;
+ 
+ 		XMMS_DBG ("Rate: %d, bps: %d, channels: %d", samplerate,
+ 		          bps, channels);
+ 
+-		xmms_xform_private_data_set (xform, flvdata);
+ 		xmms_xform_outdata_type_add (xform,
+ 		                             XMMS_STREAM_TYPE_MIMETYPE,
+-					     mime,
+-					     XMMS_STREAM_TYPE_FMT_SAMPLERATE,
+-					     samplerate,
+-					     XMMS_STREAM_TYPE_FMT_FORMAT,
+-					     bps,
+-					     XMMS_STREAM_TYPE_FMT_CHANNELS,
+-					     channels,
+-					     XMMS_STREAM_TYPE_END);
++		                             codec->mime,
++		                             XMMS_STREAM_TYPE_FMT_SAMPLERATE,
++		                             samplerate,
++		                             XMMS_STREAM_TYPE_FMT_FORMAT,
++		                             bps,
++		                             XMMS_STREAM_TYPE_FMT_CHANNELS,
++		                             channels,
++		                             XMMS_STREAM_TYPE_END);
+ 		return TRUE;
+ 	} else {
+ 		xmms_log_error ("Unsupported audio format");
+-		return FALSE;
+ 	}
++
++init_err:
++	g_free (flvdata);
++	return FALSE;
+ }
+ 
+ static gint
+ xmms_flv_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len, xmms_error_t *err)
+ {
+-	gint ret = 0, thismuch = FLV_TAG_SIZE + 5;
+-	guint8 header[FLV_TAG_SIZE + 6], gap = 1;
++	gint ret = 0, thismuch = FLV_TAG_SIZE + 1;
++	guint8 header[FLV_TAG_SIZE + 1];
+ 	xmms_flv_data_t *data = NULL;
+ 
+ 	data = xmms_xform_private_data_get (xform);
+@@ -236,12 +264,8 @@ xmms_flv_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len, xmms_error_t *
+ 		xmms_xform_auxdata_barrier (xform);
+ 		ret = next_audio_tag (xform);
+ 		if (ret > 0) {
+-			if (data->format == 10) {
+-				thismuch++;
+-				gap++;
+-			}
+ 			if (xmms_xform_read (xform, header, thismuch, err) == thismuch) {
+-				data->last_datasize = get_be24 (&header[5]) - gap;
++				data->last_datasize = get_be24 (&header[1]) - 1;
+ 			} else {
+ 				xmms_log_error ("Need %d bytes", thismuch);
+ 				return -1;
+@@ -280,40 +304,51 @@ xmms_flv_destroy (xmms_xform_t *xform)
+ static gint
+ next_audio_tag (xmms_xform_t *xform)
+ {
+-	guint8 header[FLV_TAG_SIZE + 4];
++	guint8 header[FLV_TAG_SIZE];
+ 	guint8 dumb[FLV_CHUNK_SIZE];
+ 	gint ret = 0;
+ 	xmms_error_t err;
+-	guint32 datasize = 0;
++	xmms_flv_data_t *data;
++
++	data = xmms_xform_private_data_get (xform);
+ 
+ 	do {
+-		/* there's a last 4 bytes at the end of an FLV giving the final
+-		 * tag's size, this isn't an error
+-		 */
+-		ret = xmms_xform_peek (xform, header, FLV_TAG_SIZE + 4, &err);
+-		if ((ret < FLV_TAG_SIZE) && (ret > -1)) {
+-			ret = 0;
+-			break;
+-		} else if (ret == -1) {
+-			xmms_log_error ("%s", xmms_error_message_get (&err));
+-			break;
+-		}
++		/* If > 0 assume we're in the middle of a tag's data */
++		if (!data->last_datasize) {
++			/* There are 4 bytes before an actual tag giving
++			   the previous tag's size. The first size in an
++			   flv is always 0.
++			*/
++			if (xmms_xform_read (xform, header, 4, &err) != 4) {
++				xmms_log_error ("Couldn't read last tag size");
++				return -1;
++			}
+ 
+-		if (header[4] == 8) {
+-			/* woo audio tag! */
+-			break;
+-		}
++			ret = xmms_xform_peek (xform, header, FLV_TAG_SIZE, &err);
++			if ((ret < FLV_TAG_SIZE) && (ret > -1)) {
++				return 0;
++			} else if (ret == -1) {
++				xmms_log_error ("%s", xmms_error_message_get (&err));
++				return ret;
++			}
++
++			if (header[0] == 8) {
++				/* woo audio tag! */
++				break;
++			}
+ 
+-		ret = xmms_xform_read (xform, header, FLV_TAG_SIZE + 4, &err);
+-		if (ret <= 0) { return ret; }
++			if ((ret = xmms_xform_read (xform, header, FLV_TAG_SIZE, &err)) <= 0) {
++				return ret;
++			}
+ 
+-		datasize = get_be24 (&header[5]);
++			data->last_datasize = get_be24 (&header[1]);
++		}
+ 
+-		while (datasize) {
++		while (data->last_datasize) {
+ 			ret = xmms_xform_read (xform, dumb,
+-			                         (datasize < FLV_CHUNK_SIZE) ?
+-			                         datasize : FLV_CHUNK_SIZE,
+-			                         &err);
++			                       (data->last_datasize < FLV_CHUNK_SIZE) ?
++			                       data->last_datasize : FLV_CHUNK_SIZE,
++			                       &err);
+ 			if (ret == 0) {
+ 				xmms_log_error ("Data field short!");
+ 				break;
+@@ -323,7 +358,7 @@ next_audio_tag (xmms_xform_t *xform)
+ 				break;
+ 			}
+ 
+-			datasize -= ret;
++			data->last_datasize -= ret;
+ 		}
+ 
+ 	} while (ret);
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p4.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p4.patch
new file mode 100644
index 000000000000..552f202df19d
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-audio4-p4.patch
@@ -0,0 +1,296 @@
+commit 4198d9bf5dff517740ed51b22313367f156107e1
+Author: Erik Massop <e.massop@hccnet.nl>
+Date:   Sun Dec 22 17:19:30 2013 +0100
+
+    OTHER: Split xmms_avcodec_read, remove some duplicate code
+
+diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
+index 5b9b606..eed7964 100644
+--- a/src/plugins/avcodec/avcodec.c
++++ b/src/plugins/avcodec/avcodec.c
+@@ -57,6 +57,9 @@ typedef struct {
+ static gboolean xmms_avcodec_plugin_setup (xmms_xform_plugin_t *xform_plugin);
+ static gboolean xmms_avcodec_init (xmms_xform_t *xform);
+ static void xmms_avcodec_destroy (xmms_xform_t *xform);
++static gint xmms_avcodec_internal_read_some (xmms_xform_t *xform, xmms_avcodec_data_t *data, xmms_error_t *error);
++static gint xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data);
++static void xmms_avcodec_internal_append (xmms_avcodec_data_t *data);
+ static gint xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len,
+                                xmms_error_t *error);
+ static gint64 xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples,
+@@ -281,101 +284,24 @@ xmms_avcodec_read (xmms_xform_t *xform, xmms_sample_t *buf, gint len,
+                    xmms_error_t *error)
+ {
+ 	xmms_avcodec_data_t *data;
+-	gint bytes_read = 0;
+ 	guint size;
+ 
+ 	data = xmms_xform_private_data_get (xform);
+ 	g_return_val_if_fail (data, -1);
+ 
+-	size = MIN (data->outbuf->len, len);
+-	while (size == 0) {
+-		AVPacket packet;
+-		av_init_packet (&packet);
++	while (0 == (size = MIN (data->outbuf->len, len))) {
++		gint res;
+ 
+ 		if (data->no_demuxer || data->buffer_length == 0) {
+-			gint read_total;
+-
+-			bytes_read = xmms_xform_read (xform,
+-			                              (gchar *) (data->buffer + data->buffer_length),
+-			                              data->buffer_size - data->buffer_length,
+-			                              error);
+-
+-			if (bytes_read < 0) {
+-				XMMS_DBG ("Error while reading data");
+-				return bytes_read;
+-			} else if (bytes_read == 0) {
+-				XMMS_DBG ("EOF");
+-				return 0;
+-			}
+-
+-			read_total = bytes_read;
+-
+-			/* If we have a demuxer plugin, make sure we read the whole packet */
+-			while (read_total == data->buffer_size && !data->no_demuxer) {
+-				/* multiply the buffer size and try to read again */
+-				data->buffer = g_realloc (data->buffer, data->buffer_size * 2);
+-				bytes_read = xmms_xform_read (xform,
+-				                              (gchar *) data->buffer +
+-				                                data->buffer_size,
+-				                              data->buffer_size,
+-				                              error);
+-				data->buffer_size *= 2;
+-
+-				if (bytes_read < 0) {
+-					XMMS_DBG ("Error while reading data");
+-					return bytes_read;
+-				}
+-
+-				read_total += bytes_read;
+-
+-				if (read_total < data->buffer_size) {
+-					/* finally double the buffer size for performance reasons, the
+-					 * hotspot handling likes to fit two frames in the buffer */
+-					data->buffer = g_realloc (data->buffer, data->buffer_size * 2);
+-					data->buffer_size *= 2;
+-					XMMS_DBG ("Reallocated avcodec internal buffer to be %d bytes",
+-					          data->buffer_size);
+-
+-					break;
+-				}
+-			}
+-
+-			/* Update the buffer length */
+-			data->buffer_length += read_total;
+-		}
+-
+-		packet.data = data->buffer;
+-		packet.size = data->buffer_length;
+-
+-		data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+-		bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) data->read_out_buffer,
+-		                                    &data->read_out_buffer_size, &packet);
++			gint bytes_read;
+ 
+-		/* The DTS decoder of ffmpeg is buggy and always returns
+-		 * the input buffer length, get frame length from header */
+-		if (!strcmp (data->codec_id, "dca") && bytes_read > 0) {
+-			bytes_read = ((int)data->buffer[5] << 12) |
+-			             ((int)data->buffer[6] << 4) |
+-			             ((int)data->buffer[7] >> 4);
+-			bytes_read = (bytes_read & 0x3fff) + 1;
++			bytes_read = xmms_avcodec_internal_read_some (xform, data, error);
++			if (bytes_read <= 0) { return bytes_read; }
+ 		}
+ 
+-		if (bytes_read < 0 || bytes_read > data->buffer_length) {
+-			XMMS_DBG ("Error decoding data!");
+-			return -1;
+-		} else if (bytes_read != data->buffer_length) {
+-			g_memmove (data->buffer,
+-			           data->buffer + bytes_read,
+-			           data->buffer_length - bytes_read);
+-		}
+-
+-		data->buffer_length -= bytes_read;
+-
+-		if (data->read_out_buffer_size > 0) {
+-			g_string_append_len (data->outbuf, data->read_out_buffer, data->read_out_buffer_size);
+-		}
+-
+-		size = MIN (data->outbuf->len, len);
++		res = xmms_avcodec_internal_decode_some (data);
++		if (res < 0) { return res; }
++		if (res > 0) { xmms_avcodec_internal_append (data); }
+ 	}
+ 
+ 	memcpy (buf, data->outbuf->str, size);
+@@ -388,7 +314,6 @@ static gint64
+ xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples, xmms_xform_seek_mode_t whence, xmms_error_t *err)
+ {
+ 	xmms_avcodec_data_t *data;
+-	gint bytes_read = 0;
+ 	gint64 ret = -1;
+ 
+ 	g_return_val_if_fail (xform, -1);
+@@ -406,23 +331,11 @@ xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples, xmms_xform_seek_mode_t w
+ 
+ 	/* The buggy ape decoder doesn't flush buffers, so we need to finish decoding
+ 	 * the frame before seeking to avoid segfaults... this hack sucks */
++	/* FIXME: Is ^^^ still true? */
+ 	while (data->buffer_length > 0) {
+-		AVPacket packet;
+-		av_init_packet (&packet);
+-		packet.data = data->buffer;
+-		packet.size = data->buffer_length;
+-
+-		data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+-		bytes_read = avcodec_decode_audio3 (data->codecctx, (short *) data->read_out_buffer,
+-		                                    &data->read_out_buffer_size, &packet);
+-
+-		if (bytes_read < 0 || bytes_read > data->buffer_length) {
+-			XMMS_DBG ("Error decoding data!");
++		if (xmms_avcodec_internal_decode_some (data) < 0) {
+ 			return -1;
+ 		}
+-
+-		data->buffer_length -= bytes_read;
+-		g_memmove (data->buffer, data->buffer + bytes_read, data->buffer_length);
+ 	}
+ 
+ 	ret = xmms_xform_seek (xform, samples, whence, err);
+@@ -456,3 +369,131 @@ xmms_avcodec_translate_sample_format (enum AVSampleFormat av_sample_format)
+ 		return XMMS_SAMPLE_FORMAT_UNKNOWN;
+ 	}
+ }
++
++/*
++Read some data from our source of data to data->buffer, updating buffer_length
++and buffer_size as needed.
++
++Returns: on error: negative
++         on EOF: zero
++         otherwise: number of bytes read.
++*/
++static gint
++xmms_avcodec_internal_read_some (xmms_xform_t *xform,
++                                 xmms_avcodec_data_t *data,
++                                 xmms_error_t *error)
++{
++	gint bytes_read, read_total;
++
++	bytes_read = xmms_xform_read (xform,
++	                              (gchar *) (data->buffer + data->buffer_length),
++	                              data->buffer_size - data->buffer_length,
++	                              error);
++
++	if (bytes_read < 0) {
++		XMMS_DBG ("Error while reading data");
++		return bytes_read;
++	} else if (bytes_read == 0) {
++		XMMS_DBG ("EOF");
++		return 0;
++	}
++
++	read_total = bytes_read;
++
++	/* If we have a demuxer plugin, make sure we read the whole packet */
++	while (read_total == data->buffer_size && !data->no_demuxer) {
++		/* multiply the buffer size and try to read again */
++		data->buffer = g_realloc (data->buffer, data->buffer_size * 2);
++		bytes_read = xmms_xform_read (xform,
++		                              (gchar *) data->buffer +
++		                                data->buffer_size,
++		                              data->buffer_size,
++		                              error);
++		data->buffer_size *= 2;
++
++		if (bytes_read < 0) {
++			XMMS_DBG ("Error while reading data");
++			return bytes_read;
++		}
++
++		read_total += bytes_read;
++
++		if (read_total < data->buffer_size) {
++			/* finally double the buffer size for performance reasons, the
++			 * hotspot handling likes to fit two frames in the buffer */
++			data->buffer = g_realloc (data->buffer, data->buffer_size * 2);
++			data->buffer_size *= 2;
++			XMMS_DBG ("Reallocated avcodec internal buffer to be %d bytes",
++			          data->buffer_size);
++
++			break;
++		}
++	}
++
++	/* Update the buffer length */
++	data->buffer_length += read_total;
++
++	return read_total;
++}
++
++/*
++Decode some data from data->buffer[0..data->buffer_length-1] to
++data->read_out_buffer. Number of bytes in data->read_out_buffer
++is stored in data->read_out_buffer_size.
++
++Returns: on error: negative
++         on no new data produced: zero
++         otherwise: positive
++
++FIXME: data->buffer should be at least data->buffer_length +
++FF_INPUT_BUFFER_PADDING_SIZE long.
++*/
++static gint
++xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
++{
++	gint bytes_read = 0;
++	AVPacket packet;
++
++	av_init_packet (&packet);
++	packet.data = data->buffer;
++	packet.size = data->buffer_length;
++
++	data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++	bytes_read = avcodec_decode_audio3 (data->codecctx,
++	                                    (short *) data->read_out_buffer,
++	                                    &data->read_out_buffer_size, &packet);
++
++	/* The DTS decoder of ffmpeg is buggy and always returns
++	 * the input buffer length, get frame length from header */
++	/* FIXME: Is ^^^^ still true? */
++	if (!strcmp (data->codec_id, "dca") && bytes_read > 0) {
++		bytes_read = ((int)data->buffer[5] << 12) |
++		             ((int)data->buffer[6] << 4) |
++		             ((int)data->buffer[7] >> 4);
++		bytes_read = (bytes_read & 0x3fff) + 1;
++	}
++
++	if (bytes_read < 0 || bytes_read > data->buffer_length) {
++		XMMS_DBG ("Error decoding data!");
++		return -1;
++	}
++
++	if (bytes_read < data->buffer_length) {
++		data->buffer_length -= bytes_read;
++		g_memmove (data->buffer,
++		           data->buffer + bytes_read,
++		           data->buffer_length);
++	} else {
++		data->buffer_length = 0;
++	}
++
++	return data->read_out_buffer_size;
++}
++
++static void
++xmms_avcodec_internal_append (xmms_avcodec_data_t *data)
++{
++	g_string_append_len (data->outbuf,
++	                     (gchar *) data->read_out_buffer,
++	                     data->read_out_buffer_size);
++}
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p5.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p5.patch
new file mode 100644
index 000000000000..8ed5bb4a24a5
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-audio4-p5.patch
@@ -0,0 +1,154 @@
+commit d44312fb14bde0ab47ee6de1b3fe7435d4a97c99
+Author: Erik Massop <e.massop@hccnet.nl>
+Date:   Sun Dec 22 20:01:18 2013 +0100
+
+    BUG(2572): Use avcodec_decode_audio4
+
+diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
+index 266a607..a41a675 100644
+--- a/src/plugins/avcodec/avcodec.c
++++ b/src/plugins/avcodec/avcodec.c
+@@ -37,8 +37,7 @@ typedef struct {
+ 	guint buffer_size;
+ 	gboolean no_demuxer;
+ 
+-	gchar *read_out_buffer;
+-	gint read_out_buffer_size;
++	AVFrame *read_out_frame;
+ 
+ 	guint channels;
+ 	guint samplerate;
+@@ -125,7 +124,7 @@ xmms_avcodec_destroy (xmms_xform_t *xform)
+ 
+ 	avcodec_close (data->codecctx);
+ 	av_free (data->codecctx);
+-	av_free (data->read_out_buffer);
++	avcodec_free_frame (&data->read_out_frame);
+ 
+ 	g_string_free (data->outbuf, TRUE);
+ 	g_free (data->buffer);
+@@ -151,8 +150,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 	data->buffer_size = AVCODEC_BUFFER_SIZE;
+ 	data->codecctx = NULL;
+ 
+-	data->read_out_buffer = av_malloc (AVCODEC_MAX_AUDIO_FRAME_SIZE);
+-	data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++	data->read_out_frame = avcodec_alloc_frame ();
+ 
+ 	xmms_xform_private_data_set (xform, data);
+ 
+@@ -233,6 +231,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 	data->codecctx->extradata_size = data->extradata_size;
+ 	data->codecctx->codec_id = codec->id;
+ 	data->codecctx->codec_type = codec->type;
++	data->codecctx->refcounted_frames = 0;
+ 
+ 	if (avcodec_open2 (data->codecctx, codec, NULL) < 0) {
+ 		XMMS_DBG ("Opening decoder '%s' failed", codec->name);
+@@ -279,8 +278,8 @@ err:
+ 	if (data->codecctx) {
+ 		av_free (data->codecctx);
+ 	}
+-	if (data->read_out_buffer) {
+-		av_free (data->read_out_buffer);
++	if (data->read_out_frame) {
++		avcodec_free_frame (&data->read_out_frame);
+ 	}
+ 	g_string_free (data->outbuf, TRUE);
+ 	g_free (data->extradata);
+@@ -365,17 +364,23 @@ xmms_avcodec_translate_sample_format (enum AVSampleFormat av_sample_format)
+ {
+ 	switch (av_sample_format) {
+ 	case AV_SAMPLE_FMT_U8:
++	case AV_SAMPLE_FMT_U8P:
+ 		return XMMS_SAMPLE_FORMAT_U8;
+ 	case AV_SAMPLE_FMT_S16:
++	case AV_SAMPLE_FMT_S16P:
+ 		return XMMS_SAMPLE_FORMAT_S16;
+ 	case AV_SAMPLE_FMT_S32:
++	case AV_SAMPLE_FMT_S32P:
+ 		return XMMS_SAMPLE_FORMAT_S32;
+ 	case AV_SAMPLE_FMT_FLT:
++	case AV_SAMPLE_FMT_FLTP:
+ 		return XMMS_SAMPLE_FORMAT_FLOAT;
+ 	case AV_SAMPLE_FMT_DBL:
++	case AV_SAMPLE_FMT_DBLP:
+ 		return XMMS_SAMPLE_FORMAT_DOUBLE;
+ 	default:
+-		XMMS_DBG ("AVSampleFormat (%i) not supported.", av_sample_format);
++		XMMS_DBG ("AVSampleFormat (%i: %s) not supported.", av_sample_format,
++		          av_get_sample_fmt_name (av_sample_format));
+ 		return XMMS_SAMPLE_FORMAT_UNKNOWN;
+ 	}
+ }
+@@ -448,8 +453,7 @@ xmms_avcodec_internal_read_some (xmms_xform_t *xform,
+ 
+ /*
+ Decode some data from data->buffer[0..data->buffer_length-1] to
+-data->read_out_buffer. Number of bytes in data->read_out_buffer
+-is stored in data->read_out_buffer_size.
++data->read_out_frame
+ 
+ Returns: on error: negative
+          on no new data produced: zero
+@@ -461,6 +465,7 @@ FF_INPUT_BUFFER_PADDING_SIZE long.
+ static gint
+ xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
+ {
++	int got_frame = 0;
+ 	gint bytes_read = 0;
+ 	AVPacket packet;
+ 
+@@ -468,10 +473,10 @@ xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
+ 	packet.data = data->buffer;
+ 	packet.size = data->buffer_length;
+ 
+-	data->read_out_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+-	bytes_read = avcodec_decode_audio3 (data->codecctx,
+-	                                    (short *) data->read_out_buffer,
+-	                                    &data->read_out_buffer_size, &packet);
++	avcodec_get_frame_defaults (data->read_out_frame);
++
++	bytes_read = avcodec_decode_audio4 (
++		data->codecctx, data->read_out_frame, &got_frame, &packet);
+ 
+ 	/* The DTS decoder of ffmpeg is buggy and always returns
+ 	 * the input buffer length, get frame length from header */
+@@ -497,13 +502,33 @@ xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
+ 		data->buffer_length = 0;
+ 	}
+ 
+-	return data->read_out_buffer_size;
++	return got_frame ? 1 : 0;
+ }
+ 
+ static void
+ xmms_avcodec_internal_append (xmms_avcodec_data_t *data)
+ {
+-	g_string_append_len (data->outbuf,
+-	                     (gchar *) data->read_out_buffer,
+-	                     data->read_out_buffer_size);
++	enum AVSampleFormat fmt = (enum AVSampleFormat) data->read_out_frame->format;
++	int samples = data->read_out_frame->nb_samples;
++	int channels = data->codecctx->channels;
++	int bps = av_get_bytes_per_sample (fmt);
++
++	if (av_sample_fmt_is_planar (fmt)) {
++		/* Convert from planar to packed format */
++		gint i, j;
++
++		for (i = 0; i < samples; i++) {
++			for (j = 0; j < channels; j++) {
++				g_string_append_len (
++					data->outbuf,
++					(gchar *) (data->read_out_frame->extended_data[j] + i*bps),
++					bps
++				);
++			}
++		}
++	} else {
++		g_string_append_len (data->outbuf,
++		                     (gchar *) data->read_out_frame->extended_data[0],
++		                     samples * channels * bps);
++	}
+ }
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p6.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p6.patch
new file mode 100644
index 000000000000..b1bc1c5d609b
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-audio4-p6.patch
@@ -0,0 +1,106 @@
+commit fc66249e69f53eef709c5210546fdd92e1c89554
+Author: Erik Massop <e.massop@hccnet.nl>
+Date:   Sun Dec 22 23:04:08 2013 +0100
+
+    OTHER: Some compatibility with different avcodec versions
+
+diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
+index a41a675..023833d 100644
+--- a/src/plugins/avcodec/avcodec.c
++++ b/src/plugins/avcodec/avcodec.c
+@@ -124,7 +124,7 @@ xmms_avcodec_destroy (xmms_xform_t *xform)
+ 
+ 	avcodec_close (data->codecctx);
+ 	av_free (data->codecctx);
+-	avcodec_free_frame (&data->read_out_frame);
++	av_frame_free (&data->read_out_frame);
+ 
+ 	g_string_free (data->outbuf, TRUE);
+ 	g_free (data->buffer);
+@@ -150,7 +150,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 	data->buffer_size = AVCODEC_BUFFER_SIZE;
+ 	data->codecctx = NULL;
+ 
+-	data->read_out_frame = avcodec_alloc_frame ();
++	data->read_out_frame = av_frame_alloc ();
+ 
+ 	xmms_xform_private_data_set (xform, data);
+ 
+@@ -231,7 +231,6 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 	data->codecctx->extradata_size = data->extradata_size;
+ 	data->codecctx->codec_id = codec->id;
+ 	data->codecctx->codec_type = codec->type;
+-	data->codecctx->refcounted_frames = 0;
+ 
+ 	if (avcodec_open2 (data->codecctx, codec, NULL) < 0) {
+ 		XMMS_DBG ("Opening decoder '%s' failed", codec->name);
+@@ -473,7 +472,8 @@ xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
+ 	packet.data = data->buffer;
+ 	packet.size = data->buffer_length;
+ 
+-	avcodec_get_frame_defaults (data->read_out_frame);
++	/* clear buffers and reset fields to defaults */
++	av_frame_unref (data->read_out_frame);
+ 
+ 	bytes_read = avcodec_decode_audio4 (
+ 		data->codecctx, data->read_out_frame, &got_frame, &packet);
+diff --git a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h
+index 73ac2ab..e74b3f8 100644
+--- a/src/plugins/avcodec/avcodec_compat.h
++++ b/src/plugins/avcodec/avcodec_compat.h
+@@ -83,3 +83,17 @@ typedef struct AVPacket {
+ # define avcodec_open2(avctx, codec, options) \
+     avcodec_open(avctx, codec)
+ #endif
++
++/* Map avcodec_free_frame to av_freep if the former doesn't exist.
++ * (This is in versions earlier than 54.28.0 (libav) or 54.59.100 (ffmpeg)) */
++#if ! HAVE_AVCODEC_FREE_FRAME
++# define avcodec_free_frame av_freep
++#endif
++
++/* Map av_frame_alloc, av_frame_unref, av_frame_free into their
++ * deprecated versions in versions earlier than 55.28.1 */
++#if LIBAVCODEC_VERSION_INT < 0x371c01
++# define av_frame_alloc avcodec_alloc_frame
++# define av_frame_unref avcodec_get_frame_defaults
++# define av_frame_free avcodec_free_frame
++#endif
+diff --git a/src/plugins/avcodec/wscript b/src/plugins/avcodec/wscript
+index 03ba7d8..d367816 100644
+--- a/src/plugins/avcodec/wscript
++++ b/src/plugins/avcodec/wscript
+@@ -1,10 +1,33 @@
+ from waftools.plugin import plugin
+ 
++## Code fragments for configuration
++avcodec_free_frame_fragment = """
++#ifdef HAVE_LIBAVCODEC_AVCODEC_H
++# include "libavcodec/avcodec.h"
++#else
++# include "avcodec.h"
++#endif
++int main(void) {
++    AVFrame *frame;
++
++    avcodec_free_frame (&frame);
++
++    return 0;
++}
++"""
++
+ def plugin_configure(conf):
+     conf.check_cfg(package="libavcodec", uselib_store="avcodec",
+             args="--cflags --libs")
+     conf.check_cc(header_name="avcodec.h", uselib="avcodec", type="cshlib", mandatory=False)
+     conf.check_cc(header_name="libavcodec/avcodec.h", uselib="avcodec", type="cshlib", mandatory=False)
+ 
++    # non-mandatory function avcodec_free_frame since
++    # * ffmpeg: commit 46a3595, lavc 54.59.100, release 1.0
++    # * libav: commit a42aada, lavc 54.28.0, release 9
++    conf.check_cc(fragment=avcodec_free_frame_fragment, uselib="avcodec",
++                  uselib_store="avcodec_free_frame",
++                  msg="Checking for function avcodec_free_frame", mandatory=False)
++
+ configure, build = plugin('avcodec', configure=plugin_configure,
+                           libs=["avcodec"])
diff --git a/media-sound/xmms2/files/xmms2-0.8-audio4-p7.patch b/media-sound/xmms2/files/xmms2-0.8-audio4-p7.patch
new file mode 100644
index 000000000000..2d4bafd95a7d
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-audio4-p7.patch
@@ -0,0 +1,147 @@
+commit f460440b3f2a9db1a9deef3faf7dae6e626dd7b5
+Author: Erik Massop <e.massop@hccnet.nl>
+Date:   Sun Dec 22 23:34:12 2013 +0100
+
+    OTHER: Require avcodec_decode_audio4
+    
+    This was introduced in versions 53.40.0 (ffmpeg) and 53.25.0 (libav) of
+    avcodec. Hence we drop compatibility for earlier versions.
+
+diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
+index 023833d..6d0b667 100644
+--- a/src/plugins/avcodec/avcodec.c
++++ b/src/plugins/avcodec/avcodec.c
+@@ -154,7 +154,6 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 
+ 	xmms_xform_private_data_set (xform, data);
+ 
+-	avcodec_init ();
+ 	avcodec_register_all ();
+ 
+ 	mimetype = xmms_xform_indata_get_str (xform,
+@@ -225,7 +224,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 	data->codecctx->sample_rate = data->samplerate;
+ 	data->codecctx->channels = data->channels;
+ 	data->codecctx->bit_rate = data->bitrate;
+-	CONTEXT_BPS (data->codecctx) = data->samplebits;
++	data->codecctx->bits_per_coded_sample = data->samplebits;
+ 	data->codecctx->block_align = data->block_align;
+ 	data->codecctx->extradata = data->extradata;
+ 	data->codecctx->extradata_size = data->extradata_size;
+diff --git a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h
+index e74b3f8..b50fa4b 100644
+--- a/src/plugins/avcodec/avcodec_compat.h
++++ b/src/plugins/avcodec/avcodec_compat.h
+@@ -21,69 +21,6 @@
+ # include "avcodec.h"
+ #endif
+ 
+-/* Map avcodec_decode_audio2 into the deprecated version
+- * avcodec_decode_audio in versions earlier than 51.28 */
+-#if LIBAVCODEC_VERSION_INT < 0x331c00
+-# define avcodec_decode_audio2 avcodec_decode_audio
+-#endif
+-
+-/* Handle API change that happened in libavcodec 52.00 */
+-#if LIBAVCODEC_VERSION_INT < 0x340000
+-# define CONTEXT_BPS(codecctx) (codecctx)->bits_per_sample
+-#else
+-# define CONTEXT_BPS(codecctx) (codecctx)->bits_per_coded_sample
+-#endif
+-
+-/* Before 52.23 AVPacket was defined in avformat.h which we
+- * do not want to depend on, so we define part of it manually
+- * on versions smaller than 52.23 (this makes me cry) */
+-#if LIBAVCODEC_VERSION_INT < 0x341700
+-typedef struct AVPacket {
+-        uint8_t *data;
+-        int size;
+-} AVPacket;
+-#endif
+-
+-/* Same thing as above for av_init_packet and version 52.25 */
+-#if LIBAVCODEC_VERSION_INT < 0x341900
+-# define av_init_packet(pkt) do { \
+-    (pkt)->data = NULL; \
+-    (pkt)->size = 0; \
+-  } while(0)
+-#endif
+-
+-/* Map avcodec_decode_audio3 into the deprecated version
+- * avcodec_decode_audio2 in versions earlier than 52.26 */
+-#if LIBAVCODEC_VERSION_INT < 0x341a00
+-# define avcodec_decode_audio3(avctx, samples, frame_size_ptr, avpkt) \
+-    avcodec_decode_audio2(avctx, samples, frame_size_ptr, \
+-                          (avpkt)->data, (avpkt)->size)
+-#endif
+-
+-/* Handle API change that happened in libavcodec 52.64 */
+-#if LIBAVCODEC_VERSION_INT < 0x344000
+-# define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
+-#endif
+-
+-/* Calling avcodec_init is not necessary after 53.04 (ffmpeg 0.9) */
+-#if LIBAVCODEC_VERSION_INT >= 0x350400
+-# define avcodec_init()
+-#endif
+-
+-/* Map avcodec_alloc_context3 into the deprecated version
+- * avcodec_alloc_context in versions earlier than 53.04 (ffmpeg 0.9) */
+-#if LIBAVCODEC_VERSION_INT < 0x350400
+-# define avcodec_alloc_context3(codec) \
+-    avcodec_alloc_context()
+-#endif
+-
+-/* Map avcodec_open2 into the deprecated version
+- * avcodec_open in versions earlier than 53.04 (ffmpeg 0.9) */
+-#if LIBAVCODEC_VERSION_INT < 0x350400
+-# define avcodec_open2(avctx, codec, options) \
+-    avcodec_open(avctx, codec)
+-#endif
+-
+ /* Map avcodec_free_frame to av_freep if the former doesn't exist.
+  * (This is in versions earlier than 54.28.0 (libav) or 54.59.100 (ffmpeg)) */
+ #if ! HAVE_AVCODEC_FREE_FRAME
+diff --git a/src/plugins/avcodec/wscript b/src/plugins/avcodec/wscript
+index d367816..00b182b 100644
+--- a/src/plugins/avcodec/wscript
++++ b/src/plugins/avcodec/wscript
+@@ -1,6 +1,24 @@
+ from waftools.plugin import plugin
+ 
+ ## Code fragments for configuration
++avcodec_decode_audio4_fragment = """
++#ifdef HAVE_LIBAVCODEC_AVCODEC_H
++# include "libavcodec/avcodec.h"
++#else
++# include "avcodec.h"
++#endif
++int main(void) {
++    AVCodecContext *ctx;
++    AVFrame *frame;
++    int got_frame;
++    AVPacket *pkt;
++
++    avcodec_decode_audio4 (ctx, frame, &got_frame, pkt);
++
++    return 0;
++}
++"""
++
+ avcodec_free_frame_fragment = """
+ #ifdef HAVE_LIBAVCODEC_AVCODEC_H
+ # include "libavcodec/avcodec.h"
+@@ -22,6 +40,13 @@ def plugin_configure(conf):
+     conf.check_cc(header_name="avcodec.h", uselib="avcodec", type="cshlib", mandatory=False)
+     conf.check_cc(header_name="libavcodec/avcodec.h", uselib="avcodec", type="cshlib", mandatory=False)
+ 
++    # mandatory function avcodec_decode_audio4 available since
++    # * ffmpeg: commit e4de716, lavc 53.40.0, release 0.9
++    # * libav: commit 0eea212, lavc 53.25.0, release 0.8
++    conf.check_cc(fragment=avcodec_decode_audio4_fragment, uselib="avcodec",
++                  uselib_store="avcodec_decode_audio4",
++                  msg="Checking for function avcodec_decode_audio4", mandatory=True)
++
+     # non-mandatory function avcodec_free_frame since
+     # * ffmpeg: commit 46a3595, lavc 54.59.100, release 1.0
+     # * libav: commit a42aada, lavc 54.28.0, release 9
diff --git a/media-sound/xmms2/files/xmms2-0.8-cpython.patch b/media-sound/xmms2/files/xmms2-0.8-cpython.patch
new file mode 100644
index 000000000000..58227ba5db85
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-cpython.patch
@@ -0,0 +1,9 @@
+diff --git a/src/clients/lib/python/cython_include/cxmmsclient.pxd b/src/clients/lib/python/cython_include/cxmmsclient.pxd
+index 66390a7..629bc7f 100644
+--- a/src/clients/lib/python/cython_include/cxmmsclient.pxd
++++ b/src/clients/lib/python/cython_include/cxmmsclient.pxd
+@@ -30,3 +30,3 @@ cdef extern from "xmmsc/xmmsc_idnumbers.h":
+ 
+-	ctypedef enum xmmsc_collection_changed_actions_t:
++	ctypedef enum xmms_collection_changed_actions_t:
+ 		XMMS_COLLECTION_CHANGED_ADD
diff --git a/media-sound/xmms2/files/xmms2-0.8-cython-0.19.1.patch b/media-sound/xmms2/files/xmms2-0.8-cython-0.19.1.patch
new file mode 100644
index 000000000000..1d6e59f6c830
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-cython-0.19.1.patch
@@ -0,0 +1,47 @@
+From 6d6d7a7ee38c8e3f57242f2510e06a03f4e7e249 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Mon, 5 Aug 2013 22:29:46 +0300
+Subject: [PATCH] unbreak xmms2 building on cython-0.19.1
+
+Error compiling Cython file:
+------------------------------------------------------------
+...
+        def medialib_path_import(self, path, cb = None, encoded=False):
+                """
+                @deprecated
+                Use medialib_import_path(path, ...) instead
+                """
+                return self.medialib_import_path(self, path, cb=cb, encoded=encoded)
+                                                ^
+
+Reported-by: ChunFeng
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/clients/lib/python/xmmsapi.pyx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/clients/lib/python/xmmsapi.pyx b/src/clients/lib/python/xmmsapi.pyx
+index 501a068..863db88 100644
+--- a/src/clients/lib/python/xmmsapi.pyx
++++ b/src/clients/lib/python/xmmsapi.pyx
+@@ -1364,7 +1364,7 @@ cdef class XmmsApi(XmmsCore):
+ 		@deprecated
+ 		Use medialib_import_path(path, ...) instead
+ 		"""
+-		return self.medialib_import_path(self, path, cb=cb, encoded=encoded)
++		return self.medialib_import_path(path, cb=cb, encoded=encoded)
+ 
+ 	@deprecated
+ 	def medialib_path_import_encoded(self, path, cb = None):
+@@ -1372,7 +1372,7 @@ cdef class XmmsApi(XmmsCore):
+ 		@deprecated
+ 		Use medialib_import_path(path, ..., encoded=True) instead
+ 		"""
+-		return self.medialib_import_path(self, path, cb=cb, encoded=True)
++		return self.medialib_import_path(path, cb=cb, encoded=True)
+ 
+ 	cpdef XmmsResult medialib_property_set(self, int id, key, value, source=None, cb=None):
+ 		"""
+-- 
+1.8.3.2
+
diff --git a/media-sound/xmms2/files/xmms2-0.8-ffmpeg-0.11.patch b/media-sound/xmms2/files/xmms2-0.8-ffmpeg-0.11.patch
new file mode 100644
index 000000000000..bac2fba7e9fd
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-ffmpeg-0.11.patch
@@ -0,0 +1,18 @@
+commit 8743e0c3a4f06053d89b74e40a362ba4949ed53c
+Author: Juho Vähä-Herttua <juhovh@iki.fi>
+Date:   Fri Jun 8 09:30:47 2012 +0300
+
+    OTHER: Quick fix to make XMMS2 compile on ffmpeg 0.11
+
+diff --git a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h
+index df87b27..f1b1af7 100644
+--- a/src/plugins/avcodec/avcodec_compat.h
++++ b/src/plugins/avcodec/avcodec_compat.h
+@@ -65,3 +65,7 @@ typedef struct AVPacket {
+ # define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
+ #endif
+ 
++/* Calling avcodec_init is not necessary after 53.04 (ffmpeg 0.9) */
++#if LIBAVCODEC_VERSION_INT >= 0x350400
++# define avcodec_init()
++#endif
diff --git a/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch b/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch
new file mode 100644
index 000000000000..2e9fac380ea0
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch
@@ -0,0 +1,15 @@
+Index: xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
+===================================================================
+--- xmms2-0.8DrO_o.orig/src/plugins/avcodec/avcodec.c
++++ xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
+@@ -29,6 +29,10 @@
+ 
+ #define AVCODEC_BUFFER_SIZE 16384
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++
+ typedef struct {
+ 	AVCodecContext *codecctx;
+ 
diff --git a/media-sound/xmms2/files/xmms2-0.8-libav-9-p2.patch b/media-sound/xmms2/files/xmms2-0.8-libav-9-p2.patch
new file mode 100644
index 000000000000..db55bc8a6933
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-libav-9-p2.patch
@@ -0,0 +1,50 @@
+commit 4781c507be338fe151e08af7d13267a24cbd7572
+Author: Juho Vähä-Herttua <juhovh@iki.fi>
+Date:   Fri Jun 8 09:47:03 2012 +0300
+
+    OTHER: Fix some deprecated warnings in libavcodec
+
+diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
+index 242e333..c846d64 100644
+--- a/src/plugins/avcodec/avcodec.c
++++ b/src/plugins/avcodec/avcodec.c
+@@ -208,7 +208,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 		}
+ 	}
+ 
+-	data->codecctx = avcodec_alloc_context ();
++	data->codecctx = avcodec_alloc_context3 (codec);
+ 	data->codecctx->sample_rate = data->samplerate;
+ 	data->codecctx->channels = data->channels;
+ 	data->codecctx->bit_rate = data->bitrate;
+@@ -219,7 +219,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
+ 	data->codecctx->codec_id = codec->id;
+ 	data->codecctx->codec_type = codec->type;
+ 
+-	if (avcodec_open (data->codecctx, codec) < 0) {
++	if (avcodec_open2 (data->codecctx, codec, NULL) < 0) {
+ 		XMMS_DBG ("Opening decoder '%s' failed", codec->name);
+ 		goto err;
+ 	} else {
+diff --git a/src/plugins/avcodec/avcodec_compat.h b/src/plugins/avcodec/avcodec_compat.h
+index f1b1af7..bc770f2 100644
+--- a/src/plugins/avcodec/avcodec_compat.h
++++ b/src/plugins/avcodec/avcodec_compat.h
+@@ -69,3 +69,17 @@ typedef struct AVPacket {
+ #if LIBAVCODEC_VERSION_INT >= 0x350400
+ # define avcodec_init()
+ #endif
++
++/* Map avcodec_alloc_context3 into the deprecated version
++ * avcodec_alloc_context in versions earlier than 53.04 (ffmpeg 0.9) */
++#if LIBAVCODEC_VERSION_INT < 0x350400
++# define avcodec_alloc_context3(codec) \
++    avcodec_alloc_context()
++#endif
++
++/* Map avcodec_open2 into the deprecated version
++ * avcodec_open in versions earlier than 53.04 (ffmpeg 0.9) */
++#if LIBAVCODEC_VERSION_INT < 0x350400
++# define avcodec_open2(avctx, codec, options) \
++    avcodec_open(avctx, codec)
++#endif
diff --git a/media-sound/xmms2/files/xmms2-0.8-libav-9.patch b/media-sound/xmms2/files/xmms2-0.8-libav-9.patch
new file mode 100644
index 000000000000..9c13ec41e025
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-libav-9.patch
@@ -0,0 +1,20 @@
+commit d61dbc522f4024debb1f99de758de9e5cc7c0936
+Author: Diego Biurrun <diego@biurrun.de>
+Date:   Sun Nov 25 17:33:02 2012 +0100
+
+    OTHER: Support for newer libavcodec versions
+    
+    Add missing #include
+
+diff --git a/src/plugins/avcodec/avcodec.c b/src/plugins/avcodec/avcodec.c
+index c846d64..114d7df 100644
+--- a/src/plugins/avcodec/avcodec.c
++++ b/src/plugins/avcodec/avcodec.c
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
++#include <libavutil/mem.h>
+ 
+ #include "avcodec_compat.h"
+ 
diff --git a/media-sound/xmms2/files/xmms2-0.8-memset.patch b/media-sound/xmms2/files/xmms2-0.8-memset.patch
new file mode 100644
index 000000000000..6f8377d9f928
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-memset.patch
@@ -0,0 +1,19 @@
+commit 00f4736bbb8ebc88a08e24e98d384b43d5afbbe4
+Author: Raphaël Bois <virtualdust@gmail.com>
+Date:   Sun Feb 12 16:39:46 2012 +0100
+
+    OTHER: fix erroneous sizeof usage
+
+diff --git a/src/plugins/daap/daap_md5.c b/src/plugins/daap/daap_md5.c
+index d4d8d74..69c84a5 100644
+--- a/src/plugins/daap/daap_md5.c
++++ b/src/plugins/daap/daap_md5.c
+@@ -191,7 +191,7 @@ OpenDaap_MD5Final (MD5_CTX *ctx,
+ 	MD5Transform (ctx->buf, (guint32 *) ctx->in, ctx->version);
+ 	byteReverse ((unsigned char *) ctx->buf, 4);
+ 	memcpy (digest, ctx->buf, 16);
+-	memset (ctx, 0, sizeof (ctx));     /* In case it's sensitive */
++	memset (ctx, 0, sizeof (*ctx));     /* In case it's sensitive */
+ 
+ 	return;
+ }
diff --git a/media-sound/xmms2/files/xmms2-0.8-modpug.patch b/media-sound/xmms2/files/xmms2-0.8-modpug.patch
new file mode 100644
index 000000000000..ce401279c14c
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-modpug.patch
@@ -0,0 +1,11 @@
+--- a/src/plugins/modplug/modplug.c       2011-10-20 20:26:08.000000000 +0000
++++ b/src/plugins/modplug/modplug.c       2015-01-08 19:52:43.889787624 +0000
+@@ -9,7 +9,7 @@
+ #include "xmms/xmms_sample.h"
+ #include "xmms/xmms_medialib.h"
+ #include "xmms/xmms_log.h"
+-#include <modplug.h>
++#include <libmodplug/modplug.h>
+ 
+ #include <glib.h>
+ #include <string.h>
diff --git a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch b/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
new file mode 100644
index 000000000000..20be34273883
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
@@ -0,0 +1,36 @@
+Add knob to disable valgrind at test runtime.
+
+When valgrind is installed in system but is not
+working we should still be able to run tests.
+
+Reported-by: Diego Elio Pettenò
+Bug: https://bugs.gentoo.org/424377
+diff --git a/waftools/unittest.py b/waftools/unittest.py
+index 4317287..6179dfd 100644
+--- a/waftools/unittest.py
++++ b/waftools/unittest.py
+@@ -64,7 +64,8 @@ def generate_coverage(bld):
+ 
+ def configure(conf):
+     conf.load("waf_unit_test")
+-    conf.find_program("valgrind", var="VALGRIND", mandatory=False)
++    if conf.options.enable_valgrind is True:
++        conf.find_program("valgrind", var="VALGRIND", mandatory=False)
+     conf.find_program("lcov", var="LCOV", mandatory=False)
+     conf.find_program("genhtml", var="GENHTML", mandatory=False)
+ 
+diff --git a/wscript b/wscript
+index 99c1fa3..a98d5e3 100644
+--- a/wscript
++++ b/wscript
+@@ -501,6 +501,10 @@ def options(opt):
+                    dest='ldconfig', help="Run ldconfig after install even if not root")
+     opt.add_option('--without-ldconfig', action='store_false',
+                    dest='ldconfig', help="Don't run ldconfig after install")
++    opt.add_option('--with-valgrind', action='store_true', default=None,
++                   dest='enable_valgrind', help="Run testsuite under valgrind (if present).")
++    opt.add_option('--without-valgrind', action='store_false', default=None,
++                   dest='enable_valgrind', help="Don't run testsuite under valgrind.")
+ 
+     opt.sub_options("src/xmms")
+     for o in optional_subdirs + subdirs:
diff --git a/media-sound/xmms2/files/xmms2-0.8-samba-4.patch b/media-sound/xmms2/files/xmms2-0.8-samba-4.patch
new file mode 100644
index 000000000000..937f3d75bea9
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8-samba-4.patch
@@ -0,0 +1,30 @@
+commit 86ea5e2d2ac2d8c8c1aee484e8c264440fafcb6a
+Author: Daniel P. Chokola <dan.chokola@gmail.com>
+Date:   Wed Jan 1 14:57:35 2014 -0500
+
+    BUG(2573): Samba 4.0 uses pkg-config. Find libsmbclient.h properly.
+
+diff --git a/src/plugins/samba/wscript b/src/plugins/samba/wscript
+index 8398169..77d7cda 100644
+--- a/src/plugins/samba/wscript
++++ b/src/plugins/samba/wscript
+@@ -1,8 +1,17 @@
+ from waftools.plugin import plugin
++from waflib import Errors
+ 
+ def plugin_configure(conf):
+-    conf.check_cc(header_name="libsmbclient.h")
+-    conf.check(lib="smbclient", uselib_store="smbclient")
++    try:
++        conf.check_cfg(package="smbclient", uselib_store="smbclient",
++                       args="--cflags --libs")
++    except Errors.ConfigurationError:
++        conf.check_cc(header_name="libsmbclient.h",
++                      uselib="smbclient",
++                      type="cshlib")
++        conf.check(lib="smbclient", uselib_store="smbclient",
++                   uselib="smbclient",
++                   type="cshlib")
+ 
+ configure, build = plugin("samba", configure=plugin_configure,
+         libs=["smbclient"])
diff --git a/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch b/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch
new file mode 100644
index 000000000000..220e91e68136
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch
@@ -0,0 +1,27 @@
+Fix build failure when user has non-core xsubpp.
+
+> Could not find a typemap for C type 'xmmsv_t *' in XMMSClientPlaylist.xs, line 132
+> Undefined subroutine &ExtUtils::ParseXS::errors called at /usr/lib/perl5/5.12.4/ExtUtils/xsubpp line 41.
+> Undefined subroutine &ExtUtils::ParseXS::errors called at /usr/lib/perl5/5.12.4/ExtUtils/xsubpp line 41.
+> Could not find a typemap for C type 'const unsigned char *' in XMMSClient.xs, line 1179
+
+Use xsubpp from @INC instead of bundled one with perl.
+
+Original bug: https://bugs.gentoo.org/380469
+Related: https://bugs.gentoo.org/378783
+Updated for perl-5.20.2: https://bugs.gentoo.org/578778
+diff --git a/waflib/Tools/perl.py b/waflib/Tools/perl.py
+index 2c69fe5..a75b069 100644
+--- a/waflib/Tools/perl.py
++++ b/waflib/Tools/perl.py
+@@ -60,8 +60,8 @@ def check_perl_ext_devel(self):
+ 	env['LINKFLAGS_PERLEXT']=read_out(" -MConfig -e'print $Config{lddlflags}'")
+ 	env['INCLUDES_PERLEXT']=read_out(" -MConfig -e'print \"$Config{archlib}/CORE\"'")
+ 	env['CFLAGS_PERLEXT']=read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'")
+-	env['XSUBPP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'")
+-	env['EXTUTILS_TYPEMAP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'")
++	env["XSUBPP"]           = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::xsubpp\")'")
++	env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Metadata -e'print Module::Metadata->find_module_by_name(\"ExtUtils::typemap\")'")
+ 	if not getattr(Options.options,'perlarchdir',None):
+ 		env['ARCHDIR_PERL']=self.cmd_and_log(perl+" -MConfig -e'print $Config{sitearch}'")
+ 	else:
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch
new file mode 100644
index 000000000000..5fa43298cf7f
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch
@@ -0,0 +1,39 @@
+From d97c8b8239e8b3c5ddb951d427b7d78ea7faad25 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 30 Jul 2017 23:08:02 +0100
+Subject: [PATCH] OTHER: _xmmsv_dict_hash: make hash function
+ endianness-agnostic
+
+The following code:
+    uint32_t k;
+    memcpy (&k, data, sizeof (k));
+computes different data depending on platform endianness.
+
+That causes test_xmmsv_serialize_coll_match test to fail
+as collection order is serialized in wrong order.
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/lib/xmmstypes/xmmsv_dict.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/xmmstypes/xmmsv_dict.c b/src/lib/xmmstypes/xmmsv_dict.c
+index 5ebe4eb3..32533285 100644
+--- a/src/lib/xmmstypes/xmmsv_dict.c
++++ b/src/lib/xmmstypes/xmmsv_dict.c
+@@ -66,8 +66,10 @@ _xmmsv_dict_hash (const void *key, int len)
+ 
+ 	while (len >= 4)
+ 	{
+-		uint32_t k;
+-		memcpy (&k, data, sizeof (k));
++		uint32_t k = data [0]
++			| data [1] << 8
++			| data [2] << 16
++			| data [3] << 24;
+ 
+ 		k *= m;
+ 		k ^= k >> r;
+-- 
+2.13.3
+
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch
new file mode 100644
index 000000000000..eef49b13f16f
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch
@@ -0,0 +1,78 @@
+diff --git a/utils/gen-changelog.py b/utils/gen-changelog.py
+index b539088a..301c0461 100755
+--- a/utils/gen-changelog.py
++++ b/utils/gen-changelog.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ from subprocess import check_output
+ import os
+ 
+diff --git a/utils/gen-tarball.py b/utils/gen-tarball.py
+index 2ae2a4d1..09ed5074 100755
+--- a/utils/gen-tarball.py
++++ b/utils/gen-tarball.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ from subprocess import check_output, call
+ import tarfile
+ import os
+@@ -40,15 +40,19 @@ def add_files(ball, prefix, template, files):
+ 
+ VERSION = check_output(["git", "describe"]).strip()
+ 
++# TODO: derive paths from submodule configuration
+ TUTORIAL_DIR="doc/tutorial"
++S4_DIR="src/lib/s4"
+ 
+ PREFIX="xmms2-%s" % VERSION
+ PREFIX_TUTORIAL="%s/%s" % (PREFIX, TUTORIAL_DIR)
++PREFIX_S4="%s/%s" % (PREFIX, S4_DIR)
+ 
+ DIST_DIR="dist"
+ DIST_XMMS2="%s/xmms2-%s.tar" % (DIST_DIR, VERSION)
+ DIST_XMMS2_BZ2="%s/xmms2-%s.tar.bz2" % (DIST_DIR, VERSION)
+ DIST_TUTORIAL="%s/xmms2-tutorial-%s.tar" % (DIST_DIR, VERSION)
++DIST_S4="%s/xmms2-tutorial-%s.tar" % (DIST_DIR, VERSION)
+ 
+ if not os.path.exists(DIST_DIR):
+     os.mkdir(DIST_DIR)
+@@ -62,6 +66,9 @@ if os.path.exists(DIST_XMMS2_BZ2):
+ if os.path.exists(DIST_TUTORIAL):
+     os.unlink(DIST_TUTORIAL)
+ 
++if os.path.exists(DIST_S4):
++    os.unlink(DIST_S4)
++
+ # Tar up XMMS2
+ call("git archive --format=tar --prefix=%s/ HEAD > %s" % (PREFIX, DIST_XMMS2), shell=True)
+ 
+@@ -69,9 +76,11 @@ call("git archive --format=tar --prefix=%s/ HEAD > %s" % (PREFIX, DIST_XMMS2), s
+ call("git submodule init", shell=True)
+ call("git submodule update", shell=True)
+ call("git --git-dir=%s/.git archive --format=tar --prefix=%s/ HEAD > %s" % (TUTORIAL_DIR, PREFIX_TUTORIAL, DIST_TUTORIAL), shell=True)
++call("git --git-dir=%s/.git archive --format=tar --prefix=%s/ HEAD > %s" % (S4_DIR, PREFIX_S4, DIST_S4), shell=True)
+ 
+-# Append the tutorials to the XMMS2 archive
++# Append the tutorials and s4 to the XMMS2 archive
+ call("tar -Af %s %s" % (DIST_XMMS2, DIST_TUTORIAL), shell=True)
++call("tar -Af %s %s" % (DIST_XMMS2, DIST_S4), shell=True)
+ 
+ # Append ChangeLog and a summary of all file hashes."
+ add_files(DIST_XMMS2, PREFIX, get_template(DIST_XMMS2, os.path.join(PREFIX, "wscript")), [
+diff --git a/utils/gen-tree-hashes.py b/utils/gen-tree-hashes.py
+index 7f8b9e4f..9d27adb0 100755
+--- a/utils/gen-tree-hashes.py
++++ b/utils/gen-tree-hashes.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ from subprocess import check_output
+ from operator import itemgetter
+ import os
+@@ -21,3 +21,4 @@ def collect_hashes(*paths):
+ 
+ print check_output("git describe", shell=True)
+ print collect_hashes(".", "doc/tutorial")
++print collect_hashes(".", "src/lib/s4")
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
new file mode 100644
index 000000000000..26ce4e0e0a61
--- /dev/null
+++ b/media-sound/xmms2/metadata.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<longdescription>
+		It features a client-server model, allowing multiple (even simultaneous!) user
+		interfaces, both textual and graphical. All common audio formats are supported
+		using plugins. On top of this, there is a flexible media library to organize
+		your music.
+
+		List of features currently offered by XMMS2:
+		  Client-server model:
+		    * Allows XMMS2 to have various multiple interfaces (as clients).
+			o Command line interfaces
+			o GTK clients (matching GNOME &amp; XFCE4 look and feel)
+			o KDE clients (matching KDE look and feel)
+		    * Network transparency means you can run and control XMMS2 remotely, (e.g. run
+		      XMMS2 on your 'media box' and control it over network using a bluetooth-enabled
+		      PDA (TCP))
+		  Wide format support:
+		    * Can play FLAC, mp3, MOD, SID, speex, ogg vorbis, wave files.
+		    * Clean separation of transport and decoder subsystems
+		  Allows for more flexible access to media. (e.g. play mp3 files from a Samba
+		  share without having to mount it on the local filesystem)
+		Medialib:
+		  Database-driven media library stores metadata about songs as they're played,
+		  so songs can be quickly recalled and new playlists easily made.
+	</longdescription>
+	<use>
+		<flag name="airplay">Support for airplay format</flag>
+		<flag name="asf">Support for Monkey's Audio (APE) format with help of bundled libasf</flag>
+		<flag name="fluidsynth">Enable fluidsynth support (MIDI)</flag>
+		<flag name="gvfs">Transport for glibs virtual filesystem</flag>
+		<flag name="ices">Icecast source output plugin</flag>
+		<flag name="mac">Support for Monkey's Audio (APE) format with help of <pkg>media-sound/mac</pkg></flag>
+		<flag name="ofa">Support for Open Fingerprint Architecture (OFA)</flag>
+		<flag name="opus">Enable Opus audio codec support</flag>
+		<flag name="phonehome">This client sends anonymous usage-statistics to the xmms2</flag>
+		<flag name="server">Build xmms2 player daemon (otherwise only clients are built)</flag>
+		<flag name="sid">Support for C64 SID</flag>
+		<flag name="valgrind">Run unit tests under valgrind.</flag>
+		<flag name="vocoder">Phase vocoder effect plugin</flag>
+		<flag name="mlib-update">Enable building of xmms2-mlib-updater client</flag>
+		<flag name="xml">Enable support for various XML based playlists and sources: RSS, XSPF</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">xmms2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/xmms2/xmms2-0.8-r4.ebuild b/media-sound/xmms2/xmms2-0.8-r4.ebuild
new file mode 100644
index 000000000000..56a0c20caf22
--- /dev/null
+++ b/media-sound/xmms2/xmms2-0.8-r4.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# waf fails on python3_5: AttributeError: Can't pickle local object 'Context.__init__.<locals>.node_class'
+PYTHON_COMPAT=( python{2_7,3_4} )
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
+
+MY_P="${P}DrO_o"
+
+DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
+HOMEPAGE="https://xmms2.org/wiki/Main_Page"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+LICENSE="GPL-2 LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86"
+
+IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac gvfs ices
+jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa oss
+perl phonehome pulseaudio python ruby samba +server sid sndfile speex
+test valgrind +vorbis vocoder wavpack xml zeroconf"
+
+RDEPEND="server? (
+		>=dev-db/sqlite-3.3.4
+
+		aac? ( >=media-libs/faad2-2.0 )
+		airplay? ( dev-libs/openssl:0= )
+		alsa? ( media-libs/alsa-lib )
+		ao? ( media-libs/libao )
+		cdda? ( dev-libs/libcdio-paranoia
+			>=media-libs/libdiscid-0.1.1
+			>=media-sound/cdparanoia-3.9.8 )
+		curl? ( >=net-misc/curl-7.15.1 )
+		ffmpeg? ( virtual/ffmpeg )
+		flac? ( media-libs/flac )
+		gvfs? ( gnome-base/gnome-vfs )
+		ices? ( media-libs/libogg
+			media-libs/libshout
+			media-libs/libvorbis )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 )
+		mac? ( media-sound/mac )
+		mms? ( virtual/ffmpeg
+			>=media-libs/libmms-0.3 )
+		modplug? ( media-libs/libmodplug )
+		mad? ( media-libs/libmad )
+		mp3? ( >=media-sound/mpg123-1.5.1 )
+		musepack? ( media-sound/musepack-tools )
+		ofa? ( media-libs/libofa )
+		pulseaudio? ( media-sound/pulseaudio )
+		samba? ( >=net-fs/samba-4.2 )
+		sid? ( media-sound/sidplay
+			media-libs/resid )
+		sndfile? ( media-libs/libsndfile )
+		speex? ( media-libs/speex
+			media-libs/libogg )
+		vorbis? ( media-libs/libvorbis )
+		vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate )
+		wavpack? ( media-sound/wavpack )
+		xml? ( dev-libs/libxml2 )
+		zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	)
+
+	>=dev-libs/glib-2.12.9
+	cxx? ( >=dev-libs/boost-1.32 )
+	perl? ( >=dev-lang/perl-5.8.8 )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+"
+
+DEPEND="${RDEPEND}
+	dev-lang/python
+	virtual/pkgconfig
+	perl? ( dev-perl/Module-Build
+		virtual/perl-Module-Metadata )
+	python? ( >=dev-python/cython-0.15.1
+		dev-python/pyrex )
+	test? ( dev-util/cunit
+		valgrind? ( dev-util/valgrind ) )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# used both for building xmms2 and
+	# optionally linking client library
+	# against python
+	python-single-r1_pkg_setup
+}
+
+# use_enable() is taken as proto
+# $1 - useflag
+# $2 - xmms2 option/plugin name (equals to $1 if not set)
+
+xmms2_flag() {
+	[[ -z $1 ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
+
+	local UWORD=${2:-$1}
+
+	case $1 in
+		ENABLED)
+			echo ",${UWORD}"
+			;;
+		DISABLED)
+			;;
+		*)
+			use $1 && echo ",${UWORD}"
+			;;
+	esac
+}
+
+src_prepare() {
+	./waf # inflate waf
+	cd .waf* || die
+	epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-ffmpeg-0.11.patch #443256
+	epatch "${FILESDIR}/${P}"-libav-9-p2.patch #443256
+	epatch "${FILESDIR}/${P}"-libav-9.patch #443256
+	epatch "${FILESDIR}/${P}"-cython-0.19.1.patch
+	epatch "${FILESDIR}/${P}"-memset.patch
+	epatch "${FILESDIR}/${P}"-ffmpeg2.patch #536232
+	epatch "${FILESDIR}/${P}"-cpython.patch
+	epatch "${FILESDIR}/${P}"-modpug.patch #536046
+	epatch "${FILESDIR}/${P}"-audio4-p1.patch #540890
+	epatch "${FILESDIR}/${P}"-audio4-p2.patch
+	epatch "${FILESDIR}/${P}"-audio4-p3.patch
+	epatch "${FILESDIR}/${P}"-audio4-p4.patch
+	epatch "${FILESDIR}/${P}"-audio4-p5.patch
+	epatch "${FILESDIR}/${P}"-audio4-p6.patch
+	epatch "${FILESDIR}/${P}"-audio4-p7.patch
+	epatch "${FILESDIR}/${P}"-rtvg.patch #424377
+	epatch "${FILESDIR}/${P}"-samba-4.patch
+
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' src/plugins/cdda/cdda.c || die
+	fi
+	epatch_user
+}
+
+src_configure() {
+	# ./configure alike options.
+	local waf_params="--prefix=/usr \
+			--libdir=/usr/$(get_libdir) \
+			--with-target-platform=${CHOST} \
+			--mandir=/usr/share/man \
+			--infodir=/usr/share/info \
+			--datadir=/usr/share \
+			--sysconfdir=/etc \
+			--localstatedir=/var/lib"
+
+	local optionals=""
+	local plugins=""
+	if ! use server ; then
+		waf_params+=" --without-xmms2d"
+	else
+		# some fun static mappings:
+		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
+					"phonehome	et"
+					"ENABLED	launcher"
+					"mlib-update	medialib-updater"
+					"ENABLED	nycli"
+					"		perl"
+					"ENABLED	pixmaps"
+					"		python"
+					"		ruby"
+					"DISABLED	tests"
+					"DISABLED	vistest"
+					"cxx		xmmsclient++"
+					"cxx		xmmsclient++-glib"
+					"DISABLED	xmmsclient-cf"
+					"DISABLED	xmmsclient-ecore" # not in tree
+
+					"test		tests"
+				)
+
+		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
+					"		alsa"
+					"		airplay"
+					"		ao"
+					"ffmpeg		apefile"
+					"ffmpeg		avcodec"
+					"		asf"
+					"ENABLED	asx"
+					"		cdda"
+					"DISABLED	coreaudio" # MacOS only?
+					"		curl"
+					"ENABLED	cue"
+					"zeroconf	daap"
+					"ENABLED	diskwrite"
+					"ENABLED	equalizer"
+					"aac		faad"
+					"ENABLED	file"
+					"		flac"
+					"ffmpeg		flv"
+					"ffmpeg		tta"
+					"DISABLED	gme" # not in tree
+					"		gvfs"
+					"ENABLED	html"
+					"		ices"
+					"ENABLED	icymetaint"
+					"ENABLED	id3v2"
+					"		jack"
+					"ENABLED	karaoke"
+					"ENABLED	m3u"
+					"		mac"
+					"		mms"
+					"		mad"
+					"		mp4" # bug #387961 (aac, mp3, ape can sit there)
+					"mp3		mpg123"
+					"		modplug"
+					"		musepack"
+					"DISABLED	nms" # not in tree
+					"ENABLED	normalize"
+					"ENABLED	null"
+					"ENABLED	nulstripper"
+					"		ofa"
+					"		oss"
+					"ENABLED	pls"
+					"pulseaudio	pulse"
+					"ENABLED	replaygain"
+					"xml		rss"
+					"		samba"
+					"DISABLED	sc68" #not in tree
+					"		sid"
+					"		sndfile"
+					"		speex"
+					"DISABLED	sun" # {Open,Net}BSD only
+					"DISABLED	tremor" # not in tree
+					"		vorbis"
+					"		vocoder"
+					"ffmpeg		tta"
+					"ENABLED	wave"
+					"DISABLED	waveout" # windows only
+					"		wavpack"
+					"xml		xspf"
+					"ENABLED	xml"
+				)
+
+		local option
+		for option in "${option_map[@]}"; do
+			optionals+=$(xmms2_flag $option)
+		done
+
+		local plugin
+		for plugin in "${plugin_map[@]}"; do
+			plugins+=$(xmms2_flag $plugin)
+		done
+	fi # ! server
+
+	# pass them explicitely even if empty as we try to avoid magic deps
+	waf_params+=" --with-optionals=${optionals:1}" # skip first ',' if yet
+	waf_params+=" --with-plugins=${plugins:1}"
+	waf_params+=" $(use_with valgrind)"
+
+	CC="$(tc-getCC)"         \
+	CPP="$(tc-getCPP)"       \
+	AR="$(tc-getAR)"         \
+	RANLIB="$(tc-getRANLIB)" \
+	CXX="$(tc-getCXX)"       \
+	    ./waf configure ${waf_params} || die "'waf configure' failed"
+}
+
+src_compile() {
+	# waf is very keen to run tests in build phase (bug #424377) but
+	# it does not bother running tests twice, so the hack below works:
+	./waf --verbose build || ./waf --verbose build || die "waf build failed"
+}
+
+src_test() {
+	# rerun tests
+	./waf --alltests || die "waf --alltests failed"
+}
+
+src_install() {
+	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
+	dodoc AUTHORS TODO
+}
+
+pkg_postinst() {
+	elog "This version is built on experimental development code"
+	elog "If you encounter any errors report them at http://bugs.xmms2.org"
+	elog "and visit #xmms2 at irc://irc.freenode.net"
+	if use phonehome ; then
+		einfo ""
+		einfo "The phone-home client xmms2-et was activated"
+		einfo "This client sends anonymous usage-statistics to the xmms2"
+		einfo "developers which may help finding bugs"
+		einfo "Disable the phonehome useflag if you don't like that"
+	fi
+}
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild
new file mode 100644
index 000000000000..8e1a03998bf6
--- /dev/null
+++ b/media-sound/xmms2/xmms2-0.8_p20161122-r1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
+
+# generated as 'python2 ./utils/gen-tarball.py' from clean git tree
+MY_P="${P%_p*}DrO_o-949-gca15e830"
+
+DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
+HOMEPAGE="https://xmms2.org/wiki/Main_Page"
+#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2"
+LICENSE="GPL-2 LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+
+IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth gvfs ices
+jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
+perl phonehome pulseaudio python ruby samba +server sid sndfile speex
+test valgrind +vorbis vocoder wavpack xml zeroconf"
+
+RDEPEND="server? (
+		>=dev-db/sqlite-3.3.4
+
+		aac? ( >=media-libs/faad2-2.0 )
+		airplay? ( dev-libs/openssl:0= )
+		alsa? ( media-libs/alsa-lib )
+		ao? ( media-libs/libao )
+		cdda? ( dev-libs/libcdio-paranoia
+			>=media-libs/libdiscid-0.1.1
+			>=media-sound/cdparanoia-3.9.8 )
+		curl? ( >=net-misc/curl-7.15.1 )
+		ffmpeg? ( virtual/ffmpeg )
+		flac? ( media-libs/flac )
+		fluidsynth? ( media-sound/fluidsynth )
+		gvfs? ( gnome-base/gnome-vfs )
+		ices? ( media-libs/libogg
+			media-libs/libshout
+			media-libs/libvorbis )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 )
+		mac? ( media-sound/mac )
+		mms? ( virtual/ffmpeg
+			>=media-libs/libmms-0.3 )
+		modplug? ( media-libs/libmodplug )
+		mad? ( media-libs/libmad )
+		mp3? ( >=media-sound/mpg123-1.5.1 )
+		musepack? ( media-sound/musepack-tools )
+		ofa? ( media-libs/libofa )
+		opus? ( media-libs/opus
+			media-libs/opusfile )
+		pulseaudio? ( media-sound/pulseaudio )
+		samba? ( >=net-fs/samba-4.2 )
+		sid? ( media-sound/sidplay
+			media-libs/resid )
+		sndfile? ( media-libs/libsndfile )
+		speex? ( media-libs/speex
+			media-libs/libogg )
+		vorbis? ( media-libs/libvorbis )
+		vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate )
+		wavpack? ( media-sound/wavpack )
+		xml? ( dev-libs/libxml2 )
+		zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	)
+
+	>=dev-libs/glib-2.12.9
+	cxx? ( >=dev-libs/boost-1.32 )
+	perl? ( >=dev-lang/perl-5.8.8 )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+"
+
+DEPEND="${RDEPEND}
+	dev-lang/python
+	virtual/pkgconfig
+	perl? ( dev-perl/Module-Build
+		virtual/perl-Module-Metadata )
+	python? ( >=dev-python/cython-0.15.1
+		dev-python/pyrex )
+	test? ( dev-util/cunit
+		valgrind? ( dev-util/valgrind ) )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# used both for building xmms2 and
+	# optionally linking client library
+	# against python
+	python-single-r1_pkg_setup
+}
+
+# use_enable() is taken as proto
+# $1 - useflag
+# $2 - xmms2 option/plugin name (equals to $1 if not set)
+
+xmms2_flag() {
+	[[ -z $1 ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
+
+	local UWORD=${2:-$1}
+
+	case $1 in
+		ENABLED)
+			echo ",${UWORD}"
+			;;
+		DISABLED)
+			;;
+		*)
+			use $1 && echo ",${UWORD}"
+			;;
+	esac
+}
+
+src_prepare() {
+	./waf # inflate waf
+	cd .waf* || die
+	# needs port
+	#epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
+	cd "${S}"
+
+	eapply "${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232
+
+	eapply "${FILESDIR}/${PN}"-0.8-rtvg.patch #424377
+
+	# required to build tarball from git tree
+	eapply "${FILESDIR}/${P}"-tarball.patch
+
+	# fix hash to be the same on LE/BE platforms
+	eapply "${FILESDIR}/${P}"-be-hash.patch
+
+	eapply_user
+}
+
+src_configure() {
+	# ./configure alike options.
+	local waf_params="--prefix=/usr \
+			--libdir=/usr/$(get_libdir) \
+			--with-target-platform=${CHOST} \
+			--mandir=/usr/share/man \
+			--infodir=/usr/share/info \
+			--datadir=/usr/share \
+			--sysconfdir=/etc \
+			--localstatedir=/var/lib"
+
+	local optionals=""
+	local plugins=""
+	if ! use server ; then
+		waf_params+=" --without-xmms2d"
+	else
+		# some fun static mappings:
+		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
+					"phonehome	et"
+					"ENABLED	launcher"
+					"mlib-update	medialib-updater"
+					"ENABLED	nycli"
+					"		perl"
+					"ENABLED	pixmaps"
+					"		python"
+					"		ruby"
+					"DISABLED	tests"
+					"DISABLED	vistest"
+					"cxx		xmmsclient++"
+					"cxx		xmmsclient++-glib"
+					"DISABLED	xmmsclient-cf"
+					"DISABLED	xmmsclient-ecore" # not in tree
+
+					"test		tests"
+				)
+
+		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
+					"		alsa"
+					"		airplay"
+					"		ao"
+					"ffmpeg		apefile"
+					"ffmpeg		avcodec"
+					"		asf"
+					"ENABLED	asx"
+					"		cdda"
+					"DISABLED	coreaudio" # MacOS only?
+					"		curl"
+					"ENABLED	cue"
+					"zeroconf	daap"
+					"ENABLED	diskwrite"
+					"ENABLED	equalizer"
+					"aac		faad"
+					"ENABLED	file"
+					"		flac"
+					"		fluidsynth"
+					"ffmpeg		flv"
+					"ffmpeg		tta"
+					"DISABLED	gme" # not in tree
+					"		gvfs"
+					"ENABLED	html"
+					"		ices"
+					"ENABLED	icymetaint"
+					"ENABLED	id3v2"
+					"		jack"
+					"ENABLED	karaoke"
+					"ENABLED	m3u"
+					"		mac"
+					"		mms"
+					"		mad"
+					"ENABLED	midsquash"
+					"		mp4" # bug #387961 (aac, mp3, ape can sit there)
+					"mp3		mpg123"
+					"		modplug"
+					"		musepack"
+					"DISABLED	nms" # not in tree
+					"ENABLED	normalize"
+					"ENABLED	null"
+					"ENABLED	nulstripper"
+					"		ofa"
+					"		opus"
+					"		oss"
+					"ENABLED	pls"
+					"pulseaudio	pulse"
+					"ENABLED	replaygain"
+					"xml		rss"
+					"		samba"
+					"DISABLED	sc68" #not in tree
+					"		sid"
+					"		sndfile"
+					"		speex"
+					"DISABLED	sun" # {Open,Net}BSD only
+					"DISABLED	tremor" # not in tree
+					"		vorbis"
+					"		vocoder"
+					"ffmpeg		tta"
+					"ENABLED	wave"
+					"DISABLED	waveout" # windows only
+					"		wavpack"
+					"xml		xspf"
+					"ENABLED	xml"
+				)
+
+		local option
+		for option in "${option_map[@]}"; do
+			optionals+=$(xmms2_flag $option)
+		done
+
+		local plugin
+		for plugin in "${plugin_map[@]}"; do
+			plugins+=$(xmms2_flag $plugin)
+		done
+	fi # ! server
+
+	# pass them explicitely even if empty as we try to avoid magic deps
+	waf_params+=" --with-optionals=${optionals:1}" # skip first ',' if yet
+	waf_params+=" --with-plugins=${plugins:1}"
+	waf_params+=" $(use_with valgrind)"
+
+	CC="$(tc-getCC)"         \
+	CPP="$(tc-getCPP)"       \
+	AR="$(tc-getAR)"         \
+	RANLIB="$(tc-getRANLIB)" \
+	CXX="$(tc-getCXX)"       \
+	    ./waf configure ${waf_params} || die "'waf configure' failed"
+}
+
+src_compile() {
+	# waf is very keen to run tests in build phase (bug #424377) but
+	# it does not bother running tests twice, so the hack below works:
+	./waf --verbose build || ./waf --verbose build || die "waf build failed"
+}
+
+src_test() {
+	# rerun tests
+	./waf --alltests || die "waf --alltests failed"
+}
+
+src_install() {
+	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
+	dodoc AUTHORS TODO
+}
+
+pkg_postinst() {
+	elog "This version is built on experimental development code"
+	elog "If you encounter any errors report them at http://bugs.xmms2.org"
+	elog "and visit #xmms2 at irc://irc.freenode.net"
+	if use phonehome ; then
+		einfo ""
+		einfo "The phone-home client xmms2-et was activated"
+		einfo "This client sends anonymous usage-statistics to the xmms2"
+		einfo "developers which may help finding bugs"
+		einfo "Disable the phonehome useflag if you don't like that"
+	fi
+}
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122.ebuild
new file mode 100644
index 000000000000..14ef8f66ad1c
--- /dev/null
+++ b/media-sound/xmms2/xmms2-0.8_p20161122.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit eutils multiprocessing python-single-r1 ruby-single toolchain-funcs
+
+# generated as 'python2 ./utils/gen-tarball.py' from clean git tree
+MY_P="${P%_p*}DrO_o-949-gca15e830"
+
+DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
+HOMEPAGE="https://xmms2.org/wiki/Main_Page"
+#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2"
+LICENSE="GPL-2 LGPL-2.1"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ppc x86"
+
+IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth gvfs ices
+jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
+perl phonehome pulseaudio python ruby samba +server sid sndfile speex
+test valgrind +vorbis vocoder wavpack xml zeroconf"
+
+RDEPEND="server? (
+		>=dev-db/sqlite-3.3.4
+
+		aac? ( >=media-libs/faad2-2.0 )
+		airplay? ( dev-libs/openssl:0= )
+		alsa? ( media-libs/alsa-lib )
+		ao? ( media-libs/libao )
+		cdda? ( dev-libs/libcdio-paranoia
+			>=media-libs/libdiscid-0.1.1
+			>=media-sound/cdparanoia-3.9.8 )
+		curl? ( >=net-misc/curl-7.15.1 )
+		ffmpeg? ( virtual/ffmpeg )
+		flac? ( media-libs/flac )
+		fluidsynth? ( media-sound/fluidsynth )
+		gvfs? ( gnome-base/gnome-vfs )
+		ices? ( media-libs/libogg
+			media-libs/libshout
+			media-libs/libvorbis )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.101.1 )
+		mac? ( media-sound/mac )
+		mms? ( virtual/ffmpeg
+			>=media-libs/libmms-0.3 )
+		modplug? ( media-libs/libmodplug )
+		mad? ( media-libs/libmad )
+		mp3? ( >=media-sound/mpg123-1.5.1 )
+		musepack? ( media-sound/musepack-tools )
+		ofa? ( media-libs/libofa )
+		opus? ( media-libs/opus
+			media-libs/opusfile )
+		pulseaudio? ( media-sound/pulseaudio )
+		samba? ( >=net-fs/samba-4.2 )
+		sid? ( media-sound/sidplay
+			media-libs/resid )
+		sndfile? ( media-libs/libsndfile )
+		speex? ( media-libs/speex
+			media-libs/libogg )
+		vorbis? ( media-libs/libvorbis )
+		vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate )
+		wavpack? ( media-sound/wavpack )
+		xml? ( dev-libs/libxml2 )
+		zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	)
+
+	>=dev-libs/glib-2.12.9
+	cxx? ( >=dev-libs/boost-1.32 )
+	perl? ( >=dev-lang/perl-5.8.8 )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( ${RUBY_DEPS} )
+"
+
+DEPEND="${RDEPEND}
+	dev-lang/python
+	virtual/pkgconfig
+	perl? ( dev-perl/Module-Build
+		virtual/perl-Module-Metadata )
+	python? ( >=dev-python/cython-0.15.1
+		dev-python/pyrex )
+	test? ( dev-util/cunit
+		valgrind? ( dev-util/valgrind ) )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# used both for building xmms2 and
+	# optionally linking client library
+	# against python
+	python-single-r1_pkg_setup
+}
+
+# use_enable() is taken as proto
+# $1 - useflag
+# $2 - xmms2 option/plugin name (equals to $1 if not set)
+
+xmms2_flag() {
+	[[ -z $1 ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
+
+	local UWORD=${2:-$1}
+
+	case $1 in
+		ENABLED)
+			echo ",${UWORD}"
+			;;
+		DISABLED)
+			;;
+		*)
+			use $1 && echo ",${UWORD}"
+			;;
+	esac
+}
+
+src_prepare() {
+	./waf # inflate waf
+	cd .waf* || die
+	# needs port
+	#epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
+	cd "${S}"
+
+	eapply "${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232
+
+	eapply "${FILESDIR}/${PN}"-0.8-rtvg.patch #424377
+
+	# required to build tarball from git tree
+	eapply "${FILESDIR}/${P}"-tarball.patch
+
+	eapply_user
+}
+
+src_configure() {
+	# ./configure alike options.
+	local waf_params="--prefix=/usr \
+			--libdir=/usr/$(get_libdir) \
+			--with-target-platform=${CHOST} \
+			--mandir=/usr/share/man \
+			--infodir=/usr/share/info \
+			--datadir=/usr/share \
+			--sysconfdir=/etc \
+			--localstatedir=/var/lib"
+
+	local optionals=""
+	local plugins=""
+	if ! use server ; then
+		waf_params+=" --without-xmms2d"
+	else
+		# some fun static mappings:
+		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
+					"phonehome	et"
+					"ENABLED	launcher"
+					"mlib-update	medialib-updater"
+					"ENABLED	nycli"
+					"		perl"
+					"ENABLED	pixmaps"
+					"		python"
+					"		ruby"
+					"DISABLED	tests"
+					"DISABLED	vistest"
+					"cxx		xmmsclient++"
+					"cxx		xmmsclient++-glib"
+					"DISABLED	xmmsclient-cf"
+					"DISABLED	xmmsclient-ecore" # not in tree
+
+					"test		tests"
+				)
+
+		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
+					"		alsa"
+					"		airplay"
+					"		ao"
+					"ffmpeg		apefile"
+					"ffmpeg		avcodec"
+					"		asf"
+					"ENABLED	asx"
+					"		cdda"
+					"DISABLED	coreaudio" # MacOS only?
+					"		curl"
+					"ENABLED	cue"
+					"zeroconf	daap"
+					"ENABLED	diskwrite"
+					"ENABLED	equalizer"
+					"aac		faad"
+					"ENABLED	file"
+					"		flac"
+					"		fluidsynth"
+					"ffmpeg		flv"
+					"ffmpeg		tta"
+					"DISABLED	gme" # not in tree
+					"		gvfs"
+					"ENABLED	html"
+					"		ices"
+					"ENABLED	icymetaint"
+					"ENABLED	id3v2"
+					"		jack"
+					"ENABLED	karaoke"
+					"ENABLED	m3u"
+					"		mac"
+					"		mms"
+					"		mad"
+					"ENABLED	midsquash"
+					"		mp4" # bug #387961 (aac, mp3, ape can sit there)
+					"mp3		mpg123"
+					"		modplug"
+					"		musepack"
+					"DISABLED	nms" # not in tree
+					"ENABLED	normalize"
+					"ENABLED	null"
+					"ENABLED	nulstripper"
+					"		ofa"
+					"		opus"
+					"		oss"
+					"ENABLED	pls"
+					"pulseaudio	pulse"
+					"ENABLED	replaygain"
+					"xml		rss"
+					"		samba"
+					"DISABLED	sc68" #not in tree
+					"		sid"
+					"		sndfile"
+					"		speex"
+					"DISABLED	sun" # {Open,Net}BSD only
+					"DISABLED	tremor" # not in tree
+					"		vorbis"
+					"		vocoder"
+					"ffmpeg		tta"
+					"ENABLED	wave"
+					"DISABLED	waveout" # windows only
+					"		wavpack"
+					"xml		xspf"
+					"ENABLED	xml"
+				)
+
+		local option
+		for option in "${option_map[@]}"; do
+			optionals+=$(xmms2_flag $option)
+		done
+
+		local plugin
+		for plugin in "${plugin_map[@]}"; do
+			plugins+=$(xmms2_flag $plugin)
+		done
+	fi # ! server
+
+	# pass them explicitely even if empty as we try to avoid magic deps
+	waf_params+=" --with-optionals=${optionals:1}" # skip first ',' if yet
+	waf_params+=" --with-plugins=${plugins:1}"
+	waf_params+=" $(use_with valgrind)"
+
+	CC="$(tc-getCC)"         \
+	CPP="$(tc-getCPP)"       \
+	AR="$(tc-getAR)"         \
+	RANLIB="$(tc-getRANLIB)" \
+	CXX="$(tc-getCXX)"       \
+	    ./waf configure ${waf_params} || die "'waf configure' failed"
+}
+
+src_compile() {
+	# waf is very keen to run tests in build phase (bug #424377) but
+	# it does not bother running tests twice, so the hack below works:
+	./waf --verbose build || ./waf --verbose build || die "waf build failed"
+}
+
+src_test() {
+	# rerun tests
+	./waf --alltests || die "waf --alltests failed"
+}
+
+src_install() {
+	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
+	dodoc AUTHORS TODO
+}
+
+pkg_postinst() {
+	elog "This version is built on experimental development code"
+	elog "If you encounter any errors report them at http://bugs.xmms2.org"
+	elog "and visit #xmms2 at irc://irc.freenode.net"
+	if use phonehome ; then
+		einfo ""
+		einfo "The phone-home client xmms2-et was activated"
+		einfo "This client sends anonymous usage-statistics to the xmms2"
+		einfo "developers which may help finding bugs"
+		einfo "Disable the phonehome useflag if you don't like that"
+	fi
+}
diff --git a/media-sound/xnoise/Manifest b/media-sound/xnoise/Manifest
new file mode 100644
index 000000000000..20803109306e
--- /dev/null
+++ b/media-sound/xnoise/Manifest
@@ -0,0 +1,6 @@
+DIST xnoise-0.2.21.tar.gz 3222030 SHA256 6c501091ac5a59aa0596978aa8d4750cc12d6bc9a823fd57542d9ab8e3366681 SHA512 e25f42795638a5b93f1922f1c761b0bdaf754414dfa0f7172407e0d10514c52844d0dc3146a32f93e6107a0b5bb0f8e9e5d098954e9659f28177c56f607d9851 WHIRLPOOL c2773da98b387b783dcc423a78bae6d5f6310e76f8a88eab4bc92b6de056741578a0c7dbffb455c768f412463dc14133f933d42d3215318a55f1addd0df9fee3
+EBUILD xnoise-0.2.21.ebuild 1608 SHA256 7d57eb05a0b63ea907863f037eae90f7bc9c45246dab595b5d9766a5e2db4b02 SHA512 e5dee0cedd451ce78f16ed0a8628ad84e5ab07a1893dace4b6932ead1a1f68f436252f80b834ecf7988438928ab3e3b372f64dea91c79080358935e72378126b WHIRLPOOL f22e3e30b5a22cbd557e84ccaf33fb9cd824f70fa8c2006a51b1382c1af4f2389e20a49a327568eb6215a39ff9b98a0b44f5ff3d96d29d9ccc6313cea89bb41d
+EBUILD xnoise-9999.ebuild 1689 SHA256 d8be3a2e5d6ad79b584ee2764e15d5b2d6b3e7f45f2870b1e0b348c64a8facd5 SHA512 23462598c5cbd82c32e072bcc6eba82e2ffd2b8798d386aedc96844ff6d0e9ef535dc2c4113eab98dfab3ed80b0ced6305b14cc2296eb3530c17ff03e4c089d4 WHIRLPOOL fd30f76fc2bb965fa2b429bcdc7e8f1391148aabb6bae332c9fb0202f4b1872a6ef8358575bc4de9b18f263f75659091ca908fd559e68eb70462fcda2dff684a
+MISC ChangeLog 2784 SHA256 fb759bb04ea69b9952d1b2bfafbb495cf091f79a0adb102f8ce13d5ee9482346 SHA512 9ebeb88387130bc5416957653b8dc6c727fd5b9ac195e4b53bd8d7d56c909734eb1c2bde7647735f018a3844b9b74b99f1a65a5f3214c9e55c38bb810b5ba6a1 WHIRLPOOL a13904c5cd802e8985e1f61b5d97db186646853219eaec7ab9767304c56b51c29785b4c203ee4415c3382e6fa11f0f6b12c51fba973c774bb741ba651fafc528
+MISC ChangeLog-2015 6214 SHA256 8a2acdaa618d20942fbd05ad1a20012ae2b402a1949e20ba3009c044431139d9 SHA512 7ec371a84bc4b84831511e977e8a3203dafc300038462721d55f4ecb7e44e6b069adae2c3285d3567636b8f63fca8dce36d6c3f43a8eaa7ba7d3ab028e002b73 WHIRLPOOL 275d1515dbbaf25db2e7ac5ed4fdd19673c8eeaf4f9f65b9732650b905880b046b3c9832ba56f277d41fdb7c31698d9e7ecc0630153b4e2441041b8ffbf70c59
+MISC metadata.xml 507 SHA256 8dd2750aef366db1037f8a85829ba5b3c9116acf516c06fc852a0238f7dc8220 SHA512 06e64ff5b075eb264ebfea8d77a95cdcf901e08df501abcdf4383dca64314185abc0d539df5d306e83bc4e26488ae8182cbd5c21cb39cf8314d70f070463b446 WHIRLPOOL 6300a4448c48774f124651a446d59c3fed8b9847bb1210afb1e054bc977d06051196ad90b6e44dfad3dae0a157f0e9d761b88911e2848c2c7ceec76474b8b352
diff --git a/media-sound/xnoise/metadata.xml b/media-sound/xnoise/metadata.xml
new file mode 100644
index 000000000000..236fa82f3dfa
--- /dev/null
+++ b/media-sound/xnoise/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="lastfm">Enable support for lastfm cover art fetching and scrobbling</flag>
+		<flag name="lyrics">Enable support for lyrics fetching</flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">shuerhaaken/xnoise</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/xnoise/xnoise-0.2.21.ebuild b/media-sound/xnoise/xnoise-0.2.21.ebuild
new file mode 100644
index 000000000000..f5abf7d7f05f
--- /dev/null
+++ b/media-sound/xnoise/xnoise-0.2.21.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit fdo-mime gnome2-utils
+
+DESCRIPTION="A media player for Gtk+ with a slick GUI, great speed and lots of
+features"
+HOMEPAGE="http://www.xnoise-media-player.com/"
+SRC_URI="https://www.bitbucket.org/shuerhaaken/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ayatana +lastfm +lyrics"
+
+RDEPEND="x11-libs/gtk+:3
+	>=dev-libs/glib-2.34:2
+	gnome-base/librsvg:2
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-plugins/gst-plugins-meta:1.0
+	dev-db/sqlite:3
+	>=media-libs/libtaginfo-0.2.0
+	x11-libs/cairo
+	x11-libs/libX11
+	ayatana? ( dev-libs/libappindicator:3 )
+	lastfm? ( net-libs/libsoup:2.4 )
+	lyrics? ( net-libs/libsoup:2.4
+		dev-libs/libxml2:2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	sed -i -e "/OnlyShowIn/d" data/misc/xnoise.desktop.* || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable ayatana appindicator) \
+		$(use_enable lyrics lyricwiki) \
+		$(use_enable lastfm) \
+		--enable-mpris \
+		--enable-soundmenu2 \
+		--enable-mediakeys \
+		$(use_enable lyrics chartlyrics) \
+		$(use_enable lyrics azlyrics) \
+		--enable-magnatune
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+	rm -rf "${ED}"/usr/share/${PN}/license || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/xnoise/xnoise-9999.ebuild b/media-sound/xnoise/xnoise-9999.ebuild
new file mode 100644
index 000000000000..9d103460ed61
--- /dev/null
+++ b/media-sound/xnoise/xnoise-9999.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+VALA_MIN_API_VERSION=0.20
+
+inherit fdo-mime gnome2-utils git-2 vala
+
+DESCRIPTION="A media player for Gtk+ with a slick GUI, great speed and lots of
+features"
+HOMEPAGE="http://www.xnoise-media-player.com/"
+EGIT_REPO_URI="https://bitbucket.org/shuerhaaken/${PN}.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="ayatana +lastfm +lyrics"
+
+RDEPEND="x11-libs/gtk+:3
+	>=dev-libs/glib-2.34:2
+	gnome-base/librsvg:2
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	media-plugins/gst-plugins-meta:1.0
+	dev-db/sqlite:3
+	>=media-libs/libtaginfo-0.2.0
+	x11-libs/cairo
+	x11-libs/libX11
+	ayatana? ( dev-libs/libappindicator:3 )
+	lastfm? ( net-libs/libsoup:2.4 )
+	lyrics? ( net-libs/libsoup:2.4
+		dev-libs/libxml2:2 )"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	gnome-base/gnome-common:3
+	>=sys-devel/autoconf-2.67:2.5
+	sys-devel/gettext"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	NOCONFIGURE=yes ./autogen.sh || die
+	vala_src_prepare
+}
+
+src_configure() {
+	econf \
+		$(use_enable ayatana appindicator) \
+		$(use_enable lyrics lyricwiki) \
+		$(use_enable lastfm) \
+		--enable-mpris \
+		--enable-soundmenu2 \
+		--enable-mediakeys \
+		$(use_enable lyrics chartlyrics) \
+		$(use_enable lyrics azlyrics) \
+		--enable-magnatune
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+	rm -rf "${ED}"/usr/share/${PN}/license || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
new file mode 100644
index 000000000000..3378fa67b7c2
--- /dev/null
+++ b/media-sound/xwax/Manifest
@@ -0,0 +1,8 @@
+AUX xwax-etc-security-limits.conf 18 SHA256 e24dde95f162428a991629aa19c6295b6a1746316cecb8811cc25fadbdcde3b5 SHA512 fab914f078597e9c4ba4ffa289f559106d62354d5f97c0847855c08cd8a9a1bdfd9db3f74d9b3868e6150d39fadc4c2c8d51b4815bb6b19ccdbee1fb6ddf72e2 WHIRLPOOL e60972b3ed1fa32715905fd6e132306727349b8e61cf6c91e7d203bdb880a3abef106d1441891cf2d10e78d3afbbf84322b986832291ca35306fd0578dfefa03
+DIST xwax-1.5.tar.gz 77582 SHA256 b67ee78c988e4af2ebce899da98bbb8cadf91792bca1d08ee65a9b5da7b0d4a8 SHA512 b5fb66c35dd5174277417b8973bab63232bdf471fe190ab3df1c37e386a9cdc9e2b5cbdc4f5715bf69d146846c13ce2acd5db6a0881412dabdcd234d6d199b61 WHIRLPOOL 60abdcdfd3cf70b17525e16deeecabe6aaa6838a172e4292655ca5401a15d05952649faaf85f3b616c884222abcb2cbdf105522446f1e1ddc81dcb4bcfe60ec7
+DIST xwax-1.6.tar.gz 79452 SHA256 fc3392979d243e3950819834f2303e78de5acf8fad4e5d2f77826c3ac35683df SHA512 710a53a1b056bf6850a668a1f267b91664d5629998e6ee2d4853aa57d1ab351dd782716272ed4a4858168c0ac9f5c7d2e1fe0a8b330e26775677e1eb54249015 WHIRLPOOL 621f30d72883ea23d5c86d6668d4c943e8625da4bf0b6541083133ab390b225d4737e3f9aee64d5f6c536061172b5cd580350cb5218d8e0074bfb746cd2d7164
+EBUILD xwax-1.5.ebuild 2174 SHA256 8befea9449d569df24941ac6537760b441ed07a181cce07cd133deaa53cc7c84 SHA512 02324db41aad3424fcc9b8fa2f221ba95d74ecdae659fc84ea425ff262e6ed97f3c77f41a1f45268966cd83c5c9075ba73a9e0e299a49bafbf496343f969e04e WHIRLPOOL 6b7ffc3d7d321dd8c6cc8fbad5e926339e2e887b50f0793bbb1efed0f99478f1c1576c63bd09cf5706e182aeec5b6a2aed08007755af64c4f13e999f5d534eee
+EBUILD xwax-1.6.ebuild 2178 SHA256 e6800c32bae25735be4da775e4e572068c45b87b0f4ccd26fb9739b66d546b0d SHA512 1213009c6f809a5c4b104fe160c30ab7f513e9be626c8b57c3754bf3c575981d5d0a94dbd0cf9e859d85d9871b05b0112966603fb6be6a7f242230e66e1425ac WHIRLPOOL 598477cee7b8b2b80f9568fb5ec3fa8faa853f6e48c8dfe866834e287c0602ab413149dc38f112a235072a306cd7b1631fc8c9f177a7bc1ac50d689bab9ac494
+MISC ChangeLog 2988 SHA256 79e888eb94b695b4e8462702ec8d902761aae99c940971918987d056b71b963e SHA512 db8855bd509b16eb6a961c52a93fd08eb6700ebd831cb539b0838e763b30f033c860b0a5eab109541cae112717588d476b385418bb2d379277bc279b636343b9 WHIRLPOOL a0e1c3737a721b94f330de175248cd64f8d033987dc628c7f20586fb99d3a4e06df178b51cd4c9c9ed0979708a4feba212061976c31883c9cfa8fe641bd54672
+MISC ChangeLog-2015 8578 SHA256 fe16dfd6f0e0f1c799baadbaed9852d321d94111d7a9683d8f426fdf6ab12f1f SHA512 d2ccbb32f7a96aa2febb65c5c92df807bb7d14cf457e00b4915622c3fee66ea0773419ef98eb67441ee26103540f32dd7cbc8579fcc043673f0605cb3e2d8f69 WHIRLPOOL b4cae98998b2d77dacdbd10f7ea9bf63cb0a4f44f0234c6853fb286bde8472fc9929f90ccc0419ef3fb64db05fc6fea4c56676d79fe66df06dac1192d664d1a5
+MISC metadata.xml 803 SHA256 31ed66a5bacc6e6326cd319611c136a877c081de4defa6a8f405ed7e048694e0 SHA512 9d15deede88ee114e0ade78665996cfaf09443f8629b08415ae0bd1c486ff6a239567056aacde2d49883066d4d8dc3690a397d170effbfe5e4aa5cf7d24cbca8 WHIRLPOOL c98a305fafdfaefb269c40a87344f1edc8f48f1d0daa69aab3adf5d668f080e15c2215bf3b9d7d3566e335b797ff11628173bd8a5e557aace5ce71c95f911dbd
diff --git a/media-sound/xwax/files/xwax-etc-security-limits.conf b/media-sound/xwax/files/xwax-etc-security-limits.conf
new file mode 100644
index 000000000000..7ae166ec18f8
--- /dev/null
+++ b/media-sound/xwax/files/xwax-etc-security-limits.conf
@@ -0,0 +1 @@
+@xwax - rtprio 80
diff --git a/media-sound/xwax/metadata.xml b/media-sound/xwax/metadata.xml
new file mode 100644
index 000000000000..762283d3c0c5
--- /dev/null
+++ b/media-sound/xwax/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="alsa">Adds support for ALSA audio input/output.</flag>
+		<flag name="jack">Adds support for audio input/output via the JACK Audio Connection Kit.</flag>
+		<flag name="oss">Adds support for OSS (open sound system) audio input/output.</flag>
+		<flag name="cdda">Sets runtime dependencies to support decoding audio from a compact disc.</flag>
+		<flag name="mp3">Sets runtime dependencies to support decoding MP3 audio.</flag>
+		<flag name="fallback">Sets runtime dependencies to support decoding "other" audio files.</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/xwax/xwax-1.5.ebuild b/media-sound/xwax/xwax-1.5.ebuild
new file mode 100644
index 000000000000..677a355aceb5
--- /dev/null
+++ b/media-sound/xwax/xwax-1.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs user
+
+DESCRIPTION="Digital vinyl emulation software"
+HOMEPAGE="http://xwax.org/"
+SRC_URI="http://xwax.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="alsa jack oss cdda mp3 +fallback"
+REQUIRED_USE="|| ( cdda mp3 fallback )
+	|| ( alsa jack oss )"
+
+RDEPEND="sys-libs/glibc
+	sys-libs/pam
+	media-libs/libsdl
+	media-libs/sdl-ttf
+	media-fonts/dejavu
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	cdda? ( media-sound/cdparanoia )
+	mp3? ( media-sound/mpg123 )
+	fallback? ( virtual/ffmpeg )"
+DEPEND="${RDEPEND}"
+
+DOCS="README CHANGES"
+
+src_prepare() {
+	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
+	# the Makefile
+	# Also remove the dependency on the .version target so we don't need
+	# git just to build
+	sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \
+		-e 's/^xwax\.o:.*\.version//' \
+		Makefile || die "sed failed"
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		--prefix "${EROOT}usr" \
+		$(use_enable alsa) \
+		$(use_enable jack) \
+		$(use_enable oss)
+}
+
+src_compile() {
+	# EXECDIR is the default directory in which xwax will look for
+	# the 'xwax-import' and 'xwax-scan' scripts
+	emake EXECDIR="\$(BINDIR)" VERSION="${PV}" xwax
+}
+
+pkg_preinst() {
+	enewgroup ${PN}
+}
+
+src_install() {
+	# This is easier than setting all the environment variables
+	# needed, running the sed script required to get the man directory
+	# correct, and removing the GPL-2 after a 'make install' run
+	dobin xwax || die "failed to install xwax"
+	newbin scan xwax-scan || die "failed to install xwax-scan"
+	newbin import xwax-import || die "failed to install xwax-import"
+	doman xwax.1 || die "failed to install man page"
+
+	dodoc ${DOCS} || die "failed to install docs"
+
+	insinto "/etc/security/limits.d"
+	newins "${FILESDIR}/xwax-etc-security-limits.conf" xwax.conf
+}
+
+pkg_postinst() {
+	elog "Be sure to add any users that will be using ${PN} to the"
+	elog "\"${PN}\" group. Doing so will allow processes that user"
+	elog "runs to request realtime priority."
+}
diff --git a/media-sound/xwax/xwax-1.6.ebuild b/media-sound/xwax/xwax-1.6.ebuild
new file mode 100644
index 000000000000..89ce08abad33
--- /dev/null
+++ b/media-sound/xwax/xwax-1.6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs user
+
+DESCRIPTION="Digital vinyl emulation software"
+HOMEPAGE="http://xwax.org/"
+SRC_URI="http://xwax.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="alsa jack oss cdda mp3 +fallback"
+REQUIRED_USE="|| ( cdda mp3 fallback )
+	|| ( alsa jack oss )"
+
+RDEPEND="sys-libs/glibc
+	sys-libs/pam
+	media-libs/libsdl
+	media-libs/sdl-ttf
+	media-fonts/dejavu
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	cdda? ( media-sound/cdparanoia )
+	mp3? ( media-sound/mpg123 )
+	fallback? ( virtual/ffmpeg )"
+DEPEND="${RDEPEND}"
+
+DOCS="README CHANGES"
+
+src_prepare() {
+	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
+	# the Makefile
+	# Also remove the dependency on the .version target so we don't need
+	# git just to build
+	sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \
+		-e 's/^xwax\.o:.*\.version//' \
+		Makefile || die "sed failed"
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		--prefix "${EROOT}usr" \
+		$(use_enable alsa) \
+		$(use_enable jack) \
+		$(use_enable oss)
+}
+
+src_compile() {
+	# EXECDIR is the default directory in which xwax will look for
+	# the 'xwax-import' and 'xwax-scan' scripts
+	emake EXECDIR="\$(BINDIR)" VERSION="${PV}" xwax
+}
+
+pkg_preinst() {
+	enewgroup ${PN}
+}
+
+src_install() {
+	# This is easier than setting all the environment variables
+	# needed, running the sed script required to get the man directory
+	# correct, and removing the GPL-2 after a 'make install' run
+	dobin xwax || die "failed to install xwax"
+	newbin scan xwax-scan || die "failed to install xwax-scan"
+	newbin import xwax-import || die "failed to install xwax-import"
+	doman xwax.1 || die "failed to install man page"
+
+	dodoc ${DOCS} || die "failed to install docs"
+
+	insinto "/etc/security/limits.d"
+	newins "${FILESDIR}/xwax-etc-security-limits.conf" xwax.conf
+}
+
+pkg_postinst() {
+	elog "Be sure to add any users that will be using ${PN} to the"
+	elog "\"${PN}\" group. Doing so will allow processes that user"
+	elog "runs to request realtime priority."
+}
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
new file mode 100644
index 000000000000..06e40537b0db
--- /dev/null
+++ b/media-sound/yoshimi/Manifest
@@ -0,0 +1,7 @@
+DIST yoshimi-1.4.1.tar.bz2 3674539 SHA256 9e844db60c0080fa26767e2cb5ed24097240e0e5ed65760740cf98c505e97a8c SHA512 2ae98e4cfb0a24f7777a76c971fae9b12244624d18d1dd1cb3142af421be9f55874aac658b666fe29367aa75902895b9ec5a608939ab44b2158bdc5ef7a59499 WHIRLPOOL 5dc7e2024681ef2f916b6fdf900d6e4ab51ddec40e7cda1c285cb0c3d8598919ceb753976fbb765d620070782a6fdba1cb1b155759dc49b8ecb7c522346dce11
+DIST yoshimi-1.5.1.1.tar.bz2 4035895 SHA256 cace0063b9c31f39b1437fb61600991e7463eae893ca457e0ca1236057b54abe SHA512 f7f47835aceb30ca889ec536f922a30ef3d1e4d306c666c91b984a314781e5245045aab216be3dbdca95250f8e941229db799afd6b5fa079b61e75fd92ee1c28 WHIRLPOOL 1291ba2ee28c1f7a9309baa1457e2e26337cdf693c221707f9a5618c31408453ceb2e1cde291fe472aea03cca83ff86509e8ebfd0ba6cdeb0a79d2b80abed82b
+EBUILD yoshimi-1.4.1.ebuild 1019 SHA256 590ef5bf95099b2a30f322ac1b2b855e4a34a361b254d1e1162858215a363cb5 SHA512 363c24a42f57dbe9d49eb4b3110ba7a639ec4792ca03da54a42e33d94dbc169ac32af97d6dfb777adaf91595e25f463f5563beea0d79eeafa57fa770716efb73 WHIRLPOOL 7df02f48efea8eeba2c19fbe4578084982f0a179f329b23d5abb860f43ce6b00e9466edfa880ea0a554db06e9acabc13fa7aaa298c54cac20261492606757ded
+EBUILD yoshimi-1.5.1.1.ebuild 1036 SHA256 024e5339897ddc167208a6d8ddc6636c3b223c3f441995c9444e9c2bc0c56824 SHA512 35f91f6cade5de16411b2e5639ade8ef325bd195cce129456aa91391d184c002a4c1dbf665eca7b561681effb153c1d66a80369eda8cdd253be174bbb6241e70 WHIRLPOOL 9cf38e7fb22d337082d03c46e514aafa2e76c3290147c91ac5f022790164a8cd5357b529d0537ece345bad27d21b6605311d347845192f4a4d1af2abf7cd07f8
+MISC ChangeLog 4219 SHA256 a96968cade2e07949d8b96b344c964da950559003b4efd2bff4bcb203d6d7ee0 SHA512 26560c66ac68675e9601ef283e9dfc504279fef29819bb0cff824eb63855536722268a386404ee9f3f50086a1abcbc172a65281e6f35cdb76703c0f12e621991 WHIRLPOOL c3295e955cc307d0e85a0c0b38595e4510dbbb0f6ee8f99289d4a7bec3887a6acbe5cafa03f0a8b21549a043983ee44d8c3d2c0d026017755634f97d4a03d9e6
+MISC ChangeLog-2015 2829 SHA256 5302a488dcc16f70287e86635a62ec9bb17c74aa1a777f06c831205b081d56f2 SHA512 c3f6e3272e9c9eadedbfe38f469623713dff1fc3bd85edc4081d7917f2d979781826e47d70713303e49011b48cb6c99cb8080adb162c6e5a839ef8296190e32c WHIRLPOOL d2a1d3792ecbf4caa8f1380a457644c6bbd7e9c60737fc2c07073bdf4487b899bbcbfc086d217264a5d22c2a2fafff90922931391260d61ba67437c87ca65b83
+MISC metadata.xml 397 SHA256 c667c69f33cc592d85965eaab71691b211a0496de885e9a0fa8a8954eb501460 SHA512 1fbabe7286878f7ae5877cf95384b7574a8cd7656c6dc8296608af2bb2bd0004379b6f7fe920005baa00d00687b56511f90b79709ff71145384cb748bd45f231 WHIRLPOOL aaf92f009cb73c6fd53ab8099f36a9de563588d462b5c9d30e9865ae8a19d917d8ecee5bd46cc63ffed03d3f69b28e4d1b2fa794d2cd37e43b0d9de9053f58e7
diff --git a/media-sound/yoshimi/metadata.xml b/media-sound/yoshimi/metadata.xml
new file mode 100644
index 000000000000..cda9c5467dbb
--- /dev/null
+++ b/media-sound/yoshimi/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="lv2">Add support for Ladspa V2</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">yoshimi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/yoshimi/yoshimi-1.4.1.ebuild b/media-sound/yoshimi/yoshimi-1.4.1.ebuild
new file mode 100644
index 000000000000..7c8f3e4ee739
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.4.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A software synthesizer based on ZynAddSubFX"
+HOMEPAGE="http://yoshimi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lv2"
+
+RDEPEND="
+	>=dev-libs/mini-xml-2.5
+	>=media-libs/alsa-lib-1.0.17
+	media-libs/fontconfig
+	media-libs/libsndfile
+	>=media-sound/jack-audio-connection-kit-0.115.6
+	sci-libs/fftw:3.0
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	x11-libs/cairo[X]
+	x11-libs/fltk:1[opengl]
+	lv2? ( media-libs/lv2 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+"
+
+CMAKE_USE_DIR="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	mv Change{l,L}og || die
+	sed -i \
+		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
+		-e "s:lib/lv2:$(get_libdir)/lv2:" \
+		src/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBuildLV2Plugin=$(usex lv2)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild b/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
new file mode 100644
index 000000000000..b33e6064a78d
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A software synthesizer based on ZynAddSubFX"
+HOMEPAGE="http://yoshimi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lv2"
+
+RDEPEND="
+	>=dev-libs/mini-xml-2.5
+	>=media-libs/alsa-lib-1.0.17
+	media-libs/fontconfig
+	media-libs/libsndfile
+	>=media-sound/jack-audio-connection-kit-0.115.6
+	sci-libs/fftw:3.0
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	x11-libs/cairo[X]
+	x11-libs/fltk:1[opengl]
+	lv2? ( media-libs/lv2 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+"
+
+CMAKE_USE_DIR="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	mv Change{l,L}og || die
+	sed -i \
+		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
+		-e "s:lib/lv2:$(get_libdir)/lv2:" \
+		src/CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLV2Plugin=$(usex lv2)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
new file mode 100644
index 000000000000..a04e42c9970f
--- /dev/null
+++ b/media-sound/zynaddsubfx/Manifest
@@ -0,0 +1,8 @@
+AUX zynaddsubfx-2.5.2-docs.patch 536 SHA256 d121851684dfc0dcd4d39dbd915a64ae657d3517f4853ecb6233d83857ebd416 SHA512 a2ac81dbc36c44678733fd43569a9cc1431d1491a5ef5d43253db6086107e49feaf4154b938b8c05111a5174361351338f0dc9db377218b1805598e1780f6d18 WHIRLPOOL a828e09e640af5d0e88b89ed7e5f99cf6a426a87e46173d1866256f916b192807dcbed4715df47a05c3ab7f9fe4ded171afd4d912a00512e9186e0422b447e08
+DIST zynaddsubfx-3.0.1.tar.bz2 6811606 SHA256 a8017f382be5af9e46e6e8771fb7d7c1fd2e480cf099bbb0c29606b217dd32e2 SHA512 49592e46872ae966461dfc5f7cbd2ebcf3f3a6d43139f6cd0eba65e098fb33370840c0e1f4f224a18adfc97eae9fa5583eca6a48f43b9200d5522cc413b0ce43 WHIRLPOOL 3bfe976e24f10bd94b6b3c1c994a505fcdb65d993cd76360c5b477567a10a3b864f155a035b538d081607b90ab71ed96a116249399dbda6050ce068c8dd5458b
+DIST zynaddsubfx-3.0.2.tar.bz2 7979193 SHA256 95defd8250b79fbe7fb69be860df6df05d82263cabf83cf53b391486e910b926 SHA512 96d1df903a6afbaee991221ca30b21a20d97bc6d1cbe5c9fef94f2d1c3fb88e0294c263aec282559885d6e2f5841ad2c80d863af9f58f161791a33a9c0c08f57 WHIRLPOOL 91fbe3c1ab0d424fc244f8454ecbdec2152f676fbd296424555c876963cc80730e6f79c5c4b54bde1b24a02a73ed223f42f89d96b160bf1ad7fd21297ff09ffc
+EBUILD zynaddsubfx-3.0.1-r1.ebuild 1571 SHA256 0fdc35cb7a630832ebd6a65a1da7a8565ca3e6f10ab30b2a0876d93d70bcf8b5 SHA512 163faa12e7e0028d9c426e1b2668a6c71f9f2362ba1057d3a943ac3dffcf5dfdf744519b906d6a6377464215eb4e196543f99082436ef9f612931f9ddcd3fdfd WHIRLPOOL 794a82526e019b8d64892e749a31221b3f741f4149aecf3fe5bc22238ad25cedafb42770df29b3c5613d1f51b1a8d051caa23b445b0c1198074ab116ce577acd
+EBUILD zynaddsubfx-3.0.2.ebuild 1573 SHA256 18b1ed6b59f79e60e695b08f6d0849793ee3edbbba704b334a10b8cde5885bb4 SHA512 6ef70dd65df30cd77c4f278248e7dfe83f811d7b26af7bc58804016cd8c08d0df14f2ade82c3e43d6d4e6c411b3ed6a336b3d1a9f9d90b7be14c9185ac531e49 WHIRLPOOL 5efd66cd897a2425a772628e90b467546d4c5959da7aa3a381df1e771fa7231d1fa74ef071e43e6073428d3ae7f55c2ddec9566ce65f8b5183505184d48b9cd3
+MISC ChangeLog 4167 SHA256 b955218b9bbc895b5e2bd7e1623627203a612b4ca066b7fcb3c68a359f79c535 SHA512 c2859a57917e9bc438141a6c9e7f837358d8a3fd9b458c28226ffef2e43f3996676c1d5c8e6e5317a445039006df40eb79fb23b376d18a859b74fa0e225758c5 WHIRLPOOL c836e5664e2497fbe4cd5d8f28a4f5c1633a8f24cba1a9b9ef4598c401019953a911c1200a5ee87ce582ec84f6c411b0aedb4cd3bf8aec2f8cc87c0844baa5a8
+MISC ChangeLog-2015 8272 SHA256 db0a05d195e9028d4fc702220dd0c2237a4a2d016a1568439131996d3cef5c6d SHA512 3932e1ece3b49d63df806776a9f0ce0f686a7ceb4088e1fe34b351e21f44881e9b09a9958fa41d0135c69740ee216f951af7a921023d497b9e963ecbdcf1afc6 WHIRLPOOL 11f72238677e537c82afcbbd3b288b0caaa584bbc1b4121221779485e492f434c3b6541fa460ebcdfaa8d68e59409559811af5aa37e856353fea39650525d604
+MISC metadata.xml 340 SHA256 80481e2128dfd34756b95f733b10cf085d9ee6b80b7c9694690ac6d0a27e9347 SHA512 c59fcb3065e3b34c3e3e23a8db07dbe245a8addcf7a6958834b5715bc0a8319c8d0cfa3b40925e7e9838df031843a5218bbcf91721ce57bee2632111dc27d4a3 WHIRLPOOL 9b7c26de55418a7b9320a296d18f8190c694199860f032802a8f7080004ba7395e5a023f8f8234c56b80be68f01e1a59eca394372ce7e5aaa8f37ac021c1095a
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch
new file mode 100644
index 000000000000..e3cc2784cdaa
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch
@@ -0,0 +1,14 @@
+Index: zynaddsubfx-2.5.2/CMakeLists.txt
+===================================================================
+--- zynaddsubfx-2.5.2.orig/CMakeLists.txt
++++ zynaddsubfx-2.5.2/CMakeLists.txt
+@@ -28,9 +28,6 @@ include(CTestConfig.cmake)
+ #Currently the only directory that uses cmake
+ add_subdirectory(src)
+ 
+-install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
+-	DESTINATION share/doc/zynaddsubfx
+-	)
+ install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop
+     DESTINATION share/applications)
+ install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/metadata.xml b/media-sound/zynaddsubfx/metadata.xml
new file mode 100644
index 000000000000..bca5422640b4
--- /dev/null
+++ b/media-sound/zynaddsubfx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">zynaddsubfx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.1-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..0060de73b304
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils cmake-utils flag-o-matic multilib
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="alsa +fltk jack lash"
+
+RDEPEND=">=dev-libs/mini-xml-2.2.1
+	sci-libs/fftw:3.0
+	media-libs/liblo
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )"
+#	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+# Upstream uses the following preferences: alsa > jack > portaudio
+# At least one of them must be enabled
+# We do not support portaudio, so if alsa is disabled force jack.
+REQUIRED_USE="!alsa? ( jack )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-docs.patch
+)
+
+DOCS=( ChangeLog HISTORY.txt README.adoc )
+
+src_configure() {
+	append-cxxflags "-std=c++11"
+	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
+	mycmakeargs=(
+		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
+		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
+		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
+		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
+		-DPluginLibDir=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/instruments/*
+}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.2.ebuild
new file mode 100644
index 000000000000..b07ade848065
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils cmake-utils flag-o-matic multilib
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa +fltk jack lash"
+
+RDEPEND=">=dev-libs/mini-xml-2.2.1
+	sci-libs/fftw:3.0
+	media-libs/liblo
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )"
+#	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+# Upstream uses the following preferences: alsa > jack > portaudio
+# At least one of them must be enabled
+# We do not support portaudio, so if alsa is disabled force jack.
+REQUIRED_USE="!alsa? ( jack )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-docs.patch
+)
+
+DOCS=( ChangeLog HISTORY.txt README.adoc )
+
+src_configure() {
+	append-cxxflags "-std=c++11"
+	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
+	mycmakeargs=(
+		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
+		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
+		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
+		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
+		-DPluginLibDir=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/instruments/*
+}