proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

1990 files changed, 65260 insertions, 0 deletions

diff --git a/media-sound/SmarTagger/Manifest b/media-sound/SmarTagger/Manifest
new file mode 100644
index 000000000000..719ed1552543
--- /dev/null
+++ b/media-sound/SmarTagger/Manifest
@@ -0,0 +1 @@
+DIST SmarTagger-0.1.tar.gz 3980 SHA256 f7fde56c5495068c2451189b7374f025f5d8969c7cb5d6d459912bf2c2fcc016
diff --git a/media-sound/SmarTagger/SmarTagger-0.1-r1.ebuild b/media-sound/SmarTagger/SmarTagger-0.1-r1.ebuild
new file mode 100644
index 000000000000..38dc3cb28475
--- /dev/null
+++ b/media-sound/SmarTagger/SmarTagger-0.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+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"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${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..b5e5f691ef67
--- /dev/null
+++ b/media-sound/SmarTagger/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..b54d4ba374e0
--- /dev/null
+++ b/media-sound/a2jmidid/Manifest
@@ -0,0 +1 @@
+DIST a2jmidid-8.tar.bz2 162764 SHA256 2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f SHA512 6182a295462ae587461ca395d85c956523bfecd113d031d0ae8a9f304fc3d41f6a5097b3a1a9fc06bd0eef7fe08a4b3c116a3361ff9e63468c3e40b736215592 WHIRLPOOL 04408b6eb3460a522da6009e142fa113fd95c20efbce6c1fcca30a2966478950fc3d5c061694bb533fd5f3261f2d26f22b507bff5fb73050f2fb57a23c6c8936
diff --git a/media-sound/a2jmidid/a2jmidid-8-r1.ebuild b/media-sound/a2jmidid/a2jmidid-8-r1.ebuild
new file mode 100644
index 000000000000..418ee3427075
--- /dev/null
+++ b/media-sound/a2jmidid/a2jmidid-8-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+RDEPEND="media-libs/alsa-lib
+	media-sound/jack-audio-connection-kit
+	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/a2jmidid-8.ebuild b/media-sound/a2jmidid/a2jmidid-8.ebuild
new file mode 100644
index 000000000000..61d53c3081d5
--- /dev/null
+++ b/media-sound/a2jmidid/a2jmidid-8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+PYTHON_DEPEND="2"
+NO_WAF_LIBDIR=1
+
+inherit python toolchain-funcs waf-utils
+
+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"
+
+RDEPEND="media-libs/alsa-lib
+	media-sound/jack-audio-connection-kit
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS README NEWS internals.txt)
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+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_convert_shebangs -r 2 "${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..b6dce26b0a20
--- /dev/null
+++ b/media-sound/a2jmidid/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer>
+		<email>l33tmmx@gmail.com</email>
+		<name>Jouni Rinne</name>
+	</maintainer>
+</pkgmetadata>
+
diff --git a/media-sound/aacgain/Manifest b/media-sound/aacgain/Manifest
new file mode 100644
index 000000000000..e390188acba4
--- /dev/null
+++ b/media-sound/aacgain/Manifest
@@ -0,0 +1,4 @@
+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
diff --git a/media-sound/aacgain/aacgain-1.9.ebuild b/media-sound/aacgain/aacgain-1.9.ebuild
new file mode 100644
index 000000000000..3c89e56e0e14
--- /dev/null
+++ b/media-sound/aacgain/aacgain-1.9.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 digital music files using the Replay Gain algorithm"
+HOMEPAGE="http://aacgain.altosdesign.com/"
+SRC_URI="http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
+	http://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.8+glibc-2.10.patch b/media-sound/aacgain/files/aacgain-1.8+glibc-2.10.patch
new file mode 100644
index 000000000000..df48cfdae25d
--- /dev/null
+++ b/media-sound/aacgain/files/aacgain-1.8+glibc-2.10.patch
@@ -0,0 +1,19 @@
+diff -ur aacgain-1.8.orig/mpeg4ip/include/mpeg4ip.h aacgain-1.8/mpeg4ip/include/mpeg4ip.h
+--- aacgain-1.8.orig/mpeg4ip/include/mpeg4ip.h	2008-11-08 16:39:36.000000000 +0200
++++ aacgain-1.8/mpeg4ip/include/mpeg4ip.h	2009-07-10 20:59:51.000000000 +0300
+@@ -120,6 +120,7 @@
+ #endif
+ #include <sys/param.h>
+ 
++/*
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -127,6 +128,7 @@
+ #ifdef __cplusplus
+ }
+ #endif
++*/
+ 
+ #define OPEN_RDWR O_RDWR
+ #define OPEN_CREAT O_CREAT 
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..34f86b3868ae
--- /dev/null
+++ b/media-sound/aacgain/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>
+		<email>sbriesen@gentoo.org</email>
+		<name>Stefan Briesenick</name>
+	</maintainer>
+	<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..89b6e9b3733a
--- /dev/null
+++ b/media-sound/aacplusenc/Manifest
@@ -0,0 +1 @@
+DIST aacplusenc_0.17.5.tar.gz 547953 RMD160 c59efc3a3f8126b4650b304a043f176b80078d82 SHA1 1f862538c6f3ead4c5440d2649ecff4645c32a07 SHA256 318df58a86ac0647d6bfbcd8766fe301ad2ed08ffb4ef4e016e088f4dceb1669
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..cacda23df4cf
--- /dev/null
+++ b/media-sound/aacplusenc/aacplusenc-0.17.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="High-Efficiency AAC (AAC+) Encoder"
+HOMEPAGE="http://teknoraver.net/software/mp4tools/"
+SRC_URI="http://ppa.launchpad.net/teknoraver/ppa/ubuntu/pool/main/a/${PN}/${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"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+
+	# Fix linking order (bug #393137)
+	epatch "${FILESDIR}"/${P}-libm.patch
+
+	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..ae573a60407f
--- /dev/null
+++ b/media-sound/aacplusenc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
new file mode 100644
index 000000000000..c1b475c21b73
--- /dev/null
+++ b/media-sound/abcde/Manifest
@@ -0,0 +1,3 @@
+DIST abcde-2.5.4.tar.gz 104229 SHA256 85b679b970e728a986487adcbff7c51eb0e72f9fa10c4450521f8e029fa6e591 SHA512 be3c8f697873b65888a37ea6209e161a6fc7bbe26c6e139b211b1fbcb233d3e250b21f6fad2114962ca4dcce79240e2cec51f69ce47549c737071a6122694791 WHIRLPOOL ae5ea868c7d66f8bd367f0a9724546721524b84ae0478fb9bd2ae64b1c1b358a24bfd8d0303ce3012c2bcce40d3b97a1cbcedcb13f8d4dea2ae6cd988d6c0921
+DIST abcde-2.6.tar.gz 105609 SHA256 683ea7e215142784a28afcda4a18d9a2b8f7ef7bcd9c2881ee110a3b86784c78 SHA512 cbd50b4991e80a47e9d98b7681c3dc85266969854b5e5b8d4e622f5abf4384271d40a827903fdc0e477906863b769d6f574bfdd9744a898e425818c53de70514 WHIRLPOOL fd8ca79f76a20be994f4d28f14583836dfb1bc285d7c3c44d0941388d44befe1bc833af56a51e482d3ac0c0bbbbb90535565f8e30a537c2a5ee73a096f516c47
+DIST abcde-2.7.tar.gz 140039 SHA256 0148698a09fedcbae37ee9da295afe411a1190cf8ae224b7814d31b5bf737746 SHA512 0e5c931cddf283cb4444136e4ad43c996d8f69c990a76ed032ad9863c8de54ad9a9896a2de1a500184690b72ffb35ab2e2f859f12a19f15f093ef016ff69c61e WHIRLPOOL da88cef66740720dffc5175e2777a5da7cf014a64eefcf582ee734949edf19df858e3d9a7ab49295e0d2e2cc7017eb6ccb5345fa123be780c30744be5cf6a171
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..73ea751fec54
--- /dev/null
+++ b/media-sound/abcde/abcde-2.5.4-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A command line CD encoder"
+HOMEPAGE="http://code.google.com/p/abcde/"
+SRC_URI="http://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.6.ebuild b/media-sound/abcde/abcde-2.6.ebuild
new file mode 100644
index 000000000000..f89360b4acd4
--- /dev/null
+++ b/media-sound/abcde/abcde-2.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A command line CD encoder"
+HOMEPAGE="http://abcde.einval.com/"
+SRC_URI="http://abcde.einval.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+# Enable MP3 related flags by default
+IUSE="aac cdparanoia cdr flac +id3tag +lame musepack musicbrainz normalize opus 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-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 )
+	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 )"
+
+src_prepare() {
+	sed -i -e 's:etc/abcde.co:etc/abcde/abcde.co:g' abcde || die
+}
+
+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.7.ebuild b/media-sound/abcde/abcde-2.7.ebuild
new file mode 100644
index 000000000000..b5f95361186a
--- /dev/null
+++ b/media-sound/abcde/abcde-2.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A command line CD encoder"
+HOMEPAGE="http://abcde.einval.com/"
+SRC_URI="http://abcde.einval.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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() {
+	sed -i 's:etc/abcde.co:etc/abcde/abcde.co:g' abcde || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" etcdir="${D}"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..00db7c748975
--- /dev/null
+++ b/media-sound/abcde/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..4a7d4d4e7f3a
--- /dev/null
+++ b/media-sound/abcm2ps/Manifest
@@ -0,0 +1,4 @@
+DIST abcm2ps-6.6.22.tar.gz 298108 SHA256 be3dde653a349c8875dd1c98810c7a5263ddaaee9bc99085a41749c3e53ce560 SHA512 fb7e526e7036456df8f8826c9d552de1ff9b007cdf5b5a623ac164a346cad9af07d26ed081d8693ff549cfde37fc541a02eea2d8cb45f4902b66ac05ab96f939 WHIRLPOOL e7d82037462f60ec4c9f6a8411c109eaeebae09373169d5d3b751d789c2c221d88a7062a9b6750e25b8062f999ea213f0c3d031390ea750dcfe9868469424363
+DIST abcm2ps-8.5.2.tar.gz 231017 SHA256 466446ef3007a3bbedf01667e647ba66fcdd81e3bc714bfe5b13a1c16f536c69 SHA512 605ad9eed7470ab89ce87cb0192d58cdfce6dd481b787f58c829c8cfed999fb11ffccbc1fe0ad325a311eabf40405f1ae676c7c64ce84db0ecaf9d58b509b293 WHIRLPOOL 06ad4b92557cd65fcf18b80a40aae36b688137793397cf9aef8e286b73af1218cedacfcbaff8e6e4bd29ab78aac158ef174dfc3eb7cbe00ae560a54cd169636e
+DIST abcm2ps-8.8.3.tar.gz 238617 SHA256 7a802a535ccb92e8ff0231ba70fdc9e522f9fbadf00d5a22c0a833853730db17 SHA512 61e6ebbf822a48d558e78e876ed123a7ed5125d858aae6de30b16906c3023509caaa52eeea9123c59fed3128d079965fe0bc95b2603c444bb4d01cfda22d24b3 WHIRLPOOL 5c14ee3c86714c94a65ffea4b6397e891c954f771523df028691d034f549d96d63324e3a7b2f09bd8856ccfd2567a8163d632864d0e9ae4ded1caa3e7c71fa5e
+DIST transpose_abc.pl 21045 SHA256 bd6960872bfbc9f71f183f36d533ea33b8cf62a6027b447f0b0b8adfa25a2848 SHA512 dc2623608a7b59d7e0c4d25160e69f696f170e9938dc3e035edbaf6f0163b4c6139892ec8734ea2aaba997507dcf32208562e898690600dc3c199046d4d151f3 WHIRLPOOL 81e327bbd76b40826adab06f7756c79c60289b21432b792c848db3ba1354528fa4f1a074cba890b6087cfac6e712427c6cbb2c9e6679c8ced22c362f6ec005f3
diff --git a/media-sound/abcm2ps/abcm2ps-6.6.22.ebuild b/media-sound/abcm2ps/abcm2ps-6.6.22.ebuild
new file mode 100644
index 000000000000..36b5d0c2c545
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-6.6.22.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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_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.5.2.ebuild b/media-sound/abcm2ps/abcm2ps-8.5.2.ebuild
new file mode 100644
index 000000000000..d700dad14e8f
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-8.5.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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.8.3.ebuild b/media-sound/abcm2ps/abcm2ps-8.8.3.ebuild
new file mode 100644
index 000000000000..d6c38320df21
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-8.8.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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..9e9e140a45df
--- /dev/null
+++ b/media-sound/abcm2ps/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..09290d354e6b
--- /dev/null
+++ b/media-sound/abcmidi/Manifest
@@ -0,0 +1,2 @@
+DIST abcMIDI-2014-12-25.zip 515102 SHA256 eb58236eb80c4b454c16c7df36ebb38712f60074ebbd0cc5cc992fb2ff6bc3cc SHA512 3801a35c23d3bc145c50d652f61c2ffd245cb78d080836985dd6f495d37a31742b2bfd372c7d8ccf12d75fd2d7ccd70a119eb03f2f7abdc45ff666b26d535968 WHIRLPOOL 94f15fc6689da6f7b91b9601bf329b86bc5024ca1e24b8fd6189917390715c701d75cbaa529430cb5a295703d2f2b74393336f5e20365d446c7027e417e6e562
+DIST abcMIDI-2015-02-22.zip 515257 SHA256 56576371a551f7a83d5eb60578fb0af4b17e55c27ebbd78431b8919b7259fb60 SHA512 a9b686dcbcbc63e5ca2284bf4a355718aeca12853b3b0a01a578bfd2b9e2c1c4ede5a7a33c413882e9e0254349591a82a7e13bfb2e1c4e9b2b967fcb089376e2 WHIRLPOOL 15661abcd8fbef72d3e04af3181251575def6d5942fbd38c0a133e95d82af1f903ef2b03b302c0dc7c1a9703243c9a96470dff459f87c2f2a1446b37c869559b
diff --git a/media-sound/abcmidi/abcmidi-2014.12.25.ebuild b/media-sound/abcmidi/abcmidi-2014.12.25.ebuild
new file mode 100644
index 000000000000..323b7f398e69
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2014.12.25.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator autotools
+
+MY_P="abcMIDI-$(replace_all_version_separators '-')"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="http://abc.sourceforge.net/abcMIDI/"
+SRC_URI="http://ifdo.pugmarks.com/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2011.10.19-install.patch
+	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-2015.02.22.ebuild b/media-sound/abcmidi/abcmidi-2015.02.22.ebuild
new file mode 100644
index 000000000000..323b7f398e69
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2015.02.22.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator autotools
+
+MY_P="abcMIDI-$(replace_all_version_separators '-')"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="http://abc.sourceforge.net/abcMIDI/"
+SRC_URI="http://ifdo.pugmarks.com/~seymour/runabc/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2011.10.19-install.patch
+	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-2011.10.19-install.patch b/media-sound/abcmidi/files/abcmidi-2011.10.19-install.patch
new file mode 100644
index 000000000000..5fa8ca2a5112
--- /dev/null
+++ b/media-sound/abcmidi/files/abcmidi-2011.10.19-install.patch
@@ -0,0 +1,24 @@
+--- abcmidi/Makefile.in.orig
++++ abcmidi/Makefile.in
+@@ -140,17 +140,10 @@
+ 	rm *.o ${binaries}
+ 
+ install: abc2midi midi2abc abc2abc mftext midicopy yaps abcmatch
+-	test -d $(DESTDIR)${prefix}/${bindir} || mkdir -p $(DESTDIR)${prefix}/${bindir}
+-	$(INSTALL) -m 755 ${binaries} $(DESTDIR)${prefix}/${bindir}
+-
+-	# install documentation
+-	test -d $(DESTDIR)${PREFIX}/share/doc/abcmidi || mkdir -p $(DESTDIR)${prefix}/${docdir}
+-	$(INSTALL) -m 644 doc/*.txt $(DESTDIR)${prefix}/${docdir}
+-	$(INSTALL) -m 644 doc/AUTHORS $(DESTDIR)${prefix}/${docdir}
+-	$(INSTALL) -m 644 doc/CHANGES $(DESTDIR)${prefix}/${docdir}
+-	$(INSTALL) -m 644 VERSION $(DESTDIR)${prefix}/${docdir}
++	test -d $(DESTDIR)${bindir} || mkdir -p $(DESTDIR)${bindir}
++	$(INSTALL) -m 755 ${binaries} $(DESTDIR)${bindir}
+ 
+ 	# install manpages
+-	test -d $(DESTDIR)${prefix}/${mandir} || mkdir -p $(DESTDIR)${prefix}/${mandir};
+-	$(INSTALL) -m 644 doc/*.1 $(DESTDIR)${prefix}/${mandir}
++	test -d $(DESTDIR)${mandir} || mkdir -p $(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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/abcmidi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/adplay/Manifest b/media-sound/adplay/Manifest
new file mode 100644
index 000000000000..a3548c3769d6
--- /dev/null
+++ b/media-sound/adplay/Manifest
@@ -0,0 +1 @@
+DIST adplay-1.7.tar.bz2 264340 SHA256 2c62cf763de301a05d446655380465743c5b81fb027d9791996e5eac5bf6fdc6
diff --git a/media-sound/adplay/adplay-1.7.ebuild b/media-sound/adplay/adplay-1.7.ebuild
new file mode 100644
index 000000000000..c84830cac6cc
--- /dev/null
+++ b/media-sound/adplay/adplay-1.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_configure() {
+	econf \
+		$(use_enable alsa output-alsa) \
+		$(use_enable ao output-ao) \
+		--disable-output-esound \
+		$(use_enable oss output-oss) \
+		$(use_enable sdl output-sdl)
+}
diff --git a/media-sound/adplay/metadata.xml b/media-sound/adplay/metadata.xml
new file mode 100644
index 000000000000..88d380c3ac81
--- /dev/null
+++ b/media-sound/adplay/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..4c76e9e82651
--- /dev/null
+++ b/media-sound/aeolus/Manifest
@@ -0,0 +1,3 @@
+DIST aeolus-0.8.1.tar.bz2 59676 SHA256 33cd33a3aad11123fa433ebd37fc8a5c13640d6ea059d3f1bf4f05c0f353c37f
+DIST aeolus-0.8.4.tar.bz2 64562 SHA256 59a88976e1f46dfa73d38fe209bd55b17f4c44e62a91797b84be45c6ba1654ea SHA512 79e938355f62e2b91632e0d95130e922b069116459df101dde9ec943f4c2858bb4ff14338f2fd008b26b4f47958c4b6e39d011093ef34b33dc1da2ab89f869c6 WHIRLPOOL 06713b6d23a7224fa998ab3965b00099e4192446ac4cc92547122ad493aa55522595d2c4965b999c68e8ad0a031b349aac84046f43c690d807dd675c7e1aa628
+DIST aeolus-0.9.0.tar.bz2 69017 SHA256 f7bd08d228b15a1d76a21709b47899eea16ebda2585a4348fa4615a1fe8a7336 SHA512 b73ddcb3338dc2c30d11976c1cb7239fab455faf6b1cfc87582a1e48e8bdb90f163b467e93ed5e1c524900ecf59802f4012f83b2181cccad52186c99cfa2baf9 WHIRLPOOL d9293b1a94747e0b59776e9b860ca07abd489f600ebd841e7ec27437215879ca95fe8fb2dc5a6b340b03874aed96b310ba1dca49badcb4b6a2b9c47a5ffa8a15
diff --git a/media-sound/aeolus/aeolus-0.8.1.ebuild b/media-sound/aeolus/aeolus-0.8.1.ebuild
new file mode 100644
index 000000000000..b2407f74e4d4
--- /dev/null
+++ b/media-sound/aeolus/aeolus-0.8.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit versionator toolchain-funcs multilib
+
+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/libclalsadrv-1.2.2
+	>=media-libs/libclthreads-2.2.1
+	>=media-libs/libclxclient-3.3.2
+	x11-libs/libXft
+	x11-libs/libX11
+	>=media-sound/jack-audio-connection-kit-0.109.2
+	media-libs/alsa-lib
+	sys-libs/readline"
+
+RDEPEND="${DEPEND}
+	media-libs/stops"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+src_compile() {
+	tc-export CXX
+	sed -i -e "s/-O3//" Makefile || die "Failed to remove forced CFLAGS"
+	sed -i -e "s:/sbin/ldconfig:true:" Makefile || die "Failed to remove ldconfig call CFLAGS"
+	sed -i -e "s/g++/$(tc-getCXX)/" Makefile || die "Failed to set correct compiler"
+	emake PREFIX="/usr" LIBDIR=$(get_libdir) || die "make failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	emake PREFIX="${D}/usr" install || die "make install failed"
+	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.8.4.ebuild b/media-sound/aeolus/aeolus-0.8.4.ebuild
new file mode 100644
index 000000000000..ccc86798c371
--- /dev/null
+++ b/media-sound/aeolus/aeolus-0.8.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit versionator toolchain-funcs multilib
+
+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/libclalsadrv-2.0.0
+	>=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"
+
+RDEPEND="${DEPEND}
+	media-libs/stops"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)/source
+
+src_compile() {
+	tc-export CXX
+	sed -i -e "s/-O3//" Makefile || die "Failed to remove forced CFLAGS"
+	sed -i -e "s:/sbin/ldconfig:true:" Makefile || die "Failed to remove ldconfig call CFLAGS"
+	sed -i -e "s/g++/$(tc-getCXX)/" Makefile || die "Failed to set correct compiler"
+	emake PREFIX="/usr" LIBDIR=$(get_libdir) || die "make failed"
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" install || die "make install failed"
+	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.0.ebuild b/media-sound/aeolus/aeolus-0.9.0.ebuild
new file mode 100644
index 000000000000..10310e5e7da5
--- /dev/null
+++ b/media-sound/aeolus/aeolus-0.9.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+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/metadata.xml b/media-sound/aeolus/metadata.xml
new file mode 100644
index 000000000000..a2cd58b8094c
--- /dev/null
+++ b/media-sound/aeolus/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+<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..71325dc67047
--- /dev/null
+++ b/media-sound/alac_decoder/Manifest
@@ -0,0 +1,2 @@
+DIST alac_decoder-0.1.3.tar.gz 15171 SHA256 b0ac203d873cc5746a519970adf095a32bfc4bad3fff2bfdf41bd1d518f09b1d
+DIST alac_decoder-0.2.0.tgz 19019 SHA256 7f8f978a5619e6dfa03dc140994fd7255008d788af848ba6acf9cfbaa3e4122f
diff --git a/media-sound/alac_decoder/alac_decoder-0.1.3.ebuild b/media-sound/alac_decoder/alac_decoder-0.1.3.ebuild
new file mode 100644
index 000000000000..9e22b17495c5
--- /dev/null
+++ b/media-sound/alac_decoder/alac_decoder-0.1.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils 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}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="sys-apps/sed"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -i -e "s:\(-o alac\):\$(LDFLAGS) \1:g" Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin alac || die "dobin failed"
+	dodoc README
+}
diff --git a/media-sound/alac_decoder/alac_decoder-0.2.0.ebuild b/media-sound/alac_decoder/alac_decoder-0.2.0.ebuild
new file mode 100644
index 000000000000..7f237a15a529
--- /dev/null
+++ b/media-sound/alac_decoder/alac_decoder-0.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils 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=""
+
+RDEPEND=""
+DEPEND="sys-apps/sed"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	sed -i -e "s:\(-o alac\):\$(LDFLAGS) \1:g" Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin alac || die "dobin failed"
+	dodoc README
+}
diff --git a/media-sound/alac_decoder/metadata.xml b/media-sound/alac_decoder/metadata.xml
new file mode 100644
index 000000000000..c733e85706e2
--- /dev/null
+++ b/media-sound/alac_decoder/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..820437fe8809
--- /dev/null
+++ b/media-sound/alsa-tools/Manifest
@@ -0,0 +1,3 @@
+DIST alsa-tools-1.0.27.tar.bz2 1650746 SHA256 6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2 SHA512 aad985329e5649b5bd7c142e95c5d1c415f28bac1afb81ad21fedac76e736d18abe4aa129e798650d91b2dd14fb18f3960ed5218768c689319c2360c432b4589 WHIRLPOOL 0d827aee4219e393c61a55920e3d66eb4e208e9d3d93ac9c1bf208c5c0c8cdf2d58f63d70b534458f3542cd3cbd5478129d73aecc57ce6654bc43f0bc73c0f25
+DIST alsa-tools-1.0.28.tar.bz2 1675680 SHA256 76e59711c6d0f39cbddce83ce1ed8da00bad112fee021f94fa990d8685cc3761 SHA512 b5150edb5f5124d5ec256b7c3348207da1bb9847ab2f10297171d6a43f559a31429ef96608a2c670db75d269dd940ebf2b6e3cbfafde530de25cbd95dce31af2 WHIRLPOOL 20f8acf8edf3fa82f19e4098c520c155a87966272d769f29a6208b25fc80a831a6cfdb3c748406ced643b5de7fa4cfb43f3a62d634fd90512369b1f57ea9cb92
+DIST alsa-tools-1.0.29.tar.bz2 1715439 SHA256 94abf0ab5a73f0710c70d4fb3dc1003af5bae2d2ed721d59d245b41ad0f2fbd1 SHA512 c236e105106e65b9f02e5baed536fa33f8efcff21a75470127e2edacf0bbb3ec555131e146d9dbfc8da307355b372e7c2acaf8edaa98dc7880abd484fbdb2813 WHIRLPOOL 19d34f425ad45d540a0ccd2ae2c77bae810ee6039250f57296c280156c6e6ed8d3788f306975f6b06b8b3f377e714d644aed08c177bd9d83acf352ccb939a47d
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.27-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.27-r1.ebuild
new file mode 100644
index 000000000000..3cfac0d7afa0
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.27-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+ECHOAUDIO_CARDS="alsa_cards_darla20 alsa_cards_gina20
+alsa_cards_layla20 alsa_cards_darla24 alsa_cards_gina24
+alsa_cards_layla24 alsa_cards_mona alsa_cards_mia alsa_cards_indigo
+alsa_cards_indigoio alsa_cards_echo3g"
+
+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
+${ECHOAUDIO_CARDS}"
+
+RDEPEND=">=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
+DEPEND="${RDEPEND}
+	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
+
+	if use gtk; then
+		for card in ${ECHOAUDIO_CARDS}; do
+			if use ${card}; then
+				ALSA_TOOLS="${ALSA_TOOLS} echomixer"
+			fi
+		done
+	fi
+}
+
+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.0.28.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.28.ebuild
new file mode 100644
index 000000000000..e6564d8bdf82
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.28.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.0.29.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.29.ebuild
new file mode 100644
index 000000000000..d356055227f4
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.29.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/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..4ce038f08186
--- /dev/null
+++ b/media-sound/alsa-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>
+  <herd>alsa</herd>
+  <maintainer>
+    <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..2e150b000689
--- /dev/null
+++ b/media-sound/alsa-utils/Manifest
@@ -0,0 +1,3 @@
+DIST alsa-utils-1.0.27.2.tar.bz2 1143802 SHA256 02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282edb352ea SHA512 c9a4943852ec1a71a5a8d2c99e1df0ba96a5d9d1196cabfdb6655f58c6a9a5a9d40dea62de019f5ed0fad0885800403c48a4a6c86b67af7fbd842097881c2bd6 WHIRLPOOL 9e95c37f307498bb9a7829fd721bf54888f3fe9ec78f014702cc26493e81369a44b571f1f5e65b3e32dbde926f97ab1152e22cf66fdff17be209e61ae34d9d46
+DIST alsa-utils-1.0.28.tar.bz2 1146887 SHA256 f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03642acc SHA512 faa5abf3f066106c80d019944efa2298e2d3157469c1c7bc52deb9aa1bcd5f5439a2e22b04ad9210e292fcef97bdacc27aa75fc275d0d7cae2c2f88729c84786 WHIRLPOOL d58587d9f302f3f1a7ab4de45c3889ce82e5be782e4aa9a953c39a908a4693e99c8ea9aeeb5669f0f606d980983beb7d5fc53e4c76ce1bb76500c7c2bcb45013
+DIST alsa-utils-1.0.29.tar.bz2 1154497 SHA256 5160058f3e14483ced5de919dd473f93932059454530a9b7ef97dcabd6833e9b SHA512 0d83805aa7b1c975524cc5ecd4aa6eb36126bc434458f9e9475e4bd1b14bbb4bf9691096ca7973342a3798e97a361451c078f4595f8f4275db64d6b443ca5928 WHIRLPOOL ccad5115148045e0c5f139d70306e801e250aa3946f60d9cd0a47c84c72f6d8689e53105030589309c98ddd4a7b871bb8dc03f00fcc3d46cc3e08c4718299407
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.27.2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.27.2.ebuild
new file mode 100644
index 000000000000..0c3fc633b29b
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.27.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+IUSE="doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-1.0.27.1
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7 )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+
+src_prepare() {
+	epatch_user
+}
+
+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 libsamplerate alsaloop) \
+		$(use_enable nls) \
+		$(use_enable ncurses alsamixer) \
+		--disable-alsaconf \
+		"$(systemd_with_unitdir)" \
+		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog README TODO seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r5 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.0.28-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.28-r1.ebuild
new file mode 100644
index 000000000000..42c776b92215
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.28-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7 )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-aplay-return.patch
+	epatch "${FILESDIR}"/${P}-va-end.patch
+	epatch "${FILESDIR}"/${P}-{mixer,monitor}-proto.patch
+	epatch_user
+}
+
+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 libsamplerate alsaloop) \
+		$(use_enable nls) \
+		$(use_enable ncurses alsamixer) \
+		--disable-alsaconf \
+		"$(systemd_with_unitdir)" \
+		--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.0.28.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild
new file mode 100644
index 000000000000..8922ee294e60
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+IUSE="doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7 )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+
+src_prepare() {
+	epatch_user
+}
+
+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 libsamplerate alsaloop) \
+		$(use_enable nls) \
+		$(use_enable ncurses alsamixer) \
+		--disable-alsaconf \
+		"$(systemd_with_unitdir)" \
+		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog README TODO 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.0.29.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild
new file mode 100644
index 000000000000..f9c558c759fe
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+IUSE="doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7 )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+
+src_prepare() {
+	epatch_user
+}
+
+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 libsamplerate alsaloop) \
+		$(use_enable nls) \
+		$(use_enable ncurses alsamixer) \
+		--disable-alsaconf \
+		"$(systemd_with_unitdir)" \
+		--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/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/alsa-utils-1.0.28-aplay-return.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.28-aplay-return.patch
new file mode 100644
index 000000000000..e25788892b28
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.28-aplay-return.patch
@@ -0,0 +1,45 @@
+http://crbug.com/433899
+
+From 8f361d83cfcb39887f5fc591633e68d9448e3425 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 1 Oct 2014 15:43:57 +0200
+Subject: [PATCH [alsa-utils]] Revert "aplay: fix pcm_read() return value"
+
+This reverts commit 8aa13eec80eac312e4b99423909387660fb99b8f.
+
+The semantics for pcm_read() and pcm_readv() was changed, but the
+callers expect the exact frame count as requested. It's possible
+to fix callers, but the fix is more complicated than to revert the
+change. Note that '-d' processing was broken in some cases.
+
+Note: The reverted commit allows that the return value might be
+greater than requested (see the first condition in read routines).
+---
+ aplay/aplay.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/aplay/aplay.c b/aplay/aplay.c
+index 30d3f31..e58e1bc 100644
+--- a/aplay/aplay.c
++++ b/aplay/aplay.c
+@@ -2039,7 +2039,7 @@ static ssize_t pcm_read(u_char *data, size_t rcount)
+ 			data += r * bits_per_frame / 8;
+ 		}
+ 	}
+-	return result;
++	return rcount;
+ }
+ 
+ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount)
+@@ -2084,7 +2084,7 @@ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount)
+ 			count -= r;
+ 		}
+ 	}
+-	return result;
++	return rcount;
+ }
+ 
+ /*
+-- 
+2.1.3
+
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.28-mixer-proto.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.28-mixer-proto.patch
new file mode 100644
index 000000000000..fdd26c328469
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.28-mixer-proto.patch
@@ -0,0 +1,24 @@
+From c788ce9b6088e2c937f77231eab520c3d16e0c76 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 25 Jun 2014 10:49:23 +0200
+Subject: [PATCH [alsa-utils]] alsamixer: include missing mixer_controls.h
+
+---
+ alsamixer/mainloop.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/alsamixer/mainloop.c b/alsamixer/mainloop.c
+index 351f57f..79d81a9 100644
+--- a/alsamixer/mainloop.c
++++ b/alsamixer/mainloop.c
+@@ -29,6 +29,7 @@
+ #include "widget.h"
+ #include "mixer_widget.h"
+ #include "mixer_display.h"
++#include "mixer_controls.h"
+ #include "mainloop.h"
+ 
+ static WINDOW *curses_initialized;
+-- 
+2.1.3
+
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.28-monitor-proto.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.28-monitor-proto.patch
new file mode 100644
index 000000000000..55d93f832d93
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.28-monitor-proto.patch
@@ -0,0 +1,24 @@
+From 74e5d57c999f8afed4f87046dcac84f6709b9196 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 24 Sep 2014 10:46:02 +0200
+Subject: [PATCH [alsa-utils]] alsactl: aded missing monitor() prototype
+
+---
+ alsactl/alsactl.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/alsactl/alsactl.h b/alsactl/alsactl.h
+index bd9bf23..4f969ec 100644
+--- a/alsactl/alsactl.h
++++ b/alsactl/alsactl.h
+@@ -31,6 +31,7 @@ int save_state(const char *file, const char *cardname);
+ int load_state(const char *file, const char *initfile, const char *cardname,
+ 	       int do_init);
+ int power(const char *argv[], int argc);
++int monitor(const char *name);
+ int state_daemon(const char *file, const char *cardname, int period,
+ 		 const char *pidfile);
+ int state_daemon_kill(const char *pidfile, const char *cmd);
+-- 
+2.1.3
+
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.28-va-end.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.28-va-end.patch
new file mode 100644
index 000000000000..a4153bd89f56
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.28-va-end.patch
@@ -0,0 +1,39 @@
+From 89a4f490bd974e454d82942100f241bb1a2270f3 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Wed, 24 Sep 2014 10:52:17 +0200
+Subject: [PATCH [alsa-utils]] =?UTF-8?q?alsactl:=20coverity=20-=20missing?=
+ =?UTF-8?q?=5Fva=5Fend=20=E2=80=93=20va=5Fend=20was=20not=20called=20for?=
+ =?UTF-8?q?=20"ap"?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ alsactl/utils.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/alsactl/utils.c b/alsactl/utils.c
+index b5d183c..304df7c 100644
+--- a/alsactl/utils.c
++++ b/alsactl/utils.c
+@@ -157,8 +157,8 @@ void cerror_(const char *fcn, long line, int cond, const char *fmt, ...)
+ 		fprintf(stderr, "%s: %s:%ld: ", command, fcn, line);
+ 		vfprintf(stderr, fmt, ap);
+ 		putc('\n', stderr);
+-		va_end(ap);
+ 	}
++	va_end(ap);
+ }
+ 
+ void dbg_(const char *fcn, long line, const char *fmt, ...)
+@@ -174,6 +174,6 @@ void dbg_(const char *fcn, long line, const char *fmt, ...)
+ 		fprintf(stderr, "%s: %s:%ld: ", command, fcn, line);
+ 		vfprintf(stderr, fmt, ap);
+ 		putc('\n', stderr);
+-		va_end(ap);
+ 	}
++	va_end(ap);
+ }
+-- 
+2.1.3
+
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-r5 b/media-sound/alsa-utils/files/alsasound.initd-r5
new file mode 100644
index 000000000000..fdb081f18864
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsasound.initd-r5
@@ -0,0 +1,83 @@
+#!/sbin/runscript
+# $Id$
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+alsastatedir=/var/lib/alsa
+alsascrdir=/etc/alsa.d
+
+extra_commands="save restore"
+
+depend() {
+	need localmount
+	after bootmisc modules isapnp coldplug hotplug
+}
+
+restore() {
+	ebegin "Restoring Mixer Levels"
+
+	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 -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"
+
+	mkdir -p "${alsastatedir}"
+	if ! alsactl -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-r6 b/media-sound/alsa-utils/files/alsasound.initd-r6
new file mode 100644
index 000000000000..6a3196f5a4ce
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsasound.initd-r6
@@ -0,0 +1,88 @@
+#!/sbin/runscript
+# $Id$
+# Copyright 1999-2014 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..8553be1f56dc
--- /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>
+  <herd>alsa</herd>
+  <maintainer>
+    <email>alsa-bugs@gentoo.org</email>
+  </maintainer>
+  <use>
+    <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..202b2f40b4ce
--- /dev/null
+++ b/media-sound/alsamixer-app/Manifest
@@ -0,0 +1 @@
+DIST AlsaMixer.app-0.1.tar.gz 26939 RMD160 788bc921e3dfb3e294cdc8363d44cf277724536b SHA1 33a2192e3e5bfe621b0ef2a7bc40d13496e794a6 SHA256 7d55d3ba5ffd82bcddcb546e0aa33ab8638df5d1418aa170e91c42e35c0c8c15
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..44fd48ad62ee
--- /dev/null
+++ b/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..06a7d236d552
--- /dev/null
+++ b/media-sound/alsamixer-app/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-dock</herd>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/alsamixergui/Manifest b/media-sound/alsamixergui/Manifest
new file mode 100644
index 000000000000..2ebb1ea87b32
--- /dev/null
+++ b/media-sound/alsamixergui/Manifest
@@ -0,0 +1 @@
+DIST alsamixergui-0.9.0rc1-2.tar.gz 70255 SHA256 6053a352580fa90fc5d35a2edce138759726acd72283ff6797cf7720632481cd SHA512 c1eac24c87e3d3dd8a582312a24e4f517d084845a3a0cd0a7253e3386685d72a691fe138853002b0277361d397271fbc9f445fd5ad0f5d604e5ad022a408d6b7 WHIRLPOOL 5215402cf2033a0f1584131d90c8a04f6f88921533bbff7ab600e2c0edf427fba6e594db6e5f41d25b11ab5a72c3c7ac503728b6940b6ce74db03368ae9540df
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..afb6b6da0f77
--- /dev/null
+++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils flag-o-matic
+
+MY_P=${PN}-0.9.0rc1-2
+
+DESCRIPTION="FLTK based amixer Frontend"
+HOMEPAGE="http://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/usr/include/fltk"
+	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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/alsamixergui/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
new file mode 100644
index 000000000000..0756d391e533
--- /dev/null
+++ b/media-sound/alsaplayer/Manifest
@@ -0,0 +1 @@
+DIST alsaplayer-0.99.81.tar.bz2 806906 SHA256 187897e5ad5a94ea819e42092cc35d53463e5fa43a3a5a78cb76ffd0d5ddee11
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..b76b96cecf4f
--- /dev/null
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..8882930edee4
--- /dev/null
+++ b/media-sound/alsaplayer/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<use>
+		<flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
+	</use>
+	<maintainer>
+		<email>redhatter@gentoo.org</email>
+		<name>Stuart Longland</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
new file mode 100644
index 000000000000..5ab676dd7751
--- /dev/null
+++ b/media-sound/amarok/Manifest
@@ -0,0 +1 @@
+DIST amarok-2.8.0.tar.bz2 39950028 SHA256 f4b89b28f217a6d947e55fb0890de22fad8c404794c6beeb2dcaf2711b4f8ec6 SHA512 09f7f675f1223d36fb9df2f8c88923c6616524e022ad83b12bcb770dfbf60cb6b191e4035633f2ea2eee5fb7b38e6d5092cf69fe222ef9c3f3c46ba8f157a62d WHIRLPOOL 108cfd95d65e74f28f85a846f605bc349e5b2962b7f9a357415225f3e48ff87148d7f50a642665cc3c809bb2cb4c22f339ad049cdeb4659bb7c0a48e798833ad
diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild
new file mode 100644
index 000000000000..ee3035b6cb50
--- /dev/null
+++ b/media-sound/amarok/amarok-2.8.0-r3.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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"
+KDE_MINIMAL="4.13.1"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit flag-o-matic kde4-base pax-utils
+
+DESCRIPTION="Advanced audio player based on KDE framework"
+HOMEPAGE="http://amarok.kde.org/"
+if [[ ${PV} != *9999* ]]; then
+	if [[ $PV == *[6-9][0-9]* ]]; then
+		SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	else
+		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+	fi
+	KEYWORDS="amd64 ppc x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda debug +embedded ipod lastfm mp3tunes mtp nepomuk 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(+)]
+	$(add_kdebase_dep kdelibs 'nepomuk?,opengl?' 4.8.4)
+	$(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
+	cdda? (
+		$(add_kdeapps_dep libkcddb)
+		$(add_kdeapps_dep libkcompactdisc)
+		$(add_kdeapps_dep audiocd-kio)
+	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( >=media-libs/liblastfm-1.0.3 )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		>=dev-qt/qtcore-4.8.4:4[glib]
+	)
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	nepomuk? ( >=kde-base/nepomuk-core-4.9.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
+	|| ( kde-apps/phonon-kde:4
+		$(add_kdeapps_dep phonon-kde) )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gmock-1.7.patch"
+	"${FILESDIR}/${P}-mysqld-rpath.patch"
+)
+
+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
+		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+		$(cmake-utils_use_with ipod)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with lastfm LibLastFm)
+		$(cmake-utils_use_with mtp)
+		$(cmake-utils_use_with mp3tunes MP3Tunes)
+		$(cmake-utils_use_with nepomuk)
+		$(cmake-utils_use_with nepomuk Soprano)
+		$(cmake-utils_use_with ofa LibOFA)
+		$(cmake-utils_use_with utils UTILITIES)
+	)
+
+	# Add libmysqld location for rpath patch; bug 508824
+	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-gmock-1.7.patch b/media-sound/amarok/files/amarok-2.8.0-gmock-1.7.patch
new file mode 100644
index 000000000000..1c0a7f45d25b
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.0-gmock-1.7.patch
@@ -0,0 +1,35 @@
+commit 5b3c84b29c16931e46bf7e1ddba16095245ce070
+Author: Mark Kretschmann <kretschmann@kde.org>
+Date:   Sat Dec 14 10:25:45 2013 +0100
+
+    Fix compilation with unit tests enabled.
+    
+    The problem was clashing symbols between KDE's kWarning macro and gmock.
+    Thanks go to Edward for help with fixing.
+    
+    CCMAIL: amarok-devel@kde.org
+
+diff --git a/tests/core/collections/MockCollectionLocationDelegate.h b/tests/core/collections/MockCollectionLocationDelegate.h
+index 019b096..a2f4504 100644
+--- a/tests/core/collections/MockCollectionLocationDelegate.h
++++ b/tests/core/collections/MockCollectionLocationDelegate.h
+@@ -23,6 +23,7 @@
+ 
+ #include "core/collections/CollectionLocationDelegate.h"
+ 
++#undef kWarning  // WORKAROUND: Prevent symbols clash with KDE's kWarning macro
+ #include <gmock/gmock.h>
+ 
+ namespace Collections {
+diff --git a/tests/mocks/MockTrack.h b/tests/mocks/MockTrack.h
+index 9f47956..fec6ef2 100644
+--- a/tests/mocks/MockTrack.h
++++ b/tests/mocks/MockTrack.h
+@@ -17,6 +17,7 @@
+ #ifndef META_MOCKTRACK_H
+ #define META_MOCKTRACK_H
+ 
++#undef kWarning  // WORKAROUND: Prevent symbols clash with KDE's kWarning macro
+ #include <gmock/gmock.h>
+ 
+ #include "core/meta/Meta.h"
diff --git a/media-sound/amarok/files/amarok-2.8.0-mysqld-rpath.patch b/media-sound/amarok/files/amarok-2.8.0-mysqld-rpath.patch
new file mode 100644
index 000000000000..80dc93dc6b14
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.0-mysqld-rpath.patch
@@ -0,0 +1,12 @@
+--- src/core-impl/collections/db/sql/mysqlecollection/CMakeLists.txt.orig	2014-06-15 18:31:07.362415065 -0400
++++ src/core-impl/collections/db/sql/mysqlecollection/CMakeLists.txt	2014-06-15 18:33:19.612419882 -0400
+@@ -28,6 +28,9 @@
+     ${ZLIB_LIBRARIES}
+ )
+
++SET_TARGET_PROPERTIES(amarok_collection-mysqlecollection PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
++SET_TARGET_PROPERTIES(amarok_collection-mysqlecollection PROPERTIES INSTALL_RPATH "${MYSQLD_DIR}")
++
+ if(NOT WIN32 AND NOT APPLE)
+     target_link_libraries( amarok_collection-mysqlecollection crypt pthread )
+ endif(NOT WIN32 AND NOT APPLE)
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
new file mode 100644
index 000000000000..e4da6b0d2ef6
--- /dev/null
+++ b/media-sound/amarok/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<herd>sound</herd>
+<maintainer>
+	<email>jmbsvicetto@gentoo.org</email>
+	<name>Jorge Manuel B. S. Vicetto</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="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</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 <pkg>media-sound/amarok-utils</pkg>
+	</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/ams/Manifest b/media-sound/ams/Manifest
new file mode 100644
index 000000000000..bae24ec607c5
--- /dev/null
+++ b/media-sound/ams/Manifest
@@ -0,0 +1,2 @@
+DIST ams-2.0.1.tar.bz2 286609 SHA256 1fb95261a302ff464b20a6b7363faed82dcbc0fa50b6580964e384ef0832ed64
+DIST ams-2.1.1.tar.bz2 342456 SHA256 a2fdd93f5f1eb96d0903d1d3f4709fcec28842e44b9e7420ea42618affc767d9 SHA512 04627c15c3e3d0b889c4d17a8393c2417f5004a2bb0035bf9b0d86265d55c214923b9b875cbf3dd2cdb3f0037a0d6f717a9c6b749b68cd786b591d79e06b7580 WHIRLPOOL 1152139cf676707369a3189795833c3a7fdbe2a90e1a557169514a12536fd5279a863058971e36592a4d322d742bed1af704776382c454029d5f718b7ef88a98
diff --git a/media-sound/ams/ams-2.0.1.ebuild b/media-sound/ams/ams-2.0.1.ebuild
new file mode 100644
index 000000000000..12b1a7a52c2b
--- /dev/null
+++ b/media-sound/ams/ams-2.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils flag-o-matic multilib
+
+DESCRIPTION="Alsa Modular Software Synthesizer"
+HOMEPAGE="http://alsamodular.sourceforge.net"
+SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	media-sound/jack-audio-connection-kit
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	media-libs/ladspa-sdk
+	media-libs/libclalsadrv
+	!dev-ruby/amrita"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-dl.patch
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/qt4
+	econf
+}
diff --git a/media-sound/ams/ams-2.1.1.ebuild b/media-sound/ams/ams-2.1.1.ebuild
new file mode 100644
index 000000000000..9063752a12ee
--- /dev/null
+++ b/media-sound/ams/ams-2.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils flag-o-matic multilib
+
+DESCRIPTION="Alsa Modular Software Synthesizer"
+HOMEPAGE="http://alsamodular.sourceforge.net"
+SRC_URI="mirror://sourceforge/alsamodular/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	media-sound/jack-audio-connection-kit
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	media-libs/ladspa-sdk
+	media-libs/libclalsadrv
+	!dev-ruby/amrita"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-dl.patch
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -L/usr/$(get_libdir)/qt4
+	econf
+}
diff --git a/media-sound/ams/files/ams-2.0.1-dl.patch b/media-sound/ams/files/ams-2.0.1-dl.patch
new file mode 100644
index 000000000000..ce2327d210f4
--- /dev/null
+++ b/media-sound/ams/files/ams-2.0.1-dl.patch
@@ -0,0 +1,21 @@
+Missing -ldl for dlsym, dlerror, and dlopen, see http://bugs.gentoo.org/379251
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -232,6 +232,8 @@
+ 	textedit.h \
+ 	notelist.h
+ 
++ams_LDADD = -ldl @QT_LIBS@
++
+ translationsdir = $(pkgdatadir)/translations
+ translations = \
+ 	translations/ams_de.ts \
+@@ -247,7 +249,6 @@
+ # all generated files to be removed by "make clean"
+ CLEANFILES = $(nodist_ams_SOURCES) $(translations_DATA)
+ 
+-AM_LDFLAGS = @QT_LIBS@
+ AM_CXXFLAGS = @QT_CXXFLAGS@ @AMS_CXXFLAGS@
+ DEFS = -D_REENTRANT -DLADSPA_PATH=\"$(LADSPA_PATH)\" -DTRANSLATIONSDIR=\"$(translationsdir)\" @DEFS@
+ 
diff --git a/media-sound/ams/files/ams-2.1.1-dl.patch b/media-sound/ams/files/ams-2.1.1-dl.patch
new file mode 100644
index 000000000000..00bec616c227
--- /dev/null
+++ b/media-sound/ams/files/ams-2.1.1-dl.patch
@@ -0,0 +1,13 @@
+Missing -ldl for dlsym, dlerror, and dlopen, see http://bugs.gentoo.org/379251
+
+--- ams-2.1.1/src/Makefile.am
++++ ams-2.1.1/src/Makefile.am
+@@ -252,6 +252,8 @@
+ 	textedit.h \
+ 	notelist.h
+ 
++ams_LDADD = -ldl
++
+ translationsdir = $(pkgdatadir)/translations
+ translations = \
+ 	translations/ams_de.ts \
diff --git a/media-sound/ams/metadata.xml b/media-sound/ams/metadata.xml
new file mode 100644
index 000000000000..939a2c64eb67
--- /dev/null
+++ b/media-sound/ams/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">alsamodular</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
new file mode 100644
index 000000000000..79ba3f2d3717
--- /dev/null
+++ b/media-sound/amsynth/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/media-sound/amsynth/amsynth-1.3.2.ebuild b/media-sound/amsynth/amsynth-1.3.2.ebuild
new file mode 100644
index 000000000000..5ec2071bea4c
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.3.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools
+
+MY_P=${P/ams/amS}
+
+DESCRIPTION="Virtual analogue synthesizer"
+HOMEPAGE="http://code.google.com/p/amsynth/"
+SRC_URI="http://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? ( media-sound/jack-audio-connection-kit )
+	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.ebuild b/media-sound/amsynth/amsynth-1.5.1.ebuild
new file mode 100644
index 000000000000..4bb0d758d2ea
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.5.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools
+
+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? ( media-sound/jack-audio-connection-kit )
+	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() {
+	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/files/amsynth-1.2.3-respect-cflags.patch b/media-sound/amsynth/files/amsynth-1.2.3-respect-cflags.patch
new file mode 100644
index 000000000000..2a640ce17108
--- /dev/null
+++ b/media-sound/amsynth/files/amsynth-1.2.3-respect-cflags.patch
@@ -0,0 +1,20 @@
+--- amSynth-1.2.3/configure.in	
++++ amSynth-1.2.3/configure.in	
+@@ -90,7 +90,7 @@ AC_ARG_ENABLE(debug,
+ if test "${enable_debug}" = "yes" ; then
+ 	AC_MSG_RESULT([yes])
+ 	debugging=yes
+-	CXXFLAGS="$CXXFLAGS -g -Wall -D_DEBUG"
++	CXXFLAGS="$CXXFLAGS -Wall -D_DEBUG"
+ 	COMPOPSTR="debugging $COMPOPSTR"
+ 	OPTION_DEBUG="yes"
+ else
+@@ -114,7 +114,7 @@ if test "$enable_profile" = "yes" ; then
+         fi
+ else
+ 	if test "$GCC" = "yes" ; then
+-		CXXFLAGS="$CXXFLAGS -O3 -ffast-math -fno-exceptions -fomit-frame-pointer"
++		CXXFLAGS="$CXXFLAGS -ffast-math -fno-exceptions -fomit-frame-pointer"
+ 	fi
+ 	AC_MSG_RESULT([no])
+ 	profiling=no
diff --git a/media-sound/amsynth/metadata.xml b/media-sound/amsynth/metadata.xml
new file mode 100644
index 000000000000..934627feac58
--- /dev/null
+++ b/media-sound/amsynth/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..b11565e0326f
--- /dev/null
+++ b/media-sound/apetag/Manifest
@@ -0,0 +1 @@
+DIST apetag.1.12.tar.gz 29942 RMD160 84b9282b03e7214baac316c0cab415f13955bf07 SHA1 1ccd809537567795f4fddaf27234c1b658584764 SHA256 7376c326483098c9e1f200cbbb2f238705adc0cbafe854ca583febedf42737e9
diff --git a/media-sound/apetag/apetag-1.12.ebuild b/media-sound/apetag/apetag-1.12.ebuild
new file mode 100644
index 000000000000..044fc9a8efc0
--- /dev/null
+++ b/media-sound/apetag/apetag-1.12.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+
+inherit python 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 ~x86"
+IUSE=""
+
+S=${WORKDIR}/Apetag
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e 's:CXXDEBUG:LDFLAGS:' \
+		Makefile || die
+	python_convert_shebangs -r 2 .
+}
+
+src_compile() {
+	tc-export CXX
+	emake \
+		CXXFLAGS="${CXXFLAGS} -Wall -pedantic" \
+		LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dobin ${PN} || die
+
+	local sitedir="$(python_get_sitedir)"/${PN}
+	exeinto ${sitedir}
+	doexe *.py || die
+
+	local x
+	for x in {rmid3tag,tagdir}.py; do
+		ln -s "${sitedir}"/${x} "${D}"/usr/bin/${x} || die
+	done
+
+	dodoc 00readme
+}
+
+pkg_postinst() {
+	python_mod_optimize apetag
+}
+
+pkg_postrm() {
+	python_mod_cleanup apetag
+}
diff --git a/media-sound/apetag/metadata.xml b/media-sound/apetag/metadata.xml
new file mode 100644
index 000000000000..3bf6bcfeb512
--- /dev/null
+++ b/media-sound/apetag/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
new file mode 100644
index 000000000000..c1d978bce1b1
--- /dev/null
+++ b/media-sound/apulse/Manifest
@@ -0,0 +1,2 @@
+DIST apulse-0.1.4.tar.gz 99976 SHA256 717bc537c389af546b4db2ed7622a8896f7f0f306612c9eb6c693a70c104c86f SHA512 500abca0f6b4df35acb417744a5967e58ceff8cc2a0d640db03847d79b077295abe8888ee5d0008383349bd964345a340334f39e1f55286713db94a86c6596dc WHIRLPOOL 7fe604ed3128cb24d375f4f84ee77317fd499202d8bf46f9c68735501b35a55050852d08260b2c4ad0419ac32a3d330946c65aa402b9b66dbf6d25c3a92966bb
+DIST apulse-0.1.6.tar.gz 101938 SHA256 f9ffbf7aff96680beff3243758e5c1e0d4ac9043d4bd6cbfb219890b4b91c9f3 SHA512 0bcc3966a1455bac64e7b9731a988c5d10d893544354453b70f36121e92854a632f33a2ec84fa2ee4d2010221f82fb83cea872d66c4b053b0cd9014215014dc2 WHIRLPOOL 114d7e5d2f344ee4bdb96df01db8f10b10798ef2b332542f45e0e2957462c8255963a7d00628c01fcf58c19703c207aa967fdb258efcd28922ef05687517a8d3
diff --git a/media-sound/apulse/apulse-0.1.4.ebuild b/media-sound/apulse/apulse-0.1.4.ebuild
new file mode 100644
index 000000000000..e3d67682ac95
--- /dev/null
+++ b/media-sound/apulse/apulse-0.1.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit 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 )
+
+multilib_src_configure() {
+	local mycmakeargs="-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse"
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/apulse/apulse-0.1.6.ebuild b/media-sound/apulse/apulse-0.1.6.ebuild
new file mode 100644
index 000000000000..e3d67682ac95
--- /dev/null
+++ b/media-sound/apulse/apulse-0.1.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit 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 )
+
+multilib_src_configure() {
+	local mycmakeargs="-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse"
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/apulse/metadata.xml b/media-sound/apulse/metadata.xml
new file mode 100644
index 000000000000..5673854e101f
--- /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>
+    <email>zlg@gentoo.org</email>
+    <name>Daniel Campbell</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..d044956d5c69
--- /dev/null
+++ b/media-sound/aqualung/Manifest
@@ -0,0 +1 @@
+DIST aqualung-1.0-rc1.tar.gz 1939271 SHA256 4b6c7e8a38af9f03fb042f8133cce834f87d7f5489caf2a85e9d2d1e428ae24b SHA512 a8b15eb69dab1b2615562fd25aa6081df293783eef6cf7d171c5373855bab1f3e454e90621feb4f296c407c9d74957130fc359a39315cfdbb173a6f119a859e6 WHIRLPOOL 7aad3bb2dd3740418fe6b0ec87a62772d9e53673b58bd1c534de31c08bbee48748debcb8f82ab6239d8160f1af6933cc4a13a2d185c84f72ecfb02ababdbe0ea
diff --git a/media-sound/aqualung/aqualung-1.0_rc1.ebuild b/media-sound/aqualung/aqualung-1.0_rc1.ebuild
new file mode 100644
index 000000000000..e899a7702e84
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.0_rc1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
+HOMEPAGE="http://aqualung.factorial.hu/"
+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 libsamplerate lua
+	mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
+	vorbis wavpack"
+
+RDEPEND="sys-libs/zlib
+	app-arch/bzip2
+	dev-libs/libxml2
+	x11-libs/gtk+:2
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	pulseaudio? ( media-sound/pulseaudio )
+	flac? ( media-libs/flac )
+	lame? ( media-sound/lame )
+	ffmpeg? ( >=virtual/ffmpeg-0.6.90 )
+	mac? ( media-sound/mac )
+	modplug? ( media-libs/libmodplug )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	mp3? ( media-libs/libmad )
+	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 )
+	ladspa? ( media-libs/liblrdf )
+	libsamplerate? ( media-libs/libsamplerate )
+	ifp? ( media-libs/libifp )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	lua? ( dev-lang/lua:0= )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_configure() {
+	econf \
+		--enable-nls \
+		--disable-rpath \
+		$(use_enable debug) \
+		$(use_enable podcast) \
+		$(use_enable systray) \
+		--enable-transcoding \
+		$(use_enable jack jack-mgmt) \
+		--enable-loop \
+		$(use_with alsa) \
+		$(use_with jack) \
+		$(use_with oss) \
+		$(use_with pulseaudio pulse) \
+		$(use_with flac) \
+		$(use_with lame) \
+		$(use_with ffmpeg lavc) \
+		$(use_with mac) \
+		$(use_with modplug mod) \
+		$(use_with musepack mpc) \
+		$(use_with mp3 mpeg) \
+		$(use_with sndfile) \
+		$(use_with speex) \
+		$(use_with vorbis vorbis) \
+		$(use_with vorbis vorbisenc) \
+		$(use_with wavpack) \
+		$(use_with ladspa) \
+		$(use_with libsamplerate src) \
+		$(use_with cdda) \
+		$(use_with ifp) \
+		$(use_with cddb) \
+		$(use_with lua) \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	newicon src/img/icon_64.png aqualung.png
+	make_desktop_entry aqualung Aqualung
+}
diff --git a/media-sound/aqualung/metadata.xml b/media-sound/aqualung/metadata.xml
new file mode 100644
index 000000000000..49f3ae2cc86b
--- /dev/null
+++ b/media-sound/aqualung/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+    <email>billie@gentoo.org</email>
+    <name>Daniel Pielmeier</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="sourceforge">aqualung</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
new file mode 100644
index 000000000000..83d4442cf401
--- /dev/null
+++ b/media-sound/ardour/Manifest
@@ -0,0 +1,8 @@
+DIST ardour-2.8.14.tar.bz2 2169985 SHA256 e07e483a12354c00d821dafbec5f5d2690062b758205daceab723bf1e9a633fe SHA512 0d861cfe99645ff5f7847b5e3296a1dfb6d8f15e8686ac79819b114843988b669b117bcfce89a77435d7af252b50bbfa790eb206f69dfff39f7c97126cf26540 WHIRLPOOL 75382e17152d7eea18820f7e72fff2f29553edfd4e15609f73842411edf5605d1ca2a2a8497e08747f5c210393822dc32a1b90e72cdff9774ab4c2a060de6073
+DIST ardour-2.8.16.tar.bz2 2169916 SHA256 37ee32119ba105fa0883faa7e18c58ecd5276894568da224a554d9ef49075e40 SHA512 02e74883cf466fcd5588ec8f2fd9d032b4611071d630b412c853a7ae7cb46045c0cde4308abbc78da3f54aae0ab1c32a980b8d1e1a965c8633ef43d8e08e0d0d WHIRLPOOL 357b45e506da05b1ce17f006c3e2b22b17150b5556e06785b961b308d958fb66fa82b3e01d1d5e596e43caf6b9d1c83287696a6c694e54114fed5825e2fc5a51
+DIST ardour-3.5.308.tar.gz 8578598 SHA256 8fe7d396d182c1cecc377d70e788f4bcaeca6276dc7474a6589e6469acd77d8b SHA512 64b1719c8262840bf8f02d5843640efecd1a7cb1e0a706b778db9d8f849d7cb611bc34bec3fee8291f3b01491b913e5d5239c772ba40ce883ee00d6bfeb48b41 WHIRLPOOL a5422a5f8e6addcd0bd03a11d18a057e06d82c8b7039128f25de7f6d9c906c2fd05a7c46e54403e1f18c0b7b06c1722638c66a7a0f1d55f7e04d6b0dabfd2baf
+DIST ardour-3.5.357.tar.gz 8579943 SHA256 1c13a3200bfa0fb8c0adddd3439102e0caa7f219a0f2518a4ba0d233924ef0b7 SHA512 8ee6d3b3f8e05547b3e9487e56344c2795fbc4781f6ac03a0c1684c534940570e3138023df4e57ce904c99e152ff212ddf67d83c1c95ac8542cc55a6e379c90d WHIRLPOOL a32508b6b54909111bf9a074df72d312f164a18840c28e96d1c38e368a13f8ea8f9dc6d9fb4fc600af97e06ce79fdd21a58f1701125a02c5a26ea919d823d2ae
+DIST ardour-3.5.380.tar.gz 8580892 SHA256 476829114565b56f6dd9f05d1e93752d36db6db453f0f69c09ed43f6b3ed88e1 SHA512 286290186e400cdc9fe350dce3e785de8193adac7a7de951b78ee91d0ab8a29ee4dfb113f2e996a821e6e26079749a7a2f09583451b364f5497027c0b52d7f0d WHIRLPOOL 2a59c5618690d8570a782ea7b2ad2882de7affc7b98a1d0d834bdb2b2a36031570b7e9e68e83f2b8fd19e224fef2393601b47a633659f8fca5fbb11102b957f9
+DIST ardour-3.5.403.tar.gz 8583763 SHA256 46490623479d9a25e2ab98b817c1f5c42b1d042f62afba1d1828d869a0c2d395 SHA512 e00053faf6c4f62dc80c85d82bbdb4b65de2111c9c9efc9d9e03b73be353a7cd652c02a2989566fd30491b1a07d02a7ff15e4523966163cf2e5e4c708a12aac0 WHIRLPOOL 726b66d236a9488a58fe333cbe720bdbd6beaf993d0e738ff8757cf7f657be164d5d0e390da09c773ab3b590c3bcf73be03a358164d54bd19fa7b025ff13118b
+DIST ardour-4.0.tar.gz 9189038 SHA256 ea1131a24774d5f8dcab4ac7ea3b36bd427b1e4d0bef6f3db0681bc4ca131cf1 SHA512 2317c5818fe89386319f12062f0af0d08b07f569d6f775b7ecfa4f3a4bb1f565e05f3ff32f05f591c5628bdd402eda5bce4be4f8fa89da6c2092d5edb2c9ae7a WHIRLPOOL 854145ed135f6b23222ab2d6022e31b09221cac0d326fa17c5ee88e4e8ebd033e69c447fcbac35a925ff23974cc8b2b13c076014118977bbc88836124a912ad4
+DIST ardour-4.1.tar.gz 9247567 SHA256 1d5eac009f3c84aee11c4e7d1c548747cb5a43eddac92b4e640342b79cc808b9 SHA512 5e13301ca5d8140498256d43729d770c6222b220d2c817651304746a7cc20fe8450b094d978bc9559b9ec7b5a7a95ca1c5131be5b51c78835e75b3b7bbb1be82 WHIRLPOOL 3699ea7f29c9df30ddfa3ad9a1e05f6a3cbccddaf5ae1804679b6c1a50e8b800e14f06760e8d9d44a4ac2631f32db595048640c01b9c967f060bfaee11f28a73
diff --git a/media-sound/ardour/ardour-2.8.14-r1.ebuild b/media-sound/ardour/ardour-2.8.14-r1.ebuild
new file mode 100644
index 000000000000..5d99b70f2a99
--- /dev/null
+++ b/media-sound/ardour/ardour-2.8.14-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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
+	>=media-sound/jack-audio-connection-kit-0.120
+	>=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}"/${P}-syslibs.patch \
+		"${FILESDIR}"/${P}-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-2.8.16.ebuild b/media-sound/ardour/ardour-2.8.16.ebuild
new file mode 100644
index 000000000000..ee5af30a08d4
--- /dev/null
+++ b/media-sound/ardour/ardour-2.8.16.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	>=media-sound/jack-audio-connection-kit-0.120
+	>=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-3.5.308-r1.ebuild b/media-sound/ardour/ardour-3.5.308-r1.ebuild
new file mode 100644
index 000000000000..9114305ad7b9
--- /dev/null
+++ b/media-sound/ardour/ardour-3.5.308-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [ ${PV} = 9999 ]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-2
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="3"
+IUSE="altivec debug doc 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
+	>=media-sound/jack-audio-connection-kit-0.120
+	>=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
+	>=media-libs/taglib-1.7
+	net-misc/curl
+	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}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen[dot] )"
+	if ! [ ${PV} = 9999 ]; then
+		DEPEND="${DEPEND}"
+	fi
+
+src_unpack() {
+	if [ ${PV} = 9999 ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare(){
+	if ! [ ${PV} = 9999 ]; then
+		PVTEMP=`echo "${PV}" | sed "s/\./-/2"`
+		sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript
+		sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript
+		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
+
+	fi
+	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
+	sed 's/'FLAGS\'\,\ optimization_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
+		$(use nls && echo "--nls" || echo "--no-nls") \
+		$(use debug && echo "--stl-debug" || echo "--optimize") \
+		$((use altivec || use cpu_flags_x86_sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$(use doc && echo "--docs")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
+	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
+}
diff --git a/media-sound/ardour/ardour-3.5.357.ebuild b/media-sound/ardour/ardour-3.5.357.ebuild
new file mode 100644
index 000000000000..9114305ad7b9
--- /dev/null
+++ b/media-sound/ardour/ardour-3.5.357.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [ ${PV} = 9999 ]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-2
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="3"
+IUSE="altivec debug doc 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
+	>=media-sound/jack-audio-connection-kit-0.120
+	>=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
+	>=media-libs/taglib-1.7
+	net-misc/curl
+	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}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen[dot] )"
+	if ! [ ${PV} = 9999 ]; then
+		DEPEND="${DEPEND}"
+	fi
+
+src_unpack() {
+	if [ ${PV} = 9999 ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare(){
+	if ! [ ${PV} = 9999 ]; then
+		PVTEMP=`echo "${PV}" | sed "s/\./-/2"`
+		sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript
+		sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript
+		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
+
+	fi
+	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
+	sed 's/'FLAGS\'\,\ optimization_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
+		$(use nls && echo "--nls" || echo "--no-nls") \
+		$(use debug && echo "--stl-debug" || echo "--optimize") \
+		$((use altivec || use cpu_flags_x86_sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$(use doc && echo "--docs")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
+	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
+}
diff --git a/media-sound/ardour/ardour-3.5.380.ebuild b/media-sound/ardour/ardour-3.5.380.ebuild
new file mode 100644
index 000000000000..ae3d03f871de
--- /dev/null
+++ b/media-sound/ardour/ardour-3.5.380.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [ ${PV} = 9999 ]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-2
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="3"
+IUSE="altivec debug doc 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.32.0
+	>=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
+	>=media-sound/jack-audio-connection-kit-0.120
+	>=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
+	>=media-libs/taglib-1.7
+	net-misc/curl
+	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}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen[dot] )"
+	if ! [ ${PV} = 9999 ]; then
+		DEPEND="${DEPEND}"
+	fi
+
+src_unpack() {
+	if [ ${PV} = 9999 ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare(){
+	if ! [ ${PV} = 9999 ]; then
+		PVTEMP=`echo "${PV}" | sed "s/\./-/2"`
+		sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript
+		sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript
+		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
+
+	fi
+	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
+#	sed 's/'FLAGS\'\,\ optimization_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
+	sed 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
+	append-flags "-lboost_system"
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
+		$(use nls && echo "--nls" || echo "--no-nls") \
+		$(use debug && echo "--stl-debug" || echo "--optimize") \
+		$((use altivec || use cpu_flags_x86_sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$(use doc && echo "--docs")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
+	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
+}
diff --git a/media-sound/ardour/ardour-3.5.403.ebuild b/media-sound/ardour/ardour-3.5.403.ebuild
new file mode 100644
index 000000000000..0f9d5298c2d0
--- /dev/null
+++ b/media-sound/ardour/ardour-3.5.403.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [ ${PV} = 9999 ]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-2
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="3"
+IUSE="altivec doc 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.32.0
+	>=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
+	>=media-sound/jack-audio-connection-kit-0.120
+	>=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
+	>=media-libs/taglib-1.7
+	net-misc/curl
+	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}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen[dot] )"
+	if ! [ ${PV} = 9999 ]; then
+		DEPEND="${DEPEND}"
+	fi
+
+src_unpack() {
+	if [ ${PV} = 9999 ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare(){
+	if ! [ ${PV} = 9999 ]; then
+		PVTEMP=$(echo "${PV}" | sed "s/\./-/2")
+		sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript
+		sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript
+		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
+	fi
+	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
+	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
+	sed 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
+	append-flags "-lboost_system"
+}
+
+src_configure() {
+	if use cpu_flags_x86_sse; then
+		MARCH=$(get-flag march)
+		for ARCHWOSSE in i686 i486; do
+			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
+				for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
+					is-flag ${SSEOPT} && SSEON="yes"
+				done
+				if [ -z ${SSEON} ]; then
+					append-flags -msse
+					elog "You enabled sse but use an march that does not support sse!"
+					elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
+				fi
+			fi
+		done
+	fi
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--optimize \
+		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
+		$(use nls && echo "--nls" || echo "--no-nls") \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$(use doc && echo "--docs")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
+	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
+}
diff --git a/media-sound/ardour/ardour-4.0-r2.ebuild b/media-sound/ardour/ardour-4.0-r2.ebuild
new file mode 100644
index 000000000000..225267ba04cc
--- /dev/null
+++ b/media-sound/ardour/ardour-4.0-r2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [ ${PV} = 9999 ]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-2
+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"
+
+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.32.0
+	>=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
+	>=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
+	>=media-libs/taglib-1.7
+	net-misc/curl
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	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}
+	virtual/pkgconfig
+	>=media-sound/jack-audio-connection-kit-0.120
+	sys-devel/gettext
+	doc? ( app-doc/doxygen[dot] )"
+	if ! [ ${PV} = 9999 ]; then
+		DEPEND="${DEPEND}"
+	fi
+
+src_unpack() {
+	if [ ${PV} = 9999 ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare(){
+	if ! [ ${PV} = 9999 ]; then
+		epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
+	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
+	sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
+	sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
+	sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript
+	append-flags "-lboost_system"
+}
+
+src_configure() {
+	if use cpu_flags_x86_sse; then
+		MARCH=$(get-flag march)
+		for ARCHWOSSE in i686 i486; do
+			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
+				for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
+					is-flag ${SSEOPT} && SSEON="yes"
+				done
+				if [ -z ${SSEON} ]; then
+					append-flags -msse
+					elog "You enabled sse but use an march that does not support sse!"
+					elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
+				fi
+			fi
+		done
+	fi
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--optimize \
+		--no-jack-metadata \
+		--nls \
+		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --no-jack --libjack=weak") \
+		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$(use doc && echo "--docs")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_mac.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 do a donation upstream at ardour.org. Thanks!"
+}
diff --git a/media-sound/ardour/ardour-4.1.ebuild b/media-sound/ardour/ardour-4.1.ebuild
new file mode 100644
index 000000000000..4830a49f33ea
--- /dev/null
+++ b/media-sound/ardour/ardour-4.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [ ${PV} = 9999 ]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-2
+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"
+
+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.32.0
+	>=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
+	>=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:=
+	>=media-libs/taglib-1.7
+	net-misc/curl
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	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}
+	virtual/pkgconfig
+	>=media-sound/jack-audio-connection-kit-0.120
+	sys-devel/gettext
+	doc? ( app-doc/doxygen[dot] )"
+	if ! [ ${PV} = 9999 ]; then
+		DEPEND="${DEPEND}"
+	fi
+
+src_unpack() {
+	if [ ${PV} = 9999 ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare(){
+	if ! [ ${PV} = 9999 ]; then
+		epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
+	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
+	sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
+	sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
+	sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript
+	append-flags "-lboost_system"
+}
+
+src_configure() {
+	if use cpu_flags_x86_sse; then
+		MARCH=$(get-flag march)
+		for ARCHWOSSE in i686 i486; do
+			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
+				for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
+					is-flag ${SSEOPT} && SSEON="yes"
+				done
+				if [ -z ${SSEON} ]; then
+					append-flags -msse
+					elog "You enabled sse but use an march that does not support sse!"
+					elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
+				fi
+			fi
+		done
+	fi
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--optimize \
+		--nls \
+		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa  --libjack=weak") \
+		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$(use doc && echo "--docs")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_mac.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 do a donation upstream at ardour.org. Thanks!"
+}
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
new file mode 100644
index 000000000000..e91dce0bb458
--- /dev/null
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [ ${PV} = 9999 ]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-2
+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"
+
+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.32.0
+	>=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
+	>=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
+	>=media-libs/taglib-1.7
+	net-misc/curl
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	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}
+	virtual/pkgconfig
+	>=media-sound/jack-audio-connection-kit-0.120
+	sys-devel/gettext
+	doc? ( app-doc/doxygen[dot] )"
+	if ! [ ${PV} = 9999 ]; then
+		DEPEND="${DEPEND}"
+	fi
+
+src_unpack() {
+	if [ ${PV} = 9999 ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare(){
+	if ! [ ${PV} = 9999 ]; then
+		epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
+	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
+	sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
+	sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
+	sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript
+	append-flags "-lboost_system"
+}
+
+src_configure() {
+	if use cpu_flags_x86_sse; then
+		MARCH=$(get-flag march)
+		for ARCHWOSSE in i686 i486; do
+			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
+				for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
+					is-flag ${SSEOPT} && SSEON="yes"
+				done
+				if [ -z ${SSEON} ]; then
+					append-flags -msse
+					elog "You enabled sse but use an march that does not support sse!"
+					elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
+				fi
+			fi
+		done
+	fi
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--optimize \
+		--nls \
+		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa  --libjack=weak") \
+		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$(use doc && echo "--docs")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_mac.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 do a donation upstream at ardour.org. Thanks!"
+}
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-3.0-syslibs.patch b/media-sound/ardour/files/ardour-3.0-syslibs.patch
new file mode 100644
index 000000000000..6b8deb641711
--- /dev/null
+++ b/media-sound/ardour/files/ardour-3.0-syslibs.patch
@@ -0,0 +1,35 @@
+diff -rupN ardour-3.0/libs/ardour/wscript newardour-3.0/libs/ardour/wscript
+--- ardour-3.0/libs/ardour/wscript      2013-03-10 22:13:52.000000000 +0100
++++ newardour-3.0/libs/ardour/wscript   2013-03-15 08:04:07.428001597 +0100
+@@ -287,7 +287,8 @@ def configure(conf):
+ 
+     # we don't try to detect this, since its part of our source tree
+ 
+-    conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
++    autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', atleast_version='1.7')
++    autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', atleast_version='1.4')
+     conf.define('USE_RUBBERBAND', 1)  # controls whether we actually use it
+ 
+     conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
+@@ -378,7 +379,7 @@ def build(bld):
+     obj.target       = 'ardour'
+     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
+                         'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
+-                        'OSX','BOOST','CURL','DL']
++                        'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
+     obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
+                         'libvampplugin','libtaglib','librubberband',
+                         'libaudiographer','libltc']
+diff -rupN ardour-3.0/wscript newardour-3.0/wscript
+--- ardour-3.0/wscript  2013-03-10 22:13:59.000000000 +0100
++++ newardour-3.0/wscript       2013-03-15 08:03:00.639999789 +0100
+@@ -31,9 +31,7 @@ children = [
+         'libs/vamp-sdk',
+         'libs/qm-dsp',
+         'libs/vamp-plugins',
+-        'libs/taglib',
+         'libs/libltc',
+-        'libs/rubberband',
+         'libs/surfaces',
+         'libs/panners',
+         'libs/timecode',
diff --git a/media-sound/ardour/files/ardour-3.2-syslibs.patch b/media-sound/ardour/files/ardour-3.2-syslibs.patch
new file mode 100644
index 000000000000..6b8deb641711
--- /dev/null
+++ b/media-sound/ardour/files/ardour-3.2-syslibs.patch
@@ -0,0 +1,35 @@
+diff -rupN ardour-3.0/libs/ardour/wscript newardour-3.0/libs/ardour/wscript
+--- ardour-3.0/libs/ardour/wscript      2013-03-10 22:13:52.000000000 +0100
++++ newardour-3.0/libs/ardour/wscript   2013-03-15 08:04:07.428001597 +0100
+@@ -287,7 +287,8 @@ def configure(conf):
+ 
+     # we don't try to detect this, since its part of our source tree
+ 
+-    conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
++    autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', atleast_version='1.7')
++    autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', atleast_version='1.4')
+     conf.define('USE_RUBBERBAND', 1)  # controls whether we actually use it
+ 
+     conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
+@@ -378,7 +379,7 @@ def build(bld):
+     obj.target       = 'ardour'
+     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
+                         'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
+-                        'OSX','BOOST','CURL','DL']
++                        'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
+     obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
+                         'libvampplugin','libtaglib','librubberband',
+                         'libaudiographer','libltc']
+diff -rupN ardour-3.0/wscript newardour-3.0/wscript
+--- ardour-3.0/wscript  2013-03-10 22:13:59.000000000 +0100
++++ newardour-3.0/wscript       2013-03-15 08:03:00.639999789 +0100
+@@ -31,9 +31,7 @@ children = [
+         'libs/vamp-sdk',
+         'libs/qm-dsp',
+         'libs/vamp-plugins',
+-        'libs/taglib',
+         'libs/libltc',
+-        'libs/rubberband',
+         'libs/surfaces',
+         'libs/panners',
+         'libs/timecode',
diff --git a/media-sound/ardour/files/ardour-3.5-syslibs.patch b/media-sound/ardour/files/ardour-3.5-syslibs.patch
new file mode 100644
index 000000000000..a80e3a34a7c5
--- /dev/null
+++ b/media-sound/ardour/files/ardour-3.5-syslibs.patch
@@ -0,0 +1,37 @@
+diff --git a/libs/ardour/wscript b/libs/ardour/wscript
+index 4d56983..41dd54a 100644
+--- a/libs/ardour/wscript
++++ b/libs/ardour/wscript
+@@ -287,7 +287,8 @@ def configure(conf):
+ 
+     # we don't try to detect this, since its part of our source tree
+ 
+-    conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
++    autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', atleast_version='1.7')
++    autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', atleast_version='1.4')
+     conf.define('USE_RUBBERBAND', 1)  # controls whether we actually use it
+ 
+     conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
+@@ -332,7 +333,7 @@ def build(bld):
+     obj.target       = 'ardour'
+     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
+                         'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
+-                        'OSX','BOOST','CURL','DL']
++                        'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
+     obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
+                         'libvampplugin','libtaglib','librubberband',
+                         'libaudiographer','libltc','libtimecode']
+diff --git a/wscript b/wscript
+index 3d01632..e84f4bf 100644
+--- a/wscript
++++ b/wscript
+@@ -24,9 +24,7 @@ children = [
+         'libs/vamp-sdk',
+         'libs/qm-dsp',
+         'libs/vamp-plugins',
+-        'libs/taglib',
+         'libs/libltc',
+-        'libs/rubberband',
+         'libs/surfaces',
+         'libs/panners',
+         'libs/backends',
diff --git a/media-sound/ardour/files/ardour-3.5.403-sse.patch b/media-sound/ardour/files/ardour-3.5.403-sse.patch
new file mode 100644
index 000000000000..194da5f08059
--- /dev/null
+++ b/media-sound/ardour/files/ardour-3.5.403-sse.patch
@@ -0,0 +1,24 @@
+diff -rupN ardouroriginal/libs/ardour/wscript ardour-3.5.403/libs/ardour/wscript
+--- ardouroriginal/libs/ardour/wscript	2014-10-24 19:18:10.981000000 +0200
++++ ardour-3.5.403/libs/ardour/wscript	2014-10-24 19:19:36.115000000 +0200
+@@ -385,7 +385,7 @@ def build(bld):
+     if bld.is_defined('AUDIOUNIT_SUPPORT'):
+         obj.source += [ 'audio_unit.cc' ]
+ 
+-    if Options.options.fpu_optimization:
++    if bld.env['FPU_OPTIMIZATION']:
+         if (bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686'):
+             obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
+         elif bld.env['build_target'] == 'x86_64':
+diff -rupN ardouroriginal/wscript ardour-3.5.403/wscript
+--- ardouroriginal/wscript	2014-10-24 19:18:10.989000000 +0200
++++ ardour-3.5.403/wscript	2014-10-24 19:20:20.160000000 +0200
+@@ -675,6 +675,8 @@ def configure(conf):
+         conf.env['PHONE_HOME'] = True
+     if opts.fpu_optimization:
+         conf.env['FPU_OPTIMIZATION'] = True
++    else:
++	conf.env['FPU_OPTIMIZATION'] = False
+     if opts.nls:
+         conf.define('ENABLE_NLS', 1)
+         conf.env['ENABLE_NLS'] = True
diff --git a/media-sound/ardour/files/ardour-3.5.7-syslibs.patch b/media-sound/ardour/files/ardour-3.5.7-syslibs.patch
new file mode 100644
index 000000000000..2f8ab10cf3d7
--- /dev/null
+++ b/media-sound/ardour/files/ardour-3.5.7-syslibs.patch
@@ -0,0 +1,36 @@
+diff -rupN a/ardour-3.5.74/libs/ardour/wscript b/ardour-3.5.74/libs/ardour/wscript
+--- a/ardour-3.5.74/libs/ardour/wscript 2013-11-05 20:20:03.000000000 +0100
++++ b/ardour-3.5.74/libs/ardour/wscript 2013-11-08 09:51:41.553000000 +0100
+@@ -287,7 +287,8 @@ def configure(conf):
+ 
+     # we don't try to detect this, since its part of our source tree
+ 
+-    conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
++    autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', atleast_version='1.7')
++    autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', atleast_version='1.4')
+     conf.define('USE_RUBBERBAND', 1)  # controls whether we actually use it
+ 
+     conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
+@@ -332,7 +333,7 @@ def build(bld):
+     obj.target       = 'ardour'
+     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
+                         'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
+-                        'OSX','BOOST','CURL','DL']
++                        'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
+     obj.use          = ['libpbd','libmidipp','libevoral','libvampplugin',
+                         'libaudiographer','libltc','libtimecode']
+     if bld.is_defined('USE_EXTERNAL_LIBS'):
+diff -rupN a/ardour-3.5.74/wscript b/ardour-3.5.74/wscript
+--- a/ardour-3.5.74/wscript     2013-11-05 20:20:03.000000000 +0100
++++ b/ardour-3.5.74/wscript     2013-11-08 09:49:27.594000000 +0100
+@@ -56,9 +56,7 @@ children = [
+         'libs/vamp-sdk',
+         'libs/qm-dsp',
+         'libs/vamp-plugins',
+-        'libs/taglib',
+         'libs/libltc',
+-        'libs/rubberband',
+         'libs/surfaces',
+         'libs/panners',
+         'libs/backends',
+
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.0-revision-naming.patch b/media-sound/ardour/files/ardour-4.0-revision-naming.patch
new file mode 100644
index 000000000000..360ddc6a515c
--- /dev/null
+++ b/media-sound/ardour/files/ardour-4.0-revision-naming.patch
@@ -0,0 +1,78 @@
+diff -rupN ardour-4.0-vanilla/wscript ardour-4.0/wscript
+--- ardour-4.0-vanilla/wscript  2015-04-18 00:23:10.000000000 +0200
++++ ardour-4.0/wscript  2015-04-20 18:26:50.849812000 +0200
+@@ -137,29 +137,29 @@ def fetch_tarball_revision ():
+     if not os.path.exists ('libs/ardour/revision.cc'):
+         print ('This tarball was not created correctly - it is missing libs/ardour/revision.cc')
+         sys.exit (1)
+-    with open('libs/ardour/revision.cc') as f:
+-        content = f.readlines()
+-        remove_punctuation_map = dict((ord(char), None) for char in '";')
+-        return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map)
+-
+-if os.path.isdir (os.path.join(os.getcwd(), '.git')):
+-    rev = fetch_git_revision ()
+-else:
+-    rev = fetch_tarball_revision ()
++#    with open('libs/ardour/revision.cc') as f:
++#        content = f.readlines()
++#        remove_punctuation_map = dict((ord(char), None) for char in '";')
++#        return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map)
++
++#if os.path.isdir (os.path.join(os.getcwd(), '.git')):
++#    rev = fetch_git_revision ()
++#else:
++#    rev = fetch_tarball_revision ()
+ 
+ #
+ # rev is now of the form MAJOR.MINOR[-rcX]-rev-commit
+ # or, if right at the same rev as a release, MAJOR.MINOR[-rcX]
+ #
+ 
+-parts = rev.split ('.', 1)
+-MAJOR = parts[0]
+-other = parts[1].split('-', 1)
+-MINOR = other[0]
+-if len(other) > 1:
+-    MICRO = other[1].rsplit('-',1)[0].replace('-','.')
+-else:
+-    MICRO = '0'
++#parts = rev.split ('.', 1)
++MAJOR = '4'
++#other = parts[1].split('-', 1)
++MINOR = '0'
++#if len(other) > 1:
++#    MICRO = other[1].rsplit('-',1)[0].replace('-','.')
++#else:
++MICRO = 'gentoo'
+ 
+ V = MAJOR + '.' + MINOR + '.' + MICRO
+ VERSION = V
+@@ -216,16 +216,16 @@ def fetch_gcc_version (CC):
+     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 = "4.0-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..7a22596af972
--- /dev/null
+++ b/media-sound/ardour/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proaudio</herd>
+  <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..41f907e9dea0
--- /dev/null
+++ b/media-sound/ario/Manifest
@@ -0,0 +1 @@
+DIST ario-1.5.1.tar.gz 1135444 SHA256 0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e SHA512 78c3d881d51c3109b73252da0742da2a77bcc24ec21ff2ff02fd3527d62d49a75e412bf092051a9035863d645cba73e6cd2fc674d97629909b931ae9d3ec002b WHIRLPOOL 3f280635019dca6dfff5e5681bb38a559986475b31c9c03831ae7e9893af18c03ee8fd3cfd1524a9756b80543bbde01ec3de1a7a4f223e5aeca4e6e8462fe87a
diff --git a/media-sound/ario/ario-1.5.1.ebuild b/media-sound/ario/ario-1.5.1.ebuild
new file mode 100644
index 000000000000..3de19a8e31e7
--- /dev/null
+++ b/media-sound/ario/ario-1.5.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GNOME2_LA_PUNT=yes
+PYTHON_DEPEND="python? 2"
+
+inherit gnome2 python
+
+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}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+DOCS=( AUTHORS )
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-single-includes.patch
+}
+
+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-includes.patch b/media-sound/ario/files/ario-1.5.1-single-includes.patch
new file mode 100644
index 000000000000..da7d7b598a8c
--- /dev/null
+++ b/media-sound/ario/files/ario-1.5.1-single-includes.patch
@@ -0,0 +1,48 @@
+Description: Only <glib.h> can be included directly.
+ Starting with glib 2.32 it is now mandatory to include glib.h
+ instead of individual headers, or the compiler will generate
+ an error.
+Origin: vendor: Debian
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665506
+
+Index: ario-1.5.1/src/ario-profiles.h
+===================================================================
+--- ario-1.5.1.orig/src/ario-profiles.h	2011-05-17 19:54:49.000000000 +0200
++++ ario-1.5.1/src/ario-profiles.h	2012-03-30 07:10:46.285079675 +0200
+@@ -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: ario-1.5.1/src/plugins/ario-plugin-info.c
+===================================================================
+--- ario-1.5.1.orig/src/plugins/ario-plugin-info.c	2011-02-27 16:07:28.000000000 +0100
++++ ario-1.5.1/src/plugins/ario-plugin-info.c	2012-03-30 07:10:48.289079604 +0200
+@@ -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: ario-1.5.1/src/ario-util.h
+===================================================================
+--- ario-1.5.1.orig/src/ario-util.h	2011-02-27 16:07:31.000000000 +0100
++++ ario-1.5.1/src/ario-util.h	2012-03-30 07:21:04.725057804 +0200
+@@ -18,8 +18,8 @@
+  */
+ 
+ #include "servers/ario-server.h"
+-#include "glib/gslist.h"
+-#include "gdk/gdkpixbuf.h"
++#include <glib.h>
++#include <gdk/gdkpixbuf.h>
+ 
+ /* Number of covers used to generate the drag & drop image */
+ #define MAX_COVERS_IN_DRAG 3
diff --git a/media-sound/ario/metadata.xml b/media-sound/ario/metadata.xml
new file mode 100644
index 000000000000..06aad3410300
--- /dev/null
+++ b/media-sound/ario/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>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</name>
+	</maintainer>
+	<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..b7254fc8fb69
--- /dev/null
+++ b/media-sound/aseqview/Manifest
@@ -0,0 +1 @@
+DIST aseqview-0.2.8.tar.gz 120287 SHA256 f2db64d4d0dee0800c204a87698f7dd8415c3e5d192218872231cb116629a947
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..cf3610942a5b
--- /dev/null
+++ b/media-sound/aseqview/aseqview-0.2.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/aseqview/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
new file mode 100644
index 000000000000..3950b410d58e
--- /dev/null
+++ b/media-sound/asunder/Manifest
@@ -0,0 +1,3 @@
+DIST asunder-2.2.tar.bz2 208936 SHA256 bb608c1cdefcce2f533fb5d5cc23838846b2810ec89d0ebb083507cf27e7822f SHA512 6f2a9a2f6d047a41ef0aaa221fafdc86f3fe6e49f9c8cfcaae4e325b62f3f17cddafa57982d2d3aca0922bce6aa29015d398cbf97ddfb44c7d7dfdd75aefab4c WHIRLPOOL 16b0da49f44d09f95d2a86f6290718d850c014c7aef0e875654efda05e0b959bf64a21f2c101a4e897aec633dce215f41ee3f1db221c25d8b04cb600372a633b
+DIST asunder-2.5.tar.bz2 226657 SHA256 0e548050143f964a0f869d44680554c7f7204b53262340ef0bd0f32e37507f20 SHA512 037a9c2478227de400d6dd2a86db80e6d3c6ac189cfbaf5a8c3107f8443590dc50c18f91abb47ee660880f56ba6f03435c3fb539f5df874ad1076fef1e54f474 WHIRLPOOL 6818c1a821cfec63e7082d2ff27eedbd04b17f3c0f9d7ec2aa48fd7b7cab95feb0695f9cce9fdbed4d15dbf2e44141fc569e05df1c0cddb42dec3a7e40562b68
+DIST asunder-2.7.tar.bz2 268834 SHA256 e69698f9524e443ac564b5d4b2df135ed7e5b2f94d6b3cabeae5bb2a3c828914 SHA512 3c5116411a30d4ac95ee4303c1627a385bc1bb62680ce15536fa524c8301928a81b4987043490318548832834893d31e51e46b8afb43a4e76ac0aedfeb38b7b7 WHIRLPOOL d97eeed3c7f0497b0afab2401601f1e53a3f5a0da81f1f3d74c26284ab383b3c4c08c4b664dc02083eadcc8bb2518d2b58ac19f8defe3e75525aa12a9bf49579
diff --git a/media-sound/asunder/asunder-2.2.ebuild b/media-sound/asunder/asunder-2.2.ebuild
new file mode 100644
index 000000000000..bded8e2ec07b
--- /dev/null
+++ b/media-sound/asunder/asunder-2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="A graphical Audio CD ripper and encoder with support for WAV, MP3, OggVorbis and FLAC"
+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.5.ebuild b/media-sound/asunder/asunder-2.5.ebuild
new file mode 100644
index 000000000000..c54d2df3b069
--- /dev/null
+++ b/media-sound/asunder/asunder-2.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A graphical Audio CD ripper and encoder with support for WAV, MP3, OggVorbis, FLAC and Opus"
+HOMEPAGE="http://littlesvr.ca/asunder/"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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() {
+	sed -i -e 's:cd syslogng && $(MAKE) install:true:' "${S}"/Makefile.in
+}
diff --git a/media-sound/asunder/asunder-2.7.ebuild b/media-sound/asunder/asunder-2.7.ebuild
new file mode 100644
index 000000000000..0b6f31c5f277
--- /dev/null
+++ b/media-sound/asunder/asunder-2.7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A graphical Audio CD ripper and encoder with support for WAV, MP3, OggVorbis, FLAC and Opus"
+HOMEPAGE="http://littlesvr.ca/asunder/"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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() {
+	sed -i -e 's:cd syslogng && $(MAKE) install:true:' "${S}"/Makefile.in
+}
diff --git a/media-sound/asunder/metadata.xml b/media-sound/asunder/metadata.xml
new file mode 100644
index 000000000000..0daab18b9278
--- /dev/null
+++ b/media-sound/asunder/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+<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..17d6ae6914a2
--- /dev/null
+++ b/media-sound/aucdtect/Manifest
@@ -0,0 +1 @@
+DIST aucdtect-0.8.2.rpm 221616 SHA256 ad56e301106d109274f5f9528ddfce6a6ac71e00951806682cb6ac823370e5d2 SHA512 9d7ff78915bb110e93907d74abc9201316927f80919c33617d7204027556ae30bdb358f90ce7688e4d02b4ac007b04409185c93ef59ed3212b6db2f55ee83d43 WHIRLPOOL 78356452976c92884b5cb3c360dff335cdc059f0968e9f8dbc4145abc60fd772d309a4b85080ef86d5d3afe517c0240299d681699f5b3660be5c02b08402e1e8
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..f90c742a33c5
--- /dev/null
+++ b/media-sound/aucdtect/aucdtect-0.8.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..3bf6bcfeb512
--- /dev/null
+++ b/media-sound/aucdtect/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
new file mode 100644
index 000000000000..c9c1708e0294
--- /dev/null
+++ b/media-sound/audacious/Manifest
@@ -0,0 +1,14 @@
+DIST audacious-2.4.4.tgz 1344519 SHA256 76f84038a0360da80aeaddd1ec23e5a55fee5a120abffce97c4609958cdb30e8 SHA512 39b2f243863ac6dcd81dceaec7d0f3f1078ebf92336616c6d60016e1c9a79a90db7f3161cccfa13b2498a8efeeab3e3528b508ce9366653f96a6e2c9ae8148e3 WHIRLPOOL 57c246647aaca7b6f01047805dd1c4db9ed381460cc81a799d38cc4c9a06a86e01485ec0bddc8a0ddadc5d8685638aee1cad002405770235f6a64c8216054444
+DIST audacious-2.5.4.tar.gz 1221134 SHA256 47bc36010e84c2c9638537a42a8451743d55a699bf85c614f3b913596f6e2fcd SHA512 4c6cdcd19e2de468c60c3a65fd75320f47febf3890011a6d7ebf5886ea34179bfb98bbbedd822ceeb278a466a63ba47d0243c90dd8cc04bb814ac50d60b54a1d WHIRLPOOL 99fb1f1541647ee378ab771975691b40230d3a3f7051cc714e9a0276101f3eda92e00c2071b89e62c1211481c41a0a9722a9ca494e50c93a88d4d69a334aa14a
+DIST audacious-3.1.1.tar.bz2 766551 SHA256 50e229579a0ee06e88d2b123c8db6b373db73e87898e8b4843a1bd02e3cab8ac SHA512 507381330ffb20898ece803a5782047ef316925e749940cffff590129f4b5eef895c4062b20e59cc7663e51e45c5668565bff009e71d31a5ee03f4d0e720ee79 WHIRLPOOL c5d4695308b6a219de77aa0803d0975454814156ee9c1cac142781f092d66b48121d67f2834b3949efaef1e8f75ebe42cbf1b0559864e8ba6c06c2a1c83eef1c
+DIST audacious-3.1.tar.bz2 793321 SHA256 306db180cd269b072cfb23551b4139cd2af28d8afb6699836ad82aa3bcec3a46 SHA512 c80c44dc94bf25bbf0dbcb0a2de2c8a0e2cbdb7261792f7b12b96f7aaec049b227cd67704228ad6dcd33b955d0b4ce3393511eca036cbaf996f753e85c9f7141 WHIRLPOOL 195061cc46ac5b9d6e79fafc4736d756501955b144bf2e53c439c6175632507c57962e0a29adbd030168e6d08498f2aedaa520213fbe14dfd819e27e0951825d
+DIST audacious-3.2.2.tar.bz2 675192 SHA256 c69c20e48c2ed330a0ffb55f3a648b50323406e2a15ca407e3291f83e57042ee SHA512 e9c1e4c6c9bccac83f64280742036bfbab07737af903c8b3cf7d41dda0ce1c7d449eecba6c87918d750197cb8bd7b6c9eb034e670ea3a04cbcc3699de4762e36 WHIRLPOOL 0fe8ff2bcbd366ba0f887910f99bb4f691bca716c49a31f69a90b0ee4db209875514da8fa2c440ccaae934ff0bd10692f07713bf73cb89bddb00a7e0caf00f31
+DIST audacious-3.2.3.tar.bz2 695917 SHA256 aea8ad2f4da80fb58cf8b0e880585ab49ac42e8a02247c364ea29ccca5572bae SHA512 29bcb02240cfeca8611935a9093b6271bc52809515b07fdaf846457b914ff13c03d82332a762332a16cc7a036963c582f5ab2f0b25592312478dee3a38510c7e WHIRLPOOL d92d6a5f9cb2ef46138527c47adac50f44acf33f2dd89a624875467dff39e20e72be61eb4aebd9216306b70cce43abb75e5c286da3108ec7bc14d27127b0991a
+DIST audacious-3.2.4.tar.bz2 690943 SHA256 12a14542883407110d2b4367db38e8e0620d83a266388427f358a66689a4553a SHA512 a6d4ce6c352f875caa84b32d8ff30d49e787ca387f6a25cb6a7d44be7f5432c147259a9112b247497804ffc2959ffc2713a90eeed7204d55dd26607896d3936e WHIRLPOOL a50cc579b50266e581b7c25ee56b97a54433f1c5310dd8e34eec96c5d205e921ae781ff4207f87bf1d08800b1a94cbc2baedc84f72dad30f2b2fd35bfeb79b7f
+DIST audacious-3.3.3.tar.bz2 470286 SHA256 bda1074c98284471b8ded1caa5f640cdde6e8723fa8b3f4fd685de97228f7c94 SHA512 82593b3cb2b104e6d1dcbd87ff51dad0d8ff125065700db8349032fd4eb2bdf4d08f214fd575cc405914234817a6c3092c3cf4ad62c223b4287a44845b91350f WHIRLPOOL 646980115e8c3cbe2441700b4926adb528e9a2c1e234e82290a1e9c702f5eb7aa7e069d94af210ecee8337aae905bedf77055e7ff5b16043f670094c62a65855
+DIST audacious-3.3.4.tar.bz2 473345 SHA256 671cdbf9b6b722b4ff4f43bcf85da0bdd1dfdf461b510cf6ecdb9187a427fca7 SHA512 0da20e09dec3104f6e0c16a61eee7fdbd221e21d460544efd1dd2b2f12476f62f0f9042976e6b682510a21fb894fa8a089730ed7a780544e4b49ca6f5b0b6b89 WHIRLPOOL 38ae46e98e378d8b16dc3841f2ebf9907735cb7d2a204d00cc93837f132a0fdeab9acc6c1da40dd3ac0a41a1e33074a308a7941653e4d0ca5e1347b1ef24ed04
+DIST audacious-3.4.1.tar.bz2 474755 SHA256 57ed4d8378b1e753e266a82424c3ae595b6c0e88fc3e32957720cd6cc14ac971 SHA512 2a9e203544861a0b902b720823202ef1038927932826847dc9b9a9c321dbecc19e2187afbdeb62a22ee8e6348c7df609ad671c8c63da2abc003a37556df20ac3 WHIRLPOOL 4b8facfb9fb3187286a59f5ddbba4ec784a3fd42e2fcadf322ee27cd8d1ae08ee3d5e23cb5c56875d3d3a879c1dd7ba21407cf19ef400693b8ab7a0adc176087
+DIST audacious-3.5.1.tar.bz2 446632 SHA256 df380e1ade112c703f57bc3883c71a1025e8d77091a772b86c0f9072efa69507 SHA512 b9ae3e0647b2fe76856a79d014db53ccdbce9524b62522c626032cf4a8d67b3828c280dade79a0327f4f279ece39d6aa600405a018aea0a11707c1903f479fad WHIRLPOOL 9f3a0c4f894aeb7a7274cfbfa181f25c6e4fedfd302c6b79c1a2fac47195ff73250229477278da704240a1259f9592966a0b07afaede41c5f424fd1afad61a0a
+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 gentoo_ice-xmms-0.2.tar.bz2 51839 SHA256 d1be63368b76f4a8b1d5b0e955cd7a77177f56a7f0b828c6603d8fd2836422b1 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05 WHIRLPOOL b7a4409629a860021477f34f8886c40c005ea2ec34373d80e6a696323866e54f361e38c76b1ac536775ae5912308f11416e613dec791f21473f01a2fad35bcfd
diff --git a/media-sound/audacious/audacious-2.4.4.ebuild b/media-sound/audacious/audacious-2.4.4.ebuild
new file mode 100644
index 000000000000..4320150dc819
--- /dev/null
+++ b/media-sound/audacious/audacious-2.4.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=1
+
+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.atheme.org/${MY_P}.tgz
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="altivec chardet nls session cpu_flags_x86_sse2"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	>=dev-libs/libmcs-0.7.1-r2
+	>=dev-libs/libmowgli-0.7.0:0
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/gtk+-2.14:2
+	>=x11-libs/pango-1.8.0
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-2.4.4"
+
+src_compile() {
+	# 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 altivec) \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		|| die
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README
+
+	# 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-2.5.4.ebuild b/media-sound/audacious/audacious-2.5.4.ebuild
new file mode 100644
index 000000000000..08daba6a467b
--- /dev/null
+++ b/media-sound/audacious/audacious-2.5.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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.atheme.org/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="altivec chardet nls session cpu_flags_x86_sse2"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	>=dev-libs/libmcs-0.7.1-r2
+	>=dev-libs/libmowgli-0.9.50:0
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/gtk+-2.14:2
+	>=x11-libs/pango-1.8.0
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( app-i18n/libguess )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-2.5.4"
+
+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 altivec) \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm) \
+		$(use_enable cpu_flags_x86_sse2 sse2)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README
+
+	# 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.1.1.ebuild b/media-sound/audacious/audacious-3.1.1.ebuild
new file mode 100644
index 000000000000..04ac865306c0
--- /dev/null
+++ b/media-sound/audacious/audacious-3.1.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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.atheme.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="chardet nls session"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	>=dev-libs/libmcs-0.7.1-r2
+	>=dev-libs/libmowgli-0.9.50:0
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	x11-libs/gtk+:3
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.1.1"
+
+src_configure() {
+	# Some gccs don't like "-z defs" on their command line. Explicitly make it a
+	# linker flag (bug 395213).
+	epatch "${FILESDIR}/audacious_ldflags.patch"
+
+	# 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
+	# Use of GTK+2 causes plugin build failures, bug #384185
+	econf \
+		--enable-dbus \
+		--enable-gtk3 \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS NEWS README
+
+	# 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.1.ebuild b/media-sound/audacious/audacious-3.1.ebuild
new file mode 100644
index 000000000000..3eaedb30465d
--- /dev/null
+++ b/media-sound/audacious/audacious-3.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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.atheme.org/${MY_P}.tar.bz2
+	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="chardet nls session"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	>=dev-libs/libmcs-0.7.1-r2
+	>=dev-libs/libmowgli-0.9.50:0
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	x11-libs/gtk+:3
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( app-i18n/libguess )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.1"
+
+src_configure() {
+	# Some gccs don't like "-z defs" on their command line. Explicitly make it a
+	# linker flag (bug 395213).
+	epatch "${FILESDIR}/audacious_ldflags.patch"
+
+	# 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
+	# Use of GTK+2 causes plugin build failures, bug #384185
+	econf \
+		--enable-dbus \
+		--enable-gtk3 \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS NEWS README
+
+	# 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.2.2-r1.ebuild b/media-sound/audacious/audacious-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..f161c3d90b95
--- /dev/null
+++ b/media-sound/audacious/audacious-3.2.2-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils autotools
+
+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="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="chardet +gtk gtk3 nls session"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.2.2"
+REQUIRED_USE="^^ ( gtk gtk3 )"
+
+src_prepare() {
+	epatch "$FILESDIR"/${P}-fix-build-gmodule.patch
+	eaclocal -I m4
+	eautoheader
+	eautoconf
+}
+
+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
+	# Use of GTK+2 causes plugin build failures, bug #384185
+	econf \
+		--enable-dbus \
+		$(use_enable gtk3) \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS README
+
+	# 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.2.3.ebuild b/media-sound/audacious/audacious-3.2.3.ebuild
new file mode 100644
index 000000000000..8b814df68ad8
--- /dev/null
+++ b/media-sound/audacious/audacious-3.2.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+
+IUSE="chardet nls session"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	x11-libs/gtk+:2
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.2.3"
+
+src_prepare() {
+	epatch "$FILESDIR"/${P}-fix-mutex.patch
+}
+
+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
+	# Use of gtk+:3 causes some plugins to not have preference pages
+	# and statusicon to not build. Disable till Audacious 3.3 when
+	# these issues will have been fixed.
+	econf \
+		--enable-dbus \
+		--disable-gtk3 \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS README
+
+	# 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.2.4.ebuild b/media-sound/audacious/audacious-3.2.4.ebuild
new file mode 100644
index 000000000000..4db974ad3cdf
--- /dev/null
+++ b/media-sound/audacious/audacious-3.2.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+
+IUSE="chardet nls session"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.16
+	dev-libs/libxml2
+	>=x11-libs/cairo-1.2.6
+	>=x11-libs/pango-1.8.0
+	x11-libs/gtk+:2
+	session? ( x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	chardet? ( >=app-i18n/libguess-1.1 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.2.4"
+
+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
+	# Disable gtk+:3 till Audacious 3.3
+	econf \
+		--enable-dbus \
+		--disable-gtk3 \
+		$(use_enable chardet) \
+		$(use_enable nls) \
+		$(use_enable session sm)
+}
+
+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.3.3.ebuild b/media-sound/audacious/audacious-3.3.3.ebuild
new file mode 100644
index 000000000000..07cd1ed6ece6
--- /dev/null
+++ b/media-sound/audacious/audacious-3.3.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+
+IUSE="chardet nls"
+
+RDEPEND=">=dev-libs/dbus-glib-0.60
+	>=dev-libs/glib-2.30
+	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.3.3"
+
+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.3.4.ebuild b/media-sound/audacious/audacious-3.3.4.ebuild
new file mode 100644
index 000000000000..aa14e5980e1d
--- /dev/null
+++ b/media-sound/audacious/audacious-3.3.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~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.3.4"
+
+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.4.1.ebuild b/media-sound/audacious/audacious-3.4.1.ebuild
new file mode 100644
index 000000000000..bcff67cda5b1
--- /dev/null
+++ b/media-sound/audacious/audacious-3.4.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~x86-interix ~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.5.1.ebuild b/media-sound/audacious/audacious-3.5.1.ebuild
new file mode 100644
index 000000000000..0adc3c903556
--- /dev/null
+++ b/media-sound/audacious/audacious-3.5.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~x86-interix ~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.2 )
+	nls? ( dev-util/intltool )"
+
+PDEPEND="~media-plugins/audacious-plugins-3.5.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..39cdf917d507
--- /dev/null
+++ b/media-sound/audacious/audacious-3.6.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="~amd64 ~arm ~hppa ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~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/files/audacious-3.2.2-fix-build-gmodule.patch b/media-sound/audacious/files/audacious-3.2.2-fix-build-gmodule.patch
new file mode 100644
index 000000000000..587b68fa1a49
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.2.2-fix-build-gmodule.patch
@@ -0,0 +1,51 @@
+commit 7b68fdab1dbd2ec3e8eeb37a7a0837d4d0e20851
+Author: John Lindgren <john.lindgren@aol.com>
+Date:   Mon Apr 2 16:50:39 2012 -0400
+
+    Use GMODULE_{CFLAGS,LIBS}.
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 6f6f293..5acb6b7 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -194,6 +194,7 @@ AC_PATH_PROG([WINDRES], [windres])
+ dnl Check for Gtk+/GLib and pals
+ dnl ============================
+ AUD_CHECK_MODULE([GLIB], [glib-2.0], [>= 2.16], [Glib2])
++AUD_CHECK_MODULE([GMODULE], [gmodule-2.0], [>= 2.16], [GModule])
+ AUD_CHECK_MODULE([GTHREAD], [gthread-2.0], [>= 2.16], [GThread])
+ AUD_CHECK_MODULE([PANGO], [pango], [>= 1.20], [Pango])
+ AUD_CHECK_MODULE([CAIRO], [cairo], [>= 1.6], [Cairo])
+diff --git a/extra.mk.in b/extra.mk.in
+index 464bbb0..1ff2a08 100644
+--- a/extra.mk.in
++++ b/extra.mk.in
+@@ -21,6 +21,8 @@ DBUS_CFLAGS ?= @DBUS_CFLAGS@
+ DBUS_LIBS ?= @DBUS_LIBS@
+ GLIB_CFLAGS ?= @GLIB_CFLAGS@
+ GLIB_LIBS ?= @GLIB_LIBS@
++GMODULE_CFLAGS ?= @GMODULE_CFLAGS@
++GMODULE_LIBS ?= @GMODULE_LIBS@
+ GTHREAD_CFLAGS ?= @GTHREAD_CFLAGS@
+ GTHREAD_LIBS ?= @GTHREAD_LIBS@
+ GTK_CFLAGS ?= @GTK_CFLAGS@
+diff --git a/src/audacious/Makefile b/src/audacious/Makefile
+index ea95c85..22dad64 100644
+--- a/src/audacious/Makefile
++++ b/src/audacious/Makefile
+@@ -99,6 +99,7 @@ pre-depend: ${DBUS_BINDINGS}
+ CPPFLAGS := -I.. -I../.. \
+             ${CPPFLAGS} \
+ 		${GLIB_CFLAGS}			\
++		${GMODULE_LIBS} \
+ 		${GTHREAD_CFLAGS} \
+ 		${GTK_CFLAGS}			\
+ 		${AUDACIOUS_DEFINES}	\
+@@ -119,6 +120,7 @@ LIBS := -L../libaudcore -laudcore \
+ 		${LIBINTL}						\
+ 		${EGGSM_LIBS}					\
+ 		${GLIB_LIBS}					\
++		${GMODULE_LIBS} \
+ 		${GTHREAD_LIBS} \
+ 		${GTK_LIBS}						\
+ 		${DBUS_LIBS}					\
diff --git a/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch b/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch
new file mode 100644
index 000000000000..3fb209196f83
--- /dev/null
+++ b/media-sound/audacious/files/audacious-3.2.3-fix-mutex.patch
@@ -0,0 +1,89 @@
+commit b53935921298b8164f80454c2016bd40de29704b
+Author: John Lindgren <john.lindgren@aol.com>
+Date:   Sat May 26 11:55:42 2012 -0400
+
+    Fix violation of mutex locking order (playback then playlist). Found by Helgrind.
+
+diff --git a/src/audacious/playlist-new.c b/src/audacious/playlist-new.c
+index 6407f64..596fbaa 100644
+--- a/src/audacious/playlist-new.c
++++ b/src/audacious/playlist-new.c
+@@ -822,6 +822,7 @@ void playlist_reorder (int from, int to, int count)
+ 
+ void playlist_delete (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -969,6 +970,7 @@ int playlist_get_active (void)
+ 
+ void playlist_set_playing (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing ())
+         playback_stop ();
+ 
+@@ -1112,6 +1114,7 @@ void playlist_entry_insert_batch_raw (int playlist_num, int at,
+ 
+ void playlist_entry_delete (int playlist_num, int at, int number)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing () &&
+      playlist_get_position (playlist_num) >= at && playlist_get_position
+      (playlist_num) < at + number)
+@@ -1225,6 +1228,7 @@ int playlist_entry_get_length (int playlist_num, int entry_num, bool_t fast)
+ 
+ void playlist_set_position (int playlist_num, int entry_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -1423,6 +1427,7 @@ int playlist_shift (int playlist_num, int entry_num, int distance)
+ 
+ void playlist_delete_selected (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing () &&
+      playlist_get_position (playlist_num) >= 0 && playlist_entry_get_selected
+      (playlist_num, playlist_get_position (playlist_num)))
+@@ -2023,6 +2028,7 @@ static bool_t shuffle_prev (Playlist * playlist)
+ 
+ bool_t playlist_prev_song (int playlist_num)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -2110,6 +2116,7 @@ static void shuffle_reset (Playlist * playlist)
+ 
+ bool_t playlist_next_song (int playlist_num, bool_t repeat)
+ {
++    /* stop playback before locking playlists */
+     if (playback_get_playing () && playlist_num == playlist_get_playing ())
+         playback_stop ();
+ 
+@@ -2253,6 +2260,11 @@ int playback_entry_get_end_time (void)
+ 
+ void playlist_save_state (void)
+ {
++    /* get playback state before locking playlists */
++    resume_state = playback_get_playing () ? (playback_get_paused () ?
++     RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
++    resume_time = playback_get_playing () ? playback_get_time () : 0;
++
+     ENTER;
+ 
+     char * path = g_strdup_printf ("%s/" STATE_FILE, get_path (AUD_PATH_USER_DIR));
+@@ -2261,10 +2273,6 @@ void playlist_save_state (void)
+     if (! handle)
+         LEAVE_RET_VOID;
+ 
+-    resume_state = playback_get_playing () ? (playback_get_paused () ?
+-     RESUME_PAUSE : RESUME_PLAY) : RESUME_STOP;
+-    resume_time = playback_get_playing () ? playback_get_time () : 0;
+-
+     fprintf (handle, "resume-state %d\n", resume_state);
+     fprintf (handle, "resume-time %d\n", resume_time);
+ 
diff --git a/media-sound/audacious/files/audacious_ldflags.patch b/media-sound/audacious/files/audacious_ldflags.patch
new file mode 100644
index 000000000000..e030b1af5dae
--- /dev/null
+++ b/media-sound/audacious/files/audacious_ldflags.patch
@@ -0,0 +1,11 @@
+--- configure.old	2012-01-17 12:41:09.000000000 +0000
++++ configure	2012-01-17 12:41:42.000000000 +0000
+@@ -4759,7 +4759,7 @@
+     *linux*)
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-        LDFLAGS="$LDFLAGS -z defs"
++        LDFLAGS="$LDFLAGS -Wl,-z,defs"
+         ;;
+     *)
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
new file mode 100644
index 000000000000..cf82d9d8a5f2
--- /dev/null
+++ b/media-sound/audacious/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</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..567204ee0f14
--- /dev/null
+++ b/media-sound/audacity/Manifest
@@ -0,0 +1,4 @@
+DIST audacity-manual-2.1.1.zip 20224419 SHA256 fac323e5a5c34036ba4cf85800030e7ed7027e0e577abc31a3cda7c03ed30dc1 SHA512 0d5cc3e629ba66d03f54e151a18f455a7da09c1f19133ab647d791439625d0fd8e8cfd8dedbab0719aeb803850633bb3b8e2ca4d6fa3d4b1f3784720cd80ed84 WHIRLPOOL 4b6208e290900336a67f24eaa08d0e0b30f8762cdd846415d2aa1290bfa0736da6bacaf253f2815b472a963730c121ae5546a798d8d19609f34743d90d63236b
+DIST audacity-minsrc-2.0.2.tar.bz2 6794285 SHA256 ac8a5ec62a5748de7f885fb3f82a6b6acdb26b28276827a678ec17ce65b9879d SHA512 3099c01b099306ee77c3df569a7412c230006ba8e7f85d6e79f0bc0373cc4c95f231aab7e1bde0d297afa3c1db7fe6dc125715d803dc78a47df4b716d7423d2e WHIRLPOOL 3fe42264f20920d1cadd3386c4521ce557c5f10ee5168cb4222843a25894de6a0106f2ed4246a5ab827fd4765a30cca21d81945092f5fe21bd1009483e098868
+DIST audacity-minsrc-2.0.5.tar.xz 5314060 SHA256 e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 SHA512 d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004 WHIRLPOOL 106b4e8a6c4f1328d7d064b9b02abf636180ee151f3ac08d7e502424d4cce8fb8960fea0dc907625703cbfff808f82c556c3cf02f42aea186fb0aa00e4f967a0
+DIST audacity-minsrc-2.1.1.tar.xz 7154008 SHA256 49972a1e84d1747590dfba06cbbf1030718f3880d2678819dc2e765828377872 SHA512 36ffaf40452b2b89d5c2308edc5fe1ed1a49460e16eed324904825229a14e9fd11e5beeda61bd9b38d7f06746c0945f68aef99ac81d78ac97c09c389d100651d WHIRLPOOL 240715af6b17aa424e50fc6727fffac83368236afc4d3d376274d8e554d7bf2439a55ae22f439669c4e3115668ec875425aacde7f5aee6d7b05975f7466f5762
diff --git a/media-sound/audacity/audacity-2.0.2.ebuild b/media-sound/audacity/audacity-2.0.2.ebuild
new file mode 100644
index 000000000000..438ab4ef3f72
--- /dev/null
+++ b/media-sound/audacity/audacity-2.0.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils wxwidgets autotools versionator
+
+MY_PV=$(replace_version_separator 3 -)
+MY_P="${PN}-src-${MY_PV}"
+MY_T="${PN}-minsrc-${MY_PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/"
+SRC_URI="mirror://gentoo/${MY_T}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 x86"
+IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms soundtouch twolame vamp vorbis"
+RESTRICT="test"
+
+COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
+	>=app-arch/zip-2.3
+	>=media-libs/libsndfile-1.0.0
+	dev-libs/expat
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	mp3? ( >=media-libs/libmad-0.14.2b )
+	flac? ( >=media-libs/flac-1.2.0[cxx] )
+	id3tag? ( media-libs/libid3tag )
+	sbsms? ( media-libs/libsbsms )
+	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+	twolame? ( media-sound/twolame )
+	ffmpeg? ( virtual/ffmpeg )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
+# Crashes at  startup here...
+#	lv2? ( >=media-libs/slv2-0.6.0 )
+# Disabled upstream ATM
+#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
+
+RDEPEND="${COMMON_DEPEND}
+	mp3? ( >=media-sound/lame-3.70 )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch
+
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_configure() {
+	WX_GTK_VER="2.8"
+	need-wxwidgets unicode
+
+	# * always use system libraries if possible
+	# * options listed in the order that configure --help lists them
+	# * if libsamplerate not requested, use libresample instead.
+	econf \
+		--enable-unicode \
+		--enable-nyquist \
+		$(use_enable ladspa) \
+		--with-libsndfile=system \
+		--with-expat=system \
+		$(use_with libsamplerate) \
+		$(use_with !libsamplerate libresample) \
+		$(use_with vorbis libvorbis) \
+		$(use_with mp3 libmad) \
+		$(use_with flac libflac) \
+		$(use_with id3tag libid3tag) \
+		$(use_with sbsms) \
+		$(use_with soundtouch) \
+		$(use_with vamp libvamp) \
+		$(use_with twolame libtwolame) \
+		$(use_with ffmpeg) \
+		$(use_with midi) \
+		$(use_with alsa) \
+		$(use_with jack)
+}
+
+# $(use_with lv2 slv2) \
+# $(use_with ladspa liblrdf) \
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Remove bad doc install
+	rm -rf "${D}"/usr/share/doc
+
+	# Install our docs
+	dodoc README.txt
+}
diff --git a/media-sound/audacity/audacity-2.0.5.ebuild b/media-sound/audacity/audacity-2.0.5.ebuild
new file mode 100644
index 000000000000..11a5e3d14c8f
--- /dev/null
+++ b/media-sound/audacity/audacity-2.0.5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils wxwidgets autotools versionator
+
+MY_PV=$(replace_version_separator 3 -)
+MY_P="${PN}-src-${MY_PV}"
+MY_T="${PN}-minsrc-${MY_PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/"
+SRC_URI="mirror://gentoo/${MY_T}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 x86"
+IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate +libsoxr midi mp3 sbsms soundtouch twolame vamp vorbis"
+RESTRICT="test"
+
+COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
+	>=app-arch/zip-2.3
+	>=media-libs/libsndfile-1.0.0
+	dev-libs/expat
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	libsoxr? ( media-libs/soxr )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	mp3? ( >=media-libs/libmad-0.14.2b )
+	flac? ( >=media-libs/flac-1.2.0[cxx] )
+	id3tag? ( media-libs/libid3tag )
+	sbsms? ( media-libs/libsbsms )
+	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+	twolame? ( media-sound/twolame )
+	ffmpeg? ( virtual/ffmpeg )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
+# Crashes at  startup here...
+#	lv2? ( >=media-libs/slv2-0.6.0 )
+# Disabled upstream ATM
+#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
+
+RDEPEND="${COMMON_DEPEND}
+	mp3? ( >=media-sound/lame-3.70 )"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch
+
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_configure() {
+	WX_GTK_VER="2.8"
+	need-wxwidgets unicode
+
+	# * always use system libraries if possible
+	# * options listed in the order that configure --help lists them
+	# * if libsamplerate not requested, use libresample instead.
+	econf \
+		--enable-unicode \
+		--enable-nyquist \
+		--disable-dynamic-loading \
+		$(use_enable ladspa) \
+		--with-libsndfile=system \
+		--with-expat=system \
+		$(use_with libsamplerate) \
+		$(use_with !libsamplerate libresample) \
+		$(use_with libsoxr) \
+		$(use_with vorbis libvorbis) \
+		$(use_with mp3 libmad) \
+		$(use_with flac libflac) \
+		$(use_with id3tag libid3tag) \
+		$(use_with sbsms) \
+		$(use_with soundtouch) \
+		$(use_with vamp libvamp) \
+		$(use_with twolame libtwolame) \
+		$(use_with ffmpeg) \
+		$(use_with midi) \
+		$(use_with alsa) \
+		$(use_with jack)
+}
+
+# $(use_with lv2 slv2) \
+# $(use_with ladspa liblrdf) \
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Remove bad doc install
+	rm -rf "${D}"/usr/share/doc
+
+	# Install our docs
+	dodoc README.txt
+}
diff --git a/media-sound/audacity/audacity-2.1.1.ebuild b/media-sound/audacity/audacity-2.1.1.ebuild
new file mode 100644
index 000000000000..da1efd0adf5b
--- /dev/null
+++ b/media-sound/audacity/audacity-2.1.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils wxwidgets
+
+MY_P="${PN}-minsrc-${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/"
+SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${MY_P}.tar.xz
+	doc? ( http://dev.gentoo.org/~yngwin/distfiles/${PN}-manual-${PV}.zip )"
+	# wget doesn't seem to work on FossHub links, so we mirror
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+	+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
+RESTRICT="test"
+
+RDEPEND=">=app-arch/zip-2.3
+	dev-libs/expat
+	>=media-libs/libsndfile-1.0.0
+	=media-libs/portaudio-19*
+	media-libs/soxr
+	x11-libs/wxGTK:2.8[X]
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? ( libav? ( media-video/libav:= )
+		!libav? ( >=media-video/ffmpeg-1.2:= ) )
+	flac? ( >=media-libs/flac-1.2.0[cxx] )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
+	lame? ( >=media-sound/lame-3.70 )
+	lv2? ( media-libs/lv2 )
+	mad? ( >=media-libs/libmad-0.14.2b )
+	midi? ( media-libs/portmidi )
+	sbsms? ( media-libs/libsbsms )
+	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+	twolame? ( media-sound/twolame )
+	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S=${WORKDIR}/${MY_P}
+
+#src_prepare() {
+#	epatch "${FILESDIR}"/${P}-automagic.patch
+#	AT_M4DIR="${S}/m4" eautoreconf
+#}
+
+src_configure() {
+	WX_GTK_VER="2.8"
+	need-wxwidgets unicode
+
+	# * always use system libraries if possible
+	# * options listed in the order that configure --help lists them
+	econf \
+		$(use_enable nls) \
+		--enable-unicode \
+		$(use_enable cpu_flags_x86_sse sse) \
+		--disable-dynamic-loading \
+		--enable-nyquist \
+		$(use_enable ladspa) \
+		$(use_enable vst) \
+		--with-wx-version=${WX_GTK_VER} \
+		--with-expat=system \
+		$(use_with ffmpeg) \
+		$(use_with lame) \
+		$(use_with flac libflac) \
+		$(use_with id3tag libid3tag) \
+		$(use_with mad libmad) \
+		$(use_with sbsms) \
+		--with-libsndfile=system \
+		$(use_with soundtouch) \
+		--with-libsoxr=system \
+		$(use_with twolame libtwolame) \
+		$(use_with vamp libvamp) \
+		$(use_with vorbis libvorbis) \
+		$(use_with lv2) \
+		--with-portaudio \
+		$(use_with midi) \
+		--with-widgetextra=local \
+		$(use_with portmixer)
+#		$(use_with alsa) \
+#		$(use_with jack)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Remove bad doc install
+	rm -rf "${D}"/usr/share/doc
+
+	# Install our docs
+	dodoc README.txt
+
+	use doc && dohtml -r "${WORKDIR}"/help/manual
+}
diff --git a/media-sound/audacity/files/audacity-1.3.13-automagic.patch b/media-sound/audacity/files/audacity-1.3.13-automagic.patch
new file mode 100644
index 000000000000..4e7c2917e5db
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.13-automagic.patch
@@ -0,0 +1,61 @@
+--- audacity-src-1.3.13-beta.orig/configure.in
++++ audacity-src-1.3.13-beta/configure.in
+@@ -173,6 +173,9 @@
+             lib_preference=$withval,
+             lib_preference="system local")
+ 
++AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
++AC_ARG_WITH([jack], AS_HELP_STRING([--without-jack], [Build without jack library (default: test)]))
++
+ dnl AC_ARG_WITH(wx-version,
+ dnl            [AS_HELP_STRING([--with-wx-version],
+ dnl                            [select wxWidgets version (if both installed) [2.8,]])],
+@@ -574,13 +577,21 @@
+       ;;
+    *)
+       dnl Unix
+-      AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
+-      if [[ $have_alsa = "yes" ]] ; then
+-         LIBS="$LIBS -lasound"
+-      fi
+-      PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
+-      if [[ $have_jack = "yes" ]] ; then
+-         LIBS="$LIBS $JACK_LIBS"
++      if test "x$with_alsa" != "xno"; then
++         AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
++         if [[ $have_alsa = "yes" ]] ; then
++            LIBS="$LIBS -lasound"
++        else
++            AC_MSG_WARN([Support for alsa not available])
++         fi
++      fi        
++      if test "x$with_jack" != "xno"; then
++         PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
++         if [[ $have_jack = "yes" ]] ; then
++            LIBS="$LIBS $JACK_LIBS"
++        else
++            AC_MSG_WARN([Support for jack not available])
++         fi
+       fi
+       AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
+       if [[ $have_asihpi = "yes" ]] ; then
+--- audacity-src-1.3.13-beta.orig/lib-src/portmixer/configure.ac
++++ audacity-src-1.3.13-beta/lib-src/portmixer/configure.ac
+@@ -31,6 +31,8 @@
+   [AC_SUBST( cflags, ["$cflags -g"] )  AC_MSG_RESULT(yes)],
+   [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)])
+ 
++AC_ARG_WITH([alsa], AC_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
++
+ #
+ # Check for portaudio path
+ #
+@@ -133,7 +135,7 @@
+    have_support=yes
+ fi
+ 
+-if [[ $have_alsa = "yes" ]] ; then
++if [[ $have_alsa = "yes" -a "x$with_alsa" != "xno" ]] ; then
+    AC_MSG_NOTICE([Including support for ALSA])
+    AC_DEFINE(PX_USE_LINUX_ALSA)
+    objects="$objects px_linux_alsa.o"
diff --git a/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch b/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch
new file mode 100644
index 000000000000..675470913c8d
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch
@@ -0,0 +1,164 @@
+--- audacity-src-1.3.13-beta.orig/src/export/ExportFFmpeg.cpp
++++ audacity-src-1.3.13-beta/src/export/ExportFFmpeg.cpp
+@@ -352,7 +352,7 @@
+    avcodec_get_context_defaults(mEncAudioCodecCtx);
+ 
+    mEncAudioCodecCtx->codec_id = ExportFFmpegOptions::fmts[mSubFormat].codecid;
+-   mEncAudioCodecCtx->codec_type = CODEC_TYPE_AUDIO;
++   mEncAudioCodecCtx->codec_type = AVMEDIA_TYPE_AUDIO;
+    mEncAudioCodecCtx->codec_tag = av_codec_get_tag((const AVCodecTag **)mEncFormatCtx->oformat->codec_tag,mEncAudioCodecCtx->codec_id);
+    mSampleRate = (int)project->GetRate();
+    mEncAudioCodecCtx->global_quality = -99999; //quality mode is off by default;
+@@ -403,7 +403,6 @@
+       mEncAudioCodecCtx->flags2 = 0;
+       if (gPrefs->Read(wxT("/FileFormats/FFmpegBitReservoir"),true)) mEncAudioCodecCtx->flags2 |= CODEC_FLAG2_BIT_RESERVOIR;
+       if (gPrefs->Read(wxT("/FileFormats/FFmpegVariableBlockLen"),true)) mEncAudioCodecCtx->flags2 |= 0x0004; //WMA only?
+-      mEncAudioCodecCtx->use_lpc = gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true);
+       mEncAudioCodecCtx->compression_level = gPrefs->Read(wxT("/FileFormats/FFmpegCompLevel"),-1);
+       mEncAudioCodecCtx->frame_size = gPrefs->Read(wxT("/FileFormats/FFmpegFrameSize"),(long)0);
+       mEncAudioCodecCtx->lpc_coeff_precision = gPrefs->Read(wxT("/FileFormats/FFmpegLPCCoefPrec"),(long)0);
+@@ -569,7 +569,7 @@
+       pkt.stream_index = mEncAudioStream->index;
+       pkt.data = mEncAudioEncodedBuf;
+       pkt.size = nEncodedBytes;
+-      pkt.flags |= PKT_FLAG_KEY;
++      pkt.flags |= AV_PKT_FLAG_KEY;
+ 
+       // Set presentation time of frame (currently in the codec's timebase) in the stream timebase.
+       if(mEncAudioCodecCtx->coded_frame && mEncAudioCodecCtx->coded_frame->pts != int64_t(AV_NOPTS_VALUE))
+@@ -656,7 +656,7 @@
+ 
+       pkt.stream_index = mEncAudioStream->index;
+       pkt.data = mEncAudioEncodedBuf;
+-      pkt.flags |= PKT_FLAG_KEY;
++      pkt.flags |= AV_PKT_FLAG_KEY;
+ 
+       // Write the encoded audio frame to the output file.
+       if ((ret = av_interleaved_write_frame(mEncFormatCtx, &pkt)) != 0)
+--- audacity-src-1.3.13-beta.orig/src/export/ExportFFmpegDialogs.cpp
++++ audacity-src-1.3.13-beta/src/export/ExportFFmpegDialogs.cpp
+@@ -1288,7 +1288,7 @@
+    while ((codec = av_codec_next(codec)))
+    {
+       // We're only interested in audio and only in encoders
+-      if (codec->type == CODEC_TYPE_AUDIO && codec->encode)
++      if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode)
+       {
+          mCodecNames.Add(wxString::FromUTF8(codec->name));
+          mCodecLongNames.Add(wxString::Format(wxT("%s - %s"),mCodecNames.Last().c_str(),wxString::FromUTF8(codec->long_name).c_str()));
+@@ -1528,7 +1528,7 @@
+          // Find the codec, that is claimed to be compatible
+          AVCodec *codec = avcodec_find_encoder(CompatibilityList[i].codec);
+          // If it exists, is audio and has encoder
+-         if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && codec->encode)
++         if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && codec->encode)
+          {
+             // If it was selected - remember it's new index
+             if ((id >= 0) && codec->id == id) index = mShownCodecNames.GetCount();
+@@ -1543,7 +1543,7 @@
+       AVCodec *codec = NULL;
+       while ((codec = av_codec_next(codec)))
+       {
+-         if (codec->type == CODEC_TYPE_AUDIO && codec->encode)
++         if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode)
+          {
+             if (mShownCodecNames.Index(wxString::FromUTF8(codec->name)) < 0)
+             {
+@@ -1563,7 +1563,7 @@
+       if (format != NULL)
+       {
+          AVCodec *codec = avcodec_find_encoder(format->audio_codec);
+-         if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && codec->encode)
++         if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && codec->encode)
+          {
+             if ((id >= 0) && codec->id == id) index = mShownCodecNames.GetCount();
+             mShownCodecNames.Add(wxString::FromUTF8(codec->name));
+--- audacity-src-1.3.13-beta.orig/src/FFmpeg.cpp
++++ audacity-src-1.3.13-beta/src/FFmpeg.cpp
+@@ -316,7 +316,7 @@
+    pd.buf_size = 0;
+    pd.buf = (unsigned char *) av_malloc(PROBE_BUF_MAX + AVPROBE_PADDING_SIZE);
+    if (pd.buf == NULL) {
+-      err = AVERROR_NOMEM;
++      err = AVERROR(ENOMEM);
+       goto fail;
+    }
+ 
+@@ -381,7 +381,7 @@
+ 
+    // Didn't find a suitable format, so bail
+    if (!fmt) {
+-      err = AVERROR_NOFMT;
++      err = AVERROR(EILSEQ);
+       goto fail;
+    }
+ 
+@@ -855,7 +855,6 @@
+    FFMPEG_INITDYN(codec, avcodec_find_decoder);
+    FFMPEG_INITDYN(codec, avcodec_get_context_defaults);
+    FFMPEG_INITDYN(codec, avcodec_open);
+-   FFMPEG_INITDYN(codec, avcodec_decode_audio2);
+    FFMPEG_INITDYN(codec, avcodec_decode_audio3);
+    FFMPEG_INITDYN(codec, avcodec_encode_audio);
+    FFMPEG_INITDYN(codec, avcodec_close);
+--- audacity-src-1.3.13-beta.orig/src/FFmpeg.h
++++ audacity-src-1.3.13-beta/src/FFmpeg.h
+@@ -559,7 +559,11 @@
+    FFMPEG_FUNCTION_WITH_RETURN(
+       void*,
+       av_fast_realloc,
++#if LIBAVUTIL_VERSION_MAJOR < 51
+       (void *ptr, unsigned int *size, unsigned int min_size),
++#else
++      (void *ptr, unsigned int *size, size_t min_size),
++#endif
+       (ptr, size, min_size)
+    );
+    FFMPEG_FUNCTION_WITH_RETURN(
+@@ -747,7 +751,11 @@
+    FFMPEG_FUNCTION_WITH_RETURN(
+       void*,
+       av_malloc,
++#if LIBAVUTIL_VERSION_MAJOR < 51
+       (unsigned int size),
++#else
++      (size_t size),
++#endif
+       (size)
+    );
+    FFMPEG_FUNCTION_NO_RETURN(
+--- audacity-src-1.3.13-beta.orig/src/import/ImportFFmpeg.cpp
++++ audacity-src-1.3.13-beta/src/import/ImportFFmpeg.cpp
+@@ -416,7 +416,7 @@
+    // Fill the stream contexts
+    for (unsigned int i = 0; i < mFormatContext->nb_streams; i++)
+    {
+-      if (mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
++      if (mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+       {
+          //Create a context
+          streamContext *sc = new streamContext;
+--- audacity-src-1.3.13-beta.orig/src/ondemand/ODDecodeFFmpegTask.cpp
++++ audacity-src-1.3.13-beta/src/ondemand/ODDecodeFFmpegTask.cpp
+@@ -156,7 +156,7 @@
+    //test the audio stream(s)
+    for (unsigned int i = 0; i < ic->nb_streams; i++)
+    {
+-      if (ic->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
++      if (ic->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+       {  
+          audioStreamExists = true;                 
+          st = ic->streams[i];
+@@ -573,10 +573,10 @@
+       }
+    }
+ 
+-   // avcodec_decode_audio2() expects the size of the output buffer as the 3rd parameter but
++   // avcodec_decode_audio3() expects the size of the output buffer as the 3rd parameter but
+    // also returns the number of bytes it decoded in the same parameter.
+    sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;
+-   nBytesDecoded = avcodec_decode_audio2(sc->m_codecCtx, 
++   nBytesDecoded = avcodec_decode_audio3(sc->m_codecCtx, 
+       sc->m_decodedAudioSamples,		      // out
+       &sc->m_decodedAudioSamplesValidSiz,	// in/out
+       pDecode, nDecodeSiz);				   // in
diff --git a/media-sound/audacity/files/audacity-1.3.14-typecast.patch b/media-sound/audacity/files/audacity-1.3.14-typecast.patch
new file mode 100644
index 000000000000..c01046143b21
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.14-typecast.patch
@@ -0,0 +1,15 @@
+--- audacity-src-1.3.14-beta/src/TrackPanel.cpp.orig
++++ audacity-src-1.3.14-beta/src/TrackPanel.cpp
+@@ -2915,7 +2915,11 @@
+    {
+       // Make sure we always have the first linked track of a stereo track
+       if (!mouseTrack->GetLinked() && mTracks->GetLink(mouseTrack))
+-         mouseTrack = mTracks->GetLink(mouseTrack);
++         mouseTrack = 
++#ifndef USE_MIDI
++                      (WaveTrack*)
++#endif
++                                   mTracks->GetLink(mouseTrack);
+ 
+       // Temporary apply the offset because we want to see if the
+       // track fits with the desired offset
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
new file mode 100644
index 000000000000..efb5914d2975
--- /dev/null
+++ b/media-sound/audacity/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proaudio</herd>
+  <maintainer>
+    <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="libsoxr">
+      Uses <pkg>media-libs/soxr</pkg> as audio resampling library: Better
+      quality than the included resampler and much faster than libsamplerate
+      while keeping almost the same quality.
+    </flag>
+    <flag name="lv2">Add support for Ladspa V2</flag>
+    <flag name="midi">Enables MIDI support</flag>
+    <flag name="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..d2b5a4421c92
--- /dev/null
+++ b/media-sound/audex/Manifest
@@ -0,0 +1 @@
+DIST audex-0.79.tar.xz 319120 SHA256 b043db6337bc6a0f054ee0a62b9ded5bd1ed391a4f42dd2586c76feed9dc796c SHA512 339461b283056bdb78090561b5be16e7fb0b00df06eb4d575fb8b2881838054f84244dd960ed1b57df5b39c345f670411e9990aa8df322c7e521f253225960e1 WHIRLPOOL 6133607ed6ef3a0e7f71f5efdc4fcbe1bcb0f7846b2a70d59b87d177ed0605df9f253ca8d79f7a46394875f24774bf4d5dad4a159b81634a2b64644a54bd8835
diff --git a/media-sound/audex/audex-0.79.ebuild b/media-sound/audex/audex-0.79.ebuild
new file mode 100644
index 000000000000..cff3e3220583
--- /dev/null
+++ b/media-sound/audex/audex-0.79.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="bs cs da de en_GB eo es et fi fr ga gl hu it ja km lt mai mr nds
+nl pl pt pt_BR ru sk sv tr ug uk zh_CN"
+inherit kde4-base
+
+DESCRIPTION="KDE based CDDA extraction tool"
+HOMEPAGE="http://kde.maniatek.com/audex/"
+SRC_URI="http://kde.maniatek.com/${PN}/files/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="4"
+KEYWORDS="amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	media-sound/cdparanoia
+"
+RDEPEND="${DEPEND}"
diff --git a/media-sound/audex/metadata.xml b/media-sound/audex/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/media-sound/audex/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/media-sound/audicle/Manifest b/media-sound/audicle/Manifest
new file mode 100644
index 000000000000..8b10756a89d4
--- /dev/null
+++ b/media-sound/audicle/Manifest
@@ -0,0 +1 @@
+DIST audicle-1.0.0.7.tgz 5561088 SHA256 72d739c887eb8af612e821bf0ede966a7a84254e1224290fd8acfb80fadb2514 SHA512 c96506620e22e1f7846288cb4f34dc7efe59e14d845425673524d0a89712ea7d3dabed546eb921220e021d4e8526937990a4f5764fbf2bb90339b993f6703772 WHIRLPOOL e14627f1a2be219782403388fde1385c185b654b5c90d10d31bd397a7bfdaa916f91503c41aa5f2ad385bbf0b3c685427fff15c659cb2049a7857971cd5a69d2
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..acaf33a16503
--- /dev/null
+++ b/media-sound/audicle/audicle-1.0.0.7-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..46de6f0ead5c
--- /dev/null
+++ b/media-sound/audicle/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..58372baa9ba3
--- /dev/null
+++ b/media-sound/audiocompress/Manifest
@@ -0,0 +1 @@
+DIST AudioCompress-2.0.tar.gz 15752 RMD160 b72dce48478e4ac56741a42bc9fc2d9c5cae0ddb SHA1 49a2158cdca9c86a72f71d1afcbcc1f26a019da1 SHA256 90886ee8a996e720764f01e2640f11cd4bedda18a3aab5a95d298b6f69b789fc
diff --git a/media-sound/audiocompress/audiocompress-2.0.ebuild b/media-sound/audiocompress/audiocompress-2.0.ebuild
new file mode 100644
index 000000000000..36ce1539355c
--- /dev/null
+++ b/media-sound/audiocompress/audiocompress-2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+MY_P=AudioCompress-${PV}
+
+DESCRIPTION="Very gentle 1-band dynamic range compressor"
+HOMEPAGE="http://beesbuzz.biz/code/"
+SRC_URI="http://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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/audiocompress/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/audiotag/Manifest b/media-sound/audiotag/Manifest
new file mode 100644
index 000000000000..cfd2f6ae1a0e
--- /dev/null
+++ b/media-sound/audiotag/Manifest
@@ -0,0 +1 @@
+DIST audiotag-0.19.tar.bz2 15016 SHA256 7b6a2de751058a95755f0842b83f2b1d8b94e5cd7634cbe71d67257208bf4646
diff --git a/media-sound/audiotag/audiotag-0.19.ebuild b/media-sound/audiotag/audiotag-0.19.ebuild
new file mode 100644
index 000000000000..b82100906155
--- /dev/null
+++ b/media-sound/audiotag/audiotag-0.19.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="A command-line tool for mass tagging/renaming of audio files"
+HOMEPAGE="http://github.com/Daenyth/audiotag"
+SRC_URI="http://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..c670e555e241
--- /dev/null
+++ b/media-sound/audiotag/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..fa9f0aa12c2f
--- /dev/null
+++ b/media-sound/aumix/Manifest
@@ -0,0 +1 @@
+DIST aumix-2.9.1.tar.bz2 231622 RMD160 a68d2e1da251edad721e997099d8149075f07449 SHA1 1b84054cfb74d3513b254d05c2fb08f6a6a3edc7 SHA256 d2ce43d532ef75072c8d4e7922e3bc06be6d97765a508d9ceb0d1766bbe70e29
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..92efcda416f7
--- /dev/null
+++ b/media-sound/aumix/aumix-2.9.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f3f3d23645be
--- /dev/null
+++ b/media-sound/aumix/files/aumix.rc6
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/aumix/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/awesfx/Manifest b/media-sound/awesfx/Manifest
new file mode 100644
index 000000000000..5c283d6cf418
--- /dev/null
+++ b/media-sound/awesfx/Manifest
@@ -0,0 +1,2 @@
+DIST awesfx-0.5.1d.tar.bz2 282981 SHA256 4d5e57f18d9b353b08cdbd6bd4277843f14efb1a6175344bb1f7e64384a65a61
+DIST awesfx-0.5.1e.tar.bz2 307929 SHA256 27a9b0090474ff9a0a6fb3ceb95422e9e36ecb3cf4dbf1b6720aa486e8c7f812 SHA512 f70e631b6ab6ec6dcbde7773c1da5cba72763d2198c2ac51f4bde0fee80f057f296cabc915aed805e744f7b2323b4e2b20b6d894c79cf5682457a3fc6a9be11d WHIRLPOOL abe1716f42aca14ffd92d99fe774c0561290aef10cbf44802ef4cddd2ce116d9551a96bbf6b81d99256c6719afc5e5ecb5cc08f1a6974f3eabbe58a5b53f9b96
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..e17ac16861bb
--- /dev/null
+++ b/media-sound/awesfx/awesfx-0.5.1d.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..5b85e966dbc8
--- /dev/null
+++ b/media-sound/awesfx/awesfx-0.5.1e.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..087e83d0c7ba
--- /dev/null
+++ b/media-sound/awesfx/files/sfxload.initd
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/awesfx/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/aylet/Manifest b/media-sound/aylet/Manifest
new file mode 100644
index 000000000000..18407ac81a52
--- /dev/null
+++ b/media-sound/aylet/Manifest
@@ -0,0 +1 @@
+DIST aylet-0.5.tar.gz 43577 SHA256 c8c428a63abe5087b0345709a9a8034c2e6873b6071d9f7b05578aae0f3a4f72 SHA512 9f45982bdd18f4b9d001cd8681132b89a8fa379fd4f64131d00c749975308e9d9f7fb29c196448c60d07273f36295d9b85093a542a0993c184dec411c7fbb7f7 WHIRLPOOL 16897b4b4645d935c88b20db30c29b47a36f21d6afe3941b0ddc6ac59b2f08b18a558c9f3f291ba14bb1e0fa4dfbf3fe8d5820ddd8e8f19dee2a455f19ecee97
diff --git a/media-sound/aylet/aylet-0.5.ebuild b/media-sound/aylet/aylet-0.5.ebuild
new file mode 100644
index 000000000000..97b676c3159a
--- /dev/null
+++ b/media-sound/aylet/aylet-0.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/aylet/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/banshee/Manifest b/media-sound/banshee/Manifest
new file mode 100644
index 000000000000..6050b374708b
--- /dev/null
+++ b/media-sound/banshee/Manifest
@@ -0,0 +1 @@
+DIST banshee-2.6.1.tar.xz 3323092 SHA256 53b8990cd439963edbfa776b3029bd73809e413bec302e3b6cf3914c6e74fb64 SHA512 7c934a11a41138a1e1369ccc7307155d7cba98924be1f45746e3bee923434f67a8b66ab9c7646739d7bc342b1e890c2783d99ef3de175a7a9923203e78c05c8a WHIRLPOOL 1c4e191c258d14851f63f942dd5cd39c062b6e2d98577998409f96290978e5d83f32e44efe780c59a85bf58717669ce6ebfe23a17635dbed2d60bd4373c98f21
diff --git a/media-sound/banshee/banshee-2.6.1.ebuild b/media-sound/banshee/banshee-2.6.1.ebuild
new file mode 100644
index 000000000000..fff896bf9c31
--- /dev/null
+++ b/media-sound/banshee/banshee-2.6.1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools mono gnome2-utils fdo-mime versionator gnome.org
+
+DESCRIPTION="Import, organize, play, and share your music using a simple and powerful interface"
+HOMEPAGE="http://banshee.fm/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+aac +cdda +bpm daap doc +encode ipod karma mtp test udev +web youtube"
+
+RDEPEND="
+	>=dev-lang/mono-2.4.3
+	gnome-base/gnome-settings-daemon
+	sys-apps/dbus
+	>=dev-dotnet/gtk-sharp-2.12:2
+	>=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1
+	>=media-libs/gstreamer-0.10.21-r3:0.10
+	>=media-libs/gst-plugins-base-0.10.25.2:0.10
+	media-libs/gst-plugins-bad:0.10
+	media-libs/gst-plugins-good:0.10
+	media-libs/gst-plugins-ugly:0.10
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
+	media-plugins/gst-plugins-gio:0.10
+	>=dev-dotnet/gconf-sharp-2.24.0:2
+	media-plugins/gst-plugins-gconf:0.10
+	cdda? (
+		|| (
+			media-plugins/gst-plugins-cdparanoia:0.10
+			media-plugins/gst-plugins-cdio:0.10
+		)
+	)
+	media-libs/musicbrainz:3
+	dev-dotnet/dbus-sharp
+	dev-dotnet/dbus-sharp-glib
+	>=dev-dotnet/mono-addins-0.6.2[gtk]
+	>=dev-dotnet/taglib-sharp-2.0.3.7
+	>=dev-db/sqlite-3.4:3
+	karma? ( >=media-libs/libkarma-0.1.0-r1 )
+	aac? ( media-plugins/gst-plugins-faad:0.10 )
+	bpm? ( media-plugins/gst-plugins-soundtouch:0.10 )
+	daap? (	>=dev-dotnet/mono-zeroconf-0.8.0-r1 )
+	doc? (
+		>=app-text/gnome-doc-utils-0.17.3
+	)
+	encode? (
+		media-plugins/gst-plugins-lame:0.10
+		media-plugins/gst-plugins-taglib:0.10
+	)
+	ipod? ( >=media-libs/libgpod-0.8.2[mono] )
+	mtp? (
+		>=media-libs/libmtp-0.3.0
+	)
+	web? (
+		>=net-libs/webkit-gtk-1.2.2:2
+		>=net-libs/libsoup-gnome-2.26:2.4
+	)
+	youtube? (
+		>=dev-dotnet/google-gdata-sharp-1.4
+	)
+	udev? (
+		app-misc/media-player-info
+		dev-dotnet/gudev-sharp
+		dev-dotnet/gkeyfile-sharp
+		dev-dotnet/gtk-sharp-beans
+		dev-dotnet/gio-sharp
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare () {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	# Don't build BPM extension when not wanted
+	if ! use bpm; then
+		sed -i -e 's:Banshee.Bpm:$(NULL):g' src/Extensions/Makefile.am || die
+	fi
+
+	# Don't append -ggdb, bug #458632, upstream bug #698217
+	sed -i -e 's:-ggdb3:$(NULL):g' libbanshee/Makefile.am || die
+	sed -i -e 's:-ggdb3::g' src/Core/Banshee.WebBrowser/libossifer/Makefile.am || die
+
+	AT_M4DIR="-I build/m4/banshee -I build/m4/shamrock -I build/m4/shave" \
+	eautoreconf
+}
+
+src_configure() {
+	# soundmenu needs a properly maintained and updated indicate-sharp
+	local myconf="--disable-dependency-tracking
+		--disable-static
+		--disable-maintainer-mode
+		--enable-gnome
+		--enable-schemas-install
+		--with-gconf-schema-file-dir=/etc/gconf/schemas
+		--with-vendor-build-id=Gentoo/${PN}/${PVR}
+		--enable-gapless-playback
+		--disable-boo
+		--disable-gst-sharp
+		--disable-torrent
+		--disable-shave
+		--disable-ubuntuone
+		--disable-soundmenu
+		--disable-upnp"
+
+	econf \
+		$(use_enable doc docs) \
+		$(use_enable doc user-help) \
+		$(use_enable mtp) \
+		$(use_enable daap) \
+		$(use_enable ipod appledevice) \
+		$(use_enable karma) \
+		$(use_enable web webkit) \
+		$(use_enable youtube) \
+		$(use_enable udev gio) \
+		$(use_enable udev gio_hardware) \
+		${myconf}
+}
+
+src_compile() {
+	emake MCS=/usr/bin/gmcs
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
+
+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/banshee/metadata.xml b/media-sound/banshee/metadata.xml
new file mode 100644
index 000000000000..2581afb3b97f
--- /dev/null
+++ b/media-sound/banshee/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>dotnet</herd>
+<herd>gstreamer</herd>
+<use>
+	<flag name="bpm">Build beats per minute detection extension</flag>
+	<flag name="cdda">Build with audio CD support</flag>
+	<flag name="daap">Build with Daap support</flag>
+	<flag name="karma">Build with karma support</flag>
+	<flag name="web">Enable support for plugins that access web-based services
+	such as Amazon and wikipedia (requires <pkg>net-libs/webkit-gtk</pkg>)</flag>
+	<flag name="youtube">Enable the Youtube plugin</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/baudline/Manifest b/media-sound/baudline/Manifest
new file mode 100644
index 000000000000..27288f8c9d0b
--- /dev/null
+++ b/media-sound/baudline/Manifest
@@ -0,0 +1,4 @@
+DIST baudline_1.08_linux_i686.tar.gz 1945014 SHA256 4b42e8d03c9fe9738ec66ee51a8d594a60a5770e8e22bb1d73ae38566fb951f1
+DIST baudline_1.08_linux_ppc.tar.gz 2369780 SHA256 846628197d4541510d38bdcbcae261be4832b68d183a5c8c42bb0073b9f9dd66
+DIST baudline_1.08_linux_s390.tar.gz 459868 SHA256 c3e27c1f2322e7f35bcd8c8c6fdb3325eb774e66ae263fc6165a7461acf0e9d6
+DIST baudline_1.08_linux_x86_64.tar.gz 2270546 SHA256 79ff55c3817cd4a97d565733ea6e0532be57b05a7ffe7865b03199680800d625 SHA512 d0cb5dc0e6cc3fd79dbc2a37e7a1b9bbb050c953d1d2893f24f87a45f301fbc69ba4ba3b2f32903caec391ed0ca6913d2c320ca82039bb41185b21e100a754c4 WHIRLPOOL 39b9f59f5d71d65ed1ddc8ad5cbee306157480c4b6c6f1f237cd28b56bfd93df4e961140ad60478064ceae2119f3fe8a45d0d2037f7b4d1c136013dd7579c71f
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..4ba310f578ba
--- /dev/null
+++ b/media-sound/baudline/baudline-1.08-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils
+
+DESCRIPTION="A time-frequency browser designed for scientific visualization of the spectral domain"
+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() {
+	unpack ${A}
+	# strip arch names from S
+	mv -v baudline_* ${P} || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r icons palettes || die
+
+	newicon icons/spectro512.png ${PN}.png || die
+
+	exeinto /opt/${PN}
+	doexe ${PN} || die
+	dosym /opt/${PN}/${PN} /usr/bin/${PN} || die
+	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 || die
+		dosym /opt/${PN}/${PN}_jack /usr/bin/${PN}_jack || die
+		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 || die
+}
diff --git a/media-sound/baudline/metadata.xml b/media-sound/baudline/metadata.xml
new file mode 100644
index 000000000000..67c501efc676
--- /dev/null
+++ b/media-sound/baudline/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>
+<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..f7bae6deb3d6
--- /dev/null
+++ b/media-sound/beets/Manifest
@@ -0,0 +1,2 @@
+DIST beets-1.3.13.tar.gz 1269748 SHA256 6d973c3484079b22b7d281f771a97c03f9bb14bdd94f45b673f9d754875b2c59 SHA512 ffee7e16a115f16c26ab07a75e614746cd5871a7311660d37978deff34245f3aeab97b1a453fc0900442f40e6ac7d102c5adfce910edfec78387fc149fbea261 WHIRLPOOL 79b345612b04965aa6d4b7cc819d7ed1942b5686bf3990612f2c243dc47a2cfc3f15550f97ee30502ce42f4c24cf2ade27e9db6393f40022ffedf6842f4dc05c
+DIST beets-1.3.3.tar.gz 679050 SHA256 028e08b7bab2f9c14063f318e617fa82716410170753d6b2dbe8471a8bb1975e SHA512 0e715b4d042a96c5c521f8acc12c481baad11fb9ff2b825984f6f46a1ed6dea876000fde292851292c4466e9df93ec0439d2c0f57241174014ffbb46225792ab WHIRLPOOL 6999973bb1cafa6c211ef2c709062dc322437574a874e3997319542b65c677525365c94eb9d2fcac403e0c6e59440e8beb3e50558204d216025981418fdf6e3c
diff --git a/media-sound/beets/beets-1.3.13.ebuild b/media-sound/beets/beets-1.3.13.ebuild
new file mode 100644
index 000000000000..fd072c6b0f52
--- /dev/null
+++ b/media-sound/beets/beets-1.3.13.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/ http://pypi.python.org/pypi/beets"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="bpd chroma convert doc discogs echonest 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}] )
+	echonest? ( >=dev-python/pyechonest-8.0.1[${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 bpd chroma convert discogs echonest 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.3-r1.ebuild b/media-sound/beets/beets-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..e27ad390bc2e
--- /dev/null
+++ b/media-sound/beets/beets-1.3.3-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/ http://pypi.python.org/pypi/beets"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="MIT"
+IUSE="beatport bpd chroma convert doc discogs echonest echonest_tempo lastgenre mpdstats replaygain test web"
+
+RDEPEND="
+	dev-python/munkres[${PYTHON_USEDEP}]
+	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.22[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	beatport? ( dev-python/requests[${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 )
+	echonest? ( dev-python/pyechonest[${PYTHON_USEDEP}] )
+	echonest_tempo? ( dev-python/pyechonest[${PYTHON_USEDEP}] )
+	mpdstats? ( dev-python/python-mpd[${PYTHON_USEDEP}] )
+	lastgenre? ( dev-python/pylast[${PYTHON_USEDEP}] )
+	replaygain? ( || ( 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 beatport bpd chroma convert discogs echonest echonest_tempo 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 -i "s:'beetsplug.$flag',::" 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..006bd4cd2f50
--- /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>
+    <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="beatport">Enable support for beatport.com API</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="echonest_tempo">Enable support for writing the BPM of a track
+      into its metadata</flag>
+    <flag name="echonest">Enable support for fetching and storing acoustic
+      attributes of a track from Echo Nest</flag>
+    <flag name="lastgenre">Enable support for importing music genres from
+      last.fm tags</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="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..0d50a2fe3a00
--- /dev/null
+++ b/media-sound/bempc/Manifest
@@ -0,0 +1 @@
+DIST bempc-0.11.tar.xz 182588 SHA256 62ce13e82c42b891d2e49ff691f2c7c60b8d62809ea44f729af5e1685a108703 SHA512 ec1cd82d7b93b45c16ff54e6e14f0625af0042b863c65f72e06eeaf67933384fd527f6db15725363fc02ca1ce9a6855fbf215da2bef2e8c52e8fec70d742de5c WHIRLPOOL 1e72200c28928aee34a3458a45012990ca22619024c8adf700b6a789e188b6a6ab7526a317945dde7a5ce567240b1a9154364a2a2d2eb0d5c75538d56e72a113
diff --git a/media-sound/bempc/bempc-0.11.ebuild b/media-sound/bempc/bempc-0.11.ebuild
new file mode 100644
index 000000000000..350de0bc1aa8
--- /dev/null
+++ b/media-sound/bempc/bempc-0.11.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..860c306fcfde
--- /dev/null
+++ b/media-sound/bempc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>pinkbyte@gentoo.org</email>
+    <name>Sergey Popov</name>
+  </maintainer>
+  <herd>qt</herd>
+</pkgmetadata>
diff --git a/media-sound/bitmeter/Manifest b/media-sound/bitmeter/Manifest
new file mode 100644
index 000000000000..4a93f2ae659f
--- /dev/null
+++ b/media-sound/bitmeter/Manifest
@@ -0,0 +1 @@
+DIST bitmeter-1.2.tar.gz 216592 RMD160 77272d774e760b53b5afeb33537362114c43a668 SHA1 6049d7850f8ee1b549932a89468b3747a85e6fe4 SHA256 4789370a677f98a6058302c6c3da05db049b733037821b580be0f889fb139325
diff --git a/media-sound/bitmeter/bitmeter-1.2.ebuild b/media-sound/bitmeter/bitmeter-1.2.ebuild
new file mode 100644
index 000000000000..04d8290eca0d
--- /dev/null
+++ b/media-sound/bitmeter/bitmeter-1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+DESCRIPTION="a diagnosis tool for JACK audio software"
+HOMEPAGE="http://users.ecs.soton.ac.uk/njl98r/code/audio/bitmeter"
+SRC_URI="http://users.ecs.soton.ac.uk/njl98r/code/audio/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="media-sound/jack-audio-connection-kit
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!media-sound/bitscope"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc README
+	use doc && dohtml doc/{*.png,*.html}
+}
diff --git a/media-sound/bitmeter/metadata.xml b/media-sound/bitmeter/metadata.xml
new file mode 100644
index 000000000000..0dc3775f83d7
--- /dev/null
+++ b/media-sound/bitmeter/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+</pkgmetadata>
diff --git a/media-sound/bladeenc/Manifest b/media-sound/bladeenc/Manifest
new file mode 100644
index 000000000000..0cef8eee4330
--- /dev/null
+++ b/media-sound/bladeenc/Manifest
@@ -0,0 +1 @@
+DIST bladeenc-0.94.2-src-stable.tar.gz 142949 RMD160 4e1e0c2e56abb2e6d87543c9569ecfde720fcf67 SHA1 72f9b0600cbd2a19175ccb0cd8aa8e9c194bc87c SHA256 c5e9dd180f28d1865599d0755e36fa1a4c146bb5e1b7ba9ad099955261fc1164
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..7f7993171a9d
--- /dev/null
+++ b/media-sound/bladeenc/bladeenc-0.94.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/bladeenc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/bplay/Manifest b/media-sound/bplay/Manifest
new file mode 100644
index 000000000000..63f8ec649c48
--- /dev/null
+++ b/media-sound/bplay/Manifest
@@ -0,0 +1 @@
+DIST bplay-0.991.tar.gz 18920 SHA256 c2ac63fb34012259f9636ea79ee298a7e6d4c361a2754d0954af7c0c7ee553aa
diff --git a/media-sound/bplay/bplay-0.991.ebuild b/media-sound/bplay/bplay-0.991.ebuild
new file mode 100644
index 000000000000..6b8faf9f371d
--- /dev/null
+++ b/media-sound/bplay/bplay-0.991.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/bplay/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/bpmdetect/Manifest b/media-sound/bpmdetect/Manifest
new file mode 100644
index 000000000000..9cd33161d150
--- /dev/null
+++ b/media-sound/bpmdetect/Manifest
@@ -0,0 +1 @@
+DIST bpmdetect-0.6.1-src.tar.bz2 1433211 SHA256 2b7fb3e0595b5b9dd63381c079140656df196be1bee3365807f18ef4593c0b8f
diff --git a/media-sound/bpmdetect/bpmdetect-0.6.1.ebuild b/media-sound/bpmdetect/bpmdetect-0.6.1.ebuild
new file mode 100644
index 000000000000..8f35e919c790
--- /dev/null
+++ b/media-sound/bpmdetect/bpmdetect-0.6.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils multilib
+
+DESCRIPTION="Automatic BPM detection utility"
+HOMEPAGE="http://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}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44_and_fmodex_path.patch
+	sed -i -e "s:-O2:${CXXFLAGS}:" src/SConscript || die "sed failed"
+}
+
+src_configure() { :; }
+
+src_compile() {
+	export QTDIR="/usr/$(get_libdir)"
+	scons prefix=/usr || die "scons failed"
+}
+
+src_install() {
+	dobin build/${PN} || die "dobin failed"
+	doicon src/${PN}-icon.png
+	domenu src/${PN}.desktop
+	dodoc authors readme todo
+}
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..605408c4b7f1
--- /dev/null
+++ b/media-sound/bpmdetect/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..6e50dfa1372e
--- /dev/null
+++ b/media-sound/bristol/Manifest
@@ -0,0 +1,2 @@
+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
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..475af59fc0fb
--- /dev/null
+++ b/media-sound/bristol/bristol-0.60.11.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
+HOMEPAGE="http://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..fb9cf4771f8c
--- /dev/null
+++ b/media-sound/bristol/bristol-0.60.9.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils autotools-utils
+
+DESCRIPTION="Synthesizer keyboard emulation package: Moog, Hammond and others"
+HOMEPAGE="http://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..bafa55c948c1
--- /dev/null
+++ b/media-sound/bristol/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<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..2843905b2440
--- /dev/null
+++ b/media-sound/brutefir/Manifest
@@ -0,0 +1 @@
+DIST brutefir-1.0k.tar.gz 246987 SHA256 e262ea30402e06a23c0396b46b38019f7e9bc66493feabb8792d43e16068e715
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..da9aba6ad9f1
--- /dev/null
+++ b/media-sound/brutefir/brutefir-1.0k-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/brutefir/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
new file mode 100644
index 000000000000..1db061063332
--- /dev/null
+++ b/media-sound/cantata/Manifest
@@ -0,0 +1 @@
+DIST cantata-1.5.1.tar.bz2 1986772 SHA256 57173bdd0033a2c0c2829a6e05f7579b0f13ae7794d843167c013e1c971dfe78 SHA512 bd41bbe3a9c2fa6a4e653deb62a82b928febe3876a6023d4c9bff4fb71133aca5a8e34ae77b440d10ae42c0d024ebd1c460b367a75cefa29858275d707cf4e38 WHIRLPOOL 55054c1e8d95f1dc9322b7224dfa04fd8e8430b89c5a21883fdecf0829eca60720186e6b549d80216c4035429208e2191d2e5ae31608ede3a6afc8e5046e173f
diff --git a/media-sound/cantata/cantata-1.5.1.ebuild b/media-sound/cantata/cantata-1.5.1.ebuild
new file mode 100644
index 000000000000..7112c054c944
--- /dev/null
+++ b/media-sound/cantata/cantata-1.5.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+PLOCALES="cs de en_GB es hu ko pl ru zh_CN"
+inherit kde4-base l10n
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
+HOMEPAGE="https://code.google.com/p/cantata/"
+SRC_URI="https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="cddb cdda dynamic http-server kde lame mtp musicbrainz online-services qt5 replaygain streams taglib udisks"
+REQUIRED_USE="
+	cddb? ( cdda taglib )
+	cdda? ( udisks || ( cddb musicbrainz )  )
+	lame? ( cdda taglib )
+	mtp? ( taglib udisks )
+	musicbrainz? ( cdda taglib )
+	online-services? ( taglib )
+	qt5? ( !kde )
+	replaygain? ( taglib )
+"
+
+RDEPEND="
+	sys-libs/zlib
+	x11-libs/libX11
+	kde-apps/oxygen-icons
+	cdda? ( media-sound/cdparanoia )
+	cddb? ( media-libs/libcddb )
+	kde? ( $(add_kdeapps_dep kwalletd) )
+	lame? ( media-sound/lame )
+	mtp? ( media-libs/libmtp )
+	musicbrainz? ( media-libs/musicbrainz:5 )
+	qt5? (
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	!qt5? (
+		dev-libs/qjson
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtsvg:4
+	)
+	replaygain? (
+		media-sound/mpg123
+		virtual/ffmpeg
+	)
+	taglib? (
+		media-libs/taglib[asf,mp4]
+		media-libs/taglib-extras
+		!kde? ( udisks? ( sys-fs/udisks:2 ) )
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="${RDEPEND}
+	dynamic? (
+		dev-lang/perl[ithreads]
+		dev-perl/URI
+	)
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	rm -rf 3rdparty/qtsingleapplication/ || die
+	# qjson ebuild does not support Qt5 yet
+	use qt5 || { rm -rf 3rdparty/qjson/ || die ;}
+	use kde && { rm -rf 3rdparty/solid-lite/ || die ;}
+
+	l10n_find_plocales_changes 'po' '' '.po'
+}
+
+src_configure() {
+	local langs="$(l10n_get_locales)"
+
+	local mycmakeargs=(
+		-DCANTATA_TRANSLATIONS="${langs// /;}"
+		$(cmake-utils_use_enable cdda CDPARANOIA)
+		$(cmake-utils_use_enable cddb)
+		$(cmake-utils_use_enable dynamic)
+		$(cmake-utils_use_enable http-server HTTP_SERVER)
+		$(cmake-utils_use_enable kde)
+		$(cmake-utils_use_enable kde kwallet)
+		$(cmake-utils_use_enable lame)
+		$(cmake-utils_use_enable mtp)
+		$(cmake-utils_use_enable musicbrainz)
+		$(cmake-utils_use_enable online-services ONLINE_SERVICES)
+		$(cmake-utils_use_enable streams)
+		$(cmake-utils_use_enable qt5)
+		$(cmake-utils_use_enable replaygain FFMPEG)
+		$(cmake-utils_use_enable replaygain MPG123)
+		$(cmake-utils_use_enable taglib)
+		$(cmake-utils_use_enable taglib TAGLIB_EXTRAS)
+		$(cmake-utils_use_enable udisks DEVICES_SUPPORT)
+		-DENABLE_HTTP_STREAM_PLAYBACK=OFF
+		-DENABLE_REMOTE_DEVICES=OFF
+		-DENABLE_UDISKS2=ON
+		-DUSE_SYSTEM_MENU_ICON=OFF
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
new file mode 100644
index 000000000000..4bf3ab690394
--- /dev/null
+++ b/media-sound/cantata/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<use>
+		<flag name="dynamic">Enable support for dynamic playlists</flag>
+		<flag name="http-server">Enable internal HTTP server to play non-MPD files</flag>
+		<flag name="online-services">Enable support for online services (Jamendo, Magnatune, SoundCloud, and Podcasts)</flag>
+		<flag name="replaygain">Enable ReplayGain support, for relative volume adjustments</flag>
+		<flag name="streams">Enable support for streams tab (to save favourite streams, and search for others)</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/cd-discid/Manifest b/media-sound/cd-discid/Manifest
new file mode 100644
index 000000000000..118150e0e844
--- /dev/null
+++ b/media-sound/cd-discid/Manifest
@@ -0,0 +1,2 @@
+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
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..651a07bb6387
--- /dev/null
+++ b/media-sound/cd-discid/cd-discid-1.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..55445152792d
--- /dev/null
+++ b/media-sound/cd-discid/cd-discid-1.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..0e4409843539
--- /dev/null
+++ b/media-sound/cd-discid/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..8444a937da34
--- /dev/null
+++ b/media-sound/cdcd/Manifest
@@ -0,0 +1 @@
+DIST cdcd-0.6.6.tar.gz 246286 SHA256 06ae2508926b7d1f811d9ce9a53991f8886aef078db4cde617125bda24fbf717 SHA512 841f2d7f85c81a8cc9e88bc13515959a911e22fe9cff7fd272bab63fccb3e6bbf44e9d66fc2524f1670da20568d6e10434de8143a5e94fc576c7193b4a68f418 WHIRLPOOL 9cc8f718f67f60fc20dafed83749e8542b1f6dee43e2e78ef94323ee21eaad79314c873ba32f6ebdcf2eb77aa630e774a21aed2b232d030f6e032785a7a25bad
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..3fbc5e7b9b69
--- /dev/null
+++ b/media-sound/cdcd/cdcd-0.6.6-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..385a5882ed42
--- /dev/null
+++ b/media-sound/cdcd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..3ce0ba518ca1
--- /dev/null
+++ b/media-sound/cdparanoia/Manifest
@@ -0,0 +1,2 @@
+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
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..d17ff69dd2c6
--- /dev/null
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	http://dev.gentoo.org/~ssuominen/${MY_P}-patches-2.tbz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm 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..ae573a60407f
--- /dev/null
+++ b/media-sound/cdparanoia/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/cdplay/Manifest b/media-sound/cdplay/Manifest
new file mode 100644
index 000000000000..d7741cff4990
--- /dev/null
+++ b/media-sound/cdplay/Manifest
@@ -0,0 +1 @@
+DIST cdplay-1.0.tar.gz 12779 RMD160 6169c488c65a6b8f530102a0ab42dca110651cbf SHA1 675bc5729d7ac7a78c16d559eef09406b7e95a07 SHA256 5ff855acdd94fd527774f73673716380cc23308d969c579fc216ee4b4ea05dd8
diff --git a/media-sound/cdplay/cdplay-1.0.ebuild b/media-sound/cdplay/cdplay-1.0.ebuild
new file mode 100644
index 000000000000..0ea37a39a7eb
--- /dev/null
+++ b/media-sound/cdplay/cdplay-1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/cdplay/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/cdstatus/Manifest b/media-sound/cdstatus/Manifest
new file mode 100644
index 000000000000..6aad318c63ab
--- /dev/null
+++ b/media-sound/cdstatus/Manifest
@@ -0,0 +1 @@
+DIST cdstatus-0.97.03.tar.gz 115982 SHA256 46552c966dd3cc1b429b461254bf87b16b2247f940596d85fa6b37f22ecf1ba6 SHA512 d9819bfd40360b8796810d38b2c9f75c87a1256adc289d261e0cf56557170492eabc7fb0c4f7ee91c6303f24867ff4540962556edfdd8cf46b02df0236037177 WHIRLPOOL e6b47d565a9cd9cfd01dbff761daa85b634387ceadc13478aadc3172fe9368d0a9118a15e653c80070081311115e0269a699e3ea8b091b1b5da737e07e5b7f85
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..5c9bb700f595
--- /dev/null
+++ b/media-sound/cdstatus/cdstatus-0.97.03.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d28761dbf1e3
--- /dev/null
+++ b/media-sound/cdstatus/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..99d47ed6ceb4
--- /dev/null
+++ b/media-sound/cdtool/Manifest
@@ -0,0 +1 @@
+DIST cdtool-2.1.8.tar.gz 116847 SHA256 73de81ea2de2eae64b888e1b2739ef643ccea13c79790569f8e6278369976a21 SHA512 9e4e65c753b0be024f0ceb04ec0fee52031992196e0e4a2b8dfef9dbc9feaa81462be61700c6d01f413941d66f7f3e374fb327e1bebcb79207c7b4c790cea006 WHIRLPOOL 038337d081acf3dfde53686d43d76dce10ed2a35449b724b70b90457eba82017caca4c38a455686c56eaf29d3fabca949e659df76242d323fc1ed3976b417f9a
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..7d3a2d6603e3
--- /dev/null
+++ b/media-sound/cdtool/cdtool-2.1.8-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..ae573a60407f
--- /dev/null
+++ b/media-sound/cdtool/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/chordii/Manifest b/media-sound/chordii/Manifest
new file mode 100644
index 000000000000..e8af92164e34
--- /dev/null
+++ b/media-sound/chordii/Manifest
@@ -0,0 +1,4 @@
+DIST chordii-4.3-user_guide.pdf 1086988 SHA256 2b48651fa1c55088f7886e69ef4517f22100731fe5a69f8d65047537964b397d
+DIST chordii-4.3.tar.gz 151370 SHA256 49258c625aee42b400ca40252cc562ab0db4514c838de4545cbdbcfdcd77a302
+DIST chordii-4.5.1.tar.gz 156976 SHA256 16a3fe92a82ca734cb6d08a573e513510acd41d4020a6306ac3769f6af5aa08d SHA512 92996893417cfecb3cc18db283f2f608721172540f1fbb9ea300a0235fa99228a89d2c65417e8ddee91453d4bc12190d1504039e9689ed28ca863546fa938088 WHIRLPOOL a935ab83731da23c9aef5fffb8a15070ed341fd8db69ef9e108b2c07cdaafdbe96fc415b21a8473397d0456af6b20f5fbe314b5433618c79e782788a059ef80b
+DIST user_guide-4.5.pdf 389353 SHA256 b103e4da20c0f2af52ca9f7d34dfa75b7bd5c5da169ff395443c0029673fbf56 SHA512 9ad15cf89ae6790f59d4a224367d1b5d8ffb0aec04f217875d9f31477751046e22ab7f90f798ce2347d7dc781bcdf1665323cd315ad1148d600d5e5bf27ee096 WHIRLPOOL d050b8811f6c3cff2f6460b1a78c8d1a821df0058e49cb9f694e6c654a1569ff0a21ebc2d8b006f2d322e1b637bc5e15c9251a74037b93059a1a46ff55784032
diff --git a/media-sound/chordii/chordii-4.3.ebuild b/media-sound/chordii/chordii-4.3.ebuild
new file mode 100644
index 000000000000..d2f6ff66cebd
--- /dev/null
+++ b/media-sound/chordii/chordii-4.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools
+
+DESCRIPTION="A guitar music typesetter"
+HOMEPAGE="http://chordii.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? ( mirror://sourceforge/${PN}/${P}-user_guide.pdf )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND=""
+DEPEND=">=sys-devel/autoconf-2.67"
+
+src_prepare() {
+	sed -i -e "/dist_man_MAN/d" man/Makefile.am
+	eautomake
+}
+
+src_install() {
+	default
+
+	use doc && dodoc "${DISTDIR}"/${P}-user_guide.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.1.ebuild b/media-sound/chordii/chordii-4.5.1.ebuild
new file mode 100644
index 000000000000..a07b78b9d15e
--- /dev/null
+++ b/media-sound/chordii/chordii-4.5.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/metadata.xml b/media-sound/chordii/metadata.xml
new file mode 100644
index 000000000000..c1cc2cbeaab8
--- /dev/null
+++ b/media-sound/chordii/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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/christine/Manifest b/media-sound/christine/Manifest
new file mode 100644
index 000000000000..e420355d2c36
--- /dev/null
+++ b/media-sound/christine/Manifest
@@ -0,0 +1 @@
+DIST christine-0.7.0.tar.bz2 421633 SHA256 de146b950b73692361ff3fcb8122ed2445d5aae07ad6a016117548bfbfe24660
diff --git a/media-sound/christine/christine-0.7.0.ebuild b/media-sound/christine/christine-0.7.0.ebuild
new file mode 100644
index 000000000000..d4e1cb825f3f
--- /dev/null
+++ b/media-sound/christine/christine-0.7.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.7"
+PYTHON_USE_WITH="sqlite"
+
+inherit autotools eutils python
+
+DESCRIPTION="A simple gstreamer based media player"
+HOMEPAGE="http://christine-project.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify nls readline"
+
+COMMON_DEPEND="=dev-python/gst-python-0.10*
+	dev-python/pycairo
+	dev-python/pygobject:2
+	=dev-python/pygtk-2*
+	media-libs/mutagen
+	libnotify? ( dev-python/notify-python )
+	readline? ( sys-libs/readline )"
+RDEPEND="${COMMON_DEPEND}
+	=media-plugins/gst-plugins-meta-0.10*"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-validate.patch
+	find . -name 'Makefile.*' -exec sed -i -e 's:mkdir_p:MKDIR_P:g' {} + #423113
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls) $(use_with readline)
+}
+
+pkg_postinst() { python_mod_optimize libchristine; }
+pkg_postrm() { python_mod_cleanup libchristine; }
diff --git a/media-sound/christine/files/christine-0.7.0-validate.patch b/media-sound/christine/files/christine-0.7.0-validate.patch
new file mode 100644
index 000000000000..76d5b146c345
--- /dev/null
+++ b/media-sound/christine/files/christine-0.7.0-validate.patch
@@ -0,0 +1,33 @@
+error: value "0.7.0" for key "Version" in group "Desktop Entry" is not a known version
+warning: key "Encoding" in group "Desktop Entry" is deprecated
+error: value "GTK;Application;AudioVideo" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
+error: value "application/x-ogg;application/ogg;audio/x-mp3;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;application/x-flac;video/mpeg;video/x-avi;video/x-ms-wmv;video/quicktime;video/x-ms-asf;video/x-msvideo" for string list key "MimeType" in group "Desktop Entry" does not have a semicolon (';') as trailing character
+
+--- christine.desktop.in
++++ christine.desktop.in
+@@ -6,10 +6,8 @@
+ TryExec=@programname@
+ Terminal=false
+ Type=Application
+-Version=@VERSION@
+-Encoding=UTF-8
+-Categories=GTK;Application;AudioVideo
+-MimeType=application/x-ogg;application/ogg;audio/x-mp3;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;application/x-flac;video/mpeg;video/x-avi;video/x-ms-wmv;video/quicktime;video/x-ms-asf;video/x-msvideo
++Categories=GTK;AudioVideo;
++MimeType=application/x-ogg;application/ogg;audio/x-mp3;audio/x-scpls;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;application/x-flac;video/mpeg;video/x-avi;video/x-ms-wmv;video/quicktime;video/x-ms-asf;video/x-msvideo;
+ StartupNotify=true
+ Name[es]=Reproductor Multimedia Christine
+-Comment[es]= Reproductor multimedia basado en gstreamer
++Comment[es]=Reproductor multimedia basado en gstreamer
+--- Makefile.am
++++ Makefile.am
+@@ -53,8 +53,7 @@
+ 	   -e 's,@datadir\@,$(pkgdatadir),g' \
+ 	   -e 's,@prefix\@,$(prefix),g' \
+ 	   -e 's,@sysconfdir\@,$(pkgsysconfdir),g' \
+-	   -e 's,@programname\@,$(PROGRAM_NAME),g' \
+-	   -e 's,@VERSION\@,$(VERSION),g'
++	   -e 's,@programname\@,$(PROGRAM_NAME),g'
+ 
+ clean-local:
+ 	rm -rf christine.desktop
diff --git a/media-sound/christine/metadata.xml b/media-sound/christine/metadata.xml
new file mode 100644
index 000000000000..a5fef3064c61
--- /dev/null
+++ b/media-sound/christine/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">christine</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
new file mode 100644
index 000000000000..9fd5be3c9a9b
--- /dev/null
+++ b/media-sound/chuck/Manifest
@@ -0,0 +1,2 @@
+DIST chuck-1.2.1.2.tgz 1546875 SHA256 9cb9c246a2fb7ac886c0a3d5f23a5d60eb18aa7717f6ee57f031e42140cf0d2a
+DIST chuck-1.3.5.1.tgz 14686970 SHA256 d141ca61547131edd2b29bdb88183835e4133ef09807674bfa33a4e6e09d1f53 SHA512 450237207150b285954dc2661d6f7829424d4353cdc457a7dce637b6877247b106ad0ed58bdbded17c1f7558e0f01daa7a06642f2727136f6edca5a64d202f73 WHIRLPOOL 5b70e6badffa39e38ea795ea688b4a452cd290dd849d6779e799c7a79e00513fa4b8c07ed64b7243bd0075936ce3ab4bdc99482268d564391ef3a1a96b9f9e8f
diff --git a/media-sound/chuck/chuck-1.2.1.2.ebuild b/media-sound/chuck/chuck-1.2.1.2.ebuild
new file mode 100644
index 000000000000..3b43aab18997
--- /dev/null
+++ b/media-sound/chuck/chuck-1.2.1.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="Strongly-timed, Concurrent, and On-the-fly
+Audio Programming Language"
+HOMEPAGE="http://chuck.cs.princeton.edu/release/"
+SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+IUSE="oss jack alsa examples"
+
+RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
+	alsa? ( media-libs/alsa-lib )
+	media-libs/libsndfile
+	app-admin/eselect"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+pkg_setup() {
+	local cnt=0
+	use jack && cnt="$((${cnt} + 1))"
+	use alsa && cnt="$((${cnt} + 1))"
+	use oss && cnt="$((${cnt} + 1))"
+	if [[ "${cnt}" -eq 0 ]] ; then
+		eerror "One of the following USE flags is needed: jack, alsa or oss"
+		die "Please set one audio engine type"
+	elif [[ "${cnt}" -ne 1 ]] ; then
+		ewarn "You have set ${P} to use multiple audio engine."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2.1.1-hid-smc.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
+}
+
+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
+	use oss && compile_backend oss
+}
+
+compile_backend() {
+	backend=$1
+	einfo "Compiling against ${backend}"
+	cd "${S}/src"
+	emake -f "makefile.${backend}" CC=$(tc-getCC) CXX=$(tc-getCXX) || die "emake failed"
+	mv chuck{,.${backend}}
+	emake -f "makefile.${backend}" clean
+}
+
+src_install() {
+	use jack && dobin src/chuck.jack
+	use alsa && dobin src/chuck.alsa
+	use oss && dobin src/chuck.oss
+
+	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
+	docinto doc
+	dodoc doc/*
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins $(find examples -type f)
+		for dir in $(find examples/* -type d); do
+			insinto /usr/share/doc/${PF}/"${dir}"
+			doins "${dir}"/*
+		done
+	fi
+
+	dodir /usr/share/eselect/modules
+	insinto /usr/share/eselect/modules
+	newins "${FILESDIR}"/chuck.eselect-0.1 chuck.eselect
+}
+
+pkg_postinst() {
+	elog "Chuck now can use many audio engines, so you can specify audio engine"
+	elog "with chuck.{jack,alsa,oss}"
+	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.1.ebuild b/media-sound/chuck/chuck-1.3.5.1.ebuild
new file mode 100644
index 000000000000..f5281e5788e7
--- /dev/null
+++ b/media-sound/chuck/chuck-1.3.5.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/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.2.1.2-gcc44.patch b/media-sound/chuck/files/chuck-1.2.1.2-gcc44.patch
new file mode 100644
index 000000000000..8059c97592f7
--- /dev/null
+++ b/media-sound/chuck/files/chuck-1.2.1.2-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur chuck-1.2.1.2.orig/src/util_string.h chuck-1.2.1.2/src/util_string.h
+--- chuck-1.2.1.2.orig/src/util_string.h	2008-07-16 12:55:17.000000000 +0300
++++ chuck-1.2.1.2/src/util_string.h	2009-06-01 21:33:59.000000000 +0300
+@@ -33,6 +33,8 @@
+ #ifndef __UTIL_STRING_H__
+ #define __UTIL_STRING_H__
+ 
++#include <cstdio>
++
+ #include "chuck_def.h"
+ #include <string>
+ #include <vector>
diff --git a/media-sound/chuck/files/chuck-1.3.1.3-makefile.patch b/media-sound/chuck/files/chuck-1.3.1.3-makefile.patch
new file mode 100644
index 000000000000..e1dad7f56613
--- /dev/null
+++ b/media-sound/chuck/files/chuck-1.3.1.3-makefile.patch
@@ -0,0 +1,39 @@
+diff -ru chuck-1.3.1.3.back/src/makefile chuck-1.3.1.3/src/makefile
+--- chuck-1.3.1.3.back/src/makefile	2012-10-07 15:55:19.000000000 +0200
++++ chuck-1.3.1.3/src/makefile	2012-10-07 15:57:54.000000000 +0200
+@@ -34,8 +34,6 @@
+ 
+ ifneq ($(CHUCK_DEBUG),)
+ CFLAGS+= -g
+-else
+-CFLAGS+= -O3
+ endif
+ 
+ ifneq ($(USE_64_BIT_SAMPLE),)
+diff -ru chuck-1.3.1.3.back/src/makefile.alsa chuck-1.3.1.3/src/makefile.alsa
+--- chuck-1.3.1.3.back/src/makefile.alsa	2012-10-07 15:55:19.000000000 +0200
++++ chuck-1.3.1.3/src/makefile.alsa	2012-10-07 15:57:20.000000000 +0200
+@@ -1,4 +1,4 @@
+ 
+-CFLAGS+= -D__LINUX_ALSA__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
++CFLAGS+= -D__LINUX_ALSA__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
+ LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread
+ 
+diff -ru chuck-1.3.1.3.back/src/makefile.jack chuck-1.3.1.3/src/makefile.jack
+--- chuck-1.3.1.3.back/src/makefile.jack	2012-10-07 15:55:19.000000000 +0200
++++ chuck-1.3.1.3/src/makefile.jack	2012-10-07 15:57:34.000000000 +0200
+@@ -1,4 +1,4 @@
+ 
+-CFLAGS+= -D__UNIX_JACK__ -D__LINUX_JACK__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
++CFLAGS+= -D__UNIX_JACK__ -D__LINUX_JACK__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
+ LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread
+ 
+diff -ru chuck-1.3.1.3.back/src/makefile.oss chuck-1.3.1.3/src/makefile.oss
+--- chuck-1.3.1.3.back/src/makefile.oss	2012-10-07 15:55:19.000000000 +0200
++++ chuck-1.3.1.3/src/makefile.oss	2012-10-07 15:57:16.000000000 +0200
+@@ -1,4 +1,4 @@
+ 
+-CFLAGS+= -D__LINUX_OSS__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
++CFLAGS+= -D__LINUX_OSS__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
+ LDFLAGS+= -lpthread -lstdc++ -ldl -lm -lsndfile
+ 
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/files/chuck.eselect-0.1 b/media-sound/chuck/files/chuck.eselect-0.1
new file mode 100644
index 000000000000..a074d237cf66
--- /dev/null
+++ b/media-sound/chuck/files/chuck.eselect-0.1
@@ -0,0 +1,152 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Manage /usr/bin/chuck audio engine"
+MAINTAINER="cedk@gentoo.org"
+SVN_DATE='$Date: 2008/07/20 13:49:00 $'
+VERSION=$(svn_date_to_version "${SVN_DATE}" )
+
+# find a list of unison symlink targets, best first
+find_targets() {
+	local f
+	for f in "${ROOT}"/usr/bin/chuck.{jack,alsa,oss}; do
+		if [[ -f ${f} ]] ; then
+			echo "${f##*/chuck.}"
+		fi
+	done | tac
+}
+
+# find version number of currently symlinked version
+identify_target() {
+	local f
+	f="$(canonicalise "${ROOT}"/usr/bin/chuck)"
+	echo "${f##*/chuck.}"
+}
+
+# try to remove the unison symlink
+remove_symlinks() {
+	rm -f "${ROOT}"/usr/bin/chuck &>/dev/null
+}
+
+# set the unison symlink
+set_symlinks() {
+	local target="${1}" targets
+	if is_number "${target}" && [[ ${target} -ge 1 ]] ; then
+		targets=( $(find_targets ) )
+		target=${targets[$(( ${target} - 1 ))]}
+	fi
+	if [[ -f "${ROOT}/usr/bin/chuck.${target}" ]] ; then
+		remove_symlinks
+		ln -s "chuck.${target}" "${ROOT}/usr/bin/chuck" || \
+			die "Could not set ${target} /usr/bin/chuck symlink"
+	else
+		die -q "Target \"${target}\" doesn't appear to be valid!"
+	fi
+}
+
+### show action ###
+
+describe_show() {
+	echo "Show the current chuck audio engine"
+}
+
+do_show() {
+	[[ -z "${@}" ]] || die -q "Too many parameters"
+
+	write_list_start "Current chuck audio engine:"
+	if [[ -L "${ROOT}/usr/bin/chuck" ]] ; then
+		write_kv_list_entry "$(identify_target)" ""
+	elif [[ -e "${ROOT}/usr/bin/chuck" ]] ; then
+		write_kv_list_entry "(not a symlink)" ""
+	else
+		write_kv_list_entry "(unset)" ""
+	fi
+}
+
+### list action ###
+
+describe_list() {
+	echo "List available chuck audio engines"
+}
+
+do_list() {
+	[[ -z "${@}" ]] || die -q "Too many parameters"
+
+	local i targets current
+	targets=( $(find_targets ) )
+	current=$(identify_target)
+	if [[ -n ${targets[@]} ]] ; then
+		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
+			[[ ${targets[${i}]} == ${current} ]] && \
+				targets[${i}]="${targets[${i}]} $(highlight '*' )"
+		done
+		write_list_start "Available chuck audio engines:"
+		write_numbered_list "${targets[@]}"
+	else
+		write_kv_list_entry "(none found)" ""
+	fi
+}
+
+### set action ###
+
+describe_set() {
+	echo "Set a new chuck audio engine"
+}
+
+describe_set_options() {
+	echo "target : Target audio engine or index from 'list' action"
+}
+
+describe_set_parameters() {
+	echo "<target>"
+}
+
+do_set() {
+	if [[ -z "${1}" ]] ; then
+		die -q "You didn't give me an audio engine"
+
+	elif [[ -n "${2}" ]] ; then
+		die -q "Too many parameters"
+
+	elif [[ -L "${ROOT}/usr/bin/chuck" ]] ; then
+		if ! remove_symlinks ; then
+			die -q "Can't remove existing audio engine symlink"
+		elif ! set_symlinks "${1}" ; then
+			die -q "Can't set new audio engine"
+		fi
+
+	elif [[ -e "${ROOT}/usr/bin/chuck" ]] ; then
+		die -q "${ROOT}/usr/bin/chuck seems to be from an old ebuild, please remove manually"
+
+	else
+		set_symlinks "${1}" || die -q "Can't set new audio engine"
+	fi
+}
+
+### update action ###
+
+describe_update() {
+	echo "Automatically update the chuck audio engine"
+}
+
+describe_update_options() {
+	echo "--if-unset : Do not override currently selected audio engine"
+}
+
+do_update() {
+	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
+		die -q "Usage error"
+
+	if [[ -L "${ROOT}/usr/bin/chuck" ]] ; then
+		[[ ${1} == "--if-unset" ]] && return
+		remove_symlinks || die -q "Can't remove existing symlink"
+	fi
+	if [[ -e "${ROOT}/usr/bin/chuck" ]] ; then
+		die -q "${ROOT}/usr/bin/chuck seems to be from an old ebuild, please remove manually"
+	elif ! [[ -z $(find_targets ) ]] ; then
+		set_symlinks 1 || die -q "Can't set a new audio engine"
+	fi
+}
+
+# vim: ts=4 sw=4 noet fdm=marker
diff --git a/media-sound/chuck/metadata.xml b/media-sound/chuck/metadata.xml
new file mode 100644
index 000000000000..aaa6999a44df
--- /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>
+    <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..25001dc8bee5
--- /dev/null
+++ b/media-sound/clementine/Manifest
@@ -0,0 +1,2 @@
+DIST clementine-1.2.2.tar.gz 9076752 SHA256 1f674c42f05c476baf74f1dd37b1aa357ff9199e4493173052c856a53e5f0a96 SHA512 48e934ed1f18724c4cc79eaf7ac16dcb2ecc9d268a4986a8a421c6518d7a13bd81a5b7d249b4ff146c860bed520a59d2062139fb57672609019b8c2c84e495ca WHIRLPOOL 13c3f129566c0789e67b23b2382d7ed1f756221647c4b2cc1b4b1b1efcb5e04571837a843c8ff7c099f9bcd3f9b1dd481b1fa75fe1c4b27e90169026e8880840
+DIST clementine-1.2.3.tar.gz 9076977 SHA256 7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf SHA512 fd43a7dcfec360d4478a56d0600300b6913b294f127afb0249971b45b54b48475d128861e06885c482bbdd37b09aa56b1c238675763fdb8c50329005b066bec3 WHIRLPOOL 23d0fb971118b0d73ec4a52cfa3f8829118ab65c12fb01ce30433541f5da081b52c5dd485aa0efdda2b4b57b286f59702aa686f9b7ce17a0a2595b208b95d524
diff --git a/media-sound/clementine/clementine-1.2.2.ebuild b/media-sound/clementine/clementine-1.2.2.ebuild
new file mode 100644
index 000000000000..9a65d1032530
--- /dev/null
+++ b/media-sound/clementine/clementine-1.2.2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 es_AR et eu fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
+
+inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
+[[ ${PV} == *9999* ]] && inherit git-2
+
+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="ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	wiimote? ( dbus )
+"
+
+# qca dep is temporary for bug #489850
+COMMON_DEPEND="
+	app-crypt/qca:2[qt4(+)]
+	>=dev-qt/qtgui-4.5:4
+	dbus? ( >=dev-qt/qtdbus-4.5:4 )
+	>=dev-qt/qtopengl-4.5:4
+	>=dev-qt/qtsql-4.5:4[sqlite]
+	system-sqlite? ( dev-db/sqlite[fts3(+)] )
+	>=media-libs/taglib-1.8[mp4]
+	>=dev-libs/glib-2.24.1-r1
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-libs/qjson
+	media-libs/libechonest:=
+	>=media-libs/libmygpo-qt-1.0.7
+	>=media-libs/chromaprint-0.6
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	virtual/glu
+	virtual/opengl
+	ayatana? ( dev-libs/libindicate-qt )
+	cdda? ( dev-libs/libcdio )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	lastfm? ( >=media-libs/liblastfm-1 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	moodbar? ( sci-libs/fftw:3.0 )
+	projectm? ( media-libs/glew )
+"
+# now only presets are used, libprojectm is internal
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
+RDEPEND="${COMMON_DEPEND}
+	dbus? ( udisks? ( sys-fs/udisks:2 ) )
+	mms? ( media-plugins/gst-plugins-libmms:0.10 )
+	mtp? ( gnome-base/gvfs )
+	projectm? ( >=media-libs/libprojectm-1.2.0 )
+	media-plugins/gst-plugins-meta:0.10
+	media-plugins/gst-plugins-gio:0.10
+	media-plugins/gst-plugins-soup:0.10
+	media-plugins/gst-plugins-taglib:0.10
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.39
+	virtual/pkgconfig
+	sys-devel/gettext
+	dev-qt/qttest:4
+	dev-cpp/gmock
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	skydrive? ( dev-cpp/sparsehash )
+	ubuntu-one? ( dev-cpp/sparsehash )
+	test? ( gnome-base/gsettings-desktop-schemas )
+"
+DOCS="Changelog"
+
+# https://github.com/clementine-player/Clementine/issues/3935
+RESTRICT="test"
+
+[[ ${PV} == *9999* ]] || \
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build.patch
+	"${FILESDIR}"/${P}-fix-build2.patch
+	"${FILESDIR}"/${P}-gcc49.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}"
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		$(cmake-utils_use cdda ENABLE_AUDIOCD)
+		$(cmake-utils_use dbus ENABLE_DBUS)
+		$(cmake-utils_use udisks ENABLE_DEVICEKIT)
+		$(cmake-utils_use ipod ENABLE_LIBGPOD)
+		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
+		$(cmake-utils_use mtp ENABLE_LIBMTP)
+		$(cmake-utils_use moodbar ENABLE_MOODBAR)
+		-DENABLE_GIO=ON
+		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
+		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
+		$(cmake-utils_use ayatana ENABLE_SOUNDMENU)
+		$(cmake-utils_use box ENABLE_BOX)
+		$(cmake-utils_use dropbox ENABLE_DROPBOX)
+		$(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
+		$(cmake-utils_use skydrive ENABLE_SKYDRIVE)
+		$(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DENABLE_BREAKPAD=OFF
+		$(cmake-utils_use !system-sqlite STATIC_SQLITE)
+		$(cmake-utils_use system-sqlite I_HATE_MY_USERS)
+		$(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
+		-DUSE_BUILTIN_TAGLIB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	Xemake test
+}
+
+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/clementine/clementine-1.2.3.ebuild b/media-sound/clementine/clementine-1.2.3.ebuild
new file mode 100644
index 000000000000..d9410eb7e4ba
--- /dev/null
+++ b/media-sound/clementine/clementine-1.2.3.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 es_AR et eu fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
+
+inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
+[[ ${PV} == *9999* ]] && inherit git-2
+
+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="ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	wiimote? ( dbus )
+"
+
+# qca dep is temporary for bug #489850
+COMMON_DEPEND="
+	app-crypt/qca:2[qt4(+)]
+	>=dev-qt/qtcore-4.5:4
+	>=dev-qt/qtgui-4.5:4
+	dbus? ( >=dev-qt/qtdbus-4.5:4 )
+	>=dev-qt/qtopengl-4.5:4
+	>=dev-qt/qtsql-4.5:4[sqlite]
+	system-sqlite? ( dev-db/sqlite[fts3(+)] )
+	>=media-libs/taglib-1.8[mp4]
+	>=dev-libs/glib-2.24.1-r1
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-libs/qjson
+	media-libs/libechonest:=
+	>=media-libs/libmygpo-qt-1.0.7
+	>=media-libs/chromaprint-0.6
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11
+	ayatana? ( dev-libs/libindicate-qt )
+	cdda? ( dev-libs/libcdio )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	lastfm? ( >=media-libs/liblastfm-1 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	moodbar? ( sci-libs/fftw:3.0 )
+	projectm? ( media-libs/glew )
+"
+# now only presets are used, libprojectm is internal
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
+RDEPEND="${COMMON_DEPEND}
+	dbus? ( udisks? ( sys-fs/udisks:2 ) )
+	mms? ( media-plugins/gst-plugins-libmms:0.10 )
+	mtp? ( gnome-base/gvfs )
+	projectm? ( >=media-libs/libprojectm-1.2.0 )
+	media-plugins/gst-plugins-meta:0.10
+	media-plugins/gst-plugins-gio:0.10
+	media-plugins/gst-plugins-soup:0.10
+	media-plugins/gst-plugins-taglib:0.10
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.39
+	virtual/pkgconfig
+	sys-devel/gettext
+	dev-qt/qttest:4
+	dev-cpp/gmock
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	skydrive? ( dev-cpp/sparsehash )
+	ubuntu-one? ( dev-cpp/sparsehash )
+	test? ( gnome-base/gsettings-desktop-schemas )
+"
+DOCS="Changelog"
+
+# https://github.com/clementine-player/Clementine/issues/3935
+RESTRICT="test"
+
+[[ ${PV} == *9999* ]] || \
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}"/clementine-1.2.3-namespaces.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}"
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		$(cmake-utils_use cdda ENABLE_AUDIOCD)
+		$(cmake-utils_use dbus ENABLE_DBUS)
+		$(cmake-utils_use udisks ENABLE_DEVICEKIT)
+		$(cmake-utils_use ipod ENABLE_LIBGPOD)
+		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
+		$(cmake-utils_use mtp ENABLE_LIBMTP)
+		$(cmake-utils_use moodbar ENABLE_MOODBAR)
+		-DENABLE_GIO=ON
+		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
+		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
+		$(cmake-utils_use ayatana ENABLE_SOUNDMENU)
+		$(cmake-utils_use box ENABLE_BOX)
+		$(cmake-utils_use dropbox ENABLE_DROPBOX)
+		$(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
+		$(cmake-utils_use skydrive ENABLE_SKYDRIVE)
+		$(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DENABLE_BREAKPAD=OFF
+		$(cmake-utils_use !system-sqlite STATIC_SQLITE)
+		$(cmake-utils_use system-sqlite I_HATE_MY_USERS)
+		$(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
+		-DUSE_BUILTIN_TAGLIB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	Xemake test
+}
+
+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/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
new file mode 100644
index 000000000000..e8970fff8f50
--- /dev/null
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 es_AR et eu fa fi fr ga gl he hi hr hu hy ia id is it ja ka kk ko lt lv mr ms nb nl oc pa pl pt pt_BR ro ru sk sl sr sr@latin sv te tr uk uz vi zh_CN zh_TW"
+
+inherit cmake-utils flag-o-matic fdo-mime gnome2-utils virtualx
+[[ ${PV} == *9999* ]] && inherit git-2
+
+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="ayatana box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive system-sqlite test ubuntu-one +udisks wiimote"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+	udisks? ( dbus )
+	wiimote? ( dbus )
+"
+
+# qca dep is temporary for bug #489850
+COMMON_DEPEND="
+	app-crypt/qca:2[qt4(+)]
+	>=dev-qt/qtgui-4.5:4
+	dbus? ( >=dev-qt/qtdbus-4.5:4 )
+	>=dev-qt/qtopengl-4.5:4
+	>=dev-qt/qtsql-4.5:4[sqlite]
+	system-sqlite? ( dev-db/sqlite[fts3(+)] )
+	>=media-libs/taglib-1.8[mp4]
+	>=dev-libs/glib-2.24.1-r1
+	dev-libs/libxml2
+	dev-libs/protobuf:=
+	dev-libs/qjson
+	media-libs/libechonest:=
+	>=media-libs/libmygpo-qt-1.0.7
+	>=media-libs/chromaprint-0.6
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	dev-libs/crypto++
+	virtual/glu
+	virtual/opengl
+	ayatana? ( dev-libs/libindicate-qt )
+	cdda? ( dev-libs/libcdio )
+	ipod? ( >=media-libs/libgpod-0.8.0 )
+	lastfm? ( >=media-libs/liblastfm-1 )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	moodbar? ( sci-libs/fftw:3.0 )
+	projectm? ( media-libs/glew )
+"
+# now only presets are used, libprojectm is internal
+# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
+# r1966 "Compile with a static sqlite by default, since Qt 4.7 doesn't seem to expose the symbols we need to use FTS"
+RDEPEND="${COMMON_DEPEND}
+	dbus? ( udisks? ( sys-fs/udisks:0 ) )
+	mms? ( media-plugins/gst-plugins-libmms:0.10 )
+	mtp? ( gnome-base/gvfs )
+	projectm? ( >=media-libs/libprojectm-1.2.0 )
+	media-plugins/gst-plugins-meta:0.10
+	media-plugins/gst-plugins-gio:0.10
+	media-plugins/gst-plugins-soup:0.10
+	media-plugins/gst-plugins-taglib:0.10
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/boost-1.39
+	virtual/pkgconfig
+	sys-devel/gettext
+	dev-qt/qttest:4
+	dev-cpp/gmock
+	box? ( dev-cpp/sparsehash )
+	dropbox? ( dev-cpp/sparsehash )
+	googledrive? ( dev-cpp/sparsehash )
+	skydrive? ( dev-cpp/sparsehash )
+	ubuntu-one? ( dev-cpp/sparsehash )
+	test? ( gnome-base/gsettings-desktop-schemas )
+"
+DOCS="Changelog"
+
+# https://github.com/clementine-player/Clementine/issues/3935
+RESTRICT="test"
+
+[[ ${PV} == *9999* ]] || \
+S="${WORKDIR}/${P^}"
+
+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}"
+		-DBUNDLE_PROJECTM_PRESETS=OFF
+		$(cmake-utils_use cdda ENABLE_AUDIOCD)
+		$(cmake-utils_use dbus ENABLE_DBUS)
+		$(cmake-utils_use udisks ENABLE_DEVICEKIT)
+		$(cmake-utils_use ipod ENABLE_LIBGPOD)
+		$(cmake-utils_use lastfm ENABLE_LIBLASTFM)
+		$(cmake-utils_use mtp ENABLE_LIBMTP)
+		$(cmake-utils_use moodbar ENABLE_MOODBAR)
+		-DENABLE_GIO=ON
+		$(cmake-utils_use wiimote ENABLE_WIIMOTEDEV)
+		$(cmake-utils_use projectm ENABLE_VISUALISATIONS)
+		$(cmake-utils_use ayatana ENABLE_SOUNDMENU)
+		$(cmake-utils_use box ENABLE_BOX)
+		$(cmake-utils_use dropbox ENABLE_DROPBOX)
+		$(cmake-utils_use googledrive ENABLE_GOOGLE_DRIVE)
+		$(cmake-utils_use skydrive ENABLE_SKYDRIVE)
+		$(cmake-utils_use ubuntu-one ENABLE_UBUNTU_ONE)
+		-DENABLE_SPOTIFY_BLOB=OFF
+		-DENABLE_BREAKPAD=OFF
+		$(cmake-utils_use !system-sqlite STATIC_SQLITE)
+		$(cmake-utils_use system-sqlite I_HATE_MY_USERS)
+		$(cmake-utils_use system-sqlite MY_USERS_WILL_SUFFER_BECAUSE_OF_ME)
+		-DUSE_BUILTIN_TAGLIB=OFF
+		-DUSE_SYSTEM_GMOCK=ON
+		# force to find crypto++ see bug #548544
+		-DCRYPTOPP_LIBRARIES="crypto++"
+		-DCRYPTOPP_FOUND=ON
+		)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}" || die
+	Xemake test
+}
+
+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/clementine/files/clementine-1.2.2-fix-build.patch b/media-sound/clementine/files/clementine-1.2.2-fix-build.patch
new file mode 100644
index 000000000000..7a83e3102b6b
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.2.2-fix-build.patch
@@ -0,0 +1,25 @@
+From 3df3a5b645737603af6bda844db04c431b9c8064 Mon Sep 17 00:00:00 2001
+From: John Maguire <john.maguire@gmail.com>
+Date: Thu, 6 Feb 2014 19:03:10 +0100
+Subject: [PATCH] Add missing header for syscall().
+
+This is cunningly not defined in syscall.h
+---
+ src/core/utilities.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
+index 6fce753..cb9a94d 100644
+--- a/src/core/utilities.cpp
++++ b/src/core/utilities.cpp
+@@ -52,6 +52,7 @@
+ #endif
+ 
+ #ifdef Q_OS_LINUX
++#  include <unistd.h>
+ #  include <sys/syscall.h>
+ #endif
+ #ifdef Q_OS_DARWIN
+-- 
+1.8.5.5
+
diff --git a/media-sound/clementine/files/clementine-1.2.2-fix-build2.patch b/media-sound/clementine/files/clementine-1.2.2-fix-build2.patch
new file mode 100644
index 000000000000..05ec92f3c503
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.2.2-fix-build2.patch
@@ -0,0 +1,38 @@
+From 7671108aa8d02658cd35cacf4337507cc80ea03a Mon Sep 17 00:00:00 2001
+From: John Maguire <john.maguire@gmail.com>
+Date: Thu, 6 Feb 2014 19:46:08 +0100
+Subject: [PATCH] Add missing include for symlink()
+
+---
+ src/internet/spotifyblobdownloader.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/internet/spotifyblobdownloader.cpp b/src/internet/spotifyblobdownloader.cpp
+index 9827d65..5bd12a0 100644
+--- a/src/internet/spotifyblobdownloader.cpp
++++ b/src/internet/spotifyblobdownloader.cpp
+@@ -15,8 +15,9 @@
+    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+-#include "config.h"
+ #include "spotifyblobdownloader.h"
++
++#include "config.h"
+ #include "spotifyservice.h"
+ #include "core/logging.h"
+ #include "core/network.h"
+@@ -32,6 +33,10 @@
+   #include <QtCrypto>
+ #endif // HAVE_QCA
+ 
++#ifdef Q_OS_UNIX
++  #include <unistd.h>
++#endif
++
+ const char* SpotifyBlobDownloader::kSignatureSuffix = ".sha1";
+ 
+ 
+-- 
+1.8.5.5
+
diff --git a/media-sound/clementine/files/clementine-1.2.2-gcc49.patch b/media-sound/clementine/files/clementine-1.2.2-gcc49.patch
new file mode 100644
index 000000000000..119298787a55
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.2.2-gcc49.patch
@@ -0,0 +1,17 @@
+In file included from ../../Clementine-1.2.2/src/core/mergedproxymodel.cpp:18:0:
+../../Clementine-1.2.2/src/core/mergedproxymodel.h:23:12: error: 'std::placeholders' has not been declared
+ using std::placeholders::_1;
+../../Clementine-1.2.2/src/core/mergedproxymodel.h:24:12: error: 'std::placeholders' has not been declared
+ using std::placeholders::_2;
+
+
+--- a/src/core/mergedproxymodel.h
++++ b/src/core/mergedproxymodel.h
+@@ -19,6 +19,7 @@
+ #define MERGEDPROXYMODEL_H
+ 
+ #include <QAbstractProxyModel>
++#include <functional>
+ 
+ using std::placeholders::_1;
+ using std::placeholders::_2;
diff --git a/media-sound/clementine/files/clementine-1.2.3-namespaces.patch b/media-sound/clementine/files/clementine-1.2.3-namespaces.patch
new file mode 100644
index 000000000000..2240debd0e4a
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.2.3-namespaces.patch
@@ -0,0 +1,36 @@
+From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001
+From: Chocobozzz <florian.chocobo@gmail.com>
+Date: Wed, 16 Jul 2014 15:57:25 +0200
+Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401
+
+---
+ src/CMakeLists.txt | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 650fa74..775b0a5 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
+ if(HAVE_DBUS)
+   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
+ 
+-  # Hack to get it to generate interfaces without namespaces - required
+-  # because otherwise org::freedesktop::UDisks and
+-  # org::freedesktop::UDisks::Device conflict.
+-  list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
+-
+   # MPRIS DBUS interfaces
+   qt4_add_dbus_adaptor(SOURCES
+       dbus/org.freedesktop.MediaPlayer.player.xml
+@@ -964,6 +959,10 @@ if(HAVE_DBUS)
+ 
+   # DeviceKit DBUS interfaces
+   if(HAVE_DEVICEKIT)
++    set_source_files_properties(dbus/org.freedesktop.UDisks.xml
++        PROPERTIES NO_NAMESPACE dbus/udisks)
++    set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
++        PROPERTIES NO_NAMESPACE dbus/udisksdevice)
+     qt4_add_dbus_interface(SOURCES
+         dbus/org.freedesktop.UDisks.xml
+         dbus/udisks)
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
new file mode 100644
index 000000000000..3f662b4da6d5
--- /dev/null
+++ b/media-sound/clementine/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<herd>sound</herd>
+	<maintainer>
+		<email>nikoli@gmx.us</email>
+		<name>Nikoli</name>
+	</maintainer>
+	<use>
+		<flag name="box">Enable Box support</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="skydrive">Enable Skydrive support</flag>
+		<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg> installation</flag>
+		<flag name="ubuntu-one">Enable Ubuntu One 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..f18743cac9ca
--- /dev/null
+++ b/media-sound/cmix/Manifest
@@ -0,0 +1 @@
+DIST cmix-1.6.tbz2 12880 RMD160 abb5b3b650196dcdc8782fc55aa207126f12a975 SHA1 005eb02826a960555f23eaebb840c21e8d2a7980 SHA256 3c63e687c0afac50f5218f2ee0f594132f1656073d5a9cf3f7f0da525b4e8afe
diff --git a/media-sound/cmix/cmix-1.6.ebuild b/media-sound/cmix/cmix-1.6.ebuild
new file mode 100644
index 000000000000..c5785e1c2f6c
--- /dev/null
+++ b/media-sound/cmix/cmix-1.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/cmix/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
new file mode 100644
index 000000000000..b1e9c0f4b43b
--- /dev/null
+++ b/media-sound/cmus/Manifest
@@ -0,0 +1,3 @@
+DIST cmus-2.6.0.tar.gz 287834 SHA256 0c53c072432e026d682d1749bbe89777507b31107ca04afad21a9bf375208e8e SHA512 737ee38886f449aa67b105e170aaa3ef3f7f5dff9be079ff92817e9f249f4e0a88e78a190e8a0ccae1c6be8a11fa954df5b59592472bbb795c36197d2b377dd8 WHIRLPOOL e8a2504424cf059934352e769b9e8ede05e559ed12eba81b02a78007ac7e87231a58c113e7f26f0e6f091d6a048d2979c0169dfe21d543b3d70647a21219b17a
+DIST cmus-2.7.1.tar.gz 296818 SHA256 8179a7a843d257ddb585f4c65599844bc0e516fe85e97f6f87a7ceade4eb5165 SHA512 b29ce10bbb61eb41c33c4912be320718fcf005a5797320145b124f048f6be5f5b0cebb67471ef7b062bd6f854849b6aae0e82e9adbf289a44237787932ea1576 WHIRLPOOL a6ee2109f5f6b6e771704fc1887fe1caf988bff39126d1a7a26d8fb93a7dfe53113eee697a04cb2bbaf4c274b9acbb9a5ecbf2d1c0e3fac4552380a23f5f3549
+DIST cmus-v2.5.0.tar.bz2 224675 SHA256 2021fab64088898d62d1439525ec345e219f58d91a9e933dc85e84eda21c8ddf SHA512 a43e976dd7ca39d576ae51b0f66f9bc4fa21f30626cb814fa237389c9bbc1c0b5a3a28b1d3d0d86527c3a3ffb771cc68d29d5ca8b88f0390bda7926e668504e4 WHIRLPOOL 44baaf57e0e572736f7d2ed2fa1f16c6712831c1e10de5ef26a142f7b366547fa39212e5f947fbba6401212c9ffd41f208f4cbc457d9d9ac9f08282fbedbeb3c
diff --git a/media-sound/cmus/cmus-2.5.0-r1.ebuild b/media-sound/cmus/cmus-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..51d3ee105ccb
--- /dev/null
+++ b/media-sound/cmus/cmus-2.5.0-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib
+
+MY_P=${PN}-v${PV}
+
+DESCRIPTION="A ncurses based music player with plugin support for many formats"
+HOMEPAGE="http://cmus.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cmus/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="aac alsa ao cue cdio cddb discid debug examples flac +mad mikmod modplug mp4 musepack oss pidgin pulseaudio unicode vorbis wavpack wma zsh-completion"
+
+CDEPEND="sys-libs/ncurses[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 )
+	flac? ( media-libs/flac )
+	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 )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	wavpack? ( media-sound/wavpack )
+	wma? ( >=virtual/ffmpeg-0.10.2-r1 )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	zsh-completion? ( app-shells/zsh )
+	pidgin? ( net-im/pidgin
+		dev-python/dbus-python )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cdio-make-it-work-with-libcdio-0.90.patch #452446
+}
+
+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"
+
+	use debug && debuglevel=2
+
+	my_config cue CONFIG_CUE
+	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 wavpack CONFIG_WAVPACK
+	my_config mp4 CONFIG_MP4
+	my_config aac CONFIG_AAC
+	my_config wma CONFIG_FFMPEG
+	my_config pulseaudio CONFIG_PULSE
+	my_config alsa CONFIG_ALSA
+	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
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins contrib/_cmus
+	fi
+
+	if use pidgin; then
+		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
+	fi
+}
diff --git a/media-sound/cmus/cmus-2.6.0.ebuild b/media-sound/cmus/cmus-2.6.0.ebuild
new file mode 100644
index 000000000000..e3fa73b7ea4c
--- /dev/null
+++ b/media-sound/cmus/cmus-2.6.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit multilib
+
+DESCRIPTION="A ncurses based music player with plugin support for many formats"
+HOMEPAGE="http://cmus.github.io/"
+SRC_URI="http://github.com/cmus/cmus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="aac alsa ao cue cdio cddb discid debug examples flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor unicode vorbis wavpack wma zsh-completion"
+
+CDEPEND="sys-libs/ncurses[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 )
+	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 )
+	wma? ( >=virtual/ffmpeg-0.10.2-r1 )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	zsh-completion? ( app-shells/zsh )
+	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 )"
+
+DOCS="AUTHORS README.md"
+
+# TODO: What is CONFIG_ROAR and why it's missing from Portage?
+# TODO: If CONFIG_ROAR is unhandled, has someone skipped other new dependencies as well?
+
+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"
+
+	use debug && debuglevel=2
+
+	my_config cue CONFIG_CUE
+	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 wma CONFIG_FFMPEG
+	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
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins contrib/_cmus
+	fi
+
+	if use pidgin; then
+		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
+	fi
+}
diff --git a/media-sound/cmus/cmus-2.7.1.ebuild b/media-sound/cmus/cmus-2.7.1.ebuild
new file mode 100644
index 000000000000..d7fb29f0d787
--- /dev/null
+++ b/media-sound/cmus/cmus-2.7.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit bash-completion-r1 multilib
+
+DESCRIPTION="A ncurses based music player with plugin support for many formats"
+HOMEPAGE="http://cmus.github.io/"
+SRC_URI="http://github.com/cmus/cmus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="aac alsa ao cue cdio cddb discid debug examples +flac jack libsamplerate
+	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor +unicode
+	+vorbis wavpack wma"
+
+CDEPEND="sys-libs/ncurses[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 )
+	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 )
+	wma? ( media-video/ffmpeg:= )"
+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 wma 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
+}
diff --git a/media-sound/cmus/files/cmus-2.5.0-cdio-make-it-work-with-libcdio-0.90.patch b/media-sound/cmus/files/cmus-2.5.0-cdio-make-it-work-with-libcdio-0.90.patch
new file mode 100644
index 000000000000..ace57bf075cb
--- /dev/null
+++ b/media-sound/cmus/files/cmus-2.5.0-cdio-make-it-work-with-libcdio-0.90.patch
@@ -0,0 +1,100 @@
+From 70c727022dcfd802de0d621255ab1a366a50c434 Mon Sep 17 00:00:00 2001
+From: Gregory Petrosyan <gregory.petrosyan@gmail.com>
+Date: Mon, 28 Jan 2013 16:13:40 +0400
+Subject: [PATCH] cdio: make it work with libcdio 0.90+
+
+Signed-off-by: Gregory Petrosyan <gregory.petrosyan@gmail.com>
+---
+ cdio.c | 47 ++++++++++++++++++++++++++++++++++++++---------
+ 1 file changed, 38 insertions(+), 9 deletions(-)
+
+diff --git a/cdio.c b/cdio.c
+index b88983a..b248b3a 100644
+--- a/cdio.c
++++ b/cdio.c
+@@ -27,9 +27,14 @@
+ #include "comment.h"
+ #include "discid.h"
+ 
+-#include <cdio/cdda.h>
+ #include <cdio/cdio.h>
+ #include <cdio/logging.h>
++#if LIBCDIO_VERSION_NUM >= 90
++#include <cdio/paranoia/cdda.h>
++#else
++#include <cdio/cdda.h>
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -352,24 +357,47 @@ static int libcdio_read_comments(struct input_plugin_data *ip_data, struct keyva
+ 	GROWING_KEYVALS(c);
+ 	const char *artist = NULL, *albumartist = NULL, *album = NULL,
+ 		*title = NULL, *genre = NULL, *comment = NULL;
+-	const cdtext_t *cdtext_track, *cdtext_album;
++	int track_comments_found = 0;
++	const cdtext_t *cdt;
+ #ifdef HAVE_CDDB
+ 	cddb_conn_t *cddb_conn = NULL;
+ 	cddb_disc_t *cddb_disc = NULL;
+ #endif
+ 	char buf[64];
+ 
+-	cdtext_track = cdio_get_cdtext(priv->cdio, priv->track);
+-	if (cdtext_track) {
+-		char * const *field = cdtext_track->field;
++#if LIBCDIO_VERSION_NUM >= 90
++	cdt = cdio_get_cdtext(priv->cdio);
++	if (cdt) {
++		artist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, priv->track);
++		title = cdtext_get(cdt, CDTEXT_FIELD_TITLE, priv->track);
++		genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, priv->track);
++		comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, priv->track);
++
++		if (title)
++			track_comments_found = 1;
++
++		album = cdtext_get(cdt, CDTEXT_FIELD_TITLE, 0);
++		albumartist = cdtext_get(cdt, CDTEXT_FIELD_PERFORMER, 0);
++		if (!artist)
++			artist = albumartist;
++		if (!genre)
++			genre = cdtext_get(cdt, CDTEXT_FIELD_GENRE, 0);
++		if (!comment)
++			comment = cdtext_get(cdt, CDTEXT_FIELD_MESSAGE, 0);
++	}
++#else
++	cdt = cdio_get_cdtext(priv->cdio, priv->track);
++	if (cdt) {
++		track_comments_found = 1;
++		char * const *field = cdt->field;
+ 		artist = field[CDTEXT_PERFORMER];
+ 		title = field[CDTEXT_TITLE];
+ 		genre = field[CDTEXT_GENRE];
+ 		comment = field[CDTEXT_MESSAGE];
+ 	}
+-	cdtext_album = cdio_get_cdtext(priv->cdio, 0);
+-	if (cdtext_album) {
+-		char * const *field = cdtext_album->field;
++	cdt = cdio_get_cdtext(priv->cdio, 0);
++	if (cdt) {
++		char * const *field = cdt->field;
+ 		album = field[CDTEXT_TITLE];
+ 		albumartist = field[CDTEXT_PERFORMER];
+ 		if (!artist)
+@@ -379,9 +407,10 @@ static int libcdio_read_comments(struct input_plugin_data *ip_data, struct keyva
+ 		if (!comment)
+ 			comment = field[CDTEXT_MESSAGE];
+ 	}
++#endif
+ 
+ #ifdef HAVE_CDDB
+-	if (!cdtext_track && cddb_url && cddb_url[0]) {
++	if (!track_comments_found && cddb_url && cddb_url[0]) {
+ 		cddb_track_t *cddb_track;
+ 		track_t i_tracks = cdio_get_num_tracks(priv->cdio);
+ 		track_t i_first_track = cdio_get_first_track_num(priv->cdio);
+-- 
+1.8.2.1
+
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
new file mode 100644
index 000000000000..64e10a1edfd5
--- /dev/null
+++ b/media-sound/cmus/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+    <email>fauli@gentoo.org</email>
+    <name>Christian Faulhammer</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>
+    <flag name="wma">add support for Windows Media Audio</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">cmus/cmus</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/cmusfm/Manifest b/media-sound/cmusfm/Manifest
new file mode 100644
index 000000000000..55c00b7b4d09
--- /dev/null
+++ b/media-sound/cmusfm/Manifest
@@ -0,0 +1 @@
+DIST cmusfm-0.2.5.tar.gz 28651 SHA256 f6f0a2e60a3c00480903035f71339aa4ea8a70d2f64b3ff9a6ea2f75b61543af SHA512 0db8d865342438531bfb800d835800240e47732444795159f72ed3c91a4c3f0747ba2da1dcc8e71ef340ba5a3febdb39d8dd5868b134afcbcf7b3614a7790eae WHIRLPOOL 3fe8dc2bc233f031b83fe43186a70877acafc16057dc93f2c1155031c5f65553eb525a4bd9d83afb4d8f5224b785c43c95a75d1d8147b0c92ba19d049bb47b3e
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..e1d663d45ff0
--- /dev/null
+++ b/media-sound/cmusfm/cmusfm-0.2.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/metadata.xml b/media-sound/cmusfm/metadata.xml
new file mode 100644
index 000000000000..4ee9765db591
--- /dev/null
+++ b/media-sound/cmusfm/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>
+    <email>yngwin@gentoo.org</email>
+    <name>Ben de Groot</name>
+  </maintainer>
+  <herd>sound</herd>
+  <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..d39eadbc6fdf
--- /dev/null
+++ b/media-sound/codecgraph/Manifest
@@ -0,0 +1 @@
+DIST codecgraph-20120114.tar.gz 94168 SHA256 24dca78c6a8cf894385df304d29f348d48868000d5ffbd03bf12c5b4f9805106
diff --git a/media-sound/codecgraph/codecgraph-20120114.ebuild b/media-sound/codecgraph/codecgraph-20120114.ebuild
new file mode 100644
index 000000000000..e92d05301f97
--- /dev/null
+++ b/media-sound/codecgraph/codecgraph-20120114.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="2"
+
+inherit base python
+
+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=""
+
+RDEPEND="media-gfx/graphviz"
+DEPEND="${RDEPEND}
+	media-gfx/imagemagick"
+
+PATCHES=( "${FILESDIR}/${PV}-makefile-prefix.diff" )
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc codecs.txt README BUGS IDEAS
+	python_convert_shebangs -r 2 "${ED}"
+}
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..a025c77c7636
--- /dev/null
+++ b/media-sound/codecgraph/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+<maintainer>
+  <email>chainsaw@gentoo.org</email>
+  <name>Tony Vroon</name>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/combine_wave/Manifest b/media-sound/combine_wave/Manifest
new file mode 100644
index 000000000000..4b879eb69363
--- /dev/null
+++ b/media-sound/combine_wave/Manifest
@@ -0,0 +1 @@
+DIST combine_wave-0.3.1.tgz 14875 SHA256 871dd240bce9f19a8f190496dc8aff7ef4f09c3a55bff2ec3f1c1fc2a2f68078
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..7d1940c6de35
--- /dev/null
+++ b/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/combine_wave/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/coquillo/Manifest b/media-sound/coquillo/Manifest
new file mode 100644
index 000000000000..b45a0da37c74
--- /dev/null
+++ b/media-sound/coquillo/Manifest
@@ -0,0 +1 @@
+DIST coquillo-1.12-src.tar.gz 570833 SHA256 5c1a46786e25dc3bb10ac063314aed173350cf6bc0436f181ad666d01899cd7d SHA512 4d0b7dad811019aa488baa27f0d655dc2ee126fa81c5944aa7de9093306c170863bd323de6f0233efef38e96b21b10f4a04239c0e277d42993667213e2bd2817 WHIRLPOOL 46046e32813cc46289694a8c010d026217143d59a19f0ccabdc356913fdf57867518fcf3ad61baebea7c1cc98568d9b6de619dbf3148ab10595954e9829f3cb5
diff --git a/media-sound/coquillo/coquillo-1.12.ebuild b/media-sound/coquillo/coquillo-1.12.ebuild
new file mode 100644
index 000000000000..da5ecd50f33d
--- /dev/null
+++ b/media-sound/coquillo/coquillo-1.12.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..30d1023796f6
--- /dev/null
+++ b/media-sound/coquillo/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <herd>qt</herd>
+</pkgmetadata>
diff --git a/media-sound/cplay/Manifest b/media-sound/cplay/Manifest
new file mode 100644
index 000000000000..aa2e7fb86ed4
--- /dev/null
+++ b/media-sound/cplay/Manifest
@@ -0,0 +1 @@
+DIST cplay-1.49.tar.gz 36400 SHA256 4c624a7e5839b1523418b0b898dc300c571099a7e7252265ee79f7adbed0a80d
diff --git a/media-sound/cplay/cplay-1.49.ebuild b/media-sound/cplay/cplay-1.49.ebuild
new file mode 100644
index 000000000000..4bc049cdf335
--- /dev/null
+++ b/media-sound/cplay/cplay-1.49.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+PYTHON_DEPEND="2"
+inherit python
+
+DESCRIPTION="A Curses front-end for various audio players"
+SRC_URI="http://mask.tf.hut.fi/~flu/cplay/${P}.tar.gz"
+HOMEPAGE="http://mask.tf.hut.fi/~flu/hacks/cplay/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86"
+IUSE="mp3 vorbis"
+
+RDEPEND="vorbis? ( media-sound/vorbis-tools )
+	mp3? ( || ( media-sound/mpg123
+		media-sound/mpg321
+		media-sound/madplay
+		media-sound/splay ) )"
+DEPEND="sys-devel/gettext"
+
+src_prepare() {
+	sed -i -e 's:make:$(MAKE):' Makefile || die
+	sed -i -e 's:/usr/local:/usr:' cplay || die
+	python_convert_shebangs 2 cplay
+}
+
+src_install() {
+	emake PREFIX="${D}/usr" recursive-install || die
+	dobin cplay || die
+	doman cplay.1
+	dodoc ChangeLog README TODO
+}
diff --git a/media-sound/cplay/metadata.xml b/media-sound/cplay/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/cplay/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
new file mode 100644
index 000000000000..60852ee30424
--- /dev/null
+++ b/media-sound/csound/Manifest
@@ -0,0 +1,5 @@
+DIST Csound5.19.01.tar.gz 9302526 SHA256 c918fbdfa7a65cefd080966ba4b44aadb2e36f80c83a5714efb5a9c76532111d SHA512 8dd0c8984a75fe74e5aea53abf15276fdb526ce34ff48402ad2cfd2953b65a67a52f3a279cd030964cddd2322711df04638e039e2998022d92c56593450d3c8c WHIRLPOOL 86ff2a5aea5ec2a65153a5582352a292815e95059d9c48360ea16b8a1bca6d22ec4693cd744b4335df1fcf720a8b006598cd9c1ed8ff54d93af6fe37c8165be6
+DIST Csound6.02.tar.gz 23459796 SHA256 b964199642b1141d4e3253a86996c613c2420c4e2cc39cad347ad7115768c0a5 SHA512 885911561768fe4f9761b442899ba3481d09d02f095aaeb14d076a4902482269274e394517423bf8fea68c2f9e76bd3faaebe328d878ccc0a4c4a8d2d95d1dc0 WHIRLPOOL 9ee8e51c3ce224717b3b3f0cca249d2b10052defc9749abb359b862325766117ec887e07c00a1287b7d0915849c018ee7c3985bd147d4517f466b69f7e4cbdd8
+DIST Csound6.03.2.tar.gz 24571513 SHA256 f5f8364e0bc10aba473800e66176c08ac32b43ca69ad02dc9554bad54e91d170 SHA512 01cea31349632ecf3692a23535793c1cd622669e07a9035e1ee80d6ad117e8d0296d2ece78635fee8a73eb5ba53d2b03a8b895f0b2a9a74ae015288243445c1b WHIRLPOOL 029c9c68f20ce691b1bb50be38f12723e4cdcbdc757f12d12351b6f6b7b2ec7fda517d2677bfa8a746f41daaa8e7c61e652645c3677af9198caf0d555d9d0821
+DIST Csound6.04.tar.gz 23959744 SHA256 0ff0203b87d10779dca962292a407e15ab0b284b558c9c63f892b74ed1e06080 SHA512 b19e2c4173c6d964b073ef19221f285e9ebd5a5d5d93148687b06860091bcc6e97e6b5e2223687e8f498608d9e27a33a75a50bb9d81ba83f4cd34e2eb4ceaeac WHIRLPOOL 5912e7c4e3fe42206a3914f66e24e1179e1f50337e17f407762d89a011f5f752e768faaaaf7eb34b097070bed8d28bbab37557cb6c6a1c9eebc174e0a7876dcd
+DIST csound-6.05.0.tar.gz 32094544 SHA256 2384cbc82fe37b70192c87977b52c55b336731ecbfd3be1d8d30c7223815d7b9 SHA512 a30a818e6e03b8ede0384c0bfddbde62ec9d9f1cfc33b92d6b23780c0d87a0c4e25229f9707eb2a5081971d0e53ff00c1e3465fd2af706a1c3bf2b53bc312be1 WHIRLPOOL f2e10297dbb337957dcd595b32df1a3279a504076fb113c0907374ff5ac88510e9df856c69fbef402681012adc1e36b7a03b1bf757014387b883b225d1da962f
diff --git a/media-sound/csound/csound-5.19.01.ebuild b/media-sound/csound/csound-5.19.01.ebuild
new file mode 100644
index 000000000000..4b19c0256fef
--- /dev/null
+++ b/media-sound/csound/csound-5.19.01.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator python-single-r1
+
+MY_PN="${PN/c/C}"
+MY_P="${MY_PN}${PV}"
+
+DESCRIPTION="A sound design and signal processing system providing facilities for composition and performance"
+HOMEPAGE="http://csounds.com/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa beats chua csoundac +cxx debug double-precision dssi examples fltk +fluidsynth
++image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio
+python samples static-libs stk tcl test +threads +utils vim-syntax"
+
+LANGS=" de en_GB en_US es_CO fr it ro ru"
+IUSE+="${LANGS// / linguas_}"
+
+RDEPEND=">=media-libs/libsndfile-1.0.16
+	alsa? ( media-libs/alsa-lib )
+	csoundac? (
+		x11-libs/fltk:1[threads?]
+		dev-cpp/eigen:3
+		dev-libs/boost
+		${PYTHON_DEPS}
+	)
+	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-1.5 )
+	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 )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	chua? ( dev-libs/boost )
+	csoundac? ( dev-lang/swig )
+	nls? ( sys-devel/gettext )
+	test? ( ${PYTHON_DEPS} )"
+
+REQUIRED_USE="java? ( cxx )
+	linear? ( double-precision )
+	lua? ( cxx )
+	python? ( cxx )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+pkg_setup() {
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.16.6-tests.patch
+	epatch "${FILESDIR}"/${PN}-5.17.6-fltk.patch
+	epatch "${FILESDIR}"/${PN}-5.17.6-porttime-in-portmidi.patch
+	epatch "${FILESDIR}"/${PN}-5.17.11-cmake.patch
+	epatch "${FILESDIR}"/${PN}-5.17.11-no-fltk-gl.patch
+
+	sed -i "s:^\(csoundExecutable =\).*:\1 \"${WORKDIR}/${P}_build/csound\":" \
+		tests/test.py || die
+
+	sed -i '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' CMakeLists.txt || die
+
+	if [[ $(get_libdir) == "lib64" ]] ; then
+		sed -i '/set(LIBRARY_INSTALL_DIR/s/lib/lib64/' CMakeLists.txt || die
+	fi
+
+	if use python ; then
+		sed -i "/set(PYTHON_MODULE_INSTALL_DIR/s#\${LIBRARY_INSTALL_DIR}#$(python_get_sitedir)#" CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	if use csoundac ; then
+		myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)"
+		myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)"
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_NEW_PARSER=ON
+		$(cmake-utils_use_use alsa ALSA) \
+		$(cmake-utils_use_build beats CSBEATS) \
+		$(cmake-utils_use_build chua CHUA_OPCODES) \
+		$(cmake-utils_use_build csoundac CSOUND_AC) \
+		$(cmake-utils_use_build cxx CXX_INTERFACE) \
+		$(cmake-utils_use debug NEW_PARSER_DEBUG) \
+		$(cmake-utils_use_use double-precision DOUBLE) \
+		$(cmake-utils_use_build dssi DSSI_OPCODES) \
+		$(cmake-utils_use_build fluidsynth FLUID_OPCODES) \
+		$(cmake-utils_use_use fltk FLTK) \
+		$(cmake-utils_use_build image IMAGE_OPCODES) \
+		$(cmake-utils_use_use jack JACK) \
+		$(cmake-utils_use_build jack JACK_OPCODES) \
+		$(cmake-utils_use_build java JAVA_INTERFACE) \
+		$(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD) \
+		$(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES) \
+		$(cmake-utils_use_build lua LUA_OPCODES) \
+		$(cmake-utils_use_build lua LUA_INTERFACE) \
+		$(cmake-utils_use_use nls GETTEXT) \
+		$(cmake-utils_use_build osc OSC_OPCODES) \
+		$(cmake-utils_use_use openmp OPEN_MP) \
+		$(cmake-utils_use_use portaudio PORTAUDIO) \
+		$(cmake-utils_use_use portmidi PORTMIDI) \
+		$(cmake-utils_use_use pulseaudio PULSEAUDIO) \
+		$(cmake-utils_use_build python PYTHON_OPCODES) \
+		$(cmake-utils_use_build python PYTHON_INTERFACE) \
+		$(cmake-utils_use_build static-libs STATIC_LIBRARY) \
+		$(cmake-utils_use_build stk STK_OPCODES) \
+		$(cmake-utils_use_build tcl TCLCSOUND) \
+		$(cmake-utils_use_build threads MULTI_CORE) \
+		$(cmake-utils_use_build utils UTILITIES) \
+		${myconf}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	export LD_LIBRARY_PATH="${S}" OPCODEDIR="${S}" OPCODEDIR64="${S}"
+	cd tests
+	./test.py || die "tests failed"
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodoc AUTHORS ChangeLog readme-csound5-complete.txt
+
+	# Generate env.d file
+	if use double-precision ; then
+		echo OPCODEDIR64=/usr/$(get_libdir)/${PN}/plugins64 > "${T}"/62${PN}
+	else
+		echo OPCODEDIR=/usr/$(get_libdir)/${PN}/plugins > "${T}"/62${PN}
+	fi
+	echo "CSSTRNGS=/usr/share/locale" >> "${T}"/62${PN}
+	use stk && echo "RAWWAVE_PATH=/usr/share/csound/rawwaves" >> "${T}"/62${PN}
+	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/{extract,csound_extract} || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	elog
+	elog "The extract tool is now installed as csound_extract"
+	elog "due to collisions with many other packages (bug #247394)."
+	elog
+}
diff --git a/media-sound/csound/csound-6.02.ebuild b/media-sound/csound/csound-6.02.ebuild
new file mode 100644
index 000000000000..f8bc979a3735
--- /dev/null
+++ b/media-sound/csound/csound-6.02.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator python-single-r1
+
+MY_PN="${PN/c/C}"
+MY_P="${MY_PN}${PV}"
+
+DESCRIPTION="A sound design and signal processing system providing facilities for composition and performance"
+HOMEPAGE="http://csounds.com/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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"
+
+LANGS=" de en_US es_CO fr it ro ru"
+IUSE+="${LANGS// / linguas_}"
+
+RDEPEND="
+	>=media-libs/libsndfile-1.0.16
+	alsa? ( media-libs/alsa-lib )
+	csoundac? (
+		x11-libs/fltk:1[threads?]
+		dev-cpp/eigen:3
+		dev-libs/boost
+		${PYTHON_DEPS}
+	)
+	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-1.5 )
+	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 )
+"
+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}
+	)
+"
+REQUIRED_USE="
+	java? ( cxx )
+	linear? ( double-precision )
+	lua? ( cxx )
+	python? ( cxx )
+"
+
+# requires specific alsa settings
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+pkg_setup() {
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-porttime-in-portmidi.patch
+
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+
+	if use python ; then
+		sed -i "/set(PYTHON_MODULE_INSTALL_DIR/s#\${LIBRARY_INSTALL_DIR}#$(python_get_sitedir)#" CMakeLists.txt || die
+	fi
+
+	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 myconf
+
+	if use csoundac ; then
+		myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)"
+		myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)"
+	fi
+
+	[[ $(get_libdir) == "lib64" ]] && myconf+=" -DUSE_LIB64=ON"
+
+	local mycmakeargs=(
+		$(cmake-utils_use_use alsa ALSA)
+		$(cmake-utils_use_build beats CSBEATS)
+		$(cmake-utils_use_build chua CHUA_OPCODES)
+		$(cmake-utils_use_build csoundac CSOUND_AC)
+		$(cmake-utils_use_build cxx CXX_INTERFACE)
+		$(cmake-utils_use_use curl CURL)
+		$(cmake-utils_use debug NEW_PARSER_DEBUG)
+		$(cmake-utils_use_use double-precision DOUBLE)
+		$(cmake-utils_use_build dssi DSSI_OPCODES)
+		$(cmake-utils_use_build fluidsynth FLUID_OPCODES)
+		$(cmake-utils_use_use fltk FLTK)
+		$(cmake-utils_use_build image IMAGE_OPCODES)
+		$(cmake-utils_use_use jack JACK)
+		$(cmake-utils_use_build jack JACK_OPCODES)
+		$(cmake-utils_use_build java JAVA_INTERFACE)
+		$(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD)
+		$(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES)
+		$(cmake-utils_use_build lua LUA_OPCODES)
+		$(cmake-utils_use_build lua LUA_INTERFACE)
+		$(cmake-utils_use_use nls GETTEXT)
+		$(cmake-utils_use_build osc OSC_OPCODES)
+		$(cmake-utils_use_use openmp OPEN_MP)
+		$(cmake-utils_use_use portaudio PORTAUDIO)
+		$(cmake-utils_use_use portmidi PORTMIDI)
+		$(cmake-utils_use_use pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_build python PYTHON_OPCODES)
+		$(cmake-utils_use_build python PYTHON_INTERFACE)
+		$(cmake-utils_use score SCORE_PARSER)
+		$(cmake-utils_use_build static-libs STATIC_LIBRARY)
+		$(cmake-utils_use_build stk STK_OPCODES)
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_build test STATIC_LIBRARY)
+		$(cmake-utils_use_build tcl TCLCSOUND)
+		$(cmake-utils_use_build threads MULTI_CORE)
+		$(cmake-utils_use_build utils UTILITIES)
+		-DBUILD_RELEASE=ON
+		${myconf}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodoc AUTHORS ChangeLog readme-csound6.txt What_is_New.txt \
+		Release_Notes/* Known_Problems todo.txt To-fix-and-do
+
+	# Generate env.d file
+	if use double-precision ; then
+		echo OPCODEDIR64=/usr/$(get_libdir)/${PN}/plugins64 > "${T}"/62${PN}
+	else
+		echo OPCODEDIR=/usr/$(get_libdir)/${PN}/plugins > "${T}"/62${PN}
+	fi
+	echo "CSSTRNGS=/usr/share/locale" >> "${T}"/62${PN}
+	use stk && echo "RAWWAVE_PATH=/usr/share/csound/rawwaves" >> "${T}"/62${PN}
+	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/{extract,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.03.2.ebuild b/media-sound/csound/csound-6.03.2.ebuild
new file mode 100644
index 000000000000..f873d90f24a8
--- /dev/null
+++ b/media-sound/csound/csound-6.03.2.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator python-single-r1
+
+MY_PN="${PN/c/C}"
+MY_P="${MY_PN}${PV}"
+
+DESCRIPTION="A sound design and signal processing system providing facilities for composition and performance"
+HOMEPAGE="http://csounds.com/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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"
+
+LANGS=" de en_US es_CO fr it ro ru"
+IUSE+="${LANGS// / linguas_}"
+
+RDEPEND="
+	>=media-libs/libsndfile-1.0.16
+	alsa? ( media-libs/alsa-lib )
+	csoundac? (
+		x11-libs/fltk:1[threads?]
+		dev-cpp/eigen:3
+		dev-libs/boost
+		${PYTHON_DEPS}
+	)
+	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-1.5 )
+	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 )
+"
+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}
+	)
+"
+REQUIRED_USE="
+	java? ( cxx )
+	linear? ( double-precision )
+	lua? ( cxx )
+	python? ( cxx )
+"
+
+# requires specific alsa settings
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+pkg_setup() {
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.02-porttime-in-portmidi.patch
+
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+
+	if use python ; then
+		sed -i "/set(PYTHON_MODULE_INSTALL_DIR/s#\${LIBRARY_INSTALL_DIR}#$(python_get_sitedir)#" CMakeLists.txt || die
+	fi
+
+	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 myconf
+
+	if use csoundac ; then
+		myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)"
+		myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)"
+	fi
+
+	[[ $(get_libdir) == "lib64" ]] && myconf+=" -DUSE_LIB64=ON"
+
+	local mycmakeargs=(
+		$(cmake-utils_use_use alsa ALSA)
+		$(cmake-utils_use_build beats CSBEATS)
+		$(cmake-utils_use_build chua CHUA_OPCODES)
+		$(cmake-utils_use_build csoundac CSOUND_AC)
+		$(cmake-utils_use_build cxx CXX_INTERFACE)
+		$(cmake-utils_use_use curl CURL)
+		$(cmake-utils_use debug NEW_PARSER_DEBUG)
+		$(cmake-utils_use_use double-precision DOUBLE)
+		$(cmake-utils_use_build dssi DSSI_OPCODES)
+		$(cmake-utils_use_build fluidsynth FLUID_OPCODES)
+		$(cmake-utils_use_use fltk FLTK)
+		$(cmake-utils_use_build image IMAGE_OPCODES)
+		$(cmake-utils_use_use jack JACK)
+		$(cmake-utils_use_build jack JACK_OPCODES)
+		$(cmake-utils_use_build java JAVA_INTERFACE)
+		$(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD)
+		$(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES)
+		$(cmake-utils_use_build lua LUA_OPCODES)
+		$(cmake-utils_use_build lua LUA_INTERFACE)
+		$(cmake-utils_use_use nls GETTEXT)
+		$(cmake-utils_use_build osc OSC_OPCODES)
+		$(cmake-utils_use_use openmp OPEN_MP)
+		$(cmake-utils_use_use portaudio PORTAUDIO)
+		$(cmake-utils_use_use portmidi PORTMIDI)
+		$(cmake-utils_use_use pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_build python PYTHON_OPCODES)
+		$(cmake-utils_use_build python PYTHON_INTERFACE)
+		$(cmake-utils_use score SCORE_PARSER)
+		$(cmake-utils_use_build static-libs STATIC_LIBRARY)
+		$(cmake-utils_use_build stk STK_OPCODES)
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_build test STATIC_LIBRARY)
+		$(cmake-utils_use_build tcl TCLCSOUND)
+		$(cmake-utils_use_build threads MULTI_CORE)
+		$(cmake-utils_use_build utils UTILITIES)
+		-DBUILD_RELEASE=ON
+		${myconf}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS ChangeLog README.md Release_Notes/*
+
+	# Generate env.d file
+	if use double-precision ; then
+		echo OPCODEDIR64=/usr/$(get_libdir)/${PN}/plugins64 > "${T}"/62${PN}
+	else
+		echo OPCODEDIR=/usr/$(get_libdir)/${PN}/plugins > "${T}"/62${PN}
+	fi
+	echo "CSSTRNGS=/usr/share/locale" >> "${T}"/62${PN}
+	use stk && echo "RAWWAVE_PATH=/usr/share/csound/rawwaves" >> "${T}"/62${PN}
+	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/{extract,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.04.ebuild b/media-sound/csound/csound-6.04.ebuild
new file mode 100644
index 000000000000..c95a023b0755
--- /dev/null
+++ b/media-sound/csound/csound-6.04.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator python-single-r1
+
+MY_PN="${PN/c/C}"
+MY_P="${MY_PN}${PV}"
+
+DESCRIPTION="A sound design and signal processing system providing facilities for composition and performance"
+HOMEPAGE="http://csounds.com/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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"
+
+LANGS=" de en_US es_CO fr it ro ru"
+IUSE+="${LANGS// / linguas_}"
+
+RDEPEND="
+	>=media-libs/libsndfile-1.0.16
+	alsa? ( media-libs/alsa-lib )
+	csoundac? (
+		x11-libs/fltk:1[threads?]
+		dev-cpp/eigen:3
+		dev-libs/boost
+		${PYTHON_DEPS}
+	)
+	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-1.5 )
+	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 )
+"
+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}
+	)
+"
+REQUIRED_USE="
+	java? ( cxx )
+	linear? ( double-precision )
+	lua? ( cxx )
+	python? ( cxx )
+"
+
+# requires specific alsa settings
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+pkg_setup() {
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+
+	if use python ; then
+		sed -i "/set(PYTHON_MODULE_INSTALL_DIR/s#\${LIBRARY_INSTALL_DIR}#$(python_get_sitedir)#" CMakeLists.txt || die
+	fi
+
+	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 myconf
+
+	if use csoundac ; then
+		myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)"
+		myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)"
+	fi
+
+	[[ $(get_libdir) == "lib64" ]] && myconf+=" -DUSE_LIB64=ON"
+
+	local mycmakeargs=(
+		$(cmake-utils_use_use alsa ALSA)
+		$(cmake-utils_use_build beats CSBEATS)
+		$(cmake-utils_use_build chua CHUA_OPCODES)
+		$(cmake-utils_use_build csoundac CSOUND_AC)
+		$(cmake-utils_use_build cxx CXX_INTERFACE)
+		$(cmake-utils_use_use curl CURL)
+		$(cmake-utils_use debug NEW_PARSER_DEBUG)
+		$(cmake-utils_use_use double-precision DOUBLE)
+		$(cmake-utils_use_build dssi DSSI_OPCODES)
+		$(cmake-utils_use_build fluidsynth FLUID_OPCODES)
+		$(cmake-utils_use_use fltk FLTK)
+		$(cmake-utils_use_build image IMAGE_OPCODES)
+		$(cmake-utils_use_use jack JACK)
+		$(cmake-utils_use_build jack JACK_OPCODES)
+		$(cmake-utils_use_build java JAVA_INTERFACE)
+		$(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD)
+		$(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES)
+		$(cmake-utils_use_build lua LUA_OPCODES)
+		$(cmake-utils_use_build lua LUA_INTERFACE)
+		$(cmake-utils_use_use nls GETTEXT)
+		$(cmake-utils_use_build osc OSC_OPCODES)
+		$(cmake-utils_use_use openmp OPEN_MP)
+		$(cmake-utils_use_use portaudio PORTAUDIO)
+		$(cmake-utils_use_use portmidi PORTMIDI)
+		$(cmake-utils_use_use pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_build python PYTHON_OPCODES)
+		$(cmake-utils_use_build python PYTHON_INTERFACE)
+		$(cmake-utils_use score SCORE_PARSER)
+		$(cmake-utils_use_build static-libs STATIC_LIBRARY)
+		$(cmake-utils_use_build stk STK_OPCODES)
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_build test STATIC_LIBRARY)
+		$(cmake-utils_use_build tcl TCLCSOUND)
+		$(cmake-utils_use_build threads MULTI_CORE)
+		$(cmake-utils_use_build utils UTILITIES)
+		-DNEED_PORTTIME=OFF
+		-DBUILD_RELEASE=ON
+		${myconf}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS ChangeLog README.md Release_Notes/*
+
+	# Generate env.d file
+	if use double-precision ; then
+		echo OPCODEDIR64=/usr/$(get_libdir)/${PN}/plugins64 > "${T}"/62${PN}
+	else
+		echo OPCODEDIR=/usr/$(get_libdir)/${PN}/plugins > "${T}"/62${PN}
+	fi
+	echo "CSSTRNGS=/usr/share/locale" >> "${T}"/62${PN}
+	use stk && echo "RAWWAVE_PATH=/usr/share/csound/rawwaves" >> "${T}"/62${PN}
+	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/{extract,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.05.0.ebuild b/media-sound/csound/csound-6.05.0.ebuild
new file mode 100644
index 000000000000..02e99b959cc3
--- /dev/null
+++ b/media-sound/csound/csound-6.05.0.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils multilib java-pkg-opt-2 cmake-utils toolchain-funcs versionator python-single-r1
+
+DESCRIPTION="A sound design and signal processing system providing facilities for composition and performance"
+HOMEPAGE="http://csound.github.io/"
+SRC_URI="https://github.com/csound/csound/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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"
+
+LANGS=" de en_US es_CO fr it ro ru"
+IUSE+="${LANGS// / linguas_}"
+
+RDEPEND="
+	>=media-libs/libsndfile-1.0.16
+	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-1.5 )
+	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 )
+"
+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}
+	)
+"
+REQUIRED_USE="
+	csoundac? ( || ( lua python ) )
+	java? ( cxx )
+	linear? ( double-precision )
+	lua? ( cxx )
+	python? ( cxx )
+"
+
+# requires specific alsa settings
+RESTRICT="test"
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+pkg_setup() {
+	if use python || use test ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/csound-6.05-python.patch
+
+	sed -e '/set(PLUGIN_INSTALL_DIR/s/-${APIVERSION}//' \
+		-e '/-O3/d' \
+		-i CMakeLists.txt || die
+
+	if use python ; then
+		sed -e 's#${REPLACE_ME}#'$(python_get_sitedir)'#' \
+			-i CMakeLists.txt || die
+	fi
+
+	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 myconf
+
+	if use csoundac ; then
+		myconf+=" -DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex python ON OFF)"
+		myconf+=" -DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex lua ON OFF)"
+	fi
+
+	[[ $(get_libdir) == "lib64" ]] && myconf+=" -DUSE_LIB64=ON"
+
+	local mycmakeargs=(
+		$(cmake-utils_use_use alsa ALSA)
+		$(cmake-utils_use_build beats CSBEATS)
+		$(cmake-utils_use_build chua CHUA_OPCODES)
+		$(cmake-utils_use_build csoundac CSOUND_AC)
+		$(cmake-utils_use_build cxx CXX_INTERFACE)
+		$(cmake-utils_use_use curl CURL)
+		$(cmake-utils_use debug NEW_PARSER_DEBUG)
+		$(cmake-utils_use_use double-precision DOUBLE)
+		$(cmake-utils_use_build dssi DSSI_OPCODES)
+		$(cmake-utils_use_build fluidsynth FLUID_OPCODES)
+		$(cmake-utils_use_use fltk FLTK)
+		$(cmake-utils_use_build image IMAGE_OPCODES)
+		$(cmake-utils_use_use jack JACK)
+		$(cmake-utils_use_build jack JACK_OPCODES)
+		$(cmake-utils_use_build java JAVA_INTERFACE)
+		$(cmake-utils_use_build keyboard VIRTUAL_KEYBOARD)
+		$(cmake-utils_use_build linear LINEAR_ALGEBRA_OPCODES)
+		$(cmake-utils_use_build lua LUA_OPCODES)
+		$(cmake-utils_use_build lua LUA_INTERFACE)
+		$(cmake-utils_use_use nls GETTEXT)
+		$(cmake-utils_use_build osc OSC_OPCODES)
+		$(cmake-utils_use_use openmp OPEN_MP)
+		$(cmake-utils_use_use portaudio PORTAUDIO)
+		$(cmake-utils_use_use portmidi PORTMIDI)
+		$(cmake-utils_use_use pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_build python PYTHON_OPCODES)
+		$(cmake-utils_use_build python PYTHON_INTERFACE)
+		$(cmake-utils_use score SCORE_PARSER)
+		$(cmake-utils_use_build static-libs STATIC_LIBRARY)
+		$(cmake-utils_use_build stk STK_OPCODES)
+		$(cmake-utils_use_build test TESTS)
+		$(cmake-utils_use_build test STATIC_LIBRARY)
+		$(cmake-utils_use_build tcl TCLCSOUND)
+		$(cmake-utils_use_build threads MULTI_CORE)
+		$(cmake-utils_use_build utils UTILITIES)
+		-DNEED_PORTTIME=OFF
+		-DBUILD_RELEASE=ON
+		${myconf}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS ChangeLog README.md Release_Notes/*
+
+	# Generate env.d file
+	if use double-precision ; then
+		echo OPCODEDIR64=/usr/$(get_libdir)/${PN}/plugins64 > "${T}"/62${PN}
+	else
+		echo OPCODEDIR=/usr/$(get_libdir)/${PN}/plugins > "${T}"/62${PN}
+	fi
+	echo "CSSTRNGS=/usr/share/locale" >> "${T}"/62${PN}
+	use stk && echo "RAWWAVE_PATH=/usr/share/csound/rawwaves" >> "${T}"/62${PN}
+	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/{extract,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/files/csound-5.16.6-tests.patch b/media-sound/csound/files/csound-5.16.6-tests.patch
new file mode 100644
index 000000000000..dd8b8ed289bc
--- /dev/null
+++ b/media-sound/csound/files/csound-5.16.6-tests.patch
@@ -0,0 +1,90 @@
+--- Csound5.16.6/tests/test.py.orig
++++ Csound5.16.6/tests/test.py
+@@ -6,9 +6,6 @@
+ import os
+ import sys
+ 
+-from testUI import TestApplication
+-from Tkinter import *
+-
+ parserType = "--new-parser"
+ showUIatClose = False
+ csoundExecutable = ""
+@@ -104,8 +101,6 @@
+    ]
+ 
+ 
+-    output = ""
+-    tempfile = "/tmp/csound_test_output.txt"
+     counter = 1
+ 
+     retVals = []
+@@ -124,7 +119,7 @@
+             retVal = os.system(command)
+         else:
+             executable = (csoundExecutable == "") and "../csound" or csoundExecutable
+-            command = "%s %s %s %s &> %s"%(executable, parserType, runArgs, filename, tempfile)
++            command = "%s %s %s %s"%(executable, parserType, runArgs, filename)
+             retVal = os.system(command)
+ 
+         print "Test %i: %s (%s)\nReturn Code: %i"%(counter, desc, filename, retVal)
+@@ -136,24 +131,6 @@
+             testFail += 1
+             print "Result: FAIL\n"
+         
+-        output += "%s\n"%("=" * 80)
+-        output += "Test %i: %s (%s)\nReturn Code: %i\n"%(counter, desc, filename, retVal)
+-        output += "%s\n\n"%("=" * 80)
+-
+-        f = open(tempfile, "r")
+-
+-        csOutput = ""
+-
+-        for line in f:
+-            csOutput += line
+-
+-        output += csOutput
+-
+-        f.close()
+-
+-        retVals.append(t + [retVal, csOutput])
+-
+-        output += "\n\n"
+         counter += 1
+ 
+ #    print output
+@@ -162,12 +139,7 @@
+     print "Tests Passed: %i\nTests Failed: %i\n"%(testPass, testFail)
+ 
+ 
+-    f = open("results.txt", "w")
+-    f.write(output)
+-    f.flush()
+-    f.close()
+-
+-    return retVals
++    return testFail
+ 
+ if __name__ == "__main__":
+     if(len(sys.argv) > 1):
+@@ -176,6 +148,8 @@
+                 showHelp()
+                 sys.exit(0)
+             elif arg == "--show-ui":
++                from testUI import TestApplication
++                from Tkinter import *
+                 showUIatClose = True
+             elif arg == "--old-parser":
+                 parserType = "--old-parser"
+@@ -185,6 +159,8 @@
+             elif arg.startswith("--opcodedir64="):
+                 os.environ['OPCODEDIR64'] = arg[14:]
+                 print os.environ['OPCODEDIR64'] 
+-    results = runTest()
+-    if (showUIatClose):
+-        showUI(results)
++    failures = runTest()
++    if failures > 0:
++        sys.exit(1)
++    else:
++        sys.exit(0)
diff --git a/media-sound/csound/files/csound-5.17.11-cmake.patch b/media-sound/csound/files/csound-5.17.11-cmake.patch
new file mode 100644
index 000000000000..388a043d57cf
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.11-cmake.patch
@@ -0,0 +1,10 @@
+--- Csound5.17.11/frontends/CsoundAC/CMakeLists.txt
++++ Csound5.17.11/frontends/CsoundAC/CMakeLists.txt
+@@ -29,7 +29,6 @@
+ 	allegrowr.cpp

+ 	Cell.cpp

+ 	ChordLindenmayer.cpp

+-	cmake_install.cmake

+ 	Composition.cpp

+ 	Conversions.cpp

+ 	Counterpoint.cpp

diff --git a/media-sound/csound/files/csound-5.17.11-no-fltk-gl.patch b/media-sound/csound/files/csound-5.17.11-no-fltk-gl.patch
new file mode 100644
index 000000000000..ae07d41a63e3
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.11-no-fltk-gl.patch
@@ -0,0 +1,20 @@
+--- Csound5.17.11/frontends/CsoundAC/CMakeLists.txt
++++ Csound5.17.11/frontends/CsoundAC/CMakeLists.txt
+@@ -7,6 +7,7 @@
+ 

+ find_package(Boost)

+ find_library(MUSICXML_LIBRARY musicxml2)

++set(FLTK_SKIP_OPENGL true)

+ find_package(FLTK)

+ find_package(SWIG)

+ find_package(PythonLibs)

+--- Csound5.17.11/InOut/CMakeLists.txt
++++ Csound5.17.11/InOut/CMakeLists.txt
+@@ -56,6 +56,7 @@
+     find_library(COREAUDIO_LIBRARY CoreAudio)

+ endif()

+ if(USE_FLTK OR BUILD_VIRTUAL_KEYBOARD)

++    set(FLTK_SKIP_OPENGL true)

+     find_package(FLTK)

+ endif()

+ 

diff --git a/media-sound/csound/files/csound-5.17.6-fltk.patch b/media-sound/csound/files/csound-5.17.6-fltk.patch
new file mode 100644
index 000000000000..74b72689e889
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.6-fltk.patch
@@ -0,0 +1,10 @@
+--- Csound5.17.6/InOut/CMakeLists.txt
++++ Csound5.17.6/InOut/CMakeLists.txt
+@@ -148,6 +148,7 @@
+ if(USE_FLTK)

+     set(widgets_SRCS FL_graph.cpp winFLTK.c widgets.cpp)

+     make_plugin(widgets "${widgets_SRCS}" "${FLTK_LIBRARIES}")

++    include_directories(${FLTK_INCLUDE_DIR})

+ endif()

+ 

+ check_deps(BUILD_VIRTUAL_KEYBOARD FLTK_FOUND)

diff --git a/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch b/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch
new file mode 100644
index 000000000000..3f69a3795f04
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch
@@ -0,0 +1,20 @@
+--- Csound5.17.6/InOut/CMakeLists.txt
++++ Csound5.17.6/InOut/CMakeLists.txt
+@@ -26,7 +26,6 @@
+ endif()

+ if(USE_PORTMIDI)

+     find_library(PORTMIDI_LIBRARY portmidi)

+-    find_library(PORTTIME_LIBRARY porttime)

+     check_include_file(portmidi.h PORTMIDI_HEADER)

+ endif()

+ if(USE_JACK)

+@@ -116,9 +115,6 @@
+ check_deps(USE_PORTMIDI PORTMIDI_HEADER PORTMIDI_LIBRARY)

+ if(USE_PORTMIDI)

+     set(pmidi_LIBS ${PORTMIDI_LIBRARY})

+-    if(NOT APPLE)

+-        list(APPEND pmidi_LIBS ${PORTTIME_LIBRARY})

+-    endif()

+     if(WIN32)

+         list(APPEND pmidi_LIBS ${CSOUND_WINDOWS_LIBRARIES})

+     endif()

diff --git a/media-sound/csound/files/csound-6.02-porttime-in-portmidi.patch b/media-sound/csound/files/csound-6.02-porttime-in-portmidi.patch
new file mode 100644
index 000000000000..1ef67a15c13d
--- /dev/null
+++ b/media-sound/csound/files/csound-6.02-porttime-in-portmidi.patch
@@ -0,0 +1,30 @@
+--- Csound6.02/InOut/CMakeLists.txt
++++ Csound6.02/InOut/CMakeLists.txt
+@@ -33,10 +33,6 @@
+     find_library(PORTMIDI_LIBRARY portmidi)

+ #    include_directories(${PORTMIDI_INCLUDE_PATH})

+ #    include_directories(${PORTTIME_INCLUDE_PATH})

+-    if(WIN32)

+-    else()

+-        find_library(PORTTIME_LIBRARY porttime)

+-    endif()

+ endif()

+ if(USE_JACK)

+     find_library(JACK_LIBRARY jack)

+@@ -126,15 +122,12 @@
+ elseif(WIN32)

+     check_deps(USE_PORTMIDI PORTMIDI_INCLUDE_PATH PORTTIME_INCLUDE_PATH PORTMIDI_LIBRARY)

+ else()

+-    check_deps(USE_PORTMIDI PORTMIDI_INCLUDE_PATH PORTMIDI_LIBRARY PORTTIME_LIBRARY)

++    check_deps(USE_PORTMIDI PORTMIDI_INCLUDE_PATH PORTMIDI_LIBRARY)

+ endif()

+ 

+ if(USE_PORTMIDI)

+     set(pmidi_LIBS ${PORTMIDI_LIBRARY})

+     include_directories(${PORTMIDI_INCLUDE_PATH})

+-    if(LINUX)

+-        list(APPEND pmidi_LIBS ${PORTTIME_LIBRARY})

+-    endif()

+     if(WIN32)

+         include_directories(${PORTTIME_INCLUDE_PATH})

+         list(APPEND pmidi_LIBS ${CSOUND_WINDOWS_LIBRARIES})

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/metadata.xml b/media-sound/csound/metadata.xml
new file mode 100644
index 000000000000..7bab04e3178c
--- /dev/null
+++ b/media-sound/csound/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<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>
+	</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..7bf385aa405a
--- /dev/null
+++ b/media-sound/cvoicecontrol/Manifest
@@ -0,0 +1 @@
+DIST cvoicecontrol-0.9alpha.tar.bz2 78081 RMD160 72f271ba099571e6cd220264aa46853ef511f063 SHA1 bec8bd1ef53d6817aebb13ed42e75a42ca05f388 SHA256 dbcb03ae8370c400b7d398c7715e100b5b719f109e1955a40042cd268df981ad
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..53bfa8dfdff4
--- /dev/null
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..cb3d22b054ed
--- /dev/null
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/cvoicecontrol/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/dagrab/Manifest b/media-sound/dagrab/Manifest
new file mode 100644
index 000000000000..a40f8f7b99b7
--- /dev/null
+++ b/media-sound/dagrab/Manifest
@@ -0,0 +1 @@
+DIST dagrab-S0.513.tgz 38747 RMD160 43ad50d7be07320ce6ce1bd5f5fd9e89fcb15e96 SHA1 d78c134c78b53cc27de48af0984c741b217ef0e8 SHA256 f8e4d30fc5943d1806a3320150256219bc63724f4cc7787e01d1f11fd3b3cf8a
diff --git a/media-sound/dagrab/dagrab-0.513.ebuild b/media-sound/dagrab/dagrab-0.513.ebuild
new file mode 100644
index 000000000000..9d9879d53144
--- /dev/null
+++ b/media-sound/dagrab/dagrab-0.513.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+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"
+IUSE=""
+
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-freedb.patch
+}
+
+src_install() {
+	dobin dagrab || die
+	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..6a65576497d8
--- /dev/null
+++ b/media-sound/dagrab/files/dagrab-0.513-freedb.patch
@@ -0,0 +1,25 @@
+--- dagrab.1
++++ 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
+--- const.h
++++ 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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/dagrab/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
new file mode 100644
index 000000000000..2ba504249141
--- /dev/null
+++ b/media-sound/darkice/Manifest
@@ -0,0 +1 @@
+DIST darkice-1.2.tar.gz 357026 SHA256 b3fba9be2d9c72f36b0659cd9ce0652c8f973b5c6498407f093da9a364fdb254 SHA512 d8959819d70eb9b44a34d087fcf3897be5e4cb23681c049f8d88e251d83dfd86b90fdd37744fe27d861dfcbb6bb6e1521b48c5c7b4967bb061ede75596f0a823 WHIRLPOOL f12ff32ce31cf508f556146baeb64860b3a698edf0836675a62c817b34fa1df499c3a281a3e2a66a1db5be3eb89d5fc91438184c998f4a7a0ad24e27fd7fea1e
diff --git a/media-sound/darkice/darkice-1.2.ebuild b/media-sound/darkice/darkice-1.2.ebuild
new file mode 100644
index 000000000000..e1522fe55218
--- /dev/null
+++ b/media-sound/darkice/darkice-1.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A live audio streamer"
+HOMEPAGE="http://code.google.com/p/darkice/"
+SRC_URI="http://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}"
+
+REQUIRED_USE="|| ( aac aacplus mp3 opus 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/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..73e5d357f4e0
--- /dev/null
+++ b/media-sound/darkice/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/darksnow/Manifest b/media-sound/darksnow/Manifest
new file mode 100644
index 000000000000..55072d63e220
--- /dev/null
+++ b/media-sound/darksnow/Manifest
@@ -0,0 +1 @@
+DIST darksnow-0.7.1.tar.gz 78928 SHA256 7c7c55761f7536cea2e8b6d8037c9ce7ca71f6a044c1b6026ea80e13d35b04fd SHA512 0ea1ff9f085127185d47169df358d2940fa9e52c52408bbaaefdf517402ddcb37b2df8b8c65bb22c3493820b47a3b4a2571cc819e81c70718684e8c3c3fe77ae WHIRLPOOL eec2209934cf9129528bb15dc05e6e726649a8be7f4178770776e1728f4ff69ff8dab80808e81ca5983afd77ab252e426dc384e47d12d9bbc53b60f39326b37c
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..5510fc321003
--- /dev/null
+++ b/media-sound/darksnow/darksnow-0.7.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/darksnow/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/daudio/Manifest b/media-sound/daudio/Manifest
new file mode 100644
index 000000000000..f56caa9e2c22
--- /dev/null
+++ b/media-sound/daudio/Manifest
@@ -0,0 +1 @@
+DIST daudio-0.3.tar.gz 76683 SHA256 f2abf767b6be1ff9ed0c2d2f983484bd7a41dbdc3fa7e0839729aa857d4a60f8
diff --git a/media-sound/daudio/daudio-0.3.ebuild b/media-sound/daudio/daudio-0.3.ebuild
new file mode 100644
index 000000000000..80f2168bbffa
--- /dev/null
+++ b/media-sound/daudio/daudio-0.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils 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"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
+src_compile() {
+	tc-export CC
+	emake -C client || die "emake failed"
+	emake -C server || die "emake failed"
+	emake -C streamer || die "emake failed"
+}
+
+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.rc b/media-sound/daudio/files/daudio.rc
new file mode 100644
index 000000000000..00523194a9b4
--- /dev/null
+++ b/media-sound/daudio/files/daudio.rc
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..0840b254c78f
--- /dev/null
+++ b/media-sound/daudio/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..7ec206146f75
--- /dev/null
+++ b/media-sound/dbmeasure/Manifest
@@ -0,0 +1 @@
+DIST dbmeasure-0.0.20100217-ed8105083ab72f9afac9d18b7563fbc3d6c1c925.tar.gz 6647 SHA256 8258db8cee11ca6da051033a6bc0db4c556deede712e31ebc02c72c64160c8d9 SHA512 d52a6d8d34625b3ddbeff70e712ddefabfb955ceedc525377d672b472b57163c1194df29ffcc23d881bfb7a5d38cd2850c09ee7c5e30e579414f5c599ad2b78b WHIRLPOOL 2f58741bf6b54073689354674fe51dc44d9708aacb54a40d380deb5bf98989a861032a9bb4bda94177c9d79dbb8a4bd03b0fb3fbac7f57a4088c89a798e1e215
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..06f53338956f
--- /dev/null
+++ b/media-sound/dbmeasure/dbmeasure-0.0.20100217.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d9cd2cad66c2
--- /dev/null
+++ b/media-sound/dbmeasure/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>
+<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/dcaenc/Manifest b/media-sound/dcaenc/Manifest
new file mode 100644
index 000000000000..b6afc6c4b5b2
--- /dev/null
+++ b/media-sound/dcaenc/Manifest
@@ -0,0 +1 @@
+DIST dcaenc-2.tar.gz 351199 SHA256 1054e6113cd1304f35ca830f027a53e9efd989530fe6523f732a0a9cd4110199 SHA512 0029f7c3b06199fb8100ce933827013fdc58e5fddf984ddf1744849e5d6cc24ce76e09b868eef19a49e1036a142419c3304c1822492f64301ed4feaa6bea4910 WHIRLPOOL 6e806bbf2194a9380c5f0bab186be3f14d4163b0b029fc44328cbbce4e6b209d4faf07f0a5fb809214c90aeaaff332e47f187ff13b597876fbc6fd664b1d0019
diff --git a/media-sound/dcaenc/dcaenc-2-r1.ebuild b/media-sound/dcaenc/dcaenc-2-r1.ebuild
new file mode 100644
index 000000000000..7aa4bda32faa
--- /dev/null
+++ b/media-sound/dcaenc/dcaenc-2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7e75824c88b3
--- /dev/null
+++ b/media-sound/dcaenc/dcaenc-2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7aa4bda32faa
--- /dev/null
+++ b/media-sound/dcaenc/dcaenc-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..3bf6bcfeb512
--- /dev/null
+++ b/media-sound/dcaenc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/dcd/Manifest b/media-sound/dcd/Manifest
new file mode 100644
index 000000000000..8e911ecc7143
--- /dev/null
+++ b/media-sound/dcd/Manifest
@@ -0,0 +1 @@
+DIST dcd-0.95.tar.bz2 33620 RMD160 3bb98d726e4a015766bc741d13b8ee74d3af5ed2 SHA1 61298fe7e9af3171fffa85daeaf8f528443f4b54 SHA256 6fc5b1e0b21fb299d52ea4d70d5a2c09172c3b939913d1b605afe8c48ca8bd41
diff --git a/media-sound/dcd/dcd-0.95.ebuild b/media-sound/dcd/dcd-0.95.ebuild
new file mode 100644
index 000000000000..7ea53a548cb7
--- /dev/null
+++ b/media-sound/dcd/dcd-0.95.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/dcd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/declick/Manifest b/media-sound/declick/Manifest
new file mode 100644
index 000000000000..227ddfc0ad52
--- /dev/null
+++ b/media-sound/declick/Manifest
@@ -0,0 +1 @@
+DIST declick-0.6.5.tar.gz 17932 SHA256 ce049078fd39ee68da9297cf0fa05ebce48c242934db8da1b87c2a6cdc985786
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..0a4ebe36a097
--- /dev/null
+++ b/media-sound/declick/declick-0.6.5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..9ee4d5731cb4
--- /dev/null
+++ b/media-sound/declick/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..d5b17a025bab
--- /dev/null
+++ b/media-sound/denemo/Manifest
@@ -0,0 +1,3 @@
+DIST denemo-0.9.6.tar.gz 13273412 SHA256 b04299fbf2f3207438da043b1a6d3748c86e48e9ee8af00de8bb2dec7795b6d4 SHA512 6e2e1b71d9ba0338559347742f237e66547feb6158d58cfff191818dbe64b18b86eec5b1eea35bd55c6c2a65b6b97a2de5d62d7bbfa5a6ae0d478d673b3e779a WHIRLPOOL 444648500cb768a12f3e2b1e7fe8b6e36d74a8e46d5d46f79ca2abfe2145d0fd3922c815963f757f1b287f977cae23084c6200e6939a4cfce5cf6f43612d7372
+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
diff --git a/media-sound/denemo/denemo-0.9.6.ebuild b/media-sound/denemo/denemo-0.9.6.ebuild
new file mode 100644
index 000000000000..a1d6181ffdf0
--- /dev/null
+++ b/media-sound/denemo/denemo-0.9.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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/libsmf-1.3
+	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}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-alsa.patch
+	epatch "${FILESDIR}"/${P}-jack.patch
+	epatch "${FILESDIR}"/${P}-implicit-declarations.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)
+}
+
+pkg_postinst() { fdo-mime_desktop_database_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; }
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..6e05ece8abef
--- /dev/null
+++ b/media-sound/denemo/denemo-1.0.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..6e05ece8abef
--- /dev/null
+++ b/media-sound/denemo/denemo-1.0.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-alsa.patch b/media-sound/denemo/files/denemo-0.9.6-alsa.patch
new file mode 100644
index 000000000000..484a11d9f59d
--- /dev/null
+++ b/media-sound/denemo/files/denemo-0.9.6-alsa.patch
@@ -0,0 +1,26 @@
+--- src/alsabackend.h
++++ src/alsabackend.h
+@@ -0,0 +1,23 @@
++/*
++ * alsabackend.h
++ * ALSA sequencer MIDI backend.
++ *
++ * for Denemo, a gtk+ frontend to GNU Lilypond
++ * Copyright (C) 2011  Dominic Sacré
++ *
++ * 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 3 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef ALSABACKEND_H
++#define ALSABACKEND_H
++
++#include "audiointerface.h"
++
++extern backend_t alsa_seq_midi_backend;
++
++
++#endif // ALSABACKEND_H
++
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/files/denemo-0.9.6-implicit-declarations.patch b/media-sound/denemo/files/denemo-0.9.6-implicit-declarations.patch
new file mode 100644
index 000000000000..b1f17e3d2df6
--- /dev/null
+++ b/media-sound/denemo/files/denemo-0.9.6-implicit-declarations.patch
@@ -0,0 +1,42 @@
+--- denemo-0.9.6/src/audiointerface.c
++++ denemo-0.9.6/src/audiointerface.c
+@@ -14,6 +14,7 @@
+ #include "audiointerface.h"
+ #include "eventqueue.h"
+ #include "dummybackend.h"
++#include "sourceaudio.h"
+ 
+ #ifdef _HAVE_JACK_
+   #include "jackbackend.h"
+--- denemo-0.9.6/src/audiointerface.h
++++ denemo-0.9.6/src/audiointerface.h
+@@ -228,6 +228,9 @@
+ gboolean read_event_from_queue(backend_type_t backend, unsigned char *event_buffer, size_t *event_length,
+                                double *event_time, double until_time);
+ 
++gboolean read_event_from_mixer_queue(backend_type_t backend, unsigned char *event_buffer, size_t *event_length,
++                               double *event_time, double until_time);
++
+ /**
+  * Called by a backend to notify the audio subsystem that the current playback
+  * time changed. Usually this is called once per period during playback.
+--- denemo-0.9.6/src/eventqueue.c
++++ denemo-0.9.6/src/eventqueue.c
+@@ -13,6 +13,7 @@
+ 
+ #include "eventqueue.h"
+ #include "midi.h"
++#include "moveviewport.h"
+ 
+ #include <glib.h>
+ #include <string.h>
+--- denemo-0.9.6/src/portaudiobackend.c
++++ denemo-0.9.6/src/portaudiobackend.c
+@@ -16,6 +16,7 @@
+ #include "portaudioutil.h"
+ #include "midi.h"
+ #include "fluid.h"
++#include "audiointerface.h"
+ 
+ #include <portaudio.h>
+ #include <glib.h>
diff --git a/media-sound/denemo/files/denemo-0.9.6-jack.patch b/media-sound/denemo/files/denemo-0.9.6-jack.patch
new file mode 100644
index 000000000000..93cc88db9c96
--- /dev/null
+++ b/media-sound/denemo/files/denemo-0.9.6-jack.patch
@@ -0,0 +1,66 @@
+--- src/jackbackend.h
++++ src/jackbackend.h
+@@ -0,0 +1,23 @@
++/*
++ * jackbackend.h
++ * JACK audio and MIDI backends.
++ *
++ * for Denemo, a gtk+ frontend to GNU Lilypond
++ * Copyright (C) 2011  Dominic Sacré
++ *
++ * 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 3 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef JACKBACKEND_H
++#define JACKBACKEND_H
++
++#include "audiointerface.h"
++
++extern backend_t jack_audio_backend;
++extern backend_t jack_midi_backend;
++
++
++#endif // JACKBACKEND_H
+--- src/jackutil.h
++++ src/jackutil.h
+@@ -0,0 +1,37 @@
++/*
++ * jackutil.h
++ * JACK utility functions.
++ *
++ * for Denemo, a gtk+ frontend to GNU Lilypond
++ * Copyright (C) 2011  Dominic Sacré
++ *
++ * 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 3 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef JACKUTIL_H
++#define JACKUTIL_H
++
++#include <glib.h>
++
++/**
++ * Returns a list of available JACK port names, that is, ports to which our
++ * own input/output ports can be connected.
++ *
++ * If the JACK server is not running or there are no available ports, this
++ * function returns NULL.
++ *
++ * @param midi    if TRUE returns MIDI ports, otherwise audio ports.
++ * @param output  if TRUE returns output ports, otherwise input ports.
++ */
++GList *get_jack_ports(gboolean midi, gboolean output);
++
++/**
++ * Frees a list returned by get_jack_ports()
++ */
++void free_jack_ports(GList *list);
++
++
++#endif // JACKUTIL_H
diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
new file mode 100644
index 000000000000..cb4e278a0624
--- /dev/null
+++ b/media-sound/denemo/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+<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..0f490022fb39
--- /dev/null
+++ b/media-sound/din/Manifest
@@ -0,0 +1 @@
+DIST din-5.2.1.tar.gz 321269 SHA256 ef2485963a2435256dcb099364918c2cb0560701bf4f374738f9c54a2c316447 SHA512 0fa7de383c869f9f55ee055f821f3b541ca7df83d61f9bdb6b9e0227a724abe098073985cb4f3eb381199d4baa84d9ee2b86b74614e11cb8b58b119230ca3c09 WHIRLPOOL 762fb7b5e7908da31737929d607c16a538071137fc9f50fd1be7d2c81bb190f68b82f7321b2cfa8c8e1232dddb7178ed263fd5c4ce0f90c98bbf6107e5d91466
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..9772a3d8869a
--- /dev/null
+++ b/media-sound/din/din-5.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="a software musical instrument and audio synthesizer"
+HOMEPAGE="http://dinisnoise.org/"
+SRC_URI="http://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
+
+	# 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/metadata.xml b/media-sound/din/metadata.xml
new file mode 100644
index 000000000000..0dc3775f83d7
--- /dev/null
+++ b/media-sound/din/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+</pkgmetadata>
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
new file mode 100644
index 000000000000..9f66c4af7131
--- /dev/null
+++ b/media-sound/dir2ogg/Manifest
@@ -0,0 +1,2 @@
+DIST dir2ogg-0.11.6.tar.gz 19442 SHA256 cd3b6baa42a5ee0acde95f2ef41a2a56d9fd6be1c9877e8bba2bf15834f935dc
+DIST dir2ogg-0.11.8.tar.gz 21145 SHA256 0b6fd089fc1eb20cc92b7901c947ff6033ce04c897f9af9f962fa421a67ba7e0 SHA512 44275ab5b1bda26e2148b24a1b9fc49ee09e6f2848c1e62d13da12369e28a1f787c695c1547b002f13e1733d14984bf3ca0c425d60ace8bda69f0de28af0ed8f WHIRLPOOL e1e5bcb116e706ce90a63f661f6a20234a7fc350207a021392e9983f343c439d5a0471ac42b0114f47a74e7e93d6f589126cf4789ee69d455e459936d65f7600
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..d6e91d3e43ef
--- /dev/null
+++ b/media-sound/dir2ogg/dir2ogg-0.11.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..0c012cbae2ca
--- /dev/null
+++ b/media-sound/dir2ogg/dir2ogg-0.11.8-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..892b41956295
--- /dev/null
+++ b/media-sound/dir2ogg/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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..0e64de03a449
--- /dev/null
+++ b/media-sound/drumstick/Manifest
@@ -0,0 +1,2 @@
+DIST drumstick-0.5.0.tar.bz2 200914 SHA256 5a12bcf2a26dac7f2a5c9507c662c4c85556881c64bb55365dceb437cf3652cd SHA512 12078dbeae7166da210ccbbaee9d55b4c9e233fd317de72c20482466cd29987c976290efecd29cc28a5be6ed7e3b9fe95ddf1081d75222d9cf9d6aef13080a21 WHIRLPOOL 6d7b35259280aacf0ec414868068f136c39bb8e488848d110739481cbf6bb874cb46c95b98bc8f541185816ff81819494716e2706d9e6a59519bdc2e9520a425
+DIST drumstick-1.0.0.tar.bz2 231036 SHA256 c10520e34524c904a24b7f93cddcdcb95eec3cd2f358d96be8dfc809df062b99 SHA512 631ea32ab1a611266c650d6e9c4be564556f9c965c85a600097bbe909d594f601c917ff9fb46af444a0907472dd522e61bca6d4111ad6b1beec06ae267c5e33a WHIRLPOOL 9fbdc310326b8ae6ab468182d9c6dad07b2961fbfa4a53ad611f0a4a2f51ccf03ddd28f19a9731181e3b94387245706ea1d40950c6c99e311a9dcdd4e845cebb
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..3df4f17c5ba5
--- /dev/null
+++ b/media-sound/drumstick/drumstick-0.5.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit base cmake-utils fdo-mime gnome2-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
+	)
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-doc_automagicness.patch
+	"${FILESDIR}"/${PV}-underlinking.patch
+)
+
+src_prepare() {
+	sed -i \
+		-e '/CMAKE_EXE_LINKER_FLAGS/d' \
+		CMakeLists.txt || die
+	base_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_use dbus)
+		$(cmake-utils_use_with 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.0.ebuild b/media-sound/drumstick/drumstick-1.0.0.ebuild
new file mode 100644
index 000000000000..0895566374cb
--- /dev/null
+++ b/media-sound/drumstick/drumstick-1.0.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils fdo-mime gnome2-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="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
+	x11-misc/shared-mime-info
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+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/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-underlinking.patch b/media-sound/drumstick/files/0.5.0-underlinking.patch
new file mode 100644
index 000000000000..1bb5ae7da3bf
--- /dev/null
+++ b/media-sound/drumstick/files/0.5.0-underlinking.patch
@@ -0,0 +1,17 @@
+--- utils/vpiano/CMakeLists.txt
++++ 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/metadata.xml b/media-sound/drumstick/metadata.xml
new file mode 100644
index 000000000000..1438ab505c5b
--- /dev/null
+++ b/media-sound/drumstick/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<herd>kde</herd>
+	<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..9659fbfb71e0
--- /dev/null
+++ b/media-sound/dvda-author/Manifest
@@ -0,0 +1 @@
+DIST dvda-author-10.06-300.tar.gz 828028 SHA256 d16ff7fe9af9d1b53240cf9f62f79766e0dfc0236b64c9aa1befb88832339fbe SHA512 619215e5e9ac4a3e55d2bef0222a931412946f129927f1042807ee25541d64609a5a9189c843fdc30d34bb0e41e0779d821d8c32a16cf89c6227d9925ea07024 WHIRLPOOL 5e4d04ff93ec83aed3ecf7ba2e10662899a82bd5a527b6573e5a6c33c93dc66b3e5c96a99f79c212b1fb57a492274db6603780fbdf8983a3f90c55988dfe8028
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..d0a8bab138a3
--- /dev/null
+++ b/media-sound/dvda-author/dvda-author-10.06-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d7775dac8bed
--- /dev/null
+++ b/media-sound/dvda-author/dvda-author-10.06.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..1d76118d5daf
--- /dev/null
+++ b/media-sound/dvda-author/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..494ef47b010b
--- /dev/null
+++ b/media-sound/easytag/Manifest
@@ -0,0 +1,6 @@
+DIST easytag-2.1.8.tar.xz 2459496 SHA256 1a2f75c9a70aeb7a404dfaa96e0df0eaaa325df301c58f0f708d0da4c08e65a9 SHA512 cf5d92902276b8d462c695aaa0d1072684d60cbfc45d07fb2ac7b345907a775b94665612088b33f3272db22d4b4eb78f4a4e36f2caf6e151a08f640841208e48 WHIRLPOOL ab37d4942bde4a88c233869b3cf84d13dd4a259cd894941bd9c26ec4f3b22c02af3fc7633a09670ee707d0287bb8bb9fc654ea00e0fe694319a6cf24b220420c
+DIST easytag-2.2.2.tar.xz 973116 SHA256 fb21ac51975c90c58c5dc38c28aa1030d6fa3420bc6b8406f085e34df9e14164 SHA512 1b49fdb080ad59f08c956e63fb0a286a2785e6c4483b2b4003e1b217ad1537999d76dcaedbe4a59782514b655ee53bac8b6907eff246c00bc1a578b2be674010 WHIRLPOOL 270403fe0573b80e93b4084a2089c1492253e1a678fd4b9aceba9ae78a0f590d9d905ddb9fa002d73870bdda47817b652bb29bacb21f2ac951f63063eca5c16b
+DIST easytag-2.2.3.tar.xz 987288 SHA256 f49cadc868a67faeb99bdbedc21a3009783609b380d098412c4799ec48aeaeb3 SHA512 d3a27c6f9b6326cd5850855ea2acae1f73330198247516b3f44d1553e830d29043ef973de81e13743c83aca685258b5a6ba2a19969f571664ac60ff99e71a0ea WHIRLPOOL 22db6d14c0df1001aa4488e224cabc514f91d85c1207eb517d7cfa0213381c003a5c716a391e37da94ae253f0714aa62d394a849c5d59b244604f8032e9e7968
+DIST easytag-2.2.4.tar.xz 989660 SHA256 458329ab17e07fac5e92a2d732f0f4e9b12ea8aa31707506b39d3b2428d0c091 SHA512 bafa1e26371bb95f5edf74424b3733d0ffbb80c740c65e404cf863445a835fdc87f958e9cfddaac7d85281cb3be5ad6584a5750415e294a96c5ef26d4e51f9bf WHIRLPOOL ddb789dfe838c0fa20fc2c42187778b78896b9e038cd1786adb2332764b167268fdd4eb410e45cfb5e6b8fe211745be0bd184083f8677b21905d98da64f82a06
+DIST easytag-2.2.5.tar.xz 1004688 SHA256 a6da3a094997fa225d1c01211b282f2d3c2dfd93a74f3bec24017bd5a13f3855 SHA512 4ffcce0edb49333d9fcf6dc382f58abc60f9e35cdcebc7a98115203523403a5b10795de7f46cd2787fa250dfa887283c4752435c57bf0f60a8000c735b648062 WHIRLPOOL 3af39aba7900a6cce8f7b72ae1ede6ce1ecf120b49301f59f62d1025942a0926ff505965710dae10fb2e8a47915bd7fc54dab59405d6f7e5a3ce206ab5f1ffe2
+DIST easytag-2.2.6.tar.xz 1016508 SHA256 26437f0d698c3b16794336c335b40f53fa26aefeb77322e45e4e2501c4cff14a SHA512 abd2f0e0c378c487d6b8f4761db610bf596a97cdfa469d8e597b3965934aa4e3a2e374afb404dcbd68ea124de194f428fee4ec7fe5e2615e87e92be3c9b8a246 WHIRLPOOL 9425b6f9a6bda67ac91475d2f972d70b06861d41d9a994d8a2f67fc0110b343dc87b8c83435a30a46ff8faaf9193fda529df8c3e55d4540d90fe461490a3f9a4
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..1cda84d9a1c6
--- /dev/null
+++ b/media-sound/easytag/easytag-2.1.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools gnome.org fdo-mime
+
+DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
+HOMEPAGE="http://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.2.2.ebuild b/media-sound/easytag/easytag-2.2.2.ebuild
new file mode 100644
index 000000000000..8ad4c6c0b483
--- /dev/null
+++ b/media-sound/easytag/easytag-2.2.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit fdo-mime gnome.org gnome2-utils
+
+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 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
+REQUIRED_USE="|| ( gtk2 gtk3 )
+	opus? ( vorbis )
+	speex? ( vorbis )"
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	flac? ( >=media-libs/flac-1.3 )
+	gtk2? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.4: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-util/appdata-tools-0.1.7
+		>=dev-util/desktop-file-utils-0.22
+		)"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+
+src_prepare() {
+	sed -i \
+		-e '/^DEPRECATED_CPPFLAGS="/d' \
+		-e '/warning_flags/s: -Werror=.*:":' \
+		configure || die
+}
+
+src_configure() {
+	# Kludge to make easytag find its locales (bug #503698)
+	export DATADIRNAME=share
+
+	econf \
+		$(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) \
+		$(use_with gtk2)
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
+pkg_postrm() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.2.3.ebuild b/media-sound/easytag/easytag-2.2.3.ebuild
new file mode 100644
index 000000000000..8ad4c6c0b483
--- /dev/null
+++ b/media-sound/easytag/easytag-2.2.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit fdo-mime gnome.org gnome2-utils
+
+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 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
+REQUIRED_USE="|| ( gtk2 gtk3 )
+	opus? ( vorbis )
+	speex? ( vorbis )"
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	flac? ( >=media-libs/flac-1.3 )
+	gtk2? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.4: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-util/appdata-tools-0.1.7
+		>=dev-util/desktop-file-utils-0.22
+		)"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+
+src_prepare() {
+	sed -i \
+		-e '/^DEPRECATED_CPPFLAGS="/d' \
+		-e '/warning_flags/s: -Werror=.*:":' \
+		configure || die
+}
+
+src_configure() {
+	# Kludge to make easytag find its locales (bug #503698)
+	export DATADIRNAME=share
+
+	econf \
+		$(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) \
+		$(use_with gtk2)
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
+pkg_postrm() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.2.4.ebuild b/media-sound/easytag/easytag-2.2.4.ebuild
new file mode 100644
index 000000000000..8ad4c6c0b483
--- /dev/null
+++ b/media-sound/easytag/easytag-2.2.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit fdo-mime gnome.org gnome2-utils
+
+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 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
+REQUIRED_USE="|| ( gtk2 gtk3 )
+	opus? ( vorbis )
+	speex? ( vorbis )"
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	flac? ( >=media-libs/flac-1.3 )
+	gtk2? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.4: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-util/appdata-tools-0.1.7
+		>=dev-util/desktop-file-utils-0.22
+		)"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+
+src_prepare() {
+	sed -i \
+		-e '/^DEPRECATED_CPPFLAGS="/d' \
+		-e '/warning_flags/s: -Werror=.*:":' \
+		configure || die
+}
+
+src_configure() {
+	# Kludge to make easytag find its locales (bug #503698)
+	export DATADIRNAME=share
+
+	econf \
+		$(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) \
+		$(use_with gtk2)
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
+pkg_postrm() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.2.5.ebuild b/media-sound/easytag/easytag-2.2.5.ebuild
new file mode 100644
index 000000000000..8ad4c6c0b483
--- /dev/null
+++ b/media-sound/easytag/easytag-2.2.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit fdo-mime gnome.org gnome2-utils
+
+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 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
+REQUIRED_USE="|| ( gtk2 gtk3 )
+	opus? ( vorbis )
+	speex? ( vorbis )"
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	flac? ( >=media-libs/flac-1.3 )
+	gtk2? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.4: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-util/appdata-tools-0.1.7
+		>=dev-util/desktop-file-utils-0.22
+		)"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+
+src_prepare() {
+	sed -i \
+		-e '/^DEPRECATED_CPPFLAGS="/d' \
+		-e '/warning_flags/s: -Werror=.*:":' \
+		configure || die
+}
+
+src_configure() {
+	# Kludge to make easytag find its locales (bug #503698)
+	export DATADIRNAME=share
+
+	econf \
+		$(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) \
+		$(use_with gtk2)
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
+pkg_postrm() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.2.6.ebuild b/media-sound/easytag/easytag-2.2.6.ebuild
new file mode 100644
index 000000000000..8ad4c6c0b483
--- /dev/null
+++ b/media-sound/easytag/easytag-2.2.6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit fdo-mime gnome.org gnome2-utils
+
+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 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
+REQUIRED_USE="|| ( gtk2 gtk3 )
+	opus? ( vorbis )
+	speex? ( vorbis )"
+
+RDEPEND=">=dev-libs/glib-2.32:2
+	flac? ( >=media-libs/flac-1.3 )
+	gtk2? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.4: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-util/appdata-tools-0.1.7
+		>=dev-util/desktop-file-utils-0.22
+		)"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+
+src_prepare() {
+	sed -i \
+		-e '/^DEPRECATED_CPPFLAGS="/d' \
+		-e '/warning_flags/s: -Werror=.*:":' \
+		configure || die
+}
+
+src_configure() {
+	# Kludge to make easytag find its locales (bug #503698)
+	export DATADIRNAME=share
+
+	econf \
+		$(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) \
+		$(use_with gtk2)
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
+pkg_postrm() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
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..9ba357e3df48
--- /dev/null
+++ b/media-sound/easytag/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<use>
+		<flag name='opus'>Enable support for <pkg>media-libs/opus</pkg> and <pkg>media-libs/opusfile</pkg> (opus audio codec)</flag>
+		<flag name='gtk2'>Enable GTK+:2 support and disable default GTK+:3 support</flag>
+		<flag name='gtk3'>Enable GTK+:3 support (default) and disable GTK+:2 support</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..6d38b8d05067
--- /dev/null
+++ b/media-sound/ecasound/Manifest
@@ -0,0 +1,3 @@
+DIST ecasound-2.6.0.tar.gz 966629 SHA256 925d12a422883c356565c542110d070f61c3693e01eaa1b00eb25082e4779f88
+DIST ecasound-2.9.0.tar.gz 1055913 SHA256 e2b0b8f8cce6074d660e460b3a02fc0132a51e1e982b78b3a68fa14e79fcc6c6 SHA512 d8ba4274413616b37084f716ca9c91434280cc600e5e2c231a755cbe27b05df0095b8178d280c2e576d91d04ff27aad4793ecec70c1bbb8b2ae73a030c8cbb13 WHIRLPOOL 7f9ce963a8e971b8d6a169cd07d82349f4050853b2f7b9f3a35c3c99754be1da14555ff9c61213c0f44b869a9f514a68860336e83d055e15b34268b2dc92d868
+DIST ecasound-2.9.1.tar.gz 1057333 SHA256 39fce8becd84d80620fa3de31fb5223b2b7d4648d36c9c337d3739c2fad0dcf3 SHA512 b91fd68cb4809fdf62b25323fbf52c9bb7de6663287d5aa2576cc4fb28e322850b7020df2718ed6087f5d9f5f96692a476287378ea65853d01834523e8eb7033 WHIRLPOOL ef4eccd6a2ac1b508246ce7660614e52bc9033814011cff588382f1a76ac9fc124aecd6dbd3fb4ffeb337a8eb7ef1e87c438e2c994faddd70d9a2fc49561a80d
diff --git a/media-sound/ecasound/ecasound-2.6.0.ebuild b/media-sound/ecasound/ecasound-2.6.0.ebuild
new file mode 100644
index 000000000000..3b0e3ca6bca0
--- /dev/null
+++ b/media-sound/ecasound/ecasound-2.6.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils python
+
+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? ( dev-lang/python )
+	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}"
+
+src_configure() {
+	local PYConf
+
+	if use python; then
+		PYConf="--enable-pyecasound=c
+			--with-python-includes=$(python_get_includedir)
+			--with-python-modules=$(python_get_libdir)"
+	else
+		PYConf="$myconf --disable-pyecasound"
+	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 ruby rubyecasound) \
+		$(use_enable sndfile) \
+		--enable-shared \
+		--with-largefile \
+		--enable-sys-readline \
+		${PYConf} || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc BUGS NEWS README TODO Documentation/*.txt
+	use doc && dohtml Documentation/*.html
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize ecacontrol.py eci.py pyeca.py
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup ecacontrol.py eci.py pyeca.py
+	fi
+}
diff --git a/media-sound/ecasound/ecasound-2.9.0.ebuild b/media-sound/ecasound/ecasound-2.9.0.ebuild
new file mode 100644
index 000000000000..6135d639163a
--- /dev/null
+++ b/media-sound/ecasound/ecasound-2.9.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+
+inherit eutils python autotools
+
+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 )"
+
+RDEPEND="sys-libs/readline
+	alsa? ( media-libs/alsa-lib )
+	audiofile? ( media-libs/audiofile )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	lv2? ( >=media-libs/lilv-0.5.0 )
+	media-libs/ladspa-sdk
+	mikmod? ( media-libs/libmikmod:0 )
+	ncurses? ( sys-libs/ncurses )
+	oil? ( dev-libs/liboil )
+	osc? ( media-libs/liblo )
+	ruby? ( dev-lang/ruby )
+	sndfile? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.8.1-ldflags.patch
+
+	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-includes=${EPREFIX}$(python_get_includedir)
+			--with-python-modules=${EPREFIX}$(python_get_libdir)"
+	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
+
+	if use doc ; then
+		dohtml Documentation/*.html
+		dodoc Documentation/programmers_guide/ecasound_programmers_guide.txt
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize ecacontrol.py eci.py pyeca.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ecacontrol.py eci.py pyeca.py
+}
diff --git a/media-sound/ecasound/ecasound-2.9.1.ebuild b/media-sound/ecasound/ecasound-2.9.1.ebuild
new file mode 100644
index 000000000000..a17e5c60fb1e
--- /dev/null
+++ b/media-sound/ecasound/ecasound-2.9.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+
+inherit eutils python autotools
+
+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 )"
+
+RDEPEND="sys-libs/readline
+	alsa? ( media-libs/alsa-lib )
+	audiofile? ( media-libs/audiofile )
+	jack? ( media-sound/jack-audio-connection-kit )
+	libsamplerate? ( media-libs/libsamplerate )
+	lv2? ( >=media-libs/lilv-0.5.0 )
+	media-libs/ladspa-sdk
+	mikmod? ( media-libs/libmikmod:0 )
+	ncurses? ( sys-libs/ncurses )
+	oil? ( dev-libs/liboil )
+	osc? ( media-libs/liblo )
+	ruby? ( dev-lang/ruby )
+	sndfile? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.8.1-ldflags.patch
+
+	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-includes=${EPREFIX}$(python_get_includedir)
+			--with-python-modules=${EPREFIX}$(python_get_libdir)"
+	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
+
+	if use doc ; then
+		dohtml Documentation/*.html
+		dodoc Documentation/programmers_guide/ecasound_programmers_guide.txt
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize ecacontrol.py eci.py pyeca.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ecacontrol.py eci.py pyeca.py
+}
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..c48ef0397652
--- /dev/null
+++ b/media-sound/ecasound/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+<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..d517b3fe3ea8
--- /dev/null
+++ b/media-sound/edna/Manifest
@@ -0,0 +1 @@
+DIST edna-0.6.tar.gz 50303 SHA256 601aea3af9fe37407cd9523978e69c71785e09b5d8d57ca911a74c3ce3740c4c SHA512 d48786829c127b0a1e24116524b8b95a91990c8952882ef00d7761fc6c1dd9b4b0037af2b176dbfd066b6d80670bad7a0c724af984b24c6b4bde93c884c3b76b WHIRLPOOL 3850124bdf07f79f10db2926968a0fde99884781d5afb9a67b9ad5afd014e65723e80fd966f9b91cb5e4aba709a6faadcf494be71421d0e1c3b150541db4dcad
diff --git a/media-sound/edna/edna-0.6.ebuild b/media-sound/edna/edna-0.6.ebuild
new file mode 100644
index 000000000000..b78066ed71a4
--- /dev/null
+++ b/media-sound/edna/edna-0.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..04660e0ffe3f
--- /dev/null
+++ b/media-sound/edna/files/edna.gentoo
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+#
+# 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..096a93c11ccf
--- /dev/null
+++ b/media-sound/edna/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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..96d09b22221f
--- /dev/null
+++ b/media-sound/entagged-tageditor/Manifest
@@ -0,0 +1 @@
+DIST entagged-tageditor-0.35.tar.gz 4606721 RMD160 24dbf8631a128a3ffd1eccaecdc6fe5d148bd281 SHA1 0ed0437bc938f2060d0793723f3ec22b7ee4d0df SHA256 c9e9b69a49bdf6646cc21dc3cc0734e6c54ac91e99774b1d87a6765b365611ac
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..6fcc228b543f
--- /dev/null
+++ b/media-sound/entagged-tageditor/entagged-tageditor-0.35.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a2ac2e03bfbd
--- /dev/null
+++ b/media-sound/entagged-tageditor/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/erec/Manifest b/media-sound/erec/Manifest
new file mode 100644
index 000000000000..20bb75a09629
--- /dev/null
+++ b/media-sound/erec/Manifest
@@ -0,0 +1 @@
+DIST erec-2.2.0.1.tar.bz2 25966 RMD160 4ba8e5afa47f6f7de57a182781127cfc48fce753 SHA1 e222bf7c7cb2069337fd794ad0e7abaf1ce7c210 SHA256 31fe1baa2738aa690e6af24c01950b4f67cf1b71feaeab4cdfbd9f5f76fe060f
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..2c0878bbdf2b
--- /dev/null
+++ b/media-sound/erec/erec-2.2.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/erec/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
new file mode 100644
index 000000000000..7bbb58c66680
--- /dev/null
+++ b/media-sound/exaile/Manifest
@@ -0,0 +1,3 @@
+DIST exaile-0.3.2.0.tar.gz 2082057 SHA256 7571db88db5453d09675ed70d8bd5046825b6e7b79ea76b01707e11cd14609eb
+DIST exaile-0.3.2.1.tar.gz 2061448 SHA256 db3e5b7bb4ad536df31f7f982456ef0aef935021afcd004c8755317584300ff6
+DIST exaile-3.4.5.tar.gz 3662446 SHA256 c875a5c13aa8efb0864d6bafc37e6d3b09f84e251cdb7b77098e6609fb5d00ad SHA512 9337b86ed2f6a13071615bd46a7a05a6564011a4e1fef4cb42925336864c07854cfe497d8defe65c4e287fd9546de6a51543180c5ce6a84525506e57209914be WHIRLPOOL e84c95bab48a9488e2738c16088a3fff333a8af712dd52ac5f0b9d4ce1bdbfc379c2be4fafaf532bb8f44605f1a6ec26cac2e5e96a4a29ba813fdc8b70bbea94
diff --git a/media-sound/exaile/exaile-0.3.2.0.ebuild b/media-sound/exaile/exaile-0.3.2.0.ebuild
new file mode 100644
index 000000000000..d906bb903cf6
--- /dev/null
+++ b/media-sound/exaile/exaile-0.3.2.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="sqlite"
+
+inherit fdo-mime multilib python
+
+DESCRIPTION="a media player aiming to be similar to AmaroK, but for GTK+"
+HOMEPAGE="http://www.exaile.org/"
+SRC_URI="http://launchpad.net/${PN}/0.3.2/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE="cddb libnotify nls"
+
+RDEPEND="dev-python/dbus-python
+	>=media-libs/mutagen-1.10
+	>=dev-python/pygtk-2.17
+	>=dev-python/pygobject-2.18:2
+	dev-python/gst-python:0.10
+	media-libs/gst-plugins-good:0.10
+	media-plugins/gst-plugins-meta:0.10
+	libnotify? ( dev-python/notify-python )
+	cddb? ( dev-python/cddb-py )"
+DEPEND="nls? ( dev-util/intltool
+	sys-devel/gettext )"
+
+RESTRICT="test" #315589
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e "s:exec python:exec $(PYTHON):" \
+		exaile tools/generate-launcher || die
+}
+
+src_compile() {
+	if use nls; then
+		emake locale || die
+	fi
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		LIBINSTALLDIR=/$(get_libdir) \
+		DESTDIR="${D}" \
+		install$(use nls || echo _no_locale) || die
+
+	dodoc FUTURE README || die
+
+	if has_version "<media-sound/exaile-0.3"; then
+		insinto /usr/share/exaile/data
+		doins -r data/migrations || die
+	fi
+}
+
+pkg_postinst() {
+	python_need_rebuild
+	python_mod_optimize /usr/$(get_libdir)/${PN}
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/${PN}
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-sound/exaile/exaile-0.3.2.1.ebuild b/media-sound/exaile/exaile-0.3.2.1.ebuild
new file mode 100644
index 000000000000..f3c4e190fbcb
--- /dev/null
+++ b/media-sound/exaile/exaile-0.3.2.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="sqlite"
+
+inherit fdo-mime multilib python
+
+DESCRIPTION="a media player aiming to be similar to AmaroK, but for GTK+"
+HOMEPAGE="http://www.exaile.org/"
+SRC_URI="http://launchpad.net/${PN}/0.3.2/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="cddb libnotify nls"
+
+RDEPEND="dev-python/dbus-python
+	>=media-libs/mutagen-1.10
+	>=dev-python/pygtk-2.17
+	>=dev-python/pygobject-2.18:2
+	dev-python/gst-python:0.10
+	media-libs/gst-plugins-good:0.10
+	media-plugins/gst-plugins-meta:0.10
+	libnotify? ( dev-python/notify-python )
+	cddb? ( dev-python/cddb-py )"
+DEPEND="nls? ( dev-util/intltool
+	sys-devel/gettext )"
+
+RESTRICT="test" #315589
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e "s:exec python:exec $(PYTHON):" \
+		exaile tools/generate-launcher || die
+}
+
+src_compile() {
+	if use nls; then
+		emake locale || die
+	fi
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		LIBINSTALLDIR=/$(get_libdir) \
+		DESTDIR="${D}" \
+		install$(use nls || echo _no_locale) || die
+
+	dodoc FUTURE || die
+}
+
+pkg_postinst() {
+	python_need_rebuild
+	python_mod_optimize /usr/$(get_libdir)/${PN}
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/${PN}
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
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..e3670c180112
--- /dev/null
+++ b/media-sound/exaile/exaile-3.4.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+RDEPEND="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..70b17978b4e1
--- /dev/null
+++ b/media-sound/exaile/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..765f2c2982e6
--- /dev/null
+++ b/media-sound/ezstream/Manifest
@@ -0,0 +1,2 @@
+DIST ezstream-0.5.6.tar.gz 263150 SHA256 818b7ab2a498ffe6e59155279cb79ed0291c4979210e99af6dda950fe54a30c0
+DIST ezstream-0.6.0.tar.gz 250448 SHA256 f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9 SHA512 d6b621db85a0d56dcc54a8b7a0136c25342ec507f04ab397a53f46a74e85e94806e17d0a0a59e66096b5c0d97b7f98eaba95a50c1ca6c8d82aed11b854d0d33d WHIRLPOOL 7f9960add62ec83c72fef7db8a7d7836a689879127ba7ad72f0584c152e74d76cef9def4f9251d3101b3e21b344ac8a64e47145969880c5f1fedead8ab80d398
diff --git a/media-sound/ezstream/ezstream-0.5.6.ebuild b/media-sound/ezstream/ezstream-0.5.6.ebuild
new file mode 100644
index 000000000000..8b245757c799
--- /dev/null
+++ b/media-sound/ezstream/ezstream-0.5.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="A command line source client for Icecast media streaming servers"
+HOMEPAGE="http://www.icecast.org/ezstream.php"
+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
+	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)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
+	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
+
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING
+}
diff --git a/media-sound/ezstream/ezstream-0.6.0.ebuild b/media-sound/ezstream/ezstream-0.6.0.ebuild
new file mode 100644
index 000000000000..6e0a54642775
--- /dev/null
+++ b/media-sound/ezstream/ezstream-0.6.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A command line source client for Icecast media streaming servers"
+HOMEPAGE="http://www.icecast.org/ezstream.php"
+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
+	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)
+}
+
+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..a5c0d56514c5
--- /dev/null
+++ b/media-sound/ezstream/files/ezstream.initd
@@ -0,0 +1,33 @@
+#!/sbin/runscript
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/ezstream/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/fapg/Manifest b/media-sound/fapg/Manifest
new file mode 100644
index 000000000000..ced6a4d393b4
--- /dev/null
+++ b/media-sound/fapg/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/media-sound/fapg/fapg-0.41.ebuild b/media-sound/fapg/fapg-0.41.ebuild
new file mode 100644
index 000000000000..a6fdf7fbe037
--- /dev/null
+++ b/media-sound/fapg/fapg-0.41.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..52761727688a
--- /dev/null
+++ b/media-sound/fapg/fapg-0.42.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..72d447316a74
--- /dev/null
+++ b/media-sound/fapg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+  <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..1af5b8b4b15e
--- /dev/null
+++ b/media-sound/flac-image/Manifest
@@ -0,0 +1 @@
+DIST flac-image-1.00.tar.gz 13948 SHA256 c4ee58d7f447a2a48b12b338682ddca4d9e7630e1dd04cc5e6e190b8a5ce7109 SHA512 71d72a240c0f156b546310bf356f3304bf04152317df683e30205ae79d8b97fe2a29d63e3fdea5b21d0a62390459527ecf33f6d509b36196a8dc0e28cd1a3e1d WHIRLPOOL 4b7f2e8fd42dcf6e7d38a5b4055f869078ce415065a7a297930dcecf0b9c1ea27638f4a49de9dde467854687b5595bb4f4d7a36f335a6894547a2b27d1c138f0
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..fca1550ca70e
--- /dev/null
+++ b/media-sound/flac-image/flac-image-1.00.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Utility for stuffing image files (e.g. album cover art) into metadata blocks in 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}"
+
+# compile helper
+_compile() {
+	local CC="$(tc-getCC)"
+	echo "${CC} ${@}" && "${CC}" "${@}"
+}
+
+src_prepare() {
+	sed -i -e "s:^\(#include <stdio.h>\):\1\n#include <string.h>:g" "${PN}.c"
+	rm -f -- "${PN}"  # remove pre-compiled binary
+}
+
+src_compile() {
+	# Makefile is both simple and broken, so we compile the binary ourself.
+	_compile ${CFLAGS} ${LDFLAGS} -o "${PN}" "${PN}.c" -lFLAC \
+	|| die "compile failed"
+}
+
+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..b1cf7fe492bb
--- /dev/null
+++ b/media-sound/flac-image/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..b5584871b4cc
--- /dev/null
+++ b/media-sound/flac123/Manifest
@@ -0,0 +1 @@
+DIST flac123-0.0.12-release.tar.gz 129795 SHA256 1976efd54a918eadd3cb10b34c77cee009e21ae56274148afa01edf32654e47d SHA512 4bfabecae86cf11a13bd45025d7fbdee189918e0cd4eee0128856897710b44afd19df5675cae9426d30e9d8cd09b358333438cd05701fa0a7a00a8493a77e1f7 WHIRLPOOL 4c185575c39ad6d377d55e7ff3117156e2e857b62e2ecf9e8dfe97a59563e9341c73ccbd6072d9c6dbdf28b5a42da45c781459c0fa7424a7b6ddf04b98bb92f8
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..4a509c7ebcd2
--- /dev/null
+++ b/media-sound/flac123/flac123-0.0.12.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..38f02c77fdf9
--- /dev/null
+++ b/media-sound/flac123/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..f7f7eb7b2339
--- /dev/null
+++ b/media-sound/flack/Manifest
@@ -0,0 +1 @@
+DIST flack-2.0.6.tar.gz 16273 SHA256 38c7f78e54f894faa9ee37d7d4363d1ec84f6e0939f3d8211ebdc4bda9803acd
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..cb312c647204
--- /dev/null
+++ b/media-sound/flack/flack-2.0.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="flack - edit FLAC tags from command line"
+HOMEPAGE="http://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..0107465b9dbd
--- /dev/null
+++ b/media-sound/flack/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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>
+</pkgmetadata>
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
new file mode 100644
index 000000000000..e347c209b517
--- /dev/null
+++ b/media-sound/flacon/Manifest
@@ -0,0 +1,4 @@
+DIST flacon-0.7.2.tgz 238604 SHA256 b10cfe6d7f99c3b64082edc5bf926c1759714719ef5ec99065f92df4c7da87ac SHA512 2393765d39a6cdb711a7ad27b644866d58f633b692db268b9a7b7a46be10e80c3aa4fbea2ddbeba45a6dbeddd0fd6893f753d7725534e8906bd752426530322b WHIRLPOOL ef5f28563a9871525e72815e1c3e9b28212cedc874a9329edd72180446a790517e412043f189f439106b38c79923714e118cd185475a9540ef49dc5b5d373716
+DIST flacon-0.8.0.tgz 272910 SHA256 d2889b364ea49b19c400ce8081d829e5a37149dfdcb82d55f6ab453b679d1f85 SHA512 58b2cd57266533ae3bdd524d18c279171c3092665e20332a16c421d6931492deb6d201e2b3f818ecda7e2d50fdbe7170597b12922aa9cbe07cc24dc7b6d4d0d1 WHIRLPOOL e515de827886d95c6e67c8549ef4ec3ec6700d6d7cc9f06d9e568d79274942d37e0153b88391bedfda7d5b28fc3231ceb59a7faecd0830a01468d61c1cd5197f
+DIST flacon-0.9.4.tar.gz 242933 SHA256 ef97a89897f95112d623c37f64a2c42a58f3527d66a4c322637d721ff2675e64 SHA512 3ea923fe68bcecd505f75ef25f6117209489ed57321c06bd5370bcd6c2919d709ce18d2ecbd1f6e1834f003f80f38665e522960bd7114d7c0c011296aec9e996 WHIRLPOOL efc4863b1c0f3ee1e46a60cbae3f922ca155d6d578e27f8eb4a5db6137f9b19b1ffbad0fdbda796ac1eb5c1970e7343b5c75dee7130681bad8b5946bdca20703
+DIST flacon-1.0.0.tar.gz 249473 SHA256 60487a85e828a08afbaf2fe5f7228a94e1f4094606456f73d59ae351f75e1284 SHA512 2336ec0b0bc7cdaa3792f64adb88a7fd62e7b6f4c84b6cc465e6f6546ca5cae21929de87aa3ab4c7b12754d3480cc66f412f25969707765798ecbb8aea78b7db WHIRLPOOL 50c6b2737de9d82616377048a8fee0b0feec97ae337562d53ecaa2476b417d98327c481ea162d8970615becc6b75754e8cf195fd56285b34414df1d85ba37013
diff --git a/media-sound/flacon/flacon-0.7.2.ebuild b/media-sound/flacon/flacon-0.7.2.ebuild
new file mode 100644
index 000000000000..cac14cd2da64
--- /dev/null
+++ b/media-sound/flacon/flacon-0.7.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+PYTHON_DEPEND="2"
+
+inherit python
+
+DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks"
+HOMEPAGE="https://code.google.com/p/flacon/"
+SRC_URI="https://flacon.googlecode.com/files/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="flac mac mp3 mp4 ogg replaygain tta wavpack"
+
+RDEPEND="
+	dev-python/PyQt4[X]
+	dev-python/chardet
+	media-sound/shntool[mac?]
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	mp3? ( media-sound/lame )
+	mp4? ( media-libs/faac )
+	ogg? ( media-sound/vorbis-tools )
+	tta? ( media-sound/ttaenc )
+	wavpack? ( media-sound/wavpack )
+	replaygain? (
+		mp3? ( media-sound/mp3gain )
+		ogg? ( media-sound/vorbisgain )
+	)
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+
+	sed -e '/cd $(INST_DIR) && python -mcompileall ./d' -i Makefile || die
+}
+
+src_compile() { :; }
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+}
diff --git a/media-sound/flacon/flacon-0.8.0.ebuild b/media-sound/flacon/flacon-0.8.0.ebuild
new file mode 100644
index 000000000000..5eed23d4bf1c
--- /dev/null
+++ b/media-sound/flacon/flacon-0.8.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="cs_CZ es_MX fr gl it pl_PL pt_BR ro_RO ru si_LK uk zh_CN zh_TW"
+
+inherit python-single-r1 l10n
+
+DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks"
+HOMEPAGE="https://code.google.com/p/flacon/"
+SRC_URI="https://flacon.googlecode.com/files/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac mac mp3 mp4 ogg replaygain tta wavpack"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/PyQt4[X,${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	media-sound/shntool[mac?]
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	mp3? ( media-sound/lame )
+	mp4? ( media-libs/faac )
+	ogg? ( media-sound/vorbis-tools )
+	tta? ( media-sound/ttaenc )
+	wavpack? ( media-sound/wavpack )
+	replaygain? (
+		mp3? ( media-sound/mp3gain )
+		ogg? ( media-sound/vorbisgain )
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	my_rm_loc() {
+		rm -v "translations/${PN}_${1}."{ts,qm} || die
+	}
+
+	l10n_find_plocales_changes "translations" "${PN}_" '.qm'
+	l10n_for_each_disabled_locale_do my_rm_loc
+
+	if [ -z "$(l10n_get_locales)" ]; then
+		sed -e '/install .*translations/d' -i Makefile || die
+	fi
+
+	python_fix_shebang .
+
+	sed -e '/cd $(INST_DIR) && python -mcompileall ./d' -i Makefile || die
+
+	# do not use /tmp/ for tests
+	sed -e "s,/tmp/,${T}/," -i Makefile tests/flacon_tests.py || die
+}
+
+src_compile() { :; }
+
+src_test() {
+	"${PYTHON}" tests/flacon_tests.py --verbose || die "Testing failed with ${PYTHON}"
+}
+
+src_install() {
+	default
+
+	python_optimize "${ED}"/usr/share/${PN}
+}
diff --git a/media-sound/flacon/flacon-0.9.4.ebuild b/media-sound/flacon/flacon-0.9.4.ebuild
new file mode 100644
index 000000000000..e491e873d839
--- /dev/null
+++ b/media-sound/flacon/flacon-0.9.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PLOCALES="cs_CZ cs de es_MX es fr gl hu it pl_PL pl pt_BR pt_PT ro_RO ru si_LK uk zh_CN zh_TW"
+
+EGIT_REPO_URI="https://github.com/flacon/flacon.git"
+
+inherit cmake-utils l10n fdo-mime gnome2-utils
+[[ ${PV} == *9999* ]] && inherit git-r3
+
+DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks"
+HOMEPAGE="https://flacon.github.io/"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="flac mac mp3 mp4 ogg replaygain tta wavpack"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-libs/uchardet
+	media-sound/shntool[mac?]
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	mp3? ( media-sound/lame )
+	mp4? ( media-libs/faac )
+	ogg? ( media-sound/vorbis-tools )
+	tta? ( media-sound/ttaenc )
+	wavpack? ( media-sound/wavpack )
+	replaygain? (
+		mp3? ( media-sound/mp3gain )
+		ogg? ( media-sound/vorbisgain )
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	my_rm_loc() {
+		rm "translations/${PN}_${1}."{ts,desktop} || die
+	}
+
+	l10n_find_plocales_changes "translations" "${PN}_" '.ts'
+	l10n_for_each_disabled_locale_do my_rm_loc
+}
+
+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/flacon/flacon-1.0.0.ebuild b/media-sound/flacon/flacon-1.0.0.ebuild
new file mode 100644
index 000000000000..b396a74c1bc8
--- /dev/null
+++ b/media-sound/flacon/flacon-1.0.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PLOCALES="cs_CZ cs de es_MX es fr gl hu it pl_PL pl pt_BR pt_PT ro_RO ru si_LK uk zh_CN zh_TW"
+
+EGIT_REPO_URI="https://github.com/flacon/flacon.git"
+
+inherit cmake-utils l10n fdo-mime gnome2-utils
+[[ ${PV} == *9999* ]] && inherit git-r3
+
+DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks"
+HOMEPAGE="https://flacon.github.io/"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="amd64 x86"
+IUSE="flac mac mp3 mp4 ogg replaygain tta wavpack"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-libs/uchardet
+	media-sound/shntool[mac?]
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	mp3? ( media-sound/lame )
+	mp4? ( media-libs/faac )
+	ogg? ( media-sound/vorbis-tools )
+	tta? ( media-sound/ttaenc )
+	wavpack? ( media-sound/wavpack )
+	replaygain? (
+		mp3? ( media-sound/mp3gain )
+		ogg? ( media-sound/vorbisgain )
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	my_rm_loc() {
+		rm "translations/${PN}_${1}."{ts,desktop} || die
+	}
+
+	l10n_find_plocales_changes "translations" "${PN}_" '.ts'
+	l10n_for_each_disabled_locale_do my_rm_loc
+}
+
+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/flacon/flacon-9999.ebuild b/media-sound/flacon/flacon-9999.ebuild
new file mode 100644
index 000000000000..e491e873d839
--- /dev/null
+++ b/media-sound/flacon/flacon-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PLOCALES="cs_CZ cs de es_MX es fr gl hu it pl_PL pl pt_BR pt_PT ro_RO ru si_LK uk zh_CN zh_TW"
+
+EGIT_REPO_URI="https://github.com/flacon/flacon.git"
+
+inherit cmake-utils l10n fdo-mime gnome2-utils
+[[ ${PV} == *9999* ]] && inherit git-r3
+
+DESCRIPTION="Extracts audio tracks from audio CD image to separate tracks"
+HOMEPAGE="https://flacon.github.io/"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="flac mac mp3 mp4 ogg replaygain tta wavpack"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-libs/uchardet
+	media-sound/shntool[mac?]
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
+	mp3? ( media-sound/lame )
+	mp4? ( media-libs/faac )
+	ogg? ( media-sound/vorbis-tools )
+	tta? ( media-sound/ttaenc )
+	wavpack? ( media-sound/wavpack )
+	replaygain? (
+		mp3? ( media-sound/mp3gain )
+		ogg? ( media-sound/vorbisgain )
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	my_rm_loc() {
+		rm "translations/${PN}_${1}."{ts,desktop} || die
+	}
+
+	l10n_find_plocales_changes "translations" "${PN}_" '.ts'
+	l10n_for_each_disabled_locale_do my_rm_loc
+}
+
+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/flacon/metadata.xml b/media-sound/flacon/metadata.xml
new file mode 100644
index 000000000000..249648044e80
--- /dev/null
+++ b/media-sound/flacon/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>nikoli@gmx.us</email>
+		<name>Nikoli</name>
+	</maintainer>
+	<maintainer>
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<use>
+		<flag name="mac">Add support for Monkey's Audio files</flag>
+		<flag name="replaygain">Support for Replay Gain metadata, for relative volume adjustment</flag>
+		<flag name="tta">Add support for True Audio encoding</flag>
+	</use>
+	<upstream>
+		<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..a71bb16cf5cb
--- /dev/null
+++ b/media-sound/flake/Manifest
@@ -0,0 +1 @@
+DIST flake-0.11.tar.bz2 43319 SHA256 8dd249888005c2949cb4564f02b6badb34b2a0f408a7ec7ab01e11ceca1b7f19 SHA512 045cbe7f5af29dfdc5843df3dccfa6faf1ce816566b2f3ac928b98e14f5ee0ec15ee5024a092da4e33beb5d87c31f38c0780970811c5b96ae72683aeac332584 WHIRLPOOL 1ed1293f5db7606e3f2aa40f15fc066fdd17a85236b7ac1781f7c76c85f1c7e620d08e791836e2c07a93b4b1bd96c7b4e9392b4ae347d7c36478ec87fcc7459a
diff --git a/media-sound/flake/flake-0.11.ebuild b/media-sound/flake/flake-0.11.ebuild
new file mode 100644
index 000000000000..72d393af5b40
--- /dev/null
+++ b/media-sound/flake/flake-0.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..8364f22a83d2
--- /dev/null
+++ b/media-sound/flake/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..af921347ac7e
--- /dev/null
+++ b/media-sound/fluid-soundfont/Manifest
@@ -0,0 +1,2 @@
+DIST fluid-soundfont_3.1.tar.gz 134835922 SHA256 2621acaa1c78e4abdb24bdd163230cc577e61276936d6aa6e3180582142f0343
+DIST timidity.cfg.bz2 10667 SHA256 9607f9bd59fd5a4d258f2885bb6978f02c4a600c1ee6044978b6fd4577420f1d
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..7c768db2d435
--- /dev/null
+++ b/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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? ( http://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..6ccc15efbd5f
--- /dev/null
+++ b/media-sound/fluid-soundfont/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+<email>hwoarang@gentoo.org</email>
+<name>Markos Chandras</name>
+<description>Proxy maintainer. CC him on bugs</description>
+</maintainer>
+<maintainer>
+<email>nikoli@gmx.us</email>
+<name>Nikoli</name>
+<description>Maintainer. Assign bugs to him</description>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
new file mode 100644
index 000000000000..c590398e1485
--- /dev/null
+++ b/media-sound/fluidsynth/Manifest
@@ -0,0 +1 @@
+DIST fluidsynth-1.1.6.tar.gz 958735 SHA256 50853391d9ebeda9b4db787efb23f98b1e26b7296dd2bb5d0d96b5bccee2171c SHA512 2dcb8a8a1634273cc93c45b6e21b87ac45a023c768cffdadda0a4e611eab8d5bbea0e1ba59e5f147488054cfa6fcaf561399ae275a665c76082b8738a80778bb WHIRLPOOL c3ede7f1218b5f445cf3537ed52dd32ebdcf50c44774431323b17dda963e334f80ec255e086380007dad69b4f3338aacb22ef90c10904f57d946f4573ced869b
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..d29b47c34ec5
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-1.1.6-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="Fluidsynth is a 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 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? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${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[${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/fluidsynth-1.1.6.ebuild b/media-sound/fluidsynth/fluidsynth-1.1.6.ebuild
new file mode 100644
index 000000000000..fc8bb6a05295
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-1.1.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Fluidsynth is a 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 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="alsa dbus debug examples jack ladspa lash portaudio pulseaudio readline sndfile"
+
+RDEPEND=">=dev-libs/glib-2.6.5:2
+	alsa? ( media-libs/alsa-lib
+		lash? ( >=media-sound/lash-0.5 ) )
+	dbus? ( >=sys-apps/dbus-1.0.0 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	ladspa? ( >=media-libs/ladspa-sdk-1.12
+		>=media-libs/ladspa-cmt-1.15 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	readline? ( sys-libs/readline )
+	sndfile? ( >=media-libs/libsndfile-1.0.18 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+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-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodoc AUTHORS NEWS README THANKS TODO doc/*.txt
+
+	insinto /usr/share/doc/${PF}/pdf
+	doins doc/*.pdf
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins doc/*.c
+	fi
+}
diff --git a/media-sound/fluidsynth/metadata.xml b/media-sound/fluidsynth/metadata.xml
new file mode 100644
index 000000000000..5ff04da9d27e
--- /dev/null
+++ b/media-sound/fluidsynth/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..525fc14076da
--- /dev/null
+++ b/media-sound/fmdrv/Manifest
@@ -0,0 +1 @@
+DIST fmdrv-1.0.7.tar.bz2 61373 SHA256 85bbb651a531e86b7aa07fa9efcb2c62344484cb3999b36539af6002188cbaa1 SHA512 d5533aee5c4c4e6a08dd2ede07c2f657edf93cf89bdb43d3453badd8dde68ec39a94820f91098192202490d59e2abda49af03737db39d2bfdd6b009a65824f1d WHIRLPOOL 8486f8ba5f61c441cae76531bb3e16962b934e0db495db3e6afc8228d38336201f1f2f5ce712a0d29363a4e77373c619b49c9f3bf26104a97d8350e5f27e9477
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..99a5a4512e47
--- /dev/null
+++ b/media-sound/fmdrv/fmdrv-1.0.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/fmdrv/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/fmtools/Manifest b/media-sound/fmtools/Manifest
new file mode 100644
index 000000000000..fd0eaac22221
--- /dev/null
+++ b/media-sound/fmtools/Manifest
@@ -0,0 +1 @@
+DIST fmtools-2.0.7.tar.gz 113250 SHA256 75174e07d8cde6d4a8a5d7bbaa3a3b0760a850e7f6840cb7c6246227b18f5a39 SHA512 d63790cecaad8c3724e66c11820a15654f8c11399b154412f07b931c50b2b4852fcc74df7611d3374af2ec228db21bd5be7653abe3cb42b5c00cce0ccb32fb51 WHIRLPOOL fcd4ad77dbf4045dc30414041330dd177e901b55d3291fd033391b93d75fe5caf576773888f9eca71a62ca83e0bfa3de86650c16de3bac8f11fbde666d99ccb2
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..33a53d25fb3b
--- /dev/null
+++ b/media-sound/fmtools/fmtools-2.0.7.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/fmtools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/forked-daapd/Manifest b/media-sound/forked-daapd/Manifest
new file mode 100644
index 000000000000..fac1baf27345
--- /dev/null
+++ b/media-sound/forked-daapd/Manifest
@@ -0,0 +1 @@
+DIST 23.2.tar.gz 325895 SHA256 8a85dfc479cfb3aeb01f5cec7f782b9eee749121f2d8a2b30932de9fbb31d19c SHA512 11b5c6c16c0c9e20f1c196941cd09602d90b5e2ed0765e4fac25c6aeba388706bd7ede9f6c467227c245f2597466e8658f9db75073ee8b47b16f947514eb1511 WHIRLPOOL 05fd527a3ae57bb3ff3bf11b455bd926ee76d4358a569da674745a6e2b30343a35bc40cc44c90aaa10b70f496ddbf99e0975910b8ab3f759cc43929a0d19119f
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..cc3c8e8d6e6e
--- /dev/null
+++ b/media-sound/forked-daapd/files/daapd.initd
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+
+# 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.ebuild b/media-sound/forked-daapd/forked-daapd-23.2.ebuild
new file mode 100644
index 000000000000..1a759656c323
--- /dev/null
+++ b/media-sound/forked-daapd/forked-daapd-23.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# 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"
+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-libs/antlr-c-3.1.3
+	dev-db/sqlite:3
+	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
+	virtual/jre
+	${RDEPEND}
+"
+
+pkg_setup() {
+	enewuser daapd
+	enewgroup daapd
+}
+
+src_prepare() {
+	# Required until upstream accepts https://github.com/ejurgensen/forked-daapd/pull/179
+	epatch "${FILESDIR}/${P}-fix-arg-enable.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	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..d38687d58122
--- /dev/null
+++ b/media-sound/forked-daapd/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>
+		<email>erikmack@gmail.com</email>
+		<name>Erik Mackdanz</name>
+	</maintainer>
+	<maintainer>
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</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..756242d9b027
--- /dev/null
+++ b/media-sound/freebirth/Manifest
@@ -0,0 +1 @@
+DIST freebirth-0.3.2.tar.gz 2456900 RMD160 45d86fe5f8a8ad18c71d6814e0b844e32d9d3f60 SHA1 958673def46ec95980c97a3debebaf97a698c441 SHA256 8cdee757be747eae337826ec9ca9244798c36f75c82f10dfd2c09facfc623f96
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..b0e29fea2493
--- /dev/null
+++ b/media-sound/freebirth/freebirth-0.3.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+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 || die
+}
+
+src_install() {
+	dobin ${PN} || die
+
+	insinto /usr/share/${PN}/raw
+	doins raw/*.raw || die
+
+	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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/freebirth/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/freewheeling/Manifest b/media-sound/freewheeling/Manifest
new file mode 100644
index 000000000000..3bb3e764e76f
--- /dev/null
+++ b/media-sound/freewheeling/Manifest
@@ -0,0 +1 @@
+DIST fweelin-0.6-src.tar.bz2 474220 SHA256 6aead7b32866d174c5b49a2215a5f864f3e1d9042623670fae2b6ec9dfbcc6ab SHA512 2bcb4d75a772305d8993af550838082275d07735bbc9f7a8228ec51134525c1290af7c573e78f3bf3d6d992e619bbb1934298a820bd1fc5318385037260d477a WHIRLPOOL 54a77bff8de4269b6953e277adb8e6ee9cc621059ed9fdb06ba7c4d4f0186f9669e2d1a1b45fe4ccc5fc83e790f6297c899614ed0fb26b290b043d72544cec91
diff --git a/media-sound/freewheeling/freewheeling-0.6.ebuild b/media-sound/freewheeling/freewheeling-0.6.ebuild
new file mode 100644
index 000000000000..5287b1cce2f3
--- /dev/null
+++ b/media-sound/freewheeling/freewheeling-0.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit autotools multilib
+
+MY_P=fweelin-${PV/_}
+
+DESCRIPTION="A live looping instrument using SDL and jack"
+HOMEPAGE="http://freewheeling.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="fluidsynth"
+
+RDEPEND="dev-libs/libxml2
+	media-libs/alsa-lib
+	media-libs/freetype:2
+	media-libs/libvorbis
+	media-libs/libsdl[sound,video,joystick]
+	media-libs/libsndfile
+	media-libs/sdl-gfx
+	media-libs/sdl-ttf
+	media-sound/jack-audio-connection-kit
+	net-libs/gnutls
+	x11-libs/libX11
+	fluidsynth? ( media-sound/fluidsynth )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -i -e 's:-L/usr/X11R6/lib::' configure.ac || die
+
+	sed -i \
+		-e '/CFLAGS/s:-g::' \
+		-e '/CFLAGS/s:-funroll-loops.*::' \
+		-e "s:local/lib/jack:$(get_libdir)/jack:" \
+		src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable fluidsynth) \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TUNING
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/media-sound/freewheeling/metadata.xml b/media-sound/freewheeling/metadata.xml
new file mode 100644
index 000000000000..d0cb3eb7115f
--- /dev/null
+++ b/media-sound/freewheeling/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<use>
+		<flag name="fluidsynth">compile with support for fluidsynth</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">freewheeling</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
new file mode 100644
index 000000000000..76efcc818112
--- /dev/null
+++ b/media-sound/frescobaldi/Manifest
@@ -0,0 +1,2 @@
+DIST frescobaldi-2.0.16.tar.gz 3861027 SHA256 d8e89a662da45ae6c514365a4eb6895419f8058014f5393041988a55f05eea8a SHA512 7f04b84ec73ee84094ef8c11ef546a111b3c795dff9611a0627180b6509103c7505e5799a3ad0dd8d4d54dca2596f34835dca0018f78fe55966665c5eb14f3ab WHIRLPOOL 3c1d2f9d79ab04536664176d834014d5daab73d115961913b40c247dfe142cbf95761e44043ccfd914dc6cf64eb307d29fba0cb128afd44c3c345e1cb6edcd9a
+DIST frescobaldi-2.18.tar.gz 4075233 SHA256 6531a6425a0b0a471fb0845098e9c890e59d6379636ed79b4512a48599327d4b SHA512 31c0f3d96e26f2b2a8383b25f56e89493f115bc7a60478a05be8c6f8e7f9189592ea106a366c999293e96c7860811cfe7505906f8f625a54c3ad58a9a428700a WHIRLPOOL de89589068258a421491b312f4928ed787921bf4b1f982ed31bd881f9ed59b7990cc2f2ccfb47a9cd054a19d545ae31a746dcb000267f37701a1552517be59a1
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..69072b1ad8f6
--- /dev/null
+++ b/media-sound/frescobaldi/frescobaldi-2.0.16.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.ebuild b/media-sound/frescobaldi/frescobaldi-2.18.ebuild
new file mode 100644
index 000000000000..819e32119157
--- /dev/null
+++ b/media-sound/frescobaldi/frescobaldi-2.18.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+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? ( $(python_gen_cond_dep 'media-libs/portmidi[${PYTHON_USEDEP}]' python2_7) )"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	# Instructs install unconditionally for a Windows system
+	rm setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+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..cf9a3e330f8e
--- /dev/null
+++ b/media-sound/frescobaldi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <herd>python</herd>
+  <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..6f853c5fefca
--- /dev/null
+++ b/media-sound/galan/Manifest
@@ -0,0 +1 @@
+DIST galan-0.3.0_beta7.tar.gz 1138937 SHA256 1dfe1a876a73870afb530f1f9ea66735d73cf26fda9c881f2a1006b1dc155a07 SHA512 86ef525785c77c068146ea2cc4992091ad623bc43fde3603b00d9e8ef4583c0ecf60d061ab47386eb67dc7ef269a4631cdeb19317f3eeebf2fb2fc82c5b825a8 WHIRLPOOL ead23c582182a18c3a184507cdcbf5273f8a366a1fde2750dd17aa53abbbee9b8ef6360a9ba9ae6f9e3a77da5a49c779fd8b0bed324f8ce343ae05ce8df2f2e7
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..9fb11b6e3b59
--- /dev/null
+++ b/media-sound/galan/galan-0.3.0_beta7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..8fc1bf513343
--- /dev/null
+++ b/media-sound/galan/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..49776a398e01
--- /dev/null
+++ b/media-sound/gbsplay/Manifest
@@ -0,0 +1 @@
+DIST gbsplay-0.0.91.tar.gz 61071 SHA256 1b0eeb17fe4bde5fbc473457f9a27ba60947a03833b29bf5e4da86c42f2e91c4 SHA512 94a5acd892740f2443fbc5455a190cba2aefddf3608a6f59213175bb8985d21d4f2cb4011e332756ae2bf977432e03be53014f203d7b9edc572048e2a6124f08 WHIRLPOOL 5bd33fe126732ddaaaaf134b0e4b90ae34203fb748a728b6bd33bcbf84a48407be39cb22b67b6bd8f9156db37ff14d3820b33a54a6f0ab3f1ef4fa6b7fd0fcd2
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..7dfafd835b22
--- /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
+# $Id$
+
+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"
+
+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/metadata.xml b/media-sound/gbsplay/metadata.xml
new file mode 100644
index 000000000000..ae573a60407f
--- /dev/null
+++ b/media-sound/gbsplay/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/gejengel/Manifest b/media-sound/gejengel/Manifest
new file mode 100644
index 000000000000..1c405a2ba192
--- /dev/null
+++ b/media-sound/gejengel/Manifest
@@ -0,0 +1 @@
+DIST gejengel-0.1.4.tar.gz 473674 SHA256 036a4ff2520b6ff9f73fc3012d8810939583f0dc25be6bac28689dffb6e9023b SHA512 584a6250ec87475babbeff86c7f2427cf731b3ec0906dcc6219bf40cf1c5533feaf3f076d0f34daeaa21a1c2596e5fe53e4530820a6d47dbca7f9afd6f489580 WHIRLPOOL 0afd7138782f6337bf7aa770ae8dbddf3d037978ffabf6b7f9c5fedddd6e1a3354714d9d80e7414c27b8250be8f41d7476454f2c1408b8709d063e61774d316f
diff --git a/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg-1.patch b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg-1.patch
new file mode 100644
index 000000000000..10d43d3da1a4
--- /dev/null
+++ b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg-1.patch
@@ -0,0 +1,36 @@
+Index: gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp
+===================================================================
+--- gejengel-0.1.4.orig/src/AudioDecoder/ffmpegdecoder.cpp
++++ gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp
+@@ -83,7 +83,7 @@ void FFmpegDecoder::initialise()
+     avcodec_register_all();
+     av_register_all();
+ 
+-    if (av_open_input_file(&m_pFormatContext, m_Filepath.c_str(), NULL, 0, NULL) != 0)
++    if (avformat_open_input(&m_pFormatContext, m_Filepath.c_str(), NULL, NULL) != 0)
+     {
+         throw logic_error("Could not open input file: " + m_Filepath);
+     }
+@@ -307,21 +307,7 @@ AudioFormat FFmpegDecoder::getAudioForma
+ {
+     AudioFormat format;
+ 
+-    switch(m_pAudioCodecContext->sample_fmt)
+-    {
+-    case SAMPLE_FMT_U8:
+-        format.bits = 8;
+-        break;
+-    case SAMPLE_FMT_S16:
+-        format.bits = 16;
+-        break;
+-    case SAMPLE_FMT_S32:
+-        format.bits = 32;
+-        break;
+-    default:
+-        format.bits = 0;
+-    }
+-
++    format.bits             = av_get_bytes_per_sample(m_pAudioCodecContext->sample_fmt) << 3;
+     format.rate             = m_pAudioCodecContext->sample_rate;
+     format.numChannels      = m_pAudioCodecContext->channels;
+     format.framesPerPacket  = m_pAudioCodecContext->frame_size;
diff --git a/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg.patch b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg.patch
new file mode 100644
index 000000000000..658ff0ca675c
--- /dev/null
+++ b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg.patch
@@ -0,0 +1,13 @@
+Index: gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp
+===================================================================
+--- gejengel-0.1.4.orig/src/AudioDecoder/ffmpegdecoder.cpp
++++ gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp
+@@ -104,7 +104,7 @@ void FFmpegDecoder::initializeAudio()
+ {
+     for(uint32_t i = 0; i < m_pFormatContext->nb_streams; ++i)
+     {
+-        if (m_pFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
++        if (m_pFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+         {
+             m_pAudioStream = m_pFormatContext->streams[i];
+             m_AudioStream = i;
diff --git a/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg2.patch b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg2.patch
new file mode 100644
index 000000000000..b6850eb2e58d
--- /dev/null
+++ b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg2.patch
@@ -0,0 +1,24 @@
+Index: gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp
+===================================================================
+--- gejengel-0.1.4.orig/src/AudioDecoder/ffmpegdecoder.cpp
++++ gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp
+@@ -28,6 +28,10 @@ extern "C"
+     #include <libavcodec/avcodec.h>
+ }
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++
+ using namespace std;
+ using namespace utils;
+ 
+@@ -71,7 +75,7 @@ void FFmpegDecoder::destroy()
+ 
+     if (m_pFormatContext)
+     {
+-        av_close_input_file(m_pFormatContext);
++        avformat_close_input(&m_pFormatContext);
+         m_pFormatContext = NULL;
+     }
+ 
diff --git a/media-sound/gejengel/files/gejengel-0.1.4-libav9.patch b/media-sound/gejengel/files/gejengel-0.1.4-libav9.patch
new file mode 100644
index 000000000000..5529fb7308dc
--- /dev/null
+++ b/media-sound/gejengel/files/gejengel-0.1.4-libav9.patch
@@ -0,0 +1,21 @@
+diff -urN gejengel-0.1.4.old/src/AudioDecoder/ffmpegdecoder.cpp gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp
+--- gejengel-0.1.4.old/src/AudioDecoder/ffmpegdecoder.cpp	2013-06-22 18:48:46.176890946 +0200
++++ gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp	2013-06-22 18:50:04.516888158 +0200
+@@ -88,7 +88,7 @@
+         throw logic_error("Could not open input file: " + m_Filepath);
+     }
+ 
+-    if (av_find_stream_info(m_pFormatContext) < 0)
++    if (avformat_find_stream_info(m_pFormatContext, NULL) < 0)
+     {
+         throw logic_error("Could not find stream information in " + m_Filepath);
+     }
+@@ -134,7 +134,7 @@
+     m_pFormatContext->flags |= AVFMT_FLAG_GENPTS;
+     m_pFormatContext->streams[m_AudioStream]->discard = AVDISCARD_DEFAULT;
+ 
+-    if (avcodec_open(m_pAudioCodecContext, m_pAudioCodec) < 0)
++    if (avcodec_open2(m_pAudioCodecContext, m_pAudioCodec, NULL) < 0)
+     {
+         throw logic_error("Could not open audio codec for " + m_Filepath);
+     }
diff --git a/media-sound/gejengel/files/gejengel-0.1.4-libnotify-0.7.patch b/media-sound/gejengel/files/gejengel-0.1.4-libnotify-0.7.patch
new file mode 100644
index 000000000000..8026d89725c5
--- /dev/null
+++ b/media-sound/gejengel/files/gejengel-0.1.4-libnotify-0.7.patch
@@ -0,0 +1,26 @@
+--- src/Plugins/notificationplugin.cpp
++++ src/Plugins/notificationplugin.cpp
+@@ -33,6 +33,10 @@
+ #include "ui/sharedfunctions.h"
+ #include "MusicLibrary/album.h"
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ using namespace std;
+ using namespace Gtk;
+ 
+@@ -85,7 +89,12 @@
+         }
+     }
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++    m_pNotification = notify_notification_new("dummy", "", NULL);
++#else
+     m_pNotification = notify_notification_new("dummy", "", NULL, NULL);
++#endif
++
+     notify_notification_set_timeout (m_pNotification, NOTIFY_EXPIRES_DEFAULT);
+     notify_notification_set_urgency (m_pNotification, NOTIFY_URGENCY_NORMAL);
+ 
diff --git a/media-sound/gejengel/gejengel-0.1.4-r1.ebuild b/media-sound/gejengel/gejengel-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..db2015f6e1ff
--- /dev/null
+++ b/media-sound/gejengel/gejengel-0.1.4-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils multilib flag-o-matic
+
+DESCRIPTION="Lightweight audio player"
+HOMEPAGE="http://code.google.com/p/gejengel"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+alsa audioscrobbler debug dbus +ffmpeg flac libnotify mad openal pulseaudio syslog"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	dev-cpp/pangomm:1.4
+	media-libs/taglib
+	dev-db/sqlite:3
+	|| ( media-gfx/imagemagick[cxx]
+	media-gfx/graphicsmagick[imagemagick] )
+	mad? ( media-libs/libmad )
+	flac? ( media-libs/flac[cxx] )
+	ffmpeg? ( >=virtual/ffmpeg-9 )
+	audioscrobbler? ( >=media-libs/lastfmlib-0.4 )
+	dbus? ( dev-libs/dbus-glib )
+	libnotify? ( x11-libs/libnotify )
+	openal? ( media-libs/openal )
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	dev-libs/libxdg-basedir
+	dev-util/intltool
+	>=sys-devel/automake-1.11"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch \
+		"${FILESDIR}"/${P}-ffmpeg.patch \
+		"${FILESDIR}"/${P}-ffmpeg-1.patch \
+		"${FILESDIR}"/${P}-libav9.patch \
+		"${FILESDIR}"/${P}-ffmpeg2.patch
+	# Remove Vesion and Encoding from the desktop file
+	sed -i -e "/Version/d" -e "/Encoding/d" \
+		data/${PN}.desktop.in || die "sed failed"
+	append-cxxflags "-D__STDC_CONSTANT_MACROS"
+}
+
+src_configure() {
+	econf \
+		--disable-shared \
+		$(use_enable syslog logging) \
+		$(use_enable debug) \
+		$(use_enable openal) \
+		$(use_enable audioscrobbler lastfm) \
+		$(use_enable dbus) \
+		$(use_enable libnotify) \
+		$(use_enable mad) \
+		$(use_enable flac) \
+		$(use_enable ffmpeg) \
+		$(use_enable alsa) \
+		$(use_enable pulseaudio) \
+		--disable-unittests
+}
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	default
+	# The libgejengel.a is used by the package when building but shouldn't end
+	# up in the installation target
+	rm -f "${ED}"usr/$(get_libdir)/libgejengel.{a,la}
+}
diff --git a/media-sound/gejengel/metadata.xml b/media-sound/gejengel/metadata.xml
new file mode 100644
index 000000000000..d9fbae1396c9
--- /dev/null
+++ b/media-sound/gejengel/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="audioscrobbler">Enable track submission on last.fm</flag>
+	</use>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="google-code">gejengel</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/giada/Manifest b/media-sound/giada/Manifest
new file mode 100644
index 000000000000..8c778981d6a5
--- /dev/null
+++ b/media-sound/giada/Manifest
@@ -0,0 +1 @@
+DIST giada-0.7.0.tar.gz 200738 SHA256 493b9d7d8055ac617ef08816a44ba584c1dd429c3c01ca52877cc8163e9f3c15 SHA512 72bea7b2cced2a2ce7fe5705e0c3eea912fa58c561be8e3ae92dafb08ef7d4cedefea268ce4c71dfca1140c7e70a9bd6f5dd12b2991a8a8321d76e44bc9192d2 WHIRLPOOL 7d2aa21bb157eb9f8d1fc46b21fa02982ca6a0415b083cce2907c05fccc8e0a787ca401dcf1a3b3f3ab4624512eb622d15635566a62dbb4c62f4a444e61c58dc
diff --git a/media-sound/giada/files/giada-0.5.4-flags.patch b/media-sound/giada/files/giada-0.5.4-flags.patch
new file mode 100644
index 000000000000..17e013ccd2fe
--- /dev/null
+++ b/media-sound/giada/files/giada-0.5.4-flags.patch
@@ -0,0 +1,10 @@
+--- giada-0.5.4/src/Makefile.am
++++ giada-0.5.4/src/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-AM_CXXFLAGS = -Wall -pedantic -Werror
++AM_CXXFLAGS = -Wall -pedantic
+ 
+ # aeffect.h (header from VST SDK) uses 'long long' which is not supported
+ # in ISO C++ 1998 and -Werror flag breaks the compilation.
diff --git a/media-sound/giada/files/giada-0.5.8-configure.patch b/media-sound/giada/files/giada-0.5.8-configure.patch
new file mode 100644
index 000000000000..c92ce0a1cc1b
--- /dev/null
+++ b/media-sound/giada/files/giada-0.5.8-configure.patch
@@ -0,0 +1,50 @@
+--- giada-0.5.8/configure.ac
++++ giada-0.5.8/configure.ac
+@@ -52,6 +52,27 @@
+   [AC_DEFINE(WITH_VST)]
+ )
+ 
++AC_ARG_ENABLE(
++	alsa,
++	AS_HELP_STRING([--disable-alsa], [disable alsa support]),
++  [AC_DEFINE(WITH_ALSA)]
++)
++AM_CONDITIONAL(ALSA, test "x$enable_alsa" = "xtrue")
++
++AC_ARG_ENABLE(
++	jack,
++	AS_HELP_STRING([--enable-jack], [enable jack support]),
++  [AC_DEFINE(WITH_JACK)]
++)
++AM_CONDITIONAL(JACK, test "x$enable_jack" = "xtrue")
++
++AC_ARG_ENABLE(
++	pulse,
++	AS_HELP_STRING([--enable-pulse], [enable pulseaudio support]),
++  [AC_DEFINE(WITH_PULSE)]
++)
++AM_CONDITIONAL(PULSE, test "x$enable_pulse" = "xtrue")
++
+ # ----------------------------------------------------------------------
+ 
+ # Checks for programs.
+--- giada-0.5.8/src/Makefile.am
++++ giada-0.5.8/src/Makefile.am
+@@ -39,7 +39,16 @@
+ # inside configure.ac
+ if LINUX
+ giada_LDADD = -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -lrtaudio  \
+-						  -ljack -lasound -lpthread -ldl -lpulse-simple -lsamplerate
++						  -lpthread -ldl -lsamplerate
++if ALSA
++giada_LDADD += -lasound
++endif
++if JACK
++giada_LDADD += -ljack
++endif
++if PULSE
++giada_LDADD += -lpulse-simple
++endif
+ endif
+ if WINDOWS
+ giada_LDADD   = -lole32 -lrtaudio -ldsound -lwinmm -lwsock32 -lm       \
diff --git a/media-sound/giada/giada-0.7.0.ebuild b/media-sound/giada/giada-0.7.0.ebuild
new file mode 100644
index 000000000000..867557fb1a41
--- /dev/null
+++ b/media-sound/giada/giada-0.7.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic eutils autotools
+
+DESCRIPTION="A free, minimal, hardcore audio tool for DJs and live performers"
+HOMEPAGE="http://www.giadamusic.com/"
+SRC_URI="http://www.giadamusic.com/download-action.php?os=source&version=${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack pulseaudio"
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+RDEPEND="media-libs/libsndfile
+	>=media-libs/libsamplerate-0.1.8
+	media-libs/rtaudio[alsa?,jack?,pulseaudio?]
+	x11-libs/fltk:1
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}-src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.4-flags.patch
+	epatch "${FILESDIR}"/${PN}-0.5.8-configure.patch
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags $(fltk-config --cflags)
+	append-ldflags $(fltk-config --ldflags)
+
+	econf \
+		--target=linux \
+		$(use_enable alsa) \
+		$(use_enable jack) \
+		$(use_enable pulseaudio pulse)
+}
diff --git a/media-sound/giada/metadata.xml b/media-sound/giada/metadata.xml
new file mode 100644
index 000000000000..0dc3775f83d7
--- /dev/null
+++ b/media-sound/giada/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+</pkgmetadata>
diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
new file mode 100644
index 000000000000..cb2d41bed699
--- /dev/null
+++ b/media-sound/gigedit/Manifest
@@ -0,0 +1 @@
+DIST gigedit-0.2.0.tar.gz 810112 SHA256 e7e73a1c896eea8483ff5d4e340054271ce41330b0dd7e15ee62369cbd63365e
diff --git a/media-sound/gigedit/gigedit-0.2.0.ebuild b/media-sound/gigedit/gigedit-0.2.0.ebuild
new file mode 100644
index 000000000000..1216b41e9d9f
--- /dev/null
+++ b/media-sound/gigedit/gigedit-0.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+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_compile() {
+	# fails with parallel jobs
+	emake -j1 || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-sound/gigedit/metadata.xml b/media-sound/gigedit/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/gigedit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/gimmix/Manifest b/media-sound/gimmix/Manifest
new file mode 100644
index 000000000000..daed10d75d31
--- /dev/null
+++ b/media-sound/gimmix/Manifest
@@ -0,0 +1,2 @@
+DIST gimmix-0.5.7.1.tar.bz2 330368 SHA256 f504e19615fe2032b958d14a88504fbf9c2684ccad3cbe0b177068173e538cba SHA512 03187d423afc97e9eec014603518a35795ac3d240e68c888a39c97a790be1cf5a838cd70d71df2ee455e5f437bc74689e5fd2cf3695e0e1d805fde60d9b0e26b WHIRLPOOL ace795cf2b588011e7c7a5b3bdcf4043de2f00e101245866a3990550eaa4ed0877c8b7344df1995b5e8e67515278e064b47da0a46dedfbf8ba47755bcdeaf2cb
+DIST gimmix-0.5.7.2.tar.bz2 497249 SHA256 860588d13d66631e52ee57e6b31dfbf5f1493e2be3a4649231a7cf3c8d56ee27 SHA512 1e2df9bb4ad8286d6a03d6ab41a231f1a994df5eb4e0190ace83bc5683c69c9a6ff8fae1da473be2c0c050461c9a24e2fc1e111027ea7ce21a7c12472a761b21 WHIRLPOOL ceb0f8b250189333dca10cbc4fcc86918e6924b697d37986e765fb25264127718c2a8e76b784b928b45a1d1543010ff01fd5cd242b253d021d8cbd2ad6c1291b
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.1-symbol-collision.patch b/media-sound/gimmix/files/gimmix-0.5.7.1-symbol-collision.patch
new file mode 100644
index 000000000000..631a891647bf
--- /dev/null
+++ b/media-sound/gimmix/files/gimmix-0.5.7.1-symbol-collision.patch
@@ -0,0 +1,172 @@
+diff --git a/src/gimmix-playlist.c b/src/gimmix-playlist.c
+index cd63f58..661a47f 100644
+--- a/src/gimmix-playlist.c
++++ b/src/gimmix-playlist.c
+@@ -38,9 +38,9 @@ typedef enum {
+ } GimmixColumnType;
+ 
+ typedef enum {
+-	SONG = 1,
+-	DIR,
+-	PLAYLIST
++	GFT_SONG = 1,
++	GFT_DIR,
++	GFT_PLAYLIST
+ } GimmixFileType;
+ 
+ enum { TARGET_STRING, TARGET_ROOTWIN };
+@@ -149,7 +149,7 @@ on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *
+ 		gtk_tree_model_get_iter (model, &iter, list->data);
+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
+ 		
+-		if (type == DIR || type == SONG)
++		if (type == GFT_DIR || type == GFT_SONG)
+ 		{
+ 			switch (target_type)
+ 			{
+@@ -671,7 +671,7 @@ gimmix_library_and_playlists_populate (void)
+ 						GDK_TYPE_PIXBUF, 	/* icon (0) */
+ 						G_TYPE_STRING, 		/* name (1) */
+ 						G_TYPE_STRING,		/* path (2) */
+-						G_TYPE_INT,			/* type DIR/SONG (3) */
++						G_TYPE_INT,			/* type GFT_DIR/GFT_SONG (3) */
+ 						G_TYPE_INT);		/* id (4) */
+ 	
+ 	pls_store 	= gtk_list_store_new (2, 
+@@ -696,7 +696,7 @@ gimmix_library_and_playlists_populate (void)
+ 						0, dir_pixbuf,
+ 						1, path,
+ 						2, data->directory,
+-						3, DIR,
++						3, GFT_DIR,
+ 						-1);
+ 			g_free (path);
+ 		}
+@@ -722,7 +722,7 @@ gimmix_library_and_playlists_populate (void)
+ 						0, song_pixbuf,
+ 						1, title,
+ 						2, data->song->file,
+-						3, SONG,
++						3, GFT_SONG,
+ 						-1);
+ 			g_free (title);
+ 		}
+@@ -838,7 +838,7 @@ gimmix_library_search (gint type, gchar *text)
+ 								0, song_pixbuf,
+ 								1, title,
+ 								2, data->song->file,
+-								3, SONG,
++								3, GFT_SONG,
+ 								-1);
+ 			g_free (title);
+ 		}
+@@ -954,11 +954,11 @@ cb_library_dir_activated (gpointer data)
+ 		gtk_tree_model_get_iter (model, &iter, list->data);
+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
+ 		
+-		if (type == DIR)
++		if (type == GFT_DIR)
+ 		{	
+ 			gimmix_update_library_with_dir (path);
+ 		}
+-		else if (type == SONG)
++		else if (type == GFT_SONG)
+ 		{
+ 			mpd_playlist_add (gmo, path);
+ 			added = true;
+@@ -1005,11 +1005,11 @@ cb_library_popup_add_clicked (GtkWidget *widget, gpointer data)
+ 		gtk_tree_model_get_iter (model, &iter, list->data);
+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
+ 		
+-		if (type == DIR)
++		if (type == GFT_DIR)
+ 		{
+ 			mpd_playlist_queue_add (gmo, path);
+ 		}
+-		else if (type == SONG)
++		else if (type == GFT_SONG)
+ 		{
+ 			mpd_playlist_add (gmo, path);
+ 		}
+@@ -1023,13 +1023,13 @@ cb_library_popup_add_clicked (GtkWidget *widget, gpointer data)
+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
+ 	
+ 		
+-		if (type == DIR)
++		if (type == GFT_DIR)
+ 		{	
+ 			mpd_playlist_queue_add (gmo, path);
+ 			g_free (path);
+ 		}
+ 		
+-		if (type == SONG)
++		if (type == GFT_SONG)
+ 		{
+ 			mpd_playlist_queue_add (gmo, path);
+ 			g_free (path);
+@@ -1081,11 +1081,11 @@ cd_library_popup_replace_clicked (GtkWidget *widget, gpointer data)
+ 		gtk_tree_model_get_iter (model, &iter, list->data);
+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
+ 		
+-		if (type == DIR)
++		if (type == GFT_DIR)
+ 		{
+ 			mpd_playlist_queue_add (gmo, path);
+ 		}
+-		else if (type == SONG)
++		else if (type == GFT_SONG)
+ 		{
+ 			mpd_playlist_add (gmo, path);
+ 		}
+@@ -1099,13 +1099,13 @@ cd_library_popup_replace_clicked (GtkWidget *widget, gpointer data)
+ 		gtk_tree_model_get (model, &iter, 2, &path, 3, &type, -1);
+ 	
+ 		
+-		if (type == DIR)
++		if (type == GFT_DIR)
+ 		{	
+ 			mpd_playlist_queue_add (gmo, path);
+ 			g_free (path);
+ 		}
+ 		
+-		if (type == SONG)
++		if (type == GFT_SONG)
+ 		{
+ 			mpd_playlist_queue_add (gmo, path);
+ 			g_free (path);
+@@ -1245,7 +1245,7 @@ gimmix_update_library_with_dir (gchar *dir)
+ 					0, dir_pixbuf,
+ 					1, "..",
+ 					2, parent,
+-					3, DIR,
++					3, GFT_DIR,
+ 					-1);
+ 		g_free (parent);
+ 	}
+@@ -1260,7 +1260,7 @@ gimmix_update_library_with_dir (gchar *dir)
+ 								0, dir_pixbuf,
+ 								1, directory,
+ 								2, data->directory,
+-								3, DIR,
++								3, GFT_DIR,
+ 								-1);
+ 			g_free (directory);
+ 		}
+@@ -1285,7 +1285,7 @@ gimmix_update_library_with_dir (gchar *dir)
+ 								0, song_pixbuf,
+ 								1, title,
+ 								2, data->song->file,
+-								3, SONG,
++								3, GFT_SONG,
+ 								-1);
+ 			g_free (title);
+ 		}
+@@ -1341,7 +1341,7 @@ gimmix_library_song_info (void)
+ 	gtk_tree_model_get_iter (model, &iter, list->data);
+ 	gtk_tree_model_get (model, &iter, 2, &path, 3, &type, 4, &id, -1);
+ 
+-	if (type == DIR)
++	if (type == GFT_DIR)
+ 	{
+ 		g_free (path);
+ 		return;
diff --git a/media-sound/gimmix/gimmix-0.5.7.1.ebuild b/media-sound/gimmix/gimmix-0.5.7.1.ebuild
new file mode 100644
index 000000000000..ec9f2340f5ed
--- /dev/null
+++ b/media-sound/gimmix/gimmix-0.5.7.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="a graphical music player daemon (MPD) client using GTK+2"
+HOMEPAGE="https://code.google.com/p/gimmix/"
+SRC_URI="mirror://gentoo/${PN}/${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}"/${P}-curl-headers.patch \
+		"${FILESDIR}"/${P}-symbol-collision.patch
+}
+
+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..fd403f9cea28
--- /dev/null
+++ b/media-sound/gimmix/gimmix-0.5.7.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="a graphical music player daemon (MPD) client using GTK+2"
+HOMEPAGE="https://code.google.com/p/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..55888bda0012
--- /dev/null
+++ b/media-sound/gimmix/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<maintainer>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</name>
+	</maintainer>
+	<use>
+		<flag name='cover'>Enable cover art fetching</flag>
+		<flag name='lyrics'>Enable lyric fetching</flag>
+	</use>
+</pkgmetadata>
+
diff --git a/media-sound/glmix/Manifest b/media-sound/glmix/Manifest
new file mode 100644
index 000000000000..ac8b5f9b4884
--- /dev/null
+++ b/media-sound/glmix/Manifest
@@ -0,0 +1 @@
+DIST glmix-0.3.tar.gz 17500 SHA256 901bbd5817e9a49426c2a143c09a251b83907e2a8f621ba231c19549e90884a8
diff --git a/media-sound/glmix/glmix-0.3.ebuild b/media-sound/glmix/glmix-0.3.ebuild
new file mode 100644
index 000000000000..6569c728b2af
--- /dev/null
+++ b/media-sound/glmix/glmix-0.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="${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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/glmix/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/glurp/Manifest b/media-sound/glurp/Manifest
new file mode 100644
index 000000000000..b21952d81eac
--- /dev/null
+++ b/media-sound/glurp/Manifest
@@ -0,0 +1 @@
+DIST glurp-0.12.3.tar.gz 166976 SHA256 c145a58008c642ddb48db9ff9e68f1869b9d7e3a91b95885c587bb3c2085461e
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..4ebcd5b34abc
--- /dev/null
+++ b/media-sound/glurp/glurp-0.12.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Glurp is a GTK2 based graphical client for the Music Player Daemon"
+HOMEPAGE="http://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..65f6531b04b5
--- /dev/null
+++ b/media-sound/glurp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..35cc1ef8984b
--- /dev/null
+++ b/media-sound/gmorgan/Manifest
@@ -0,0 +1,2 @@
+DIST gmorgan-0.70.tar.gz 7010268 SHA256 be9da04dffecb879583eab221217a40ecec3dea22b5538f10cd65191a87abe01 SHA512 d003b8e06707b6e3d707caa368f916a932a3e2f21927c90f3918e28705d2185d56661aa5fd937370b8f5c23ef1873510fd6848d7eba6ee4aa57df1a608cda3b6 WHIRLPOOL 9557eac232201a0a75d26d8d50a04fa96afb17d077d0836d7e7220457d37868c565a3497125453990f18c087d9298319f999075102a62dfef180fa9e9decf915
+DIST gmorgan_0.39.tar.gz 1370780 SHA256 37f6c3d4b43c415e0edaf5d8acc80d7a60fb9318f684acde0eaa723f3ef58b56
diff --git a/media-sound/gmorgan/files/gmorgan-0.70-cxxflags.patch b/media-sound/gmorgan/files/gmorgan-0.70-cxxflags.patch
new file mode 100644
index 000000000000..61225fc07c29
--- /dev/null
+++ b/media-sound/gmorgan/files/gmorgan-0.70-cxxflags.patch
@@ -0,0 +1,11 @@
+--- gmorgan-0.70/configure.in
++++ gmorgan-0.70/configure.in
+@@ -15,7 +15,7 @@
+ 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/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..02b20c629a76
--- /dev/null
+++ b/media-sound/gmorgan/gmorgan-0.39.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.70.ebuild b/media-sound/gmorgan/gmorgan-0.70.ebuild
new file mode 100644
index 000000000000..74c9a8b17a88
--- /dev/null
+++ b/media-sound/gmorgan/gmorgan-0.70.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils
+
+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 )"
+
+DOCS=(AUTHORS ChangeLog NEWS README)
+
+PATCHES=( "${FILESDIR}/${P}-cxxflags.patch" )
+
+src_configure() {
+	econf \
+		$(use_enable nls)
+}
diff --git a/media-sound/gmorgan/metadata.xml b/media-sound/gmorgan/metadata.xml
new file mode 100644
index 000000000000..f507623abb56
--- /dev/null
+++ b/media-sound/gmorgan/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<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..a23408083d47
--- /dev/null
+++ b/media-sound/gmpc/Manifest
@@ -0,0 +1 @@
+DIST gmpc-11.8.16.tar.gz 7082909 SHA256 a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c SHA512 4e5c8112edc016ac6c472b0099347a4fcd0336022e15be8d76fae449d30e533df92a4379aa98e389e624b9910ff3f528afb682f64901ea53f09e00d3d5678623 WHIRLPOOL 4703e62bf6e23b6bdbb6be19fbc7c99e0461dc19f6cdc582653cdc680340544239d5d41aa6033884e46bb277ee3c9e676f0a8fa6bf5e8051c2465b771fbd18d6
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 100755
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..50a7b101c362
--- /dev/null
+++ b/media-sound/gmpc/gmpc-11.8.16-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/gmpc-11.8.16.ebuild b/media-sound/gmpc/gmpc-11.8.16.ebuild
new file mode 100644
index 000000000000..79fd7737f110
--- /dev/null
+++ b/media-sound/gmpc/gmpc-11.8.16.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	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..969d55282588
--- /dev/null
+++ b/media-sound/gmpc/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+<maintainer>
+	<email>angelos@gentoo.org</email>
+	<name>Christoph Mende</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..33e5f42b19cc
--- /dev/null
+++ b/media-sound/gmtp/Manifest
@@ -0,0 +1,2 @@
+DIST gmtp-1.3.5.tar.gz 1613492 SHA256 ae6950d7157e6b90a46f0f850085c5e2fba628e9e58ba493ba164eb3405f55d3 SHA512 5e6f4b4f5dff0d9d5a2b477a8b174958d660bca046b8904b019540b9fc975be974e3dd261c4ee00ea00a023227a9f641911b46bb94dd7b00ff5354bbb5bdae6a WHIRLPOOL 2fa7747418d1e8a7ba0d8bb661d100e8e9953ec938d4af7e70c82d6dd94c0c714403d5e0cfa3d0b956aa8f940d7991d24e30e99bdafe5b6ff7238425fe0e792b
+DIST gmtp-1.3.9.tar.gz 489612 SHA256 5bff5385db66f5c3e82d89edb7ca4a8ccb8c8954faf7341438080f2741dcbd2d SHA512 e5fc652105d23719cb366bb9292c1520cc0a0e4c10179fec6108145c32725ea2a8e47b10c0bee415327718b3d9e2c2f84e0fda6225e57b472d9eabe4fcb615e0 WHIRLPOOL ca95a0b1a194a6c40bd20916614a75b77f6bf525179fb81bdb8c4788edc0127b0552427e82e335d119907864822f58917be6c07463225f5a17a0ce7c0b001ae0
diff --git a/media-sound/gmtp/gmtp-1.3.5.ebuild b/media-sound/gmtp/gmtp-1.3.5.ebuild
new file mode 100644
index 000000000000..8e04c0967efc
--- /dev/null
+++ b/media-sound/gmtp/gmtp-1.3.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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/gmtp-1.3.9.ebuild b/media-sound/gmtp/gmtp-1.3.9.ebuild
new file mode 100644
index 000000000000..0cd14c7fb2fd
--- /dev/null
+++ b/media-sound/gmtp/gmtp-1.3.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..cfe9c2c04f39
--- /dev/null
+++ b/media-sound/gmtp/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>
+    <email>tomka@gentoo.org</email>
+    <name>Thomas Kahle</name>
+  </maintainer>
+  <herd>sound</herd>
+  <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..7a103e11dd96
--- /dev/null
+++ b/media-sound/gmusicbrowser/Manifest
@@ -0,0 +1,2 @@
+DIST gmusicbrowser-1.1.13.tar.gz 2083888 SHA256 0da5eeff037fe61e3f63723e5eba7f7f28018d7a81c7ab334a450dc28d8ab341 SHA512 65f070161b85b1a91d0d856b1886c90f3090d0da4fb83b6fcb99d5bb024f401c62e1b9b52cc1bcf5a487dc675d20b360e3f25a09931f664cb2496c7f891ced4f WHIRLPOOL f4d7af9599944a416b6ee7abe15fe6cb7cb58bcdf85507e26cd97438ab3ed396e3fa5598842efb289debe11abf37fefe56209b11fb2af7b5e0c9c1bc4f0630d1
+DIST gmusicbrowser-1.1.14.tar.gz 2252178 SHA256 c1064ca4247470158469f2d0e73f0ecc6ccb4b280cbaa709e20ba81efcfba956 SHA512 fedf8125833f3f7cbd9b1a4d4adc2cf989788d39f1a6beb72ce88fe409cf28861a6093b91332fd836175ade045b90a22c0c516f46e99a0fd73566fabf52be156 WHIRLPOOL cb9d6496a550dcf648087b88d60288cf7c65d72e01dd60c200a0ee30058d01bf9b23d99e9628a1350f977b92b0493bf9d1f2d26651b3d323ec3c69546d07f11e
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.13.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.13.ebuild
new file mode 100644
index 000000000000..79f4d4f5b5ec
--- /dev/null
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.13.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime gnome2-utils
+
+DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
+HOMEPAGE="http://gmusicbrowser.org/"
+SRC_URI="http://${PN}.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+GSTREAMER_DEPEND="
+	dev-perl/GStreamer
+	dev-perl/GStreamer-Interfaces
+	media-plugins/gst-plugins-meta:0.10"
+MPLAYER_DEPEND="media-video/mplayer"
+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-perl
+	virtual/perl-MIME-Base64
+	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
+	|| (
+		( ${GSTREAMER_DEPEND} )
+		( ${MPLAYER_DEPEND} )
+		( ${OTHER_DEPEND} )
+	)"
+DEPEND="sys-devel/gettext"
+
+src_install() {
+	emake \
+		DOCS="AUTHORS NEWS README" \
+		DESTDIR="${D}" \
+		iconsdir="${D}/usr/share/icons/hicolor/32x32/apps" \
+		liconsdir="${D}/usr/share/icons/hicolor/48x48/apps" \
+		miconsdir="${D}/usr/share/pixmaps" \
+		install
+
+	dohtml layout_doc.html
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "Gmusicbrowser supports gstreamer, mplayer and mpg123/ogg123..."
+	elog "for audio playback. Needed dependencies:"
+	elog "Gstreamer: ${GSTREAMER_DEPEND}"
+	elog "mplayer: ${MPLAYER_DEPEND}"
+	elog "mpg123/ogg123...: ${OTHER_DEPEND}"
+	elog
+	elog "This ebuild just ensures at least one implementation is installed!"
+	elog
+	elog "other optional dependencies:"
+	elog "	dev-perl/Net-DBus (for dbus support and mpris1/2 plugins)"
+	elog "	dev-perl/Gtk2-WebKit (for Web context plugin)"
+	elog "	dev-perl/Gtk2-Notify (for Notify plugin)"
+	elog "	dev-perl/gnome2-wnck (for Titlebar plugin)"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/gmusicbrowser/gmusicbrowser-1.1.14.ebuild b/media-sound/gmusicbrowser/gmusicbrowser-1.1.14.ebuild
new file mode 100644
index 000000000000..42a08999955f
--- /dev/null
+++ b/media-sound/gmusicbrowser/gmusicbrowser-1.1.14.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime gnome2-utils
+
+DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
+HOMEPAGE="http://gmusicbrowser.org/"
+SRC_URI="http://${PN}.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+GSTREAMER_DEPEND="
+	dev-perl/GStreamer
+	dev-perl/GStreamer-Interfaces
+	media-plugins/gst-plugins-meta:0.10"
+MPLAYER_DEPEND="media-video/mplayer"
+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-perl
+	virtual/perl-MIME-Base64
+	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
+	|| (
+		( ${GSTREAMER_DEPEND} )
+		( ${MPLAYER_DEPEND} )
+		( ${OTHER_DEPEND} )
+	)"
+DEPEND="sys-devel/gettext"
+
+src_install() {
+	emake \
+		DOCS="AUTHORS NEWS README" \
+		DESTDIR="${D}" \
+		iconsdir="${D}/usr/share/icons/hicolor/32x32/apps" \
+		liconsdir="${D}/usr/share/icons/hicolor/48x48/apps" \
+		miconsdir="${D}/usr/share/pixmaps" \
+		install
+
+	dohtml layout_doc.html
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "Gmusicbrowser supports gstreamer, mplayer and mpg123/ogg123..."
+	elog "for audio playback. Needed dependencies:"
+	elog "Gstreamer: ${GSTREAMER_DEPEND}"
+	elog "mplayer: ${MPLAYER_DEPEND}"
+	elog "mpg123/ogg123...: ${OTHER_DEPEND}"
+	elog
+	elog "This ebuild just ensures at least one implementation is installed!"
+	elog
+	elog "other optional dependencies:"
+	elog "	dev-perl/Net-DBus (for dbus support and mpris1/2 plugins)"
+	elog "	dev-perl/Gtk2-WebKit (for Web context plugin)"
+	elog "	dev-perl/Gtk2-Notify (for Notify plugin)"
+	elog "	dev-perl/gnome2-wnck (for Titlebar plugin)"
+}
+
+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..7975b1fef710
--- /dev/null
+++ b/media-sound/gmusicbrowser/gmusicbrowser-9999.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fdo-mime git-2 gnome2-utils
+
+DESCRIPTION="An open-source jukebox for large collections of mp3/ogg/flac files"
+HOMEPAGE="http://gmusicbrowser.org/"
+EGIT_REPO_URI="git://github.com/squentin/${PN}.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+GSTREAMER_DEPEND="
+	dev-perl/GStreamer
+	dev-perl/GStreamer-Interfaces
+	media-plugins/gst-plugins-meta:0.10"
+MPLAYER_DEPEND="media-video/mplayer"
+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-perl
+	virtual/perl-MIME-Base64
+	|| ( net-misc/wget dev-perl/AnyEvent-HTTP )
+	|| (
+		( ${GSTREAMER_DEPEND} )
+		( ${MPLAYER_DEPEND} )
+		( ${OTHER_DEPEND} )
+	)"
+DEPEND="sys-devel/gettext
+	doc? ( dev-perl/Text-Markdown )"
+
+src_compile() {
+	emake MARKDOWN=$(usex doc "Markdown.pl" "echo")
+}
+
+src_install() {
+	emake \
+		DOCS="AUTHORS NEWS README" \
+		DESTDIR="${D}" \
+		iconsdir="${D}/usr/share/icons/hicolor/32x32/apps" \
+		liconsdir="${D}/usr/share/icons/hicolor/48x48/apps" \
+		miconsdir="${D}/usr/share/pixmaps" \
+		install
+
+	use doc && dohtml layout_doc.html
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	elog "Gmusicbrowser supports gstreamer, mplayer and mpg123/ogg123..."
+	elog "for audio playback. Needed dependencies:"
+	elog "Gstreamer: ${GSTREAMER_DEPEND}"
+	elog "mplayer: ${MPLAYER_DEPEND}"
+	elog "mpg123/ogg123...: ${OTHER_DEPEND}"
+	elog
+	elog "This ebuild just ensures at least one implementation is installed!"
+	elog
+	elog "other optional dependencies:"
+	elog "	dev-perl/Net-DBus (for dbus support and mpris1/2 plugins)"
+	elog "	dev-perl/Gtk2-WebKit (for Web context plugin)"
+	elog "	dev-perl/Gtk2-Notify (for Notify plugin)"
+	elog "	dev-perl/gnome2-wnck (for Titlebar plugin)"
+}
+
+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..3bf6bcfeb512
--- /dev/null
+++ b/media-sound/gmusicbrowser/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/gnac/Manifest b/media-sound/gnac/Manifest
new file mode 100644
index 000000000000..ee54c7ded314
--- /dev/null
+++ b/media-sound/gnac/Manifest
@@ -0,0 +1 @@
+DIST gnac-0.2.4.1.tar.bz2 929747 SHA256 8f9c4731bbc40fde57c311a2a7fabe4e3200198abfe7415c659b98a2d54869da SHA512 c474854222cc938d6ec081cdf5e8e8762e5618eca1c17dacaf8412970310ee50af2fad92501ba3b129f8756782fabd770e52656d6eead77d1a8ec0dd5f972f9b WHIRLPOOL b81588b4c13bd6920679d096b17c6af79a8d61d8b014654140451d65de150f1f295d50cd5ceb270067f45e52c358c8ff1f12511ea29486a0acd573fa0c71cb72
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..6ee40a00f04e
--- /dev/null
+++ b/media-sound/gnac/gnac-0.2.4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools 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 )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-nls.patch
+
+	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..4ad88e363608
--- /dev/null
+++ b/media-sound/gnac/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">gnac</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/gnaural/Manifest b/media-sound/gnaural/Manifest
new file mode 100644
index 000000000000..ab3e3f16fcc7
--- /dev/null
+++ b/media-sound/gnaural/Manifest
@@ -0,0 +1 @@
+DIST gnaural-1.0.20110606.tar.gz 414028 SHA256 c5efe082a10290cc0d5ed51a3abe67cfcbf6f77827c86bb709ae5719be56395d SHA512 328704fc082d826cf5a681ace8a32c426a3560046f8133ca5c726ad3a4e0071fffa81ffe4ccb4df2b6dad4cfcde6ad40ebea8aeb01e20a494bb7b965116a64c9 WHIRLPOOL 9461bf21aa2a67636742f90a25617bb87e876a7efe2cc4591d83eb97c4d527f0f6bd00e06a26dc309dce30d1deec9854961a2f9d2ab318a76124bbb329a8f8fa
diff --git a/media-sound/gnaural/gnaural-1.0.20110606.ebuild b/media-sound/gnaural/gnaural-1.0.20110606.ebuild
new file mode 100644
index 000000000000..0c9c8c80f53c
--- /dev/null
+++ b/media-sound/gnaural/gnaural-1.0.20110606.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit autotools gnome2
+
+DESCRIPTION="An opensource binaural-beat generator"
+HOMEPAGE="http://gnaural.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/Gnaural/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND="
+	>=x11-libs/gtk+-2:2
+	>=gnome-base/libglade-2
+	>=dev-libs/glib-2:2
+	>=media-libs/libsndfile-1.0.2
+	>=media-libs/portaudio-19_pre20071207
+"
+DEPEND="${RDEPEND}
+	nls? ( dev-util/intltool )
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	mv configure.in configure.ac || die #426262
+
+	# Install desktop file into xdg compliant location
+	sed -i -e 's@/gnome/apps/Multimedia@/applications@g' \
+		Makefile.am || die "Failed to sed Makefile.am"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable nls)
+}
diff --git a/media-sound/gnaural/metadata.xml b/media-sound/gnaural/metadata.xml
new file mode 100644
index 000000000000..b2cdca124c2b
--- /dev/null
+++ b/media-sound/gnaural/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>
+		<email>miknix@gentoo.org</email>
+		<name>Angelo Arrifano</name>
+	</maintainer>
+	<longdescription>
+		Gnaural is an opensource programmable auditory binaural-beat generator, implementing the principle described in the October 1973 Scientific American article "Auditory Beats in the Brain" by Gerald Oster. The theme of the article is that the processing of binaural beats involves different neural pathways than conventional hearing. Research inspired by the article went on to show that binaural beats can induce a "frequency-following response" (FFR) in brainwave activity.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">gnaural</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/gnomad/Manifest b/media-sound/gnomad/Manifest
new file mode 100644
index 000000000000..87ea50d357f5
--- /dev/null
+++ b/media-sound/gnomad/Manifest
@@ -0,0 +1 @@
+DIST gnomad2-2.9.6.tar.gz 318431 SHA256 74d423f4df1e71933ae31eb66724bed8027d7c4ca174a0221f6a1499e3735c9a SHA512 10f025ac38089ebc4a063ac25a262d3e2f6b72336c4566877fae311a873923b55d532d210fd2ec8a29013c06c806ddacc50f042546e4aaa5cf23228d09d854a1 WHIRLPOOL e09a00f86aa46ab36326bba69dde82c00e90b2f394306a0fa57f72b8cd4f34f59dcf7517efc145224186d5e0a91c6d233a189fa6186ccac69ba6169c85c7f71e
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..383bd6ac77c8
--- /dev/null
+++ b/media-sound/gnomad/gnomad-2.9.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..05ec0f5c79ec
--- /dev/null
+++ b/media-sound/gnomad/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..6c2cca991663
--- /dev/null
+++ b/media-sound/gnome-music/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-music-3.14.3.1.tar.xz 1466232 SHA256 9bf614cd790bc7abebe56c65f3acae56c90ea5488f97a41a8ef70bcbce42604a SHA512 ce394fdd6701f5da2b1ac1bf9ca66de706a335ac5022466260a4e5a76646a062f7b48cf27207baea37c29805b234fe0fabe34fe47cea33009b27dbc5aec54e9b WHIRLPOOL 0672023af6dc95da76c78030bfb88c3f74ae127c69715cfc624d1391c5a651808a32203e6a7e20e6408977f610c23c3153ca71616fde21b3dfb290605cf98c35
+DIST gnome-music-3.16.1.tar.xz 1477652 SHA256 116945d87fbac6aea2aedfa8e6a98bef720675916a0a6e9ae21aa83d450ad2df SHA512 dfc65d4d951fa9e87b9969b9a4c8affe467770ac37f8bf2027135b26668b099217a467cec6747f16f9cfed04f2403b13923bcd59c2548a9a22f4090adef7e2c2 WHIRLPOOL 9b9af3cdc935189a4aafbe475a1da8481389ddf70495c80a1d0834df370d3b9e195526152837638e2b29023e9734acea6ffed0f5f903b9865d3e26d25b596977
diff --git a/media-sound/gnome-music/gnome-music-3.14.3.1.ebuild b/media-sound/gnome-music/gnome-music-3.14.3.1.ebuild
new file mode 100644
index 000000000000..5a4efb77a8fe
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.14.3.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="http://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.28:2
+	>=dev-libs/gobject-introspection-1.35.9
+	>=media-libs/grilo-0.2.6:0.2[introspection]
+	media-libs/libmediaart:1.0
+	>=x11-libs/gtk+-3.13.2: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[introspection(+)]
+	|| (
+		app-misc/tracker[gstreamer]
+		app-misc/tracker[ffmpeg]
+	)
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${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.2[tracker]
+	x11-misc/xdg-user-dirs
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure ITSTOOL="$(type -P true)"
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/gnome-music/gnome-music-3.16.1.ebuild b/media-sound/gnome-music/gnome-music-3.16.1.ebuild
new file mode 100644
index 000000000000..a538d71c16f2
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.16.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="http://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.28:2
+	>=dev-libs/gobject-introspection-1.35.9:=
+	>=media-libs/grilo-0.2.6:0.2[introspection]
+	media-libs/libmediaart:2.0
+	>=x11-libs/gtk+-3.13.2: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[introspection(+)]
+	|| (
+		app-misc/tracker[gstreamer]
+		app-misc/tracker[ffmpeg]
+	)
+	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${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.2[tracker]
+	x11-misc/xdg-user-dirs
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure ITSTOOL="$(type -P true)"
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/gnome-music/metadata.xml b/media-sound/gnome-music/metadata.xml
new file mode 100644
index 000000000000..6e0e2ecb48ca
--- /dev/null
+++ b/media-sound/gnome-music/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
new file mode 100644
index 000000000000..ee78488e446c
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -0,0 +1 @@
+DIST gnome-sound-recorder-3.16.0.tar.xz 437788 SHA256 9af4935a8007810f750b40039a77cc762c260cb554339c1fc13e6ee52f6a1c04 SHA512 4d94f4f81d7b3cb3fa16e6b8ba26994c70ac9000482db1e1773a48ffe8ea7094f83c4f2b5f3f65a4b58f549d475f736fe1e117b788a64002169c18b609b9de10 WHIRLPOOL 4e4cd9f7bd859b3eeb5e1876c07658a8f300b63d924c4373d9c0235a8541ac67fc5a66364ede108a0032f614c6c4ea2c6b07ca96b82bd5d97df348c41e06f871
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.16.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.16.0.ebuild
new file mode 100644
index 000000000000..ae9380114ba9
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.16.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Simple sound recorder"
+HOMEPAGE="https://wiki.gnome.org/ThreePointEleven/Features/SoundRecorder"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# For the list of plugins, see src/audioProfile.js
+COMMON_DEPEND="
+	dev-libs/gjs
+	dev-libs/glib:2
+	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="${RDEPEND}
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+"
diff --git a/media-sound/gnome-sound-recorder/metadata.xml b/media-sound/gnome-sound-recorder/metadata.xml
new file mode 100644
index 000000000000..6e0e2ecb48ca
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>
diff --git a/media-sound/gnomoradio/Manifest b/media-sound/gnomoradio/Manifest
new file mode 100644
index 000000000000..4062650f089e
--- /dev/null
+++ b/media-sound/gnomoradio/Manifest
@@ -0,0 +1 @@
+DIST gnomoradio-0.15.1.tar.bz2 351723 SHA256 02b6c256fe6877da3831c5e67c1564b16cc9d5ff33ca410baf5dbdb41922e40a SHA512 7e9fc70054e3966e1bd6af9451c4c6eb0cd1018e422f767589ca2e86b08e2f74c520b9a9a4bd09a12ce76f4d7b7e545ac61601472ffa1818209182b026f9f882 WHIRLPOOL 7d070ee0ceac35a0432f4b690353ab5d91da37b3202e203fea7f37e55e1ae383a4c4c3415f00633677121d7974cfaf11bdbfbdaa5c7b740c608103313510c73b
diff --git a/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc42.patch b/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc42.patch
new file mode 100644
index 000000000000..0efc60fb868f
--- /dev/null
+++ b/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc42.patch
@@ -0,0 +1,22 @@
+diff -ur gnomoradio-0.15.1.orig/roboradio/audio/prober.h gnomoradio-0.15.1/roboradio/audio/prober.h
+--- gnomoradio-0.15.1.orig/roboradio/audio/prober.h	2004-10-17 04:40:36.000000000 +0300
++++ gnomoradio-0.15.1/roboradio/audio/prober.h	2008-06-29 14:48:13.000000000 +0300
+@@ -27,6 +27,7 @@
+ {
+ 	namespace Audio
+ 	{
++		gboolean probe (gpointer s);
+ 		class Prober : public Audio
+ 		{
+ 		public:
+diff -ur gnomoradio-0.15.1.orig/roboradio/state.cc gnomoradio-0.15.1/roboradio/state.cc
+--- gnomoradio-0.15.1.orig/roboradio/state.cc	2004-10-24 03:24:34.000000000 +0300
++++ gnomoradio-0.15.1/roboradio/state.cc	2008-06-29 14:48:13.000000000 +0300
+@@ -28,6 +28,7 @@
+ #include <sys/stat.h>
+ #include <dirent.h>
+ #include <iostream>
++#include <cstring>
+ 
+ #include <map>
+ #include <set>
diff --git a/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc43.patch b/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc43.patch
new file mode 100644
index 000000000000..b5f30edfa395
--- /dev/null
+++ b/media-sound/gnomoradio/files/gnomoradio-0.15.1-gcc43.patch
@@ -0,0 +1,70 @@
+Index: gnomoradio-0.15.1/rainbow/license.cc
+===================================================================
+--- gnomoradio-0.15.1.orig/rainbow/license.cc
++++ gnomoradio-0.15.1/rainbow/license.cc
+@@ -54,7 +54,7 @@ void Rainbow::License::get_and_do (const
+ 	}
+ 	
+ 	if (done) {
+-		signal<void,ref_ptr<License> > sig;
++		sigc::signal<void,ref_ptr<License> > sig;
+ 		sig.connect(slot);
+ 		sig(license);
+ 	} else {
+Index: gnomoradio-0.15.1/rainbow/rdf-resource.cc
+===================================================================
+--- gnomoradio-0.15.1.orig/rainbow/rdf-resource.cc
++++ gnomoradio-0.15.1/rainbow/rdf-resource.cc
+@@ -35,7 +35,7 @@ void Rainbow::RdfResource::get_and_do (c
+ 		resource = ref_ptr<RdfResource>(p->second);
+ 		if (resource->downloaded) { // already downloaded
+ 			map<Glib::ustring,xmlpp::Element*>::iterator el = resource->id_map.find(id);
+-			signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
++			sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
+ 			sig.connect(slot);
+ 			sig(el != resource->id_map.end() ? el->second : 0, resource);
+ 			return;
+@@ -47,7 +47,7 @@ void Rainbow::RdfResource::get_and_do (c
+ 		Glib::ustring host, file;
+ 		unsigned short port;
+ 		if (!HttpClient::parse_url(uri, host, port, file)) {
+-			signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
++			sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > sig;
+ 			sig.connect(slot);
+ 			sig(0, resource);
+ 			return;
+@@ -55,14 +55,14 @@ void Rainbow::RdfResource::get_and_do (c
+ 	}
+ 
+ 	// connect mem_fun to appropriate signal
+-	map<Glib::ustring,signal<void,xmlpp::Element*, ref_ptr<RdfResource> >*>::iterator sig;
++	map<Glib::ustring,sigc::signal<void,xmlpp::Element*, ref_ptr<RdfResource> >*>::iterator sig;
+ 	sig = resource->signal_map.find(id);
+ 	if (sig != resource->signal_map.end()) {
+ 		// found existing signal for id
+ 		sig->second->connect(slot);
+ 	} else {
+ 		// need to create new signal to handle id
+-		signal<void,xmlpp::Element*,ref_ptr<RdfResource> > *signal_ = new signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
++		sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> > *signal_ = new sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >;
+ 		signal_->connect(slot);
+ 		resource->signal_map.insert(make_pair(id, signal_));
+ 	}
+@@ -190,7 +190,7 @@ void Rainbow::RdfResource::on_downloaded
+ 
+  error:
+ 	// call all signals
+-	map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
++	map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
+ 	for (signal = signal_map.begin(); signal != signal_map.end(); ++signal) {
+ 		map<Glib::ustring,xmlpp::Element*>::iterator el = id_map.find(signal->first);
+ 		signal->second->emit(el != id_map.end() ? el->second : 0, ref_ptr<RdfResource>(this));
+@@ -204,7 +204,7 @@ void Rainbow::RdfResource::on_downloaded
+ 
+ void Rainbow::RdfResource::clear_signal_map ()
+ {
+-	map<Glib::ustring,signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
++	map<Glib::ustring,sigc::signal<void,xmlpp::Element*,ref_ptr<RdfResource> >*>::iterator signal;
+ 	for (signal = signal_map.begin(); signal != signal_map.end(); ++signal)
+ 		delete signal->second;
+ 	signal_map.clear();
diff --git a/media-sound/gnomoradio/files/gnomoradio-0.15.1-glib-single-include.patch b/media-sound/gnomoradio/files/gnomoradio-0.15.1-glib-single-include.patch
new file mode 100644
index 000000000000..168872e57cae
--- /dev/null
+++ b/media-sound/gnomoradio/files/gnomoradio-0.15.1-glib-single-include.patch
@@ -0,0 +1,53 @@
+Index: gnomoradio-0.15.1/roboradio/mp3/common.c
+===================================================================
+--- gnomoradio-0.15.1.orig/roboradio/mp3/common.c
++++ gnomoradio-0.15.1/roboradio/mp3/common.c
+@@ -19,7 +19,7 @@
+ #include "id3.h"
+ #include "id3_header.h"
+ 
+-#include <glib/gmem.h>
++#include <glib.h>
+ 
+ /* max = 1728 */
+ #define MAXFRAMESIZE 1792
+Index: gnomoradio-0.15.1/roboradio/mp3/esd-audio.c
+===================================================================
+--- gnomoradio-0.15.1.orig/roboradio/mp3/esd-audio.c
++++ gnomoradio-0.15.1/roboradio/mp3/esd-audio.c
+@@ -2,8 +2,7 @@
+ #include <config.h>
+ #include "esd-audio.h"
+ 
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <pthread.h>
+ #include <stdlib.h>
+ #include <string.h>
+Index: gnomoradio-0.15.1/roboradio/mp3/esd-audio.h
+===================================================================
+--- gnomoradio-0.15.1.orig/roboradio/mp3/esd-audio.h
++++ gnomoradio-0.15.1/roboradio/mp3/esd-audio.h
+@@ -1,7 +1,7 @@
+ #ifndef ESD_AUDIO_H
+ #define ESD_AUDIO_H
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #define N_(string) string
+ 
+Index: gnomoradio-0.15.1/roboradio/mp3/id3.h
+===================================================================
+--- gnomoradio-0.15.1.orig/roboradio/mp3/id3.h
++++ gnomoradio-0.15.1/roboradio/mp3/id3.h
+@@ -28,7 +28,7 @@
+ #ifndef ID3_H
+ #define ID3_H
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ /*
+  * Option flags to id3_open_*().
diff --git a/media-sound/gnomoradio/files/gnomoradio-0.15.1-lm.patch b/media-sound/gnomoradio/files/gnomoradio-0.15.1-lm.patch
new file mode 100644
index 000000000000..68104e752237
--- /dev/null
+++ b/media-sound/gnomoradio/files/gnomoradio-0.15.1-lm.patch
@@ -0,0 +1,12 @@
+diff -ur gnomoradio-0.15.1.orig/roboradio/mp3/Makefile.am gnomoradio-0.15.1/roboradio/mp3/Makefile.am
+--- gnomoradio-0.15.1.orig/roboradio/mp3/Makefile.am	2004-06-15 08:45:35.000000000 +0300
++++ gnomoradio-0.15.1/roboradio/mp3/Makefile.am	2009-07-18 13:35:08.000000000 +0300
+@@ -44,7 +44,7 @@
+ 	mpg123.h				\
+ 	tabinit.c				\
+ 	$(optimized_source)
+-libroboradio_mp3_la_LIBADD = -lpthread \
++libroboradio_mp3_la_LIBADD = -lm -lpthread \
+ 			     $(ROBORADIO_LIBS) \
+ 			     $(AO_LIBS)
+ 
diff --git a/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild b/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
new file mode 100644
index 000000000000..a468d69a8471
--- /dev/null
+++ b/media-sound/gnomoradio/gnomoradio-0.15.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="Finds, fetches, shares, and plays freely licensed music"
+HOMEPAGE="http://gnomoradio.org"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="vorbis"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	dev-cpp/glibmm:2
+	>=dev-cpp/gconfmm-2.6
+	dev-cpp/libxmlpp:2.6
+	dev-libs/libsigc++:2
+	media-libs/libao
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc42.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-lm.patch \
+		"${FILESDIR}"/${P}-glib-single-include.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable vorbis)
+}
diff --git a/media-sound/gnomoradio/metadata.xml b/media-sound/gnomoradio/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/gnomoradio/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/gnump3d/Manifest b/media-sound/gnump3d/Manifest
new file mode 100644
index 000000000000..2336c3f8e4a8
--- /dev/null
+++ b/media-sound/gnump3d/Manifest
@@ -0,0 +1 @@
+DIST gnump3d-3.0.tar.bz2 633215 SHA256 1ac5bd0e850b0e18ccd9d19219f5108fa84b50d8ae3825a361e8b907eab7f19c SHA512 23778604b557346e42f5cd2045cc394c7d6f7044479c74cd635dfdbbfd6835c8e3ad761d54c5cba239cc5e020b049ac11d64eb463272fc4134b7645226e2524b WHIRLPOOL ea5be9683cadb4e7b40e237b043e9c93174ae999a3d776ed96e6c039db320faa131f95aae7bcc518cd8fa5275528f9b12252c030d2847079dee2fc18c58c1827
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..2a228e2de80d
--- /dev/null
+++ b/media-sound/gnump3d/files/gnump3d.init.d
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..482d0f313392
--- /dev/null
+++ b/media-sound/gnump3d/gnump3d-3.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils multilib user
+
+DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
+HOMEPAGE="http://www.gnu.org/software/gnump3d/"
+SRC_URI="http://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..251e9164d822
--- /dev/null
+++ b/media-sound/gnump3d/gnump3d-3.0-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://www.gnu.org/software/gnump3d/"
+SRC_URI="http://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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/gnump3d/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/gom/Manifest b/media-sound/gom/Manifest
new file mode 100644
index 000000000000..bdc5de7b6ab4
--- /dev/null
+++ b/media-sound/gom/Manifest
@@ -0,0 +1 @@
+DIST gom-0.29.103.tar.gz 88269 RMD160 f731fd24f436627d2a8a7c0601f865ae465c2c78 SHA1 a2c547dfab01b770b863d74a2af2b68998392433 SHA256 9ae883906f61009d404977bcb4da7a7f67df8bac7ab3be5a14c477843b206a9c
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..33bc0569c335
--- /dev/null
+++ b/media-sound/gom/gom-0.29.103-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/gom/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/google-musicmanager/Manifest b/media-sound/google-musicmanager/Manifest
new file mode 100644
index 000000000000..47003c47f22f
--- /dev/null
+++ b/media-sound/google-musicmanager/Manifest
@@ -0,0 +1,6 @@
+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.182.3607-r0_amd64.deb 3976548 SHA256 a463d614b92231a577d348fbd0d494288987c1cf17c1f7c4c9e375050d4a3d90 SHA512 f08e2843f82b3bdb15372ce856b7523a7cc04ac3063c9d73806e4281b581d15dda33fcfa36790be60052a2a12d6733da4d221b2da20a5e712180f21acf986970 WHIRLPOOL 49588479c1f35376e833211694fbf4fe318b56ff15107e85b573229e6beee935a9c81369d13ba3008a8917575031c8803f514e988e71d0aab6f676acd6cc7cbf
+DIST google-musicmanager-beta_1.0.182.3607-r0_i386.deb 3923342 SHA256 346ce6ed2b045c8e02156fef98987cff61529d4c509547615848c27e8f52d11c SHA512 f111507af3ac4c99b30c5f7ece746ac256a6b9982651083afae82b5037e72eb0e1a3dd3db3e7c03a86618a781d1734d0966fd3473e8ba72a31855450c2804522 WHIRLPOOL 89fed2558d5cab3b3194304483c8c6fc69dac6c68c5bc16e514583f699dac9b7965a30ce2bdb14704da561dcbd6cbfb347c4e3d54638105c9b7b495077246237
+DIST google-musicmanager-beta_1.0.196.8837-r0_amd64.deb 4334448 SHA256 1b46d257a93cea3c209a6e9b0e2985e31b6990b9de778459ad78b086d3f6d2b0 SHA512 70c144b446c1a6cca7725e2d8bb494f5175a50cbe9ba1a5d0a18867fb9d821e3d302cafdca83c78d1e27971f41b9d5848c15c5643ccba2f984b87136d9233789 WHIRLPOOL 38be4761e48975dbc3ea484260aa343b913a09bbb88724c1ca6caee758b849552a83583b248da6c2adba96de00f8add17888baeed6faf6a6b1a63d0a7efe80bb
+DIST google-musicmanager-beta_1.0.196.8837-r0_i386.deb 4196444 SHA256 7005a06a921040eafd9afa0f15d63fba014c59ae150c89099f0a6be2deecdae7 SHA512 b9d237be61249e5cd27b48a0ed25426e59cd01660d57e900e692bec5ac2a1ff915da39f9837f61d558380b208a23990289c7191fa806bc0747c4926947f8ae6d WHIRLPOOL a054ea29e91bb059ebec01a8dc2b2d5a60fc98691df3bf24b303625852af0a3bcdc89f5eb984eff79b7cb82e0db709d5dd9ee8a4ac87e1031ed3aa66c154302b
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..3f2752ecf832
--- /dev/null
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.129.6633_beta.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils unpacker
+
+#http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-i386/Packages
+MY_URL="http://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="http://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: http://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 http://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.182.3607_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.182.3607_beta.ebuild
new file mode 100644
index 000000000000..ff64d3ede881
--- /dev/null
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.182.3607_beta.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils unpacker
+
+#http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-i386/Packages
+MY_URL="http://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="http://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: http://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 http://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.196.8837_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.196.8837_beta.ebuild
new file mode 100644
index 000000000000..0946e64a8d0a
--- /dev/null
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.196.8837_beta.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils unpacker
+
+#http://dl.google.com/linux/musicmanager/deb/dists/stable/main/binary-i386/Packages
+MY_URL="http://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="http://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_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: http://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 http://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..5a0d1e7114db
--- /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>
+		<email>ottxor@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..796f8a0d6e8b
--- /dev/null
+++ b/media-sound/gpodder/Manifest
@@ -0,0 +1,3 @@
+DIST gpodder-3.6.0.tar.gz 1555280 SHA256 9a00144c73d69a1f285ef1fe779a88ace1eac8f65dd370371c1cede4e1535dd9 SHA512 9ead76f7f24a09135848d7bd70ad97c620852778ead6630a53e145eeade70dc8d3ac3558660620794e00db57381885af2390bae7bac97864019b5aace1451140 WHIRLPOOL 0215c958ef571e1874b61b358ab12b8b98d449cb84dbd5536eda9870aa281f0f96c2943fc67c7b5acdbb39cac66aca5b1f137815594abcd56b1800af2c90f09b
+DIST gpodder-3.7.0.tar.gz 1563670 SHA256 fa90ef4bdd3fd9eef95404f7f43f70912ae3ab4f8d24078484a2f3e11b14dc47 SHA512 c81d477b09fc7ebf994a9e3ee9a4c6b197865925731e82ee9a33d9f0ffbd0c30c734543d72703d4979c08be87e4739757439e754e2b1525c076bef0c6b3f61db WHIRLPOOL 8aebde3f7e05fbecab46831f88d4d737c805f39792ffe7f6a2fe5e477855d750e0dde838d07c35d8f8d67d95c6839588468e5cee302d858a6d66fa09a4b3352d
+DIST gpodder-3.8.3.tar.gz 1452239 SHA256 8ac120a6084bded6bc88ecadbbc9df54a85f44ef4507f73a76de1d7a5574303c SHA512 9829c1af0085b93772ffb4864ec3701022d5aa51ed6c5499b7c018de743f9d98ba01ad3869bbcfc94ce7cd125b8bb0d91f63b94b51c4aeade9c2110dfa5cf365 WHIRLPOOL 9a8819e1d5aec3f1c5a390c7e3a29ce2b17d66d1b9f8785db25caa46dce7c5e559ddf9a75d0a966875652b698b5d43159f7d7b19eb3ee58fac2c4b7dbccd957d
diff --git a/media-sound/gpodder/gpodder-3.6.0.ebuild b/media-sound/gpodder/gpodder-3.6.0.ebuild
new file mode 100644
index 000000000000..3fddce5618f7
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.6.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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 gstreamer ipod kernel_linux mtp test webkit"
+
+#TODO: add QML UI deps (USE=qt4) and make pygtk optional, see README
+COMMON_DEPEND=">=dev-python/eyeD3-0.7
+	>=dev-python/feedparser-5.1.2
+	>=dev-python/mygpoclient-1.7
+	>=dev-python/pygtk-2.16:2
+	dbus? ( dev-python/dbus-python )
+	bluetooth? ( net-wireless/bluez )
+	gstreamer? ( dev-python/gst-python:0.10 )
+	ipod? ( media-libs/libgpod[python] )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	webkit? ( dev-python/pywebkitgtk )"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-apps/iproute2 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-apps/help2man
+	test? (
+		dev-python/minimock
+		dev-python/coverage
+	)"
+
+src_prepare() {
+	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/gpodder-3.7.0.ebuild b/media-sound/gpodder/gpodder-3.7.0.ebuild
new file mode 100644
index 000000000000..3fddce5618f7
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.7.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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 gstreamer ipod kernel_linux mtp test webkit"
+
+#TODO: add QML UI deps (USE=qt4) and make pygtk optional, see README
+COMMON_DEPEND=">=dev-python/eyeD3-0.7
+	>=dev-python/feedparser-5.1.2
+	>=dev-python/mygpoclient-1.7
+	>=dev-python/pygtk-2.16:2
+	dbus? ( dev-python/dbus-python )
+	bluetooth? ( net-wireless/bluez )
+	gstreamer? ( dev-python/gst-python:0.10 )
+	ipod? ( media-libs/libgpod[python] )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	webkit? ( dev-python/pywebkitgtk )"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-apps/iproute2 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-apps/help2man
+	test? (
+		dev-python/minimock
+		dev-python/coverage
+	)"
+
+src_prepare() {
+	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/gpodder-3.8.3.ebuild b/media-sound/gpodder/gpodder-3.8.3.ebuild
new file mode 100644
index 000000000000..3fddce5618f7
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.8.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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 gstreamer ipod kernel_linux mtp test webkit"
+
+#TODO: add QML UI deps (USE=qt4) and make pygtk optional, see README
+COMMON_DEPEND=">=dev-python/eyeD3-0.7
+	>=dev-python/feedparser-5.1.2
+	>=dev-python/mygpoclient-1.7
+	>=dev-python/pygtk-2.16:2
+	dbus? ( dev-python/dbus-python )
+	bluetooth? ( net-wireless/bluez )
+	gstreamer? ( dev-python/gst-python:0.10 )
+	ipod? ( media-libs/libgpod[python] )
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	webkit? ( dev-python/pywebkitgtk )"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-apps/iproute2 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-apps/help2man
+	test? (
+		dev-python/minimock
+		dev-python/coverage
+	)"
+
+src_prepare() {
+	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..95d4e3860501
--- /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>
+  <herd>sound</herd>
+  <use>
+    <flag name='webkit'>Enable the webkit rendering engine for HTML episode shownotes</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/gqmpeg/Manifest b/media-sound/gqmpeg/Manifest
new file mode 100644
index 000000000000..1eb1d0943f28
--- /dev/null
+++ b/media-sound/gqmpeg/Manifest
@@ -0,0 +1 @@
+DIST gqmpeg-0.91.1.tar.gz 1078478 SHA256 78502bf9b9119c9d4495a640e7467c67aa992b30d8b5b2a51c1db86ada045df5
diff --git a/media-sound/gqmpeg/files/gqmpeg-0.91.1-libpng15.patch b/media-sound/gqmpeg/files/gqmpeg-0.91.1-libpng15.patch
new file mode 100644
index 000000000000..f89565b30e10
--- /dev/null
+++ b/media-sound/gqmpeg/files/gqmpeg-0.91.1-libpng15.patch
@@ -0,0 +1,11 @@
+--- src/ui_pixbuf_save.c
++++ src/ui_pixbuf_save.c
+@@ -86,7 +86,7 @@ gboolean pixbuf_to_file_as_png (GdkPixbu
+ 	    	return FALSE;
+ 		}
+ 
+-	if (setjmp (png_ptr->jmpbuf))
++	if (setjmp (png_jmpbuf(png_ptr)))
+ 		{
+ 		png_destroy_write_struct (&png_ptr, &info_ptr);
+ 		fclose (handle);
diff --git a/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild b/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild
new file mode 100644
index 000000000000..d8dd5d11ebd6
--- /dev/null
+++ b/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="front end to various audio players, including mpg123"
+HOMEPAGE="http://gqmpeg.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+RDEPEND="x11-libs/gtk+:2
+	media-sound/vorbis-tools
+	media-sound/mpg123
+	>=media-libs/libpng-1.4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog FAQ NEWS README SKIN-SPECS* TODO
+}
diff --git a/media-sound/gqmpeg/metadata.xml b/media-sound/gqmpeg/metadata.xml
new file mode 100644
index 000000000000..c1a71961758e
--- /dev/null
+++ b/media-sound/gqmpeg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">gqmpeg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/gqradio/Manifest b/media-sound/gqradio/Manifest
new file mode 100644
index 000000000000..2ae483d7c902
--- /dev/null
+++ b/media-sound/gqradio/Manifest
@@ -0,0 +1 @@
+DIST gqradio-1.9.2.tar.gz 444114 SHA256 8c00b589c2faab3fdb5053f8d47abc883ee9fc44702a34bd049ebde8a1adcfef SHA512 7b749f03ff110b78a644fc6b574f5a9d9d3a6db22976c4c8871b8f5c781515d29112745df5b5a4a70e4c48ba3cc9fd4921af64de39415ac179f57a26d33a4e5a WHIRLPOOL 4589bec806e43290eb0efda1038afec69b27d9c71f517bd8c0fdae0d99477f335282b017deccac023e63f0adf46b4a12ceb11f38477983b115e179c20f351ac7
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..f1f8084020d1
--- /dev/null
+++ b/media-sound/gqradio/gqradio-1.9.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..2946d7c23fef
--- /dev/null
+++ b/media-sound/gqradio/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..b9e98ee4b737
--- /dev/null
+++ b/media-sound/gramofile/Manifest
@@ -0,0 +1,3 @@
+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
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..96caada64d42
--- /dev/null
+++ b/media-sound/gramofile/gramofile-1.6-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..91c7b9e5e0b1
--- /dev/null
+++ b/media-sound/gramofile/gramofile-1.6_p9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f6f41985a82b
--- /dev/null
+++ b/media-sound/gramofile/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+<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..fc3ac75924be
--- /dev/null
+++ b/media-sound/grip/Manifest
@@ -0,0 +1 @@
+DIST grip-3.3.1.tar.gz 812562 SHA256 d46394a1062ed066f9c633b010fd1059e63d9ed791bbb7a85bc6567cf0fd66fd
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..e8fc95363bbd
--- /dev/null
+++ b/media-sound/grip/grip-3.3.1-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils flag-o-matic toolchain-funcs libtool
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="http://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/metadata.xml b/media-sound/grip/metadata.xml
new file mode 100644
index 000000000000..b9d0f75b5165
--- /dev/null
+++ b/media-sound/grip/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..3201d6acf6b7
--- /dev/null
+++ b/media-sound/gsm/Manifest
@@ -0,0 +1 @@
+DIST gsm-1.0.13.tar.gz 65318 SHA256 52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa WHIRLPOOL 0beaad0ef45f3b200d98dca208dd9d6fced10e32b7d7db74e0d60fb1009909c270817fe481e4bc42b9c3471f9fd996d44a8d5a07bae9c4187ee12007afe9ca46
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..6dc0b84883ad
--- /dev/null
+++ b/media-sound/gsm/gsm-1.0.13-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+DESCRIPTION="Lossy speech compression library and tool"
+HOMEPAGE="http://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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/gsm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/gst123/Manifest b/media-sound/gst123/Manifest
new file mode 100644
index 000000000000..b9cb48782dd0
--- /dev/null
+++ b/media-sound/gst123/Manifest
@@ -0,0 +1,3 @@
+DIST gst123-0.3.1.tar.bz2 110925 SHA256 89d1de025eca0466c125dcd6a11b64341bdf98ee4c03c3e5a12321d77cb8b0ce SHA512 d31177fe4ec20db5b6a9a2a35be149ebf6682d00a8163b8fee3953f60b39b2a33e3fbc468b3d0864f059d95bb820ee998dcb8a8b47c8aa1c68ea583e434cb8af WHIRLPOOL b642042b745c601850a9438f7ac19d442bf2db5b88c483f83b1459c97ae8c43e4301967279fb19d83c8a55018758daf455cb91ea58d1793a94508f1dc7c3d976
+DIST gst123-0.3.2.tar.bz2 112709 SHA256 51033261967da4cf1beb512e156e9f647572689202a1c2aceb8cd2beb427f53d SHA512 4ab1039e912fe02d2802b4a289bdb6061710f2d16188e538d833aeef39300594f98c29c13df2a4546befd87730e3e097941dc5f96271524c3dd31ae0a81386e9 WHIRLPOOL 1c39366c18c601783a46c1a9278519c98753d1cfef858046c6d6e515c8e54371b51d59ca579275a40127f10048d0abb3ad4806db596b34aac3e6fa5c073c37a8
+DIST gst123-0.3.3.tar.bz2 113344 SHA256 45359410c99a622790dd2b6efdc2d1a94748da3763242d95da79c633b5dfbce9 SHA512 8c6b23ee66ef983874268a41c00aa431df5daeb9daf995663c9b9ab72b7df16a0e55c949b5602b50de324b58cd75b7bb734cdbeae0ad56d2059d9d1100630c47 WHIRLPOOL e4171f7a7f29ed379445fa42ec12812a5b9bd4fe8dc1e06141e2b36dac67dee1aa04aa2fc562f50e44210469470cfbb57fff71bf69629e5de1ae319fd4e5ae41
diff --git a/media-sound/gst123/gst123-0.3.1.ebuild b/media-sound/gst123/gst123-0.3.1.ebuild
new file mode 100644
index 000000000000..15e695a256b1
--- /dev/null
+++ b/media-sound/gst123/gst123-0.3.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="A more flexible command line player in the spirit of ogg123 and mpg123, based on gstreamer"
+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"
+IUSE=""
+
+CDEPEND="dev-libs/glib
+	media-libs/gst-plugins-base:0.10
+	media-libs/gstreamer:0.10
+	sys-libs/ncurses
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+RDEPEND="${CDEPEND}
+	media-plugins/gst-plugins-meta:0.10"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
diff --git a/media-sound/gst123/gst123-0.3.2.ebuild b/media-sound/gst123/gst123-0.3.2.ebuild
new file mode 100644
index 000000000000..d30bf25a81d1
--- /dev/null
+++ b/media-sound/gst123/gst123-0.3.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A more flexible command line player in the spirit of ogg123 and mpg123, based on gstreamer"
+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"
+IUSE=""
+
+CDEPEND="dev-libs/glib
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	sys-libs/ncurses
+	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/gst123-0.3.3.ebuild b/media-sound/gst123/gst123-0.3.3.ebuild
new file mode 100644
index 000000000000..0895e333ca8d
--- /dev/null
+++ b/media-sound/gst123/gst123-0.3.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A more flexible command line player in the spirit of ogg123 and mpg123, based on gstreamer"
+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
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	sys-libs/ncurses
+	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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/gst123/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/gstreamripper/Manifest b/media-sound/gstreamripper/Manifest
new file mode 100644
index 000000000000..1a8af44f95c9
--- /dev/null
+++ b/media-sound/gstreamripper/Manifest
@@ -0,0 +1 @@
+DIST GStreamripperX-0.2.tar.gz 187186 SHA256 211d967db34e70b97d989bddf4f847f9cb9e9466430b0a2397127d28fbc37ad2
diff --git a/media-sound/gstreamripper/gstreamripper-0.2.ebuild b/media-sound/gstreamripper/gstreamripper-0.2.ebuild
new file mode 100644
index 000000000000..8ed5fe4524df
--- /dev/null
+++ b/media-sound/gstreamripper/gstreamripper-0.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+MY_P=GStreamripperX-${PV}
+
+DESCRIPTION="A GTK+ toolkit based frontend for streamripper"
+HOMEPAGE="http://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..ceaa2f3b8c4b
--- /dev/null
+++ b/media-sound/gstreamripper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..5d9d84017020
--- /dev/null
+++ b/media-sound/gtick/Manifest
@@ -0,0 +1 @@
+DIST gtick-0.5.0.tar.gz 650541 SHA256 766930718d8f272b8fb45be89974db907db084e281e922e4fb7dd9d874b9d59d
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..1f4392f0691f
--- /dev/null
+++ b/media-sound/gtick/gtick-0.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..ae573a60407f
--- /dev/null
+++ b/media-sound/gtick/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/gtkguitune/Manifest b/media-sound/gtkguitune/Manifest
new file mode 100644
index 000000000000..4211cf8502ab
--- /dev/null
+++ b/media-sound/gtkguitune/Manifest
@@ -0,0 +1 @@
+DIST gtkguitune-gtk2-0.8.tar.gz 660808 RMD160 70fee7f43488be4364a9833ec5931f55476d85a6 SHA1 635a78c96db9a7d5d71dbc59492d50e19c5bffa6 SHA256 be0e8a8b8085498201d3674a1a719d4841a4f79cd7bcff3e14fec83512c30849
diff --git a/media-sound/gtkguitune/gtkguitune-0.8.ebuild b/media-sound/gtkguitune/gtkguitune-0.8.ebuild
new file mode 100644
index 000000000000..1b3c6a3ecb0e
--- /dev/null
+++ b/media-sound/gtkguitune/gtkguitune-0.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils gnome2-utils
+
+DESCRIPTION="A guitar tuning program that uses Schmitt-triggering for quick feedback"
+HOMEPAGE="http://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_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog README
+	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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/gtkguitune/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest
new file mode 100644
index 000000000000..b0f2367a7be4
--- /dev/null
+++ b/media-sound/guayadeque/Manifest
@@ -0,0 +1,3 @@
+DIST guayadeque-0.3.5.tar.bz2 3078223 SHA256 8c2c846e65d6776b2af9bf4974ecb36ae7f51cfce218f13e93cbc9249d0baa7a SHA512 0de23a85f02acacc30328659e10bf010a354eda400e2f7d2e220943514c0930de00ac7e2b4e5cf85ddde0a4c0041d542cbe9f0ad51b76e2673fe553bbecabc28 WHIRLPOOL fd502b90c631a9ec1020e2357d8246e10eec1bd9117c6ccb3687d958e49a319b7b47ff19ee70774b3c29ddb5014da2d3e2bcdad65b6b0594264d4ec22ee93beb
+DIST guayadeque-0.3.6_pre1887.zip 3689081 SHA256 b17e96622efebb132253a73d0175ac60a09e832393d484da31c25b8262fcc082 SHA512 7694d3340facc3da29d90e63ca998b1823e182f87b8f6647c8f3806902acb191b01d444a7b958ba58c0a5d41c3ee857202ecee4f3864efc3fe08c9bd5cc74aa4 WHIRLPOOL 70d06c44c9c29f069a54417b6fa824d5df237178138a2545af279d585474ff86110ac8e93a641e9c76408af6c2f768728cf0f19a13a00b7967d83ac227276da3
+DIST guayadeque-0.3.7.tar.bz2 1620734 SHA256 d23eb1247add0bef8d5fef834294d7cb3d7c5fc20db9022b86f618a13d359938 SHA512 7fb15d0454281a9fb436a95b04054812d0758f643ab9a28e6cefc171d5d90ad6de19e0b97384f8304a24e417a53b8655d4d99babf86439f371d719cd4a00e58e WHIRLPOOL ed6863de7916d484dd8702e3f809b20691157f9ecfa3314e3d3bb2471d5d440f10a9a4bd646c767648be4c612f45d5de03c761c0487b53631bcad8c6a6f40d95
diff --git a/media-sound/guayadeque/files/guayadeque-0.3.6_pre1887-underlinking.patch b/media-sound/guayadeque/files/guayadeque-0.3.6_pre1887-underlinking.patch
new file mode 100644
index 000000000000..c2b73e2585e9
--- /dev/null
+++ b/media-sound/guayadeque/files/guayadeque-0.3.6_pre1887-underlinking.patch
@@ -0,0 +1,10 @@
+--- guayadeque-svn1858/src/CMakeLists.txt.orig	2012-12-14 19:42:25.000000000 +0100
++++ guayadeque-svn1858/src/CMakeLists.txt	2012-12-24 14:33:58.486362648 +0100
+@@ -321,6 +321,7 @@
+ 	${LIBINDICATE07_LIBRARIES}
+ 	${LIBAPPINDICATOR_LIBRARIES}
+ 	${LIBWXSQLITE3_LIBRARIES}
++	-lgdk_pixbuf-2.0
+ 	)
+ 
+ INSTALL( TARGETS guayadeque
diff --git a/media-sound/guayadeque/guayadeque-0.3.5.ebuild b/media-sound/guayadeque/guayadeque-0.3.5.ebuild
new file mode 100644
index 000000000000..b04e7cbb007f
--- /dev/null
+++ b/media-sound/guayadeque/guayadeque-0.3.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+WX_GTK_VER="2.8"
+
+inherit cmake-utils eutils wxwidgets
+
+DESCRIPTION="Music management program designed for all music enthusiasts"
+HOMEPAGE="http://guayadeque.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ayatana ipod"
+
+# No test available, Making src_test fail
+RESTRICT="test"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	media-libs/flac
+	media-libs/gstreamer:0.10
+	media-libs/taglib
+	media-plugins/gst-plugins-soup:0.10
+	net-misc/curl
+	sys-apps/dbus
+	x11-libs/wxGTK:2.8[X]
+	ayatana? ( dev-libs/libindicate )
+	ipod? ( media-libs/libgpod )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	dev-util/cmake"
+
+# echo $(cat po/CMakeLists.txt | grep ADD_SUBDIRECTORY | sed 's#ADD_SUBDIRECTORY( \(\w\+\) )#\1#')
+LANGS="es uk it de fr is nb th cs ru hu sv nl"
+for l in ${LANGS}; do
+	IUSE="$IUSE linguas_${l}"
+done
+
+src_prepare() {
+	for l in ${LANGS} ; do
+		if ! use linguas_${l} ; then
+			sed \
+				-e "/${l}/d" \
+				-i po/CMakeLists.txt || die
+		fi
+	done
+
+	if ! use ipod; then
+		sed \
+			-e '/PKG_CHECK_MODULES( LIBGPOD/,/^ENDIF/d' \
+			-i CMakeLists.txt || die
+	fi
+
+	if ! use ayatana; then
+		sed \
+			-e '/PKG_CHECK_MODULES( LIBINDICATE/,/^ENDIF/d' \
+			-i CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+
+	# otherwise cmake checks for svn
+	esvn_clean
+
+	sed 's:-O2::g' -i CMakeLists.txt || die
+
+	sed \
+		-e '/Encoding/d' \
+		-i guayadeque.desktop || die
+}
+
+src_configure() {
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/media-sound/guayadeque/guayadeque-0.3.6_pre1887.ebuild b/media-sound/guayadeque/guayadeque-0.3.6_pre1887.ebuild
new file mode 100644
index 000000000000..28929db45eaa
--- /dev/null
+++ b/media-sound/guayadeque/guayadeque-0.3.6_pre1887.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+
+inherit cmake-utils eutils wxwidgets
+
+DESCRIPTION="Music management program designed for all music enthusiasts"
+HOMEPAGE="http://guayadeque.org/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="http://sourceforge.net/code-snapshots/svn/g/gu/guayadeque/code/guayadeque-code-1887.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana ipod +minimal"
+
+# No test available, Making src_test fail
+RESTRICT="test"
+
+# Missing
+# gstreamer0.10-fluendo-mp3 #120237
+# gstreamer0.10-plugins-bad-multiverse ??
+# gstreamer0.10-plugins-base-apps ??
+
+GST_VERSION=0.10
+GST_DEPS="
+	dev-perl/GStreamer
+	media-libs/gnonlin:${GST_VERSION}
+	media-plugins/gst-plugins-alsa:${GST_VERSION}
+	media-plugins/gst-plugins-ffmpeg:${GST_VERSION}
+	media-plugins/gst-plugins-gio:${GST_VERSION}
+	media-plugins/gst-plugins-gnomevfs:${GST_VERSION}
+	media-plugins/gst-plugins-libnice:${GST_VERSION}
+	media-plugins/gst-plugins-pulse:${GST_VERSION}
+	media-plugins/gst-plugins-soup:${GST_VERSION}
+	media-plugins/gst-plugins-x:${GST_VERSION}
+	media-libs/gst-plugins-bad:${GST_VERSION}
+	media-libs/gst-plugins-base:${GST_VERSION}
+	media-libs/gst-plugins-good:${GST_VERSION}
+	media-libs/gst-plugins-ugly:${GST_VERSION}
+"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-db/wxsqlite3
+	dev-libs/glib:2
+	media-libs/flac
+	media-libs/gstreamer:${GST_VERSION}[introspection]
+	>=media-libs/taglib-1.6.4
+	net-misc/curl
+	sys-apps/dbus
+	x11-libs/wxGTK:2.8[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="es uk it de fr is nb th cs ru hu sv nl pt_BR pt el sk pl tr ja sr bg ca_ES hr"
+for l in ${LANGS}; do
+	IUSE="$IUSE linguas_${l}"
+done
+
+S="${WORKDIR}"/guayadeque-code-1887/Trunk
+
+PATCHES=( "${FILESDIR}"/${P}-underlinking.patch )
+
+src_prepare() {
+	for l in ${LANGS} ; do
+		if ! use linguas_${l} ; then
+			sed \
+				-e "/${l}/d" \
+				-i po/CMakeLists.txt || die
+		fi
+	done
+
+	if ! use ipod; then
+		sed \
+			-e '/PKG_CHECK_MODULES( LIBGPOD/,/^ENDIF/d' \
+			-i CMakeLists.txt || die
+	fi
+
+	if ! use ayatana; then
+		sed \
+			-e '/PKG_CHECK_MODULES( LIBINDICATE/,/^ENDIF/d' \
+			-i CMakeLists.txt || die
+	fi
+
+	rm -rf src/wx/wxsql* src/wxsqlite3 || die
+
+	cmake-utils_src_prepare
+
+	# otherwise cmake checks for svn
+	esvn_clean
+
+	sed 's:-O2::g' -i CMakeLists.txt || die
+
+	sed \
+		-e '/Encoding/d' \
+		-i guayadeque.desktop || die
+}
+
+pkg_postinst() {
+	local pkg
+	if use minimal; then
+		elog "If you are missing functionalities consider setting USE=-minimal"
+		elog "or install any of the following packages:"
+		for pkg in ${GST_DEPS}; do
+			elog "\t ${pkg}"
+		done
+	fi
+}
diff --git a/media-sound/guayadeque/guayadeque-0.3.7.ebuild b/media-sound/guayadeque/guayadeque-0.3.7.ebuild
new file mode 100644
index 000000000000..9e59f0bdea7c
--- /dev/null
+++ b/media-sound/guayadeque/guayadeque-0.3.7.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+
+inherit cmake-utils eutils wxwidgets
+
+DESCRIPTION="Music management program designed for all music enthusiasts"
+HOMEPAGE="http://guayadeque.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana ipod +minimal"
+
+# No test available, Making src_test fail
+RESTRICT="test"
+
+# Missing
+# gstreamer0.10-fluendo-mp3 #120237
+# gstreamer0.10-plugins-bad-multiverse ??
+# gstreamer0.10-plugins-base-apps ??
+
+GST_VERSION=0.10
+GST_DEPS="
+	dev-perl/GStreamer
+	media-libs/gnonlin:${GST_VERSION}
+	media-plugins/gst-plugins-alsa:${GST_VERSION}
+	media-plugins/gst-plugins-ffmpeg:${GST_VERSION}
+	media-plugins/gst-plugins-gio:${GST_VERSION}
+	media-plugins/gst-plugins-gnomevfs:${GST_VERSION}
+	media-plugins/gst-plugins-libnice:${GST_VERSION}
+	media-plugins/gst-plugins-pulse:${GST_VERSION}
+	media-plugins/gst-plugins-soup:${GST_VERSION}
+	media-plugins/gst-plugins-x:${GST_VERSION}
+	media-libs/gst-plugins-bad:${GST_VERSION}
+	media-libs/gst-plugins-base:${GST_VERSION}
+	media-libs/gst-plugins-good:${GST_VERSION}
+	media-libs/gst-plugins-ugly:${GST_VERSION}
+"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-db/wxsqlite3
+	dev-libs/glib:2
+	media-libs/flac
+	media-libs/gstreamer:${GST_VERSION}[introspection]
+	>=media-libs/taglib-1.6.4
+	net-misc/curl
+	sys-apps/dbus
+	x11-libs/wxGTK:2.8[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="es uk it de fr is nb th cs ru hu sv nl pt_BR pt el sk pl tr ja sr bg ca_ES hr"
+for l in ${LANGS}; do
+	IUSE="$IUSE linguas_${l}"
+done
+
+PATCHES=( "${FILESDIR}"/${PN}-0.3.6*-underlinking.patch )
+
+src_prepare() {
+	for l in ${LANGS} ; do
+		if ! use linguas_${l} ; then
+			sed \
+				-e "/${l}/d" \
+				-i po/CMakeLists.txt || die
+		fi
+	done
+
+	if ! use ipod; then
+		sed \
+			-e '/PKG_CHECK_MODULES( LIBGPOD/,/^ENDIF/d' \
+			-i CMakeLists.txt || die
+	fi
+
+	if ! use ayatana; then
+		sed \
+			-e '/PKG_CHECK_MODULES( LIBINDICATE/,/^ENDIF/d' \
+			-i CMakeLists.txt || die
+	fi
+
+	rm -rf src/wx/wxsql* src/wxsqlite3 || die
+
+	cmake-utils_src_prepare
+
+	# otherwise cmake checks for svn
+	esvn_clean
+
+	sed 's:-O2::g' -i CMakeLists.txt || die
+
+	sed \
+		-e '/Encoding/d' \
+		-i guayadeque.desktop || die
+}
+
+pkg_postinst() {
+	local pkg
+	if use minimal; then
+		elog "If you are missing functionalities consider setting USE=-minimal"
+		elog "or install any of the following packages:"
+		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..11028e23a69c
--- /dev/null
+++ b/media-sound/guayadeque/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>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">guayadeque</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/guimup/Manifest b/media-sound/guimup/Manifest
new file mode 100644
index 000000000000..d41846ef172e
--- /dev/null
+++ b/media-sound/guimup/Manifest
@@ -0,0 +1 @@
+DIST guimup_0.3.2_src.tar.gz 587543 SHA256 930c137be80a2cecf3053bb3c96d805dc618c84a83b17aa63e56cd69d977e49a
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..3d3cfabcd45e
--- /dev/null
+++ b/media-sound/guimup/guimup-0.3.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+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=""
+DOCS="ChangeLog README NEWS AUTHORS"
+
+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_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..55c0c42e86ac
--- /dev/null
+++ b/media-sound/guimup/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>
+		<email>jdhore@gentoo.org</email>
+		<name>Jeff Horelick</name>
+	</maintainer>
+	<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..fc3de0fcaae5
--- /dev/null
+++ b/media-sound/hearnet/Manifest
@@ -0,0 +1 @@
+DIST hearnet-0.0.9.tar.gz 11164 SHA256 d9e9608d96501874c9b1b9eb51aab34e9dacbc3a7290190e0c9d0aef92b8705c
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..c952b648381f
--- /dev/null
+++ b/media-sound/hearnet/hearnet-0.0.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/hearnet/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/herrie/Manifest b/media-sound/herrie/Manifest
new file mode 100644
index 000000000000..18e1eacc29d0
--- /dev/null
+++ b/media-sound/herrie/Manifest
@@ -0,0 +1 @@
+DIST herrie-2.2.tar.bz2 71596 SHA256 142341072920f86b6eb570b8f13bf5fd87c06cf801543dc7d1a819e39eb9fb2b
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..00dc3057b205
--- /dev/null
+++ b/media-sound/herrie/files/herrie-2.2-libxspf.patch
@@ -0,0 +1,122 @@
+--- configure
++++ 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
+--- src/conftest.c
++++ 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);
+ }
+--- src/vfs_xspf.c
++++ 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.ebuild b/media-sound/herrie/herrie-2.2.ebuild
new file mode 100644
index 000000000000..e258c54365f0
--- /dev/null
+++ b/media-sound/herrie/herrie-2.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..45200fa35db8
--- /dev/null
+++ b/media-sound/herrie/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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..84fd7998d5a2
--- /dev/null
+++ b/media-sound/horgand/Manifest
@@ -0,0 +1 @@
+DIST horgand-1.14.tar.gz 2531734 RMD160 73fa51d91936ff95e8029c628cfdca4061ccebf7 SHA1 045b339241e8047aa8f5221fa215789333d6ef47 SHA256 836b3a8608953bb3bb37151947eb6236c557a9efde10e4bae1ecad46fc325e8e
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..4549d2b0a4f3
--- /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
+# $Id$
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Opensource software organ"
+HOMEPAGE="http://horgand.berlios.de"
+SRC_URI="mirror://berlios/${PN}/${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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/horgand/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
new file mode 100644
index 000000000000..ba52e77ee698
--- /dev/null
+++ b/media-sound/hydrogen/Manifest
@@ -0,0 +1 @@
+DIST hydrogen-0.9.5.tar.gz 5239702 SHA256 963c73ef911ec9e7589e502d17df3b794dd027d7e99a36b5115a0bb51389d9c3 SHA512 0053f0cb301c541326b66eb416dc548561a973ade993c055e7bc2acbdf28732e627a605061c8b487644026510f5b8395946bba209ddfd19230c960e9bb619f97 WHIRLPOOL 326a6716b150103fd0f40e5277d775875083a255cbea8c34fd0392dde2642410c7830c55c1bba0f62322c2f0fc68f5ca85dfe3fd6a8231223112ad89e3709c9f
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-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.ebuild b/media-sound/hydrogen/hydrogen-0.9.5.ebuild
new file mode 100644
index 000000000000..da33cd3648e2
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-0.9.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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? ( media-sound/jack-audio-connection-kit )
+	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
+}
+
+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..d77759037425
--- /dev/null
+++ b/media-sound/hydrogen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proaudio</herd>
+  <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..1befdd42268a
--- /dev/null
+++ b/media-sound/icecream/Manifest
@@ -0,0 +1 @@
+DIST icecream-1.3.tar.gz 17976 SHA256 2d687cc81990ff703ecfe595fefd8dfd1ce187b50fbd974e60d6234124e6e9ff
diff --git a/media-sound/icecream/icecream-1.3.ebuild b/media-sound/icecream/icecream-1.3.ebuild
new file mode 100644
index 000000000000..dfe1a76575f4
--- /dev/null
+++ b/media-sound/icecream/icecream-1.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b1fb858f25be
--- /dev/null
+++ b/media-sound/icecream/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..8a0ffea0813b
--- /dev/null
+++ b/media-sound/id3/Manifest
@@ -0,0 +1 @@
+DIST id3_0.15.orig.tar.gz 12871 RMD160 85a84f94012971bd79828dee179ffe171fe2eb07 SHA1 5095c2e8963071776adf10df92d94b3fa8934dd8 SHA256 2979c59f93ff3cfadf68d1785fbc62a21f1c296f4a44072a320f126841936c5d
diff --git a/media-sound/id3/id3-0.15.ebuild b/media-sound/id3/id3-0.15.ebuild
new file mode 100644
index 000000000000..310a3a695676
--- /dev/null
+++ b/media-sound/id3/id3-0.15.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/id3/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/id3ed/Manifest b/media-sound/id3ed/Manifest
new file mode 100644
index 000000000000..46a9d5c39cd2
--- /dev/null
+++ b/media-sound/id3ed/Manifest
@@ -0,0 +1 @@
+DIST id3ed-1.10.4.tar.gz 31610 RMD160 c01388bcde85c271ea1a9f1f07a2769913c40e18 SHA1 b699e645fcea2fa42658886621eb10531d24008a SHA256 56f26dfde7b6357c5ad22644c2a379f25fce82a200264b5d4ce62f2468d8431b
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..5e9f33be7755
--- /dev/null
+++ b/media-sound/id3ed/id3ed-1.10.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/id3ed/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/id3ted/Manifest b/media-sound/id3ted/Manifest
new file mode 100644
index 000000000000..4c54672397dd
--- /dev/null
+++ b/media-sound/id3ted/Manifest
@@ -0,0 +1 @@
+DIST id3ted-1.0b3.tar.gz 33023 SHA256 2a571ef96bc160e118e95441c3823870399a0a60681eb9e178bfffa651788ccd SHA512 6478ee5b6ba652687dd17828a039e8b6fc2b593285c01309c32dfcd7ec4e0e24c10288a195e9b95c47689c844f342498d5151904bd2e596de0e5ec73afa0bd7f WHIRLPOOL b864ea979d60ca8f6f9a9be544cfa81244953af9dd12354fb10bbba7f01714bed39643e70bc6268678ead0b74e04c1233787cd70650a7714ce676faa91b79bc7
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..e6602ecec024
--- /dev/null
+++ b/media-sound/id3ted/id3ted-1.0_beta3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs
+
+MY_P=${PN}-${PV/_beta/b}
+DESCRIPTION="A Command-line ID3 Tag Editor"
+HOMEPAGE="http://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..9506ae145cdb
--- /dev/null
+++ b/media-sound/id3ted/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</pkgmetadata>
+
diff --git a/media-sound/id3tool/Manifest b/media-sound/id3tool/Manifest
new file mode 100644
index 000000000000..6a51ea68cf61
--- /dev/null
+++ b/media-sound/id3tool/Manifest
@@ -0,0 +1 @@
+DIST id3tool-1.2a.tar.gz 74723 SHA256 7908d66c5aabe2a53ae8019e8234f4231485d80be4b2fe72c9d04013cff1caec
diff --git a/media-sound/id3tool/id3tool-1.2a.ebuild b/media-sound/id3tool/id3tool-1.2a.ebuild
new file mode 100644
index 000000000000..ef601bbd26d7
--- /dev/null
+++ b/media-sound/id3tool/id3tool-1.2a.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/id3tool/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/id3v2/Manifest b/media-sound/id3v2/Manifest
new file mode 100644
index 000000000000..d0fa48bb1d89
--- /dev/null
+++ b/media-sound/id3v2/Manifest
@@ -0,0 +1 @@
+DIST id3v2-0.1.12.tar.gz 121476 SHA256 8105fad3189dbb0e4cb381862b4fa18744233c3bbe6def6f81ff64f5101722bf
diff --git a/media-sound/id3v2/files/id3v2-0.1.11-alpha.patch b/media-sound/id3v2/files/id3v2-0.1.11-alpha.patch
new file mode 100644
index 000000000000..9cad2ac3e8e0
--- /dev/null
+++ b/media-sound/id3v2/files/id3v2-0.1.11-alpha.patch
@@ -0,0 +1,17 @@
+Prevent a segfault on alpha and any other arch that doesn't always get
+zero-initialized automatics.  Frankly the code in this segment looks
+pretty broken to me, but I'm just fixing the segfault...
+
+07 Feb 2004 agriffis
+
+--- id3v2.cpp	2004-05-04 20:30:15.000000000 +0200
++++ id3v2.cpp.alpha	2004-08-29 16:13:08.848513320 +0200
+@@ -423,7 +423,7 @@
+         {
+           // check if there is a total track number and if we only have 
+           // the track number for this file.  In this case combine them.
+-          char *currentTrackNum, *newTrackNum;
++          char *currentTrackNum, *newTrackNum = NULL;
+ 
+           if (pFrame != NULL) 
+           {
diff --git a/media-sound/id3v2/files/id3v2-0.1.11-makefile.patch b/media-sound/id3v2/files/id3v2-0.1.11-makefile.patch
new file mode 100644
index 000000000000..06a26a102b6c
--- /dev/null
+++ b/media-sound/id3v2/files/id3v2-0.1.11-makefile.patch
@@ -0,0 +1,23 @@
+Index: id3v2-0.1.11/Makefile
+===================================================================
+--- id3v2-0.1.11.orig/Makefile
++++ id3v2-0.1.11/Makefile
+@@ -3,14 +3,14 @@ all: id3v2
+ VERSION=0.1.11
+ 
+ PREFIX=	/usr/local
+-CXXFLAGS+=	-I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
+-LDFLAGS+=	-L${PREFIX}/lib/ 
++CXXFLAGS+=	-I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" $(OPT_CXXFLAGS) #-DSORT_RUNTIME
++LDFLAGS+=	-L${PREFIX}/lib/ $(OPT_LDFLAGS)
+ 
+ id3v2:	convert.o list.o id3v2.o genre.o
+-	c++ ${LDFLAGS} -pedantic -Wall -lz -lid3 -g -o $@ $^
++	$(CXX) $(LDFLAGS) -pedantic -Wall -o $@ $^ -lz -lid3
+ 
+ create_map: create_map.o
+-	c++ -Wall -g -o $@ $^
++	$(CXX) $(LDFLAGS) -o $@ $^
+ 
+ install: all
+ 	install -c -s id3v2 ${PREFIX}/bin/id3v2
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..601f65a677c9
--- /dev/null
+++ b/media-sound/id3v2/id3v2-0.1.12.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..0fb660950983
--- /dev/null
+++ b/media-sound/id3v2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..2d41b036ef84
--- /dev/null
+++ b/media-sound/ifp-gnome/Manifest
@@ -0,0 +1 @@
+DIST ifp-gnome-0.7.tar.gz 11287 SHA256 274793f76a667e1e5ee982aa04f9eea14068cdcb1b7adeb945412ea7e16770ba
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..95e055b3a89c
--- /dev/null
+++ b/media-sound/ifp-gnome/files/ifp-gnome-0.7-file-locations.patch
@@ -0,0 +1,47 @@
+--- ifp-gnome.py
++++ 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.ebuild b/media-sound/ifp-gnome/ifp-gnome-0.7.ebuild
new file mode 100644
index 000000000000..b4cdd74ba986
--- /dev/null
+++ b/media-sound/ifp-gnome/ifp-gnome-0.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+PYTHON_DEPEND=2
+inherit eutils python
+
+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=""
+
+RDEPEND=">=dev-python/libgnome-python-2
+	>=dev-python/pygtk-2
+	>=dev-python/pyifp-0.2.2"
+DEPEND=""
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs 2 ${PN}.py
+	epatch "${FILESDIR}"/${P}-file-locations.patch
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins ${PN}.{glade,png} || die
+	newbin ${PN}.py ${PN} || die
+}
diff --git a/media-sound/ifp-gnome/metadata.xml b/media-sound/ifp-gnome/metadata.xml
new file mode 100644
index 000000000000..5ddd82b6cb49
--- /dev/null
+++ b/media-sound/ifp-gnome/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..30e81ec15d59
--- /dev/null
+++ b/media-sound/imp3sh/Manifest
@@ -0,0 +1 @@
+DIST imp3sh-0.2.4.tar.gz 344331 SHA256 cc174a517abdc5029f397b329cde359038ebb935a139be8667406dd6b13e5729 SHA512 a5d48413d359bef280a090aef323d9abc9400ce08da86d24194881f6305ee82ceaa5226e19f476885792e9d0cc2a75f3edd4465c6fac7222e2a6e21ef0002a1f WHIRLPOOL 7918b050b6611a2b6ec04629cb21db6de6ef003393229fd8a761184f5416039db802146baa3ff9052e93c9d3c76332bb9224d44d9123c95aff79d06accba861f
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..15d06166d580
--- /dev/null
+++ b/media-sound/imp3sh/imp3sh-0.2.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs
+
+DESCRIPTION="flexible playlist manipulation shell and song player/streamer"
+HOMEPAGE="http://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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/imp3sh/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/jaaa/Manifest b/media-sound/jaaa/Manifest
new file mode 100644
index 000000000000..199504dd4c17
--- /dev/null
+++ b/media-sound/jaaa/Manifest
@@ -0,0 +1,3 @@
+DIST jaaa-0.4.2.tar.bz2 25307 SHA256 0bae72d819963c40e0a202bb08bc55a600fe7c453749601a3836bc9272cffb3a
+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
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..e5524b26acf1
--- /dev/null
+++ b/media-sound/jaaa/jaaa-0.4.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The 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..25c1d78734be
--- /dev/null
+++ b/media-sound/jaaa/jaaa-0.6.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The 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..16c525691966
--- /dev/null
+++ b/media-sound/jaaa/jaaa-0.8.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The 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"
+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.0
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.8.4-makefile.patch
+}
+
+src_compile() {
+	cd source || die
+	tc-export CC CXX
+	emake PREFIX=/usr
+}
+
+src_install() {
+	pushd source &>/dev/null || die
+	emake DESTDIR="${D}" PREFIX=/usr install
+	popd &>/dev/null || die
+	dodoc AUTHORS README
+}
diff --git a/media-sound/jaaa/metadata.xml b/media-sound/jaaa/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/jaaa/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..69e0a173fbca
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -0,0 +1,2 @@
+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
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..e8ce9bf247a7
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 \
+		$(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.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild
new file mode 100644
index 000000000000..7cec76766fe8
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/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 \
+		$(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..63276d7c70ea
--- /dev/null
+++ b/media-sound/jack-audio-connection-kit/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proaudio</herd>
+  <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 realime 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..45073a32f797
--- /dev/null
+++ b/media-sound/jack-keyboard/Manifest
@@ -0,0 +1 @@
+DIST jack-keyboard-2.5.tar.gz 108710 SHA256 430bb859eb4396eaae7bf94b738b8ea661a63768a9798169736cf9ad147af557 SHA512 2a8b45315f25080529dc667d869ae6bd6fe70345f74a10625e6ed6a13043333e495f37c53dc49d968533c65dfb0bd0f0a6b91eaa89e890ce492cb1f3da8c8009 WHIRLPOOL 1b46a900e6bfa7bee4c50795aa9f13d8d9d0063a7d2660d4f1772f5fbd9d7cba1b526443a3220cd539f2a33269ea69a519517674aca502f419ffcc5cd7e05243
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..a9f7e40f446f
--- /dev/null
+++ b/media-sound/jack-keyboard/jack-keyboard-2.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..66b06171fa91
--- /dev/null
+++ b/media-sound/jack-keyboard/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+<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..531cf2b3f7f3
--- /dev/null
+++ b/media-sound/jack-rack/Manifest
@@ -0,0 +1,3 @@
+DIST jack-rack-1.4.7.tar.gz 317474 SHA256 f0e8e1e5ebe1dbc9d89d57427f1dcb65094451ce8b7c8bf56799bf5ce4b8df64
+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
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..00e60a469e05
--- /dev/null
+++ b/media-sound/jack-rack/jack-rack-1.4.7-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a17f3dfdbef3
--- /dev/null
+++ b/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..0dc3775f83d7
--- /dev/null
+++ b/media-sound/jack-rack/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+</pkgmetadata>
diff --git a/media-sound/jack-smf-utils/Manifest b/media-sound/jack-smf-utils/Manifest
new file mode 100644
index 000000000000..9ad3c178a471
--- /dev/null
+++ b/media-sound/jack-smf-utils/Manifest
@@ -0,0 +1 @@
+DIST jack-smf-utils-1.0.tar.gz 120497 RMD160 f9c58a398d2c7210b800da7c1ecd38b5870dc2b1 SHA1 88533da65c3f6872b0a690f30da7f5ca635cfe59 SHA256 8f2a086fbb5935375590ac45310ca92f17b8d2684299b37b5366de1cbc167a71
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..45f92e85cc82
--- /dev/null
+++ b/media-sound/jack-smf-utils/jack-smf-utils-1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..bb34255979d6
--- /dev/null
+++ b/media-sound/jack-smf-utils/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+<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..e52c7bdb13fc
--- /dev/null
+++ b/media-sound/jack/Manifest
@@ -0,0 +1 @@
+DIST jack-3.1.1.tar.gz 318119 SHA256 fef030c4ba68a747d11e04c8ec4ca545563dbef519a6b23a3ebd6bb9bcb038cc SHA512 e34bec0ae89a7619e1f446d1259be06415f57697d1b925799d00554940b4cb6cb40eba9e6e7cf9f2f9eacddbed9fe7a9a48e395530c8a701be3979162a9379d7 WHIRLPOOL b7e43e0a422cb405409eb5f411f92d611c9c5922dd84a6749e8b784a4211bf9f6659cb52302adf3e90962b602b74c08f6f7ca9ddfea3e336c278f0827fe1664a
diff --git a/media-sound/jack/files/jack-3.0.0-python26.patch b/media-sound/jack/files/jack-3.0.0-python26.patch
new file mode 100644
index 000000000000..98701345f3b3
--- /dev/null
+++ b/media-sound/jack/files/jack-3.0.0-python26.patch
@@ -0,0 +1,12 @@
+--- jack_functions.py
++++ 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/jack-3.1.1-r1.ebuild b/media-sound/jack/jack-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..9bbef7dc6a8b
--- /dev/null
+++ b/media-sound/jack/jack-3.1.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils distutils
+
+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=""
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}
+	dev-python/cddb-py
+	dev-python/id3-py
+	dev-python/pyid3lib
+	dev-python/pyvorbis
+	media-libs/flac
+	media-sound/lame
+	media-sound/cdparanoia"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.0-python26.patch
+}
+
+src_install() {
+	distutils_src_install
+
+	dobin jack || die "dobin failed"
+
+	insinto $(python_get_sitedir)
+	PYTHON_MODNAME="$(ls jack_*.py)"
+	doins ${PYTHON_MODNAME}
+
+	newman jack.man jack.1
+
+	dodoc README doc/ChangeLog doc/TODO
+
+	dohtml doc/*html doc/*css doc/*gif
+}
diff --git a/media-sound/jack/metadata.xml b/media-sound/jack/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/jack/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/jackbeat/Manifest b/media-sound/jackbeat/Manifest
new file mode 100644
index 000000000000..6afa49bc7e67
--- /dev/null
+++ b/media-sound/jackbeat/Manifest
@@ -0,0 +1 @@
+DIST jackbeat-0.7.6.tar.gz 455771 SHA256 0f17d9fab398e87564da89a7e174005a3dd7e16980bb49f395a7f82c866ae6c4 SHA512 878cd545cd4d53b2e3ab6e4a8b60d81a94fba22cfaab3b694046b8d47d23ca5a87eaa31a242f76449a1ee647bc20b218563261ae37f5bfe291da2e31c63124bc WHIRLPOOL e3e47ef5c0e107f0149479ecd2bd3b9fa5595706fd577ad5cd89c40e3ef0dff18a42daec4529d254c29e79138924d5a6c1d8aae82b9305b9619c9f321614f8fe
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..85aad1a35eeb
--- /dev/null
+++ b/media-sound/jackbeat/jackbeat-0.7.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..0dc3775f83d7
--- /dev/null
+++ b/media-sound/jackbeat/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+</pkgmetadata>
diff --git a/media-sound/jalv/Manifest b/media-sound/jalv/Manifest
new file mode 100644
index 000000000000..bd9de71ddc7e
--- /dev/null
+++ b/media-sound/jalv/Manifest
@@ -0,0 +1,5 @@
+DIST jalv-1.0.0.tar.bz2 119985 SHA256 f9407e038413f6351a67b53cb47ea658d523ffec582bfe91406fec89a545b6b1 SHA512 d0ae31a5dce7edaf97da18c6fdbd999428cfc455abdce1d018abe08447a9ab2f4b5653e0ce80e091ddfddca05fbc82a9d8bc49f3164b656ef4fc63101a96a9a7 WHIRLPOOL dc2c5e38bf9d583f49e41cf14b145c16f13a6f74960b8a43564134fd19674a11d17689b80adec6862aac80319d960e5d14f205da76a33d26709d6999842fa6b5
+DIST jalv-1.2.0.tar.bz2 103393 SHA256 57e7e1510b594b112ddde07e29a46877c2db463483c6fba55a12738988cabd27 SHA512 b6069eb97953082cb8013cbe605dd5f9b0c7713c8abdca3101846e932ca1222618523153d5b9b5cf8db4bcec528543e4f69557f42375239f8b5b759a9bb3b58c WHIRLPOOL 88da65a45eecfa8be1f619439289ca05ff3e5ce08b7f1fa8e164cae794f7890cec6769222c1ccfff87ae2f753e410d98f20dcabc0f895a5145f0e685f1cf5e2b
+DIST jalv-1.4.0.tar.bz2 115677 SHA256 4061031d8052eff74fdacce995d88b2b1c4ef7a012e23c912006fd081d3209c3 SHA512 3a02eba555839ae2f9c7880745d03f7daa2a6c8db56db65fce7916417f3fac04cef5b1130cfe3787094f12eeb2a5190f6d71ed7defc34bc227f888a79e791eb3 WHIRLPOOL 02db30318966e0a80fc401117054b7c7929e24edd76fec24cf3397d8bf9d2186cf61ea6b32fa8c20ac314d8675aeb9e592fde6349d2383c13b091598caad6a24
+DIST jalv-1.4.4.tar.bz2 133234 SHA256 8e1e9c04dc9e7b787948aa96f2fe6ff1e04b87ea0cf6290d3ec8d52c4a0e14c7 SHA512 5fdead5375eb6d03c64fa35204b4ba00c48dc29fb53567558e5674a956a3f751e0d3b8c0012f6c105d69f69a8502f4996e5a0d1cbc9c1fbdd9b6a780b3cb2960 WHIRLPOOL 25eb71705f160ccefb8e320f1790b9c70a1a4c13ef9570d64c0f3120b5c2b46a07a91c83e36fc3b20df695cfbd73170a90231a9565889063ba6621aa3ec32867
+DIST jalv-1.4.6.tar.bz2 133878 SHA256 893e0cd7ba6090d615646eec197b4302f0b7832ab69e3417e2f10f4b0e6630b8 SHA512 d31e4d5aa91513f977a54787af0dec0f01f5befdf14579063a8389141a02eb0218340ad13e174643da859f4c621c4d4711a765627dfd77b085e400378ea4d8bc WHIRLPOOL a3566ea6e3f080fc56d67d1a527412e30007624790f18a655bd7da42afe3108352244bb1c85c3d08f301b69a4f500d264bc226102b4ea97f1e070e95df24aff3
diff --git a/media-sound/jalv/jalv-1.0.0.ebuild b/media-sound/jalv/jalv-1.0.0.ebuild
new file mode 100644
index 000000000000..05093d235d6d
--- /dev/null
+++ b/media-sound/jalv/jalv-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 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 gtkmm qt4"
+
+RDEPEND="media-libs/lv2
+	>=media-libs/lilv-0.14.0
+	>=dev-libs/serd-0.4.5
+	>=media-libs/suil-0.6.0
+	>=media-libs/sratom-0.2.0
+	>=media-sound/jack-audio-connection-kit-0.120.0
+	gtk? ( >=x11-libs/gtk+-2.18.0:2 )
+	gtkmm? ( >=dev-cpp/gtkmm-2.20.0:2.4 )
+	qt4? ( dev-qt/qtgui:4 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_configure() {
+	# otherwise automagic
+	use gtk || sed -i -e 's/gtk+-2.0/DiSaBlEd/' wscript
+	use gtkmm || sed -i -e 's/gtkmm-2.4/DiSaBlEd/' wscript
+	use qt4 || sed -i -e 's/QtGui/DiSaBlEd/' wscript
+	waf-utils_src_configure \
+		"--docdir=/usr/share/doc/${PF}"
+}
diff --git a/media-sound/jalv/jalv-1.2.0.ebuild b/media-sound/jalv/jalv-1.2.0.ebuild
new file mode 100644
index 000000000000..10d8c7e2f17b
--- /dev/null
+++ b/media-sound/jalv/jalv-1.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 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 qt4"
+
+RDEPEND=">=media-libs/lv2-1.0.15
+	>=media-libs/lilv-0.14.0
+	>=dev-libs/serd-0.5.0
+	>=media-libs/suil-0.6.0
+	>=media-libs/sratom-0.2.0
+	>=media-sound/jack-audio-connection-kit-0.120.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 )
+	qt4? ( dev-qt/qtgui:4 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_configure() {
+	# otherwise automagic
+	use gtk || sed -i -e 's/gtk+-3.0/DiSaBlEd/' wscript
+	use gtk2 || sed -i -e 's/gtk+-2.0/DiSaBlEd/' wscript
+	use gtkmm || sed -i -e 's/gtkmm-2.4/DiSaBlEd/' wscript
+	use qt4 || sed -i -e 's/QtGui/DiSaBlEd/' wscript
+	waf-utils_src_configure \
+		"--docdir=/usr/share/doc/${PF}"
+}
diff --git a/media-sound/jalv/jalv-1.4.0.ebuild b/media-sound/jalv/jalv-1.4.0.ebuild
new file mode 100644
index 000000000000..69c57e335d91
--- /dev/null
+++ b/media-sound/jalv/jalv-1.4.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 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 qt4"
+
+RDEPEND=">=media-libs/lv2-1.3.0
+	>=media-libs/lilv-0.15.1
+	>=dev-libs/serd-0.14.0
+	>=dev-libs/sord-0.12.0
+	>=media-libs/suil-0.6.0
+	>=media-libs/sratom-0.4.0
+	>=media-sound/jack-audio-connection-kit-0.120.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 )
+	qt4? ( dev-qt/qtgui:4 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_configure() {
+	# otherwise automagic
+	use gtk || sed -i -e 's/gtk+-3.0/DiSaBlEd/' wscript
+	use gtk2 || sed -i -e 's/gtk+-2.0/DiSaBlEd/' wscript
+	use gtkmm || sed -i -e 's/gtkmm-2.4/DiSaBlEd/' wscript
+	use qt4 || sed -i -e 's/QtGui/DiSaBlEd/' wscript
+	waf-utils_src_configure \
+		"--docdir=/usr/share/doc/${PF}"
+}
diff --git a/media-sound/jalv/jalv-1.4.4.ebuild b/media-sound/jalv/jalv-1.4.4.ebuild
new file mode 100644
index 000000000000..14ac57c49af1
--- /dev/null
+++ b/media-sound/jalv/jalv-1.4.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 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 qt4"
+
+RDEPEND=">=media-libs/lv2-1.6.0
+	>=media-libs/lilv-0.15.1
+	>=dev-libs/serd-0.14.0
+	>=dev-libs/sord-0.12.0
+	>=media-libs/suil-0.6.0
+	>=media-libs/sratom-0.4.0
+	>=media-sound/jack-audio-connection-kit-0.120.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 )
+	qt4? ( dev-qt/qtgui:4 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_configure() {
+	# otherwise automagic
+	use gtk || sed -i -e 's/gtk+-3.0/DiSaBlEd/' wscript
+	use gtk2 || sed -i -e 's/gtk+-2.0/DiSaBlEd/' wscript
+	use gtkmm || sed -i -e 's/gtkmm-2.4/DiSaBlEd/' wscript
+	use qt4 || sed -i -e 's/QtGui/DiSaBlEd/' wscript
+	waf-utils_src_configure \
+		"--docdir=/usr/share/doc/${PF}"
+}
diff --git a/media-sound/jalv/jalv-1.4.6.ebuild b/media-sound/jalv/jalv-1.4.6.ebuild
new file mode 100644
index 000000000000..14ac57c49af1
--- /dev/null
+++ b/media-sound/jalv/jalv-1.4.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 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 qt4"
+
+RDEPEND=">=media-libs/lv2-1.6.0
+	>=media-libs/lilv-0.15.1
+	>=dev-libs/serd-0.14.0
+	>=dev-libs/sord-0.12.0
+	>=media-libs/suil-0.6.0
+	>=media-libs/sratom-0.4.0
+	>=media-sound/jack-audio-connection-kit-0.120.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 )
+	qt4? ( dev-qt/qtgui:4 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_configure() {
+	# otherwise automagic
+	use gtk || sed -i -e 's/gtk+-3.0/DiSaBlEd/' wscript
+	use gtk2 || sed -i -e 's/gtk+-2.0/DiSaBlEd/' wscript
+	use gtkmm || sed -i -e 's/gtkmm-2.4/DiSaBlEd/' wscript
+	use qt4 || sed -i -e 's/QtGui/DiSaBlEd/' wscript
+	waf-utils_src_configure \
+		"--docdir=/usr/share/doc/${PF}"
+}
diff --git a/media-sound/jalv/metadata.xml b/media-sound/jalv/metadata.xml
new file mode 100644
index 000000000000..a07c92332af9
--- /dev/null
+++ b/media-sound/jalv/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+
+<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..913336ae873f
--- /dev/null
+++ b/media-sound/jamin/Manifest
@@ -0,0 +1 @@
+DIST jamin-0.95.0.tar.gz 1007290 SHA256 762fee88682f27888e46dfb013a9ab5e798533b9b67643ff1d7760501939bb3c
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..c5db949929a9
--- /dev/null
+++ b/media-sound/jamin/files/jamin-0.95.0-multilib-strict.patch
@@ -0,0 +1,11 @@
+--- controller/Makefile.in.old	2007-02-24 20:08:10.000000000 +0100
++++ controller/Makefile.in	2007-02-24 20:08:33.000000000 +0100
+@@ -228,7 +228,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 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..272750c29f20
--- /dev/null
+++ b/media-sound/jamin/jamin-0.95.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/metadata.xml b/media-sound/jamin/metadata.xml
new file mode 100644
index 000000000000..f5edf9bf1515
--- /dev/null
+++ b/media-sound/jamin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<upstream>
+		<remote-id type="sourceforge">jamin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/jokosher/Manifest b/media-sound/jokosher/Manifest
new file mode 100644
index 000000000000..579ac40c4bd7
--- /dev/null
+++ b/media-sound/jokosher/Manifest
@@ -0,0 +1 @@
+DIST jokosher-0.11.5.tar.gz 1265726 SHA256 489e0d06c28c3a11b817e7d6e49573ad4942a9cd426ad62dbbf94f3cca03dedb SHA512 b00728abe74c76a1fcfd6f70fea542add43629c40c1b55f41496e3bf940e09a3f57c1028eac458c10e68a43e3eb40f8ee5ae3102d1d931e5a6edff0f3ff1ca8d WHIRLPOOL 08eeab42dc950019bbf9d0760a4fc01bf7e0ec0f9afc1eadc37665d29ed709da0650f6839768e9156df5b21f935fb228f8a1c35cf21a7b4999df22bf039531b2
diff --git a/media-sound/jokosher/files/jokosher-0.11.1-update-database.patch b/media-sound/jokosher/files/jokosher-0.11.1-update-database.patch
new file mode 100644
index 000000000000..287765b04fc5
--- /dev/null
+++ b/media-sound/jokosher/files/jokosher-0.11.1-update-database.patch
@@ -0,0 +1,31 @@
+diff -ur jokosher-0.11.1.orig/setup.py jokosher-0.11.1/setup.py
+--- jokosher-0.11.1.orig/setup.py	2009-03-17 05:19:23.000000000 +0200
++++ jokosher-0.11.1/setup.py	2009-05-12 09:43:39.000000000 +0300
+@@ -93,27 +93,6 @@
+ 		call(["scrollkeeper-preinstall", HELPURI[fileNum],
+ 			installedOmfFiles[fileNum], installedOmfFiles[fileNum]])
+ 		
+-	#Update the scrollkeeper catalog
+-	if os.geteuid() == 0:
+-		print "Updating the scrollkeeper index..."
+-		call(["scrollkeeper-update", "-o", installroot + omfdir])
+-
+-# Update the mime types
+-if os.geteuid() == 0 and dist != None:
+-	print "Updating the mime-types...."
+-	
+-	#update the mimetypes database
+-	try:
+-	    call(["update-mime-database", "/usr/share/mime/"])
+-	except:
+-	    pass
+-	
+-	#update the .desktop file database
+-	try:
+-	   call(["update-desktop-database"])
+-	except:
+-	    pass
+-
+ print "\nInstallation finished! You can now run Jokosher by typing 'jokosher' or through your applications menu icon."
+ 	
+ ## To uninstall manually delete these files/folders:
diff --git a/media-sound/jokosher/files/jokosher-0.11.5-cairo.patch b/media-sound/jokosher/files/jokosher-0.11.5-cairo.patch
new file mode 100644
index 000000000000..a327283b145d
--- /dev/null
+++ b/media-sound/jokosher/files/jokosher-0.11.5-cairo.patch
@@ -0,0 +1,30 @@
+--- jokosher-0.11.5/Jokosher/Project.py.orig	2010-04-11 17:54:15.000000000 +0100
++++ jokosher-0.11.5/Jokosher/Project.py	2010-12-04 14:51:17.000000000 +0000
+@@ -787,7 +787,7 @@
+ 		params = doc.createElement("Parameters")
+ 		head.appendChild(params)
+ 		
+-		items = ["viewScale", "viewStart", "name", "author",
++		items = ["viewScale", "viewStart", "name", "author", "volume",
+ 		         "transportMode", "bpm", "meter_nom", "meter_denom", "projectfile"]
+ 		
+ 		Utils.StoreParametersToXML(self, doc, params, items)
+--- jokosher-0.11.5/Jokosher/VUWidget.py.orig	2010-03-04 19:46:54.000000000 +0000
++++ jokosher-0.11.5/Jokosher/VUWidget.py	2010-12-04 14:51:17.000000000 +0000
+@@ -307,6 +307,7 @@
+ 		
+ 		ctx = widget.window.cairo_create()
+ 		
++		ctx.save()
+ 		rect = self.get_allocation()
+ 
+ 		# Fill a black background		
+@@ -321,7 +322,7 @@
+ 		ctx.paint()
+ 
+ 		# Reset the clip region
+-		ctx.reset_clip()
++		ctx.restore()
+ 		
+ 		# Draw the current volume level bar, with highlight if appropriate
+ 		vpos = self.__GetVolumeHandleYPos()
diff --git a/media-sound/jokosher/jokosher-0.11.5-r1.ebuild b/media-sound/jokosher/jokosher-0.11.5-r1.ebuild
new file mode 100644
index 000000000000..07c09a0e208d
--- /dev/null
+++ b/media-sound/jokosher/jokosher-0.11.5-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL="yes"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 distutils-r1
+
+DESCRIPTION="A simple yet powerful multi-track studio"
+HOMEPAGE="http://www.jokosher.org"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="gnome"
+
+# NOTE: setuptools are a runtime requirement as the app
+#       loads its extensions via pkg_resources
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/gst-python-0.10.8:0.10[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+	gnome-base/librsvg
+	>=media-libs/gnonlin-0.10.9:0.10
+	>=media-libs/gst-plugins-good-0.10.6:0.10
+	>=media-libs/gst-plugins-bad-0.10.5:0.10
+	>=media-plugins/gst-plugins-alsa-0.10.14:0.10
+	>=media-plugins/gst-plugins-flac-0.10.6:0.10
+	gnome? ( >=media-plugins/gst-plugins-gnomevfs-0.10.14:0.10 )
+	>=media-plugins/gst-plugins-lame-0.10.6:0.10
+	>=media-plugins/gst-plugins-ogg-0.10.14:0.10
+	>=media-plugins/gst-plugins-vorbis-0.10.14:0.10
+	>=media-plugins/gst-plugins-ladspa-0.10.5:0.10
+	x11-themes/hicolor-icon-theme
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.11.1-update-database.patch \
+		"${FILESDIR}"/${P}-cairo.patch
+	gnome2_src_prepare
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	distutils-r1_src_configure
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+}
diff --git a/media-sound/jokosher/metadata.xml b/media-sound/jokosher/metadata.xml
new file mode 100644
index 000000000000..42f09df9bad2
--- /dev/null
+++ b/media-sound/jokosher/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="launchpad">jokosher</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/jtagger/Manifest b/media-sound/jtagger/Manifest
new file mode 100644
index 000000000000..f0457877ae97
--- /dev/null
+++ b/media-sound/jtagger/Manifest
@@ -0,0 +1 @@
+DIST jtagger-1.0.zip 458575 SHA256 9cce80aeb2129cc04900c30f66558400aacb4c107376ef3b99dc8652e2457933 SHA512 abd6a6b2025b292520c302ca82d3e26ebf1243421749bf62406880d5566390c3dda8ec878b21dce1c5bf697c409a0b213b5243d32a5d040fe7f4d83f03a9ebcd WHIRLPOOL b059f4543944e05cfc015586a5ece2881f86a2a1d5bcd6b34ba71d7f9a9ec2fb2a2d6c3d7c8e2a6a843d5f3209ba7eb12e9f6ea491725e7e327a94ae7a3e3341
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..367313c547ff
--- /dev/null
+++ b/media-sound/jtagger/jtagger-1.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f467e695da5e
--- /dev/null
+++ b/media-sound/jtagger/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<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..6b772982ef03
--- /dev/null
+++ b/media-sound/justeport/Manifest
@@ -0,0 +1 @@
+DIST JustePort-0.2.tar.gz 16181 RMD160 385ef76c5cac47fad66e1a40c520484ee6e0356e SHA1 8d83daeb636ff40a4b27808c6e94599d5d557220 SHA256 5576bae0da54cb1ecf384bfbafaabbd19e5933bfafb77a4dbc0b69f143381b0a
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..8382a6dcedfc
--- /dev/null
+++ b/media-sound/justeport/justeport-0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..ae573a60407f
--- /dev/null
+++ b/media-sound/justeport/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/k4guitune/Manifest b/media-sound/k4guitune/Manifest
new file mode 100644
index 000000000000..7cc4cc7ae639
--- /dev/null
+++ b/media-sound/k4guitune/Manifest
@@ -0,0 +1 @@
+DIST 117669-k4guitune-1.1.1.tar.gz 189593 SHA256 1fcbf28c87c3127864baae19458fdc70f96755b0ccbaddb0de2be8d0437e37a1
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..ab5d59910fdf
--- /dev/null
+++ b/media-sound/k4guitune/k4guitune-1.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK=optional
+inherit kde4-base
+
+DESCRIPTION="A program to tune a musical instrument using your computer and it'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"
+
+DEPEND="=sci-libs/fftw-3*"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=( "${FILESDIR}/${P}-desktop_entry.patch" )
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	sed -e '/set[[:space:]]*([[:space:]]*HTML_INSTALL_DIR/s/^/# DISABLED /' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_build handbook doc)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/k4guitune/metadata.xml b/media-sound/k4guitune/metadata.xml
new file mode 100644
index 000000000000..3f15b98a4e84
--- /dev/null
+++ b/media-sound/k4guitune/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <herd>kde</herd>
+</pkgmetadata>
diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest
new file mode 100644
index 000000000000..109d80eb6599
--- /dev/null
+++ b/media-sound/karlyriceditor/Manifest
@@ -0,0 +1,2 @@
+DIST karlyriceditor-1.3.tar.gz 215564 SHA256 f59bc9352e30a02228db65d47e190aa00e6f8e7f6ec18b093a30841548b90e57 SHA512 23e91e6f950b4f3d5ddaa474380dfd5904bd29f262144df6d587efbba070e1c84bd6d364981e0babb75aa4562c375734b16944817e49ad83ab0c169cf9d2e0e5 WHIRLPOOL d71b7111e2bf57a995acb10de14c39bce37c8f8072936812d8d672540dd22650ce1259cffccecfe6231ca0a3cba87546cd00247247bdc2b6deeb58f2e6c11c10
+DIST karlyriceditor-1.4.tar.gz 236662 SHA256 b458eb21087cd0d92e8ea87b4ac094a2126cfbcf6471b0b1ea03173cec0ebfef SHA512 ac92e8f67be46880e71082ae1b2d099deb15ca1abca1fdf7eb8539d0346ca223ee50d9739f7879699fb190e7bc544c2a753402804df20c9b4c35eefae2d3bdbb WHIRLPOOL 9072da5010deb34fe9e09dee165f824b3aeace89a3fd0c1b464def17cf767a5ee84a77d7b2f8696f81364be5bc54003243faba3870198ba084b98e3bc2207984
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.3-libav.patch b/media-sound/karlyriceditor/files/karlyriceditor-1.3-libav.patch
new file mode 100644
index 000000000000..d3f63d51b522
--- /dev/null
+++ b/media-sound/karlyriceditor/files/karlyriceditor-1.3-libav.patch
@@ -0,0 +1,10 @@
+--- src/ffmpeg_headers.h
++++ src/ffmpeg_headers.h
+@@ -32,6 +32,7 @@
+ 
+ #include "libavcodec/avcodec.h"
+ #include "libavformat/avformat.h"
++#include "libavutil/mathematics.h"
+ #include "libswscale/swscale.h"
+ 
+ };
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.4-ffmpeg_compat.patch b/media-sound/karlyriceditor/files/karlyriceditor-1.4-ffmpeg_compat.patch
new file mode 100644
index 000000000000..9711f9e556f9
--- /dev/null
+++ b/media-sound/karlyriceditor/files/karlyriceditor-1.4-ffmpeg_compat.patch
@@ -0,0 +1,37 @@
+Index: karlyriceditor-1.4/src/ffmpegvideoencoder.cpp
+===================================================================
+--- karlyriceditor-1.4.orig/src/ffmpegvideoencoder.cpp
++++ karlyriceditor-1.4/src/ffmpegvideoencoder.cpp
+@@ -397,6 +397,13 @@ int FFMpegVideoEncoderPriv::encodeImage(
+ 	// SWS conversion
+ 	convertImage_sws(img);
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,2,0)
++	int out_size = avcodec_encode_video(pVideoCodecCtx,outbuf,outbuf_size,ppicture);
++
++	if (out_size > 0)
++	{
++		av_init_packet(&pkt);
++#else
+ 	av_init_packet( &pkt );
+ 	pkt.data = NULL;
+ 	pkt.size = 0;
+@@ -408,6 +415,7 @@ int FFMpegVideoEncoderPriv::encodeImage(
+ 
+ 	if ( got_packet )
+ 	{
++#endif
+ 		if ( pVideoCodecCtx->coded_frame->pts != (int64_t) (0x8000000000000000LL) )
+ 			pkt.pts= av_rescale_q(pVideoCodecCtx->coded_frame->pts, pVideoCodecCtx->time_base, pVideoStream->time_base);
+ 
+@@ -415,6 +423,10 @@ int FFMpegVideoEncoderPriv::encodeImage(
+ 			pkt.flags |= AV_PKT_FLAG_KEY;
+ 
+ 		pkt.stream_index = pVideoStream->index;
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54,2,0)
++		pkt.data = outbuf;
++		pkt.size = out_size;
++#endif
+ 
+ 		int ret = av_interleaved_write_frame(pOutputCtx, &pkt);
+ 
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.4-qmin.patch b/media-sound/karlyriceditor/files/karlyriceditor-1.4-qmin.patch
new file mode 100644
index 000000000000..b7835e5973ac
--- /dev/null
+++ b/media-sound/karlyriceditor/files/karlyriceditor-1.4-qmin.patch
@@ -0,0 +1,13 @@
+Index: karlyriceditor-1.4/src/kfn_file_parser.cpp
+===================================================================
+--- karlyriceditor-1.4.orig/src/kfn_file_parser.cpp
++++ karlyriceditor-1.4/src/kfn_file_parser.cpp
+@@ -311,7 +311,7 @@ QByteArray KFNFileParser::extract( const
+ 
+ 	while ( total_in < entry.length_in )
+ 	{
+-		int toRead = qMin( sizeof(buffer), (unsigned int) entry.length_in - total_in );
++		int toRead = qMin( sizeof(buffer), (size_t) entry.length_in - total_in );
+ 		int bytesRead = m_file.read( buffer, toRead );
+ 
+ 		// We might need to write less than we read since the file is rounded to 16 bytes
diff --git a/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild b/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild
new file mode 100644
index 000000000000..b9afaa040457
--- /dev/null
+++ b/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils qt4-r2
+
+DESCRIPTION="A program which lets you edit and synchronize lyrics with karaoke songs in varions formats"
+HOMEPAGE="http://www.karlyriceditor.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/openssl:0
+	media-libs/libsdl
+	>=virtual/ffmpeg-0.9
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-libav.patch" )
+
+src_install() {
+	dodoc Changelog
+	dobin bin/${PN}
+	doicon packages/${PN}.png
+	make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
+}
diff --git a/media-sound/karlyriceditor/karlyriceditor-1.4.ebuild b/media-sound/karlyriceditor/karlyriceditor-1.4.ebuild
new file mode 100644
index 000000000000..b564adff9553
--- /dev/null
+++ b/media-sound/karlyriceditor/karlyriceditor-1.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qt4-r2
+
+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=""
+
+RDEPEND="
+	dev-libs/openssl:0
+	media-libs/libsdl
+	>=virtual/ffmpeg-0.10
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+		"${FILESDIR}/${PN}-1.3-libav.patch"
+		"${FILESDIR}/${PN}-1.4-ffmpeg_compat.patch"
+		"${FILESDIR}/${PN}-1.4-qmin.patch"
+		)
+
+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..b060190a0f50
--- /dev/null
+++ b/media-sound/karlyriceditor/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<herd>qt</herd>
+	<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..59b804970bf4
--- /dev/null
+++ b/media-sound/kaudiocreator/Manifest
@@ -0,0 +1 @@
+DIST 107645-kaudiocreator-1.3.tar.bz2 310937 SHA256 f0f13bea35ef5faf3fa3443701c0671f0fc89b5d3478fe286b32435df598ed70 SHA512 41df88f9d5a36fb33b516a6559218412e971ea65cdeff18cfb91acc78cf519a5af15821977e427df99c2d8d1b54f18790112a008097b720cd724d15fa8bcaaa0 WHIRLPOOL 43628ce619ccaa79d56e792287a42c72839c6d56fbc6df3d5aef4a0012b5525f2d6539db4e408c297aa07158733a206b64fcd3d8aa6a677d0f66af21cf6bab0e
diff --git a/media-sound/kaudiocreator/kaudiocreator-1.3-r2.ebuild b/media-sound/kaudiocreator/kaudiocreator-1.3-r2.ebuild
new file mode 100644
index 000000000000..6c63505b4385
--- /dev/null
+++ b/media-sound/kaudiocreator/kaudiocreator-1.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="af ar be bg br bs ca ca@valencia cs cy da de el en_GB eo es et eu
+fa fi fr ga gl hi hne hr is it ja kk km lt lv mai mk ms nb nds ne nl nn oc pa
+pl pt_BR pt ro ru se sk sl sr@ijekavianlatin sr@ijekavian sr@Latn sr sv ta tg
+th tr ug uk xh zh_CN zh_HK zh_TW"
+inherit kde4-base
+
+DESCRIPTION="KDE CD ripper and audio encoder frontend"
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=107645"
+SRC_URI="http://www.kde-apps.org/CONTENT/content-files/107645-${P}.tar.bz2"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+COMMON_DEPEND="
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	media-libs/libdiscid
+	>=media-libs/taglib-1.5
+"
+
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdebase_dep kdelibs 'udev,udisks(+)')
+	$(add_kdeapps_dep audiocd-kio)
+"
+DEPEND="${COMMON_DEPEND}"
+
+DOCS=( Changelog TODO )
diff --git a/media-sound/kaudiocreator/metadata.xml b/media-sound/kaudiocreator/metadata.xml
new file mode 100644
index 000000000000..ede2e3c0508d
--- /dev/null
+++ b/media-sound/kaudiocreator/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/kenvy24/Manifest b/media-sound/kenvy24/Manifest
new file mode 100644
index 000000000000..233e3d7d31a9
--- /dev/null
+++ b/media-sound/kenvy24/Manifest
@@ -0,0 +1 @@
+DIST kenvy24-1.2-src.tgz 701921 SHA256 6482bf008adffad4360bd85c3baee3c93450553be42ed65ef333e4a74150fbad
diff --git a/media-sound/kenvy24/kenvy24-1.2.ebuild b/media-sound/kenvy24/kenvy24-1.2.ebuild
new file mode 100644
index 000000000000..2762bb10f016
--- /dev/null
+++ b/media-sound/kenvy24/kenvy24-1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://kenvy24.wiki.sourceforge.net/"
+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..b33fb2b8cf32
--- /dev/null
+++ b/media-sound/kenvy24/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<herd>kde</herd>
+	<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..6285a49f20d0
--- /dev/null
+++ b/media-sound/kid3/Manifest
@@ -0,0 +1,2 @@
+DIST kid3-3.1.2.tar.gz 1109060 SHA256 085097a653877ef56dd719083da1ab005944826ce215141fe3f6d4285e5f6246 SHA512 5f6912bd4e7e2e8e641e001fcb487489e7ea0861a3d6cda02388a3774ef010d6db1803d701e2befc824d86f347d6a29b05750d5d7a186cd7cf877f2848205677 WHIRLPOOL 01dd5e1ae09893058250cf85c24a61ea64cd76a5baa124b32d1f7b13a7f67cc4c11ca1ecfc6eb98a6036ea31be59baa2fa09bb4aecca831d8c1432a9f3018023
+DIST kid3-3.2.1.tar.gz 1215072 SHA256 da686929b5329f910b96b4fd1a10d490ffac4a604be22a795405460871afe494 SHA512 1ef6f432ac9f6e1c9ae1a400f8f8a34f8cabab76e0c501dca5cd56df5e675dc15109f978dc0f1f86ebd873d96194a7f39945f84d1c84385ee523da3680438180 WHIRLPOOL 98dc4e7ce84c14a71bc4b0499d4cb1be385dca1fdd2ef39674cea242b733767cb6b74e3bb69d28b4e6406400c556c4d75cfb4006569cadc3c033719b60acd7a0
diff --git a/media-sound/kid3/kid3-3.1.2.ebuild b/media-sound/kid3/kid3-3.1.2.ebuild
new file mode 100644
index 000000000000..723169de5a30
--- /dev/null
+++ b/media-sound/kid3/kid3-3.1.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="cs de es et fi fr it nl pl ru sr sr@ijekavian sr@ijekavianlatin
+sr@Latn tr zh_CN zh_TW"
+KDE_REQUIRED="optional"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A simple tag editor for KDE"
+HOMEPAGE="http://kid3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="acoustid flac kde mp3 mp4 +phonon +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	sys-libs/readline:0
+	acoustid? (
+		media-libs/chromaprint
+		virtual/ffmpeg
+	)
+	flac? (
+		media-libs/flac[cxx]
+		media-libs/libvorbis
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2:0 )
+	phonon? ( || (
+		media-libs/phonon[qt4]
+		dev-qt/qtphonon:4
+	) )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with acoustid CHROMAPRINT)
+		$(cmake-utils_use_with flac)
+		$(cmake-utils_use_with mp3 ID3LIB)
+		$(cmake-utils_use_with mp4 MP4V2)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with taglib)
+		$(cmake-utils_use_with vorbis)
+		"-DWITH_QT5=OFF"
+	)
+
+	if use kde; then
+		mycmakeargs+=("-DWITH_APPS=KDE;CLI")
+	else
+		mycmakeargs+=("-DWITH_APPS=Qt;CLI")
+	fi
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/kid3/kid3-3.2.1.ebuild b/media-sound/kid3/kid3-3.2.1.ebuild
new file mode 100644
index 000000000000..f6be3bc94ba6
--- /dev/null
+++ b/media-sound/kid3/kid3-3.2.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="cs de es et fi fr it nl pl ru sr sr@ijekavian sr@ijekavianlatin
+sr@Latn tr zh_CN zh_TW"
+KDE_REQUIRED="optional"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A simple tag editor for KDE"
+HOMEPAGE="http://kid3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid flac kde mp3 mp4 +phonon +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	sys-libs/readline:0
+	acoustid? (
+		media-libs/chromaprint
+		virtual/ffmpeg
+	)
+	flac? (
+		media-libs/flac[cxx]
+		media-libs/libvorbis
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2:0 )
+	phonon? ( || (
+		media-libs/phonon[qt4]
+		dev-qt/qtphonon:4
+	) )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with acoustid CHROMAPRINT)
+		$(cmake-utils_use_with flac)
+		$(cmake-utils_use_with mp3 ID3LIB)
+		$(cmake-utils_use_with mp4 MP4V2)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with taglib)
+		$(cmake-utils_use_with vorbis)
+		"-DWITH_QT5=OFF"
+	)
+
+	if use kde; then
+		mycmakeargs+=("-DWITH_APPS=KDE;CLI")
+	else
+		mycmakeargs+=("-DWITH_APPS=Qt;CLI")
+	fi
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
new file mode 100644
index 000000000000..456baec68635
--- /dev/null
+++ b/media-sound/kid3/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>kde</herd>
+  <herd>sound</herd>
+  <use>
+    <flag name='acoustid'>Enable support for acoustic fingerprinting plugin using
+      (<pkg>media-libs/chromaprint</pkg>)</flag>
+	<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg> or <pkg>dev-qt/qtphonon</pkg></flag>
+  </use>
+  <upstream>
+    <bugs-to>http://sourceforge.net/tracker/?group_id=70849</bugs-to>
+    <remote-id type="sourceforge">kid3</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/kmetronome/Manifest b/media-sound/kmetronome/Manifest
new file mode 100644
index 000000000000..155608e28027
--- /dev/null
+++ b/media-sound/kmetronome/Manifest
@@ -0,0 +1,2 @@
+DIST kmetronome-0.10.1.tar.bz2 201241 SHA256 76907378433fe1e7041ba575b4cef8132819a3eed63373e1c2d4bfc746eb2d30 SHA512 27203f2a85e13cb61ccb214f445c9ce51c4b101a0114e6bf0133128a8998886b73b38c6215ee51c095de7494933706043c925d5be7a268c17a9086cabea78b86 WHIRLPOOL 759819de4d1586f616e210be69baaf36f42f464224f8247b809c1d85c7dd5090934fff6110d3b34a885b67b2815df9b79574e3c63167c069cd2432aff8533e69
+DIST kmetronome-1.0.0.tar.bz2 225715 SHA256 8b8acc5af534679ae947ee4b0fd415c298aecaefcef174988ea1f211c8d56e9f SHA512 69290c56119de78a75863c8afd891fbff2d26eeb739a5e65938ba6238e522b1fb79edc6ac0264b912cb70bc3028a6245ab16cc3d22f19e30ea9a33817589f426 WHIRLPOOL 24f769381bd8bdfcffeeb3b7bc8c9bbed8f9f04e74439f1694f7bbde348c3c8c8dcfc276d51eaadc9fee04b02d40b05338cba32de67193e4738035f793a3074e
diff --git a/media-sound/kmetronome/kmetronome-0.10.1-r1.ebuild b/media-sound/kmetronome/kmetronome-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..37fec1640394
--- /dev/null
+++ b/media-sound/kmetronome/kmetronome-0.10.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="cs de es fr tr"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="MIDI based metronome using ALSA sequencer"
+HOMEPAGE="http://kmetronome.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="
+	media-libs/alsa-lib
+	media-sound/drumstick
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_configure() {
+	mycmakeargs=(
+		-DSTATIC_DRUMSTICK=OFF
+	)
+
+	kde4-base_src_configure
+}
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..d0911153cc31
--- /dev/null
+++ b/media-sound/kmetronome/kmetronome-1.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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..9a940c2c43f6
--- /dev/null
+++ b/media-sound/kmetronome/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<herd>sound</herd>
+	<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..36ed214b6445
--- /dev/null
+++ b/media-sound/kmid/Manifest
@@ -0,0 +1 @@
+DIST kmid-2.4.0.tar.bz2 577246 SHA256 44c4cf65d011d38e278e8f4d8e03e17ed1cfb7c76c33916f890a1f46d17de43b SHA512 1a25ddae7133c492a6141795b3f87c49ed7c2621c97c163addc4c6328185710e65e526af7d87e0623e67eb48e3feace11da1047f7475dff8768406c219fb3ad0 WHIRLPOOL 81b7bc6f896e257201b0735592320f34e28a4f7818470243ee051750c88d8b1f35680f6adde6a06e640e0132d4c1a2894b94e2cf9ced06ae0387f6d50bf6a0a2
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..9ac845baaed7
--- /dev/null
+++ b/media-sound/kmid/kmid-2.4.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 for KDE"
+HOMEPAGE="http://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..3f64f0879217
--- /dev/null
+++ b/media-sound/kmid/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<herd>sound</herd>
+	<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..38be796e9992
--- /dev/null
+++ b/media-sound/kmidimon/Manifest
@@ -0,0 +1 @@
+DIST kmidimon-0.7.5.tar.bz2 285207 SHA256 0f44e69eedf4ea9bac013182352e2f5a5c81a0ea8d2f6ed979432868381c460e SHA512 4ed2db2e0e1af951ad664c64f9a4ae26f9809f826de43a02188cc6051086319386fee6b061da30943709c4b05b5845b9519f72b4310b17516765ae7a51d8725a WHIRLPOOL 03a329ef722182bd22b4ab1d013cdd72fe1ab455fc6194133f9e4a5bd30d6d59283871b597f9a7dc1ccf0517556cd1387f193c6dae9c4b14dc5ebdaf9c340b78
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..9a0f8a376966
--- /dev/null
+++ b/media-sound/kmidimon/kmidimon-0.7.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+KDE_LINGUAS="cs es ja"
+KDE_HANDBOOK="optional"
+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 )
+
+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..692f59fa5841
--- /dev/null
+++ b/media-sound/kmidimon/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<herd>sound</herd>
+	<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..7ae501514ff4
--- /dev/null
+++ b/media-sound/konvertible/Manifest
@@ -0,0 +1 @@
+DIST 116892-konvertible-1.0.1.tar.bz2 195359 SHA256 1f44e169ae4dd643a5e1133e51f6503058be35dc2183c6a1d74a53118757f06d
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..dff4cd688a26
--- /dev/null
+++ b/media-sound/konvertible/konvertible-1.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e737e3a436d2
--- /dev/null
+++ b/media-sound/konvertible/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+<herd>kde</herd>
+</pkgmetadata>
diff --git a/media-sound/kradio/Manifest b/media-sound/kradio/Manifest
new file mode 100644
index 000000000000..4930753e5257
--- /dev/null
+++ b/media-sound/kradio/Manifest
@@ -0,0 +1,2 @@
+DIST kradio4-4.0.7.tar.bz2 1645669 SHA256 53d1a706f08cfd5a405142cf34cf9c0b03397b03961936651dfae7206003959c SHA512 61acb55cfbf3394b4e40381507cc1476360cb8d07b23dc5983ad807e9d6f8e2e850787b06bf0884010ed5b7f373ee3d08fb2fb59201937002d95280a37a169bc WHIRLPOOL b0c9d66553aa06bbccd7168a7cbc05c75ae2cc8c8528fa8041a52e6fef3d3427fcf641fe1bf20fa7e357b1676361efc2e98fdfa162275d56e7385e6567637683
+DIST kradio4-4.0.8.tar.bz2 1694959 SHA256 b6a0354ee0d8a69700b95428cf305940d00ff67c1a3268e8fdd9852bbacc000e SHA512 5c10cd8135d5c595cc3b1de83e59dd8913edd06ec2a74a1d69afcb01ad720eac51baea1fd53328d99f307feceb5c5f98db353f9ee94581fd290b34f6de509784 WHIRLPOOL 1a9f39d869c8f0498cf9f8924f2affd9b16f92231f3fc3a76e2d622ad0e33b610eecf144bf5780893556abb7523b121bf7b0accc85833ce96adf41f2cf0a55b1
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..f5c2917de6db
--- /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.
+--- CMakeLists.txt
++++ 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.7.ebuild b/media-sound/kradio/kradio-4.0.7.ebuild
new file mode 100644
index 000000000000..d5128cf99086
--- /dev/null
+++ b/media-sound/kradio/kradio-4.0.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS_DIR=( po convert-presets/po )
+PLUGINS=(
+	alsa-sound dbus gui-docking-menu gui-error-log gui-quickbar
+	gui-standard-display internetradio lirc oss-sound radio recording shortcuts
+	soundserver streaming timecontrol timeshifter v4lradio
+)
+KDE_LINGUAS="cs de es is it pl pt pt_BR ru sk tr uk"
+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 lirc +mp3 +vorbis v4l"
+
+DEPEND="
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? (
+		>=media-libs/libmms-0.4
+		virtual/ffmpeg
+	)
+	lirc? ( app-misc/lirc )
+	mp3? ( media-sound/lame )
+	vorbis? (
+		media-libs/libvorbis
+		media-libs/libogg
+	)
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}/${P}-include.patch" )
+
+src_prepare() {
+	local lang
+	for lang in ${KDE_LINGUAS} ; do
+		if ! use linguas_${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() {
+	mycmakeargs=(
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with ffmpeg)
+		$(cmake-utils_use_with lirc)
+		$(cmake-utils_use_with mp3 LAME)
+		$(cmake-utils_use_with vorbis OGG_VORBIS)
+		$(cmake-utils_use_with v4l V4L2)
+	)
+
+	kde4-base_src_configure
+}
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..6d4c7ebf9bd8
--- /dev/null
+++ b/media-sound/kradio/kradio-4.0.8.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS_DIR=( po convert-presets/po )
+PLUGINS=(
+	alsa-sound dbus gui-docking-menu gui-error-log gui-quickbar
+	gui-standard-display internetradio lirc oss-sound radio recording shortcuts
+	soundserver streaming timecontrol timeshifter v4lradio
+)
+KDE_LINGUAS="cs de es is it pl pt pt_BR ru sk tr uk"
+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 lirc +mp3 +vorbis v4l"
+
+DEPEND="
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	ffmpeg? (
+		>=media-libs/libmms-0.4
+		virtual/ffmpeg
+	)
+	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 linguas_${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() {
+	mycmakeargs=(
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with ffmpeg)
+		$(cmake-utils_use_with lirc)
+		$(cmake-utils_use_with mp3 LAME)
+		$(cmake-utils_use_with vorbis OGG_VORBIS)
+		$(cmake-utils_use_with v4l V4L2)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/kradio/metadata.xml b/media-sound/kradio/metadata.xml
new file mode 100644
index 000000000000..2b76613721f7
--- /dev/null
+++ b/media-sound/kradio/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<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..3f3f2cc546fe
--- /dev/null
+++ b/media-sound/kstreamripper/Manifest
@@ -0,0 +1 @@
+DIST kstreamripper-0.7.100.tar.bz2 1019096 SHA256 7d081453034c0bd3429766118a7e18b65d0b2acc8d306993ff17df7ec647d76d SHA512 395a2238470bc40686ac29b5d0d05ec082668a23a908649d643edbe72cb3c581f74a46ad9607f98e6b8f43148e1993676e4e295578bbf9db4ee077498957aec0 WHIRLPOOL 23d47d3daa756d0c357c719c541e812d6c64a3332e78992977a8206e2aedd5c03d8b78d5d38558c087a711c4dc3acd30e249087bb8d154a1df33ea8e72969831
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..5e2e94e57a3a
--- /dev/null
+++ b/media-sound/kstreamripper/kstreamripper-0.7.100-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..9236e6b99c1d
--- /dev/null
+++ b/media-sound/kstreamripper/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<herd>kde</herd>
+	<upstream>
+		<remote-id type="sourceforge">kstreamripper</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/kwave/Manifest b/media-sound/kwave/Manifest
new file mode 100644
index 000000000000..b03f6f5ab76e
--- /dev/null
+++ b/media-sound/kwave/Manifest
@@ -0,0 +1,3 @@
+DIST kwave-0.8.10-1.tar.bz2 2955781 SHA256 82f6cd2b256fbeb94fadd0b7920671e69a4ba2649b9bcb2bdaab8dc834b757bc SHA512 c6421b9ccb03e198cffd745e7f77553014f9148930dfc09e59a5ff02ba5c36cd17ad2835f76033b3edd517f006bd164fd1def6fa0f7189177c62012acbfc380a WHIRLPOOL f325a160887c33589faf0316adc34740096f67de288d56506c57da74357379ab8866d3b5ee0d31537fbc6ac250f67612f18f6b2d5ea8ec4c28d73c3da5251566
+DIST kwave-0.8.12-1.tar.bz2 3692668 SHA256 88c1fb9fd55b6a7fe230d3257268f8c91d5b6ddd6106b4a1d791bb671e6d4b0b SHA512 1ee182054b2e35aa6e40c8c8a51589eda615a019578f41b001d470bdc1809970e5bd78772c4c87c5a482dbe72e08b5ae5992457e9aa83fbb92225408e9f3f10d WHIRLPOOL 0934e743372a00b92a9fd3ec697d68ea267b41bf491dedbc72a139ed42da7b7db0bd4cfad9355b9498a06865b672cd87b2d8c94959fd45a45a7cf509a0889b2a
+DIST kwave-0.8.99-2.tar.bz2 4111307 SHA256 94ad5d5d526714c5c496cf2f83d4e1aa34081997f574b465cd1972e5cba377f2 SHA512 390c08a2b8e540deb15d59a97dd210c6ce051cb2faa2002f60fb9ba03460978c633050688c16ed6e12442c40eef57710aa4ac7268964a045e35a2ac5c637cbdc WHIRLPOOL 66ade430c4f29934fd41576368fa8ff685c3cae5ebf14a006496641373efdb05aa1b6327522e76b04ba95b847f8bad97390830d13afe72c77b9e6e5ec41f2f5c
diff --git a/media-sound/kwave/files/kwave-0.8.12-fr.patch b/media-sound/kwave/files/kwave-0.8.12-fr.patch
new file mode 100644
index 000000000000..dc7fc8447deb
--- /dev/null
+++ b/media-sound/kwave/files/kwave-0.8.12-fr.patch
@@ -0,0 +1,173 @@
+From 0217487c4ba80cb8392450442a71d5f86e2e9ed3 Mon Sep 17 00:00:00 2001
+From: Thomas Eschenbacher <Thomas.Eschenbacher@gmx.de>
+Date: Sun, 20 Jul 2014 08:12:36 +0200
+Subject: [PATCH] fixed missing entities in french online help (svn -> git)
+
+---
+ doc/help_fr.po | 51 ++++++++++++++++++++++++++-------------------------
+ 1 file changed, 26 insertions(+), 25 deletions(-)
+
+diff --git a/doc/help_fr.po b/doc/help_fr.po
+index 97bf9f6..81d677c 100644
+--- a/doc/help_fr.po
++++ b/doc/help_fr.po
+@@ -7,7 +7,7 @@ msgid ""
+ msgstr ""
+ "Project-Id-Version: Kwave\n"
+ "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+-"POT-Creation-Date: 2014-06-04 16:45+0000\n"
++"POT-Creation-Date: 2014-07-20 06:11+0000\n"
+ "PO-Revision-Date: 2012-05-17 20:26+0200\n"
+ "Last-Translator: Thomas Eschenbacher\n"
+ "Language-Team: German <kde-i18n-de@kde.org>\n"
+@@ -360,15 +360,15 @@ msgid ""
+ "\"&url_git_web;\">web interface</ulink> you can use to browse through the "
+ "sources."
+ msgstr ""
+-"Il y a également un dépôt CVS, qui est hébergé par <ulink url="
++"Il y a également un dépôt GIT, qui est hébergé par <ulink url="
+ "\"&url_sourceforge;\">SourceForge</ulink> ou vous pouvez télécharger les "
+ "dernières versions des sources du programme. Pour toute information "
+-"concernant la procédure d'accès au dépôt CVS, lisez le chapitre sur <link "
+-"linkend=\"building_rpm_from_cvs\">la construction à partir du CVS</link>, "
+-"consultez l'URL <ulink url=\"&url_svn_instructions;\">"
+-"\"&url_svn_instructions;\"</ulink>, ou visiter l'arborescence CVS "
++"concernant la procédure d'accès au dépôt GIT, lisez le chapitre sur <link "
++"linkend=\"building_rpm_from_git\">la construction à partir du GIT</link>, "
++"consultez l'URL <ulink url=\"&url_git_instructions;\">"
++"\"&url_git_instructions;\"</ulink>, ou visiter l'arborescence GIT "
+ "directement à travers votre navigateur internet. <emphasis>Un accès anonyme "
+-"au dépôt CVS est disponible !</emphasis>"
++"au dépôt GIT est disponible !</emphasis>"
+ 
+ #. Tag: title
+ #: help_en.docbook:220
+@@ -674,8 +674,8 @@ msgid ""
+ "If you intend to get the &kwave; sources via GIT, you will also need a "
+ "current git package."
+ msgstr ""
+-"Si vous désirez utiliser CVS, il vous faut aussi la version actuelle du "
+-"paquetage correspondant à CVS."
++"Si vous désirez utiliser GIT, il vous faut aussi la version actuelle du "
++"paquetage correspondant à GIT."
+ 
+ #. Tag: para
+ #: help_en.docbook:396
+@@ -895,10 +895,10 @@ msgstr ""
+ "RPM. Premièrement, vous devez récupérer les sources de &kwave;, tel que "
+ "l'archive au format « .tar.gz » disponible sur la page WEB de téléchargement "
+ "de &kwave; ou une copie de la dernière version des sources via le <link "
+-"linkend=\"cvs-repository\">serveur CVS</link> (comme cela est décrit dans le "
+-"chapitre concernant le <link linkend=\"cvs_checkout\">CVS</link>), et lisez "
+-"le chapitre concernant la <link linkend=\"building_rpm_from_cvs"
+-"\">compilation d'un RPM à partir du CVS</link>."
++"linkend=\"git-repository\">serveur GIT</link> (comme cela est décrit dans le "
++"chapitre concernant le <link linkend=\"git_checkout\">GIT</link>), et lisez "
++"le chapitre concernant la <link linkend=\"building_rpm_from_git"
++"\">compilation d'un RPM à partir du GIT</link>."
+ 
+ #. Tag: para
+ #: help_en.docbook:553
+@@ -1117,9 +1117,9 @@ msgid ""
+ "your provider doesn't give you full access. A good place for the source "
+ "files will be <filename>\"$HOME/src\"</filename>."
+ msgstr ""
+-"Pour initialement vérifier la mise à jour des sources sur le CVS, vous avez "
++"Pour initialement vérifier la mise à jour des sources sur le GIT, vous avez "
+ "besoin d'un espace disque conséquent (environ 70 Mo) dans le dossier de "
+-"votre choix, du paquetage correspondant au programme cvs dédié à votre "
++"votre choix, du paquetage correspondant au programme git dédié à votre "
+ "distribution, et d'un accès complet à internet. Si vous recevez un message "
+ "d'erreur pour des connexions qui sont rejetées, soit vous avez tapé des "
+ "commandes incorrectes, soit votre fournisseur d'accès à internet n'autorise "
+@@ -1159,7 +1159,7 @@ msgstr ""
+ #, fuzzy, no-c-format
+ msgid "<prompt>% </prompt><command>git clone &url_git_master; kwave</command>"
+ msgstr ""
+-"<prompt>% </prompt><command>svn checkout &url_svn_trunk; kwave</command>"
++"<prompt>% </prompt><command>svn checkout &url_git_master; kwave</command>"
+ 
+ #. Tag: para
+ #: help_en.docbook:669
+@@ -1189,7 +1189,7 @@ msgid ""
+ msgstr ""
+ "Il <emphasis>ne doit pas</emphasis> y avoir de dossier nommé "
+ "<filename>kwave</filename> dans le dossier où vous aller stocker les sources "
+-"en provenance du CVS. En effet si tel est le cas, le programme cvs enverra "
++"en provenance du GIT. En effet si tel est le cas, le programme git enverra "
+ "un message d'erreur indiquant qu'il existe déjà un dossier de ce nom et le "
+ "téléchargement des sources sur votre machine échouera."
+ 
+@@ -1197,7 +1197,7 @@ msgstr ""
+ #: help_en.docbook:691
+ #, fuzzy, no-c-format
+ msgid "Updating fresh sources from GIT"
+-msgstr "La mise à jour les sources à partir du CVS"
++msgstr "La mise à jour les sources à partir du GIT"
+ 
+ #. Tag: para
+ #: help_en.docbook:692
+@@ -1215,7 +1215,7 @@ msgstr ""
+ "Mettez vous dans le sous-dossier que vous souhaitez mettre à jour et tapez "
+ "les commandes suivantes : <screen width=\"75\" format=\"linespecific\">\n"
+ "<prompt>% </prompt><command>make distclean</command>\n"
+-"<prompt>% </prompt><command>cvs update -dP -C</command>\n"
++"<prompt>% </prompt><command>git pull</command>\n"
+ "</screen> Vous pouvez alors passer à la section suivante pour faire une "
+ "compilation du programme."
+ 
+@@ -1231,7 +1231,7 @@ msgstr ""
+ "Si vous pensez que vous avez endommagé vos fichiers sources en local ou s'il "
+ "y a des conflits pendant la mise à jour, vous pouvez enlever tous les "
+ "fichiers et les sous-dossiers dans votre copie locale de &kwave; <emphasis>à "
+-"l'exception des dossiers <filename>CVS</filename></emphasis> et recommencer "
++"l'exception des dossiers <filename>GIT</filename></emphasis> et recommencer "
+ "à nouveau."
+ 
+ #. Tag: screen
+@@ -1266,7 +1266,7 @@ msgid ""
+ "<literal>sparc</literal> or whatever, <replaceable>XXX</replaceable> stands "
+ "for the version number you have checked out."
+ msgstr ""
+-"Construire un paquetage RPM à partir des sources du CVS est une chose assez "
++"Construire un paquetage RPM à partir des sources du GIT est une chose assez "
+ "facile à réaliser. La procédure est presque la même que celle décrite dans "
+ "la section précédente, et malheureusement on a le même problème avec la "
+ "commande <command>rpmbuild -ta</command>. Comme dans le chapitre précédent, "
+@@ -1300,7 +1300,7 @@ msgid ""
+ "instead of installing."
+ msgstr ""
+ "Vous devez être le superutilisateur ROOT pour faire la mise à jour à partir "
+-"du CVS, construire le paquetage de &kwave;, et l'installer. Si vous avez "
++"du GIT, construire le paquetage de &kwave;, et l'installer. Si vous avez "
+ "déjà une version de &kwave; installée sur votre système, vous devez "
+ "désinstaller celle-ci en premier ou utiliser l'option <literal>rpm -U</"
+ "literal> à la place de <literal>rpm -i</literal> pour faire une mise à jour "
+@@ -1358,12 +1358,13 @@ msgstr ""
+ 
+ #. Tag: screen
+ #: help_en.docbook:763
+-#, fuzzy, no-c-format
++#, no-c-format
+ msgid ""
+ "<prompt>% </prompt><command>sudo apt-get install build-essential "
+ "checkinstall</command>"
+ msgstr ""
+-"<prompt>% </prompt><command>svn checkout &url_svn_trunk; kwave</command>"
++"<prompt>% </prompt><command>sudo apt-get install build-essential "
++"checkinstall</command>"
+ 
+ #. Tag: para
+ #: help_en.docbook:766
+@@ -1559,7 +1560,7 @@ msgid ""
+ "flags need to be specified before the call. For example:"
+ msgstr ""
+ "Si vous construisez &kwave; à partir des sources (tel qu'une archive au "
+-"format « .tar.gz » ou via le dépot CVS) l'option à activer doit l'être avant "
++"format « .tar.gz » ou via le dépot GIT) l'option à activer doit l'être avant "
+ "l'appel de la commande <command>make -f Makefile.dist</command>. Par "
+ "exemple :"
+ 
+-- 
+2.0.5
+
diff --git a/media-sound/kwave/kwave-0.8.10.ebuild b/media-sound/kwave/kwave-0.8.10.ebuild
new file mode 100644
index 000000000000..310d3b362b9f
--- /dev/null
+++ b/media-sound/kwave/kwave-0.8.10.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="cs de fr"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A sound editor for KDE that can edit many types of audio files"
+HOMEPAGE="http://kwave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-1.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2
+	handbook? ( FDL-1.2 )"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="alsa debug flac handbook mp3 opus oss phonon pulseaudio vorbis"
+
+RDEPEND="
+	media-libs/audiofile:=
+	>=sci-libs/fftw-3
+	media-libs/libsamplerate
+	alsa? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac )
+	mp3? (
+		media-libs/id3lib
+		media-libs/libmad
+		|| ( media-sound/lame media-sound/twolame media-sound/toolame )
+	)
+	opus? (
+		media-libs/libogg
+		media-libs/opus
+	)
+	phonon? ( media-libs/phonon[qt4] )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_kdeapps_dep poxml extras)
+	|| ( media-gfx/imagemagick[png,svg] media-gfx/graphicsmagick[imagemagick,png,svg] )
+"
+
+DOCS=( AUTHORS CHANGES LICENSES README TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SAMPLERATE=ON
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with flac)
+		$(cmake-utils_use_with mp3)
+		$(cmake-utils_use_with vorbis OGG_VORBIS)
+		$(cmake-utils_use_with opus OGG_OPUS)
+		$(cmake-utils_use_with oss)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with pulseaudio)
+		$(cmake-utils_use debug)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/kwave/kwave-0.8.12.ebuild b/media-sound/kwave/kwave-0.8.12.ebuild
new file mode 100644
index 000000000000..4646915f0f42
--- /dev/null
+++ b/media-sound/kwave/kwave-0.8.12.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="cs de es fr"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A sound editor for KDE that can edit many types of audio files"
+HOMEPAGE="http://kwave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-1.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2
+	handbook? ( FDL-1.2 )"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug flac mp3 opus oss phonon pulseaudio vorbis"
+
+RDEPEND="
+	media-libs/audiofile:=
+	>=sci-libs/fftw-3
+	media-libs/libsamplerate
+	alsa? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac )
+	mp3? (
+		media-libs/id3lib
+		media-libs/libmad
+		|| ( media-sound/lame media-sound/twolame media-sound/toolame )
+	)
+	opus? (
+		media-libs/libogg
+		media-libs/opus
+	)
+	phonon? ( media-libs/phonon[qt4] )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_kdeapps_dep poxml extras)
+	|| ( media-gfx/imagemagick[png,svg] media-gfx/graphicsmagick[imagemagick,png,svg] )
+"
+
+PATCHES=( "${FILESDIR}/${P}-fr.patch" )
+DOCS=( AUTHORS CHANGES LICENSES README TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with handbook DOC)
+		$(cmake-utils_use_with flac)
+		$(cmake-utils_use_with mp3)
+		$(cmake-utils_use_with vorbis OGG_VORBIS)
+		$(cmake-utils_use_with opus OGG_OPUS)
+		$(cmake-utils_use_with oss)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with pulseaudio)
+		$(cmake-utils_use debug)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/kwave/kwave-0.8.99.ebuild b/media-sound/kwave/kwave-0.8.99.ebuild
new file mode 100644
index 000000000000..1cc4b40ce121
--- /dev/null
+++ b/media-sound/kwave/kwave-0.8.99.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="cs de es fr"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="A sound editor for KDE that can edit many types of audio files"
+HOMEPAGE="http://kwave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-2.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2
+	handbook? ( FDL-1.2 )"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug flac mp3 opus oss phonon pulseaudio vorbis"
+
+RDEPEND="
+	media-libs/audiofile:=
+	>=sci-libs/fftw-3
+	media-libs/libsamplerate
+	alsa? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac )
+	mp3? (
+		media-libs/id3lib
+		media-libs/libmad
+		|| ( media-sound/lame media-sound/twolame media-sound/toolame )
+	)
+	opus? (
+		media-libs/libogg
+		media-libs/opus
+	)
+	phonon? ( media-libs/phonon[qt4] )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_kdeapps_dep poxml extras)
+	|| ( media-gfx/imagemagick[png,svg] media-gfx/graphicsmagick[imagemagick,png,svg] )
+"
+
+DOCS=( AUTHORS CHANGES LICENSES README TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with alsa)
+		$(cmake-utils_use_with handbook DOC)
+		$(cmake-utils_use_with flac)
+		$(cmake-utils_use_with mp3)
+		$(cmake-utils_use_with vorbis OGG_VORBIS)
+		$(cmake-utils_use_with opus OGG_OPUS)
+		$(cmake-utils_use_with oss)
+		$(cmake-utils_use_with phonon)
+		$(cmake-utils_use_with pulseaudio)
+		$(cmake-utils_use debug)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/media-sound/kwave/metadata.xml b/media-sound/kwave/metadata.xml
new file mode 100644
index 000000000000..44d8bd70fea4
--- /dev/null
+++ b/media-sound/kwave/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<longdescription>With Kwave you can edit many sorts of wav-files including multi-channel files. You are able to alter and play back each channel on its own. Kwave also includes many plugins (most are still under development) to transform the wave-file in several ways and presents a graphical view with a complete zoom- and scroll capability.</longdescription>
+	<use>
+		<flag name="opus">Enable Opus audio codec support</flag>
+		<flag name="phonon">Enable playback via Phonon</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">kwave</remote-id>
+		<bugs-to>http://sourceforge.net/tracker/?group_id=6478</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
new file mode 100644
index 000000000000..c4ea8f054f79
--- /dev/null
+++ b/media-sound/lame/Manifest
@@ -0,0 +1,3 @@
+DIST lame-3.99.3.tar.gz 1443843 SHA256 d4ea3c8d00d2cc09338425a25dbfeb4d587942cb3c83a677c09aeb1e850c74cf SHA512 13f01790b4ceb15824e3267955e15b91994c6350f7a59188ca331c24b29b4613953860b6193bebc6a1d7c6a71072d92604c1c0d09b443952ebed1d3229d09955 WHIRLPOOL b27782ed141b1c2a8730e44bfb15f57e68ba4c9522c0ca8d716910ffaccc8070b4c4efc091ea17e0babab409b52a8927b0a8163b4273e2ac3424171aac9a4a7c
+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
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-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.3.ebuild b/media-sound/lame/lame-3.99.3.ebuild
new file mode 100644
index 000000000000..ed3625a28b71
--- /dev/null
+++ b/media-sound/lame/lame-3.99.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="LAME Ain't an MP3 Encoder"
+HOMEPAGE="http://lame.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug cpu_flags_x86_mmx mp3rtp sndfile static-libs"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	sndfile? ( >=media-libs/libsndfile-1.0.2 )"
+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
+
+	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=${S} eautoreconf
+	epunt_cxx #74498
+}
+
+src_configure() {
+	local myconf
+	use cpu_flags_x86_mmx && myconf+="--enable-nasm" #361879
+	use sndfile && myconf+=" --with-fileio=sndfile"
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug debug norm) \
+		--disable-mp3x \
+		$(use_enable mp3rtp) \
+		--enable-dynamic-frontends \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
+	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/lame-3.99.5-r1.ebuild b/media-sound/lame/lame-3.99.5-r1.ebuild
new file mode 100644
index 000000000000..b1fb71d78b90
--- /dev/null
+++ b/media-sound/lame/lame-3.99.5-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug cpu_flags_x86_mmx 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=">=sys-libs/ncurses-5.7-r7
+	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 \
+		"${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 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/lame-3.99.5.ebuild b/media-sound/lame/lame-3.99.5.ebuild
new file mode 100644
index 000000000000..0b79548b3951
--- /dev/null
+++ b/media-sound/lame/lame-3.99.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+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 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug cpu_flags_x86_mmx mp3rtp sndfile static-libs"
+
+RDEPEND=">=sys-libs/ncurses-5.7-r7
+	sndfile? ( >=media-libs/libsndfile-1.0.2 )"
+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 \
+		"${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
+}
+
+src_configure() {
+	local myconf
+	use cpu_flags_x86_mmx && myconf+="--enable-nasm" #361879
+	use sndfile && myconf+=" --with-fileio=sndfile"
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug debug norm) \
+		--disable-mp3x \
+		$(use_enable mp3rtp) \
+		--enable-dynamic-frontends \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
+	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..3b49a3fd60bf
--- /dev/null
+++ b/media-sound/lame/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <use>
+    <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..3e829ef60bac
--- /dev/null
+++ b/media-sound/lash/Manifest
@@ -0,0 +1 @@
+DIST lash-0.5.4.tar.gz 623469 SHA256 105a7da84415c4725c6bcad28e70f23aeb4534f94fc80ca262b6a2cef2226c16 SHA512 93193dd585738b8c3432b3f75864d287f874b5618100a84f0a1b2bda2df15403203cfc66e7a0298adab7ef95bfdded81697614ca5ef8eaf5cebdde5860f47e3c WHIRLPOOL 404cf85b8a2e4a17b32f9c43f78ac088864ce8de7777cec30261d614d3753922985492bc0862a6b0fa18e9e2fc962696954850c4d47034bbfa54e7c5ef1fdb6b
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-r1.ebuild b/media-sound/lash/lash-0.5.4-r1.ebuild
new file mode 100644
index 000000000000..9ea2c4a16f3f
--- /dev/null
+++ b/media-sound/lash/lash-0.5.4-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2:2.6"
+inherit autotools eutils python
+
+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 hppa ppc ppc64 sparc x86"
+IUSE="alsa debug gtk python static-libs" # doc
+
+RDEPEND="dev-libs/libxml2
+	media-sound/jack-audio-connection-kit
+	alsa? ( media-libs/alsa-lib )
+	gtk? ( x11-libs/gtk+:2 )
+	|| ( 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"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+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
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+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
+	use python || myconf='--disable-pylash'
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable alsa alsa-midi) \
+		$(use_enable gtk gtk2) \
+		$(use_enable debug) \
+		${myconf}
+}
+
+src_install() {
+	default
+	dohtml docs/lash-manual-html-*/lash-manual.html
+	prune_libtool_files --all # --all for _lash.la in python directory
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize lash.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup lash.py
+}
diff --git a/media-sound/lash/lash-0.5.4-r2.ebuild b/media-sound/lash/lash-0.5.4-r2.ebuild
new file mode 100644
index 000000000000..62fff5433b3e
--- /dev/null
+++ b/media-sound/lash/lash-0.5.4-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 hppa ppc ppc64 sparc x86"
+IUSE="alsa debug gtk python static-libs" # doc
+
+RDEPEND="dev-libs/libxml2
+	media-sound/jack-audio-connection-kit
+	>=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..0dc3775f83d7
--- /dev/null
+++ b/media-sound/lash/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+</pkgmetadata>
diff --git a/media-sound/lastfm-desktop/Manifest b/media-sound/lastfm-desktop/Manifest
new file mode 100644
index 000000000000..68ae7dd21a34
--- /dev/null
+++ b/media-sound/lastfm-desktop/Manifest
@@ -0,0 +1,2 @@
+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
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..7c44efdc1a1e
--- /dev/null
+++ b/media-sound/lastfm-desktop/lastfm-desktop-2.1.35.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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]
+	sys-libs/zlib
+	|| ( dev-qt/qtphonon:4 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..08b682479d91
--- /dev/null
+++ b/media-sound/lastfm-desktop/lastfm-desktop-2.1.36.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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]
+	sys-libs/zlib
+	|| ( dev-qt/qtphonon:4 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..883aeb431414
--- /dev/null
+++ b/media-sound/lastfm-desktop/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>
+    <email>jlec@gentoo.org</email>
+  </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..f08ef72c9396
--- /dev/null
+++ b/media-sound/lastfmplayer/Manifest
@@ -0,0 +1,3 @@
+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
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..df62dd85cba5
--- /dev/null
+++ b/media-sound/lastfmplayer/lastfmplayer-1.5.4.27091-r3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib readme.gentoo toolchain-funcs 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="http://dev.gentoo.org/~hwoarang/distfiles/lastfm-${PV}+dfsg.tar.gz
+	http://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; 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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/lastfmplayer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/lilycomp/Manifest b/media-sound/lilycomp/Manifest
new file mode 100644
index 000000000000..13daf032a236
--- /dev/null
+++ b/media-sound/lilycomp/Manifest
@@ -0,0 +1 @@
+DIST lilycomp.1.0.2.tar.gz 16997 SHA256 47f46adb5ea620a66d5858c50301c76b9041099121705376cd81c5b0db9e20dd
diff --git a/media-sound/lilycomp/lilycomp-1.0.2-r1.ebuild b/media-sound/lilycomp/lilycomp-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..b28fc16efb3f
--- /dev/null
+++ b/media-sound/lilycomp/lilycomp-1.0.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+inherit python
+
+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=""
+
+DEPEND="dev-lang/python[tk]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	newbin lilycomp.py lilycomp || die "newbin failed"
+	dohtml *.html
+	dodoc [[:upper:]]*
+}
diff --git a/media-sound/lilycomp/metadata.xml b/media-sound/lilycomp/metadata.xml
new file mode 100644
index 000000000000..ddedef7083fa
--- /dev/null
+++ b/media-sound/lilycomp/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>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <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..44c4319bb39c
--- /dev/null
+++ b/media-sound/lilypond/Manifest
@@ -0,0 +1,2 @@
+DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c
+DIST lilypond-2.19.15.tar.gz 16351341 SHA256 bc48d2cf23cfabf79e8b7fdfcb46b7e8c04ba63c3b076b5bca2bbb3a86a07da9 SHA512 a2004086ebd9f4d6fa5d38910a605a3fa7ce76e126f6be6e0c9cdc6a7443f47a435e5dfac1cf54c1eb5113b5c3909a57943c7f6e84c31b7bf7f4cb7c5bfa71c7 WHIRLPOOL 2e7610e7a21a6ce1f042789c2f30aad2ea626971b816ebb18aa45471cdebde7f53fb0e94f5d0d20e1d950efd125c50f76621e3fbc8f260d1cabfa2ee59e37e3e
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/lilypond-2.18.2.ebuild b/media-sound/lilypond/lilypond-2.18.2.ebuild
new file mode 100644
index 000000000000..2604de192bbc
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.18.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit elisp-common autotools eutils python-single-r1
+
+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="amd64 ~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[deprecated,regex]
+	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-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
+		<dev-texlive/texlive-metapost-2013
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge
+	>=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"
+
+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() {
+	epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+
+	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
+}
+
+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}"
+
+	dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/lilypond-2.19.15.ebuild b/media-sound/lilypond/lilypond-2.19.15.ebuild
new file mode 100644
index 000000000000..b53f90cc3712
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.15.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit elisp-common autotools eutils python-single-r1
+
+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="~amd64 ~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[deprecated,regex]
+	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-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
+		<dev-texlive/texlive-metapost-2013
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge
+	>=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"
+
+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() {
+	epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+
+	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
+}
+
+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
+
+	dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+}
+
+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..18d2f013153d
--- /dev/null
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit elisp-common autotools eutils git-r3 python-single-r1
+
+EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+
+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 profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2[deprecated,regex]
+	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-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
+		<dev-texlive/texlive-metapost-2013
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge
+	>=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"
+
+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() {
+	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
+}
+
+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}"
+
+	dodoc HACKING README.txt
+}
+
+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..ea8736230eea
--- /dev/null
+++ b/media-sound/lilypond/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>scheme</herd>
+	<maintainer>
+		<email>hkBst@gentoo.org</email>
+		<name>Marijn Schouten</name>
+	</maintainer>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</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>
+</pkgmetadata>
diff --git a/media-sound/lingot/Manifest b/media-sound/lingot/Manifest
new file mode 100644
index 000000000000..7af399ba5261
--- /dev/null
+++ b/media-sound/lingot/Manifest
@@ -0,0 +1,2 @@
+DIST lingot-0.9.0.tar.gz 420806 RMD160 29cdb4c6afffe389a89cac9647918af76b09915c SHA1 b183cffc1bfda66257595c416e4cd07dbda38ed7 SHA256 ab1fc0cc45e03da6d7c92711bbd8e1691816c2e209108c80f99a54746912e11f
+DIST lingot-0.9.1.tar.gz 440043 RMD160 bd0292c541040c97fda50525e8493ad7cecd122c SHA1 e27e91ee3fa9059b08ace37f5029e9de0a5990e1 SHA256 ec91223ab3df7c9160e6f1ededd8125e64764360caa0de39f54ef0668d56f979
diff --git a/media-sound/lingot/files/lingot-0.7.6-clean-install.patch b/media-sound/lingot/files/lingot-0.7.6-clean-install.patch
new file mode 100644
index 000000000000..688aea188efd
--- /dev/null
+++ b/media-sound/lingot/files/lingot-0.7.6-clean-install.patch
@@ -0,0 +1,24 @@
+diff -ur lingot-0.7.6.orig/Makefile.am lingot-0.7.6/Makefile.am
+--- lingot-0.7.6.orig/Makefile.am	2007-12-23 21:45:19.000000000 +0200
++++ lingot-0.7.6/Makefile.am	2008-05-08 13:00:18.000000000 +0300
+@@ -8,19 +8,12 @@
+ 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/files/lingot-0.9.0-jack.patch b/media-sound/lingot/files/lingot-0.9.0-jack.patch
new file mode 100644
index 000000000000..c7885a4098e0
--- /dev/null
+++ b/media-sound/lingot/files/lingot-0.9.0-jack.patch
@@ -0,0 +1,32 @@
+--- a/src/lingot-audio-jack.c
++++ b/src/lingot-audio-jack.c
+@@ -177,7 +177,7 @@
+ 	const char **ports = NULL;
+ 	const char* exception;
+ 
+-	unsigned long int flags = JackPortIsActive | JackPortIsOutput;
++	unsigned long int flags = JackPortIsOutput;
+ 
+ 	try {
+ 		if (client != NULL) {
+@@ -265,8 +265,9 @@
+ 			throw(_("Cannot activate client"));
+ 		}
+ 
+-		ports = jack_get_ports(audio->jack_client, NULL, NULL, JackPortIsActive
+-				| JackPortIsOutput);
++		ports
++				= jack_get_ports(audio->jack_client, NULL, NULL,
++						JackPortIsOutput);
+ 		if (ports == NULL) {
+ 			throw(_("No active capture ports"));
+ 		}
+@@ -321,7 +322,7 @@
+ #	ifdef JACK
+ 	//jack_cycle_wait(audio->jack_client);
+ 	const char** ports = jack_get_ports(audio->jack_client, NULL, NULL,
+-			JackPortIsActive | JackPortIsOutput);
++			JackPortIsOutput);
+ 
+ 	if (ports != NULL) {
+ 		int i, j = 0;
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.0.ebuild b/media-sound/lingot/lingot-0.9.0.ebuild
new file mode 100644
index 000000000000..6b86955bb473
--- /dev/null
+++ b/media-sound/lingot/lingot-0.9.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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? ( >=media-sound/jack-audio-connection-kit-0.102 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7.6-clean-install.patch \
+		"${FILESDIR}"/${P}-jack.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/lingot-0.9.1.ebuild b/media-sound/lingot/lingot-0.9.1.ebuild
new file mode 100644
index 000000000000..e18391f84985
--- /dev/null
+++ b/media-sound/lingot/lingot-0.9.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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? ( >=media-sound/jack-audio-connection-kit-0.102 )"
+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..ae573a60407f
--- /dev/null
+++ b/media-sound/lingot/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
new file mode 100644
index 000000000000..036e3e20b57e
--- /dev/null
+++ b/media-sound/linuxsampler/Manifest
@@ -0,0 +1,3 @@
+DIST linuxsampler-0.5.1.tar.bz2 614500 SHA256 e0d42f98813abf187b636f52d3fe3d5c1add228a2e783bdda409ebae1c7f901f
+DIST linuxsampler-1.0.0.tar.bz2 701591 SHA256 bf4f4f83b9ab706e8e8b017aafb560c363bb7663413aeae46d49f1f56110c9cf SHA512 50b27ff16ef0f393e0808d992ca58f8a4ec12ce909bf3a461502e7e2a2bcfcbfb1558dd07a5ff5af2cbf26bc5f7b878a736005a8e90e4d5e92ca9b868e9bc204 WHIRLPOOL e7668fb4a1c802411de89fb73bdbca78150a8fc6386c42d9c3b9f8c7c1d4576260ef6c89e283f1fbcbcf397515d565e5e13f1e5286a07b6cb8240bb26e437bf6
+DIST linuxsampler-2.0.0.tar.bz2 1318939 SHA256 1943d05006d96a9fb49f74a6f38129a4585cb78cc0648885fca9f056529c5c28 SHA512 f4a57117dbec3eeb9d6d670fec76e928ef9d9e49a1a8c6bd654d6114efdc203861e7865005f06265c172e29b5e0a948eac160377dcdabc5244caed5e5ca7e441 WHIRLPOOL d8af13229d8dafd8ed68950038968d19e01a010465a91ddd54866fb626c47081931dba7dda9a073c17274c26dec9a1ec51cf30a00fe4831716354c9e9fcf4cf4
diff --git a/media-sound/linuxsampler/files/linuxsampler-0.5.1-gcc43.patch b/media-sound/linuxsampler/files/linuxsampler-0.5.1-gcc43.patch
new file mode 100644
index 000000000000..e65c6cbb1065
--- /dev/null
+++ b/media-sound/linuxsampler/files/linuxsampler-0.5.1-gcc43.patch
@@ -0,0 +1,36 @@
+Index: linuxsampler-0.5.1/src/db/InstrumentsDbUtilities.h
+===================================================================
+--- linuxsampler-0.5.1.orig/src/db/InstrumentsDbUtilities.h
++++ linuxsampler-0.5.1/src/db/InstrumentsDbUtilities.h
+@@ -24,6 +24,7 @@
+ #define __LS_INSTRUMENTSDBUTILITIES_H__
+ 
+ #include <vector>
++#include <memory>
+ #include <gig.h>
+ #include <sqlite3.h>
+ #include <sys/stat.h>
+Index: linuxsampler-0.5.1/src/drivers/midi/midi.h
+===================================================================
+--- linuxsampler-0.5.1.orig/src/drivers/midi/midi.h
++++ linuxsampler-0.5.1/src/drivers/midi/midi.h
+@@ -21,6 +21,7 @@
+ #ifndef __LS_MIDI_H__
+ #define __LS_MIDI_H__
+ 
++#include <stdint.h>
+ #include <string.h>
+ 
+ namespace LinuxSampler {
+Index: linuxsampler-0.5.1/src/network/lscpserver.cpp
+===================================================================
+--- linuxsampler-0.5.1.orig/src/network/lscpserver.cpp
++++ linuxsampler-0.5.1/src/network/lscpserver.cpp
+@@ -21,6 +21,7 @@
+  *   MA  02111-1307  USA                                                   *
+  ***************************************************************************/
+ 
++#include <algorithm>
+ #include "lscpserver.h"
+ #include "lscpresultset.h"
+ #include "lscpevent.h"
diff --git a/media-sound/linuxsampler/files/linuxsampler-0.5.1-libtool22.patch b/media-sound/linuxsampler/files/linuxsampler-0.5.1-libtool22.patch
new file mode 100644
index 000000000000..3c4add20637f
--- /dev/null
+++ b/media-sound/linuxsampler/files/linuxsampler-0.5.1-libtool22.patch
@@ -0,0 +1,20 @@
+Index: linuxsampler-0.5.1/configure.in
+===================================================================
+--- linuxsampler-0.5.1.orig/configure.in
++++ linuxsampler-0.5.1/configure.in
+@@ -38,6 +38,7 @@ LSCP_RELEASE_MINOR=3
+ AC_DEFINE_UNQUOTED(LSCP_RELEASE_MAJOR, ${LSCP_RELEASE_MAJOR}, [LSCP spec major version this release complies with.])
+ AC_DEFINE_UNQUOTED(LSCP_RELEASE_MINOR, ${LSCP_RELEASE_MINOR}, [LSCP spec minor version this release complies with.])
+ 
++AC_PROG_CXX
+ AM_PROG_LIBTOOL
+ 
+ AC_SUBST(SHLIB_VERSION_ARG)
+@@ -1082,7 +1083,6 @@ AM_CONFIG_HEADER(config.h)
+ AM_INIT_AUTOMAKE(linuxsampler, "$LINUXSAMPLER_RELEASE_MAJOR.$LINUXSAMPLER_RELEASE_MINOR.$LINUXSAMPLER_RELEASE_BUILD")
+ 
+ AC_LANG_CPLUSPLUS
+-AC_PROG_CXX
+ 
+ # some gcc 4.0 versions need -msse for SSE register allocations
+ if test "$config_asm" = "yes"; then
diff --git a/media-sound/linuxsampler/files/linuxsampler-0.5.1-pkgconfiginit.patch b/media-sound/linuxsampler/files/linuxsampler-0.5.1-pkgconfiginit.patch
new file mode 100644
index 000000000000..551f1512e12e
--- /dev/null
+++ b/media-sound/linuxsampler/files/linuxsampler-0.5.1-pkgconfiginit.patch
@@ -0,0 +1,12 @@
+Index: linuxsampler-0.5.1/configure.in
+===================================================================
+--- linuxsampler-0.5.1.orig/configure.in
++++ linuxsampler-0.5.1/configure.in
+@@ -52,6 +52,7 @@ AC_SUBST(target_cpu)
+ AC_SUBST(target_os)
+ AC_SUBST(target_vendor)
+ 
++PKG_PROG_PKG_CONFIG
+ 
+ ###########################################################################
+ # General Checks
diff --git a/media-sound/linuxsampler/files/linuxsampler-1.0.0-gcc47.patch b/media-sound/linuxsampler/files/linuxsampler-1.0.0-gcc47.patch
new file mode 100644
index 000000000000..e46fb243b6ce
--- /dev/null
+++ b/media-sound/linuxsampler/files/linuxsampler-1.0.0-gcc47.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/414033
+
+--- a/src/common/Pool.h
++++ b/src/common/Pool.h
+@@ -393,7 +393,7 @@ class RTList : public RTListBase<T> {
+         inline Iterator allocAppend() {
+             if (pPool->poolIsEmpty()) return RTListBase<T>::begin();
+             Iterator element = pPool->alloc();
+-            append(element);
++            this->append(element);
+             #if CONFIG_DEVMODE
+             element.list = this;
+             #endif // CONFIG_DEVMODE
diff --git a/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild b/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild
new file mode 100644
index 000000000000..79def7f1e524
--- /dev/null
+++ b/media-sound/linuxsampler/linuxsampler-0.5.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 sqlite"
+
+RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 )
+	>=media-libs/libgig-3.2.1
+	media-libs/alsa-lib
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-pkgconfiginit.patch"
+	epatch "${FILESDIR}/${P}-libtool22.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf --enable-alsa-driver \
+		$(use_enable jack jack-driver) \
+		$(use_enable sqlite instruments-db)
+	emake -j1 || die "emake failed."
+
+	if use doc; then
+		emake -j1 docs || die "emake docs failed."
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README
+
+	if use doc; then
+		dohtml -r doc/html/*
+	fi
+}
diff --git a/media-sound/linuxsampler/linuxsampler-1.0.0-r1.ebuild b/media-sound/linuxsampler/linuxsampler-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..cf7592f4b3b2
--- /dev/null
+++ b/media-sound/linuxsampler/linuxsampler-1.0.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit 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 sqlite static-libs"
+
+RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 )
+	>=media-libs/libgig-3.3.0
+	media-libs/alsa-lib
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc47.patch
+}
+
+src_configure() {
+	econf --enable-alsa-driver \
+		--disable-arts-driver \
+		$(use_enable jack jack-driver) \
+		$(use_enable sqlite instruments-db) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake
+	if use doc; then
+		emake docs
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README
+
+	if use doc; then
+		dohtml -r doc/html/*
+	fi
+
+	prune_libtool_files
+}
diff --git a/media-sound/linuxsampler/linuxsampler-2.0.0.ebuild b/media-sound/linuxsampler/linuxsampler-2.0.0.ebuild
new file mode 100644
index 000000000000..70199562962f
--- /dev/null
+++ b/media-sound/linuxsampler/linuxsampler-2.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit 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 sqlite static-libs"
+
+RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 )
+	>=media-libs/libgig-4.0.0
+	media-libs/alsa-lib
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	econf --enable-alsa-driver \
+		--disable-arts-driver \
+		$(use_enable jack jack-driver) \
+		$(use_enable sqlite instruments-db) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake
+	if use doc; then
+		emake docs
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README
+
+	if use doc; then
+		dohtml -r doc/html/*
+	fi
+
+	prune_libtool_files
+}
diff --git a/media-sound/linuxsampler/metadata.xml b/media-sound/linuxsampler/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/linuxsampler/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/listen/Manifest b/media-sound/listen/Manifest
new file mode 100644
index 000000000000..8ab63aea145c
--- /dev/null
+++ b/media-sound/listen/Manifest
@@ -0,0 +1 @@
+DIST listen-0.6.5.tar.gz 984613 SHA256 23a4d33ef3251c529ac9a78d992557a2498fa05b825e76c9ab4bad431ed6c61a SHA512 aa772077603f0796f4ec5376c2ec3d1d67ca6a85a489ab6589258c75aafb58a525e2c803663ecfc31de789348e5b9cc7e380fc439dd1bd76292f1e798b305cce WHIRLPOOL a84964ad172a66c5f432cdd7f3f8a6b4ac3d8fbe7d9c92b77bbef5ffe30e97ddd8c2670b8b8e7b0ecc81ce1109e2668553d67f8e990dd19398e60d06dbb39409
diff --git a/media-sound/listen/files/listen-0.6.5-Makefile.patch b/media-sound/listen/files/listen-0.6.5-Makefile.patch
new file mode 100644
index 000000000000..5d13bbc30237
--- /dev/null
+++ b/media-sound/listen/files/listen-0.6.5-Makefile.patch
@@ -0,0 +1,32 @@
+--- Makefile
++++ Makefile
+@@ -50,10 +50,8 @@
+ 	echo 'Name=org.gnome.Listen' >> org.gnome.Listen.service
+ 	echo 'Exec=$(BINDIR)/listen' >> org.gnome.Listen.service
+ 
+-	docbook2x-man misc/listen.1.docbook --to-stdout | gzip > listen.1.gz
++	docbook2man.pl misc/listen.1.docbook
+ 
+-	python -m compileall src
+-	python -O -m compileall src
+ 	@echo "Done"
+ 	@echo "Type: make install now"
+ 
+@@ -104,8 +102,6 @@
+ 
+ install: make-install-dirs
+ 	install -m 644 src/*.py $(DESTDIR)$(LIBDIR)/listen
+-	install -m 644 src/*.pyc $(DESTDIR)$(LIBDIR)/listen
+-	install -m 644 src/*.pyo $(DESTDIR)$(LIBDIR)/listen
+ 	for dir in $(PYSRC_DIR); do \
+ 		for file in src/$${dir}/*.py; do \
+ 			grep '^#@nodistribution' $$file >/dev/null && echo "$$file not distribued" && continue ; \
+@@ -122,7 +118,7 @@
+ 	install -m 644 data/img/listen.png $(DESTDIR)$(DATADIR)/pixmaps/
+ 	
+ 	install -m 644 listen.desktop $(DESTDIR)$(DATADIR)/applications/
+-	install -m 644 listen.1.gz $(DESTDIR)$(MANDIR)/man1/
++	install -m 644 listen.1 $(DESTDIR)$(MANDIR)/man1/
+ 	install -m 644 org.gnome.Listen.service $(DESTDIR)$(DBUSDIR)/services
+ 	
+ 	for lang in $(PO); do install -m 644 po/$$lang.mo $(DESTDIR)$(LOCALEDIR)/$$lang/LC_MESSAGES/listen.mo; done
diff --git a/media-sound/listen/listen-0.6.5-r1.ebuild b/media-sound/listen/listen-0.6.5-r1.ebuild
new file mode 100644
index 000000000000..61fcfa7733ec
--- /dev/null
+++ b/media-sound/listen/listen-0.6.5-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils multilib python-single-r1
+
+DESCRIPTION="A music management and playback for GTK+ based desktops"
+HOMEPAGE="http://www.listen-project.org/"
+SRC_URI="http://download.listen-project.org/${PV%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/gst-python:0.10[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
+	dev-python/pyinotify[${PYTHON_USEDEP}]
+	|| ( dev-python/python-xlib[${PYTHON_USEDEP}] dev-python/egg-python[${PYTHON_USEDEP}] )
+	dev-python/pywebkitgtk
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	media-libs/libgpod[python]
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	media-plugins/gst-plugins-meta:0.10
+	x11-libs/libnotify
+	cdda? ( dev-python/python-musicbrainz[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	!media-radio/ax25-apps"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	sed -i -e 's:audip/mp3:audio/mp3:' misc/listen.desktop.in || die
+}
+
+src_compile() {
+	CHECK_DEPENDS=0 emake PYTHON="${EPYTHON}"
+}
+
+src_test() { :; } #324719
+
+src_install() {
+	DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" emake install
+	dodoc README
+
+	python_optimize "${ED}"/usr/$(get_libdir)/${PN}
+}
diff --git a/media-sound/listen/metadata.xml b/media-sound/listen/metadata.xml
new file mode 100644
index 000000000000..fbb7560bc15d
--- /dev/null
+++ b/media-sound/listen/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <longdescription>
+	Listen, a music management and playback for GNOME
+		
+	With listen you can
+
+    * Play your favorite songs
+    * Manage your library
+    * Manage your ipod
+    * Manage your podcast
+    * Make playlists
+    * Automatically or manually download album covers
+    * Automatically synchronize album covers with iPod
+    * Easily burn an audio CD
+    * Directly get informations from wikipedia when you play a song
+    * See the lyrics of a song
+    * Have statistics about your favorite songs, albums or artists
+    * Listen to web radio
+    * Submit your songs to Audioscrobbler
+    * Quick access to last.fm related file
+
+ 
+	With listen you will be able to
+
+    * Listen And Rip Audio CDs
+    * Browse and listen songs on a DAAP share
+    * Share you library via a DAAP share
+    * Fill metadata with musicbrainz
+    * Make inteligent playlists
+</longdescription>
+</pkgmetadata>
diff --git a/media-sound/litestream/Manifest b/media-sound/litestream/Manifest
new file mode 100644
index 000000000000..1248f26dab61
--- /dev/null
+++ b/media-sound/litestream/Manifest
@@ -0,0 +1 @@
+DIST litestream-1.3RC3.tar.gz 25018 SHA256 ee3edf1ea89a90f2b7f82ad09b83c25dc8ea8ca7cf0fce2aa921f897929b2bb9
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..22d01fc538c4
--- /dev/null
+++ b/media-sound/litestream/litestream-1.3_rc3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/litestream/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/lltag/Manifest b/media-sound/lltag/Manifest
new file mode 100644
index 000000000000..a6eedb29d067
--- /dev/null
+++ b/media-sound/lltag/Manifest
@@ -0,0 +1 @@
+DIST lltag-0.14.4.tar.bz2 48137 SHA256 5fe8d993289136395eb040ac6f1fa633cd8fd6a02a39de2db6f0ff1397ec948d SHA512 d2dbc513ce5e75a808acb7676a2513ece34322d134d52e1f5ea44f51b7c134699a0a8e368265c2594fd275873e4908a21af135c8714278954d0b45f2fc239bf7 WHIRLPOOL 62caf3b3e5fc05dd081cf4323b1b90e302306feee4a42c3a8a7e92703cbf08986f82b8f8a5d3faf4a13f69e59d4148a35b1b0c507e1284285ed6cc9893298dbb
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..53dbc80e8a0d
--- /dev/null
+++ b/media-sound/lltag/lltag-0.14.4-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..ae573a60407f
--- /dev/null
+++ b/media-sound/lltag/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
new file mode 100644
index 000000000000..bf5c53fa513a
--- /dev/null
+++ b/media-sound/lmms/Manifest
@@ -0,0 +1,3 @@
+DIST lmms-1.0.2-src.tar.bz2 12273540 SHA256 62fe46ecfa486ed046a551e366ec6cc7d17f53bda9843a5ddce690f59d919cd7 SHA512 14742689ec21b108153daf264ba190e9cab98bfe95fa969e1ab2df609a8bbb0d9762cca128837ad947acaa6faf61c990f97764036fc3026eabb7b56aaee033d4 WHIRLPOOL 2e6639a618fc7dddfbb3f9e995930d0503ebf18e7dced5046872e514181dec78e3bc3216c6821824c3cce0198d7d8ad01bdc1239e12b128ae31868d24def6911
+DIST lmms-1.0.3-src.tar.bz2 12461138 SHA256 22e045403201946d39a2f1074c64d6875f68cfd0ad47e7088b1a534062ea512d SHA512 1cf390ac36a18ceb23dd180497c8bff458541bd43c1fc70a0c239ae3352edd6053a93f13f8b7086315f121d9108912b6819d65724cb86b1762c269299b09ba92 WHIRLPOOL 34e937bae271093b1618d826a0991628129ade311ff7dbbb8cef52b0d026272655165b0bdfd556437c81ad30e4d5ea904223a67f1835e5d3575f895391e2d5e2
+DIST lmms-1.1.3.tar.gz 16843533 SHA256 59338e7b90e02fe18db73114aefe479c0e6d1e0e366185d71ea5c1a1e0f9e6bc SHA512 55a7a57bfe30efa85a281ca8c2ca2cb64a4b834b0338dbd3be7c2c78beb695999ba801264b45c39a5c0d87a0915890997ad3be1ab0da8b28432c4fd97d7cff3e WHIRLPOOL a06d7b13d9c87c129cfb0d389a776022ebac1a21b5dc9c786e729fa9f1a2b11b12134a043987d14b5afdfe62002dd3de8533762d54a4bc7073bc23d3ea839372
diff --git a/media-sound/lmms/lmms-1.0.2.ebuild b/media-sound/lmms/lmms-1.0.2.ebuild
new file mode 100644
index 000000000000..036bd53dfcaa
--- /dev/null
+++ b/media-sound/lmms/lmms-1.0.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Free alternative to popular programs such as Fruityloops, Cubase and Logic"
+HOMEPAGE="http://lmms.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="alsa debug fluidsynth jack ogg portaudio pulseaudio sdl stk vst"
+
+RDEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4[accessibility]
+	>=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? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
+	ogg? ( media-libs/libvorbis
+		media-libs/libogg )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl
+		>=media-libs/sdl-sound-1.0.1 )
+	stk? ( media-libs/stk )
+	vst? ( app-emulation/wine )"
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.4.5"
+RDEPEND="${RDEPEND}
+	media-plugins/swh-plugins
+	media-plugins/caps-plugins
+	media-plugins/tap-plugins
+	media-libs/ladspa-cmt"
+
+DOCS="README AUTHORS TODO"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DWANT_SYSTEM_SR=TRUE
+		-DWANT_CAPS=FALSE
+		-DWANT_TAP=FALSE
+		-DWANT_SWH=FALSE
+		-DWANT_CMT=FALSE
+		-DWANT_CALF=TRUE
+		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
+		$(cmake-utils_use_want alsa ALSA)
+		$(cmake-utils_use_want jack JACK)
+		$(cmake-utils_use_want ogg OGGVORBIS)
+		$(cmake-utils_use_want portaudio PORTAUDIO)
+		$(cmake-utils_use_want pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_want sdl SDL)
+		$(cmake-utils_use_want stk STK)
+		$(cmake-utils_use_want vst VST)
+		$(cmake-utils_use_want fluidsynth SF2)"
+	cmake-utils_src_configure
+}
diff --git a/media-sound/lmms/lmms-1.0.3.ebuild b/media-sound/lmms/lmms-1.0.3.ebuild
new file mode 100644
index 000000000000..036bd53dfcaa
--- /dev/null
+++ b/media-sound/lmms/lmms-1.0.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Free alternative to popular programs such as Fruityloops, Cubase and Logic"
+HOMEPAGE="http://lmms.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="alsa debug fluidsynth jack ogg portaudio pulseaudio sdl stk vst"
+
+RDEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4[accessibility]
+	>=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? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
+	ogg? ( media-libs/libvorbis
+		media-libs/libogg )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl
+		>=media-libs/sdl-sound-1.0.1 )
+	stk? ( media-libs/stk )
+	vst? ( app-emulation/wine )"
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.4.5"
+RDEPEND="${RDEPEND}
+	media-plugins/swh-plugins
+	media-plugins/caps-plugins
+	media-plugins/tap-plugins
+	media-libs/ladspa-cmt"
+
+DOCS="README AUTHORS TODO"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DWANT_SYSTEM_SR=TRUE
+		-DWANT_CAPS=FALSE
+		-DWANT_TAP=FALSE
+		-DWANT_SWH=FALSE
+		-DWANT_CMT=FALSE
+		-DWANT_CALF=TRUE
+		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
+		$(cmake-utils_use_want alsa ALSA)
+		$(cmake-utils_use_want jack JACK)
+		$(cmake-utils_use_want ogg OGGVORBIS)
+		$(cmake-utils_use_want portaudio PORTAUDIO)
+		$(cmake-utils_use_want pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_want sdl SDL)
+		$(cmake-utils_use_want stk STK)
+		$(cmake-utils_use_want vst VST)
+		$(cmake-utils_use_want fluidsynth SF2)"
+	cmake-utils_src_configure
+}
diff --git a/media-sound/lmms/lmms-1.1.3.ebuild b/media-sound/lmms/lmms-1.1.3.ebuild
new file mode 100644
index 000000000000..db9a5060802a
--- /dev/null
+++ b/media-sound/lmms/lmms-1.1.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Free alternative to popular programs such as Fruityloops, Cubase and Logic"
+HOMEPAGE="http://lmms.sourceforge.net/"
+SRC_URI="https://github.com/LMMS/lmms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="alsa debug fluidsynth jack ogg portaudio pulseaudio sdl stk vst"
+
+RDEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4[accessibility]
+	>=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? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
+	ogg? ( media-libs/libvorbis
+		media-libs/libogg )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl
+		>=media-libs/sdl-sound-1.0.1 )
+	stk? ( media-libs/stk )
+	vst? ( app-emulation/wine )"
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.4.5"
+RDEPEND="${RDEPEND}
+	media-plugins/swh-plugins
+	media-plugins/caps-plugins
+	media-plugins/tap-plugins
+	media-libs/ladspa-cmt"
+
+DOCS="README AUTHORS TODO"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		-DWANT_SYSTEM_SR=TRUE
+		-DWANT_CAPS=FALSE
+		-DWANT_TAP=FALSE
+		-DWANT_SWH=FALSE
+		-DWANT_CMT=FALSE
+		-DWANT_CALF=TRUE
+		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
+		$(cmake-utils_use_want alsa ALSA)
+		$(cmake-utils_use_want jack JACK)
+		$(cmake-utils_use_want ogg OGGVORBIS)
+		$(cmake-utils_use_want portaudio PORTAUDIO)
+		$(cmake-utils_use_want pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_want sdl SDL)
+		$(cmake-utils_use_want stk STK)
+		$(cmake-utils_use_want vst VST)
+		$(cmake-utils_use_want fluidsynth SF2)"
+	cmake-utils_src_configure
+}
diff --git a/media-sound/lmms/metadata.xml b/media-sound/lmms/metadata.xml
new file mode 100644
index 000000000000..3c171575d48f
--- /dev/null
+++ b/media-sound/lmms/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proaudio</herd>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>aballier@gentoo.org</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
+  <maintainer>
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+    <description>proxy-maintainer, please CC on bugs</description>
+  </maintainer>
+  <maintainer>
+    <email>gimpel@sonnenkinder.org</email>
+    <name>Thomas Kuther</name>
+  </maintainer>
+  <maintainer>
+    <email>jaquilina@eagleeyet.net</email>
+    <name>Jonathan Aquilina</name>
+    <description>Please assign bugs</description>
+  </maintainer>
+  <use>
+    <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis plugin.</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>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/lxmusic/Manifest b/media-sound/lxmusic/Manifest
new file mode 100644
index 000000000000..2d61acb95195
--- /dev/null
+++ b/media-sound/lxmusic/Manifest
@@ -0,0 +1 @@
+DIST lxmusic-0.4.5.tar.gz 288873 SHA256 08a508e1df800f142fef567ff9d3d0e845bfdd70e2edb796b3b7ad0e92dce064
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/files/lxmusic-0.4.5-libnotify-0.7.patch b/media-sound/lxmusic/files/lxmusic-0.4.5-libnotify-0.7.patch
new file mode 100644
index 000000000000..01f513de4c3a
--- /dev/null
+++ b/media-sound/lxmusic/files/lxmusic-0.4.5-libnotify-0.7.patch
@@ -0,0 +1,27 @@
+Upstream:
+https://sourceforge.net/tracker/?func=detail&aid=3529198&group_id=180858&atid=894869
+Index: lxmusic-0.4.5/src/lxmusic-notify.c
+===================================================================
+--- lxmusic-0.4.5.orig/src/lxmusic-notify.c
++++ lxmusic-0.4.5/src/lxmusic-notify.c
+@@ -84,9 +84,20 @@ LXMusicNotification lxmusic_do_notify_pr
+     else 			
+ 	g_string_append( message, title );
+     struct _LXMusicNotification *lxn = g_new ( struct _LXMusicNotification, 1);
++#ifdef NOTIFY_CHECK_VERSION
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++    lxn->notify = notify_notification_new (summary, message->str, NULL);
++#else
+     lxn->notify = notify_notification_new (summary, message->str, NULL, NULL);
++#endif
++#else
++    lxn->notify = notify_notification_new (summary, message->str, NULL, NULL);
++#endif
+     notify_notification_set_urgency (lxn->notify, NOTIFY_URGENCY_NORMAL);
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
++    notify_notification_attach_to_status_icon(notify, priv->statusIcon);
+     notify_notification_attach_to_status_icon( lxn->notify, status_icon );
++#endif
+     notify_notification_set_timeout (lxn->notify, NOTIFY_EXPIRES_DEFAULT);
+     g_string_free( message, TRUE );
+     return lxn;
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..083ef81a2eec
--- /dev/null
+++ b/media-sound/lxmusic/lxmusic-0.4.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/metadata.xml b/media-sound/lxmusic/metadata.xml
new file mode 100644
index 000000000000..f8f477c04966
--- /dev/null
+++ b/media-sound/lxmusic/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>lxde</herd>
+	<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..8e5cecada036
--- /dev/null
+++ b/media-sound/lyvi/Manifest
@@ -0,0 +1 @@
+DIST lyvi-2.0.0.tar.gz 19307 SHA256 74b1fd94807b873ba921f071d55da7359a0033a9e7398f8dc7ce378f5d200f0a SHA512 0248ceb16436be427ab38769824ce4be48998997b1997f90ddef751105e7449cff7d865e9a5895fb67c79da0eaf394baefe1a77bdc9e6c5e2b6498d64128b045 WHIRLPOOL cf73fff6fc096fe5168adb9d56593cc3e636bb679bed294bf828f0ef557ff4b7ef78534ad643f9bbdb3ad16bc221538b5a6f8e437f068084e69ecf31e620476b
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..a73cc4a3dca9
--- /dev/null
+++ b/media-sound/lyvi/lyvi-2.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python3_{3,4} )
+
+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..1646c2fcad92
--- /dev/null
+++ b/media-sound/lyvi/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>idella4@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>witold.pilat@gmail.com</email>
+		<name>Witold Pilat</name>
+		<description>Proxy maintainer</description>
+	</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..9e3e6d78b527
--- /dev/null
+++ b/media-sound/mac/Manifest
@@ -0,0 +1 @@
+DIST mac-3.99-u4-b5-s7.tar.gz 450981 SHA256 9a735af2c56f05ee06b6e2ff719e902271299adf9e25cd3c9e4b28e8df3e30c5 SHA512 fa7ca8cec0ba6c0fb78dda6e964b17e9331184fed656a2458d0e3ac12fc375a661adfd36c142ef63111f31c6b63e8c00fe40e7babe84f0cefe5433940be628e0 WHIRLPOOL f4df5bccad06b7313348e9be734e926c1d511a2e3ca40162bc2c6a8cffb38c1455543fd7dc0a2352efa91945ae5546364085bd05888e906eb9e1c49fde7f743d
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..f0b8f1d2d782
--- /dev/null
+++ b/media-sound/mac/mac-3.99.4.5.7-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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/metadata.xml b/media-sound/mac/metadata.xml
new file mode 100644
index 000000000000..1d564b87f116
--- /dev/null
+++ b/media-sound/mac/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+    <email>billie@gentoo.org</email>
+    <name>Daniel Pielmeier</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/madplay/Manifest b/media-sound/madplay/Manifest
new file mode 100644
index 000000000000..bc0e7c1fcba7
--- /dev/null
+++ b/media-sound/madplay/Manifest
@@ -0,0 +1 @@
+DIST madplay-0.15.2b.tar.gz 590929 SHA256 5a79c7516ff7560dffc6a14399a389432bc619c905b13d3b73da22fa65acede0
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..1d030ad5c872
--- /dev/null
+++ b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+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 ~x86-interix ~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..315b2eb6f52e
--- /dev/null
+++ b/media-sound/madplay/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..f480eeeca01c
--- /dev/null
+++ b/media-sound/mangler/Manifest
@@ -0,0 +1 @@
+DIST mangler-1.2.5.tar.bz2 5390985 SHA256 baae921ac7d0708bf1f435977fa834e41e66007532a39009154835bc4677a55f SHA512 e72eb2f408ba925d10563c6821e08406007bd0b7586f9ee054a1de421a6195351140a2df9656a45389f5f568ebf44f53fb719fbf6fb113695f230dd4bad21e38 WHIRLPOOL 29364187c730dedefeb9017b01e0a426572ce47b6e98efafd2735a96aba1ea722c23b50a92bc9f675960361f703899bbac295c6359a63f54cb208e1bae8bdc52
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..d8d817c42a09
--- /dev/null
+++ b/media-sound/mangler/mangler-1.2.5-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit 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
+	econf \
+		--disable-dependency-tracking \
+		$(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() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}
diff --git a/media-sound/mangler/metadata.xml b/media-sound/mangler/metadata.xml
new file mode 100644
index 000000000000..07e68d257297
--- /dev/null
+++ b/media-sound/mangler/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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>
+    <email>prometheanfire@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/marrie/Manifest b/media-sound/marrie/Manifest
new file mode 100644
index 000000000000..cfc1d0028d11
--- /dev/null
+++ b/media-sound/marrie/Manifest
@@ -0,0 +1 @@
+DIST marrie-0.3.2.tar.gz 7626 SHA256 be65ca0f2a238ec811d778db938d98488f72a8df2d323fed0a7730f3b7e29258 SHA512 da6688e18124f2c95e2dd9846a2578fd2e6312f7e145424f50761eaabdd3c234424921f289b595e8842a9f5e3863a9ef106331c19cec42de9731d12f9584958a WHIRLPOOL 33f7b0681d6290f0eddfb1117c89283551d4299a05adfbdc4fbae5bdbccec6e00040ff22000becefce9be1930675291ade2cc1925b7234fe599d4dc5c95cc7a7
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..04d9d26810d9
--- /dev/null
+++ b/media-sound/marrie/marrie-0.3.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+GIT_ECLASS=""
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="git://github.com/rafaelmartins/marrie.git
+		https://github.com/rafaelmartins/marrie.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..04d9d26810d9
--- /dev/null
+++ b/media-sound/marrie/marrie-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+GIT_ECLASS=""
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="git://github.com/rafaelmartins/marrie.git
+		https://github.com/rafaelmartins/marrie.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..cf524c19040d
--- /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>
+		<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..ac840a118374
--- /dev/null
+++ b/media-sound/mcdp/Manifest
@@ -0,0 +1,2 @@
+DIST mcdp-0.4a.tar.bz2 29872 RMD160 19fcfde4c22a6ad818dd6a68a2baa9c58ea769d7 SHA1 8628a555214565e0f474048fa26e4e7a9f9f8868 SHA256 92477cdd96bda3aae8a6ffff532845958f29700829c25cdfca25c54788a6a3d5
+DIST mcdp-0.4b.tar.bz2 29940 RMD160 56beff05c5dd35bd8fa4d587743643c7c03b41c7 SHA1 2f2ecdf1fdba3506a9ef98c9e987962e5aec0fc1 SHA256 0faa031b07299b0fb2353306a669328c877717e1bc7e274e40c3d2612e103cab
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..5f64fe283608
--- /dev/null
+++ b/media-sound/mcdp/mcdp-0.4a.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..85b67d6c4e55
--- /dev/null
+++ b/media-sound/mcdp/mcdp-0.4b.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/mcdp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..99eba67eed71
--- /dev/null
+++ b/media-sound/meterbridge/Manifest
@@ -0,0 +1 @@
+DIST meterbridge-0.9.3.tar.gz 610566 SHA256 3feef0e52d68333c97f32393aff73f2c4d963bd974c5d3f42689c6eb3e1bf668
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/metadata.xml b/media-sound/meterbridge/metadata.xml
new file mode 100644
index 000000000000..0dc3775f83d7
--- /dev/null
+++ b/media-sound/meterbridge/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+</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..bf89331e0a6a
--- /dev/null
+++ b/media-sound/meterbridge/meterbridge-0.9.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+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
+	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..c0e6edc8fa04
--- /dev/null
+++ b/media-sound/mhwaveedit/Manifest
@@ -0,0 +1,3 @@
+DIST mhwaveedit-1.4.21.tar.bz2 625695 SHA256 878788bfb9e0bcb4194042d64ab86e9dc2114d25d090d08a658e7ccde17e874a SHA512 9d4f12cae243812f58d90dab1a1cef86ed62c0a2948f417bf5cfa4213621426dbd86e2293d514fdcc440d726851bd22d7e0728e60c1547fb9203672070864304 WHIRLPOOL 37a767b03f2b76b795ba49d52d86c341bb74afad213629dcee335b00711b48493f3be8e3ce55f485768882695a27f1b9fe2a7c893a8677e18378e5adec61aee9
+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
diff --git a/media-sound/mhwaveedit/metadata.xml b/media-sound/mhwaveedit/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/mhwaveedit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/mhwaveedit/mhwaveedit-1.4.21.ebuild b/media-sound/mhwaveedit/mhwaveedit-1.4.21.ebuild
new file mode 100644
index 000000000000..ec57f4e9d0f8
--- /dev/null
+++ b/media-sound/mhwaveedit/mhwaveedit-1.4.21.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+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"
+
+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
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS BUGS ChangeLog HACKING NEWS README TODO
+}
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..a1753d656176
--- /dev/null
+++ b/media-sound/mhwaveedit/mhwaveedit-1.4.22.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..cba4b58583f8
--- /dev/null
+++ b/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..99bc8d56d7a8
--- /dev/null
+++ b/media-sound/mikmod/Manifest
@@ -0,0 +1,2 @@
+DIST mikmod-3.2.5.tar.gz 285801 SHA256 da2b4b13f769a7c54119869851c8e6b9a6ca812b96fe5e2c5394441722e4e383 SHA512 e441d5dc4a3f6f2101e4db8cd3cb55f90a418d92767c143c1754c8ef33445aa4ace48a48ab8c209336c0eb3fd66590380cfbbe71c086908dfb0ae9fdd88adca5 WHIRLPOOL 9f46690799f4f1a899eaff15367512969f461ae6264024e1b1350b59fed979bac42ffcce9569558675a8f257c7de22ded1d0df9f30e4ebbe03fd109c81e8f334
+DIST mikmod-3.2.6.tar.gz 278754 SHA256 04544e0edb36a19fab61233dff97430969cff378a98f5989a1378320550e2673 SHA512 7a3fbbf7b0ceff92448224a7d9d58660c8f0ecdb26fe08b1b318abf2b07dd18d472467c226c72fcefd73aa9c42da813c65b236c91f5c582e41fad33b6ee96cc5 WHIRLPOOL aa66da48f4e00e5f823ae512d3005dc4c80693d2b768a43f4ca40fbaecee71cc048f3ad9d136b3df2a78f79545bec34641b85b3fd1690ab65f09068228babec8
diff --git a/media-sound/mikmod/metadata.xml b/media-sound/mikmod/metadata.xml
new file mode 100644
index 000000000000..b86266440788
--- /dev/null
+++ b/media-sound/mikmod/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">mikmod</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mikmod/mikmod-3.2.5.ebuild b/media-sound/mikmod/mikmod-3.2.5.ebuild
new file mode 100644
index 000000000000..3530e48c929c
--- /dev/null
+++ b/media-sound/mikmod/mikmod-3.2.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.2.0
+	>=sys-libs/ncurses-5.7-r7"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README"
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..adce3e9c2d53
--- /dev/null
+++ b/media-sound/mikmod/mikmod-3.2.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/milkytracker/Manifest b/media-sound/milkytracker/Manifest
new file mode 100644
index 000000000000..95f5a45c441a
--- /dev/null
+++ b/media-sound/milkytracker/Manifest
@@ -0,0 +1 @@
+DIST milkytracker-0.90.86.tar.bz2 2202256 SHA256 eb93000ed4855e198dfb02df54f3e3536dc891084ca47cdd5393121137ba3bed SHA512 8142f0b438e478571db25960d1b31f1d8c7e68feea96bdd238d1b1c1744105d929f18c990a301af6bebfc2d517bad687232410477ced6d8c4bfec8053cfcad8e WHIRLPOOL 3c388cde08c81a73e80ee834e7b1cef90dc32d3e7885de47259cb3b219bd7207f816c240b87fede59335ec5a2561a00e23ab3aa05b5e34f4bbe3ae7866ff5045
diff --git a/media-sound/milkytracker/files/milkytracker-0.90.86-underlinking.patch b/media-sound/milkytracker/files/milkytracker-0.90.86-underlinking.patch
new file mode 100644
index 000000000000..fb270ab17e22
--- /dev/null
+++ b/media-sound/milkytracker/files/milkytracker-0.90.86-underlinking.patch
@@ -0,0 +1,11 @@
+--- src/tracker/Makefile.am
++++ src/tracker/Makefile.am
+@@ -76,7 +76,7 @@
+ $(top_builddir)/src/ppui/osinterface/libosinterface.a \
+ $(top_builddir)/src/fx/libfx.a $(compressionLib) $(RTMIDI) $(SDL_LIBS) \
+ $(top_builddir)/src/compression/zziplib/generic/libzzip.a \
+-$(Z_LIBS)
++$(Z_LIBS) $(ALSA_LIBS)
+ #$(ZZIP_LIBS) read below
+ 
+ # NOTE: The MilkyTracker source contains a MODIFIED version of the zzip
diff --git a/media-sound/milkytracker/metadata.xml b/media-sound/milkytracker/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/milkytracker/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/milkytracker/milkytracker-0.90.86.ebuild b/media-sound/milkytracker/milkytracker-0.90.86.ebuild
new file mode 100644
index 000000000000..24ea5258d1c9
--- /dev/null
+++ b/media-sound/milkytracker/milkytracker-0.90.86.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# TODO: Unbundle dev-libs/zziplib!
+
+inherit autotools eutils
+
+DESCRIPTION="FastTracker 2 inspired music tracker"
+HOMEPAGE="http://milkytracker.org/"
+SRC_URI="http://milkytracker.org/files/${P}.tar.bz2"
+
+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=">=media-libs/libsdl-1.2:=[X]
+	sys-libs/zlib:=
+	alsa? ( media-libs/alsa-lib:= )
+	jack? ( media-sound/jack-audio-connection-kit:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-underlinking.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with alsa) \
+		$(use_with jack)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS docs/{readme_unix,TiTAN.nfo}
+	dohtml docs/{ChangeLog,FAQ,MilkyTracker}.html
+
+	newicon resources/pictures/carton.png ${PN}.png
+	make_desktop_entry ${PN} MilkyTracker ${PN} \
+		"AudioVideo;Audio;Sequencer"
+}
diff --git a/media-sound/mimd/Manifest b/media-sound/mimd/Manifest
new file mode 100644
index 000000000000..08f2e6383318
--- /dev/null
+++ b/media-sound/mimd/Manifest
@@ -0,0 +1 @@
+DIST mimd-0.30.1.tar.bz2 16853 SHA256 c1ee0c19163b412dede0cf7d302050931498f2d34fe2e1e9c580d609c8c91924
diff --git a/media-sound/mimd/files/mimd-0.30.1+live-2006.12.08.patch b/media-sound/mimd/files/mimd-0.30.1+live-2006.12.08.patch
new file mode 100644
index 000000000000..96b94095e349
--- /dev/null
+++ b/media-sound/mimd/files/mimd-0.30.1+live-2006.12.08.patch
@@ -0,0 +1,29 @@
+Index: mimd-0.30.1/Makefile.in
+===================================================================
+--- mimd-0.30.1.orig/Makefile.in
++++ mimd-0.30.1/Makefile.in
+@@ -1,10 +1,12 @@
+ LIVEDIR=@LIVEDIR@
+-XERCESDIR=@XERCESDIR@
++#XERCESDIR=@XERCESDIR@
++XERCESDIR=/usr
+ PREFIX=@PREFIX@
+ 
+-CXXFLAGS += -I$(LIVEDIR)/BasicUsageEnvironment/include -I$(LIVEDIR)/groupsock/include -I$(LIVEDIR)/liveMedia/include -I$(LIVEDIR)/UsageEnvironment/include -I$(XERCESDIR)/include -Isrc/include -DVERSION="0301"
++#CXXFLAGS += -I$(LIVEDIR)/BasicUsageEnvironment/include -I$(LIVEDIR)/groupsock/include -I$(LIVEDIR)/liveMedia/include -I$(LIVEDIR)/UsageEnvironment/include -I$(XERCESDIR)/include -Isrc/include -DVERSION="0301"
++CPPFLAGS += -I/usr/include/BasicUsageEnvironment -I/usr/include/groupsock -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -Isrc/include -DVERSION="0301"
+ 
+-LDFLAGS=-L$(LIVEDIR)/BasicUsageEnvironment -L$(LIVEDIR)/groupsock -L$(LIVEDIR)/liveMedia -L$(LIVEDIR)/UsageEnvironment -L$(XERCESDIR)/lib
++#LDFLAGS=-L$(LIVEDIR)/BasicUsageEnvironment -L$(LIVEDIR)/groupsock -L$(LIVEDIR)/liveMedia -L$(LIVEDIR)/UsageEnvironment -L$(XERCESDIR)/lib
+ 
+ LDLIBS=-lxerces-c -lUsageEnvironment -lBasicUsageEnvironment -lgroupsock -lliveMedia -lpthread
+ 
+@@ -32,7 +34,7 @@ OBJS= src/MediaStreamer.o\
+       src/parser.o
+ 
+ mimd: $(OBJS)
+-	g++ -o mimd $(LDFLAGS) $(OBJS) $(LDLIBS)
++	$(CXX) -o mimd $(LDFLAGS) $(OBJS) $(LDLIBS)
+ 
+ install: mimd
+ 	mkdir -p $(PREFIX)/doc $(PREFIX)/etc $(PREFIX)/bin $(PREFIX)/man/man1 > /dev/null
diff --git a/media-sound/mimd/files/mimd-0.30.1-fortify_sources.patch b/media-sound/mimd/files/mimd-0.30.1-fortify_sources.patch
new file mode 100644
index 000000000000..74a1e76560b1
--- /dev/null
+++ b/media-sound/mimd/files/mimd-0.30.1-fortify_sources.patch
@@ -0,0 +1,12 @@
+diff -ur mimd-0.30.1.orig/src/parser.cpp mimd-0.30.1/src/parser.cpp
+--- mimd-0.30.1.orig/src/parser.cpp	2003-07-10 21:35:52.000000000 +0300
++++ mimd-0.30.1/src/parser.cpp	2009-06-06 19:49:56.000000000 +0300
+@@ -37,7 +37,7 @@
+       int fd;
+ 
+       // Check to see if we can make a scratch file in the directory
+-      if((fd=open(tf.c_str(), O_RDWR|O_CREAT|O_TRUNC)) == -1) 
++      if((fd=open(tf.c_str(), O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR)) == -1) 
+          return false;
+ 
+       // Close and delete the test file
diff --git a/media-sound/mimd/metadata.xml b/media-sound/mimd/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/mimd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/mimd/mimd-0.30.1.ebuild b/media-sound/mimd/mimd-0.30.1.ebuild
new file mode 100644
index 000000000000..ca7a3efe069b
--- /dev/null
+++ b/media-sound/mimd/mimd-0.30.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Multicast streaming server for MPEG1/2 and MP3 files"
+HOMEPAGE="http://darkwing.uoregon.edu/~tkay/mim.html"
+SRC_URI="http://darkwing.uoregon.edu/~tkay/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE=""
+
+RDEPEND=">=media-plugins/live-2006.12.08
+	dev-libs/xerces-c"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}+live-2006.12.08.patch \
+		"${FILESDIR}"/${P}-fortify_sources.patch
+	cp -f Makefile.in Makefile
+}
+
+src_configure() { :; }
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin mimd || die "dobin failed"
+	dodoc doc/mimd.pod
+
+	if [ -x /usr/bin/pod2html ]; then
+		pod2html < doc/mimd.pod > doc/mimd.html
+		dohtml doc/mimd.html
+	fi
+
+	if [ -x /usr/bin/pod2man ]; then
+		pod2man < doc/mimd.pod > doc/mimd.1
+		doman doc/mimd.1
+	fi
+
+	insinto /usr/share/mimd
+	doins etc/mimd.dtd etc/sample.xml
+}
+
+pkg_postinst() {
+	elog "Please read the documentation (mimd.html or man mimd) for "
+	elog "instructions on configuring mimd. The DTD for the configuration "
+	elog "files is in /usr/share/mimd/mimd.dtd, along with a sample "
+	elog "configuration file (/usr/share/mimd/sample.xml)."
+	ewarn "NOTE: You must have ip multicasting enabled in the kernel for this"
+	ewarn "daemon to work properly."
+}
diff --git a/media-sound/miniaudicle/Manifest b/media-sound/miniaudicle/Manifest
new file mode 100644
index 000000000000..955f93152e70
--- /dev/null
+++ b/media-sound/miniaudicle/Manifest
@@ -0,0 +1 @@
+DIST miniAudicle-0.1.3.8.tgz 2253821 SHA256 adfbd244a7963e646c466f70111fee4ecf32eee500c4c9a33ca9b52387631cd6 SHA512 6d2b9596174f1f6aa2f246cf880b920f9855b93e57b437e355acc880cd2980b8aa21fa2ce870230c9e0ca7403bd43ce865f79b7fa188e8fea906aac24ce3e16d WHIRLPOOL ff3d7a3ad66fa31339e10637ae96b1c7fbe378cfbe07a2e1572a738c2d22298e88913c7a0a383d90d209817a53422a21100bfca72f18e0c2f53981d22ddd7d2a
diff --git a/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-gcc44.patch b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-gcc44.patch
new file mode 100644
index 000000000000..7b1bc9c06d3e
--- /dev/null
+++ b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-gcc44.patch
@@ -0,0 +1,159 @@
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/chuck_vm.cpp miniAudicle-0.1.3.8/chuck/src/chuck_vm.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/chuck_vm.cpp	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/chuck_vm.cpp	2009-06-27 21:15:00.000000000 -0400
+@@ -47,6 +47,7 @@
+ #else
+   #include <unistd.h>
+   #include <pthread.h>
++  #include <algorithm>
+ #endif
+ 
+ 
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/rtaudio.cpp miniAudicle-0.1.3.8/chuck/src/rtaudio.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/rtaudio.cpp	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/rtaudio.cpp	2009-06-27 21:15:00.000000000 -0400
+@@ -50,6 +50,7 @@
+ #include "chuck_errmsg.h"
+ #include "digiio_rtaudio.h"
+ #include <stdio.h>
++#include <climits>
+ // old
+ // #include "RtAudio.h"
+ // #include <iostream>
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/ugen_stk.cpp miniAudicle-0.1.3.8/chuck/src/ugen_stk.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/ugen_stk.cpp	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/ugen_stk.cpp	2009-06-27 21:15:00.000000000 -0400
+@@ -41,6 +41,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <float.h>
++#include <climits>
+ 
+ 
+ 
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/ugen_xxx.cpp miniAudicle-0.1.3.8/chuck/src/ugen_xxx.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/ugen_xxx.cpp	2009-06-27 21:11:20.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/ugen_xxx.cpp	2009-06-27 21:15:31.000000000 -0400
+@@ -2587,7 +2587,7 @@
+         // open it
+         SF_INFO info;
+         info.format = 0;
+-        char * format = strrchr( filename, '.');
++        const char * format = strrchr( filename, '.');
+         if( format && strcmp( format, ".raw" ) == 0 )
+         { 
+             fprintf( stderr, "[chuck](via SndBuf) %s :: type is '.raw'...\n    assuming 16 bit signed mono (PCM)\n", filename );
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/util_hid.cpp miniAudicle-0.1.3.8/chuck/src/util_hid.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/util_hid.cpp	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/util_hid.cpp	2009-06-27 21:15:00.000000000 -0400
+@@ -37,6 +37,7 @@
+ 
+ #include <vector>
+ #include <map>
++#include <climits>
+ 
+ using namespace std;
+ 
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/util_opsc.cpp miniAudicle-0.1.3.8/chuck/src/util_opsc.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/util_opsc.cpp	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/util_opsc.cpp	2009-06-27 21:15:00.000000000 -0400
+@@ -56,6 +56,7 @@
+ #include <netinet/tcp.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <algorithm>
+ #endif
+ 
+ #if defined(__MACOSX_CORE__)
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/util_string.h miniAudicle-0.1.3.8/chuck/src/util_string.h
+--- miniAudicle-0.1.3.8-orig/chuck/src/util_string.h	2009-06-27 21:11:20.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/util_string.h	2009-06-27 21:16:12.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include "chuck_def.h"
+ #include <string>
+ #include <vector>
++#include <cstdio>
+ 
+ 
+ // itoa
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/add.xpm miniAudicle-0.1.3.8/wxw/icons/add.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/add.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/add.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * add_xpm[] = {
++static const char * add_xpm[] = {
+ "32 32 47 1",
+ " 	c None",
+ ".	c #C3F8BE",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-blue.xpm miniAudicle-0.1.3.8/wxw/icons/led-blue.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/led-blue.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/led-blue.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * led_blue_xpm[] = {
++static const char * led_blue_xpm[] = {
+ "28 28 431 2",
+ "  	c None",
+ ". 	c #949394",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-green.xpm miniAudicle-0.1.3.8/wxw/icons/led-green.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/led-green.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/led-green.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * led_green_xpm[] = {
++static const char * led_green_xpm[] = {
+ "28 28 443 2",
+ "  	c None",
+ ". 	c #959696",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-off.xpm miniAudicle-0.1.3.8/wxw/icons/led-off.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/led-off.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/led-off.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * led_off_xpm[] = {
++static const char * led_off_xpm[] = {
+ "28 28 143 2",
+ "  	c None",
+ ". 	c #959595",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-red.xpm miniAudicle-0.1.3.8/wxw/icons/led-red.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/led-red.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/led-red.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * led_red_xpm[] = {
++static const char * led_red_xpm[] = {
+ "28 28 434 2",
+ "  	c None",
+ ". 	c #959594",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/miniAudicle.xpm miniAudicle-0.1.3.8/wxw/icons/miniAudicle.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/miniAudicle.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/miniAudicle.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * miniAudicle_xpm[] = {
++static const char * miniAudicle_xpm[] = {
+ "128 128 1543 2",
+ "  	c None",
+ ". 	c #FF9D20",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/remove.xpm miniAudicle-0.1.3.8/wxw/icons/remove.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/remove.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/remove.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * remove_xpm[] = {
++static const char * remove_xpm[] = {
+ "32 32 177 2",
+ "  	c None",
+ ". 	c #FFB6B5",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/replace.xpm miniAudicle-0.1.3.8/wxw/icons/replace.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/replace.xpm	2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/replace.xpm	2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * replace_xpm[] = {
++static const char * replace_xpm[] = {
+ "32 32 114 2",
+ "  	c None",
+ ". 	c #5764FF",
+
diff --git a/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-hid-smc.patch b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-hid-smc.patch
new file mode 100644
index 000000000000..de1265511a0b
--- /dev/null
+++ b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-hid-smc.patch
@@ -0,0 +1,148 @@
+diff -ru miniAudicle-0.1.3.8~/chuck-1.2.1.1/src/util_hid.cpp miniAudicle-0.1.3.8/chuck-1.2.1.1/src/util_hid.cpp
+--- miniAudicle-0.1.3.8~/chuck-1.2.1.1/src/util_hid.cpp	2008-03-29 23:46:07.000000000 +0100
++++ miniAudicle-0.1.3.8/chuck-1.2.1.1/src/util_hid.cpp	2008-03-29 23:46:36.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
diff --git a/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-void-to-int-cast.patch b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-void-to-int-cast.patch
new file mode 100644
index 000000000000..926788c6f20c
--- /dev/null
+++ b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-void-to-int-cast.patch
@@ -0,0 +1,58 @@
+Index: miniAudicle-0.1.3.8/wxw/mAPreferencesWindow.cpp
+===================================================================
+--- miniAudicle-0.1.3.8.orig/wxw/mAPreferencesWindow.cpp
++++ miniAudicle-0.1.3.8/wxw/mAPreferencesWindow.cpp
+@@ -828,7 +828,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
+     selected_item = audio_output->GetSelection();
+     if( selected_item != wxNOT_FOUND )
+     {
+-        int dac = ( int ) audio_output->GetClientData( selected_item );
++        int dac = ( intptr_t ) audio_output->GetClientData( selected_item );
+         config->Write( mAPreferencesAudioOutput, dac );
+         ma->set_dac( dac );
+     }
+@@ -837,7 +837,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
+     selected_item = audio_input->GetSelection();
+     if( selected_item != wxNOT_FOUND )
+     {
+-        int adc = ( int ) audio_input->GetClientData( selected_item );
++        int adc = ( intptr_t ) audio_input->GetClientData( selected_item );
+         config->Write( mAPreferencesAudioInput, adc );
+         ma->set_adc( adc );
+     }
+@@ -846,7 +846,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
+     selected_item = output_channels->GetSelection();
+     if( selected_item != wxNOT_FOUND )
+     {
+-        int num_outputs = ( int ) output_channels->GetClientData( selected_item );
++        int num_outputs = ( intptr_t ) output_channels->GetClientData( selected_item );
+         config->Write( mAPreferencesOutputChannels, num_outputs );
+         ma->set_num_outputs( num_outputs );
+     }
+@@ -855,7 +855,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
+     selected_item = input_channels->GetSelection();
+     if( selected_item != wxNOT_FOUND )
+     {
+-        int num_inputs = ( int ) input_channels->GetClientData( selected_item );
++        int num_inputs = ( intptr_t ) input_channels->GetClientData( selected_item );
+         config->Write( mAPreferencesInputChannels, num_inputs );
+         ma->set_num_inputs( num_inputs );
+     }
+@@ -864,7 +864,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
+     selected_item = sample_rate->GetSelection();
+     if( selected_item != wxNOT_FOUND )
+     {
+-        int _sample_rate = ( int ) sample_rate->GetClientData( selected_item );
++        int _sample_rate = ( intptr_t ) sample_rate->GetClientData( selected_item );
+         config->Write( mAPreferencesSampleRate, _sample_rate );
+         ma->set_sample_rate( _sample_rate );
+     }
+@@ -873,7 +873,7 @@ void mAPreferencesWindow::LoadGUIToMiniA
+     selected_item = buffer_size->GetSelection();
+     if( selected_item != wxNOT_FOUND )
+     {
+-        int _buffer_size = ( int ) buffer_size->GetClientData( selected_item );
++        int _buffer_size = ( intptr_t ) buffer_size->GetClientData( selected_item );
+         config->Write( mAPreferencesBufferSize, _buffer_size );
+         ma->set_buffer_size( _buffer_size );
+     }
diff --git a/media-sound/miniaudicle/metadata.xml b/media-sound/miniaudicle/metadata.xml
new file mode 100644
index 000000000000..ac5c42297c90
--- /dev/null
+++ b/media-sound/miniaudicle/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		a light-weight integrated development environment for the ChucK digital
+		audio programming language
+	</longdescription>
+</pkgmetadata>
+
diff --git a/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild b/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild
new file mode 100644
index 000000000000..fc561c4adb02
--- /dev/null
+++ b/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER=2.8
+inherit eutils toolchain-funcs flag-o-matic wxwidgets
+
+MY_P="${P/a/A}"
+
+DESCRIPTION="integrated development + performance environment for chuck"
+HOMEPAGE="http://audicle.cs.princeton.edu/mini/"
+SRC_URI="http://audicle.cs.princeton.edu/mini/release/files/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+alsa jack oss"
+
+RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	media-libs/libsndfile
+	>=x11-libs/gtk+-2.10:2
+	x11-libs/wxGTK:2.8[X]
+	app-eselect/eselect-miniaudicle"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="|| ( alsa jack oss )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-hid-smc.patch" \
+		"${FILESDIR}/${P}-gcc44.patch" \
+		"${FILESDIR}/${P}-void-to-int-cast.patch"
+
+	sed -i -e 's/make -C/#make -C/' \
+		-e 's/g++/$(CXX)/' \
+		-e 's/-O3 -c/-c $(CFLAGS)/' \
+		-e 's/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
+		makefile.* || die "sed failed"
+
+	# Respect LDFLAGS in bundled media-sound/chuck
+	# prevent underlinking with pthreads library
+	sed -i -e 's/$(LIBS)/$(LDFLAGS) $(LIBS) -lpthread/' \
+		chuck/src/makefile.* || die "sed failed"
+
+	epatch_user
+}
+
+compile_backend() {
+	local backend="$1"
+	einfo "Compiling against ${backend}"
+	cd "${S}/chuck/src"
+	emake -f "makefile.${backend}" CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)"
+	cd "${S}"
+	emake -f "makefile.${backend}" CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)"
+	mv wxw/miniAudicle{,-${backend}}
+	emake -f "makefile.${backend}" clean
+	cd "${S}/chuck/src"
+	emake -f "makefile.${backend}" clean
+}
+
+src_compile() {
+	# when compiled with -march=athlon or -march=athlon-xp
+	# miniaudicle 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 wxw/miniAudicle-jack
+	use alsa && dobin wxw/miniAudicle-alsa
+	use oss && dobin wxw/miniAudicle-oss
+	dodoc BUGS README.linux VERSIONS
+}
+
+pkg_postinst() {
+	elog "miniAudicle now can use many audio engines, so you can specify audio engine"
+	elog "with miniAudicle-{jack,alsa,oss}"
+	elog "Or you can use 'eselect miniaudicle' to set the audio engine"
+
+	einfo "Calling eselect miniaudicle update..."
+	eselect miniaudicle update --if-unset
+}
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
new file mode 100644
index 000000000000..abcdcd865fe1
--- /dev/null
+++ b/media-sound/mixxx/Manifest
@@ -0,0 +1,2 @@
+DIST mixxx-1.10.1-src.tar.gz 15948956 SHA256 eab49a95336dacee9a9e4c2ad22a0436e9c0b341930e9a03e3b46619d7a9f365 SHA512 eff18cba96d781830d33a35cf74dcac0dc33c9d2c16e9533d171d2acc2fd0ad602f5bb46d62212e224e61357332a5d9ed078ca86532f39ee01057eb3aaf09af3 WHIRLPOOL 39fda17c512030da1c4de4e495ad22ff9fda9b5aeccfcdd3a7f35d08ebed79c2e6655bef409a43bfd25a072a01e3512669a566048f40b46c9d1c3143f58f821c
+DIST mixxx-1.11.0-src.tar.gz 24473835 SHA256 00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331 SHA512 a42c2e3a648986e401f9812315942b5c68e0bc4f47ce867eb043d64f9d7836860e414b04b5e5da52b0541da5069d231774f30e965bcf3bd0db09f6bca74876c2 WHIRLPOOL 9ab4de6bfa5840500f04a4e7d523b6546e0ef08ade017f14b73425e205f039a6da11604f2b0e902085ff3062fff451385f984735029592d4b10ac3d4e0c985b1
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/metadata.xml b/media-sound/mixxx/metadata.xml
new file mode 100644
index 000000000000..90052b15c004
--- /dev/null
+++ b/media-sound/mixxx/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<use>
+		<flag name="hid">Enable HID controller support</flag>
+		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
+		<flag name="vamp">Enable vamp analyzing plugins support</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/mixxx/mixxx-1.10.1.ebuild b/media-sound/mixxx/mixxx-1.10.1.ebuild
new file mode 100644
index 000000000000..a5e2a4081476
--- /dev/null
+++ b/media-sound/mixxx/mixxx-1.10.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils multilib scons-utils toolchain-funcs
+
+DESCRIPTION="A Qt based Digital DJ tool"
+HOMEPAGE="http://mixxx.sourceforge.net"
+SRC_URI="http://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="aac debug doc mp3 pulseaudio shout wavpack"
+
+RDEPEND="media-libs/fidlib
+	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/taglib
+	virtual/glu
+	virtual/opengl
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qtsql:4
+	dev-qt/qtsvg:4
+	dev-qt/qtwebkit:4
+	dev-qt/qtxmlpatterns:4
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	mp3? ( media-libs/libmad )
+	pulseaudio? ( media-sound/pulseaudio )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.10.0-system-libs.patch
+	epatch "${FILESDIR}"/${PN}-1.10.0-cflags.patch
+	epatch "${FILESDIR}"/${PN}-1.10.0-docs.patch
+	epatch "${FILESDIR}"/${PN}-1.10.0-no-bzr.patch
+
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	# alter startup command when pulseaudio support is disabled
+	if ! use pulseaudio ; then
+		sed -i -e 's:pasuspender ::' src/mixxx.desktop || die
+	fi
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBPATH="/usr/$(get_libdir)" escons \
+		prefix=/usr \
+		qtdir=/usr/$(get_libdir)/qt4 \
+		hifieq=1 \
+		vinylcontrol=1 \
+		optimize=0 \
+		$(use_scons aac faad) \
+		$(use_scons debug qdebug) \
+		$(use_scons mp3 mad) \
+		$(use_scons shout shoutcast) \
+		$(use_scons wavpack wv)
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBPATH="/usr/$(get_libdir)" escons install \
+		prefix=/usr \
+		qtdir=/usr/$(get_libdir)/qt4 \
+		install_root="${D}"/usr
+
+	dodoc README Mixxx-Manual.pdf
+}
diff --git a/media-sound/mixxx/mixxx-1.11.0.ebuild b/media-sound/mixxx/mixxx-1.11.0.ebuild
new file mode 100644
index 000000000000..7e06555bea87
--- /dev/null
+++ b/media-sound/mixxx/mixxx-1.11.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib scons-utils toolchain-funcs
+
+DESCRIPTION="A Qt based Digital DJ tool"
+HOMEPAGE="http://mixxx.sourceforge.net"
+SRC_URI="http://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac debug doc hid mp3 mp4 pulseaudio shout vamp wavpack"
+
+RDEPEND="
+	dev-libs/protobuf:=
+	dev-libs/libusb:1
+	>=media-libs/fidlib-0.9.10-r1
+	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/taglib
+	virtual/glu
+	virtual/opengl
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qtscript:4
+	dev-qt/qtsql:4
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2 )
+	pulseaudio? ( media-sound/pulseaudio )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )
+	vamp? ( media-libs/vamp-plugin-sdk )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.10.0-cflags.patch
+	epatch "${FILESDIR}"/${P}-system-libs.patch
+	EPATCH_OPTS="-l" epatch "${FILESDIR}"/${PN}-1.10.0-docs.patch
+	epatch "${FILESDIR}"/${P}-no-bzr.patch
+
+	# use multilib compatible directory for plugins
+	sed -i "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	# alter startup command when pulseaudio support is disabled
+	if ! use pulseaudio ; then
+		sed -i 's:pasuspender ::' src/mixxx.desktop || die
+	fi
+}
+
+src_configure() {
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt4"
+		hifieq=1
+		vinylcontrol=1
+		optimize=0
+		$(use_scons aac faad)
+		$(use_scons debug qdebug)
+		$(use_scons hid hid)
+		$(use_scons mp3 mad)
+		$(use_scons mp4 m4a)
+		$(use_scons shout shoutcast)
+		$(use_scons wavpack wv)
+		$(use_scons vamp)
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+		LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBPATH="${EPREFIX}/usr/$(get_libdir)" escons \
+		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..aa2505f959c3
--- /dev/null
+++ b/media-sound/mmix/Manifest
@@ -0,0 +1 @@
+DIST mmix-0.3.tar.bz2 23628 RMD160 578293ceb355db4b20fceaef9f4aa4639ceef642 SHA1 2b99d7e99463ec0084b197cf0d121897d732da03 SHA256 089071e8440ae8715340e5757714176ab2b14c1918339f9c22d91745ad0ca9d6
diff --git a/media-sound/mmix/metadata.xml b/media-sound/mmix/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/mmix/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..0ca5021b7728
--- /dev/null
+++ b/media-sound/mmix/mmix-0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..c4df553b5470
--- /dev/null
+++ b/media-sound/moc/Manifest
@@ -0,0 +1,3 @@
+DIST moc-2.5.0-beta1.tar.bz2 570468 SHA256 076816da9c6d1e61a386a1dda5f63ee2fc84bc31e9011ef70acc1d391d4c46a6 SHA512 16f1cf35706bbf410197651fd4398114ae2c95103773886629f0e1884900f2b865b9b6354da507a57af021a7d6599cd2e1d7e338791dc4a6f55e6c6c193800f2 WHIRLPOOL 793fa9bdd23da14cc558262335b81560aa82a86c641b2a163af64d80659b652ada83193b0ed2888bfbe0d0b43cb35447ad0b0fa8de394742c0e162d3050520de
+DIST moc-2.5.0.tar.bz2 594532 SHA256 d29ea52240af76c4aa56fa293553da9d66675823e689249cee5f8a60657a6091 SHA512 ca6cfd4d1d13030bd561df8ab671399a17dfb675c360ecc95a2491c6a85764d0f72259ac33665405b197f370f4fd7ef59d9a485706f8a882bff30d0fafcf252c WHIRLPOOL 770d4024451c9f153fe16b60819392f677171c1ba08c8d95d9dfd5e1be1a19bfd5a7d9f771aa4ded8c40c0f042865f6e693727fce261464261d4311860fcff58
+DIST moc-2.6-alpha1.tar.xz 491660 SHA256 0b0a3515c65b4c47a250e350c663535778239352db859921f5d564ed727a0bbc SHA512 9de2e17e2d7441bb5ae2fa33884d4f569a91e987db39d2b331e8c28ddf0ecca1bdbd6079bebc1770c20d7f062b33069dd8b4a8184a309bf831538cb36f69ed3a WHIRLPOOL 86adcff80f4597e68bcf22ecf21f9eba913e257f8c7cf63d934e3874ea8fd59169652e4571b6f2bb1e54cdce0de6cb3027c494b29c9ae179910366b11b3786f9
diff --git a/media-sound/moc/files/moc-2.5.0_beta1-no-automagic-popt.patch b/media-sound/moc/files/moc-2.5.0_beta1-no-automagic-popt.patch
new file mode 100644
index 000000000000..83c071e6b1e5
--- /dev/null
+++ b/media-sound/moc/files/moc-2.5.0_beta1-no-automagic-popt.patch
@@ -0,0 +1,12 @@
+--- moc-2.5.0-beta1/configure.in
++++ moc-2.5.0-beta1/configure.in
+@@ -341,9 +341,6 @@
+ 		AC_MSG_ERROR([You need curses/ncurses library and header files.])
+ fi
+ 
+-dnl popt
+-AC_SEARCH_LIBS([poptGetContext], [popt], , [POPT_MISSING="yes"])
+-
+ dnl getopt
+ AC_CHECK_FUNC(getopt_long,
+ 	      [AC_CHECK_HEADERS([getopt.h],,[AC_MSG_ERROR([You need getopt.h.])])],
diff --git a/media-sound/moc/metadata.xml b/media-sound/moc/metadata.xml
new file mode 100644
index 000000000000..0ed4f43541ba
--- /dev/null
+++ b/media-sound/moc/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>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<herd>sound</herd>
+	<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.0.ebuild b/media-sound/moc/moc-2.5.0.ebuild
new file mode 100644
index 000000000000..9f6273d236e6
--- /dev/null
+++ b/media-sound/moc/moc-2.5.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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[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.5.0_beta1-r1.ebuild b/media-sound/moc/moc-2.5.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..c6552af955ee
--- /dev/null
+++ b/media-sound/moc/moc-2.5.0_beta1-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils autotools
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Music On Console - ncurses interface for playing audio files"
+HOMEPAGE="http://moc.daper.net"
+SRC_URI="ftp://ftp.daper.net/pub/soft/moc/unstable/${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[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_prepare() {
+	# moc-2.5.0 will require popt, but currently it's an unused, automagic dep
+	epatch "${FILESDIR}"/${P}-no-automagic-popt.patch
+	eautoreconf
+}
+
+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() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS TODO # The rest is installed by doc_DATA from "${S}"/Makefile.am
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
diff --git a/media-sound/moc/moc-2.6_alpha1.ebuild b/media-sound/moc/moc-2.6_alpha1.ebuild
new file mode 100644
index 000000000000..657caea3c390
--- /dev/null
+++ b/media-sound/moc/moc-2.6_alpha1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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/unstable/${MY_P}.tar.xz"
+
+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[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/modplugtools/Manifest b/media-sound/modplugtools/Manifest
new file mode 100644
index 000000000000..38ba7b95f8f8
--- /dev/null
+++ b/media-sound/modplugtools/Manifest
@@ -0,0 +1,2 @@
+DIST modplugtools-0.5.1.tar.gz 337382 SHA256 72731c640a6f97ff6511ab982934486c1a8ae995c8a723ce4aa6b8f08b4ca067
+DIST modplugtools-0.5.3.tar.gz 342603 SHA256 0122d44ea0513b928cf9d463acc886d08a2664579aa96ddeeb270d5c81193a4e
diff --git a/media-sound/modplugtools/metadata.xml b/media-sound/modplugtools/metadata.xml
new file mode 100644
index 000000000000..f38b8dd871f0
--- /dev/null
+++ b/media-sound/modplugtools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..ab689a3a7321
--- /dev/null
+++ b/media-sound/modplugtools/modplugtools-0.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..526f6f232a04
--- /dev/null
+++ b/media-sound/modplugtools/modplugtools-0.5.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..3b201a5bcb03
--- /dev/null
+++ b/media-sound/moodbar/Manifest
@@ -0,0 +1 @@
+DIST moodbar-0.1.2.tar.gz 327715 SHA256 3d53627c3d979636e98bbe1e745ed79e98f1238148ba4f8379819f9083b3d9c4
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..3cbd34b008ee
--- /dev/null
+++ b/media-sound/moodbar/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<herd>kde</herd>
+</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..e831d833d2cc
--- /dev/null
+++ b/media-sound/moodbar/moodbar-0.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="The moodbar tool and gstreamer plugin for Amarok"
+HOMEPAGE="http://amarok.kde.org/wiki/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..4c34af5fe94a
--- /dev/null
+++ b/media-sound/moosic/Manifest
@@ -0,0 +1 @@
+DIST moosic-1.5.6.tar.gz 165916 SHA256 bdb04e7f26b7ff1f5266fe24ed11fb47f3bd5c2723ef0548fcf13bef3219db69 SHA512 06cf060dbcadd793bd045c378d2993636f875a4ccd320258ecbaa36bfd0341870e10f362380006ce3e6a9d9180e272bec6c216947ab80c39f04c7aecb8e80da3 WHIRLPOOL 06bf94fd030bec44092ec2bd20826e6412c1871039ea473da980d9f50576cb5438b04db446b80d4cb8b65cf6757d923114297852ae4789072ce97317cb023805
diff --git a/media-sound/moosic/metadata.xml b/media-sound/moosic/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/moosic/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..ba87d977d891
--- /dev/null
+++ b/media-sound/moosic/moosic-1.5.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..3b4e397dd0b8
--- /dev/null
+++ b/media-sound/mp32ogg/Manifest
@@ -0,0 +1 @@
+DIST mp32ogg 9216 SHA256 66d6276944e54e1ba15a4fc29b098baa9d1e5fcd29c57f1d77cd16c87ca302ce
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/mp32ogg/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..df9fb2eda05a
--- /dev/null
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..1a6a263815e8
--- /dev/null
+++ b/media-sound/mp3_check/Manifest
@@ -0,0 +1 @@
+DIST mp3_check-1.98.tar.gz 83098 SHA256 bd63a63789f808d0632ad9e9b9448b8bf24f258629ec9195663ecce5fe889461
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..b285f3ae22f0
--- /dev/null
+++ b/media-sound/mp3_check/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">mp3check</remote-id>
+	</upstream>
+</pkgmetadata>
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..d0a75ca15ae6
--- /dev/null
+++ b/media-sound/mp3_check/mp3_check-1.98.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="MP3 consistency checker"
+HOMEPAGE="http://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..5ad3191c50b0
--- /dev/null
+++ b/media-sound/mp3asm/Manifest
@@ -0,0 +1 @@
+DIST mp3asm-0.1.3-1.tar.bz2 46530 SHA256 14d67f040e99eb33369e3f7b136d60eca45c59b946ce58a6af9fb4954a87adc7
diff --git a/media-sound/mp3asm/metadata.xml b/media-sound/mp3asm/metadata.xml
new file mode 100644
index 000000000000..68c47aa31f4d
--- /dev/null
+++ b/media-sound/mp3asm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..4f427eaca77f
--- /dev/null
+++ b/media-sound/mp3asm/mp3asm-0.1.3-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+MY_PV="${PV}-1"  # Patchlevel
+
+DESCRIPTION="A command line tool to clean and edit mp3 files"
+HOMEPAGE="http://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..08092964609a
--- /dev/null
+++ b/media-sound/mp3blaster/Manifest
@@ -0,0 +1,2 @@
+DIST mp3blaster-3.2.5.tar.gz 329407 SHA256 129115742c77362cc3508eb7782702cfb44af2463a5453e8d19ea68abccedc29 SHA512 53f623340b7a8e4be6cd973474fd5f23c623b6d1c667478dc0d4c7a1ef5758f4bbc09d9d0698d1539d8d1c3ef45301b447f3ed74f68586070a07a7f9fa8c353e WHIRLPOOL 96cdc3b6436dec282a5836c00e2151dd04f218175fdd2451fcfd45f70bced05dea0c8915cf1a817d24a9961fc8ab3d9c5b568a5ae67e23e2b1915604b2d7806e
+DIST mp3blaster_3.2.5-3.debian.tar.gz 11000 SHA256 e4d424aeccde6ccd219270f4e4f0bf8f70b97e13075447b6d6d069110ed092c9 SHA512 1d899c85c2a2e1326fac0f87c61ead82273a08c672aeab0929479d9aa10c6ae703bb63c1a6aec14c8f5b6a139089fa5228cf09db72ea5b114efb60a196bd4788 WHIRLPOOL 9c1c99d5a4f4e5060a9eae4e681f0df841d6932f34a12102a82d2e1f795d4db41fd3f15d6aa6a34d04d42259d73ba67f775b24a51df30779d4f4466ded40f69f
diff --git a/media-sound/mp3blaster/files/mp3blaster-3.2.5-gcc44.patch b/media-sound/mp3blaster/files/mp3blaster-3.2.5-gcc44.patch
new file mode 100644
index 000000000000..fc1a6c8d053e
--- /dev/null
+++ b/media-sound/mp3blaster/files/mp3blaster-3.2.5-gcc44.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/362347
+
+--- src/global.cc
++++ src/global.cc
+@@ -371,7 +371,7 @@
+ is_sid(const char *filename)
+ {
+ #ifdef HAVE_SIDPLAYER
+-	char *ext = strrchr(filename, '.');
++	const char *ext = strrchr(filename, '.');
+ 	if (ext) {
+ 		if (!strcasecmp(ext, ".psid")) return 1;
+ 		if (!strcasecmp(ext, ".sid")) return 1;
diff --git a/media-sound/mp3blaster/metadata.xml b/media-sound/mp3blaster/metadata.xml
new file mode 100644
index 000000000000..dbdb14e66904
--- /dev/null
+++ b/media-sound/mp3blaster/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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..540a74a99eff
--- /dev/null
+++ b/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild
new file mode 100644
index 000000000000..f7625e100048
--- /dev/null
+++ b/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+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 "${FILESDIR}"/${P}-gcc44.patch
+	# 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
+	# 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..f5493fd1e5fc
--- /dev/null
+++ b/media-sound/mp3c/Manifest
@@ -0,0 +1 @@
+DIST mp3c-0.31.tar.bz2 351015 RMD160 a8de900b2f9a699b247cefed2cd2fe73b86f9da5 SHA1 af67dea78b3ccef08b091e54499f1ec25bfb7393 SHA256 5a98855ff180e5c3a7805866c04e50204dd2336784b1bc7a24445fa984e878bb
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/mp3c/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..1115d67dbcb9
--- /dev/null
+++ b/media-sound/mp3c/mp3c-0.31-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..9b0610f51be4
--- /dev/null
+++ b/media-sound/mp3cat/Manifest
@@ -0,0 +1 @@
+DIST mp3cat-0.4.tar.gz 14956 SHA256 fd2b0d58018f5117bd1e22298c899bef5e6af61a0c540186d16d2bf516d6849a SHA512 a72bbbd296bb07a7e7fc084a494b2676c012cf3a4c71ace7eea52892f6f478769c5b6140fcd8dbfa245d537335a484fd8c5db15edd83a0146821d48e24862492 WHIRLPOOL 578b34557b11eabc94e42f8a78c03ad99866354b1ec2c63bfe635b0475f402a7ea23956e433d911a94dbb0f419e14cb959b6263e74da5396b5fe58fcad51c3fa
diff --git a/media-sound/mp3cat/metadata.xml b/media-sound/mp3cat/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/mp3cat/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..ad038f56976a
--- /dev/null
+++ b/media-sound/mp3cat/mp3cat-0.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..2ed203613346
--- /dev/null
+++ b/media-sound/mp3check/Manifest
@@ -0,0 +1,2 @@
+DIST mp3check-0.8.4.tgz 71396 SHA256 952f271aab86adf89e2391503bf46a6ddbd838b7bd1ea19756d004f143dbfaa9
+DIST mp3check-0.8.7.tgz 71629 SHA256 27d976ad8495671e9b9ce3c02e70cb834d962b6fdf1a7d437bb0e85454acdd0e SHA512 5b5c9bde0cc7fd9dc02de53e4ccc3e403001547c06121be57f8f693b9224302d24f0c84f928b329b0f69c67dd4fb51fa3b60368f57a9446476d8344417bd09fd WHIRLPOOL f3d12ed391fb3a520899f228363b418ceb8e36f7bd9b3609f672baecd174ad04500af788e6c25e31aa7a6c14adcfd5ffcb8662e33cca06c6a5e13801f5d7c08f
diff --git a/media-sound/mp3check/metadata.xml b/media-sound/mp3check/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/mp3check/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..516f31e1fbc2
--- /dev/null
+++ b/media-sound/mp3check/mp3check-0.8.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..506d7f12cf94
--- /dev/null
+++ b/media-sound/mp3check/mp3check-0.8.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Checks mp3 files for consistency and prints several errors and warnings"
+HOMEPAGE="http://code.google.com/p/mp3check/"
+SRC_URI="http://${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..3cea368e94d6
--- /dev/null
+++ b/media-sound/mp3diags/Manifest
@@ -0,0 +1,3 @@
+DIST MP3Diags-1.0.12.079.tar.gz 959757 SHA256 ab06936658d857b55be473544094c6d6dbd8a8ca9593af90ad48e8f59163fe0f SHA512 fc4b9d23aeb3379bdc65fcdb44c8d9f4ff666270e5cb060980bd1db9a180eca4997fdb8f5d5f8df257e02e6e4fdeeef345f701f38637b7c1fa2680a9acb6f054 WHIRLPOOL 6ed36be2b5d083ffe92f9c80171d68ebd5a996b7b15ad78ffd0d06ab1023c9d22622f13f5f31338ded030f0c3ecfa468bf3dfd454fd5e1ffe2b510ffe8e5ada7
+DIST MP3Diags-1.2.01.tar.gz 1221991 SHA256 ffec777929dfa6c0f42094349438b02babc1a1b5fe3eb6da7362e795315272a1 SHA512 59f86d01ec8a8686a709d683e72f1f36a42da1b43a6bbd55dc4e4814cdcf96b228987d69175d324e4f2aaf6010be5dced67b08cc8013a1f087dd1b43e96fe6eb WHIRLPOOL 5939cb46f2ee53aefb09343d6a7c836285ada870e98641ee61e22645ae123ccb6e84ab9413231948d83d0b701306c0aa4ca085cc2acaf876cc213698b7a53962
+DIST MP3Diags-1.2.02.tar.gz 1220039 SHA256 17c4dc2b40a855f39ef8dbac41dacc5c309d46043c969dcf6319d76103341fcd SHA512 51498646ad3c9a19aeb0bcbf8cd280de75a24eb252790cc71d1eba433b986bbc58d4198d8bdfc0339dd6845ddfd966dd482f991b976e2da8f49e9d4e4f0464d0 WHIRLPOOL f7a8fd855de147bfd26076e3dc1242b5c7d5819621626b8efe42dcb19b3b86042deb53439fec598fe20be29e35dc0c33ef5a251a4ed55478cda1f8f3ed915140
diff --git a/media-sound/mp3diags/metadata.xml b/media-sound/mp3diags/metadata.xml
new file mode 100644
index 000000000000..3159078fa42f
--- /dev/null
+++ b/media-sound/mp3diags/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>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="sourceforge">mp3diags</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3diags/mp3diags-1.0.12.079.ebuild b/media-sound/mp3diags/mp3diags-1.0.12.079.ebuild
new file mode 100644
index 000000000000..376bebcd53cb
--- /dev/null
+++ b/media-sound/mp3diags/mp3diags-1.0.12.079.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qt4-r2
+
+MY_PN=${PN/mp3d/MP3D}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Qt-based MP3 diagnosis and repair tool"
+HOMEPAGE="http://mp3diags.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/boost-1.37
+	sys-libs/zlib
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:4"
+
+S=${WORKDIR}/${MY_P}
+
+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
+}
diff --git a/media-sound/mp3diags/mp3diags-1.2.01.ebuild b/media-sound/mp3diags/mp3diags-1.2.01.ebuild
new file mode 100644
index 000000000000..ef846b2eec2a
--- /dev/null
+++ b/media-sound/mp3diags/mp3diags-1.2.01.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qt4-r2
+
+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="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/boost-1.37
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:4
+"
+
+S=${WORKDIR}/${MY_P}
+
+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
+}
diff --git a/media-sound/mp3diags/mp3diags-1.2.02.ebuild b/media-sound/mp3diags/mp3diags-1.2.02.ebuild
new file mode 100644
index 000000000000..04e663fbe268
--- /dev/null
+++ b/media-sound/mp3diags/mp3diags-1.2.02.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qt4-r2
+
+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="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/boost-1.37
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:4
+"
+
+S=${WORKDIR}/${MY_P}
+
+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
+}
diff --git a/media-sound/mp3gain/Manifest b/media-sound/mp3gain/Manifest
new file mode 100644
index 000000000000..fbe330027906
--- /dev/null
+++ b/media-sound/mp3gain/Manifest
@@ -0,0 +1,2 @@
+DIST mp3gain-1_4_6-src.zip 111408 SHA256 e1ad9aeb18403cf9ea54af830e1371523d6d5373bfef01a8964e3735deaf7d4f
+DIST mp3gain-1_5_2-src.zip 129435 SHA256 dbadc7a41a8a3b87d3a21a1989701cfe72d2090c3ead02b0b396a19a8acf6fca SHA512 1a7ac51bf0108c1f6fbd610c513bf7fd2c64d340a2ba23dc9fa5c3b896b279474f31f2d60318f409576e39f7643dd585d3e159e2a4db4553f7c9cc3761b7f388 WHIRLPOOL 4a0584c52090100e9f9fe2c53ac6614965976f1ada9134212734966199a6c116ce2e304ed54ec240c489c293928daf664f109d003d29c5c79c1e3b4a6ee08403
diff --git a/media-sound/mp3gain/files/1.4.6-option-parser.patch b/media-sound/mp3gain/files/1.4.6-option-parser.patch
new file mode 100644
index 000000000000..7b4085e9abda
--- /dev/null
+++ b/media-sound/mp3gain/files/1.4.6-option-parser.patch
@@ -0,0 +1,348 @@
+--- mp3gain.c.old	2004-12-23 15:47:04.000000000 -0500
++++ mp3gain.c	2006-03-13 22:15:28.000000000 -0500
+@@ -46,7 +46,8 @@
+ 

+ #include <stdio.h>

+ #include <stdlib.h>

+-#include <math.h>

++#include <math.h>
++#include <ctype.h>

+ #include "apetag.h"

+ 

+ #ifndef WIN32

+@@ -1181,10 +1182,11 @@
+ static

+ void errUsage(char *progname) {

+ 	showVersion(progname);

+-	fprintf(stderr,"copyright(c) 2001-2004 by Glen Sawyer\n");

++	fprintf(stderr,"copyright(c) 2001-2004 by Glen Sawyer\n");
++        fprintf(stderr,"portions copyright(c) 2006 by Stephan Sokolow\n");

+ 	fprintf(stderr,"uses mpglib, which can be found at http://www.mpg123.de\n");

+ 	fprintf(stderr,"Usage: %s [options] <infile> [<infile 2> ...]\n",progname);

+-	fprintf(stderr,"  --use %c? or %ch for a full list of options\n",SWITCH_CHAR,SWITCH_CHAR);

++	fprintf(stderr,"  --use %c?, %ch, or --help for a full list of options\n",SWITCH_CHAR,SWITCH_CHAR);

+     fclose(stdout);

+     fclose(stderr);

+ 	exit(1);

+@@ -1195,7 +1197,8 @@
+ static

+ void fullUsage(char *progname) {

+ 		showVersion(progname);

+-		fprintf(stderr,"copyright(c) 2001-2004 by Glen Sawyer\n");

++		fprintf(stderr,"copyright(c) 2001-2004 by Glen Sawyer\n");
++                fprintf(stderr,"portions copyright(c) 2006 by Stephan Sokolow\n");

+ 		fprintf(stderr,"uses mpglib, which can be found at http://www.mpg123.de\n");

+ 		fprintf(stderr,"Usage: %s [options] <infile> [<infile 2> ...]\n",progname);

+ 		fprintf(stderr,"options:\n");

+@@ -1227,9 +1230,14 @@
+ 		fprintf(stderr,"\t%cs d - delete stored tag info (no other processing)\n",SWITCH_CHAR);

+ 		fprintf(stderr,"\t%cs s - skip (ignore) stored tag info (do not read or write tags)\n",SWITCH_CHAR);

+ 		fprintf(stderr,"\t%cs r - force re-calculation (do not read tag info)\n",SWITCH_CHAR);

+-		fprintf(stderr,"\t%cu - undo changes made by mp3gain (based on stored tag info)\n",SWITCH_CHAR);

+-        fprintf(stderr,"\t%cw - \"wrap\" gain change if gain+change > 255 or gain+change < 0\n",SWITCH_CHAR);

+-        fprintf(stderr,"\t      (use \"%c? wrap\" switch for a complete explanation)\n",SWITCH_CHAR);

++		fprintf(stderr,"\t%cu - undo changes made by mp3gain (based on stored tag info)\n",SWITCH_CHAR);
++                fprintf(stderr,"\t%cw - \"wrap\" gain change if gain+change > 255 or gain+change < 0\n",SWITCH_CHAR);
++                fprintf(stderr,"\t      (use \"%c? wrap\" switch for a complete explanation)\n",SWITCH_CHAR);
++                fprintf(stderr,"\t-- - force everything beyond this point to be treated as arguments.\n");
++                fprintf(stderr,"long options:\n");
++                fprintf(stderr,"\t--auto - same as %cr %ck %cp\n", SWITCH_CHAR, SWITCH_CHAR, SWITCH_CHAR);
++                fprintf(stderr,"\t--help - show this message\n");
++                fprintf(stderr,"\t--recursive - TODO\n");

+ 		fprintf(stderr,"If you specify %cr and %ca, only the second one will work\n",SWITCH_CHAR,SWITCH_CHAR);

+ 		fprintf(stderr,"If you do not specify %cc, the program will stop and ask before\n     applying gain change to a file that might clip\n",SWITCH_CHAR);

+         fclose(stdout);

+@@ -1245,7 +1253,20 @@
+   fprintf(stderr, "haveTrackPeak       %d  trackPeak %f\n",info->haveTrackPeak, info->trackPeak);

+   fprintf(stderr, "haveMinMaxGain      %d  min %d  max %d\n",info->haveMinMaxGain, info->minGain, info->maxGain);

+ }

+-

++
++void showHelp(int argc, char **argv, int i) {
++    if ((argv[i][2] == 'w')||(argv[i][2] == 'W')) {
++        wrapExplanation();
++    } else {
++        if (i+1 < argc) {
++            if ((argv[i+1][0] == 'w')||(argv[i+1][0] =='W'))
++                wrapExplanation();
++        } else {
++            fullUsage(argv[0]);
++        }
++    }
++    fullUsage(argv[0]);
++}
+ 

+ #ifdef WIN32

+ int __cdecl main(int argc, char **argv) { /*make sure this one is standard C declaration*/

+@@ -1282,7 +1303,7 @@
+ 	int fileStart;

+ 	int numFiles;

+ 	int databaseFormat = 0;

+-	int i;

++	int i, j;

+ 	int *fileok;

+ 	int goAhead;

+ 	int directGain = 0;

+@@ -1303,7 +1324,10 @@
+ 	double curAlbumPeak = 0;

+ 	unsigned char curAlbumMinGain = 0;

+ 	unsigned char curAlbumMaxGain = 0;

+-	char chtmp;

++	char chtmp;
++        
++        /* Variables used in the improved option parser */
++        int parseOptions = !0;

+ 

+     gSuccess = 1;

+ 

+@@ -1316,28 +1340,28 @@
+ 	fileStart = 1;

+ 	numFiles = 0;

+ 

+-	for (i = 1; i < argc; i++) {

+-#ifdef WIN32

+-		if ((argv[i][0] == '/')||((argv[i][0] == '-') && (strlen(argv[i])==2))) { /* don't need to force single-character command parameters */

+-#else

+-		if (((argv[i][0] == '/')||(argv[i][0] == '-'))&&

+-		    (strlen(argv[i])==2)) {

+-#endif

+-			fileStart++;

+-			switch(argv[i][1]) {

+-				case 'a':

+-				case 'A':

++	for (i = 1; i < argc; i++) {
++            /* 
++            TODO: Implement support for:
++                - consider including the glob-parsing support from vorbisgain's so-called recursive support.
++            */
++                if ((parseOptions) && (argv[i][0] == SWITCH_CHAR) && (strlen(argv[i]) >= 2) ) {

++			fileStart++;
++                        
++                        if (!strcmp(argv[i],"--")) { /* Support for the standard "--" option to force the end of the option parsing. */
++                            parseOptions = 0;
++                            continue;
++                        } else if (argv[i][1] != '-') { /* Ensure that this isn't a long option. */
++                            for (j = 1; j < strlen(argv[i]); j++) {
++                                switch(tolower(argv[i][j])) {

++                                    case 'a':

+ 					applyTrack = 0;

+ 					applyAlbum = !0;

+ 					break;

+-

+-                case 'c':

+-				case 'C':

++                                    case 'c':

+ 					ignoreClipWarning = !0;

+ 					break;

+-

+-				case 'd':

+-				case 'D':

++                                    case 'd':

+ 					if (argv[i][2] != '\0') {

+ 						dBGainMod = atof(argv[i]+2);

+ 					}

+@@ -1352,14 +1376,10 @@
+ 						}

+ 					}

+ 					break;

+-

+-				case 'f':

+-				case 'F':

++                                    case 'f':

+ 					Reckless = 1;

+ 					break;

+-

+-				case 'g':

+-				case 'G':

++                                    case 'g':

+ 					directGain = !0;

+ 					directSingleChannelGain = 0;

+ 					if (argv[i][2] != '\0') {

+@@ -1376,32 +1396,14 @@
+ 						}

+ 					}

+ 					break;

+-

+-				case 'h':

+-				case 'H':

+-				case '?':

+-					if ((argv[i][2] == 'w')||(argv[i][2] == 'W')) {

+-						wrapExplanation();

+-					}

+-					else {

+-						if (i+1 < argc) {

+-							if ((argv[i+1][0] == 'w')||(argv[i+1][0] =='W'))

+-                                wrapExplanation();

+-						}

+-						else {

+-							fullUsage(argv[0]);

+-						}

+-					}

+-					fullUsage(argv[0]);

+-					break;

+-

+-                case 'k':

+-                case 'K':

+-                    autoClip = !0;

+-                    break;

+-

+-				case 'l':

+-				case 'L':

++                                    case 'h':

++                                    case '?':

++                                        showHelp(argc, argv, i);
++                                        break;

++                                    case 'k':

++                                        autoClip = !0;

++                                        break;

++                                    case 'l':

+ 					directSingleChannelGain = !0;

+ 					directGain = 0;

+ 					if (argv[i][2] != '\0') {

+@@ -1429,9 +1431,7 @@
+ 						}

+ 					}

+ 					break;

+-

+-				case 'm':

+-				case 'M':

++                                    case 'm':

+ 					if (argv[i][2] != '\0') {

+ 						mp3GainMod = atoi(argv[i]+2);

+ 					}

+@@ -1446,30 +1446,20 @@
+ 						}

+ 					}

+ 					break;

+-

+-				case 'o':

+-				case 'O':

++                                    case 'o':

+ 					databaseFormat = !0;

+ 					break;

+-

+-				case 'p':

+-				case 'P':

++                                    case 'p':

+ 					saveTime = !0;

+ 					break;

+-

+-				case 'q':

+-				case 'Q':

++                                    case 'q':

+ 					QuietMode = !0;

+ 					break;

+-

+-				case 'r':

+-				case 'R':

++                                    case 'r':

+ 					applyTrack = !0;

+ 					applyAlbum = 0;

+ 					break;

+-

+-                case 's':

+-                case 'S':

++                                    case 's':

+ 					chtmp = 0;

+ 					if (argv[i][2] == '\0') {

+ 						if (i+1 < argc) {

+@@ -1482,59 +1472,56 @@
+ 					} else {

+ 						chtmp = argv[i][2];

+ 					}

+-		            switch (chtmp) {

+-                        case 'c':

+-                        case 'C':

+-                            checkTagOnly = !0;

+-                            break;

+-                        case 'd':

+-                        case 'D':

+-                            deleteTag = !0;

+-                            break;

+-                        case 's':

+-                        case 'S':

+-                            skipTag = !0;

+-                            break;

+-                        case 'r':

+-                        case 'R':

+-                            forceRecalculateTag = !0;

+-                            break;

+-						default:

+-							errUsage(argv[0]);

+-                    }

+-

+-                    break;

+-

+-				case 't':

+-				case 'T':

++                                        switch (tolower(chtmp)) {

++                                            case 'c':

++                                                checkTagOnly = !0;

++                                                break;

++                                            case 'd':

++                                                deleteTag = !0;

++                                                break;

++                                            case 's':

++                                                skipTag = !0;

++                                                break;

++                                            case 'r':

++                                                forceRecalculateTag = !0;

++                                                break;

++                                            default:

++                                                errUsage(argv[0]);

++                                        }

++                                        break;

++                                    case 't':

+ 					UsingTemp = !0;

+ 					break;

+-

+-				case 'u':

+-				case 'U':

++                                    case 'u':

+ 					undoChanges = !0;

+ 					break;

+-

+-				case 'v':

+-				case 'V':

++                                    case 'v':

+ 					showVersion(argv[0]);

+-                    fclose(stdout);

+-                    fclose(stderr);

++                                        fclose(stdout);

++                                        fclose(stderr);

+ 					exit(0);

+-					

+-				case 'w':

+-				case 'W':

++                                    case 'w':

+ 					wrapGain = !0;

+ 					break;

+-

+-				case 'x':

+-				case 'X':

++                                    case 'x':

+ 					maxAmpOnly = !0;

+ 					break;

+-

+-				default:

+-					fprintf(stderr,"I don't recognize option %s\n",argv[i]);

+-			}

++                                    default:

++					fprintf(stderr,"I don't recognize option %s\n",argv[i]);
++                                }
++                            }

++			} else if (!strncmp(argv[i],"--",2)) { /* This is a long option and must be parsed as such */
++                            if (!strcasecmp(argv[i],"--auto")) {
++                                autoClip = !0;   /* -k */
++                                saveTime = !0;   /* -p */
++                                applyTrack = !0; /* -r */
++                                applyAlbum = 0;  /* -r */
++                            } else if (!strcasecmp(argv[i],"--help")) {
++                                showHelp(argc, argv, i);
++                            } else if (!strcasecmp(argv[i],"--recursive")) {
++                                fprintf(stderr,"Sorry, --recursive has not been implemented yet.\n\t However, the following command seems to be equivalent:\n\t`find /path/to/mp3s -iname \"*.mp3\" -exec mp3gain -r {} \\;`\n\tThe use of --auto in place of -r is recommended.\n");
++                            }
++                        }

+ 		}

+ 	}

+ 	/* now stored in tagInfo---  maxsample = malloc(sizeof(Float_t) * argc); */

diff --git a/media-sound/mp3gain/metadata.xml b/media-sound/mp3gain/metadata.xml
new file mode 100644
index 000000000000..ea3b89738a14
--- /dev/null
+++ b/media-sound/mp3gain/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">mp3gain</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3gain/mp3gain-1.4.6-r3.ebuild b/media-sound/mp3gain/mp3gain-1.4.6-r3.ebuild
new file mode 100644
index 000000000000..5c29defc123a
--- /dev/null
+++ b/media-sound/mp3gain/mp3gain-1.4.6-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils flag-o-matic toolchain-funcs
+
+IUSE=""
+
+MY_P=${P//./_}
+S=${WORKDIR}
+
+DESCRIPTION="MP3Gain automatically adjusts mp3s so that they all have the same volume"
+HOMEPAGE="http://mp3gain.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	filter-flags -O*
+	sed -i -e "s:CC=.*:CC=$(tc-getCC):" \
+		-e "s:CFLAGS= -Wall -O3 -DHAVE_MEMCPY:CFLAGS+= -Wall -DHAVE_MEMCPY:" \
+		-e "s:LIBS=.*:LIBS= ${LDFLAGS} -lm:" \
+		"${S}"/Makefile \
+		|| die "Unable to adjust build system compiler/flags."
+	epatch "${FILESDIR}"/${PV}-option-parser.patch
+}
+
+src_install () {
+	dobin mp3gain
+}
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..06af3c1c6f6a
--- /dev/null
+++ b/media-sound/mp3gain/mp3gain-1.5.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..664603cfc0a4
--- /dev/null
+++ b/media-sound/mp3info/Manifest
@@ -0,0 +1 @@
+DIST mp3info-0.8.5a.tgz 127482 SHA256 0438ac68e9f04947fb14ca5573d27c62454cb9db3a93b7f1d2c226cd3e0b4e10 SHA512 30e0ef62deaa090fc115317f6c372f408077dfceed7e05faa6744b8516291e38d21f1742732f6532585f0c3d8c705d8c7026c2bed84c97e1f497d433637affd2 WHIRLPOOL a34f8328993523c5ca0c32f637c726546a83e8340d6ba58fdc157b23faa8fe9ee22783398764689df3c704383b7b3b92c5a3e95208de78a21b61a881b52a70d9
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/mp3info/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..fe37295d8a55
--- /dev/null
+++ b/media-sound/mp3info/mp3info-0.8.5a.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..eead226250da
--- /dev/null
+++ b/media-sound/mp3report/Manifest
@@ -0,0 +1 @@
+DIST mp3report-1.0.2.tar.gz 37396 SHA256 f1448ba692f3320442e57b217af9b37f52d18e753c6ce5cee991db33ed57bad5
diff --git a/media-sound/mp3report/metadata.xml b/media-sound/mp3report/metadata.xml
new file mode 100644
index 000000000000..ef0d54f2d511
--- /dev/null
+++ b/media-sound/mp3report/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..6532a42580f7
--- /dev/null
+++ b/media-sound/mp3report/mp3report-1.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..da15baab4b8c
--- /dev/null
+++ b/media-sound/mp3splt-gtk/Manifest
@@ -0,0 +1,4 @@
+DIST mp3splt-gtk-0.7.3.tar.gz 1166328 SHA256 7300383453ca8d3268776163e2afb9b03a0d907d2f29ec6fc1826b41679d4e1c SHA512 070d9aabfe3eed77f596051b2a750dff3a36f1a37e233d6d6498dae4688a48770a87730b3c2e9c1c775a28e834590d84027030fd6f994ffa890c685c9f8bd809 WHIRLPOOL e0b42f51a552d0b372054b5a55d6f1e9e3ee35f20363999bfcb7a34436515a831f3b20b4ca40723cd5614b63e405e46530621d16167954c986f320f8876b9cc0
+DIST mp3splt-gtk-0.9.1.tar.gz 1079894 SHA256 3c9db4b6ec26cd55c91b7fe30b8b6236555b95012cd8abdc4c949e6ae45c8194 SHA512 7596e8341b8cd5f0592f310665bd178d04e8c46b43e51a2df4fb0d6acac64e5be66aeb58f072acbbf9597578c5126f28eb3734e8d24e020669db7b2b94ef6a65 WHIRLPOOL ce701110d5c855c1872ca1c83aa7e13c8e95c307e9cea43545a9d77017dac1c13c7bddaaf129ba00ef6be8f2f4a1a3aae57e29df7b3361830a54643d0bfa85fc
+DIST mp3splt-gtk-0.9.1a.tar.gz 1079260 SHA256 5fc242870f1690a2e27b5bea8b13bb4f7ede1e4cb212f9d9bccd9502a734f718 SHA512 9eea51063350d7644a96150332a3e88a35ba5e94bda07043d03dc93fe1b6ff656e55f8d7e564248d54004e44e0f9f4677c63a456a8a65a18be63417e47b524aa WHIRLPOOL 75e7c3c87d60fd0d4dead656cab4560dc13a69c70a18de776127875fff6804e92c7311d60f88a9115d7bbfab66d22718e6de334480e7faab9017f94a03131afd
+DIST mp3splt-gtk-0.9.tar.gz 1061200 SHA256 6262cf61f74bfb1cac5d5bdf6c3ad41fece221f7fb66032ae633835044aecff5 SHA512 0966e08fb8aef75feb6d3ffea7377ce39376739b1c6d97cb5729e627829d99e0b56011d625cfea26c76a39f7a2ff2a941fef92b4ab85a9c83f99ef1c55c6a87f WHIRLPOOL 14d64a728364139fabfe4851886fc0bdc98121f2ef8c8642f9d30b37cfdf143b3e8434aaac600fda0c80d38afdb8f13a2423e53904cc0cf446d187193d426bf4
diff --git a/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.7-disable-docs.patch b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.7-disable-docs.patch
new file mode 100644
index 000000000000..fa7b5f588553
--- /dev/null
+++ b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.7-disable-docs.patch
@@ -0,0 +1,40 @@
+From 12880888a2857f73cc87b9bdf5505fed0cbc6bbe Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 3 Aug 2011 20:53:22 +0200
+Subject: [PATCH 2/2] Disable documentation
+
+---
+ configure.ac |   17 +++--------------
+ 1 files changed, 3 insertions(+), 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1c564c5..260602d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -269,20 +269,9 @@ echo
+ 
+ # Check for doxygen, so we can decide if we add it to the "doc" 
+ # make target.
+-AC_PATH_PROG([DOXYGEN],[doxygen])
+-AC_ARG_VAR(DOXYGEN,
+-           [Location of the 'doxygen' program; if found we can generate documentation for the C code])
+-AM_CONDITIONAL(HAVE_DOXYGEN, [ test "x$DOXYGEN" != "x" ])
+-
+-# Check for dot, the tool that makes the nice little caller graphs for the
+-# doxygen documentation.
+-AC_PATH_PROG([GRAPHVIZ],[dot])
+-AC_ARG_VAR(GRAPHVIZ,
+-           [Location of the 'dot' program from the graphviz suite; if found we can generate caller graphs for the documentation of the C code])
+-AM_CONDITIONAL(HAVE_GRAPHVIZ, [ test "x$GRAPHVIZ" != "x" ])
+-if test x$HAVE_DOT = "xfalse"; then
+-   AC_MSG_WARN([*** dot from the graphviz package not found, inheritance diagrams will not be generated in code documentation])
+-fi
++AM_CONDITIONAL(HAVE_DOXYGEN, [ false ])
++
++AM_CONDITIONAL(HAVE_GRAPHVIZ, [ false ])
+ 
+ #################################################
+ # Generate Makefile
+-- 
+1.7.6
+
diff --git a/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.7.0.930-gtk.patch b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.7.0.930-gtk.patch
new file mode 100644
index 000000000000..bb4b2f763998
--- /dev/null
+++ b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.7.0.930-gtk.patch
@@ -0,0 +1,44 @@
+From bb1c3cb3ffd1081d56e48d87ab05d31ad05d89de Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 23 Sep 2011 23:09:47 +0200
+Subject: [PATCH] Allow specifying a specific slot of GTK
+
+---
+ configure.ac |   18 +++++++++++++-----
+ 1 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2157019..fbcadcf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -150,14 +150,22 @@ fi
+ 
+ #################################################
+ #Check for GTK
+-ifdef([AM_PATH_GTK_3_0],
+-[
++AC_ARG_ENABLE(gtk3, [
++AC_HELP_STRING([--enable-gtk3],  [Compile against GTK 3.x explicitly (default: use GTK 3.x if available)])
++AC_HELP_STRING([--disable-gtk3], [Compile against GTK 2.x explicitly (default: use GTK 3.x if available)])],
++    [enable_gtk3=$enableval],[enable_gtk3="auto"])
++
++if test "x$enable_gtk3" = xauto; then
++  AC_MSG_NOTICE([selecting GTK 2.x/3.x automatically])
++  ifdef([AM_PATH_GTK_3_0],[enable_gtk3=yes],[enable_gtk3=no])
++fi
++
++if test "x$enable_gtk3" = xyes; then
+   CFLAGS="$CFLAGS -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE"
+   AM_PATH_GTK_3_0(3.0.0,,AC_MSG_ERROR(mp3splt-gtk needs GTK+ >= 3.0.0))
+-],
+-[
++else
+   AM_PATH_GTK_2_0(2.20.0,,AC_MSG_ERROR(mp3splt-gtk needs GTK+ >= 2.20.0))
+-])
++fi
+ 
+ #################################################
+ #Check for libmp3splt
+-- 
+1.7.6.1
+
diff --git a/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.8.2-automake-1.13.patch b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.8.2-automake-1.13.patch
new file mode 100644
index 000000000000..109682f46fcc
--- /dev/null
+++ b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.8.2-automake-1.13.patch
@@ -0,0 +1,61 @@
+From cb38e44936aa6a923f9dedffb7084de657caa54f Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 8 Jun 2013 21:44:45 +0200
+Subject: [PATCH] Resolve use of $(top_srcdir) in TESTS to stop Automake 1.13.1
+ from erroring out
+
+This is actually a cheap port of a fix to upstream bug #153
+https://sourceforge.net/p/mp3splt/bugs/152/
+https://sourceforge.net/p/mp3splt/code/1326/
+---
+ test/Makefile.am  | 7 +++++--
+ test/run-tests.sh | 7 ++++++-
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index bb77e86..81159e3 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -34,11 +34,14 @@ test_douglas_peucker_la_SOURCES = test_douglas_peucker.c tests.h \
+ $(top_srcdir)/src/douglas_peucker.c $(top_srcdir)/src/douglas_peucker.h \
+ $(top_srcdir)/src/utilities.c $(top_srcdir)/src/utilities.h
+ 
+-TESTS = $(top_srcdir)/test/run-tests.sh
+-TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)"
++TESTS = run-tests.sh
++TESTS_ENVIRONMENT = NO_MAKE=yes CUTTER="$(CUTTER)" TESTS_DIR="$(top_builddir)/test"
+ 
+ echo-cutter:
+ 	@echo $(CUTTER)
+ 
++echo-tests-dir:
++	@echo $(top_builddir)/test
++
+ endif
+ 
+diff --git a/test/run-tests.sh b/test/run-tests.sh
+index a7bee7a..49ca19e 100755
+--- a/test/run-tests.sh
++++ b/test/run-tests.sh
+@@ -5,6 +5,11 @@ top_dir="$BASE_DIR/.."
+ 
+ if test -z "$NO_MAKE"; then
+     make -C $top_dir > /dev/null || exit 1
++  TESTS_DIR=$BASE_DIR
++else
++  if test -z "$TESTS_DIR"; then
++    TESTS_DIR="`make -s -C $BASE_DIR echo-tests-dir`"
++  fi
+ fi
+ 
+ if test -z "$CUTTER"; then
+@@ -21,5 +26,5 @@ fi
+   exit 1
+ }
+ 
+-$CUTTER -s $BASE_DIR "$@" $BASE_DIR
++$CUTTER -s $BASE_DIR "$@" $TESTS_DIR
+ 
+-- 
+1.8.2.1
+
diff --git a/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.8.2-desktop-file.patch b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.8.2-desktop-file.patch
new file mode 100644
index 000000000000..f03c8a1e2987
--- /dev/null
+++ b/media-sound/mp3splt-gtk/files/mp3splt-gtk-0.8.2-desktop-file.patch
@@ -0,0 +1,26 @@
+From 2db2b45c9b78561370b620a6a64d2d5e7c988a78 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 1 May 2013 22:27:25 +0200
+Subject: [PATCH] Remove deprecated category "Application" from .desktop file
+ template
+
+---
+ mp3splt-gtk.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mp3splt-gtk.desktop.in b/mp3splt-gtk.desktop.in
+index d7d0c98..67e4e1b 100644
+--- a/mp3splt-gtk.desktop.in
++++ b/mp3splt-gtk.desktop.in
+@@ -6,7 +6,7 @@ Comment=Split mp3 and ogg files without decoding
+ Icon=PREFIX/mp3splt-gtk_ico.svg
+ 
+ Type=Application
+-Categories=Application;AudioVideo;Audio;AudioVideoEditing;
++Categories=AudioVideo;Audio;AudioVideoEditing;
+ 
+ Exec=mp3splt-gtk
+ StartupNotify=false
+-- 
+1.8.1.5
+
diff --git a/media-sound/mp3splt-gtk/metadata.xml b/media-sound/mp3splt-gtk/metadata.xml
new file mode 100644
index 000000000000..f622bddd39c5
--- /dev/null
+++ b/media-sound/mp3splt-gtk/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<use>
+		<flag name="audacious">Include <pkg>media-sound/audacious</pkg> support</flag>
+		<flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mp3splt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.7.3.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.7.3.ebuild
new file mode 100644
index 000000000000..fcca594ccb8e
--- /dev/null
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.7.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+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 gtk3 gnome gstreamer nls"
+
+RDEPEND=">=media-libs/libmp3splt-0.7.3
+	gtk3? ( x11-libs/gtk+:3
+		audacious? ( >=media-sound/audacious-3.0 ) )
+	!gtk3? ( >=x11-libs/gtk+-2.18:2
+		audacious? ( <media-sound/audacious-3.0 ) )
+	!audacious? ( dev-libs/dbus-glib )
+	gstreamer? ( media-libs/gst-plugins-base:0.10 )
+	gnome? ( gnome-base/libgnomeui )"
+DEPEND="${RDEPEND}
+	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 \
+		--with-mp3splt-libraries=/usr/$(get_libdir) \
+		--with-mp3splt-includes=/usr/include/libmp3splt \
+		$(use_enable gnome) \
+		$(use_enable doc doxygen_doc) \
+		$(use_enable gtk3) \
+		--disable-cutter \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.1.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.1.ebuild
new file mode 100644
index 000000000000..1715333c86bc
--- /dev/null
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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 gtk3 gnome gstreamer nls"
+
+RDEPEND="~media-libs/libmp3splt-0.9.1
+	gtk3? ( x11-libs/gtk+:3
+		audacious? ( >=media-sound/audacious-3.0 ) )
+	!gtk3? ( >=x11-libs/gtk+-2.18:2
+		audacious? ( <media-sound/audacious-3.0 ) )
+	!audacious? ( dev-libs/dbus-glib )
+	gstreamer? ( media-libs/gstreamer:1.0 )
+	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) \
+		$(use_enable gtk3) \
+		--disable-cutter \
+		${myconf}
+}
+
+src_install() {
+	default
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.1a-r1.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.1a-r1.ebuild
new file mode 100644
index 000000000000..a1c35fe0e454
--- /dev/null
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.1a-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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 gtk3 gnome gstreamer nls"
+
+RDEPEND="~media-libs/libmp3splt-0.9.1a
+	gtk3? ( x11-libs/gtk+:3
+		audacious? ( >=media-sound/audacious-3.0 ) )
+	!gtk3? ( >=x11-libs/gtk+-2.18:2
+		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) \
+		$(use_enable gtk3) \
+		--disable-cutter \
+		${myconf}
+}
+
+src_install() {
+	default
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.1a.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.1a.ebuild
new file mode 100644
index 000000000000..7438241eeec4
--- /dev/null
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.1a.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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 gtk3 gnome gstreamer nls"
+
+RDEPEND="~media-libs/libmp3splt-0.9.1a
+	gtk3? ( x11-libs/gtk+:3
+		audacious? ( >=media-sound/audacious-3.0 ) )
+	!gtk3? ( >=x11-libs/gtk+-2.18:2
+		audacious? ( <media-sound/audacious-3.0 ) )
+	!audacious? ( dev-libs/dbus-glib )
+	gstreamer? ( media-libs/gstreamer:1.0 )
+	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) \
+		$(use_enable gtk3) \
+		--disable-cutter \
+		${myconf}
+}
+
+src_install() {
+	default
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.ebuild
new file mode 100644
index 000000000000..9a51fb5ec7bb
--- /dev/null
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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 gtk3 gnome gstreamer nls"
+
+RDEPEND="~media-libs/libmp3splt-0.9.0
+	gtk3? ( x11-libs/gtk+:3
+		audacious? ( >=media-sound/audacious-3.0 ) )
+	!gtk3? ( >=x11-libs/gtk+-2.18:2
+		audacious? ( <media-sound/audacious-3.0 ) )
+	!audacious? ( dev-libs/dbus-glib )
+	gstreamer? ( media-libs/gst-plugins-base:0.10 )
+	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) \
+		$(use_enable gtk3) \
+		--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..14dbab5e727b
--- /dev/null
+++ b/media-sound/mp3splt/Manifest
@@ -0,0 +1 @@
+DIST mp3splt-2.6.1a.tar.gz 260476 SHA256 9cd24b7483bbca7bf4a1c306fbf2afc2bb111defd0d88e9d87f642c1b519bb50 SHA512 5c0f6a56e09c0b33f83360bc4ea5d4c9398fa6ec9bc39e7e9ab34b0ff19e46ddacbbc69ff51953ee399f1a172f2d634c57c256abdfe51def593e5f981490cc17 WHIRLPOOL a511c8627afcce86ec290c76628520b0f520c94445ee13bf8ad1c47ab344c485035ab9061f2bfa6522a4a19cbb232dc131f27b1b80f2b6ee2843b2c7f6de9b43
diff --git a/media-sound/mp3splt/metadata.xml b/media-sound/mp3splt/metadata.xml
new file mode 100644
index 000000000000..ab638f070ef2
--- /dev/null
+++ b/media-sound/mp3splt/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</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..d714db807d71
--- /dev/null
+++ b/media-sound/mp3splt/mp3splt-2.6.1a.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/mp3unicode/Manifest b/media-sound/mp3unicode/Manifest
new file mode 100644
index 000000000000..21c7bbe5b1c8
--- /dev/null
+++ b/media-sound/mp3unicode/Manifest
@@ -0,0 +1 @@
+DIST mp3unicode-1.2.1.tar.bz2 101593 SHA256 375b432ce784407e74fceb055d115bf83b1bd04a83b95256171e1a36e00cfe07
diff --git a/media-sound/mp3unicode/metadata.xml b/media-sound/mp3unicode/metadata.xml
new file mode 100644
index 000000000000..0cb41d4907cf
--- /dev/null
+++ b/media-sound/mp3unicode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="github">alonbl/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..0e8581e59206
--- /dev/null
+++ b/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Commandline utility to convert ID3 tags in mp3 files between different encodings"
+HOMEPAGE="http://mp3unicode.sourceforge.net"
+SRC_URI="http://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"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -rf "${D}"/usr/share/doc/${PN}
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/media-sound/mp3wrap/Manifest b/media-sound/mp3wrap/Manifest
new file mode 100644
index 000000000000..43460b2c1d79
--- /dev/null
+++ b/media-sound/mp3wrap/Manifest
@@ -0,0 +1 @@
+DIST mp3wrap-0.5-src.tar.gz 113008 SHA256 1b4644f6b7099dcab88b08521d59d6f730fa211b5faf1f88bd03bf61fedc04e7
diff --git a/media-sound/mp3wrap/metadata.xml b/media-sound/mp3wrap/metadata.xml
new file mode 100644
index 000000000000..63c81edecdb3
--- /dev/null
+++ b/media-sound/mp3wrap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..c5127436b26b
--- /dev/null
+++ b/media-sound/mp3wrap/mp3wrap-0.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..2e85306ef330
--- /dev/null
+++ b/media-sound/mpc/Manifest
@@ -0,0 +1,2 @@
+DIST mpc-0.25.tar.xz 100880 SHA256 70cfa4f734a275a3c76df481ec5222872362ed8f58a4175459cae65d66acaf24 SHA512 7752dd35027b6075d96a27808556af8b2b6e1ac5bb8069515f5baadf25ff31d46409749163634c668da132428b9686ba01a04051f4d41d4cd5e782e57a07b2cb WHIRLPOOL c73eefd8481a1c7cc43840b514c5b571fe204c8e51096562d3a797416f602ce5352491736a8f477b1924483165e90064bbdcb352e5c6476749fb20ea957d1073
+DIST mpc-0.26.tar.xz 105432 SHA256 20735f7173cce56bec50c1d8b4633751052dc68365b29a6113206dc1cdc6e242 SHA512 099d4970418fa848290864ff475801cc9e0aada3f8c11809a0254b9645229d1564e58b746e7e6a327860df72e4d645de06eb7aa9b3cc5f3b7a42331c4aa7192e WHIRLPOOL 53d9e9d9546727b4b8dacd716e95ed77c199aa6b99104d67a0d3ee8e98d4e3a6aa2544552c9e17da6183d4fe50e8baa1c0d2800b946338d86f7d69be6fc3ca21
diff --git a/media-sound/mpc/metadata.xml b/media-sound/mpc/metadata.xml
new file mode 100644
index 000000000000..f939777e6a35
--- /dev/null
+++ b/media-sound/mpc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<maintainer>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/mpc/mpc-0.25.ebuild b/media-sound/mpc/mpc-0.25.ebuild
new file mode 100644
index 000000000000..b5ff7a55e298
--- /dev/null
+++ b/media-sound/mpc/mpc-0.25.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit bash-completion-r1
+
+DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://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.26.ebuild b/media-sound/mpc/mpc-0.26.ebuild
new file mode 100644
index 000000000000..b742f1ef65a2
--- /dev/null
+++ b/media-sound/mpc/mpc-0.26.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit bash-completion-r1
+
+DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://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/mpck/Manifest b/media-sound/mpck/Manifest
new file mode 100644
index 000000000000..d63a3328aeb7
--- /dev/null
+++ b/media-sound/mpck/Manifest
@@ -0,0 +1 @@
+DIST checkmate-0.15.tar.gz 198526 SHA256 7bf49e3c5bcdcac66211a08a18f87dde636417cf28bb5a00730d4dda2a0ee8c7
diff --git a/media-sound/mpck/metadata.xml b/media-sound/mpck/metadata.xml
new file mode 100644
index 000000000000..a025c77c7636
--- /dev/null
+++ b/media-sound/mpck/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+<maintainer>
+  <email>chainsaw@gentoo.org</email>
+  <name>Tony Vroon</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..3839a4c9f074
--- /dev/null
+++ b/media-sound/mpck/mpck-0.15.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..ccef47d3b87b
--- /dev/null
+++ b/media-sound/mpd/Manifest
@@ -0,0 +1,6 @@
+DIST mpd-0.17.6.tar.bz2 585951 SHA256 9788948175157dc1c4da4a7d36e04a4b4812cb3a79f6b935e4fc9f93cb60c332 SHA512 014629b913e7bd537f38303ffee295648b55fe18dc0ea669b463b82c3d60334792eeedb624f96849c834cf32e0bb5107f804e59d62be293ff78d3d940dbbb9e2 WHIRLPOOL dee52fe02174b3818ce4483385b7b91e0667fddfd4912023551032b29a67b80a9d3aba2f2d49781266eceb25d5af2c3fe1285f46ad1513cafcd0f5d3766d2705
+DIST mpd-0.18.16.tar.xz 587724 SHA256 7524c7a7695acfc6a5ce4117b30c74b172cef681a4bb9032db20c3671ad5765a SHA512 bddd0236066bae97ef690b24a0eac46d892fe10ce7c5455634cb8b84210bf2ceb1b5ee8c7754fcf581de7fbd165c9b805f179e243b88bc87e6254e72fa6c8f45 WHIRLPOOL cdf7488fee33b18880b24686bcc86b8d4696023e72011d1310d81f067a8ae99590441c61214e5e371b3cd4da6fb99575963343765c9defa4fb3b41582193c407
+DIST mpd-0.18.20.tar.xz 587320 SHA256 0de4f79fb4f0788ec7e7db7d5abc18bd54d32b7bdaf6fbd244c44e5d56b69f2b SHA512 743761c9ab9bf3c856e2355f417f90a9dfb8d8df5d75d3fc904d874516743ffee969f6ae225f88ed128588e508d82e558a7a279f3b18888c29f7f9d592ce9a29 WHIRLPOOL 21ab9870a42be68d8073d84422ea368ab58c1435e41f81daf9e151230b5b64022f8b91b2856d2c01c585a219e5082d97eb8bde0c16b99b7ddaef585c19da4f2b
+DIST mpd-0.18.23.tar.xz 584160 SHA256 647cf5a27ca68307ab4b28b0c58a3f7461d1f8dad1ab4d3e2ac9a2c380d92e70 SHA512 99641514b4c7dac8d814f891072e0131efa54bc03d9abd54165cbbea3398fb21b01236ab43374a763184c4aad06b3b27cc9455c6f78168e2bf49d7c8c945b975 WHIRLPOOL 9416e88e0071966fc06bd9cfb6ec4a536cf2eeb5c66f3646fb3425a9ffd7edd268858d0ef1b23fbff374306b2c4d4b61610862fd60aa06d5502de313754c1f1c
+DIST mpd-0.19.6.tar.xz 703328 SHA256 fac25376ee46b89249ee28a1ae13b2d5d1df7ff62464340c33c077015364d1e0 SHA512 b679c42169ad0815c69de817b7d59531e6afb9a88ed15ddbe4648f103815b513605081ffddb12a92c9e52e402fcb80c9df984c05c70491a4f3cc4f7efc5e3d86 WHIRLPOOL 7c02eaf842a89417e2a97ee0d6bae4ab22e3233c015496b8bb93bcff2eca40104ae5bdbe50a91d27a1130e531be515e2ff551424f0466cc5525953eb29ab044c
+DIST mpd-0.19.9.tar.xz 701480 SHA256 47851423053cd38cfad65be5985b41b7cd5bdbe8d0d13378e11748a28b19f26f SHA512 7d74254e009008ed142ce0b69e75fe6f255ec2c814b246f570225af715ec5c3a5c75276f4720bc1ad351d48be5b20f9797843c03aae9380a6062796539507bf4 WHIRLPOOL 04ee826f55512c5f4b28f0bfbf78e23710070970be2f7da07b421483da1d9dad20b0b3513a2529f88d83c92f8202cb57bad09fee894eb18387cbc156312e3a06
diff --git a/media-sound/mpd/files/mpd-0.16.conf.patch b/media-sound/mpd/files/mpd-0.16.conf.patch
new file mode 100644
index 000000000000..8f193c82df00
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.16.conf.patch
@@ -0,0 +1,70 @@
+Index: mpd-0.16/doc/mpdconf.dist
+===================================================================
+--- mpd-0.16.orig/doc/mpdconf.dist
++++ mpd-0.16/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,7 +34,7 @@
+ # 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
+@@ -47,7 +47,7 @@
+ # 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.17.4-ffmpeg2.patch b/media-sound/mpd/files/mpd-0.17.4-ffmpeg2.patch
new file mode 100644
index 000000000000..07c3e48eb1b8
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.17.4-ffmpeg2.patch
@@ -0,0 +1,19 @@
+Fix build with FFmpeg 2.0.
+
+Upstream status: Better patch sent and merged upstream.
+
+Index: mpd-0.17.4/src/decoder/ffmpeg_decoder_plugin.c
+===================================================================
+--- mpd-0.17.4.orig/src/decoder/ffmpeg_decoder_plugin.c
++++ mpd-0.17.4/src/decoder/ffmpeg_decoder_plugin.c
+@@ -47,6 +47,10 @@
+ #undef G_LOG_DOMAIN
+ #define G_LOG_DOMAIN "ffmpeg"
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++
+ static GLogLevelFlags
+ level_ffmpeg_to_glib(int level)
+ {
diff --git a/media-sound/mpd/files/mpd-0.17.6-opus-linking.patch b/media-sound/mpd/files/mpd-0.17.6-opus-linking.patch
new file mode 100644
index 000000000000..fa3250ce0149
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.17.6-opus-linking.patch
@@ -0,0 +1,15 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun May  4 11:59:48 UTC 2014
+Subject: fix linking
+
+--- mpd-0.17.6/configure.ac
++++ mpd-0.17.6/configure.ac
+@@ -1149,7 +1149,7 @@
+ AM_CONDITIONAL(ENABLE_FLAC_ENCODER, test x$enable_flac_encoder = xyes)
+ 
+ dnl ---------------------------- Ogg Vorbis Encoder ---------------------------
+-MPD_AUTO_PKG(vorbis_encoder, VORBISENC, [vorbisenc],
++MPD_AUTO_PKG(vorbis_encoder, VORBISENC, [vorbisenc vorbis ogg],
+ 	[Ogg Vorbis encoder], [libvorbisenc not found])
+ 
+ if test x$enable_vorbis_encoder = xyes; then
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.init b/media-sound/mpd/files/mpd.init
new file mode 100644
index 000000000000..f9934fcf99cd
--- /dev/null
+++ b/media-sound/mpd/files/mpd.init
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting Music Player Daemon"
+	start-stop-daemon --start --quiet --background --wait 50 --exec /usr/bin/mpd --pidfile /var/run/mpd.pid --make-pidfile -- --no-daemon /etc/mpd.conf 2>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Music Player Daemon"
+	start-stop-daemon --stop --exec /usr/bin/mpd --pidfile /var/run/mpd.pid
+	eend $?
+}
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..9ec1ed2e9070
--- /dev/null
+++ b/media-sound/mpd/files/mpd2.init
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ^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..5f39ad5c0ac7
--- /dev/null
+++ b/media-sound/mpd/metadata.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+	<email>angelos@gentoo.org</email>
+	<name>Christoph Mende</name>
+  </maintainer>
+  <maintainer>
+  	<email>hwoarang@gentoo.org</email>
+	<name>Markos Chandras</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="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="lastfmradio">Support listening to last.fm radio stations</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="soundcloud">Build plugin to access soundcloud</flag>
+	<flag name="soup">Use <pkg>net-libs/libsoup</pkg> for HTTP streaming</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>
+</pkgmetadata>
diff --git a/media-sound/mpd/mpd-0.17.6.ebuild b/media-sound/mpd/mpd-0.17.6.ebuild
new file mode 100644
index 000000000000..6e0ce9220e29
--- /dev/null
+++ b/media-sound/mpd/mpd-0.17.6.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils flag-o-matic linux-info multilib readme.gentoo systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
+IUSE="+alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
+fluidsynth gme +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate +mad
+mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio recorder
+selinux sid sndfile soundcloud soup sqlite systemd tcpd twolame unicode vorbis wavpack
+wildmidi zeroconf zip"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+INPUT_PLUGINS="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} )
+	|| ( ${INPUT_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	lastfmradio? ( curl )"
+
+RDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	dev-libs/glib:2
+	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 )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( virtual/ffmpeg )
+	flac? ( media-libs/flac[ogg?] )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lame? ( network? ( media-sound/lame ) )
+	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 ) ) )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	pulseaudio? ( media-sound/pulseaudio )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( media-libs/libsidplay:2 )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2 )
+	soup? ( net-libs/libsoup:2.4 )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+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 inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is unset."
+
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.16.conf.patch \
+		"${FILESDIR}"/${PN}-0.17.4-ffmpeg2.patch \
+		"${FILESDIR}"/${PN}-0.17.6-opus-linking.patch
+
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+			src/input/cdio_paranoia_input_plugin.c || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local mpdconf="--disable-despotify --disable-documentation --disable-ffado
+		--disable-mvp --disable-roar --enable-largefile
+		--enable-tcp --enable-un --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
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	econf \
+		$(use_enable alsa) \
+		$(use_enable ao) \
+		$(use_enable audiofile) \
+		$(use_enable bzip2) \
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable cdio iso9660) \
+		$(use_enable curl) \
+		$(use_enable debug) \
+		$(use_enable faad aac) \
+		$(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 jack) \
+		$(use_enable lastfmradio lastfm) \
+		$(use_enable libsamplerate lsr) \
+		$(use_enable mad) \
+		$(use_enable mikmod) \
+		$(use_enable mms) \
+		$(use_enable modplug) \
+		$(use_enable mpg123) \
+		$(use_enable musepack mpc) \
+		$(use_enable openal) \
+		$(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 soundcloud) \
+		$(use_enable soup) \
+		$(use_enable sqlite) \
+		$(use_enable systemd systemd-daemon) \
+		$(use_enable tcpd libwrap) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack) \
+		$(use_enable wildmidi) \
+		$(use_enable zip zzip) \
+		$(use_with zeroconf zeroconf avahi) \
+		"$(systemd_with_unitdir)" \
+		${mpdconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	newinitd "${FILESDIR}"/mpd.init mpd
+
+	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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpd/mpd-0.18.16.ebuild b/media-sound/mpd/mpd-0.18.16.ebuild
new file mode 100644
index 000000000000..a30bd3b169f3
--- /dev/null
+++ b/media-sound/mpd/mpd-0.18.16.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ppc ~sh x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
+	fluidsynth gme +id3tag inotify ipv6 jack lame mms libav libmpdclient
+	libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus
+	oss pipe pulseaudio recorder selinux sid sndfile soundcloud sqlite systemd tcpd
+	twolame unicode vorbis wavpack wildmidi zeroconf zip"
+
+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 )"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	dev-libs/glib:2
+	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 )
+	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 )
+	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 ) ) )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplay:2 )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+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 inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+			src/input/CdioParanoiaInputPlugin.cxx || die
+	fi
+}
+
+src_configure() {
+	local mpdconf="--disable-despotify --disable-documentation --disable-roar
+		--enable-largefile --enable-tcp --enable-un
+		--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
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	econf \
+		$(use_enable alsa) \
+		$(use_enable ao) \
+		$(use_enable audiofile) \
+		$(use_enable bzip2) \
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable cdio iso9660) \
+		$(use_enable curl) \
+		$(use_enable debug) \
+		$(use_enable faad aac) \
+		$(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 jack) \
+		$(use_enable libmpdclient) \
+		$(use_enable libsamplerate lsr) \
+		$(use_enable mad) \
+		$(use_enable mikmod) \
+		$(use_enable mms) \
+		$(use_enable modplug) \
+		$(use_enable mpg123) \
+		$(use_enable musepack mpc) \
+		$(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 soundcloud) \
+		$(use_enable sqlite) \
+		$(use_enable systemd systemd-daemon) \
+		$(use_enable tcpd libwrap) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack) \
+		$(use_enable wildmidi) \
+		$(use_enable zip zzip) \
+		$(use_with zeroconf zeroconf avahi) \
+		"$(systemd_with_unitdir)" \
+		${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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpd/mpd-0.18.20.ebuild b/media-sound/mpd/mpd-0.18.20.ebuild
new file mode 100644
index 000000000000..c272a3399aa2
--- /dev/null
+++ b/media-sound/mpd/mpd-0.18.20.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
+	fluidsynth gme +id3tag inotify ipv6 jack lame mms libav libmpdclient
+	libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus
+	oss pipe pulseaudio recorder selinux sid sndfile soundcloud sqlite systemd tcpd
+	twolame unicode vorbis wavpack wildmidi zeroconf zip"
+
+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 )"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	dev-libs/glib:2
+	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 )
+	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 )
+	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 ) ) )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplay:2 )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+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 inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+			src/input/CdioParanoiaInputPlugin.cxx || die
+	fi
+}
+
+src_configure() {
+	local mpdconf="--disable-despotify --disable-documentation --disable-roar
+		--enable-largefile --enable-tcp --enable-un
+		--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
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	econf \
+		$(use_enable alsa) \
+		$(use_enable ao) \
+		$(use_enable audiofile) \
+		$(use_enable bzip2) \
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable cdio iso9660) \
+		$(use_enable curl) \
+		$(use_enable debug) \
+		$(use_enable faad aac) \
+		$(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 jack) \
+		$(use_enable libmpdclient) \
+		$(use_enable libsamplerate lsr) \
+		$(use_enable mad) \
+		$(use_enable mikmod) \
+		$(use_enable mms) \
+		$(use_enable modplug) \
+		$(use_enable mpg123) \
+		$(use_enable musepack mpc) \
+		$(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 soundcloud) \
+		$(use_enable sqlite) \
+		$(use_enable systemd systemd-daemon) \
+		$(use_enable tcpd libwrap) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack) \
+		$(use_enable wildmidi) \
+		$(use_enable zip zzip) \
+		$(use_with zeroconf zeroconf avahi) \
+		"$(systemd_with_unitdir)" \
+		${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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd
+}
diff --git a/media-sound/mpd/mpd-0.18.23.ebuild b/media-sound/mpd/mpd-0.18.23.ebuild
new file mode 100644
index 000000000000..ff063cdbb4be
--- /dev/null
+++ b/media-sound/mpd/mpd-0.18.23.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug faad +fifo +ffmpeg flac
+	fluidsynth gme +id3tag inotify ipv6 jack lame mms libav libmpdclient
+	libsamplerate +mad mikmod modplug mpg123 musepack +network ogg openal opus
+	oss pipe pulseaudio recorder selinux sid sndfile soundcloud sqlite systemd tcpd
+	twolame unicode vorbis wavpack wildmidi zeroconf zip"
+
+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 )"
+
+CDEPEND="!<sys-cluster/mpich2-1.4_rc2
+	dev-libs/glib:2
+	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 )
+	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 )
+	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 ) ) )
+	ogg? ( media-libs/libogg )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	sid? ( media-libs/libsidplay:2 )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+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 inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+			src/input/CdioParanoiaInputPlugin.cxx || die
+	fi
+}
+
+src_configure() {
+	local mpdconf="--disable-documentation --disable-roar --enable-largefile
+		--enable-tcp --enable-un --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
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	econf \
+		$(use_enable alsa) \
+		$(use_enable ao) \
+		$(use_enable audiofile) \
+		$(use_enable bzip2) \
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable cdio iso9660) \
+		$(use_enable curl) \
+		$(use_enable debug) \
+		$(use_enable faad aac) \
+		$(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 jack) \
+		$(use_enable libmpdclient) \
+		$(use_enable libsamplerate lsr) \
+		$(use_enable mad) \
+		$(use_enable mikmod) \
+		$(use_enable mms) \
+		$(use_enable modplug) \
+		$(use_enable mpg123) \
+		$(use_enable musepack mpc) \
+		$(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 soundcloud) \
+		$(use_enable sqlite) \
+		$(use_enable systemd systemd-daemon) \
+		$(use_enable tcpd libwrap) \
+		$(use_enable vorbis) \
+		$(use_enable wavpack) \
+		$(use_enable wildmidi) \
+		$(use_enable zip zzip) \
+		$(use_with zeroconf zeroconf avahi) \
+		"$(systemd_with_unitdir)" \
+		${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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# 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.6-r1.ebuild b/media-sound/mpd/mpd-0.19.6-r1.ebuild
new file mode 100644
index 000000000000..ec3d5694f18f
--- /dev/null
+++ b/media-sound/mpd/mpd-0.19.6-r1.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug 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
+	sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack
+	wildmidi zeroconf zip"
+
+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 )
+	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 )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+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 inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+}
+
+src_configure() {
+	local mpdconf="--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-despotify --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 libmpdclient)	\
+		$(use_enable expat)			\
+		$(use_enable upnp)			\
+		$(use_enable adplug)		\
+		$(use_enable alsa)			\
+		$(use_enable ao)			\
+		$(use_enable audiofile)		\
+		$(use_enable bzip2)			\
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable cdio iso9660)	\
+		$(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 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 glib)			\
+		$(use_enable faad aac)		\
+		$(use_with zeroconf zeroconf avahi) \
+		"$(systemd_with_unitdir)"	\
+		${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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# 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.6.ebuild b/media-sound/mpd/mpd-0.19.6.ebuild
new file mode 100644
index 000000000000..2c54b82a03bf
--- /dev/null
+++ b/media-sound/mpd/mpd-0.19.6.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug 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
+	sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack
+	wildmidi zeroconf zip"
+
+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[smbclient] )
+	sid? ( media-libs/libsidplay:2 )
+	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 )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+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 inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+}
+
+src_configure() {
+	local mpdconf="--enable-database --disable-roar --disable-documentation
+		--enable-dsd --enable-largefile --disable-despotify --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 libmpdclient)	\
+		$(use_enable expat)			\
+		$(use_enable upnp)			\
+		$(use_enable adplug)		\
+		$(use_enable alsa)			\
+		$(use_enable ao)			\
+		$(use_enable audiofile)		\
+		$(use_enable bzip2)			\
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable cdio iso9660)	\
+		$(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 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 glib)			\
+		$(use_enable faad aac)		\
+		$(use_with zeroconf zeroconf avahi) \
+		"$(systemd_with_unitdir)"	\
+		${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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# 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.9-r1.ebuild b/media-sound/mpd/mpd-0.19.9-r1.ebuild
new file mode 100644
index 000000000000..9c438b6d7165
--- /dev/null
+++ b/media-sound/mpd/mpd-0.19.9-r1.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://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 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
+	sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack
+	wildmidi zeroconf zip"
+
+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 )
+	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 )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+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 inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+}
+
+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 libmpdclient)	\
+		$(use_enable expat)			\
+		$(use_enable upnp)			\
+		$(use_enable adplug)		\
+		$(use_enable alsa)			\
+		$(use_enable ao)			\
+		$(use_enable audiofile)		\
+		$(use_enable bzip2)			\
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable cdio iso9660)	\
+		$(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 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 glib)			\
+		$(use_enable faad aac)		\
+		$(use_with zeroconf zeroconf avahi) \
+		"$(systemd_with_unitdir)"	\
+		${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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# 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.9.ebuild b/media-sound/mpd/mpd-0.19.9.ebuild
new file mode 100644
index 000000000000..e27b47a0ad51
--- /dev/null
+++ b/media-sound/mpd/mpd-0.19.9.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic linux-info multilib readme.gentoo systemd user
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="http://www.musicpd.org"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug 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
+	sndfile soundcloud sqlite systemd tcpd twolame unicode upnp vorbis wavpack
+	wildmidi zeroconf zip"
+
+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[smbclient] )
+	sid? ( media-libs/libsidplay:2 )
+	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 )"
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+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 inotify; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="If you will be starting mpd via /etc/init.d/mpd, please make
+		sure that MPD's pid_file is _set_."
+
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	epatch "${FILESDIR}"/${PN}-0.18.conf.patch
+}
+
+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 libmpdclient)	\
+		$(use_enable expat)			\
+		$(use_enable upnp)			\
+		$(use_enable adplug)		\
+		$(use_enable alsa)			\
+		$(use_enable ao)			\
+		$(use_enable audiofile)		\
+		$(use_enable bzip2)			\
+		$(use_enable cdio cdio-paranoia) \
+		$(use_enable cdio iso9660)	\
+		$(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 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 glib)			\
+		$(use_enable faad aac)		\
+		$(use_with zeroconf zeroconf avahi) \
+		"$(systemd_with_unitdir)"	\
+		${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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	# 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..2830db0c12bb
--- /dev/null
+++ b/media-sound/mpdas/Manifest
@@ -0,0 +1,3 @@
+DIST mpdas-0.3.0.tar.bz2 19219 SHA256 f6542196fa8dfba7cdcc07a95b8df71d03b40a436ea76bcc999f13185d262573 SHA512 782cae5d8a0707656397edd15a299b250129bc2e5e788a5788d06c7d034e56edc105e5ee6669b7bbecb00bd840fd426cf84c0f41502afd50d645cf7b4504784c WHIRLPOOL 083328bff77e935d30f1c97ca55d4081147707a4051ccf6649eb8166dc7a2db291dd36a5f5f0df6a583e542cec54a01a28dfedc04215cf825568960007d76cdb
+DIST mpdas-0.3.1.tar.bz2 13472 SHA256 eaf01afbeac02e6a2023fd05be81042eee94b30abd82667f2220b06955f52ab9 SHA512 26f1e91f6787cd937550e48c04f97a326145ef5b5ac017da86089cc18150f6123e4e233f1936e67240f0125dab0526a86855f2d990b07131c7c52649e2cfe939 WHIRLPOOL 7ff0cce030e5dbb8b792d2a2481051aa5ff376cd8f6b3cd3e75eae82181d1a8c0cd53f17ce5207f74ae9abf324d4e0a989603e5f4c2055783f985bfcd160924d
+DIST mpdas-0.3.2.tar.gz 14143 SHA256 145f85b29f7bd0b1b83d85c887fcf233ff463b31abb4767e7e289e1f9e7abb62 SHA512 b7bc6a78d9a531684a0b59d6e5b6b9701948d10650f567bfebd7eb408d4f22b8c5aed4ddd9b08968aca828ae59b22404bb19c552fc25cf50cdf8adbd7cd77771 WHIRLPOOL c3e7de844bc0ed06a9ef89bbe5b02f076cfb13883196811640f9d346fe31c4dc86567c032ce738df155858ae6254b37044abab703373eb5daa510939d86c8abf
diff --git a/media-sound/mpdas/files/mpdas.init b/media-sound/mpdas/files/mpdas.init
new file mode 100644
index 000000000000..96ebd6101705
--- /dev/null
+++ b/media-sound/mpdas/files/mpdas.init
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..159a30662957
--- /dev/null
+++ b/media-sound/mpdas/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+  	<email>angelos@gentoo.org</email>
+	<name>Christoph Mende</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/media-sound/mpdas/mpdas-0.3.0-r1.ebuild b/media-sound/mpdas/mpdas-0.3.0-r1.ebuild
new file mode 100644
index 000000000000..4d2c873a6f85
--- /dev/null
+++ b/media-sound/mpdas/mpdas-0.3.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="media-libs/libmpd
+	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 ChangeLog 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.3.1.ebuild b/media-sound/mpdas/mpdas-0.3.1.ebuild
new file mode 100644
index 000000000000..4092d2536e10
--- /dev/null
+++ b/media-sound/mpdas/mpdas-0.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libmpd
+	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.3.2.ebuild b/media-sound/mpdas/mpdas-0.3.2.ebuild
new file mode 100644
index 000000000000..e146896063f5
--- /dev/null
+++ b/media-sound/mpdas/mpdas-0.3.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/libmpd
+	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/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
new file mode 100644
index 000000000000..e3d02c25210f
--- /dev/null
+++ b/media-sound/mpdscribble/Manifest
@@ -0,0 +1 @@
+DIST mpdscribble-0.22.tar.bz2 116981 SHA256 1cde2b5f8c70f0e3e6f059d01bf0b0f2eac2b29fbcd14b01a8a5103e603feb41
diff --git a/media-sound/mpdscribble/files/mpdscribble.rc b/media-sound/mpdscribble/files/mpdscribble.rc
new file mode 100644
index 000000000000..463d27fec89b
--- /dev/null
+++ b/media-sound/mpdscribble/files/mpdscribble.rc
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+
+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..5789d68fda54
--- /dev/null
+++ b/media-sound/mpdscribble/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<maintainer>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</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="sourceforge">musicpd</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..e498ca6e2e7f
--- /dev/null
+++ b/media-sound/mpdscribble/mpdscribble-0.22.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="An MPD client that submits information to Audioscrobbler"
+HOMEPAGE="http://mpd.wikia.com/wiki/Client:Mpdscribble"
+SRC_URI="mirror://sourceforge/musicpd/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc x86"
+IUSE="+curl"
+
+RDEPEND=">=dev-libs/glib-2.16:2
+	>=media-libs/libmpdclient-2.2
+	curl? ( net-misc/curl )
+	!curl? ( net-libs/libsoup:2.4 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local myclient=soup
+	use curl && myclient=curl
+	econf \
+		--with-http-client=${myclient} \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+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..7606073518f7
--- /dev/null
+++ b/media-sound/mpfc/Manifest
@@ -0,0 +1,2 @@
+DIST mpfc-1.3.7.tar.gz 869364 SHA256 256ec3a9ebe3296e614b937d3e9044ba11d27c863f723fc939beb82daf54ec8d
+DIST mpfc-1.3.8.1.tar.gz 1042027 SHA256 e8a498ba390bd4ad91d4a36a84d676bcdd9525264ed34548df1d94118abc1116
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-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..2227ff7a1ff4
--- /dev/null
+++ b/media-sound/mpfc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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..8f7936c4670d
--- /dev/null
+++ b/media-sound/mpfc/mpfc-1.3.7-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-r1.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r1.ebuild
new file mode 100644
index 000000000000..d8898b71610e
--- /dev/null
+++ b/media-sound/mpfc/mpfc-1.3.8.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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[unicode]
+	dev-libs/icu:="
+DEPEND="${RDEPEND}"
+
+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
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-sound/mpfc/mpfc-1.3.8.1.ebuild b/media-sound/mpfc/mpfc-1.3.8.1.ebuild
new file mode 100644
index 000000000000..4a4897b40489
--- /dev/null
+++ b/media-sound/mpfc/mpfc-1.3.8.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+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 flac gpm mad vorbis oss wav cdda nls"
+
+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[unicode]
+	dev-libs/icu"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		$(use_enable alsa) \
+		$(use_enable flac) \
+		$(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 || die
+}
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
new file mode 100644
index 000000000000..742a1c67ba83
--- /dev/null
+++ b/media-sound/mpg123/Manifest
@@ -0,0 +1,8 @@
+DIST mpg123-1.18.1.tar.bz2 853423 SHA256 bc6d384f7e038f2458cb05a4d175325e5cb25e0aed441d7b02960e8ec186652d SHA512 973af5e9de67c489dd609d18234ba4118a635d63bb6f1b919f9b89f57adc4bddca9a5bf41a47f1da588f14c84ed130d8ac8e674a081f06d35f5ace85924a70b5 WHIRLPOOL 4959edd4002f021092fffb4c84d864c612b2692b8d9bfa5dd3c16ae7bcdbcf179c20f3af6609260646cb71305fe9831c7f080678783aed1af187251a1d13970c
+DIST mpg123-1.19.0.tar.bz2 855879 SHA256 869024e01d7cb4dae1aea2f2a10420d4be7e1ac02a9c434d06d727599169b01b SHA512 ac176321265c3c6270fbceaab045784ffeb1185e5bf599fb8f269ff6f02a05a7c70988c44ff7bedeb665c45ab9ed0a5e408180fabf3e3e3121972acec0e65351 WHIRLPOOL 05b3cbdc813f4c88e2a343518f41b813ab40a76dff82358527f66a1130ceec7fb61a37f77586fd008ef0801be53da8ac65cdd25c4ca7f89de845a1bcb3ce36c3
+DIST mpg123-1.20.0.tar.bz2 863544 SHA256 a97c85f212fade0728d2d641190907935d4b03028ba200d1576f4f6786578503 SHA512 1ebb01ce8f8745a36c4b32ce4f4ec9036af36f18de08633425cb38038cc2bee5fbe3afbeb2deaa7251d0b0f28d2c5ceb41f82625417ec037a0e529facdd1ac17 WHIRLPOOL b3124d6791da7e017d40565a2b51b1a84bc5cfb896801736f86f65a79ffb1786b409b13834d665a9f520fe8565851ff343101f705e4608922cb9bf7f91e25358
+DIST mpg123-1.20.1.tar.bz2 863792 SHA256 da2941c1905b5776d5468209896502a8d5257966dfadc07f1e4ea105cc515900 SHA512 88e11c5aa84181c457d4b7df7f54d79705552f69ee76197964442d4d817c9dc1e092005feb4ccc59d7ceef428052688c9abf95e49e443afb93ca4645b5b30dd7 WHIRLPOOL b2942a5d816dea735782ba31e334a52ff2a848dcf7f5ac995185f5c4b2e254015d2bde8532c8e14fcf937f82704347db6a045bbb75f2e641c2e8c1b7da09529f
+DIST mpg123-1.21.0.tar.bz2 863177 SHA256 3ad197f77c9ffdf3601e1c3183ae0709ccb3c3de68309527ce9375fcfb15dcba SHA512 8c48037981d3ff8a2e863a781b2d22226a820d63d334c11dcc2868d715ef696ece7a302d1df0550a5fe936ad19ef87bdddf3c8cc8a7339998f229671dc5cc48c WHIRLPOOL 19e4d335f67e181e57acb716337b501aed1c5815dc63a8a69995bee06d6fd0bff8a5e4c86aec09459d5213b8d8bcc27fa99653795a72affad74cea7679eaa5af
+DIST mpg123-1.22.0.tar.bz2 854090 SHA256 25244c07dcb1df0a94092d94126c4172918739fe0e78faaaf97cf0b0fcc1a800 SHA512 b9ac9b95e2627949b32a4c3175e2ad1dda43986222750903e565696e03ef751ee545707ad081a5c06160d199ccae841c90d228082df4d9db841987e973ac5eda WHIRLPOOL fe9a599a5d8433564bc3615a453c5f7205f175438bb296c67efbeeed8d101733e7d302bd327dc90aa3a2d34553b63623955f106422dad36f2f80446942d6ea9d
+DIST mpg123-1.22.1.tar.bz2 854802 SHA256 a0eb598e5bd72cee4c1b7603fa227b7bd54575aa84b7b94a35ca05dd3536cdba SHA512 bb7bb43e1ce3be22c24835aa7a8e91863f39d855d5b66d03b1989fffa14784117f65374301c8e38f3f58a6fe93f07a66c181b2d2f2eb24ca7b81c6a83bd648c4 WHIRLPOOL 1b7435ee0b362241f88243e4876ca0bb3e27bbc488010561b007f6fa2a5d87265a2e8de170159a73d8ab9c3e525a47a8c6114c5ba7f4b57b363419fa5d040220
+DIST mpg123-1.22.2.tar.bz2 870063 SHA256 6d1e2487777114ba8a73c543f355cacfa2055646724000fc195ac9e64c843744 SHA512 503fb42ec6cf69ded895adfb81fd0e05d02f34b5e4e35a0eeaa041c5bc855d26c02a9c7103735e00ab2155b201128c4e0b1e1efed87a183c6e66b66b5a887236 WHIRLPOOL 590076210ef7459a57d1d075dfc525f11e7409ae96f953b97a001969b2ab5afd36ad55c18199a61623a93108b9890f27d232b1de850981b199c155701705147a
diff --git a/media-sound/mpg123/metadata.xml b/media-sound/mpg123/metadata.xml
new file mode 100644
index 000000000000..0ddbd9e20b42
--- /dev/null
+++ b/media-sound/mpg123/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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.18.1.ebuild b/media-sound/mpg123/mpg123-1.18.1.ebuild
new file mode 100644
index 000000000000..091add1f88ed
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.18.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://www.mpg123.org/"
+SRC_URI="http://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
+	>=sys-devel/libtool-2.2.6b
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	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}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	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="${_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.19.0.ebuild b/media-sound/mpg123/mpg123-1.19.0.ebuild
new file mode 100644
index 000000000000..c52f5141308c
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.19.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://www.mpg123.org/"
+SRC_URI="http://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
+	>=sys-devel/libtool-2.2.6b
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	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}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	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="${_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.20.0.ebuild b/media-sound/mpg123/mpg123-1.20.0.ebuild
new file mode 100644
index 000000000000..c52f5141308c
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.20.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://www.mpg123.org/"
+SRC_URI="http://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
+	>=sys-devel/libtool-2.2.6b
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	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}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	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="${_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.20.1.ebuild b/media-sound/mpg123/mpg123-1.20.1.ebuild
new file mode 100644
index 000000000000..c52f5141308c
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.20.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://www.mpg123.org/"
+SRC_URI="http://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
+	>=sys-devel/libtool-2.2.6b
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	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}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	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="${_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.21.0.ebuild b/media-sound/mpg123/mpg123-1.21.0.ebuild
new file mode 100644
index 000000000000..169c5419e650
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.21.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://www.mpg123.org/"
+SRC_URI="http://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
+	>=sys-devel/libtool-2.2.6b
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	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}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	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="${_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.22.0.ebuild b/media-sound/mpg123/mpg123-1.22.0.ebuild
new file mode 100644
index 000000000000..930d58607203
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.22.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://www.mpg123.org/"
+SRC_URI="http://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 <sys-devel/libtool-2.4.3-r2:2 )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	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 )
+
+src_prepare() {
+	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="${_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.22.1.ebuild b/media-sound/mpg123/mpg123-1.22.1.ebuild
new file mode 100644
index 000000000000..930d58607203
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.22.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://www.mpg123.org/"
+SRC_URI="http://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 <sys-devel/libtool-2.4.3-r2:2 )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	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 )
+
+src_prepare() {
+	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="${_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.22.2.ebuild b/media-sound/mpg123/mpg123-1.22.2.ebuild
new file mode 100644
index 000000000000..930d58607203
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.22.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://www.mpg123.org/"
+SRC_URI="http://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 <sys-devel/libtool-2.4.3-r2:2 )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	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 )
+
+src_prepare() {
+	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="${_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..03c59343dc87
--- /dev/null
+++ b/media-sound/mpg321/Manifest
@@ -0,0 +1 @@
+DIST mpg321-0.3.1.tar.gz 151104 SHA256 0b9c23d75a89236ade9830e0319d7e799efea9f6af262d6defda962037d65579 SHA512 77a7b975f2d31f670eb786ccb9601820945e60b19a188e7337bd2ff0237c7ee47970c27adf78cf633d4a561e89b06de3eacf9f2ec11373abcdcb75c322f19eee WHIRLPOOL 81ee33186d25fdadc288cb09cfa9a124531ac1fbe8e7c10cf748b5960f12de46d536ff7bde9fbb98979d57939fe10ad87179c193bf350dd4932731276eb330bf
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/metadata.xml b/media-sound/mpg321/metadata.xml
new file mode 100644
index 000000000000..e16c7f691b28
--- /dev/null
+++ b/media-sound/mpg321/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..f6c764d1a1d7
--- /dev/null
+++ b/media-sound/mpg321/mpg321-0.3.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-interix ~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/mplay/Manifest b/media-sound/mplay/Manifest
new file mode 100644
index 000000000000..bed872a80a7c
--- /dev/null
+++ b/media-sound/mplay/Manifest
@@ -0,0 +1 @@
+DIST mplay-0.80.tar.gz 565002 SHA256 72fce8aaa866cc42eb3f0d5425857a38aba4264cab4f66b7b08790565837a714
diff --git a/media-sound/mplay/metadata.xml b/media-sound/mplay/metadata.xml
new file mode 100644
index 000000000000..d70777d3bcb5
--- /dev/null
+++ b/media-sound/mplay/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..1dadf8644fc6
--- /dev/null
+++ b/media-sound/mplay/mplay-0.80.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/mserv/Manifest b/media-sound/mserv/Manifest
new file mode 100644
index 000000000000..a97af5ae8d47
--- /dev/null
+++ b/media-sound/mserv/Manifest
@@ -0,0 +1 @@
+DIST mserv-0.35.tar.gz 280299 SHA256 7072ffbea66fd17e1ee0ab81de57eac612cbcb25587931602db85536158dd442
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..b694107fe036
--- /dev/null
+++ b/media-sound/mserv/files/mserv-0.35-initd
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Id$
+
+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..40df0e99544a
--- /dev/null
+++ b/media-sound/mserv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..6cb62d29c324
--- /dev/null
+++ b/media-sound/mserv/mserv-0.35-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..9f5dd0d4e39d
--- /dev/null
+++ b/media-sound/mt-daapd/Manifest
@@ -0,0 +1 @@
+DIST mt-daapd-0.2.4.2.tar.gz 436513 SHA256 50d89f77bdc3fd0ca408d52cabff528224fcc7319acc3b9456db0e3164a3b6cf
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 100755
index 000000000000..4f6c37ce400d
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd.init.2
@@ -0,0 +1,46 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+# 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} && ${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..ca0aef2e58a7
--- /dev/null
+++ b/media-sound/mt-daapd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..358f7ecd26d0
--- /dev/null
+++ b/media-sound/mt-daapd/mt-daapd-0.2.4.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/muine/Manifest b/media-sound/muine/Manifest
new file mode 100644
index 000000000000..97fefffcc38c
--- /dev/null
+++ b/media-sound/muine/Manifest
@@ -0,0 +1 @@
+DIST muine-0.8.11.tar.bz2 647177 SHA256 fac70bd9ab8a3c7c48c1f48d10f06080f6b5a42ce32cce21a6ab472cb178ecd4 SHA512 13063c1057cc4a5fb9c2cfca6249e3014415cbfa735a89f1ae411705412e379f1252789787aaca5e11f844fcd8c31a319c408c73539ffe173bc03985b3606d79 WHIRLPOOL c1bbe48293d23f922bd34a3b613942d96ae33d419ee7220b9c2dfe33bf769b59f5fe8984ac6549e9c9a5a16c53460c06db3366fabbd2df9e3e4a7996cb161da0
diff --git a/media-sound/muine/files/muine-0.8.11-drop-deprecated.patch b/media-sound/muine/files/muine-0.8.11-drop-deprecated.patch
new file mode 100644
index 000000000000..fa4b6d8ca2d8
--- /dev/null
+++ b/media-sound/muine/files/muine-0.8.11-drop-deprecated.patch
@@ -0,0 +1,31 @@
+From 86e885f1f17db2ec3caa31b0ff7955dfe2b4e543 Mon Sep 17 00:00:00 2001
+From: daniel g. siegel <dgsiegel@gnome.org>
+Date: Tue, 27 Apr 2010 18:22:57 +0000
+Subject: replace some deprecated gtk functions
+
+use gtk_widget_has_focus instead of GTK_WIDGET_HAS_FOCUS and
+gtk_widget_get_state instead of GTK_WIDGET_STATE
+---
+diff --git a/libmuine/rb-cell-renderer-pixbuf.c b/libmuine/rb-cell-renderer-pixbuf.c
+index 42cff41..abf6958 100644
+--- a/libmuine/rb-cell-renderer-pixbuf.c
++++ b/libmuine/rb-cell-renderer-pixbuf.c
+@@ -295,14 +295,14 @@ rb_cell_renderer_pixbuf_render (GtkCellRenderer    *cell,
+ 
+   if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
+     {
+-      if (GTK_WIDGET_HAS_FOCUS (widget))
++      if (gtk_widget_has_focus (widget))
+         state = GTK_STATE_SELECTED;
+       else
+         state = GTK_STATE_ACTIVE;
+     }
+   else
+     {
+-      if (GTK_WIDGET_STATE (widget) == GTK_STATE_INSENSITIVE)
++      if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE)
+         state = GTK_STATE_INSENSITIVE;
+       else
+         state = GTK_STATE_NORMAL;
+--
+cgit v0.8.3.1
diff --git a/media-sound/muine/files/muine-0.8.11-multimedia-keys.patch b/media-sound/muine/files/muine-0.8.11-multimedia-keys.patch
new file mode 100644
index 000000000000..5bce0ca765c0
--- /dev/null
+++ b/media-sound/muine/files/muine-0.8.11-multimedia-keys.patch
@@ -0,0 +1,26 @@
+From d4dd66d73885db1b2aea2a267197413559bed5bc Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Wed, 16 Sep 2009 21:30:06 +0000
+Subject: Fix multimedia key support for >=Gnome-2.22
+
+---
+diff --git a/src/GnomeMMKeys.cs b/src/GnomeMMKeys.cs
+index dd99718..af5419a 100644
+--- a/src/GnomeMMKeys.cs
++++ b/src/GnomeMMKeys.cs
+@@ -37,11 +37,11 @@ namespace Muine
+     public class GnomeMMKeys : IDisposable
+     {
+         private const string BusName = "org.gnome.SettingsDaemon";
+-        private const string ObjectPath = "/org/gnome/SettingsDaemon";
++        private const string ObjectPath = "/org/gnome/SettingsDaemon/MediaKeys";
+         
+         private delegate void MediaPlayerKeyPressedHandler(string application, string key);
+         
+-        [Interface("org.gnome.SettingsDaemon")]
++        [Interface("org.gnome.SettingsDaemon.MediaKeys")]
+         private interface ISettingsDaemon
+         {
+             void GrabMediaPlayerKeys(string application, uint time);
+--
+cgit v0.8.3.1
diff --git a/media-sound/muine/metadata.xml b/media-sound/muine/metadata.xml
new file mode 100644
index 000000000000..42d1ea6516db
--- /dev/null
+++ b/media-sound/muine/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>dotnet</herd>
+	<herd>gstreamer</herd>
+</pkgmetadata>
diff --git a/media-sound/muine/muine-0.8.11-r3.ebuild b/media-sound/muine/muine-0.8.11-r3.ebuild
new file mode 100644
index 000000000000..f26d8faff348
--- /dev/null
+++ b/media-sound/muine/muine-0.8.11-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="yes"
+
+inherit gnome2 mono-env eutils multilib
+
+DESCRIPTION="A music player for GNOME"
+HOMEPAGE="http://muine.gooeylinux.org/"
+SRC_URI="mirror://gnome/sources/muine/0.8/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="flac mad vorbis"
+
+RDEPEND="
+	x11-themes/gnome-icon-theme
+	>=dev-lang/mono-2
+	>=x11-libs/gtk+-2.6:2
+	>=dev-dotnet/gtk-sharp-2.12.9:2
+	>=dev-dotnet/glade-sharp-2.12.6:2
+	>=dev-dotnet/gnome-sharp-2.6:2
+	>=dev-dotnet/gconf-sharp-2.6:2
+	>=dev-dotnet/gnomevfs-sharp-2.6:2
+	>=dev-dotnet/ndesk-dbus-0.4
+	>=dev-dotnet/ndesk-dbus-glib-0.3
+	>=dev-dotnet/taglib-sharp-2.0.3
+	sys-libs/gdbm
+	media-libs/gstreamer:0.10
+	media-libs/gst-plugins-base:0.10
+	media-libs/gst-plugins-good:0.10
+	media-plugins/gst-plugins-gconf:0.10
+	media-plugins/gst-plugins-gnomevfs:0.10
+	flac? ( media-plugins/gst-plugins-flac:0.10 )
+	mad? ( media-plugins/gst-plugins-mad:0.10 )
+	vorbis? (
+		media-plugins/gst-plugins-ogg:0.10
+		media-plugins/gst-plugins-vorbis:0.10
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	app-text/scrollkeeper
+	gnome-base/gnome-common
+	>=dev-util/intltool-0.29
+"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS PLUGINS README TODO"
+
+	# Fix multimedia key support for >=Gnome-2.22
+	epatch "${FILESDIR}/${P}-multimedia-keys.patch"
+
+	# Replace some deprecated gtk functions
+	epatch "${FILESDIR}/${P}-drop-deprecated.patch"
+
+	# Update icons, upstream bug #623480
+	sed "s:stock_timer:list-add:g" -i src/AddWindow.cs src/StockIcons.cs || die
+	sed "s:stock_music-library:folder-music:g" -i data/glade/PlaylistWindow.glade \
+		src/Actions.cs src/StockIcons.cs || die
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
+
+src_install() {
+	gnome2_src_install
+	insinto /usr/$(get_libdir)/${PN}/plugins
+	doins "${S}"/plugins/TrayIcon.dll
+}
diff --git a/media-sound/multimux/Manifest b/media-sound/multimux/Manifest
new file mode 100644
index 000000000000..f5181a6a537d
--- /dev/null
+++ b/media-sound/multimux/Manifest
@@ -0,0 +1 @@
+DIST multimux-0.2.5.2.tgz 16855 SHA256 78217012abf7944729bd8e4c471323349f26cc9b77b6afbd99170e04af7d53cb
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/multimux/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..5dc0d4268f65
--- /dev/null
+++ b/media-sound/multimux/multimux-0.2.5.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..8d02c2080d45
--- /dev/null
+++ b/media-sound/mumble/Manifest
@@ -0,0 +1,2 @@
+DIST mumble-1.2.6.tar.gz 3201577 SHA256 876cdecfb89798ab45020cdae0d64bd0fa899a9a97c2c7f4a6e706d4165fb6ff SHA512 cf67d171bb76d30fd0b098552ac1707423cdeb7d04031fd5f6693cad4661f3a2d99b8e8d653686fab00f46e66257f8fb75c819b9ad1d4f514a0d0b04c36a446e WHIRLPOOL 37654990d66fb01fc7265c5757ad8b79e9a10325b669735f3010486b15896e3d191bb705664a1151c4b0eea1cb6c17daef86e45c38247a1463ad72c273019ee7
+DIST mumble-1.2.8.tar.gz 3202518 SHA256 4c2fc3dff49687bc1d977905958e8a9c35e109723aeed42c9ea124104febe159 SHA512 9c3534dacce22c6152f3ffa847e98b3b1bab43fd8a92285362333487b1bb9a064699296005350cf09bd44a8070508beaf14d3b518465fad3db94710cd818bc5b WHIRLPOOL 613f2faf233bb8475dcdec97dca46e75d871a1b02d1c783f24a739644c21cf169dedc7b500c1a3a4ef39ff1f22635ed4926fb805ae45ec148ba5b7bfba112451
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..7b22cdeaa94e
--- /dev/null
+++ b/media-sound/mumble/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>
+<email>tgurr@gentoo.org</email>
+</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>
+</pkgmetadata>
diff --git a/media-sound/mumble/mumble-1.2.6.ebuild b/media-sound/mumble/mumble-1.2.6.ebuild
new file mode 100644
index 000000000000..181823841d0e
--- /dev/null
+++ b/media-sound/mumble/mumble-1.2.6.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+QT_MINIMAL="4.6"
+
+inherit eutils multilib qt4-r2
+
+MY_P="${PN}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+alsa +dbus debug g15 oss pch portaudio pulseaudio speech zeroconf"
+
+RDEPEND=">=dev-libs/boost-1.41.0
+	>=dev-libs/openssl-1.0.0b
+	>=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_compile() {
+	# parallel make workaround, bug #445960
+	emake -j1
+}
+
+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.1.2.6
+	dosym libmumble.so.1.2.6 /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.8.ebuild b/media-sound/mumble/mumble-1.2.8.ebuild
new file mode 100644
index 000000000000..e457a05d5cca
--- /dev/null
+++ b/media-sound/mumble/mumble-1.2.8.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+QT_MINIMAL="4.6"
+
+inherit eutils multilib qt4-r2
+
+MY_P="${PN}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa +dbus debug g15 oss pch portaudio pulseaudio speech zeroconf"
+
+RDEPEND=">=dev-libs/boost-1.41.0
+	>=dev-libs/openssl-1.0.0b
+	>=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_compile() {
+	# parallel make workaround, bug #445960
+	emake -j1
+}
+
+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.1.2.8
+	dosym libmumble.so.1.2.8 /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..474037c0e2ec
--- /dev/null
+++ b/media-sound/mup/Manifest
@@ -0,0 +1 @@
+DIST mup57src.tar.gz 2178380 SHA256 9fada398942c34dda38a33e7c86b29023dc83443419d8f0ab57326b6db3cce3a
diff --git a/media-sound/mup/files/mup-5.4-Makefile.patch b/media-sound/mup/files/mup-5.4-Makefile.patch
new file mode 100644
index 000000000000..3aff321d0719
--- /dev/null
+++ b/media-sound/mup/files/mup-5.4-Makefile.patch
@@ -0,0 +1,374 @@
+diff -urN mup-5.4.orig/makefile mup-5.4/makefile
+--- mup-5.4.orig/makefile	2007-07-03 07:32:12.000000000 +0300
++++ mup-5.4/makefile	1970-01-01 02:00:00.000000000 +0200
+@@ -1,222 +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.)
+-# 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.
+-
+-
+-# 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.
+-CFLAGS = -O
+-
+-# You can change this if your X libraries and headers are somewhere else
+-# (like /usr/X11R6).
+-X_LOCATION = /usr/X11
+-
+-# 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/extchtbl.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/muschtbl.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 = \
+-	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 \
+-	-lfltk -lfltk_images -lXext -lX11 -lXpm \
+-	-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
+diff -urN mup-5.4.orig/Makefile mup-5.4/Makefile
+--- mup-5.4.orig/Makefile	1970-01-01 02:00:00.000000000 +0200
++++ mup-5.4/Makefile	2007-07-29 19:42:40.000000000 +0300
+@@ -0,0 +1,144 @@
++PREFIX = /usr
++BINDIR = $(PREFIX)/bin
++MANDIR = $(PREFIX)/share/man/man1
++CC = gcc
++CXX = g++
++CFLAGS = -O2 -pipe
++CXXFLAGS = -O2 -pipe
++X_LOCATION = /usr
++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/extchtbl.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/muschtbl.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 = \
++	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/usr/include/fltk-1 -Imup -L$(X_LOCATION)/lib \
++	-L/usr/lib/fltk-1 -lfltk -lfltk_images -lXext -lX11 -lXpm \
++	-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/files/mup-5.6-Makefile.patch b/media-sound/mup/files/mup-5.6-Makefile.patch
new file mode 100644
index 000000000000..e44ffa215efd
--- /dev/null
+++ b/media-sound/mup/files/mup-5.6-Makefile.patch
@@ -0,0 +1,407 @@
+diff -urN mup-5.6.orig/Makefile mup-5.6/Makefile
+--- mup-5.6.orig/Makefile	1970-01-01 00:00:00.000000000 +0000
++++ mup-5.6/Makefile	2010-05-05 18:11:13.000000000 +0000
+@@ -0,0 +1,148 @@
++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/extchtbl.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/muschtbl.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 -urN mup-5.6.orig/makefile mup-5.6/makefile
+--- mup-5.6.orig/makefile	2010-05-05 18:10:57.000000000 +0000
++++ mup-5.6/makefile	1970-01-01 00:00:00.000000000 +0000
+@@ -1,251 +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 (CLFAGS 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
+-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/extchtbl.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/muschtbl.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
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/mup/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..2af7a77c35ae
--- /dev/null
+++ b/media-sound/mup/mup-5.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..650b3ac89d8b
--- /dev/null
+++ b/media-sound/murmur/Manifest
@@ -0,0 +1,2 @@
+DIST mumble-1.2.5.tar.gz 3200216 SHA256 915156946f7662c2488e4c40c95cb95c4ff00532789515da7df775a36d544faf SHA512 bc1761f1e2fc833124ff2ff9af994be59dc9ef96a1ed49316d5383d9b5d91c37ddce87bf6afefc99315824a2a52c615162b2e6050c78f90beca591b58229e7b1 WHIRLPOOL 1f4b226c4036d35a73f65beb4ea66ec0c4363c6122320e8d70a52e0f40b0e2e550282206dcf158bf5a4bb1109202c38a9451374c1bbce96bc559c576a18346c3
+DIST mumble-1.2.8.tar.gz 3202518 SHA256 4c2fc3dff49687bc1d977905958e8a9c35e109723aeed42c9ea124104febe159 SHA512 9c3534dacce22c6152f3ffa847e98b3b1bab43fd8a92285362333487b1bb9a064699296005350cf09bd44a8070508beaf14d3b518465fad3db94710cd818bc5b WHIRLPOOL 613f2faf233bb8475dcdec97dca46e75d871a1b02d1c783f24a739644c21cf169dedc7b500c1a3a4ef39ff1f22635ed4926fb805ae45ec148ba5b7bfba112451
diff --git a/media-sound/murmur/files/murmur-1.2.4-ice-3.5.0-compat.patch b/media-sound/murmur/files/murmur-1.2.4-ice-3.5.0-compat.patch
new file mode 100644
index 000000000000..f7b82ba42b7b
--- /dev/null
+++ b/media-sound/murmur/files/murmur-1.2.4-ice-3.5.0-compat.patch
@@ -0,0 +1,12 @@
+diff -Naur mumble-1.2.4/src/murmur/murmur.pro mumble-1.2.4.new/src/murmur/murmur.pro
+--- mumble-1.2.4/src/murmur/murmur.pro	2013-06-01 23:16:32.000000000 +0200
++++ mumble-1.2.4.new/src/murmur/murmur.pro	2013-06-04 21:38:46.323677587 +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.0/slice/ ${QMAKE_FILE_NAME}
+ 	}
+ 	slice.input = SLICEFILES
+ 	slice.CONFIG *= no_link explicit_dependencies
diff --git a/media-sound/murmur/files/murmur-1.2.4-ice-3.5.1-compat.patch b/media-sound/murmur/files/murmur-1.2.4-ice-3.5.1-compat.patch
new file mode 100644
index 000000000000..c5d7af520ed7
--- /dev/null
+++ b/media-sound/murmur/files/murmur-1.2.4-ice-3.5.1-compat.patch
@@ -0,0 +1,25 @@
+From d2ed7d2d38e4548b23d105c124737a871b1fc72c Mon Sep 17 00:00:00 2001
+From: Timo Gurr <timo.gurr@gmail.com>
+Date: Wed, 16 Oct 2013 13:27:19 +0200
+Subject: [PATCH] Update slice path for Ice 3.5.1
+
+---
+ src/murmur/murmur.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro
+index adaeb2b..7621699 100644
+--- a/src/murmur/murmur.pro
++++ b/src/murmur/murmur.pro
+@@ -77,7 +77,7 @@ ice {
+ 	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/ -I/usr/share/Ice-3.5.0/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.0/slice/ -I/usr/share/Ice-3.5.1/slice/ ${QMAKE_FILE_NAME}
+ 	}
+ 	slice.input = SLICEFILES
+ 	slice.CONFIG *= no_link explicit_dependencies
+-- 
+1.8.4
+
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..29b2f9d23a0f
--- /dev/null
+++ b/media-sound/murmur/files/murmur.initd-r1
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+
+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..7d2340766229
--- /dev/null
+++ b/media-sound/murmur/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>
+<email>tgurr@gentoo.org</email>
+</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-cpp/Ice</pkg> to enable remote control capabilities.</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/murmur/murmur-1.2.5.ebuild b/media-sound/murmur/murmur-1.2.5.ebuild
new file mode 100644
index 000000000000..5ce03d2dab3a
--- /dev/null
+++ b/media-sound/murmur/murmur-1.2.5.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+QT_MINIMAL="4.6"
+
+inherit eutils qt4-r2 systemd user readme.gentoo
+
+MY_P="${PN/murmur/mumble}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="http://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
+	>=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.4-ice-3.5.0-compat.patch
+	"${FILESDIR}"/${PN}-1.2.4-ice-3.5.1-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() {
+	qt4-r2_src_prepare
+
+	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_compile() {
+	# parallel make workaround, upstream bug #3190498
+	emake -j1
+}
+
+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
+
+	doman man/murmurd.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/murmur/murmur-1.2.8.ebuild b/media-sound/murmur/murmur-1.2.8.ebuild
new file mode 100644
index 000000000000..d25d6cc7a400
--- /dev/null
+++ b/media-sound/murmur/murmur-1.2.8.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+QT_MINIMAL="4.6"
+
+inherit eutils qt4-r2 systemd user readme.gentoo
+
+MY_P="${PN/murmur/mumble}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="http://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
+	>=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.4-ice-3.5.0-compat.patch
+	"${FILESDIR}"/${PN}-1.2.4-ice-3.5.1-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() {
+	qt4-r2_src_prepare
+
+	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_compile() {
+	# parallel make workaround, upstream bug #3190498
+	emake -j1
+}
+
+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
+
+	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..bd19ced76f4d
--- /dev/null
+++ b/media-sound/muse/Manifest
@@ -0,0 +1 @@
+DIST MuSE-0.9.2.tar.gz 1420411 RMD160 05e156c44abbf48f26b30f6204c4524a760606d2 SHA1 b953f19a29ead39cc1723d07b5bf10ad1453afb2 SHA256 270f95b3a4f9d11bea04d5db4b3868aee1fa78177da0b5d9a74f26c4cfa5e197
diff --git a/media-sound/muse/files/muse-0.9.2-asneeded.patch b/media-sound/muse/files/muse-0.9.2-asneeded.patch
new file mode 100644
index 000000000000..70674bbb0c27
--- /dev/null
+++ b/media-sound/muse/files/muse-0.9.2-asneeded.patch
@@ -0,0 +1,12 @@
+--- MuSE-0.9.2/src/Makefile.in.old	2006-11-12 20:22:22.000000000 +0100
++++ MuSE-0.9.2/src/Makefile.in	2006-11-12 20:22:36.000000000 +0100
+@@ -274,7 +274,8 @@
+ 	@OGG_LIBS@ \
+ 	@VORBIS_LIBS@ \
+ 	@GUI_LIBS@ \
+-	@SNDFILE_LIBS@
++	@SNDFILE_LIBS@ \
++	@GTK2_LIBS@
+ 
+ all: all-recursive
+ 
diff --git a/media-sound/muse/files/muse-0.9.2-gcc43.patch b/media-sound/muse/files/muse-0.9.2-gcc43.patch
new file mode 100644
index 000000000000..ec58eac62015
--- /dev/null
+++ b/media-sound/muse/files/muse-0.9.2-gcc43.patch
@@ -0,0 +1,16 @@
+diff -NrU5 MuSE-0.9.2.orig/src/libmpeg/mpegtoraw.cc MuSE-0.9.2/src/libmpeg/mpegtoraw.cc
+--- MuSE-0.9.2.orig/src/libmpeg/mpegtoraw.cc	2008-04-22 20:39:47.000000000 +0200
++++ MuSE-0.9.2/src/libmpeg/mpegtoraw.cc	2008-04-22 20:53:44.000000000 +0200
+@@ -417,11 +417,11 @@
+   if(loader->eof())return seterrorcode(SOUND_ERROR_FINISH);
+ 
+   return true;
+ }
+ 
+-#include <iostream.h>
++#include <iostream>
+ // Convert mpeg to raw
+ bool Mpegtoraw::run(int frames) {
+   clearrawdata();
+   if(frames<0)lastfrequency=0;
+ 
diff --git a/media-sound/muse/metadata.xml b/media-sound/muse/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/muse/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/muse/muse-0.9.2.ebuild b/media-sound/muse/muse-0.9.2.ebuild
new file mode 100644
index 000000000000..09fb0f8d6436
--- /dev/null
+++ b/media-sound/muse/muse-0.9.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils
+
+MY_P=${P/muse/MuSE}
+
+DESCRIPTION="Multiple Streaming Engine, an icecast source streamer"
+HOMEPAGE="http://muse.dyne.org"
+SRC_URI="ftp://ftp.dyne.org/muse/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE="debug gtk"
+
+RDEPEND="media-sound/lame
+	media-libs/libvorbis
+	media-libs/libsndfile
+	media-libs/libogg
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gtk gtk2)
+}
+
+src_compile() {
+	emake CXXFLAGS="${CXXFLAGS} -fpermissive" CFLAGS="${CFLAGS}" \
+		|| die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" docsdir="/usr/share/doc/${PF}" \
+		install || die "emake install failed."
+	prepalldocs
+}
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
new file mode 100644
index 000000000000..13d6aa5558dd
--- /dev/null
+++ b/media-sound/musepack-tools/Manifest
@@ -0,0 +1 @@
+DIST musepack-tools-465.tar.bz2 167612 SHA256 3c14ea0cbbabf3b3141d680ade1caa1c48d77fb0ab286a4fbf449643f302760a SHA512 ce933376bc127f6f4acc8500e50b6318a6bc5bf8443547fc0e25b4e8e5881fd7a73aff155560ffbc5161b5d7d03522c73bfbc31e14e1531fe511036a0f657d54 WHIRLPOOL fd598d7417ce20611da79c0382a686cc6ffa0e0f064e1260b94807c9f2028ad6603043b36c019e7b5d45efda749f8e3caa7d0607681e049c69b5d04f56b354c4
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..3bf6bcfeb512
--- /dev/null
+++ b/media-sound/musepack-tools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+</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..1d57a96a703c
--- /dev/null
+++ b/media-sound/musepack-tools/musepack-tools-465-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..9b9c542c1b96
--- /dev/null
+++ b/media-sound/musescore/Manifest
@@ -0,0 +1,3 @@
+DIST mscore-1.1.tar.bz2 82410619 SHA256 d160b4dabbee5bbe7c0ba6e653e90fd36fae07ab7fffed2c6991b65123fee10c
+DIST mscore-1.2.tar.bz2 85739954 SHA256 e7f6c6cd705381a4583db267acbfed2dc9ce3985b20ed5407cd9cfe208d74d81 SHA512 aa92520b34d597db9fcf3c0121a56ceb7bfd8008ec5520cb318129da1c127426b0b789aab9d4754526d22c00307cc730d3c1b5a23e4252d5c5ca9e2b6cd95a38 WHIRLPOOL 6abcd260e908a045b43d210d274911cb87acacc1707638bc625aae817ad3791b13b079b6eaf44fb8b600031e7492eae86d88a6d6cb923c6badcdfe1b89314734
+DIST mscore-1.3.tar.bz2 94704857 SHA256 a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683 SHA512 65369cc62f401c059c3452ada8a8861b6dd36df54313f4039f1a8a96771a37926bb40240df88d150b99cee7bc8a4ee8963a4fdb5a162defc8be660810cbc49b4 WHIRLPOOL 89a91da5607ce8163b74f6a787b57f15ef615a32ede154f943a3d87e78f348b145d14e89c487797df1bff577085b36d5e21c6ffb2daf044cf48b01f350538be1
diff --git a/media-sound/musescore/files/musescore-1.1-sline.patch b/media-sound/musescore/files/musescore-1.1-sline.patch
new file mode 100644
index 000000000000..15345803b63f
--- /dev/null
+++ b/media-sound/musescore/files/musescore-1.1-sline.patch
@@ -0,0 +1,11 @@
+--- mscore-1.1/mscore/mscore/exportxml.cpp.orig
++++ mscore-1.1/mscore/mscore/exportxml.cpp
+@@ -2363,7 +2363,7 @@
+                    el->userOff().y());
+ */
+             if (el->type() == HAIRPIN || el->type() == OTTAVA || el->type() == TEXTLINE) {
+-                  SLine* sl = static_cast<const SLine*>(el);
++                  SLine* sl = static_cast<SLine*>(el);
+ //                  printf("slin segsz=%d", sl->lineSegments().size());
+                   if (sl->lineSegments().size() > 0) {
+                         LineSegment* seg = sl->lineSegments().at(0);
diff --git a/media-sound/musescore/files/musescore-1.2-cflags.patch b/media-sound/musescore/files/musescore-1.2-cflags.patch
new file mode 100644
index 000000000000..d3450b8cae92
--- /dev/null
+++ b/media-sound/musescore/files/musescore-1.2-cflags.patch
@@ -0,0 +1,64 @@
+--- mscore-1.2/mscore/al/CMakeLists.txt
++++ mscore-1.2/mscore/al/CMakeLists.txt
+@@ -42,7 +42,7 @@
+ 
+ set_source_files_properties(
+    dsp.cpp xml.cpp tempo.cpp sig.cpp pos.cpp fraction.cpp
+-   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
++   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ set_source_files_properties(dspSSE.cpp
+--- mscore-1.2/mscore/awl/CMakeLists.txt
++++ mscore-1.2/mscore/awl/CMakeLists.txt
+@@ -61,7 +61,7 @@
+ 
+ set_target_properties( awl
+    PROPERTIES COMPILE_FLAGS
+-      "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
++      "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ ADD_DEPENDENCIES(awl mops1)
+--- mscore-1.2/mscore/CMakeLists.txt
++++ mscore-1.2/mscore/CMakeLists.txt
+@@ -253,9 +253,6 @@
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    )
+ 
+-set(CMAKE_CXX_FLAGS_DEBUG   "")
+-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
+-
+ if (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+       if (MINGW)
+             set(FLAGS -DQT_DEBUG -DQT_DLL)
+@@ -264,9 +261,9 @@
+       endif (MINGW)
+ else (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+       if (MINGW)
+-            set(FLAGS -O2 -DNDEBUG -DQT_DLL -DQT_NO_DEBUG)
++            set(FLAGS -DNDEBUG -DQT_DLL -DQT_NO_DEBUG)
+       else (MINGW)
+-            set(FLAGS -O2 -DNDEBUG -DQT_NO_DEBUG)
++            set(FLAGS -DNDEBUG -DQT_NO_DEBUG)
+       endif (MINGW)
+ endif (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+ 
+@@ -276,7 +273,7 @@
+       add_custom_command(
+          OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch
+          COMMAND ${CMAKE_CXX_COMPILER}
+-           -x c++-header -g ${FLAGS}
++           -x c++-header ${FLAGS}
+            -I${QT_INCLUDE_DIR}
+            -o all.h.pch all.h
+          DEPENDS ${PROJECT_BINARY_DIR}/all.h
+@@ -287,7 +284,7 @@
+       add_custom_command(
+          OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch
+          COMMAND ${CMAKE_CXX_COMPILER}
+-           -x c++-header -g  ${FLAGS} -m32
++           -x c++-header ${FLAGS}
+            -I${QT_HEADERS_DIR}
+            -o all.h.gch all.h
+          DEPENDS ${PROJECT_BINARY_DIR}/all.h
diff --git a/media-sound/musescore/files/musescore-1.3-cflags.patch b/media-sound/musescore/files/musescore-1.3-cflags.patch
new file mode 100644
index 000000000000..44af8851be97
--- /dev/null
+++ b/media-sound/musescore/files/musescore-1.3-cflags.patch
@@ -0,0 +1,113 @@
+--- mscore-1.3/mscore/al/CMakeLists.txt
++++ mscore-1.3/mscore/al/CMakeLists.txt
+@@ -42,7 +42,7 @@
+ 
+ set_source_files_properties(
+    dsp.cpp xml.cpp tempo.cpp sig.cpp pos.cpp fraction.cpp
+-   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
++   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ set_source_files_properties(dspSSE.cpp
+--- mscore-1.3/mscore/awl/CMakeLists.txt
++++ mscore-1.3/mscore/awl/CMakeLists.txt
+@@ -61,7 +61,7 @@
+ 
+ set_target_properties( awl
+    PROPERTIES COMPILE_FLAGS
+-      "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
++      "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ ADD_DEPENDENCIES(awl mops1)
+--- mscore-1.3/mscore/CMakeLists.txt
++++ mscore-1.3/mscore/CMakeLists.txt
+@@ -257,9 +257,6 @@
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    )
+ 
+-set(CMAKE_CXX_FLAGS_DEBUG   "-g")
+-set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+-
+ if (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+       if (MINGW)
+             set(FLAGS -DQT_DEBUG -DQT_DLL)
+@@ -272,9 +269,9 @@
+       endif (MINGW)
+ else (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+       if (MINGW)
+-            set(FLAGS -O2 -DNDEBUG -DQT_DLL -DQT_NO_DEBUG)
++            set(FLAGS -DNDEBUG -DQT_DLL -DQT_NO_DEBUG)
+       else (MINGW)
+-            set(FLAGS -O2 -DNDEBUG -DQT_NO_DEBUG)
++            set(FLAGS -DNDEBUG -DQT_NO_DEBUG)
+       endif (MINGW)
+ endif (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
+ 
+@@ -284,7 +281,7 @@
+ add_custom_command(
+  OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch
+  COMMAND ${CMAKE_CXX_COMPILER}
+-   -x c++-header -g  ${FLAGS}
++   -x c++-header ${FLAGS}
+    -I${QT_HEADERS_DIR}
+    -o all.h.gch all.h
+  DEPENDS ${PROJECT_BINARY_DIR}/all.h
+--- mscore-1.3/mscore/fluid/CMakeLists.txt
++++ mscore-1.3/mscore/fluid/CMakeLists.txt
+@@ -28,7 +28,7 @@
+   )
+ 
+ set_target_properties( fluid
+-   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
++   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ ADD_DEPENDENCIES(fluid mops1)
+--- mscore-1.3/mscore/mscore/CMakeLists.txt
++++ mscore-1.3/mscore/mscore/CMakeLists.txt
+@@ -199,7 +199,7 @@
+    if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+      set_target_properties( mscore
+         PROPERTIES
+-           COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB -DQT_SCRIPT_LIB"
++           COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB -DQT_SCRIPT_LIB"
+            LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
+         )
+    else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+--- mscore-1.3/mscore/ofqf/CMakeLists.txt
++++ mscore-1.3/mscore/ofqf/CMakeLists.txt
+@@ -34,8 +34,8 @@
+    )
+ 
+ set_target_properties( ofqf
+-   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
++   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ ADD_DEPENDENCIES(ofqf mops1)
+-ADD_DEPENDENCIES(ofqf mops2)
+\ No newline at end of file
++ADD_DEPENDENCIES(ofqf mops2)
+--- mscore-1.3/mscore/osdabzip/CMakeLists.txt
++++ mscore-1.3/mscore/osdabzip/CMakeLists.txt
+@@ -29,7 +29,7 @@
+   )
+ 
+ set_target_properties( osdabzip
+-   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
++   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ ADD_DEPENDENCIES(osdabzip mops1)
+--- mscore-1.3/mscore/singleapp/src/CMakeLists.txt
++++ mscore-1.3/mscore/singleapp/src/CMakeLists.txt
+@@ -35,7 +35,7 @@
+   )
+ 
+ set_target_properties( qtsingleapp
+-   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
++   PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+    )
+ 
+ ADD_DEPENDENCIES(qtsingleapp mops1)
diff --git a/media-sound/musescore/files/musescore-1.3-freetype251.patch b/media-sound/musescore/files/musescore-1.3-freetype251.patch
new file mode 100644
index 000000000000..0fbad400e8f9
--- /dev/null
+++ b/media-sound/musescore/files/musescore-1.3-freetype251.patch
@@ -0,0 +1,19 @@
+Date: Tue, 15 Apr 2014 16:36:51 +0200
+Subject: [PATCH] Fix compilation with >=freetype-2.5.1 while remaining
+ compatible with older freetype versions.
+
+This fixes Gentoo bug #507712 (https://bugs.gentoo.org/507712)
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+--- mscore-1.3/mscore/mscore/genft.cpp
++++ mscore-1.3/mscore/mscore/genft.cpp
+@@ -27,7 +27,7 @@
+ 
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+-#include <freetype/tttables.h>
++#include FT_TRUETYPE_TABLES_H
+ #include "al/xml.h"
+ 
+ QMap<int, int> codemap;
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
new file mode 100644
index 000000000000..2db48a7c9199
--- /dev/null
+++ b/media-sound/musescore/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">mscore</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/musescore/musescore-1.1.ebuild b/media-sound/musescore/musescore-1.1.ebuild
new file mode 100644
index 000000000000..627b4afadcb5
--- /dev/null
+++ b/media-sound/musescore/musescore-1.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit cmake-utils eutils font
+
+MY_P="mscore-${PV}"
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="http://mscore.sourceforge.net"
+SRC_URI="mirror://sourceforge/mscore/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	>=media-libs/libsndfile-1.0.19
+	media-libs/portaudio
+	media-sound/fluidsynth
+	media-sound/jack-audio-connection-kit
+	sys-libs/zlib
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qt3support:4
+	dev-qt/qtscript:4
+	dev-qt/qtsvg:4
+	x11-libs/qtscriptgenerator"
+DEPEND="${RDEPEND}
+	dev-texlive/texlive-context
+	app-doc/doxygen
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}/mscore"
+VARTEXFONTS="${T}/fonts"
+FONT_SUFFIX="ttf"
+FONT_S="${S}/mscore/fonts"
+
+src_prepare() {
+	# Fix invalid conversion error
+	epatch "${FILESDIR}"/${P}-sline.patch
+
+	# Don't build redundant qtscriptgenerator libs
+	sed -i -e '/^set(BUILD_SCRIPTGEN/s/TRUE/FALSE/' CMakeLists.txt || die
+}
+
+src_compile() {
+	cmake-utils_src_make lupdate
+	cmake-utils_src_make lrelease
+	cmake-utils_src_make
+}
+
+src_install() {
+	cmake-utils_src_install
+	font_src_install
+	dodoc ChangeLog NEWS README
+	doman packaging/mscore.1
+}
diff --git a/media-sound/musescore/musescore-1.2.ebuild b/media-sound/musescore/musescore-1.2.ebuild
new file mode 100644
index 000000000000..75acf326d3e0
--- /dev/null
+++ b/media-sound/musescore/musescore-1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit cmake-utils eutils font
+
+MY_P="mscore-${PV}"
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="http://mscore.sourceforge.net"
+SRC_URI="mirror://sourceforge/mscore/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	>=media-libs/libsndfile-1.0.19
+	media-libs/portaudio
+	media-sound/fluidsynth
+	media-sound/jack-audio-connection-kit
+	sys-libs/zlib
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qt3support:4
+	dev-qt/qtscript:4
+	dev-qt/qtsvg:4
+	x11-libs/qtscriptgenerator"
+DEPEND="${RDEPEND}
+	dev-texlive/texlive-context
+	app-doc/doxygen
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}/mscore"
+VARTEXFONTS="${T}/fonts"
+FONT_SUFFIX="ttf"
+FONT_S="${S}/mscore/fonts"
+
+src_prepare() {
+	# Don't build redundant qtscriptgenerator libs
+	sed -i -e '/^set(BUILD_SCRIPTGEN/s/TRUE/FALSE/' CMakeLists.txt || die
+
+	epatch "${FILESDIR}"/${P}-cflags.patch
+}
+
+src_compile() {
+	cmake-utils_src_make lupdate
+	cmake-utils_src_make lrelease
+	cmake-utils_src_make
+}
+
+src_install() {
+	cmake-utils_src_install
+	font_src_install
+	dodoc ChangeLog NEWS README
+	doman packaging/mscore.1
+}
diff --git a/media-sound/musescore/musescore-1.3.ebuild b/media-sound/musescore/musescore-1.3.ebuild
new file mode 100644
index 000000000000..fc1ae3480726
--- /dev/null
+++ b/media-sound/musescore/musescore-1.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils eutils font
+
+MY_P="mscore-${PV}"
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="http://mscore.sourceforge.net"
+SRC_URI="mirror://sourceforge/mscore/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/alsa-lib
+	>=media-libs/libsndfile-1.0.19
+	media-libs/portaudio
+	media-sound/fluidsynth
+	media-sound/jack-audio-connection-kit
+	sys-libs/zlib
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qt3support:4
+	dev-qt/qtscript:4
+	dev-qt/qtsvg:4
+	x11-libs/qtscriptgenerator"
+DEPEND="${RDEPEND}
+	dev-texlive/texlive-context
+	app-doc/doxygen
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}/mscore"
+VARTEXFONTS="${T}/fonts"
+FONT_SUFFIX="ttf"
+FONT_S="${S}/mscore/fonts"
+
+src_prepare() {
+	# don't build redundant qtscriptgenerator libs
+	sed -i '/^set(BUILD_SCRIPTGEN/s/TRUE/FALSE/' CMakeLists.txt || die
+
+	epatch "${FILESDIR}"/${P}-cflags.patch \
+		"${FILESDIR}"/${P}-freetype251.patch
+}
+
+src_compile() {
+	cmake-utils_src_make lupdate
+	cmake-utils_src_make lrelease
+	cmake-utils_src_make
+}
+
+src_install() {
+	cmake-utils_src_install
+	font_src_install
+	dodoc ChangeLog NEWS README
+	doman packaging/mscore.1
+}
diff --git a/media-sound/music-file-organizer/Manifest b/media-sound/music-file-organizer/Manifest
new file mode 100644
index 000000000000..5093554656d9
--- /dev/null
+++ b/media-sound/music-file-organizer/Manifest
@@ -0,0 +1 @@
+DIST music-file-organizer-1.0.1.tar.xz 6644 SHA256 509fdd986872d41c82467483802b647f6c9130f52bbb1ed10884810ce1ae0f4a SHA512 4a69f90b3d859ec18746708c64c316b9f583e3ed7718848109815a9e725fe43d3ca1260dea90aae25201150569538056de7de75f05fe7ea6a1ae637f041431c2 WHIRLPOOL 2131268bc178422c8ffc55f981cc10dcc6ad3e7779e1c08c8e7379d5a61641cf7ef267a657a64f8b2ac85dc94c8aed43fa117477a9986789c5ad2e3cd12763a6
diff --git a/media-sound/music-file-organizer/metadata.xml b/media-sound/music-file-organizer/metadata.xml
new file mode 100644
index 000000000000..160670d046a4
--- /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>
+		<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..d891660a1d85
--- /dev/null
+++ b/media-sound/music-file-organizer/music-file-organizer-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e22fbb7353d9
--- /dev/null
+++ b/media-sound/musique/Manifest
@@ -0,0 +1,2 @@
+DIST musique-1.2.1.tar.gz 374601 SHA256 cc0f626d7de981ff7fdd776fb9eab6a7750443ad55f6978132d9c9d11abd1f38 SHA512 b6d52d8345c69e5b4bfa6419cab4baeb5ed1c81106fbe98b74943cc4c6aa0712444e2189605132da2a2362d38de322926eb3f6ef0b8f25bb45e3e86e3b74cd33 WHIRLPOOL 775751a857dd2e4fbc1f9e50dea9ed0c9d40edd8af7c1bc0a9c7eb186aad39680760825b5c04bbc439d9ac98682952cf5fc2d8e8db595e0f0a99125e6112a078
+DIST musique-1.3.tar.gz 399750 SHA256 401643ad9c750270a89d431806044c626dee3fe7ebc14d0ac72917197cdd0592 SHA512 eb197c315b77d4053960c8c18d012635f957eb9ae89bb8b576f938013db43f78ab0d5a0fe0d46fb32cc9f398f9d7f96a37cf975b2f192a6cbc3dd294c4cad279 WHIRLPOOL b4a48d2e8d57d3cfb6cb3d705b4cccbbaf9ae642f16864bb9c61ece02e658b941472a2767d82218c5bf36031af52354fd2868014d8af0a4b2bb71abdf96f3e6e
diff --git a/media-sound/musique/files/musique-1.1-gcc47.patch b/media-sound/musique/files/musique-1.1-gcc47.patch
new file mode 100644
index 000000000000..6350578103bb
--- /dev/null
+++ b/media-sound/musique/files/musique-1.1-gcc47.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/show_bug.cgi?id=422665
+Index: musique/src/qtsingleapplication/qtlocalpeer.cpp
+===================================================================
+--- musique.orig/src/qtsingleapplication/qtlocalpeer.cpp
++++ musique/src/qtsingleapplication/qtlocalpeer.cpp
+@@ -57,6 +57,7 @@ typedef BOOL(WINAPI*PProcessIdToSessionI
+ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #endif
+ #if defined(Q_OS_UNIX)
++#include <unistd.h>
+ #include <time.h>
+ #endif
+ 
diff --git a/media-sound/musique/metadata.xml b/media-sound/musique/metadata.xml
new file mode 100644
index 000000000000..dc439f7e84f5
--- /dev/null
+++ b/media-sound/musique/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qt</herd>
+</pkgmetadata>
diff --git a/media-sound/musique/musique-1.2.1.ebuild b/media-sound/musique/musique-1.2.1.ebuild
new file mode 100644
index 000000000000..039837676c5a
--- /dev/null
+++ b/media-sound/musique/musique-1.2.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Qt4 music player"
+HOMEPAGE="http://flavio.tordini.org/musique"
+# Same tarball for every release. We repackage it
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4[gtkstyle]
+	dev-qt/qtsql:4[sqlite]
+	|| ( dev-qt/qtphonon:4 media-libs/phonon[qt4] )
+	media-libs/taglib
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+DOCS="CHANGES TODO"
+
+src_prepare () {
+	# bug 422665. Upstream only cares about ubuntu
+	# so this bug will be fixed once ubuntu moves
+	# to gcc-4.7. No, I will not send this patch upstream
+	# *again*
+	epatch "${FILESDIR}"/${PN}-1.1-gcc47.patch
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	eqmake4 ${PN}.pro PREFIX="/usr"
+}
+
+src_install() {
+	qt4-r2_src_install
+	doicon data/${PN}.svg
+}
diff --git a/media-sound/musique/musique-1.3.ebuild b/media-sound/musique/musique-1.3.ebuild
new file mode 100644
index 000000000000..039837676c5a
--- /dev/null
+++ b/media-sound/musique/musique-1.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Qt4 music player"
+HOMEPAGE="http://flavio.tordini.org/musique"
+# Same tarball for every release. We repackage it
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4[gtkstyle]
+	dev-qt/qtsql:4[sqlite]
+	|| ( dev-qt/qtphonon:4 media-libs/phonon[qt4] )
+	media-libs/taglib
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+DOCS="CHANGES TODO"
+
+src_prepare () {
+	# bug 422665. Upstream only cares about ubuntu
+	# so this bug will be fixed once ubuntu moves
+	# to gcc-4.7. No, I will not send this patch upstream
+	# *again*
+	epatch "${FILESDIR}"/${PN}-1.1-gcc47.patch
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	eqmake4 ${PN}.pro PREFIX="/usr"
+}
+
+src_install() {
+	qt4-r2_src_install
+	doicon data/${PN}.svg
+}
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
new file mode 100644
index 000000000000..2d1c1475c624
--- /dev/null
+++ b/media-sound/ncmpc/Manifest
@@ -0,0 +1,3 @@
+DIST ncmpc-0.20.tar.bz2 356991 SHA256 f19b15be4cb94f402bc488463e8159958d1a395b2fea97c02522b848061348e2 SHA512 4072f11d6956313cd63ef22eddedc6eb1919900038af1acf4b9483ac8515d5e112be5180b2a265ca08f2f9c1705d4e2e39282a4bfb543e4015ea923498fe1063 WHIRLPOOL 47f061ea32a91a3493842b51281c8fea1f9c344818bdd86e795e1c242048c0bc37906fca77218857f63980497b316e860a7ad27af0835d7c8a8388e2ef19383a
+DIST ncmpc-0.21.tar.bz2 337229 SHA256 648e846e305c867cb937dcb467393c2f5a30bf460bdf77b63de7af69fba1fd07 SHA512 e6ae3d741e239f48b833b15bd9805fd7bb1d491eb5154a37da2363b9d57ac87fb4744e12bd9bdcd5d3e011190afb8980c20d044a2eaf54e082fc202a192b0ecf WHIRLPOOL 748c3a61eb9bd3817aab42988df484b2862c77673dbdb0fadba7006dc195138085ec48d81284771eeedc98c1362cffe7592ce845528f4d72487c4a142d407bdf
+DIST ncmpc-0.24.tar.xz 298012 SHA256 0e6f76b2b11449cfa479d2830ac681f4e3bff54a95a9134b069dd5a173b4c3e9 SHA512 852bedec9d1e0f13748d00ded8a57b7824a3907fa4aef441cd016c13b3a4229e630957ee965d9f5cf7c1a0c47bfa3bb040058d32c6fcf6b4474acc57f834d929 WHIRLPOOL 56aca88f833e06793113c283272ccfb1170f8cd2c094218863d91a5735a2028ebc9c3e870b416e6a260242b61714fedc3eee2f1e6d4f696e0cfd2402bdb4ab68
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..40ee0066e3d3
--- /dev/null
+++ b/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch
@@ -0,0 +1,48 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,11 +17,8 @@
+ 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 @@
+ esac
+ AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1])
+ 
++dnl ncurses
++
++PKG_CHECK_MODULES([ncurses], [ncurses],[
++	LIBS="$LIBS $ncurses_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],[$ncurses_LIBS])
++	],
++	[AC_MSG_ERROR([No curses support detected.])])
++
++
+ dnl multi-byte character support
+ 
+ AC_ARG_ENABLE([multibyte],
+@@ -207,12 +217,6 @@
+ 
+ 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..33213f752747
--- /dev/null
+++ b/media-sound/ncmpc/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<maintainer>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</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>
+</pkgmetadata>
diff --git a/media-sound/ncmpc/ncmpc-0.20.ebuild b/media-sound/ncmpc/ncmpc-0.20.ebuild
new file mode 100644
index 000000000000..49064d70a11c
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.20.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit multilib
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="http://mpd.wikia.com/wiki/Client:Ncmpc"
+SRC_URI="http://downloads.sourceforge.net/musicpd/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
+IUSE="artist-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.2
+	sys-libs/ncurses
+	lirc? ( app-misc/lirc )
+	nls? ( sys-libs/ncurses[unicode] )"
+DEPEND="${RDEPEND}
+	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 nls multibyte) \
+		$(use_enable nls locale) \
+		$(use_enable nls) \
+		$(use_enable colors) \
+		$(use_enable lirc) \
+		$(use_enable help-screen) \
+		$(use_enable mouse) \
+		$(use_enable artist-screen) \
+		$(use_enable search-screen) \
+		$(use_enable song-screen) \
+		$(use_enable key-screen) \
+		$(use_enable lyrics-screen) \
+		$(use_enable debug) \
+		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
+}
diff --git a/media-sound/ncmpc/ncmpc-0.21.ebuild b/media-sound/ncmpc/ncmpc-0.21.ebuild
new file mode 100644
index 000000000000..4f10c1565c9d
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.21.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit multilib
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="http://mpd.wikia.com/wiki/Client:Ncmpc"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.bz2"
+
+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.2
+	sys-libs/ncurses
+	lirc? ( app-misc/lirc )
+	nls? ( sys-libs/ncurses[unicode] )"
+DEPEND="${RDEPEND}
+	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.24-r1.ebuild b/media-sound/ncmpc/ncmpc-0.24-r1.ebuild
new file mode 100644
index 000000000000..1e6e9f90e66f
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.24-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils multilib
+
+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
+	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_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.24-tinfo.patch
+
+	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..ca8605f51b64
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.24.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit multilib
+
+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
+	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/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
new file mode 100644
index 000000000000..d8b915f3aa88
--- /dev/null
+++ b/media-sound/ncmpcpp/Manifest
@@ -0,0 +1,2 @@
+DIST ncmpcpp-0.6.4.tar.bz2 429705 SHA256 757e2e06b7e17009c24e2b46a69f008e61aa679476f93e00dc602ca087c805f1 SHA512 c60a6c2c89a9297d73360ec8819e8ae66ca53090c5ea5d3daf235e708467ee20006b1fff344c9312ccb0941c8307f3d84bcdc9cbf500955c74b10bd6a823c19f WHIRLPOOL 56bd22148f38289030a558b43008f83e9e0ccd1ff178be183ad935d08b397de51c49f2c7d84ab9504b62b0105516f460ff131d65a99af9e73519783e15c84797
+DIST ncmpcpp-0.6.5.tar.bz2 429699 SHA256 51128f6835c592c8d4367a66b08e06a9419a86c9d5c6e91d0f1dc73af56cd1fd SHA512 b120bd3c0697d51755e04908d29ddd4180ae662d3f02d60e967ccbefca87471eaf0dcf4ebed5d76203b7a0a6dd17a397f318a65087c1b8ec1e3fb4178964e581 WHIRLPOOL c4fa51645de9f1c7a530ee06113bc0fce5954d155112de4921dec2af5da58465b646c193f8359708b51619ec5f0fc9968680ec22549f97352f9309006499c77b
diff --git a/media-sound/ncmpcpp/metadata.xml b/media-sound/ncmpcpp/metadata.xml
new file mode 100644
index 000000000000..9a964f39fa16
--- /dev/null
+++ b/media-sound/ncmpcpp/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<maintainer>
+		<email>jer@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>wired@gentoo.org</email>
+		<name>Alex Alexander</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.6.4.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.4.ebuild
new file mode 100644
index 000000000000..e0caa2bc6ca3
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.6.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="http://ncmpcpp.rybczak.net/"
+SRC_URI="http://ncmpcpp.rybczak.net/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="
+	>=media-libs/libmpdclient-2.1
+	curl? ( net-misc/curl )
+	dev-libs/boost:=[nls,threads]
+	sys-libs/ncurses[unicode?]
+	sys-libs/readline:*
+	taglib? ( media-libs/taglib )
+	visualizer? ( sci-libs/fftw:3.0 )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	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.6.5.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.5.ebuild
new file mode 100644
index 000000000000..fae8b4835a42
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.6.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="http://ncmpcpp.rybczak.net/"
+SRC_URI="http://ncmpcpp.rybczak.net/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="
+	>=media-libs/libmpdclient-2.1
+	curl? ( net-misc/curl )
+	dev-libs/boost:=[nls,threads]
+	sys-libs/ncurses[unicode?]
+	sys-libs/readline:*
+	taglib? ( media-libs/taglib )
+	visualizer? ( sci-libs/fftw:3.0 )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	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-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
new file mode 100644
index 000000000000..d1775b6eddd6
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils 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 curl outputs taglib unicode visualizer"
+
+RDEPEND="
+	>=media-libs/libmpdclient-2.1
+	curl? ( net-misc/curl )
+	dev-libs/boost:=[nls,threads]
+	sys-libs/ncurses[unicode?]
+	sys-libs/readline:*
+	taglib? ( media-libs/taglib )
+	visualizer? ( sci-libs/fftw:3.0 )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	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 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/neroaac/Manifest b/media-sound/neroaac/Manifest
new file mode 100644
index 000000000000..0007cfdacffc
--- /dev/null
+++ b/media-sound/neroaac/Manifest
@@ -0,0 +1 @@
+DIST NeroAACCodec-1.5.1.zip 2050564 SHA256 e0496ad856e2803001a59985368d21b22f4fbdd55589c7f313d6040cefff648b
diff --git a/media-sound/neroaac/metadata.xml b/media-sound/neroaac/metadata.xml
new file mode 100644
index 000000000000..90c8025fc556
--- /dev/null
+++ b/media-sound/neroaac/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..db606b99f596
--- /dev/null
+++ b/media-sound/neroaac/neroaac-1.5.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..215a371a9b5e
--- /dev/null
+++ b/media-sound/neutrino/Manifest
@@ -0,0 +1 @@
+DIST neutrino-0.8.4.tar.gz 497660 SHA256 8a5bb9634ff0fa618a13b6160a0527a86c68cc71dac751c8401190f55bcbdfff SHA512 f36cc682e59565f0d3e64068a20d51396d824db8f65654d3ff0727d7e107f71a0f9590f78b220716caa8e67edb91aa234894f4b656a3dce60aab5cd950cff0c8 WHIRLPOOL dbd14a650e60f9172bd041b8fdb9459e50941749b6fa8fb999c1101119407c25a7aa9667359e74bf93f295ed8c4676192853fd737b9f559aaca5aed143f48a19
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..86c665161c18
--- /dev/null
+++ b/media-sound/neutrino/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</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..aa4f408c7e92
--- /dev/null
+++ b/media-sound/neutrino/neutrino-0.8.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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}
+	virtual/pkgconfig
+	dev-util/intltool"
+
+DOCS="AUTHORS ChangeLog README TODO"
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.8.4-glib-single-include.patch"
+	gnome2_src_prepare
+}
diff --git a/media-sound/normalize/Manifest b/media-sound/normalize/Manifest
new file mode 100644
index 000000000000..3747d22f568e
--- /dev/null
+++ b/media-sound/normalize/Manifest
@@ -0,0 +1,2 @@
+DIST normalize-0.7.7-m4.patch.gz 5078 RMD160 0bcde8a203f5d1d71d2cc5e895d5cc661d27a5a6 SHA1 5095f66c02505de5c38821881259afbe62ada28f SHA256 8ac7d9e980f2534f7f2f7c81a7fc9f5dda90ac60cfe6675785f371a43ef6518a
+DIST normalize-0.7.7.tar.bz2 388777 RMD160 cfb47808816da4196b7d87033921716bf13f212d SHA1 1d84a9e1cd50b24ebb99428452604dd1fb78be9d SHA256 ef9d8558515cc942518981d3db8fa2490fba6d6b5b74e0a3b75336fbc66c6bd8
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/normalize/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..137e9e15aabb
--- /dev/null
+++ b/media-sound/normalize/normalize-0.7.7-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="Audio file volume normalizer"
+HOMEPAGE="http://normalize.nongnu.org/"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.bz2
+	http://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..ab2d7b755892
--- /dev/null
+++ b/media-sound/nted/Manifest
@@ -0,0 +1 @@
+DIST nted-1.10.18.tar.gz 4099835 SHA256 808df3c851dbc4b24efdbf96c4e6ed28152deb301c4373268831f2a243e8f1ac SHA512 adf5b53afc9017f5fc89524c5b26e16acffd142da98296c598fa53259bb88770a7a2a1f527729adcff4819177173c4ffff90096c577d42534ea9721ecd964981 WHIRLPOOL b450a8082fd95aa2e2cc40122197c528b3500e082d09ee6c9860d0b7290aa8d723ee07c019d4d034afd2e33e648bbc0c29672f1c9a98d88a9788377a8a2a7ff0
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-freetype.patch b/media-sound/nted/files/nted-1.10.18-freetype.patch
new file mode 100644
index 000000000000..66acdf2c7ffa
--- /dev/null
+++ b/media-sound/nted/files/nted-1.10.18-freetype.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS caused by freetype headers path change.
+Author: Gilles Filippini <pini@debian.org>
+Bug-Debian: http://bugs.debian.org/733403
+Index: nted/mainwindow.cpp
+===================================================================
+--- nted.orig/mainwindow.cpp	2013-12-30 17:45:21.000000000 +0100
++++ nted/mainwindow.cpp	2013-12-30 17:45:44.000000000 +0100
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
++#include <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..a40624fba8f0
--- /dev/null
+++ b/media-sound/nted/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>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</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..495a5d2254ae
--- /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
+# $Id$
+
+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
+)
+
+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..4de6a4b414c3
--- /dev/null
+++ b/media-sound/ogg2mp3/Manifest
@@ -0,0 +1 @@
+DIST ogg2mp3-0.6.1.tar.bz2 12424 SHA256 4f6ffeed81a36bf1b6715ce0213a57fa3e7e1f40f80f382e663060645400d84e
diff --git a/media-sound/ogg2mp3/metadata.xml b/media-sound/ogg2mp3/metadata.xml
new file mode 100644
index 000000000000..d2247332ee95
--- /dev/null
+++ b/media-sound/ogg2mp3/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <herd>sound</herd>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer>
+    <email>james.ausmus.code@gmail.com</email>
+    <name>James Ausmus</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..57239bce01f0
--- /dev/null
+++ b/media-sound/ogg2mp3/ogg2mp3-0.6.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..f4d7912ec533
--- /dev/null
+++ b/media-sound/oggtst/Manifest
@@ -0,0 +1 @@
+DIST oggtst.tgz 19382 RMD160 ef9b25a49199342ab8ca0150c62f8b95f19d0b4a SHA1 c4845a30c1b8fdbb620311f56d9d74d22bd820f0 SHA256 4d1ff60037ae22a6e941bd68dfee3b1e7de5d0d8dd3981bae28ecd19b25946dc
diff --git a/media-sound/oggtst/metadata.xml b/media-sound/oggtst/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/oggtst/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..7f4620b54762
--- /dev/null
+++ b/media-sound/oggtst/oggtst-0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b03aabd4920b
--- /dev/null
+++ b/media-sound/ogmtools/Manifest
@@ -0,0 +1 @@
+DIST ogmtools-1.5.tar.bz2 214934 SHA256 c8d61d1dbceb981dc7399c1a85e43b509fd3d071fb8d3ca89ea9385e6e40fdea
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..ae573a60407f
--- /dev/null
+++ b/media-sound/ogmtools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</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..3c1d420fee99
--- /dev/null
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b24160840ccf
--- /dev/null
+++ b/media-sound/opus-tools/Manifest
@@ -0,0 +1,3 @@
+DIST opus-tools-0.1.6.tar.gz 306902 SHA256 cc86dbc2a4d76da7e1ed9afee85448c8f798c465a5412233f178783220f3a2c1 SHA512 547828082c4838643eeda513f65316b60b0e44c4a0826ef39cbfa3fe81df71b30651c03ceee7729aeb74258c259014bf95ca5f01aba097a4de8334e58c8e7ce6 WHIRLPOOL 68be6525aee01454631a3123cfa6891206cd5a5f5dfb413c044d112e2d6d5c506d1d45591951fb936a07f4f5bcc7e788bcfe266a8a566de4216a34b98df20e75
+DIST opus-tools-0.1.8.tar.gz 388711 SHA256 e4e188579ea1c4e4d5066460d4a7214a7eafe3539e9a4466fdc98af41ba4a2f6 SHA512 c36181f073e05d1535f149eb638d58fb14386e1caae23a3e1a7008f5530d033f4c7f388b48f3d8b111a9e55b78f5e91b69e8c96b6c9074700a3b15a1796c0ade WHIRLPOOL 0d2c06265bd108edf5ad4daf6c6e2735daff5172f14c6c445b062e04697adbd0bc4f5cba14482702d3a934f12a336893c04ba590f9e41427018f8111daf0fbfd
+DIST opus-tools-0.1.9.tar.gz 385158 SHA256 b1873dd78c7fbc98cf65d6e10cfddb5c2c03b3af93f922139a2104baedb4643a SHA512 e2cdc0c9c24297565f9d457893bcc548696b1a9c9b66e4cd48ddbe4dcf865bc50da5ed1b438b2b9ecdcd8be1d7c211d2be199f707cdbcd8a46a75353b0173a4c WHIRLPOOL c0acf53763c6263ece4b8b796373ba689006282987043ed15c3d747d08cc9fae76e968a643919b4d9d08a00acc9b8ad46e4fefbdd43263d7293ae2fb93e88278
diff --git a/media-sound/opus-tools/metadata.xml b/media-sound/opus-tools/metadata.xml
new file mode 100644
index 000000000000..3bf6bcfeb512
--- /dev/null
+++ b/media-sound/opus-tools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/opus-tools/opus-tools-0.1.6.ebuild b/media-sound/opus-tools/opus-tools-0.1.6.ebuild
new file mode 100644
index 000000000000..362552f6b72c
--- /dev/null
+++ b/media-sound/opus-tools/opus-tools-0.1.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://git.opus-codec.org/${PN}.git"
+fi
+
+inherit autotools ${SCM}
+
+DESCRIPTION="The Opus codec is designed for interactive speech and audio
+transmission over the Internet."
+HOMEPAGE="http://opus-codec.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="http://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
+else # Official release
+	SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libogg-1.3.0
+		 >=media-libs/opus-0.9.10"
+DEPEND="virtual/pkgconfig
+		${DEPEND}"
+
+src_prepare() {
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete
+}
diff --git a/media-sound/opus-tools/opus-tools-0.1.8.ebuild b/media-sound/opus-tools/opus-tools-0.1.8.ebuild
new file mode 100644
index 000000000000..37a43410509a
--- /dev/null
+++ b/media-sound/opus-tools/opus-tools-0.1.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Royalty-free, highly versatile audio codec"
+HOMEPAGE="http://opus-codec.org/"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.opus-codec.org/${PN}.git"
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="http://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
+else # Official release
+	SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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() {
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with flac)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-sound/opus-tools/opus-tools-0.1.9.ebuild b/media-sound/opus-tools/opus-tools-0.1.9.ebuild
new file mode 100644
index 000000000000..e3975b1b99ae
--- /dev/null
+++ b/media-sound/opus-tools/opus-tools-0.1.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Royalty-free, highly versatile audio codec"
+HOMEPAGE="http://opus-codec.org/"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-2
+	EGIT_REPO_URI="git://git.opus-codec.org/${PN}.git"
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="http://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
+else # Official release
+	SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~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() {
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with flac)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/media-sound/orpheus/Manifest b/media-sound/orpheus/Manifest
new file mode 100644
index 000000000000..f5a01f6c433d
--- /dev/null
+++ b/media-sound/orpheus/Manifest
@@ -0,0 +1 @@
+DIST orpheus-1.6.tar.gz 440553 SHA256 18a6a4b0171c8a2a5a09be6e2cd8fc781c145fde1b266e43a9902fef10ee6ff5 SHA512 40f4ac7533449940370f29d4a14281d7f235ce711166e0e979f3e2a5ca37f792dc74b5267ee2a4f51af6c20f346c543d0d9f1fc88f47670971ad32f7c2856abb WHIRLPOOL 4c166cdc42315a6981d730de3ad62b6d36b9953c6d7ee7c02c7ea21fbae885a9ff1286902644e9c7410675ab64f026ed987ff3b56c15ffb270ea65738df6c7fe
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-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..ae573a60407f
--- /dev/null
+++ b/media-sound/orpheus/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</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..89cdd63149aa
--- /dev/null
+++ b/media-sound/orpheus/orpheus-1.6-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/paprefs/Manifest b/media-sound/paprefs/Manifest
new file mode 100644
index 000000000000..728818f3f15a
--- /dev/null
+++ b/media-sound/paprefs/Manifest
@@ -0,0 +1 @@
+DIST paprefs-0.9.10.tar.xz 163444 SHA256 261c5a67543f2d0c019894fb933949f6ee7c5e181808e1e9565f0784961eabb0
diff --git a/media-sound/paprefs/metadata.xml b/media-sound/paprefs/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/paprefs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..ebd06992133c
--- /dev/null
+++ b/media-sound/paprefs/paprefs-0.9.10.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="PulseAudio Preferences, configuration dialog for PulseAudio"
+HOMEPAGE="http://freedesktop.org/software/pulseaudio/paprefs"
+SRC_URI="http://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/gnome-icon-theme )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext
+		dev-util/intltool )
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-lynx \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dohtml -r doc
+	dodoc README
+}
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
new file mode 100644
index 000000000000..c669c188f50c
--- /dev/null
+++ b/media-sound/pasystray/Manifest
@@ -0,0 +1 @@
+DIST pasystray-0.2.1.tar.bz2 100456 SHA256 d24fe23773e0a25fd32aefe101bb703ca42a487c8e25411c831621332cee61a7 SHA512 db7c05c2eb5fd3dada2e3c23f28978497d17a2147078390ab3e8c88654c4bd8ce48d07a15e9a5b3834acffcc2d86fa719ce2403255915bdfb2eb610bd0549041 WHIRLPOOL 71e4519b9bf6012e770820cf1a72bfb875a34eb87e74eab87edc4a18e01d88ecabf56b88e30686ae409d6fe2456a1058a3194ce539e72934410ba402d72cdd22
diff --git a/media-sound/pasystray/metadata.xml b/media-sound/pasystray/metadata.xml
new file mode 100644
index 000000000000..ea0ac98285b4
--- /dev/null
+++ b/media-sound/pasystray/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="github">christophgysin/pasystray</remote-id>
+	</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..9b9cf4e02ded
--- /dev/null
+++ b/media-sound/pasystray/pasystray-0.2.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit gnome2-utils
+
+DESCRIPTION="A system tray for pulseaudio controls (replacement for the deprecated padevchooser)"
+HOMEPAGE="http://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/patchage/Manifest b/media-sound/patchage/Manifest
new file mode 100644
index 000000000000..c2f86bdc80bb
--- /dev/null
+++ b/media-sound/patchage/Manifest
@@ -0,0 +1,2 @@
+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
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..081cbd6f01fe
--- /dev/null
+++ b/media-sound/patchage/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proaudio</herd>
+  <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..cbe96544f6f9
--- /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
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils 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() {
+	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..ed552826f36e
--- /dev/null
+++ b/media-sound/patchage/patchage-1.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..0e6a72565b63
--- /dev/null
+++ b/media-sound/pavucontrol/Manifest
@@ -0,0 +1,2 @@
+DIST pavucontrol-1.0.tar.xz 179596 SHA256 3dbe2865b6e3a195a8951967d9234f62cd254c30b08bdea1ecf8997b58f68cde SHA512 ff17e452426ff11da9a3215232b4742c88dd84ea3d2f55f8e6e6459f0edbe1323ad4ee8a3403db9a22a72eadae60baa6ecabfa502c005fde4c92ae3bf4aac007 WHIRLPOOL 07f32ee76b44f290eb6ffbf0bf4f9419e3bc26efbef2c54fb0a711d492a0de79300d84181c8fae0f8ada5111931464d199e8b4d9deccd64ee721894a44f7cc0a
+DIST pavucontrol-2.0.tar.xz 151560 SHA256 22f29dd81b4a1a34ec7bffe9b027aff2a37fc76ccded4539d43a8c126a39470b SHA512 2b5f83f79cf6d7ce94bd836278274acb09824af389f5a7ad7d3977db743d8f9c5def78d8e9dea901a7e05355cfebb060f513cf01997baf546fd2dd2ada0513b1 WHIRLPOOL f85b60363ea30aee976e4e704bddf607b4e18ea9f9041d63acd0dc36183e103435f37c70e3b55b6327b7b1c7291c898b8167742cbcc7c47ebcd83a10f790d33c
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..3bf6bcfeb512
--- /dev/null
+++ b/media-sound/pavucontrol/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/pavucontrol/pavucontrol-1.0.ebuild b/media-sound/pavucontrol/pavucontrol-1.0.ebuild
new file mode 100644
index 000000000000..519b82f2aa15
--- /dev/null
+++ b/media-sound/pavucontrol/pavucontrol-1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
+HOMEPAGE="http://freedesktop.org/software/pulseaudio/pavucontrol/"
+SRC_URI="http://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-0.9.16[glib]
+	virtual/freedesktop-icon-theme"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+		)"
+
+DOCS="ChangeLog"
+
+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-2.0-r1.ebuild b/media-sound/pavucontrol/pavucontrol-2.0-r1.ebuild
new file mode 100644
index 000000000000..b42518be041b
--- /dev/null
+++ b/media-sound/pavucontrol/pavucontrol-2.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
+HOMEPAGE="http://freedesktop.org/software/pulseaudio/pavucontrol/"
+SRC_URI="http://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/pavumeter/Manifest b/media-sound/pavumeter/Manifest
new file mode 100644
index 000000000000..9d0abf772520
--- /dev/null
+++ b/media-sound/pavumeter/Manifest
@@ -0,0 +1 @@
+DIST pavumeter-0.9.3.tar.gz 89241 RMD160 cb76748b6192dd7641e50fec7d2b8c379df0328f SHA1 fc2f12405fbb15cced43de36c5a519043ea04050 SHA256 fd8d5804c27efb22d63579aba5ab69d70ad115f5eb8c7bd1d63d5024113f067b
diff --git a/media-sound/pavumeter/metadata.xml b/media-sound/pavumeter/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/pavumeter/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..c5968062a9f6
--- /dev/null
+++ b/media-sound/pavumeter/pavumeter-0.9.3-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+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() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-lynx
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dohtml -r doc
+	dodoc README
+}
diff --git a/media-sound/peercast/Manifest b/media-sound/peercast/Manifest
new file mode 100644
index 000000000000..a3f1c72cab2f
--- /dev/null
+++ b/media-sound/peercast/Manifest
@@ -0,0 +1 @@
+DIST peercast-0.1218-src.tgz 557909 RMD160 316c88ea087cc985ab172612eea6455140c1bf96 SHA1 1e6f7ecdad01e0c29f03f6c401e3c9972c8d90b6 SHA256 d480e3bc5a23c2e7612c05503852888126210e7159d07e9c36bf5e3716569036
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 100755
index 000000000000..d0adc83d00bd
--- /dev/null
+++ b/media-sound/peercast/files/peercast.initd
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/peercast/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..95282832db57
--- /dev/null
+++ b/media-sound/peercast/peercast-0.1218-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/phasex/Manifest b/media-sound/phasex/Manifest
new file mode 100644
index 000000000000..b199335d8f6e
--- /dev/null
+++ b/media-sound/phasex/Manifest
@@ -0,0 +1 @@
+DIST phasex-0.12.0beta3.tar.gz 1009615 RMD160 d27c12759132a6c75ca3fc122566ea9f1b604268 SHA1 ec0f4bcc62d379075a4f5eaeda8a79e7e343204d SHA256 0af0b8b4560649b8fa3ebad6cc1627838747919dbe01116cf7f1205da5199d66
diff --git a/media-sound/phasex/metadata.xml b/media-sound/phasex/metadata.xml
new file mode 100644
index 000000000000..0dc3775f83d7
--- /dev/null
+++ b/media-sound/phasex/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+</pkgmetadata>
diff --git a/media-sound/phasex/phasex-0.12.0_beta3.ebuild b/media-sound/phasex/phasex-0.12.0_beta3.ebuild
new file mode 100644
index 000000000000..689b9ad5cede
--- /dev/null
+++ b/media-sound/phasex/phasex-0.12.0_beta3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+DESCRIPTION="Software synthesizer (Phase Harmonic Advanced Synthesis EXperiment)"
+HOMEPAGE="http://sysex.net/phasex/"
+SRC_URI="http://sysex.net/phasex/beta/${P/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	media-sound/jack-audio-connection-kit
+	media-libs/alsa-lib
+	media-libs/libsamplerate
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_beta3}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README TODO doc/ROADMAP
+}
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
new file mode 100644
index 000000000000..d293cf19fe94
--- /dev/null
+++ b/media-sound/pianobar/Manifest
@@ -0,0 +1 @@
+DIST pianobar-2014.09.28.tar.bz2 51810 SHA256 6bd10218ad5d68c4c761e02c729627d2581b4a6db559190e7e52dc5df177e68f SHA512 3a9a508eaa4f1060ab456c4e28cd5447ed0a2e6a15b7694bf711ffa363d86c27483b1956da7f90919c9111c48752a99b9f704e721924903c017355dd577bc905 WHIRLPOOL 35db2f53b194d61c8601f27a787319036e5a59d86734ffd6ee00762fb66b2265c0f5b99aeea7ebffc9ebf5f8aa1430acc136e3486e6fa8cd2b355c439e96b68b
diff --git a/media-sound/pianobar/metadata.xml b/media-sound/pianobar/metadata.xml
new file mode 100644
index 000000000000..157326a7e891
--- /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>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/pianobar/pianobar-2014.09.28.ebuild b/media-sound/pianobar/pianobar-2014.09.28.ebuild
new file mode 100644
index 000000000000..2f81e0e51c0f
--- /dev/null
+++ b/media-sound/pianobar/pianobar-2014.09.28.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git"
+else
+	SRC_URI="http://6xq.net/projects/${PN}/${P}.tar.bz2"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="A console-based replacement for Pandora's flash player"
+HOMEPAGE="http://6xq.net/projects/pianobar/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND="media-libs/libao
+	net-libs/gnutls
+	dev-libs/libgcrypt:0=
+	dev-libs/json-c
+	>=virtual/ffmpeg-9"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -e '/@echo /d' \
+		-e 's/@${CC}/${CC}/' \
+		-i Makefile || die
+}
+
+src_compile() {
+	append-cflags -std=c99
+	tc-export CC
+	emake DYNLINK=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
+	dodoc ChangeLog README
+
+	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..d8bd6bf72694
--- /dev/null
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/PromyLOPh/pianobar.git"
+else
+	SRC_URI="http://6xq.net/projects/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A console-based replacement for Pandora's flash player"
+HOMEPAGE="http://6xq.net/projects/pianobar/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="static-libs"
+
+RDEPEND="media-libs/libao
+	net-libs/gnutls
+	dev-libs/libgcrypt:0=
+	dev-libs/json-c
+	>=virtual/ffmpeg-9"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -e '/@echo /d' \
+		-e 's/@${CC}/${CC}/' \
+		-i Makefile || die
+}
+
+src_compile() {
+	append-cflags -std=c99
+	tc-export CC
+	emake DYNLINK=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
+	dodoc ChangeLog README
+
+	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/pianobooster/Manifest b/media-sound/pianobooster/Manifest
new file mode 100644
index 000000000000..3873bcdd674c
--- /dev/null
+++ b/media-sound/pianobooster/Manifest
@@ -0,0 +1 @@
+DIST pianobooster-src-0.6.4b.tar.gz 166210 SHA256 65505369a597a8a812288ce963b007546a19c9dea26c0923a0ac2324c0559ef7 SHA512 1676b127321d6fca4e3e77b5f1f78cfbf1eb71399859af1058c42821cde546dc385137c719d7375215972e4e9ce059278fd030c445787c2937c1420f7b405c03 WHIRLPOOL 21c65e484239fca817211c3816cc9e1f1d678f8f94021d3eb095ccd91d1a40df8b672aac35c9b4aec97e22b381f2574d3162ec01e410e40cb40ae3cba56c432c
diff --git a/media-sound/pianobooster/files/pianobooster-0.6.4b-cmake.patch b/media-sound/pianobooster/files/pianobooster-0.6.4b-cmake.patch
new file mode 100644
index 000000000000..8cdd8738e2b3
--- /dev/null
+++ b/media-sound/pianobooster/files/pianobooster-0.6.4b-cmake.patch
@@ -0,0 +1,44 @@
+--- pianobooster-src-0.6.4b/src/CMakeLists.txt.orig
++++ pianobooster-src-0.6.4b/src/CMakeLists.txt
+@@ -2,12 +2,6 @@
+ # for the debug build type cmake -DCMAKE_BUILD_TYPE=Debug

+ SET(CMAKE_BUILD_TYPE Release)

+ SET(CMAKE_VERBOSE_MAKEFILE OFF)

+-SET(USE_FLUIDSYNTH OFF)

+-

+-# The inplace directory is mainly for windows builds

+-# SET(FLUIDSYNTH_INPLACE_DIR C:/download/misc/ljb/fluidsynth-1.0.9)

+-SET(FLUIDSYNTH_INPLACE_DIR /home/louis/build/fluidsynth-1.0.9)

+-

+ 

+ # Testing precompiled headers  it does not work -- leave as OFF.

+ SET(USE_PCH OFF)

+@@ -78,18 +72,7 @@
+     ADD_DEFINITIONS(-DPB_USE_FLUIDSYNTH)

+     MESSAGE("Building using fluidsynth")

+     SET( PB_BASE_SRCS MidiDeviceFluidSynth.cpp )

+-

+-    IF(FLUIDSYNTH_INPLACE_DIR)

+-        INCLUDE_DIRECTORIES(${FLUIDSYNTH_INPLACE_DIR}/include/)

+-        IF(WIN32)

+-            LINK_LIBRARIES( ${FLUIDSYNTH_INPLACE_DIR}/src/.libs/libfluidsynth.dll.a)

+-        ENDIF(WIN32)

+-        IF(UNIX)

+-            LINK_LIBRARIES(${FLUIDSYNTH_INPLACE_DIR}/src/.libs/libfluidsynth.so)

+-        ENDIF(UNIX)

+-    ELSEIF(FLUIDSYNTH_INPLACE_DIR)

+-        LINK_LIBRARIES( fluidsynth)

+-    ENDIF(FLUIDSYNTH_INPLACE_DIR)

++	LINK_LIBRARIES(fluidsynth)

+ ENDIF(USE_FLUIDSYNTH)

+ 

+ 

+@@ -214,8 +197,6 @@
+ INSTALL(TARGETS pianobooster RUNTIME DESTINATION bin)

+ #INSTALL( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en  SUBDIR kmidimon )

+ 

+-INSTALL( FILES ../README.txt  DESTINATION share/doc/pianobooster )

+-

+ INSTALL ( FILES images/pianobooster.png DESTINATION share/pixmaps )

+ 

+ 

diff --git a/media-sound/pianobooster/files/pianobooster-0.6.4b-gcc47.patch b/media-sound/pianobooster/files/pianobooster-0.6.4b-gcc47.patch
new file mode 100644
index 000000000000..2b1b28c5a849
--- /dev/null
+++ b/media-sound/pianobooster/files/pianobooster-0.6.4b-gcc47.patch
@@ -0,0 +1,11 @@
+--- pianobooster-src-0.6.4b/src/CMakeLists.txt.orig	2013-04-06 10:48:02.469532914 -0700
++++ pianobooster-src-0.6.4b/src/CMakeLists.txt	2013-04-06 10:48:12.989532445 -0700
+@@ -203,8 +203,6 @@
+         ${PIANOBOOSTER_UI_HDRS} )

+ ENDIF(WIN32)

+ 

+-SET_TARGET_PROPERTIES(pianobooster PROPERTIES LINK_FLAGS "-mwindows")

+-

+ IF (USE_PCH)

+ ADD_PRECOMPILED_HEADER( pianobooster ${CMAKE_CURRENT_SOURCE_DIR}/precompile/precompile.h )

+ ENDIF (USE_PCH)

diff --git a/media-sound/pianobooster/metadata.xml b/media-sound/pianobooster/metadata.xml
new file mode 100644
index 000000000000..3f6f2798fdcb
--- /dev/null
+++ b/media-sound/pianobooster/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<use>
+		<flag name="fluidsynth">Enable Fluidsynth MIDI software synthesis</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">pianobooster</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/pianobooster/pianobooster-0.6.4b.ebuild b/media-sound/pianobooster/pianobooster-0.6.4b.ebuild
new file mode 100644
index 000000000000..54705c9f72be
--- /dev/null
+++ b/media-sound/pianobooster/pianobooster-0.6.4b.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit cmake-utils
+
+MY_P=${PN}-src-${PV}
+DESCRIPTION="A MIDI file player that teaches how to play the piano"
+HOMEPAGE="http://pianobooster.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fluidsynth"
+
+DEPEND="fluidsynth? ( media-sound/fluidsynth )
+	media-libs/alsa-lib
+	virtual/opengl
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4"
+RDEPEND="${DEPEND}"
+
+DOCS="ReleaseNote.txt ../README.txt"
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-gcc47.patch )
+
+S=${WORKDIR}/${MY_P}/src
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_use fluidsynth)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
new file mode 100644
index 000000000000..22485336fe3c
--- /dev/null
+++ b/media-sound/picard/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml
new file mode 100644
index 000000000000..cce6e75146f7
--- /dev/null
+++ b/media-sound/picard/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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..23c4bb7731ae
--- /dev/null
+++ b/media-sound/picard/picard-1.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+inherit eutils distutils-r1 readme.gentoo
+
+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"
+
+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."
+
+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
+	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..7a8a330b8acf
--- /dev/null
+++ b/media-sound/picard/picard-1.3.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+inherit eutils distutils-r1 readme.gentoo
+
+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"
+
+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."
+
+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
+	readme.gentoo_create_doc
+}
diff --git a/media-sound/picoxine/Manifest b/media-sound/picoxine/Manifest
new file mode 100644
index 000000000000..f090c9f41af0
--- /dev/null
+++ b/media-sound/picoxine/Manifest
@@ -0,0 +1 @@
+DIST 39596-picoxine-0.0.7.tar.bz2 13677 RMD160 98e54e5ea1de0345e7343bdbe32bc0e364b93869 SHA1 5ee3a9e770fc6472d11cd4354a3dd3f09364cee8 SHA256 aeee5c6f7343e20755ddd0f3bdbb624656198b79e8fed213ea05bc868b09c21a
diff --git a/media-sound/picoxine/metadata.xml b/media-sound/picoxine/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/picoxine/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..275731eab1b2
--- /dev/null
+++ b/media-sound/picoxine/picoxine-0.0.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..fa4a97b1a108
--- /dev/null
+++ b/media-sound/pitchtune/Manifest
@@ -0,0 +1 @@
+DIST pitchtune-0.0.4.tar.gz 163348 SHA256 f6e81b0aa1cfafc8678527b3ef8e8e4f3b2414f591629b7f51853dc9e27c9299
diff --git a/media-sound/pitchtune/metadata.xml b/media-sound/pitchtune/metadata.xml
new file mode 100644
index 000000000000..ce1975285068
--- /dev/null
+++ b/media-sound/pitchtune/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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..9f918ee89ae9
--- /dev/null
+++ b/media-sound/pitchtune/pitchtune-0.0.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Precise Instrument Tweaking for Crispy Harmony - tuner"
+HOMEPAGE="http://sourceforge.net/projects/pitchtune/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	media-libs/alsa-lib"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	doicon pixmaps/${PN}.xpm
+	make_desktop_entry ${PN} Pitchtune
+	dodoc AUTHORS README REQUIRED TODO
+}
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
new file mode 100644
index 000000000000..ccab0104008d
--- /dev/null
+++ b/media-sound/pithos/Manifest
@@ -0,0 +1,2 @@
+DIST pithos-1.0.1.tar.gz 112230 SHA256 67b83927d5111067aefbf034d23880f96b1a2d300464e8491efa80e97e67f50f SHA512 ab1b671ae4c75534782e64f61eb4bdb63781ac895e1e07f4c6bc64aa56033a0fb301e6f673ea2ddea6e51c1aa69f3fc4e81d7ec4db80cfd7843550424a5cff26 WHIRLPOOL eaa1fe7341f639624847bf574a9b4f35d28a41a9825cdb7cd84ca22464043a5da74ff4dbf914b874077612412449b38d66f80b69e82a7befffdf19d54155c3c9
+DIST pithos-1.1.1.tar.gz 112793 SHA256 4424534bbf7ab3d3d6c51764d689606fd0df214422eb79ccc91a8981f95d7dce SHA512 8813e5218b448cac64d9787388f3bfa8e7a06cc785c3f7ca6bdce5dee2fdb393d9019169256a01f43fd610ebfd8e07d6fcdafeb476c18d88d8de87895c5b9c2f WHIRLPOOL 401cbd1e3cbeaa0457e4e75be3f2fe04e0ca252274e1539fe9de0777e2c77c3e50e4b4e401bbca0ff0371c8aedc08920384b87016f8357b2caadd3f86e90247d
diff --git a/media-sound/pithos/files/pithos-1.0.0-icons.patch b/media-sound/pithos/files/pithos-1.0.0-icons.patch
new file mode 100644
index 000000000000..ea2ceb0e3bba
--- /dev/null
+++ b/media-sound/pithos/files/pithos-1.0.0-icons.patch
@@ -0,0 +1,68 @@
+diff --git a/pithos/data/ui/PithosWindow.ui b/pithos/data/ui/PithosWindow.ui
+index 711892f..722dad0 100644
+--- a/pithos/data/ui/PithosWindow.ui
++++ b/pithos/data/ui/PithosWindow.ui
+@@ -48,7 +48,7 @@
+                           <object class="GtkImage" id="playpause_image">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+-                            <property name="icon_name">media-playback-start-symbolic</property>
++                            <property name="icon_name">media-playback-start</property>
+                             <property name="icon_size">2</property>
+                           </object>
+                         </child>
+@@ -69,7 +69,7 @@
+                           <object class="GtkImage" id="skip_image">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+-                            <property name="icon_name">media-skip-forward-symbolic</property>
++                            <property name="icon_name">media-skip-forward</property>
+                             <property name="icon_size">2</property>
+                           </object>
+                         </child>
+@@ -88,10 +88,10 @@
+                         <property name="relief">none</property>
+                         <property name="focus_on_click">False</property>
+                         <property name="orientation">vertical</property>
+-                        <property name="icons">audio-volume-muted-symbolic
+-audio-volume-high-symbolic
+-audio-volume-low-symbolic
+-audio-volume-medium-symbolic</property>
++                        <property name="icons">audio-volume-muted
++audio-volume-high
++audio-volume-low
++audio-volume-medium</property>
+                         <signal name="value-changed" handler="on_volume_change_event" swapped="no"/>
+                         <child internal-child="plus_button">
+                           <object class="GtkButton" id="volumebutton-plus_button2">
+@@ -160,7 +160,7 @@ audio-volume-medium-symbolic</property>
+                           <object class="GtkImage" id="image14">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+-                            <property name="icon_name">dialog-information-symbolic</property>
++                            <property name="icon_name">dialog-information</property>
+                           </object>
+                         </child>
+                       </object>
+diff --git a/pithos/pithos.py b/pithos/pithos.py
+index e7e0c97..8076b7e 100755
+--- a/pithos/pithos.py
++++ b/pithos/pithos.py
+@@ -489,7 +489,7 @@ class PithosWindow(Gtk.ApplicationWindow):
+             self.playing = True
+         self.player.set_state(Gst.State.PLAYING)
+         GLib.timeout_add_seconds(1, self.update_song_row)
+-        self.playpause_image.set_from_icon_name('media-playback-pause-symbolic', Gtk.IconSize.SMALL_TOOLBAR)
++        self.playpause_image.set_from_icon_name('media-playback-pause', Gtk.IconSize.SMALL_TOOLBAR)
+         self.update_song_row()
+         self.emit('play-state-changed', True)
+ 
+@@ -500,7 +500,7 @@ class PithosWindow(Gtk.ApplicationWindow):
+     def pause(self):
+         self.playing = False
+         self.player.set_state(Gst.State.PAUSED)
+-        self.playpause_image.set_from_icon_name('media-playback-start-symbolic', Gtk.IconSize.SMALL_TOOLBAR)
++        self.playpause_image.set_from_icon_name('media-playback-start', Gtk.IconSize.SMALL_TOOLBAR)
+         self.update_song_row()
+         self.emit('play-state-changed', False)
+ 
diff --git a/media-sound/pithos/metadata.xml b/media-sound/pithos/metadata.xml
new file mode 100644
index 000000000000..d52c7b5f0e42
--- /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>
+		<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.0.1.ebuild b/media-sound/pithos/pithos-1.0.1.ebuild
new file mode 100644
index 000000000000..27f94504a195
--- /dev/null
+++ b/media-sound/pithos/pithos-1.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python3_{3,4})
+inherit eutils distutils-r1
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/pithos/pithos.git
+		https://github.com/pithos/pithos.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="http://pithos.github.io/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify appindicator +keybinder"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pylast[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
+	media-libs/gstreamer:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
+	>=x11-libs/gtk+-3.12:3[introspection]
+	libnotify? ( x11-libs/libnotify[introspection] )
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	keybinder? ( dev-libs/keybinder:3[introspection] )"
+
+PATCHES=("${FILESDIR}/${PN}-1.0.0-icons.patch")
+
+python_test() {
+	esetup.py test || die
+}
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..f187a8e4b16c
--- /dev/null
+++ b/media-sound/pithos/pithos-1.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python3_4)
+inherit eutils distutils-r1
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/pithos/pithos.git
+		https://github.com/pithos/pithos.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="http://pithos.github.io/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify appindicator +keybinder"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	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] )"
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/media-sound/pithos/pithos-9999.ebuild b/media-sound/pithos/pithos-9999.ebuild
new file mode 100644
index 000000000000..120ed367782c
--- /dev/null
+++ b/media-sound/pithos/pithos-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python3_4)
+inherit eutils distutils-r1
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/pithos/pithos.git
+		https://github.com/pithos/pithos.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="http://pithos.github.io/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="libnotify appindicator +keybinder"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	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] )"
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/media-sound/playmidi/Manifest b/media-sound/playmidi/Manifest
new file mode 100644
index 000000000000..bf703f1dcd48
--- /dev/null
+++ b/media-sound/playmidi/Manifest
@@ -0,0 +1 @@
+DIST playmidi-2.5.tar.gz 147687 SHA256 a7ce37c2a2234fc875290e6ecc897ea2d405c63e95eda5244487c6a7053bfbdd
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..5084ba319789
--- /dev/null
+++ b/media-sound/playmidi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..ad574babc76f
--- /dev/null
+++ b/media-sound/playmidi/playmidi-2.5-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Command Line and GUI based MIDI Player"
+HOMEPAGE="http://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..0517e1b6fa74
--- /dev/null
+++ b/media-sound/pms/Manifest
@@ -0,0 +1 @@
+DIST pms-0.42.tar.bz2 196053 SHA256 96bf942b08cba10ee891a63eeccad307fd082ef3bd20be879f189e1959e775a6 SHA512 34fea13f524154455d9a44eb5c885ae3a555adc5e495234c0e720c7351b0e9169226cede08b65eb8236d6b0f35eaeae4968baa374dfd4f53c6cc164cb669ab0a WHIRLPOOL 45a0bb0322541cad6dffb14bb28c1156ce85be7ced57cc7a8dcc12d6b3f298d811f564b522d0110eeceb9fe697bf402541384d611b94fb211bda2181e68b1d1f
diff --git a/media-sound/pms/metadata.xml b/media-sound/pms/metadata.xml
new file mode 100644
index 000000000000..67d53893f383
--- /dev/null
+++ b/media-sound/pms/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>
+	<email>wired@gentoo.org</email>
+	<name>Alex Alexander</name>
+	</maintainer>
+	<use>
+		<flag name='regex'>Enable regular expression searches
+			using <pkg>dev-libs/boost</pkg></flag>
+	</use>
+</pkgmetadata>
+
diff --git a/media-sound/pms/pms-0.42-r1.ebuild b/media-sound/pms/pms-0.42-r1.ebuild
new file mode 100644
index 000000000000..67e01f4b75c1
--- /dev/null
+++ b/media-sound/pms/pms-0.42-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Practical Music Search: an open source ncurses client for mpd, written in C++"
+HOMEPAGE="http://pms.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="regex"
+
+RDEPEND="
+	sys-libs/ncurses
+	dev-libs/glib:2
+	regex? ( dev-libs/boost:= )
+"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+DOCS=( AUTHORS README TODO )
+
+src_prepare() {
+	# bug #424717
+	sed -i -e "s:^CXXFLAGS +=:AM_CXXFLAGS =:g" Makefile.am || die 'sed on Makefile.am failed'
+
+	# Compatibility with automake 1.14
+	sed -i -e '/AM_INIT_AUTOMAKE/s/-Werror/subdir-objects/' configure.ac || die 'sed on configure.ac failed'
+
+	epatch_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable regex)
+}
diff --git a/media-sound/pms/pms-0.42.ebuild b/media-sound/pms/pms-0.42.ebuild
new file mode 100644
index 000000000000..a6d0e145873b
--- /dev/null
+++ b/media-sound/pms/pms-0.42.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit autotools
+
+DESCRIPTION="Practical Music Search: an open source ncurses client for mpd, written in C++"
+HOMEPAGE="http://pms.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="regex"
+
+RDEPEND="
+	sys-libs/ncurses
+	dev-libs/glib:2
+	regex? ( >=dev-libs/boost-1.36 )
+"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+src_prepare() {
+	# bug #424717
+	sed -i "s:^CXXFLAGS +=:AM_CXXFLAGS =:g" Makefile.am || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable regex) ||
+			die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installation failed"
+
+	dodoc AUTHORS README TODO
+}
diff --git a/media-sound/pms/pms-9999.ebuild b/media-sound/pms/pms-9999.ebuild
new file mode 100644
index 000000000000..7ead914d10b8
--- /dev/null
+++ b/media-sound/pms/pms-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit autotools git-2
+
+DESCRIPTION="Practical Music Search: an open source ncurses client for mpd, written in C++"
+HOMEPAGE="http://pms.sourceforge.net/"
+SRC_URI=""
+
+EGIT_REPO_URI="git://pms.git.sourceforge.net/gitroot/pms/pms"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="regex"
+
+RDEPEND="
+	sys-libs/ncurses
+	dev-libs/glib:2
+	regex? ( >=dev-libs/boost-1.36 )
+"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+src_prepare() {
+	# bug #424717
+	sed -i "s:^CXXFLAGS +=:AM_CXXFLAGS =:g" Makefile.am || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable regex) ||
+			die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installation failed"
+
+	dodoc AUTHORS README TODO
+}
diff --git a/media-sound/pnmixer/Manifest b/media-sound/pnmixer/Manifest
new file mode 100644
index 000000000000..5d31624d3143
--- /dev/null
+++ b/media-sound/pnmixer/Manifest
@@ -0,0 +1,2 @@
+DIST pnmixer-0.6_pre20111213.tar.xz 131328 SHA256 aa42180145aa56639440168935a8b16c576e6e49db0bbe2955b79a890437f013 SHA512 967a685593256f9f2e8ab2ef955a91a03c3710d96956087ac55301d5232e6f01897efbb064bd6dc1804836af1b66c038cb3d04203043462de5246e4f14dd37c4 WHIRLPOOL 1fe36a5ea212447212bbd9b6b4efee22e1f75fbb0f2c0548447c0987664d94524e306e2942f6e96c6f10cf6bf15abc35df6b7953d63ef8ec2241eef3d627c16d
+DIST pnmixer-0.6_pre20140924.tar.gz 263467 SHA256 8db9160fe5a41222e84ef19a38264f3633629013971f7fe549733e5644429558 SHA512 4ed5a5fb8cfa5a0f0757a30c78cb4b90fa8d1fa64234f18306941ef4382af66f49ecce2a833c1784e547b840bab36eab7d0c1f85cb89bde81c117472669ba283 WHIRLPOOL 54bd420e5bdfb76b155440f3f44f3e1e207ed116c3ff664429c0f8ced5945c6545daf0be8ffcede91ead1983882a6e1a18e61d8708f6a24719a0065e250a884a
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..22796d6e1d8e
--- /dev/null
+++ b/media-sound/pnmixer/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>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<upstream>
+		<doc lang="en">https://github.com/nicklan/pnmixer/wiki</doc>
+		<bugs-to>https://github.com/nicklan/pnmixer/issues</bugs-to>
+		<remote-id type="github">nicklan/pnmixer</remote-id>
+	</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..d27dc8abcd12
--- /dev/null
+++ b/media-sound/pnmixer/pnmixer-0.6_pre20111213.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils gnome2-utils
+
+DESCRIPTION="Alsa volume mixer for the system tray"
+HOMEPAGE="https://github.com/nicklan/pnmixer"
+SRC_URI="http://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.6_pre20140924.ebuild b/media-sound/pnmixer/pnmixer-0.6_pre20140924.ebuild
new file mode 100644
index 000000000000..eace2db10319
--- /dev/null
+++ b/media-sound/pnmixer/pnmixer-0.6_pre20140924.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils gnome2-utils
+
+DESCRIPTION="Volume mixer for the system tray"
+HOMEPAGE="https://github.com/nicklan/pnmixer"
+SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug libnotify"
+
+RDEPEND="dev-libs/glib:2
+	media-libs/alsa-lib
+	>=x11-libs/gtk+-3.6:3
+	x11-libs/libX11
+	libnotify? ( x11-libs/libnotify )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_with libnotify) \
+		$(use_enable debug) \
+		--enable-minimal-flags \
+		--with-gtk3
+}
+
+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-9999.ebuild b/media-sound/pnmixer/pnmixer-9999.ebuild
new file mode 100644
index 000000000000..d97a17c9c003
--- /dev/null
+++ b/media-sound/pnmixer/pnmixer-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_LIBTOOL=none
+inherit autotools eutils gnome2-utils git-2
+
+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="debug libnotify"
+
+RDEPEND="dev-libs/glib:2
+	media-libs/alsa-lib
+	>=x11-libs/gtk+-3.6:3
+	x11-libs/libX11
+	libnotify? ( x11-libs/libnotify )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with libnotify) \
+		$(use_enable debug) \
+		--enable-minimal-flags \
+		--with-gtk3
+}
+
+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/poc/Manifest b/media-sound/poc/Manifest
new file mode 100644
index 000000000000..d570bcacf14a
--- /dev/null
+++ b/media-sound/poc/Manifest
@@ -0,0 +1 @@
+DIST poc-0.4.1.tar.gz 114875 RMD160 f7981920993742aeed20aa6000dfd53c4b9f8ffc SHA1 b2d210886b04544a33ed863927b8eadcf706e186 SHA256 a8f8be5281b80f9bb1dd0d330ec59e608d557351f6e6ad5b3d14932f7b952d29
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/poc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..83a3b0f219f9
--- /dev/null
+++ b/media-sound/poc/poc-0.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..24dcd4bda6e5
--- /dev/null
+++ b/media-sound/podcatcher/Manifest
@@ -0,0 +1 @@
+DIST podcatcher-3.1.6.tar.gz 22260 SHA256 0672fd11c3aefde8d28f2539bd3f8d1f47a3acb1b0bb8120ed028d4dfbd365db SHA512 5e1ac6771a4d81d2bfbc77c4a89861a976329a77144b630aaa7f6a1663a0dd9021acc71cfd44e6373bdaf4562718bbb3c19ff7cda56be1c7624cf389ff293599 WHIRLPOOL 03f081fd2aa2a81cfdfb6d3b402fd4013dcf4d5a8725a07e1c1e73117b57cb62d6ec24a5d58d8ac2f81a6475795ae375de33e1781f10fd8c9756b3546abfcf42
diff --git a/media-sound/podcatcher/metadata.xml b/media-sound/podcatcher/metadata.xml
new file mode 100644
index 000000000000..147dbcbac593
--- /dev/null
+++ b/media-sound/podcatcher/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <longdescription lang="en">
+</longdescription>
+  <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..4537b1303c55
--- /dev/null
+++ b/media-sound/podcatcher/podcatcher-3.1.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..fa62cb856dc6
--- /dev/null
+++ b/media-sound/podget/Manifest
@@ -0,0 +1,3 @@
+DIST podget-0.6.15.tar.gz 33590 SHA256 b2e5552d0ed6371bea9864b30592c4acabdfb7d8c0409e1adc6daaaa872b52fe SHA512 1442a1d10b506926bec98e642cf8a060e9a2205c692a453c5e0444e36fb7afdf55b975eac27bb230eb0483993f6526b6151e9f153e2eac9d6cbe6967f054e55a WHIRLPOOL 507f28428fe0dc719a74e4aa01e882a7aead9452feeaa5c208c1706b8d0703298362b8f08c802ee5e10d94d4dc9c80db321b305775f4d81e5a75b76045614b8e
+DIST podget-0.6.tar.gz 32988 SHA256 58b3ace69295010b39f11dbf592109dfcc37684e8c08f71ea30c726d5f830d3a
+DIST podget_0.6.9.tar.gz 30329 SHA256 7f676bf73568b18a3a9a3b8d5207a1b8a3a9da6869898c83bb36440983fa79a7 SHA512 f38ea35cda98346d13f50a900d8519d70ad6198e7237717f4e59e0149c92c9d9957c5106c4a2dc6235eb52ec6a6f69d1ea6710165fe5f7286d1882f19225f28b WHIRLPOOL 741e401a1789febb649cd553a512e350a6866e938ddd8588e986fa7ca32bb217df786904be0c80f775804d1c1d84380b4f78c8db8e28a4830d3bdd531978a0cc
diff --git a/media-sound/podget/metadata.xml b/media-sound/podget/metadata.xml
new file mode 100644
index 000000000000..1cae8b0fa16a
--- /dev/null
+++ b/media-sound/podget/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>kitcat490@gmail.com</email>
+		<name>Michael Niehoff</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">podget</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/podget/podget-0.6.15.ebuild b/media-sound/podget/podget-0.6.15.ebuild
new file mode 100644
index 000000000000..d114a6e4ada7
--- /dev/null
+++ b/media-sound/podget/podget-0.6.15.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-${PV}"
+
+DESCRIPTION="A simple podcast aggregator written in bash"
+HOMEPAGE="http://podget.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="sys-apps/grep
+	sys-apps/sed
+	app-text/tofrodos
+	net-misc/wget"
+
+src_compile() {
+		# There is a Makefile that we don't use
+		:
+}
+
+src_install() {
+		dobin ${PN}
+		doman DOC/${PN}.7
+		dodoc -r Changelog README SCRIPTS/
+}
diff --git a/media-sound/podget/podget-0.6.9.ebuild b/media-sound/podget/podget-0.6.9.ebuild
new file mode 100644
index 000000000000..0190e74e8815
--- /dev/null
+++ b/media-sound/podget/podget-0.6.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="A simple podcast aggregator written in bash"
+HOMEPAGE="http://podget.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	# There is a Makefile that we don't use
+	:
+}
+
+src_install() {
+	dobin podget
+	doman DOC/podget.7
+	dodoc -r Changelog README SCRIPTS/
+}
diff --git a/media-sound/podget/podget-0.6.ebuild b/media-sound/podget/podget-0.6.ebuild
new file mode 100644
index 000000000000..7a5161fad2c7
--- /dev/null
+++ b/media-sound/podget/podget-0.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="A simple podcast aggregator written in bash"
+HOMEPAGE="http://podget.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	# There is a Makefile that we don't use
+	:
+}
+
+src_install() {
+	dobin podget
+	doman DOC/podget.7
+	dodoc -r Changelog README SCRIPTS/
+}
diff --git a/media-sound/podracer/Manifest b/media-sound/podracer/Manifest
new file mode 100644
index 000000000000..d6b23aae4a6a
--- /dev/null
+++ b/media-sound/podracer/Manifest
@@ -0,0 +1 @@
+DIST podracer-1.4.tar.bz2 14600 SHA256 93319054315ed5edeaa62b84eee9103036142d5b55b85ae6524297bc1e6412e0 SHA512 f1a6946299b6e32d8a86a153b531c7e6d8ec9cf175719fb8fd2f1d9974ed29469e7b1a2548c4104d7e3e1991cb8138e2970a0b6a4208b7a537dde8c2ca425dd3 WHIRLPOOL 733333300ef3eae9c1f5cf4405e95dd5e3363513bfd9fbd376c9472ff8d5e772d7b2e563a6dfc8812a1b98ea98f8cae48895ac404d4fd196ff457f009ed7488a
diff --git a/media-sound/podracer/metadata.xml b/media-sound/podracer/metadata.xml
new file mode 100644
index 000000000000..591d2d15ea2e
--- /dev/null
+++ b/media-sound/podracer/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">podracer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/podracer/podracer-1.4.ebuild b/media-sound/podracer/podracer-1.4.ebuild
new file mode 100644
index 000000000000..154bdf8613a3
--- /dev/null
+++ b/media-sound/podracer/podracer-1.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# EAPI=4 is not allowed unless somone re-works the sample.subscriptions logic
+# (because it gets compressed with EAPI=4). To test this, start podracer without
+# a subscriptions file
+EAPI=3
+
+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_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.gz
+	insinto /usr/share/doc/${PF}
+	doins 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..97166005dec4
--- /dev/null
+++ b/media-sound/positron/Manifest
@@ -0,0 +1 @@
+DIST positron-1.1.tar.gz 88427 SHA256 c4f6311c58c29725dfca1e2110e1ef3608d07912051e8f16832837299943f0b4
diff --git a/media-sound/positron/metadata.xml b/media-sound/positron/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/positron/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/positron/positron-1.1.ebuild b/media-sound/positron/positron-1.1.ebuild
new file mode 100644
index 000000000000..7f435ff1a444
--- /dev/null
+++ b/media-sound/positron/positron-1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit distutils
+
+DESCRIPTION="Synchronization manager for the Neuros Audio Computer (www.neurosaudio.com) portable music player"
+HOMEPAGE="http://www.xiph.org/positron"
+SRC_URI="http://www.xiph.org/positron/files/source/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="x86 ppc sparc amd64"
+IUSE="vorbis"
+
+DEPEND="vorbis? ( dev-python/pyvorbis )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	distutils_src_prepare
+	# install docs in /usr/share/doc/${PF}, bug #241290
+	sed -i -e "s:share/doc/positron:share/doc/${PF}:" setup.py
+}
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest
new file mode 100644
index 000000000000..2f100a797a9f
--- /dev/null
+++ b/media-sound/potamus/Manifest
@@ -0,0 +1,2 @@
+DIST potamus-0.12.tar.gz 127788 SHA256 5034e09c8646cbb299f895541e155b9d7012597210bc8b0ba213812928525e2d SHA512 ab88031eaa4608b4513aec75d86ab1b16e6e192926d0ca7b0616845ecb9a564f12affba9ed2a3fc903b8b9ac5481a1aabab8904df5546a3ea6a9f6f3eccc1ba0 WHIRLPOOL 4491a23f1e87fee6dab5e279630de4c1f5a85106263b6c11d2410c511ac838bd30e36057bf3a42960514559bbb71714f5839659b49ce04c15ac151e2cc609b7a
+DIST potamus-14.tar.gz 163164 SHA256 ae271a7101dbbd75c95faaa0afcd311cae24311a1c4eb01e73d1ffce43667194 SHA512 d6192e9e9114f4f88619751529718afb94f113613f23432646c1d5fa707a82ad10c70425135a5ca5a076b68a36ededdb01d73bc1dc6a92e2bdb644d624303394 WHIRLPOOL fc70d8043fec093be4781cdee5e615131f9bea3c375c9f22b290d4777b121c911c402298bac6b9253deb791580a98f224abd751d4912c46a1cb939d50a562b23
diff --git a/media-sound/potamus/metadata.xml b/media-sound/potamus/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/potamus/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/potamus/potamus-0.12.ebuild b/media-sound/potamus/potamus-0.12.ebuild
new file mode 100644
index 000000000000..06e4f90bb81f
--- /dev/null
+++ b/media-sound/potamus/potamus-0.12.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit gnome2
+
+DESCRIPTION="a lightweight audio player with a simple interface and an emphasis on high audio quality"
+HOMEPAGE="http://offog.org/code/potamus.html"
+SRC_URI="http://offog.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	>=gnome-base/libglade-2
+	media-libs/libao
+	media-libs/libsamplerate
+	media-libs/libvorbis
+	media-libs/libmad
+	media-libs/audiofile
+	media-libs/libmodplug
+	virtual/ffmpeg
+	media-libs/flac
+	media-sound/jack-audio-connection-kit"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	sed -i -e \
+		's:CODEC_TYPE_AUDIO:AVMEDIA_TYPE_AUDIO:g' \
+		src/input-avcodec.c || die
+}
+
+src_install() {
+	default
+}
diff --git a/media-sound/potamus/potamus-14.ebuild b/media-sound/potamus/potamus-14.ebuild
new file mode 100644
index 000000000000..1115eccdebe2
--- /dev/null
+++ b/media-sound/potamus/potamus-14.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit gnome2
+
+DESCRIPTION="a lightweight audio player with a simple interface and an emphasis on high audio quality"
+HOMEPAGE="http://offog.org/code/potamus.html"
+SRC_URI="http://offog.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="audiofile flac mad modplug vorbis +ao jack"
+
+RDEPEND="x11-libs/gtk+:2
+	>=gnome-base/libglade-2
+	media-libs/libsamplerate
+	virtual/ffmpeg
+	audiofile? ( media-libs/audiofile )
+	flac? ( media-libs/flac )
+	mad? ( media-libs/libmad )
+	modplug? ( media-libs/libmodplug )
+	vorbis? ( media-libs/libvorbis )
+	ao? ( media-libs/libao )
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable audiofile input-audiofile) \
+		$(use_enable flac input-flac) \
+		$(use_enable mad input-mad) \
+		$(use_enable modplug input-modplug) \
+		$(use_enable vorbis input-vorbis) \
+		$(use_enable ao output-ao) \
+		$(use_enable jack output-jack)
+
+}
+
+src_install() {
+	default
+}
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
new file mode 100644
index 000000000000..c750ef29928e
--- /dev/null
+++ b/media-sound/pragha/Manifest
@@ -0,0 +1,3 @@
+DIST pragha-1.1.2.1.tar.bz2 533694 SHA256 0d687f6b4b5adc325ac1114833bd2d206a5c23063ba2b6e8f323831c0f3bc9bb SHA512 bd0fb6bea10c932f76d12b56aeea16b5503ce67ffa1c00e0c1fa50628336d41437584fb9f3568221f84ab58cdb150c37c9c8762a41b1673a71659091f1def5be WHIRLPOOL db0a1a62bd2bea563bf17801bf46040682d17d5ac0c1bcc7a98f082b93dccb2e69e569c95a2af642006267f2b449c6365e19c203a752516f2a180561aa4275e8
+DIST pragha-1.3.0.tar.gz 360328 SHA256 2f268b6e2d9c6678e9370a90a5a54fb52d0d035c9cc22f8bdb2a7e13f5a2ee8f SHA512 126c1bcbfc724c1a61adf5239a0d5f68c88d88ea3f79fbd1269900a7a315d7f3e5cc69a5b52a35c431c44e6d7d9085e130a66cdfe45c98da793d958c4b9d09f8 WHIRLPOOL c0ee8a02ee86c60eb75ffe932be32293ef930ad872eba64a38764254a831f935bcba1e0019b19696b39e90d39ea474e918a7bf48f3981302c8c2b8186a1bf623
+DIST pragha-1.3.1.tar.bz2 621106 SHA256 49287152f59e5d62b57620f94b228517caaca001873c30c7abd426afacfc8a78 SHA512 17d086d84382c8e417e513c8803ea90612ca9d5c665384299362b3197978a8697faef531996b078e4ce12c52b7fad3be377083622c923775c6c738d5ae6acb93 WHIRLPOOL 1d531e588723623b99aa0bde1d2e1d8407e15cce89112847893ecf50f1fce4709ffb3bb1b5d88ce14a616db2809e81991228262fc12227cacf213d0c85a9c0ae
diff --git a/media-sound/pragha/metadata.xml b/media-sound/pragha/metadata.xml
new file mode 100644
index 000000000000..7fa36158ea32
--- /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>
+    <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">matiasdelellis/pragha</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/pragha/pragha-1.1.2.1.ebuild b/media-sound/pragha/pragha-1.1.2.1.ebuild
new file mode 100644
index 000000000000..3c855ed900ec
--- /dev/null
+++ b/media-sound/pragha/pragha-1.1.2.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic xfconf
+
+DESCRIPTION="A lightweight music player (with support for the Xfce desktop environment)"
+HOMEPAGE="http://pragha.wikispaces.com/ http://github.com/matiasdelellis/pragha"
+SRC_URI="http://dissonance.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug +glyr lastfm +playlist"
+
+COMMON_DEPEND="dev-db/sqlite:3
+	>=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.28
+	>=dev-libs/keybinder-0.2.2:0
+	dev-libs/libcdio-paranoia
+	media-libs/gst-plugins-base:0.10
+	>=media-libs/libcddb-1.3.2
+	>=media-libs/taglib-1.7.1
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/libX11
+	>=x11-libs/libnotify-0.7
+	>=xfce-base/libxfce4ui-4.10
+	playlist? ( >=dev-libs/totem-pl-parser-2.26 )
+	glyr? ( >=media-libs/glyr-1.0.1 )
+	lastfm? ( >=media-libs/libclastfm-0.5 )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:0.10"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable debug)
+		$(use_enable lastfm libclastfm)
+		$(use_enable glyr libglyr)
+		$(use_enable playlist totem-plparser)
+		)
+}
+
+src_prepare() {
+	sed -i -e '/CFLAGS/s:-g -ggdb -O0::' configure || die
+	xfconf_src_prepare
+}
+
+src_configure() {
+	# src/cdda.h should #include config.h to get this defined:
+	# http://github.com/matiasdelellis/pragha/issues/46
+	append-cppflags -DHAVE_PARANOIA_NEW_INCLUDES
+	xfconf_src_configure
+}
diff --git a/media-sound/pragha/pragha-1.3.0.ebuild b/media-sound/pragha/pragha-1.3.0.ebuild
new file mode 100644
index 000000000000..64bf1654e801
--- /dev/null
+++ b/media-sound/pragha/pragha-1.3.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools xfconf
+
+DESCRIPTION="A lightweight music player (with support for the Xfce desktop environment)"
+HOMEPAGE="http://pragha.wikispaces.com/ http://github.com/matiasdelellis/pragha"
+SRC_URI="http://github.com/matiasdelellis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +glyr +keybinder lastfm libnotify mtp +peas +playlist +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
+	x11-libs/libX11
+	>=xfce-base/libxfce4ui-4.11[gtk3(+)]
+	glyr? ( >=media-libs/glyr-1.0.1 )
+	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 )
+	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 )
+	libnotify? ( peas )
+	mtp? ( udev )
+	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)
+			)
+	else
+		XFCONF+=(
+			--disable-libnotify
+			--disable-keybinder
+			--disable-gudev-1.0
+			--disable-libmtp
+			)
+	fi
+}
+
+src_prepare() {
+	sed -i -e '/CFLAGS/s:-g -ggdb -O0::' configure.ac || 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.1-r1.ebuild b/media-sound/pragha/pragha-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..50c6926a8015
--- /dev/null
+++ b/media-sound/pragha/pragha-1.3.1-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf # autotools
+
+DESCRIPTION="A lightweight music player (with support for the Xfce desktop environment)"
+HOMEPAGE="http://pragha.wikispaces.com/ http://github.com/matiasdelellis/pragha"
+SRC_URI="http://github.com/matiasdelellis/${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/projectm-jack/Manifest b/media-sound/projectm-jack/Manifest
new file mode 100644
index 000000000000..5883659ace8a
--- /dev/null
+++ b/media-sound/projectm-jack/Manifest
@@ -0,0 +1,2 @@
+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
diff --git a/media-sound/projectm-jack/metadata.xml b/media-sound/projectm-jack/metadata.xml
new file mode 100644
index 000000000000..2ace5da19108
--- /dev/null
+++ b/media-sound/projectm-jack/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..3d393280f892
--- /dev/null
+++ b/media-sound/projectm-jack/projectm-jack-2.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+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..b0ca6d28ecac
--- /dev/null
+++ b/media-sound/projectm-jack/projectm-jack-2.1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..9849531abae9
--- /dev/null
+++ b/media-sound/projectm-pulseaudio/Manifest
@@ -0,0 +1 @@
+DIST projectM-complete-2.1.0-Source.tar.gz 31130351 SHA256 513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f WHIRLPOOL f60ee006dac8465a17e1397a9331bdabd7a3967455f9e16644e1ff5e544ab1662b3aa8a2b428c0258f0b38c91513bfbda3cd29b4419e05e64aa410e61ad03972
diff --git a/media-sound/projectm-pulseaudio/metadata.xml b/media-sound/projectm-pulseaudio/metadata.xml
new file mode 100644
index 000000000000..2ace5da19108
--- /dev/null
+++ b/media-sound/projectm-pulseaudio/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..17c367415e58
--- /dev/null
+++ b/media-sound/projectm-pulseaudio/projectm-pulseaudio-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..583b167ced1c
--- /dev/null
+++ b/media-sound/protux/Manifest
@@ -0,0 +1 @@
+DIST protux-0.50.100.tar.gz 392027 RMD160 e8806ce35a72e6b93e3df15e6fcd65a254e9950a SHA1 067bbc12ceaa9aef97cd45a4174e5536a31d0e09 SHA256 cb8edab6684ea58c13e5cfcec0b6925f32e35cfca4129ca5ab668234541f78e2
diff --git a/media-sound/protux/metadata.xml b/media-sound/protux/metadata.xml
new file mode 100644
index 000000000000..5fcf89fb6d18
--- /dev/null
+++ b/media-sound/protux/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proaudio</herd>
+  <herd>java</herd>
+</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..5534c62283a7
--- /dev/null
+++ b/media-sound/protux/protux-0.50.100.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~ppc 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..0eeff4c701c5
--- /dev/null
+++ b/media-sound/ptabtools/Manifest
@@ -0,0 +1,2 @@
+DIST ptabtools-0.4.3.tar.gz 112640 RMD160 bb470264c826128c4e133058903eb15b1c43a880 SHA1 450313bca8ad15a676e5be6f09fa352a2950c071 SHA256 bc40d0c541446969f99a746c105f02e527260d00a3dfa00226b03448bfd21187
+DIST ptabtools-0.5.0.tar.gz 116083 RMD160 22f0dd72611b79f3ca5df18816e52f23536b99dd SHA1 ba46ae31319aa59863f2111e85d8ab4bfc5778a5 SHA256 2204d5969eaf17c538d839ee5cabdf68f4c458d0ef1e314689e3f6523633db98
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/ptabtools/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/ptabtools/ptabtools-0.4.3.ebuild b/media-sound/ptabtools/ptabtools-0.4.3.ebuild
new file mode 100644
index 000000000000..8eb9a41f01eb
--- /dev/null
+++ b/media-sound/ptabtools/ptabtools-0.4.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit multilib
+
+DESCRIPTION="Utilities for PowerTab Guitar files (.ptb)"
+HOMEPAGE="http://jelmer.vernstok.nl/oss/ptabtools"
+SRC_URI="http://jelmer.vernstok.nl/releases/${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_install() {
+	emake DESTDIR="${D}" libdir="/usr/$(get_libdir)" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog README ROADMAP TODO
+}
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..9b79b32820c5
--- /dev/null
+++ b/media-sound/ptabtools/ptabtools-0.5.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b8351e413398
--- /dev/null
+++ b/media-sound/puddletag/Manifest
@@ -0,0 +1 @@
+DIST puddletag-1.0.5.tar.gz 958207 SHA256 4698d5effe8f265446b356068bad7ced0b29c1f66824dc94a5688f3fffc389e2 SHA512 73a3535cf6f4c527c25cbe0e9d81be42ac0078df63542278b6636e7f448f5bff2eba6badf0ef0ff03a8d00727eb4a3277f395cbba09f0261fd9f13e902e78441 WHIRLPOOL 152dca34004277abcf36b40fb65b297a56e123a2566547d6021ee980b9c22545e668db92c7ff5a99914e59044105cd95ff8c184dc0a6e3e29e94200e30d5ace3
diff --git a/media-sound/puddletag/files/puddletag-1.0.5-pyqt4.11.4.patch b/media-sound/puddletag/files/puddletag-1.0.5-pyqt4.11.4.patch
new file mode 100644
index 000000000000..b1ad489a0e82
--- /dev/null
+++ b/media-sound/puddletag/files/puddletag-1.0.5-pyqt4.11.4.patch
@@ -0,0 +1,22 @@
+From 489acd2ee62eb5fbff95f8220dc8958c14871931 Mon Sep 17 00:00:00 2001
+From: keithgg <concentricpuddle@gmail.com>
+Date: Tue, 16 Jun 2015 20:47:19 +0200
+Subject: [PATCH] Fixes #261
+
+---
+ source/puddlestuff/puddleobjects.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source/puddlestuff/puddleobjects.py b/source/puddlestuff/puddleobjects.py
+index ffc6bf7..436b7b8 100644
+--- a/source/puddlestuff/puddleobjects.py
++++ b/source/puddlestuff/puddleobjects.py
+@@ -1418,7 +1418,7 @@ def __init__(self, *args, **kwargs):
+         super(ArtworkLabel, self).__init__(*args, **kwargs)
+ 
+         pal = self.palette()
+-        pal.setBrush(self.backgroundRole(), QBrush(QPalette.Window))
++        pal.setBrush(self.backgroundRole(), QBrush(pal.window()))
+         self.setAutoFillBackground(True)
+         self.setPalette(pal)
+ 
diff --git a/media-sound/puddletag/metadata.xml b/media-sound/puddletag/metadata.xml
new file mode 100644
index 000000000000..34aa5eb03555
--- /dev/null
+++ b/media-sound/puddletag/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>
+		<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>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/puddletag/puddletag-1.0.5.ebuild b/media-sound/puddletag/puddletag-1.0.5.ebuild
new file mode 100644
index 000000000000..f165a6c5ee0c
--- /dev/null
+++ b/media-sound/puddletag/puddletag-1.0.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 fdo-mime
+
+DESCRIPTION="Audio tag editor"
+HOMEPAGE="http://puddletag.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${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? ( virtual/python-imaging[${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 README THANKS TODO)
+
+PATCHES=("${FILESDIR}/${P}-pyqt4.11.4.patch")
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
new file mode 100644
index 000000000000..3dfc27a818f0
--- /dev/null
+++ b/media-sound/pulseaudio/Manifest
@@ -0,0 +1,2 @@
+DIST pulseaudio-5.0.tar.xz 1455428 SHA256 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939 SHA512 f3d64bd6e03a732fd812da466b6658004600b4f3d0b9760403b7e113b6d654d54387658bf3704f45f28ab700245433e23fe517e4579130886fc58647eb97be2b WHIRLPOOL c85829c78ded3bbef234e455bfd3778f2daf50de9d7627508dbf131d0c398e35ab3ae41a4b5136f0c0da09249bc9a600ad85d848ba4e1faba74875af0a787036
+DIST pulseaudio-6.0.tar.xz 1469248 SHA256 b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6 SHA512 4f2293b41c8278047a41be4609a6bc267766874001092a91e785b05d5224fd82810862402942dadbb54bed7f74689779c958ca512666dfe6755d29551583cc2d WHIRLPOOL d75724f2ada640dabd256dc9e9840def17e78f63116c31df711d266349e9f4b99efbc797a5108649c860a5bf8ec8199383eaede440d8b4b655ef09f4ce37984f
diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-crash-udp.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-crash-udp.patch
new file mode 100644
index 000000000000..d14da07459ff
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-5.0-crash-udp.patch
@@ -0,0 +1,53 @@
+From 26b9d22dd24c17eb118d0205bf7b02b75d435e3c Mon Sep 17 00:00:00 2001
+From: Alexander E. Patrakov <patrakov@gmail.com>
+Date: Thu, 05 Jun 2014 16:29:25 +0000
+Subject: rtp-recv: fix crash on empty UDP packets (CVE-2014-3970)
+
+On FIONREAD returning 0 bytes, we cannot return success, as the caller
+(rtpoll_work_cb in module-rtp-recv.c) would then try to
+pa_memblock_unref(chunk.memblock) and, because memblock is NULL, trigger
+an assertion.
+
+Also we have to read out the possible empty packet from the socket, so
+that the kernel doesn't tell us again and again about it.
+
+Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com>
+---
+diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c
+index 570737e..7b75e0e 100644
+--- a/src/modules/rtp/rtp.c
++++ b/src/modules/rtp/rtp.c
+@@ -182,8 +182,29 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct
+         goto fail;
+     }
+ 
+-    if (size <= 0)
+-        return 0;
++    if (size <= 0) {
++        /* size can be 0 due to any of the following reasons:
++         *
++         * 1. Somebody sent us a perfectly valid zero-length UDP packet.
++         * 2. Somebody sent us a UDP packet with a bad CRC.
++         *
++         * It is unknown whether size can actually be less than zero.
++         *
++         * In the first case, the packet has to be read out, otherwise the
++         * kernel will tell us again and again about it, thus preventing
++         * reception of any further packets. So let's just read it out
++         * now and discard it later, when comparing the number of bytes
++         * received (0) with the number of bytes wanted (1, see below).
++         *
++         * In the second case, recvmsg() will fail, thus allowing us to
++         * return the error.
++         *
++         * Just to avoid passing zero-sized memchunks and NULL pointers to
++         * recvmsg(), let's force allocation of at least one byte by setting
++         * size to 1.
++         */
++        size = 1;
++    }
+ 
+     if (c->memchunk.length < (unsigned) size) {
+         size_t l;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-module-switch.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-module-switch.patch
new file mode 100644
index 000000000000..e8ff6e051ae4
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-5.0-module-switch.patch
@@ -0,0 +1,35 @@
+From ef4a41e8b0ef81a53769d853dbc7679b25252327 Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson@canonical.com>
+Date: Fri, 28 Mar 2014 11:59:09 +0100
+Subject: [PATCH 36/38] module-switch-on-port-available: Don't switch profiles
+ on uninitialized cards
+
+This could cause the HDMI port to become the default on some systems
+where analog output was available.
+
+BugLink: https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/1256511
+BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=73375
+Signed-off-by: David Henningsson <david.henningsson@canonical.com>
+---
+ src/modules/module-switch-on-port-available.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/modules/module-switch-on-port-available.c b/src/modules/module-switch-on-port-available.c
+index 2c7ad17..c560306 100644
+--- a/src/modules/module-switch-on-port-available.c
++++ b/src/modules/module-switch-on-port-available.c
+@@ -173,6 +173,11 @@ static pa_hook_result_t port_available_hook_callback(pa_core *c, pa_device_port
+         return PA_HOOK_OK;
+     }
+ 
++    if (pa_idxset_size(card->sinks) == 0 && pa_idxset_size(card->sources) == 0)
++        /* This card is not initialized yet. We'll handle it in
++           sink_new / source_new callbacks later. */
++        return PA_HOOK_OK;
++
+     find_sink_and_source(card, port, &sink, &source);
+ 
+     is_active_profile = card->active_profile == pa_hashmap_get(port->profiles, card->active_profile->name);
+-- 
+1.9.0
+
diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-1.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-1.patch
new file mode 100644
index 000000000000..d90399be3653
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-1.patch
@@ -0,0 +1,26 @@
+From d03ffdccdb7286021e53876ba5d4adf9a1edd0d0 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
+Date: Sat, 15 Mar 2014 09:37:05 +0200
+Subject: zeroconf-publish: Add locking around pa_mainloop_api_once()
+
+Commit e1e154c7377779377fa1a36655a10effd693f7b5 added locking around
+pa_mainloop_api_once() everywhere except pa__done(). This fixes that
+omission.
+
+diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
+index 0110e1d..35277c2 100644
+--- a/src/modules/module-zeroconf-publish.c
++++ b/src/modules/module-zeroconf-publish.c
+@@ -807,7 +807,9 @@ void pa__done(pa_module*m) {
+     if (!(u = m->userdata))
+         return;
+ 
++    pa_threaded_mainloop_lock(u->mainloop);
+     pa_mainloop_api_once(u->api, client_free, u);
++    pa_threaded_mainloop_unlock(u->mainloop);
+     pa_asyncmsgq_wait_for(u->thread_mq.outq, AVAHI_MESSAGE_SHUTDOWN_COMPLETE);
+ 
+     pa_threaded_mainloop_stop(u->mainloop);
+-- 
+cgit v0.10.2
+
diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-2.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-2.patch
new file mode 100644
index 000000000000..7d4de455941f
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-2.patch
@@ -0,0 +1,73 @@
+From 37e73e10be9e42544a4cc160ff85ccada2cc9aa9 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
+Date: Sat, 15 Mar 2014 09:37:06 +0200
+Subject: zeroconf-publish: Don't react to messages while shutting down
+
+This fixes a case where pa__done() is called while
+AVAHI_MESSAGE_PUBLISH_ALL is waiting for processing. The
+pa_asyncmsgq_wait_for(AVAHI_MESSAGE_SHUTDOWN_COMPLETE) call will
+process all pending messages, and processing AVAHI_MESSAGE_PUBLISH_ALL
+causes publish_all_services(), and that in turn accesses u->services,
+which has been already freed at this point. If we are shutting down,
+we shouldn't react to any of the messages that the Avahi thread is
+sending to the main thread.
+
+BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=76184
+
+diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
+index 35277c2..db92850 100644
+--- a/src/modules/module-zeroconf-publish.c
++++ b/src/modules/module-zeroconf-publish.c
+@@ -141,6 +141,8 @@ struct userdata {
+     pa_hook_slot *sink_new_slot, *source_new_slot, *sink_unlink_slot, *source_unlink_slot, *sink_changed_slot, *source_changed_slot;
+ 
+     pa_native_protocol *native;
++
++    bool shutting_down;
+ };
+ 
+ /* Runs in PA mainloop context */
+@@ -638,6 +640,11 @@ static void unpublish_all_services(struct userdata *u, bool rem) {
+ static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
+     struct userdata *u = (struct userdata *) data;
+ 
++    pa_assert(u);
++
++    if (u->shutting_down)
++        return 0;
++
+     switch (code) {
+         case AVAHI_MESSAGE_PUBLISH_ALL:
+             publish_all_services(u);
+@@ -647,10 +654,6 @@ static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offs
+             pa_module_unload(u->core, u->module, true);
+             break;
+ 
+-        case AVAHI_MESSAGE_SHUTDOWN_COMPLETE:
+-            /* pa__done() is waiting for this */
+-            break;
+-
+         default:
+             pa_assert_not_reached();
+     }
+@@ -797,7 +800,7 @@ static void client_free(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) {
+     if (u->avahi_poll)
+         pa_avahi_poll_free(u->avahi_poll);
+ 
+-    pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, NULL, 0, NULL, NULL);
++    pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, u, 0, NULL, NULL);
+ }
+ 
+ void pa__done(pa_module*m) {
+@@ -807,6 +810,8 @@ void pa__done(pa_module*m) {
+     if (!(u = m->userdata))
+         return;
+ 
++    u->shutting_down = true;
++
+     pa_threaded_mainloop_lock(u->mainloop);
+     pa_mainloop_api_once(u->api, client_free, u);
+     pa_threaded_mainloop_unlock(u->mainloop);
+-- 
+cgit v0.10.2
+
diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch
new file mode 100644
index 000000000000..6bdd46415cd2
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch
@@ -0,0 +1,77 @@
+From b75a20db10c8605d98324a7782a7da6483ae9f14 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
+Date: Wed, 19 Mar 2014 09:50:39 +0200
+Subject: zeroconf-publish: Don't assume any particular defer event ordering
+
+Also, initialize userdata with zeros to avoid invalid pointers in
+client_free().
+
+This fixes a crash when client_free() is called before
+create_client(). The whole issue could be avoided by using some other
+mechanism than defer events for running the two functions, but I'll
+do that change later (I have also other cleanups planned for
+zeroconf-publish).
+
+BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=76184
+
+diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
+index db92850..be8806e 100644
+--- a/src/modules/module-zeroconf-publish.c
++++ b/src/modules/module-zeroconf-publish.c
+@@ -142,7 +142,8 @@ struct userdata {
+ 
+     pa_native_protocol *native;
+ 
+-    bool shutting_down;
++    bool shutting_down; /* Used in the main thread. */
++    bool client_freed; /* Used in the Avahi thread. */
+ };
+ 
+ /* Runs in PA mainloop context */
+@@ -707,6 +708,16 @@ static void create_client(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) {
+     struct userdata *u = (struct userdata *) userdata;
+     int error;
+ 
++    /* create_client() and client_free() are called via defer events. If the
++     * two defer events are created very quickly one after another, we can't
++     * assume that the defer event that runs create_client() will be dispatched
++     * before the defer event that runs client_free() (at the time of writing,
++     * pa_mainloop actually always dispatches queued defer events in reverse
++     * creation order). For that reason we must be prepared for the case where
++     * client_free() has already been called. */
++    if (u->client_freed)
++        return;
++
+     pa_thread_mq_install(&u->thread_mq);
+ 
+     if (!(u->client = avahi_client_new(u->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, u, &error))) {
+@@ -733,7 +744,7 @@ int pa__init(pa_module*m) {
+         goto fail;
+     }
+ 
+-    m->userdata = u = pa_xnew(struct userdata, 1);
++    m->userdata = u = pa_xnew0(struct userdata, 1);
+     u->core = m->core;
+     u->module = m;
+     u->native = pa_native_protocol_get(u->core);
+@@ -757,8 +768,6 @@ int pa__init(pa_module*m) {
+     u->source_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PROPLIST_CHANGED], PA_HOOK_LATE, (pa_hook_cb_t) device_new_or_changed_cb, u);
+     u->source_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) device_unlink_cb, u);
+ 
+-    u->main_entry_group = NULL;
+-
+     un = pa_get_user_name_malloc();
+     hn = pa_get_host_name_malloc();
+     u->service_name = pa_truncate_utf8(pa_sprintf_malloc("%s@%s", un, hn), AVAHI_LABEL_MAX-1);
+@@ -801,6 +810,8 @@ static void client_free(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) {
+         pa_avahi_poll_free(u->avahi_poll);
+ 
+     pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, u, 0, NULL, NULL);
++
++    u->client_freed = true;
+ }
+ 
+ void pa__done(pa_module*m) {
+-- 
+cgit v0.10.2
+
diff --git a/media-sound/pulseaudio/files/pulseaudio.conf.d b/media-sound/pulseaudio/files/pulseaudio.conf.d
new file mode 100644
index 000000000000..348540b3fcf5
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio.conf.d
@@ -0,0 +1,7 @@
+# Config file for /etc/init.d/pulseaudio
+# $Id$
+
+# 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..a6841020774d
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio.init.d-5
@@ -0,0 +1,81 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/files/svolume-fix_param_loading_undefined_beh.patch b/media-sound/pulseaudio/files/svolume-fix_param_loading_undefined_beh.patch
new file mode 100644
index 000000000000..4e22f5e95d1c
--- /dev/null
+++ b/media-sound/pulseaudio/files/svolume-fix_param_loading_undefined_beh.patch
@@ -0,0 +1,37 @@
+From: Wim Taymans
+Date: Wed,  7 Jan 2015 11:20:01 +0100
+Subject: [PATCH] svolume.orc: avoid parameter loading undefined behaviour
+
+In some cases, depending on the instruction that performs the load, orc
+ignores the size of the parameter when loading it for the first time.
+Explicitly load the parameter into a temp to make sure it is loaded
+correctly, like we do for the 2ch case.
+
+See https://bugzilla.gnome.org/show_bug.cgi?id=742271
+---
+ src/pulsecore/svolume.orc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/pulsecore/svolume.orc b/src/pulsecore/svolume.orc
+index 0edbefb..f869893 100644
+--- a/src/pulsecore/svolume.orc
++++ b/src/pulsecore/svolume.orc
+@@ -45,13 +45,15 @@
+ 
+ .function pa_volume_s16ne_orc_1ch
+ .dest 2 samples int16_t
+-.param 4 v int32_t
++.param 4 vols int32_t
++.temp 4 v
+ .temp 2 vh
+ .temp 4 s
+ .temp 4 mh
+ .temp 4 ml
+ .temp 4 signc
+ 
++loadpl v, vols
+ convuwl s, samples
+ x2 cmpgtsw signc, 0, s
+ x2 andw signc, signc, v
+-- 
+1.9.3
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
new file mode 100644
index 000000000000..2bc52644812e
--- /dev/null
+++ b/media-sound/pulseaudio/metadata.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <herd>sound</herd>
+  <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
+	  http://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="xen">
+      Builds a special paravirtualized module for running in a Xen guest.
+    </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-5.0-r4.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild
new file mode 100644
index 000000000000..60af38bda9b6
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit autotools bash-completion-r1 eutils flag-o-matic linux-info readme.gentoo systemd user versionator udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="http://www.pulseaudio.org/"
+SRC_URI="http://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.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+
+IUSE="+alsa +asyncns avahi bluetooth +caps dbus doc equalizer +gdbm +glib gnome
+gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd
+system-wide tcpd test +udev +webrtc-aec +X xen"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="bluetooth? ( dbus )
+	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[${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[${MULTILIB_USEDEP}] )
+	avahi? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
+	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:=
+		>=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 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	ssl? ( dev-libs/openssl:0 )
+	>=media-libs/speex-1.2_rc1
+	gdbm? ( sys-libs/gdbm )
+	webrtc-aec? ( media-libs/webrtc-audio-processing )
+	xen? ( app-emulation/xen-tools )
+	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+	dev-libs/json-c[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+	|| (
+		dev-libs/libltdl:0
+		( >=sys-devel/libtool-2.4.2 <sys-devel/libtool-2.4.3-r2 )
+	)
+"
+# 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 )
+	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? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] )"
+
+# 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:= )
+	)
+"
+
+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
+
+	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() {
+	# Skip test that cannot work with sandbox, bug #501846
+	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+	# Fix CVE-2014-3970, bug #512516
+	epatch "${FILESDIR}/${P}-crash-udp.patch"
+
+	# module-switch-on-port-available: Don't switch profiles on uninitialized cards (from 'master')
+	epatch "${FILESDIR}/${P}-module-switch.patch"
+
+	epatch_user
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if use gdbm; then
+		myconf+=( --with-database=gdbm )
+	#elif use tdb; then
+	#	myconf+=( --with-database=tdb )
+	else
+		myconf+=( --with-database=simple )
+	fi
+
+	if use bluetooth; then
+		if has_version '<net-wireless/bluez-5'; then
+			myconf+=( --disable-bluez5 --enable-bluez4 )
+		else
+			 myconf+=( --enable-bluez5 --disable-bluez4 )
+		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 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_enable systemd)
+		$(use_enable systemd systemd-journal)
+		$(use_enable ipv6)
+		$(use_enable ssl openssl)
+		$(use_enable webrtc-aec)
+		$(use_enable xen)
+		$(use_with caps)
+		$(use_with equalizer fftw)
+		--disable-adrian-aec
+		--disable-esound
+		--localstatedir="${EPREFIX}"/var
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+	)
+
+	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-systemd
+			--disable-openssl
+			--disable-orc
+			--disable-webrtc-aec
+			--disable-xen
+			--without-fftw
+
+			# 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
+	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake -C src ${targets[@]}
+	fi
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use doc; then
+		pushd doxygen
+		doxygen doxygen.conf
+		popd
+	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
+	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 \
+			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 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 avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+	dodoc NEWS README todo
+
+	if use doc; then
+		pushd doxygen/html
+		dohtml *
+		popd
+	fi
+
+	# 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 "    http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    http://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
+}
diff --git a/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild
new file mode 100644
index 000000000000..731060b641f1
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="http://www.pulseaudio.org/"
+SRC_URI="http://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.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~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 lirc neon +orc oss qt4 realtime ssl systemd
+system-wide tcpd test +udev +webrtc-aec +X xen zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="bluetooth? ( dbus )
+	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[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
+	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:=
+		>=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 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	ssl? ( dev-libs/openssl:0 )
+	>=media-libs/speex-1.2_rc1
+	gdbm? ( sys-libs/gdbm )
+	webrtc-aec? ( media-libs/webrtc-audio-processing )
+	xen? ( app-emulation/xen-tools )
+	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+	dev-libs/json-c[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+	dev-libs/libltdl:0
+"
+# 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 )
+	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:= )
+	)
+"
+
+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() {
+	gnome2_environment_reset
+	linux-info_pkg_setup
+
+	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() {
+	# Skip test that cannot work with sandbox, bug #501846
+	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+	# Fix CVE-2014-3970, bug #512516 (from 'master')
+	epatch "${FILESDIR}/${P}-crash-udp.patch"
+
+	# module-switch-on-port-available: Don't switch profiles on uninitialized cards (from 'master')
+	epatch "${FILESDIR}/${P}-module-switch.patch"
+
+	# Fix module-zeroconf-publish crashes, bug #504612 (from 'master')
+	epatch "${FILESDIR}"/${P}-zeroconf-crash-{1,2,3}.patch
+
+	# svolume.orc: avoid parameter loading undefined behaviour
+	# orc-0.4.23 triggers a bug on certain volume changes with PA, leading to distorted sounds
+	# http://lists.freedesktop.org/archives/pulseaudio-discuss/2015-January/022905.html
+	# Gentoo bug 534144
+	epatch "${FILESDIR}"/svolume-fix_param_loading_undefined_beh.patch
+
+	epatch_user
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if use gdbm; then
+		myconf+=( --with-database=gdbm )
+	#elif use tdb; then
+	#	myconf+=( --with-database=tdb )
+	else
+		myconf+=( --with-database=simple )
+	fi
+
+	if use bluetooth; then
+		if has_version '<net-wireless/bluez-5'; then
+			myconf+=( --disable-bluez5 --enable-bluez4 )
+		else
+			 myconf+=( --enable-bluez5 --disable-bluez4 )
+		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_enable systemd)
+		$(use_enable systemd systemd-journal)
+		$(use_enable ipv6)
+		$(use_enable ssl openssl)
+		$(use_enable webrtc-aec)
+		$(use_enable xen)
+		$(use_with caps)
+		$(use_with equalizer fftw)
+		--disable-adrian-aec
+		--disable-esound
+		--localstatedir="${EPREFIX}"/var
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+	)
+
+	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-systemd
+			--disable-openssl
+			--disable-orc
+			--disable-webrtc-aec
+			--disable-xen
+			--without-fftw
+
+			# 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
+	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
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use doc; then
+		pushd doxygen
+		doxygen doxygen.conf
+		popd
+	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
+	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
+
+	if use doc; then
+		pushd doxygen/html
+		dohtml *
+		popd
+	fi
+
+	# 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 "    http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    http://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
+}
diff --git a/media-sound/pulseaudio/pulseaudio-6.0.ebuild b/media-sound/pulseaudio/pulseaudio-6.0.ebuild
new file mode 100644
index 000000000000..f23c4d18d182
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-6.0.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="http://www.pulseaudio.org/"
+SRC_URI="http://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.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~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 lirc native-headset neon ofono-headset
+	+orc oss qt4 realtime selinux ssl systemd system-wide tcpd test +udev
+	+webrtc-aec +X xen zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="bluetooth? ( 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[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
+	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:=
+		>=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 )
+	ssl? ( dev-libs/openssl:0 )
+	>=media-libs/speex-1.2_rc1
+	gdbm? ( sys-libs/gdbm )
+	webrtc-aec? ( media-libs/webrtc-audio-processing )
+	xen? ( app-emulation/xen-tools )
+	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+	>=dev-libs/json-c-0.11[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+	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 )
+	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:= )
+	)
+"
+
+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() {
+	# Skip test that cannot work with sandbox, bug #501846
+	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+	# Fix CVE-2014-3970, bug #512516 (from 'master')
+	#epatch "${FILESDIR}/${P}-crash-udp.patch"
+
+	# module-switch-on-port-available: Don't switch profiles on uninitialized cards (from 'master')
+	#epatch "${FILESDIR}/${P}-module-switch.patch"
+
+	# Fix module-zeroconf-publish crashes, bug #504612 (from 'master')
+	#epatch "${FILESDIR}"/${P}-zeroconf-crash-{1,2,3}.patch
+
+	epatch_user
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	if use gdbm; then
+		myconf+=( --with-database=gdbm )
+	#elif use tdb; then
+	#	myconf+=( --with-database=tdb )
+	else
+		myconf+=( --with-database=simple )
+	fi
+
+	if use bluetooth; then
+		if multilib_is_native_abi; then
+			if has_version '<net-wireless/bluez-5'; then
+				myconf+=( --disable-bluez5 --enable-bluez4 )
+			else
+				myconf+=( --enable-bluez5 --disable-bluez4
+					$(use_enable native-headset bluez5-native-headset)
+					$(use_enable ofono-headset bluez5-ofono-headset) )
+			fi
+		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_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_enable xen)
+		$(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
+			--disable-xen
+			--without-fftw
+
+			# 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
+	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
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+
+	if use doc; then
+		pushd doxygen
+		doxygen doxygen.conf
+		popd
+	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
+	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
+
+	if use doc; then
+		pushd doxygen/html
+		dohtml *
+		popd
+	fi
+
+	# 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 "    http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    http://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..93ffd6dfaa55
--- /dev/null
+++ b/media-sound/pwavecat/Manifest
@@ -0,0 +1 @@
+DIST pwavecat-0.4.5.tgz 13110 RMD160 cd335312d0339cd84df44556b2ffdd04563f7a10 SHA1 8f5d15dd7151b88571c3119e8ed55764c7ccb30a SHA256 3a7d270f09fc918ac7c78258bb99b38369744b90f2217f9f7aa30393f6467db7
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/pwavecat/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..2c8ee6ef9ecc
--- /dev/null
+++ b/media-sound/pwavecat/pwavecat-0.4.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b3db5571a4f6
--- /dev/null
+++ b/media-sound/pympd/Manifest
@@ -0,0 +1 @@
+DIST pympd-0.08.1.tar.gz 101120 SHA256 8da3b91c06857c486321a1d2769c035becd90286ce03791aa2058b0a5f620a06
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..c1c8b1075dc8
--- /dev/null
+++ b/media-sound/pympd/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+    <email>angelos@gentoo.org</email>
+    <name>Christoph Mende</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.ebuild b/media-sound/pympd/pympd-0.08.1.ebuild
new file mode 100644
index 000000000000..da8ee4edad0f
--- /dev/null
+++ b/media-sound/pympd/pympd-0.08.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils gnome2-utils multilib python toolchain-funcs
+
+DESCRIPTION="a Rhythmbox-like PyGTK+ client for Music Player Daemon"
+HOMEPAGE="http://sourceforge.net/projects/pympd"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pygtk-2.6
+	|| ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )
+	x11-themes/gnome-icon-theme"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	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
+	epatch "${FILESDIR}"/${P}-desktop-entry.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr DESTDIR="${D}" || die
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install || die
+	dodoc README
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	python_mod_optimize pympd
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	python_mod_cleanup pympd
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/qarecord/Manifest b/media-sound/qarecord/Manifest
new file mode 100644
index 000000000000..bdd8e131a342
--- /dev/null
+++ b/media-sound/qarecord/Manifest
@@ -0,0 +1 @@
+DIST qarecord-0.5.0.tar.bz2 100173 SHA256 404c72800201e1e005941a078e098368c8f76fce1f3959acf44a90857195666c SHA512 1179d6d5017d243860910a2fdd0d731b3c5262b95998b96e2c13f3b5bd15fc7daf8d7d1c399d0c602ac48b2790153a2d3fcb10e9541afb90a5ec393fb6182460 WHIRLPOOL 134374a4d44238f549a1995b2fce286a3e8f3c9a71fd518f26e45648bcb191b8f0e4a8c9fc5f0b395689283b84c6041954b04325e92f9bc3fbeb9c92915b01a4
diff --git a/media-sound/qarecord/metadata.xml b/media-sound/qarecord/metadata.xml
new file mode 100644
index 000000000000..939a2c64eb67
--- /dev/null
+++ b/media-sound/qarecord/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..a3c6387f740c
--- /dev/null
+++ b/media-sound/qarecord/qarecord-0.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..799ed6754c0f
--- /dev/null
+++ b/media-sound/qastools/Manifest
@@ -0,0 +1,2 @@
+DIST qastools_0.17.2.tar.xz 202152 SHA256 a5f6a765f1c192b150c5a9fdc2d3490575f7a11a2a53245b731ee513cf22b05a SHA512 81911a93a65e0276460610c6ea96d1c19b5f2965dbabd5650ba03a714832538f9ce0af87abfa1d0c6192d8f25c040028fa325c2a877d47830153bd069719d9b8 WHIRLPOOL 1016d769d1d0617bb4f012b52a0be38cd35f6087eb2f55432b586fc74cce7beda52b8855b24b514cfb9a0d8c0b9ffbf18164ebdb05af0e326884374f1ab4b6dc
+DIST qastools_0.18.1.tar.xz 207752 SHA256 ef94bd3ab8660ff169f2b9a0425b3a415a62e2c5c34427b9ec7af2299dde2dc6 SHA512 011d45bae593514647b6f7af3135467f1a3a203fa85a76d72eb26f766701318131500dd44e00765fcd80addd096fa71e49d1e9a0d00e7bf618ec1037207d584c WHIRLPOOL 294364384a5b9f39b829897aa7932605d61717582538c7893453313911717961943cb0bc340766f9fa6f83e16117bd1378d8bceffd39484b5cd76d6b746872b7
diff --git a/media-sound/qastools/metadata.xml b/media-sound/qastools/metadata.xml
new file mode 100644
index 000000000000..6a60bbd94825
--- /dev/null
+++ b/media-sound/qastools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="sourceforge">qastools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/qastools/qastools-0.17.2.ebuild b/media-sound/qastools/qastools-0.17.2.ebuild
new file mode 100644
index 000000000000..9e12fecead94
--- /dev/null
+++ b/media-sound/qastools/qastools-0.17.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Qt4 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=""
+
+LANGS="cs de es ru"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+RDEPEND="media-libs/alsa-lib
+	>=dev-qt/qtcore-4.6:4
+	>=dev-qt/qtgui-4.6:4
+	>=dev-qt/qtsvg-4.6:4"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( CHANGELOG README TODO )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	local lang
+	for lang in ${LANGS} ; do
+		if ! use linguas_${lang} ; then
+			rm i18n/ts/app_${lang}.ts
+		fi
+	done
+}
diff --git a/media-sound/qastools/qastools-0.18.1-r1.ebuild b/media-sound/qastools/qastools-0.18.1-r1.ebuild
new file mode 100644
index 000000000000..e299776ec358
--- /dev/null
+++ b/media-sound/qastools/qastools-0.18.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="cs de es he ru"
+inherit cmake-utils l10n
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Qt4 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="media-libs/alsa-lib
+	>=dev-qt/qtcore-4.6:4
+	>=dev-qt/qtgui-4.6:4
+	>=dev-qt/qtsvg-4.6:4
+	virtual/libudev"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+S=${WORKDIR}/${MY_P}
+DOCS=( CHANGELOG README TODO )
+
+rm_loc() {
+	rm i18n/ts/app_${1}.ts || die "removing ${1} locale failed"
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+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..f99e5d8f61bf
--- /dev/null
+++ b/media-sound/qjackctl/Manifest
@@ -0,0 +1,5 @@
+DIST qjackctl-0.3.10.tar.gz 487678 SHA256 5cdd937c44e5c737f3d2c2063ada015cac2fc8ed0cdbcb90d0ba747087270132 SHA512 1d7c310967cd112aad2caa79684b40b90070e5ce78fe2fd71f0a159ff835a8ccb4806dd140237c05d369ec782965472616aca67fc649cf1ba232535dc8b3104f WHIRLPOOL 7a6cb86992d4dafc0dc43bb8587285c0a2db64649c29fb9a4236f050f89ac9df4cd1d6b7083b980a6121bb508eb98da3b48b3d4eca96d655d75bf737e107f9ab
+DIST qjackctl-0.3.11.tar.gz 487451 SHA256 944393e87d193e8b495b0878ac3726882b5dc9a8cc596666f75a093bfacb5ff2 SHA512 4fd14cd8da30d9b04b9eac32cc13a4a145c1b695b833e7d97a12fc1609b1e96faf7ce451d6f9dea4f9f664ab4a9a27c7bc5e596f3d8432e0eefdc0181d7f7167 WHIRLPOOL 5083b5e16e86bea80b564b6732b80c5d37075db0cf37f7022a21290d670a4fa6480de4b28b329e348c2676dc1bd410ffba316bf0decccdfe2b5a901c23aceb04
+DIST qjackctl-0.3.12.tar.gz 496010 SHA256 8cff21f2b249d8960ddd8749ec1fa0ed0ec316014d2cf4a8939ac33109b3db93 SHA512 5afa61f4bef986601d9ee84d4c38128847f6160c827ca22abbe70c1a5b20fbd0e914ba00e0d4e16d118fb616d71618aa72d17507170dc9ca5bac6b5a8a2aa5a9 WHIRLPOOL a6fd4b5eeceec4d731fd9d9058ec462b8c247e8a5e62a0ec7ae93204dd4f05c62386b8cfea0082862fc5948420a14bb502353f0d50b9e9f54cc073af54a01e8d
+DIST qjackctl-0.3.13.tar.gz 498208 SHA256 11e0041ff38ac46df466968bd5e0e33986f76b7f099bd75a66fbf2a07c1b1295 SHA512 1e515783eea4cd628ee0195b9d711b2d1d5a2651f8a9c1c6077de06055053129019be0657b12bd01238ba7d39e38fd06a361128187ac32d52c16fe873bd50dea WHIRLPOOL abb926b3a06bd5e7e90a3dd6ab3a30b4387b61a2b58c34d04f66b078a634f45e4275e8526a7d020f3d958296299e416479761caa3455758c1d2c68785be6f5ae
+DIST qjackctl-0.4.0.tar.gz 500534 SHA256 5b651cc5bd85986bcb36b32943e091c931ba229d58732c1724a200e03762485a SHA512 dff5d6bd153cc92149e7a16820ab061f70090eca7a15f8f79ac7b9316e7c279f61e800cfbfc7ec4ce0a13721e717f9f18b98611c22c2a134830111c865d3d001 WHIRLPOOL ae607775d75825355d405b6b3e41ae25793b4a698735d847c9617e6af2eef8dd73cf4ed104e7941c1d014ebeb02d48d128cb363241898ab9ffcb5752ae59464e
diff --git a/media-sound/qjackctl/files/qjackctl-0.3.9-gcc47.patch b/media-sound/qjackctl/files/qjackctl-0.3.9-gcc47.patch
new file mode 100644
index 000000000000..fd6a2dedf646
--- /dev/null
+++ b/media-sound/qjackctl/files/qjackctl-0.3.9-gcc47.patch
@@ -0,0 +1,12 @@
+Index: qjackctl-0.3.9/src/qjackctl.cpp
+===================================================================
+--- qjackctl-0.3.9.orig/src/qjackctl.cpp
++++ qjackctl-0.3.9/src/qjackctl.cpp
+@@ -27,6 +27,7 @@
+ #include <QLibraryInfo>
+ #include <QTranslator>
+ #include <QLocale>
++#include <unistd.h>
+ 
+ #if QT_VERSION < 0x040300
+ #define lighter(x)	light(x)
diff --git a/media-sound/qjackctl/metadata.xml b/media-sound/qjackctl/metadata.xml
new file mode 100644
index 000000000000..a82e3bf98ee3
--- /dev/null
+++ b/media-sound/qjackctl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<upstream>
+		<remote-id type="sourceforge">qjackctl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/qjackctl/qjackctl-0.3.10.ebuild b/media-sound/qjackctl/qjackctl-0.3.10.ebuild
new file mode 100644
index 000000000000..34e32beafdc4
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.3.10.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit qt4-r2
+
+DESCRIPTION="A Qt application 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="
+	>=media-sound/jack-audio-connection-kit-0.109.2
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:4 )
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
+
+PATCHES=( "${FILESDIR}/${PN}-0.3.9-gcc47.patch" )
+
+src_configure() {
+	econf \
+		$(use_enable alsa alsa-seq) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable portaudio)
+
+	# Emulate what the Makefile does, so that we can get the correct
+	# compiler used.
+	eqmake4 ${PN}.pro -o ${PN}.mak
+}
+
+src_compile() {
+	emake -f ${PN}.mak
+	lupdate ${PN}.pro || die "lupdate failed"
+}
diff --git a/media-sound/qjackctl/qjackctl-0.3.11.ebuild b/media-sound/qjackctl/qjackctl-0.3.11.ebuild
new file mode 100644
index 000000000000..bb1c6aeacd8e
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.3.11.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit qt4-r2
+
+DESCRIPTION="A Qt application 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="
+	>=media-sound/jack-audio-connection-kit-0.109.2
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:4 )
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
+
+PATCHES=( "${FILESDIR}/${PN}-0.3.9-gcc47.patch" )
+
+src_configure() {
+	econf \
+		$(use_enable alsa alsa-seq) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable portaudio)
+
+	# Emulate what the Makefile does, so that we can get the correct
+	# compiler used.
+	eqmake4 ${PN}.pro -o ${PN}.mak
+}
+
+src_compile() {
+	emake -f ${PN}.mak
+	lupdate ${PN}.pro || die "lupdate failed"
+}
diff --git a/media-sound/qjackctl/qjackctl-0.3.12.ebuild b/media-sound/qjackctl/qjackctl-0.3.12.ebuild
new file mode 100644
index 000000000000..bb1c6aeacd8e
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.3.12.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit qt4-r2
+
+DESCRIPTION="A Qt application 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="
+	>=media-sound/jack-audio-connection-kit-0.109.2
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:4 )
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
+
+PATCHES=( "${FILESDIR}/${PN}-0.3.9-gcc47.patch" )
+
+src_configure() {
+	econf \
+		$(use_enable alsa alsa-seq) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable portaudio)
+
+	# Emulate what the Makefile does, so that we can get the correct
+	# compiler used.
+	eqmake4 ${PN}.pro -o ${PN}.mak
+}
+
+src_compile() {
+	emake -f ${PN}.mak
+	lupdate ${PN}.pro || die "lupdate failed"
+}
diff --git a/media-sound/qjackctl/qjackctl-0.3.13.ebuild b/media-sound/qjackctl/qjackctl-0.3.13.ebuild
new file mode 100644
index 000000000000..9e4eede6137e
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.3.13.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit qt4-r2
+
+DESCRIPTION="A Qt application 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="
+	>=media-sound/jack-audio-connection-kit-0.109.2
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:4 )
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
+
+src_configure() {
+	econf \
+		$(use_enable alsa alsa-seq) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable portaudio)
+
+	# Emulate what the Makefile does, so that we can get the correct
+	# compiler used.
+	eqmake4 ${PN}.pro -o ${PN}.mak
+}
+
+src_compile() {
+	emake -f ${PN}.mak
+	lupdate ${PN}.pro || die "lupdate failed"
+}
diff --git a/media-sound/qjackctl/qjackctl-0.4.0.ebuild b/media-sound/qjackctl/qjackctl-0.4.0.ebuild
new file mode 100644
index 000000000000..5e2e279b7f8d
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.4.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils
+
+DESCRIPTION="A Qt application 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 +qt5"
+
+RDEPEND="
+	>=media-sound/jack-audio-connection-kit-0.109.2
+	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 dev-qt/qtwidgets:5 )
+	!qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:4 )
+	portaudio? ( media-libs/portaudio )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
+
+src_configure() {
+	use qt5 && export PATH="$(qt5_get_bindir):${PATH}"
+	econf \
+		$(use_with !qt5 qt4 $(qt4_get_bindir)) \
+		$(use_with qt5 qt5 $(qt5_get_bindir)) \
+		$(use_enable alsa alsa-seq) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable portaudio)
+
+	# Emulate what the Makefile does, so that we can get the correct
+	# compiler used.
+	if use qt5 ; then
+		eqmake5 ${PN}.pro -o ${PN}.mak
+	else
+		eqmake4 ${PN}.pro -o ${PN}.mak
+	fi
+}
+
+src_compile() {
+	emake -f ${PN}.mak
+}
diff --git a/media-sound/qmidiarp/Manifest b/media-sound/qmidiarp/Manifest
new file mode 100644
index 000000000000..2546a4e7096c
--- /dev/null
+++ b/media-sound/qmidiarp/Manifest
@@ -0,0 +1 @@
+DIST qmidiarp-0.3.9.tar.bz2 185426 SHA256 0e9b9de1e8f0e54e253a20d985ea923275a006eacc17281f48644b96ae3d01fc
diff --git a/media-sound/qmidiarp/files/qmidiarp-0.3.9-ldadd.patch b/media-sound/qmidiarp/files/qmidiarp-0.3.9-ldadd.patch
new file mode 100644
index 000000000000..127d93167256
--- /dev/null
+++ b/media-sound/qmidiarp/files/qmidiarp-0.3.9-ldadd.patch
@@ -0,0 +1,21 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e2385d0..89cc4a5 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -44,6 +44,8 @@ qmidiarp_SOURCES = \
+ 	seqdriver.cpp seqdriver.h \
+ 	slider.cpp slider.h
+ 
++qmidiarp_LDADD = $(QT_LIBS)
++
+ translationsdir = $(pkgdatadir)/translations
+ translations = \
+ 	translations/qmidiarp_de.ts \
+@@ -54,7 +56,6 @@ translations_DATA = \
+ 	translations/qmidiarp_fr.qm
+ 
+ 
+-AM_LDFLAGS = @QT_LIBS@ @DEFS@
+ AM_CXXFLAGS = @QT_CXXFLAGS@
+ DEFS = -Wall -Wextra -D_REENTRANT -DTRANSLATIONSDIR=\"$(translationsdir)\" @DEFS@
+ 
diff --git a/media-sound/qmidiarp/metadata.xml b/media-sound/qmidiarp/metadata.xml
new file mode 100644
index 000000000000..8075e869d631
--- /dev/null
+++ b/media-sound/qmidiarp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">qmidiarp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/qmidiarp/qmidiarp-0.3.9.ebuild b/media-sound/qmidiarp/qmidiarp-0.3.9.ebuild
new file mode 100644
index 000000000000..b6c25ac12166
--- /dev/null
+++ b/media-sound/qmidiarp/qmidiarp-0.3.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+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=""
+
+RDEPEND="media-libs/alsa-lib
+	media-sound/jack-audio-connection-kit
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldadd.patch
+	eautomake
+}
diff --git a/media-sound/qmidiroute/Manifest b/media-sound/qmidiroute/Manifest
new file mode 100644
index 000000000000..ca1c0d7cf51e
--- /dev/null
+++ b/media-sound/qmidiroute/Manifest
@@ -0,0 +1 @@
+DIST qmidiroute-0.3.0.tar.bz2 103285 SHA256 238ab3af3fdfaccab1366ecfec3d203d29e459b39f1ea579a3929b8035e19479
diff --git a/media-sound/qmidiroute/metadata.xml b/media-sound/qmidiroute/metadata.xml
new file mode 100644
index 000000000000..939a2c64eb67
--- /dev/null
+++ b/media-sound/qmidiroute/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..c6d9a615be08
--- /dev/null
+++ b/media-sound/qmidiroute/qmidiroute-0.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/qmmp/Manifest b/media-sound/qmmp/Manifest
new file mode 100644
index 000000000000..361985cc7a0f
--- /dev/null
+++ b/media-sound/qmmp/Manifest
@@ -0,0 +1,3 @@
+DIST qmmp-0.8.3.tar.bz2 991403 SHA256 9e73518adf011e60e36c18d55d05845f8103b4af61351e26edb6c105390dd949 SHA512 62e9e1671fa75103b3a77761b64b02ae9284e5b6512957cd83037fe90b3b02453d0d556ac64885d39acb1e79e676a5ba3a940c1af6e4e215db20fd95cefd57d0 WHIRLPOOL 0d42ab65c17c1fe10db46111c56375220a07204270045987ec8f1f0770ec9fb79a66f39301b6f57e43338dc9518837ddf377147cb17f55faa2a0063ccdd5d928
+DIST qmmp-0.8.4.tar.bz2 990768 SHA256 aef9f7685b5b5d79949bf501ac5420883ad2bceeeb6f57f9a7632a7f7d4fa6d1 SHA512 02af2f3d8a1f4f0b04613af21779e24509d696bb19de8f1a3173de124764ba950af6be00700271c0f14344a21bb69fdf9a350ddd179c9d48ab9acafcf3459608 WHIRLPOOL cd1b655a378275fc91a6ee15560b1ffa65a6c0f15238433a51207c35f540e0db82589686fb51b01ba0d48f57b2088a800cd8b69aba21266cb770d7d5b877f7ac
+DIST qmmp-0.8.5.tar.bz2 991464 SHA256 7fe9347ad6c66e8013b73f2c5cf628037c58151e0cfcb926a8f27b93ad2d7c0d SHA512 07659ea7421079da77f6caa77c1e5f007664b1732a8bae160c154e3a687f330e476d5b2fec2e1b79da512ca1b68fdf6d462975821ced76f4f4c87799e6d79c39 WHIRLPOOL a46264d2886953f924fae40bd43cd5e23a59592ae8456a6120f6e41cd2d9572fa94a8c68f212dabfa97b8534f723ab9c91f26a0d98e0b6109266802ecb18d7f4
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
new file mode 100644
index 000000000000..954064eaa3cc
--- /dev/null
+++ b/media-sound/qmmp/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+  	<email>hwoarang@gentoo.org</email>
+	<name>Markos Chandras</name>
+	</maintainer>
+  <use>
+    <flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
+	<flag name="crossfade">Enable crossfade effect when switching tracks</flag>
+	<flag name="cover">Enable album cover support</flag>
+	<flag name="enca">Detects the character encoding automatically</flag>
+	<flag name="game">Enable Game music support</flag>
+	<flag name="lyrics">Fetch track lyrics from the web</flag>
+	<flag name="midi">Enable midi support using wildmidi library</flag>
+	<flag name="mpris">Enable MPRIS support</flag>
+	<flag name="notifier">Enable qmmps' notifier system</flag>
+	<flag name="opus">Enable the opus plugin</flag>
+	<flag name="stereo">Enable stereo effect</flag>
+	<flag name="tray">Build tray icon</flag>
+	<flag name="kde">Use kde4 notifier system</flag>
+	<flag name="projectm">Enable projectm music visualization plugin</flag>
+    <flag name="scrobbler">Enable audioscrobbler/last.fm support</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/qmmp/qmmp-0.8.3.ebuild b/media-sound/qmmp/qmmp-0.8.3.ebuild
new file mode 100644
index 000000000000..a35be0060bc2
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.8.3.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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
+	SRC_URI=""
+	ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+	dev-qt/qtgui:4
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdda? ( dev-libs/libcdio-paranoia )
+	dbus? ( sys-apps/dbus )
+	aac? ( media-libs/faad2 )
+	enca? ( app-i18n/enca )
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	ladspa? ( media-libs/ladspa-cmt )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	mplayer? ( || ( media-video/mplayer
+		media-video/mplayer2 )
+	)
+	mpris? ( dev-qt/qtdbus:4 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	vorbis? ( media-libs/libvorbis
+		media-libs/libogg )
+	jack? ( media-sound/jack-audio-connection-kit
+		media-libs/libsamplerate )
+	ffmpeg? ( virtual/ffmpeg )
+	opus? ( media-libs/opusfile )
+	projectm? ( media-libs/libprojectm
+		dev-qt/qtopengl:4 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	wavpack? ( media-sound/wavpack )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( 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() {
+	mycmakeargs=(
+		$(cmake-utils_use_use alsa)
+		$(cmake-utils_use_use aac)
+		$(cmake-utils_use_use bs2b)
+		$(cmake-utils_use_use cover)
+		$(cmake-utils_use_use cdda CDA)
+		$(cmake-utils_use_use crossfade)
+		$(cmake-utils_use_use dbus)
+		$(cmake-utils_use_use enca)
+		$(cmake-utils_use_use ffmpeg)
+		-DUSE_FFMPEG_LEGACY=OFF
+		$(cmake-utils_use_use flac)
+		$(cmake-utils_use_use game GME)
+		-DUSE_HAL=OFF
+		$(cmake-utils_use_use jack)
+		$(cmake-utils_use_use kde KDENOTIFY)
+		$(cmake-utils_use_use ladspa)
+		$(cmake-utils_use_use lyrics)
+		$(cmake-utils_use_use mad)
+		$(cmake-utils_use_use midi MIDI_WILDMIDI)
+		$(cmake-utils_use_use mplayer)
+		$(cmake-utils_use_use mms)
+		$(cmake-utils_use_use modplug)
+		$(cmake-utils_use_use mpris)
+		$(cmake-utils_use_use musepack MPC)
+		$(cmake-utils_use_use notifier)
+		$(cmake-utils_use_use opus)
+		$(cmake-utils_use_use oss)
+		$(cmake-utils_use_use projectm)
+		$(cmake-utils_use_use pulseaudio PULSE)
+		$(cmake-utils_use_use scrobbler)
+		$(cmake-utils_use_use sndfile)
+		$(cmake-utils_use_use stereo)
+		$(cmake-utils_use_use tray STATICON)
+		$(cmake-utils_use_use udisks UDISKS2)
+		$(cmake-utils_use_use libsamplerate SRC)
+		$(cmake-utils_use_use vorbis)
+		$(cmake-utils_use_use wavpack)
+		)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-0.8.4.ebuild b/media-sound/qmmp/qmmp-0.8.4.ebuild
new file mode 100644
index 000000000000..018e7dcfde05
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.8.4.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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
+	SRC_URI=""
+	ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+	dev-qt/qtgui:4
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdda? ( dev-libs/libcdio-paranoia )
+	dbus? ( sys-apps/dbus )
+	aac? ( media-libs/faad2 )
+	enca? ( app-i18n/enca )
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	ladspa? ( media-libs/ladspa-cmt )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	mplayer? ( || ( media-video/mplayer
+		media-video/mplayer2 )
+	)
+	mpris? ( dev-qt/qtdbus:4 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	vorbis? ( media-libs/libvorbis
+		media-libs/libogg )
+	jack? ( media-sound/jack-audio-connection-kit
+		media-libs/libsamplerate )
+	ffmpeg? ( virtual/ffmpeg )
+	opus? ( media-libs/opusfile )
+	projectm? ( media-libs/libprojectm
+		dev-qt/qtopengl:4 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	wavpack? ( media-sound/wavpack )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( 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() {
+	mycmakeargs=(
+		$(cmake-utils_use_use alsa)
+		$(cmake-utils_use_use aac)
+		$(cmake-utils_use_use bs2b)
+		$(cmake-utils_use_use cover)
+		$(cmake-utils_use_use cdda CDA)
+		$(cmake-utils_use_use crossfade)
+		$(cmake-utils_use_use dbus)
+		$(cmake-utils_use_use enca)
+		$(cmake-utils_use_use ffmpeg)
+		-DUSE_FFMPEG_LEGACY=OFF
+		$(cmake-utils_use_use flac)
+		$(cmake-utils_use_use game GME)
+		-DUSE_HAL=OFF
+		$(cmake-utils_use_use jack)
+		$(cmake-utils_use_use kde KDENOTIFY)
+		$(cmake-utils_use_use ladspa)
+		$(cmake-utils_use_use lyrics)
+		$(cmake-utils_use_use mad)
+		$(cmake-utils_use_use midi MIDI_WILDMIDI)
+		$(cmake-utils_use_use mplayer)
+		$(cmake-utils_use_use mms)
+		$(cmake-utils_use_use modplug)
+		$(cmake-utils_use_use mpris)
+		$(cmake-utils_use_use musepack MPC)
+		$(cmake-utils_use_use notifier)
+		$(cmake-utils_use_use opus)
+		$(cmake-utils_use_use oss)
+		$(cmake-utils_use_use projectm)
+		$(cmake-utils_use_use pulseaudio PULSE)
+		$(cmake-utils_use_use scrobbler)
+		$(cmake-utils_use_use sndfile)
+		$(cmake-utils_use_use stereo)
+		$(cmake-utils_use_use tray STATICON)
+		$(cmake-utils_use_use udisks UDISKS2)
+		$(cmake-utils_use_use libsamplerate SRC)
+		$(cmake-utils_use_use vorbis)
+		$(cmake-utils_use_use wavpack)
+		)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-0.8.5.ebuild b/media-sound/qmmp/qmmp-0.8.5.ebuild
new file mode 100644
index 000000000000..018e7dcfde05
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.8.5.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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
+	SRC_URI=""
+	ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+	dev-qt/qtgui:4
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdda? ( dev-libs/libcdio-paranoia )
+	dbus? ( sys-apps/dbus )
+	aac? ( media-libs/faad2 )
+	enca? ( app-i18n/enca )
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	ladspa? ( media-libs/ladspa-cmt )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	mplayer? ( || ( media-video/mplayer
+		media-video/mplayer2 )
+	)
+	mpris? ( dev-qt/qtdbus:4 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	vorbis? ( media-libs/libvorbis
+		media-libs/libogg )
+	jack? ( media-sound/jack-audio-connection-kit
+		media-libs/libsamplerate )
+	ffmpeg? ( virtual/ffmpeg )
+	opus? ( media-libs/opusfile )
+	projectm? ( media-libs/libprojectm
+		dev-qt/qtopengl:4 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	wavpack? ( media-sound/wavpack )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( 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() {
+	mycmakeargs=(
+		$(cmake-utils_use_use alsa)
+		$(cmake-utils_use_use aac)
+		$(cmake-utils_use_use bs2b)
+		$(cmake-utils_use_use cover)
+		$(cmake-utils_use_use cdda CDA)
+		$(cmake-utils_use_use crossfade)
+		$(cmake-utils_use_use dbus)
+		$(cmake-utils_use_use enca)
+		$(cmake-utils_use_use ffmpeg)
+		-DUSE_FFMPEG_LEGACY=OFF
+		$(cmake-utils_use_use flac)
+		$(cmake-utils_use_use game GME)
+		-DUSE_HAL=OFF
+		$(cmake-utils_use_use jack)
+		$(cmake-utils_use_use kde KDENOTIFY)
+		$(cmake-utils_use_use ladspa)
+		$(cmake-utils_use_use lyrics)
+		$(cmake-utils_use_use mad)
+		$(cmake-utils_use_use midi MIDI_WILDMIDI)
+		$(cmake-utils_use_use mplayer)
+		$(cmake-utils_use_use mms)
+		$(cmake-utils_use_use modplug)
+		$(cmake-utils_use_use mpris)
+		$(cmake-utils_use_use musepack MPC)
+		$(cmake-utils_use_use notifier)
+		$(cmake-utils_use_use opus)
+		$(cmake-utils_use_use oss)
+		$(cmake-utils_use_use projectm)
+		$(cmake-utils_use_use pulseaudio PULSE)
+		$(cmake-utils_use_use scrobbler)
+		$(cmake-utils_use_use sndfile)
+		$(cmake-utils_use_use stereo)
+		$(cmake-utils_use_use tray STATICON)
+		$(cmake-utils_use_use udisks UDISKS2)
+		$(cmake-utils_use_use libsamplerate SRC)
+		$(cmake-utils_use_use vorbis)
+		$(cmake-utils_use_use 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..018e7dcfde05
--- /dev/null
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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
+	SRC_URI=""
+	ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa +dbus bs2b cdda cover crossfade enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+	dev-qt/qtgui:4
+	alsa? ( media-libs/alsa-lib )
+	bs2b? ( media-libs/libbs2b )
+	cdda? ( dev-libs/libcdio-paranoia )
+	dbus? ( sys-apps/dbus )
+	aac? ( media-libs/faad2 )
+	enca? ( app-i18n/enca )
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	ladspa? ( media-libs/ladspa-cmt )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	mplayer? ( || ( media-video/mplayer
+		media-video/mplayer2 )
+	)
+	mpris? ( dev-qt/qtdbus:4 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	vorbis? ( media-libs/libvorbis
+		media-libs/libogg )
+	jack? ( media-sound/jack-audio-connection-kit
+		media-libs/libsamplerate )
+	ffmpeg? ( virtual/ffmpeg )
+	opus? ( media-libs/opusfile )
+	projectm? ( media-libs/libprojectm
+		dev-qt/qtopengl:4 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	wavpack? ( media-sound/wavpack )
+	scrobbler? ( net-misc/curl )
+	sndfile? ( media-libs/libsndfile )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( 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() {
+	mycmakeargs=(
+		$(cmake-utils_use_use alsa)
+		$(cmake-utils_use_use aac)
+		$(cmake-utils_use_use bs2b)
+		$(cmake-utils_use_use cover)
+		$(cmake-utils_use_use cdda CDA)
+		$(cmake-utils_use_use crossfade)
+		$(cmake-utils_use_use dbus)
+		$(cmake-utils_use_use enca)
+		$(cmake-utils_use_use ffmpeg)
+		-DUSE_FFMPEG_LEGACY=OFF
+		$(cmake-utils_use_use flac)
+		$(cmake-utils_use_use game GME)
+		-DUSE_HAL=OFF
+		$(cmake-utils_use_use jack)
+		$(cmake-utils_use_use kde KDENOTIFY)
+		$(cmake-utils_use_use ladspa)
+		$(cmake-utils_use_use lyrics)
+		$(cmake-utils_use_use mad)
+		$(cmake-utils_use_use midi MIDI_WILDMIDI)
+		$(cmake-utils_use_use mplayer)
+		$(cmake-utils_use_use mms)
+		$(cmake-utils_use_use modplug)
+		$(cmake-utils_use_use mpris)
+		$(cmake-utils_use_use musepack MPC)
+		$(cmake-utils_use_use notifier)
+		$(cmake-utils_use_use opus)
+		$(cmake-utils_use_use oss)
+		$(cmake-utils_use_use projectm)
+		$(cmake-utils_use_use pulseaudio PULSE)
+		$(cmake-utils_use_use scrobbler)
+		$(cmake-utils_use_use sndfile)
+		$(cmake-utils_use_use stereo)
+		$(cmake-utils_use_use tray STATICON)
+		$(cmake-utils_use_use udisks UDISKS2)
+		$(cmake-utils_use_use libsamplerate SRC)
+		$(cmake-utils_use_use vorbis)
+		$(cmake-utils_use_use wavpack)
+		)
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qmpdclient/Manifest b/media-sound/qmpdclient/Manifest
new file mode 100644
index 000000000000..ba471ed942be
--- /dev/null
+++ b/media-sound/qmpdclient/Manifest
@@ -0,0 +1 @@
+DIST qmpdclient-1.2.2.tar.bz2 271565 SHA256 ed65705eaae8fb10fdce34ce20e010757a87423c2874479e1466e4368a866289 SHA512 2ae8a2235640c0c644f32290a9d39bcef6f041bb7eca1d269b54433975578c31067f2e5a28d9d679c229075962523b6b20e779b1ed23af7c47129ff4b63e5735 WHIRLPOOL e52e5b99892cc7b475f1c1b26a514b8125d704c83fef02b140307536acad45a94bdc4fe59adbec289d379cd599f4748452f17c5345b166ab443defbfcfeb0460
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..4e2154e07e54
--- /dev/null
+++ b/media-sound/qmpdclient/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<maintainer>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</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-r1.ebuild b/media-sound/qmpdclient/qmpdclient-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..81f8eeff74e4
--- /dev/null
+++ b/media-sound/qmpdclient/qmpdclient-1.2.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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=""
+KEYWORDS="amd64 ppc x86"
+IUSE="debug"
+
+DEPEND="dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+	dev-qt/qtxmlpatterns:4"
+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..ac03037c9079
--- /dev/null
+++ b/media-sound/qpitch/Manifest
@@ -0,0 +1 @@
+DIST qpitch-1.0.1.tar.gz 116676 SHA256 20153417bf8e25dfd6e73c46ac5e05b7aaf5d4060b85a09778e0dcc61d4496a0 SHA512 d732d0b2a7c07741586d3724a6a2c73bb02b4390bbd4baa5e7fe4abe3531ad12e7be208a470ca6f0da38334e4cb556cebe5c0df3839547c3f55c5b37b9944e94 WHIRLPOOL 4e5a6d46d389e49837d73dd4d642ae5f84ad81d95bdc5a361b091607b09f5fd37aa411882148b3791d47d922ad553cb27cb57ecbfed741f9f2774af627b0453e
diff --git a/media-sound/qpitch/metadata.xml b/media-sound/qpitch/metadata.xml
new file mode 100644
index 000000000000..84d667565f36
--- /dev/null
+++ b/media-sound/qpitch/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<herd>sound</herd>
+</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..7a02ece00c90
--- /dev/null
+++ b/media-sound/qpitch/qpitch-1.0.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/qpitch/qpitch-1.0.1.ebuild b/media-sound/qpitch/qpitch-1.0.1.ebuild
new file mode 100644
index 000000000000..c49e7a38d136
--- /dev/null
+++ b/media-sound/qpitch/qpitch-1.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+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/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..485d6b405a77
--- /dev/null
+++ b/media-sound/qsampler/Manifest
@@ -0,0 +1 @@
+DIST qsampler-0.2.2.2345.tar.xz 184892 SHA256 4afaf245b5c7b15ecbf447a26c4930dc5e69c8e70397fa20a54a7a2bdf7b778a
diff --git a/media-sound/qsampler/metadata.xml b/media-sound/qsampler/metadata.xml
new file mode 100644
index 000000000000..6839654ee445
--- /dev/null
+++ b/media-sound/qsampler/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <use>
+    <flag name="libgig">Enable libgig support for loading Gigasampler files and DLS (Downloadable Sounds) Level 1/2 files</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/qsampler/qsampler-0.2.2_p2345.ebuild b/media-sound/qsampler/qsampler-0.2.2_p2345.ebuild
new file mode 100644
index 000000000000..99450fd4eede
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.2.2_p2345.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils qt4-r2
+
+MY_P=${P/_p/.}
+DESCRIPTION="A graphical frontend to the LinuxSampler engine"
+HOMEPAGE="http://qsampler.sourceforge.net"
+SRC_URI="mirror://gentoo/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +libgig"
+
+DEPEND="media-libs/alsa-lib
+	>=media-libs/liblscp-0.5.5
+	x11-libs/libX11
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	libgig? ( >=media-libs/libgig-3.2.1 )"
+RDEPEND="${DEPEND}
+	>=media-sound/linuxsampler-0.5"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	econf $(use_enable debug) \
+		$(use_enable libgig)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README TODO
+	doman debian/${PN}.1
+}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
new file mode 100644
index 000000000000..0f5746144381
--- /dev/null
+++ b/media-sound/qsynth/Manifest
@@ -0,0 +1,2 @@
+DIST qsynth-0.3.6.tar.gz 223774 SHA256 b5968da98661bac5c9fcc93d3a15851594dfbf3bb7d01ace15fbe8779d53fb3c SHA512 c61f6913f28a18a8e74af290560c0f8862e86c192715299fd24e73243a3563c1d65bebf6ab8844c692b06bf357f6bf42d43ef5298d74636fe7c4c082aea3eeea WHIRLPOOL 0e3c6aaab8a4ed9a77baca128f4661c4dfd82d089b636d3ce97a95ce4a303ba745f5023447bd1d5477aeda4bad5b64923f69e3aa1d5a1e435b5efb7906829483
+DIST qsynth-0.3.9.tar.gz 255130 SHA256 eb2050d0f7a8011b9ac20f82fec88faf2237a2475dfefc424cb4944399b17e22 SHA512 7702dc9eb3d38d338dcab5587e02e9fcdaffbe6188437e3b0f54b07499553f7a7d083f233cd21963a908578108f82c0d904b68da2f156ca0ab489e989b5787a8 WHIRLPOOL 621b53fbf251e4b35dcdefb6b63e6ed124fc12dccad6148f077914bd25931cc8ea10a8dfb959b5ad4ae8a451686c63dedeb060b8a68d7a3d6e72e2d5c437104a
diff --git a/media-sound/qsynth/metadata.xml b/media-sound/qsynth/metadata.xml
new file mode 100644
index 000000000000..7047d1231fd4
--- /dev/null
+++ b/media-sound/qsynth/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<longdescription>
+QSynth is a fluidsynth GUI front-end application written in C++ around the
+Qt3 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.6.ebuild b/media-sound/qsynth/qsynth-0.3.6.ebuild
new file mode 100644
index 000000000000..034eb3354c6a
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.3.6.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+LANGS="cs de es ru"
+
+inherit qt4-r2 eutils flag-o-matic
+
+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_prepare() {
+	sed -e '/@install/,/share\/locale$/d' -i Makefile.in || die "sed translations failed"
+
+	sed -e 's/@make/@\$(MAKE)/' -i Makefile.in || die "sed Makefile failed"
+
+	qt4-r2_src_prepare
+}
+
+src_configure() {
+	# Stupidly, qsynth's configure does *not* use pkg-config to
+	# discover the presence of Qt4, but uses fixed paths; as they
+	# don't really work that well for our case, let's just use this
+	# nasty hack and be done with it. *NOTE*: this hinders
+	# cross-compile.
+	append-flags -I/usr/include/qt4
+	append-ldflags -L/usr/$(get_libdir)/qt4
+
+	econf \
+		$(use_enable debug)
+	eqmake4 "${PN}.pro" -o "${PN}.mak"
+}
+
+src_compile() {
+	lupdate "${PN}.pro" || die "lupdate failed"
+	qt4-r2_src_compile
+}
+
+src_install () {
+	qt4-r2_src_install
+
+	insinto /usr/share/locale
+	local lang
+	for lang in ${LANGS} ; do
+		if use linguas_${lang} ; then
+			doins "src/translations/${PN}_${lang}.qm"
+		fi
+	done
+
+	# 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.3.9.ebuild b/media-sound/qsynth/qsynth-0.3.9.ebuild
new file mode 100644
index 000000000000..e6969b895855
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.3.9.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/qtagconvert/Manifest b/media-sound/qtagconvert/Manifest
new file mode 100644
index 000000000000..4971f40c818f
--- /dev/null
+++ b/media-sound/qtagconvert/Manifest
@@ -0,0 +1 @@
+DIST qtagconvert-2.0.0.tar.gz 95475 SHA256 7d76a9e377e1b21ebbf8f5a5bc7adaf7b846b5d7772c9e9ce7a633facadecc42 SHA512 dec5ac042dbe9219fceaeaa3d2aa7476ac12321157421bcd2f1dce9fb9dcabffc8c059ec86ac16b2043f168161d3b3b13c9f4e24fad469a955575d4df8733390 WHIRLPOOL f732d962ea08b0a4682499ac46d2912ae7fa62f461ac9533dc8d238b1afb4ef365a41ef6e5c7b750a71c5a4c156300168c38784d665d5ba56728f64dfa8099a6
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..263a40f9ba45
--- /dev/null
+++ b/media-sound/qtagconvert/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<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..1f3d68f6bf96
--- /dev/null
+++ b/media-sound/qtagconvert/qtagconvert-2.0.0-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..8eb8060b745e
--- /dev/null
+++ b/media-sound/qtagger/Manifest
@@ -0,0 +1 @@
+DIST qtagger-1.0.1.tar.bz2 81611 SHA256 603b04079f5b9f525620fdcd48ec165f8947b69d98c3ecc4777dd9ff6100e801 SHA512 fbd62fef9b5c6026c6e986bf7f0a89631094b6b43fe5d65414099c5f268298728062cbb12679bc33acdac82316f52a0629a35afa3e5e5774b8d92c910f58d414 WHIRLPOOL bcc67e118e47944d7a2fa63f3c52a2d79cd4162086cda0478b664b39bc3b4a8c6a312f3c0ebf34f02ab9452f9cb05da21c751323bfaf3dbf3f0d95ffb706c2b4
diff --git a/media-sound/qtagger/metadata.xml b/media-sound/qtagger/metadata.xml
new file mode 100644
index 000000000000..d3a41ffbcc64
--- /dev/null
+++ b/media-sound/qtagger/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>qt</herd>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="google-code">qtagger</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/qtagger/qtagger-1.0.1-r1.ebuild b/media-sound/qtagger/qtagger-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..3a1f842ba0a5
--- /dev/null
+++ b/media-sound/qtagger/qtagger-1.0.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Simple Qt4 ID3v2 tag editor"
+HOMEPAGE="http://code.google.com/p/qtagger"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+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 "s/doc\/${PN}/doc\/${PF}/" CMakeLists.txt
+
+	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 "${D}"/usr/share/doc/${PF}/{ChangeLog~,LICENSE}
+}
diff --git a/media-sound/qtagger/qtagger-1.0.1.ebuild b/media-sound/qtagger/qtagger-1.0.1.ebuild
new file mode 100644
index 000000000000..103f2dc7e5b4
--- /dev/null
+++ b/media-sound/qtagger/qtagger-1.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit cmake-utils
+
+DESCRIPTION="Simple Qt4 ID3v2 tag editor"
+HOMEPAGE="http://code.google.com/p/qtagger"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="media-libs/taglib
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# fix doc installation path
+	sed -i "s/doc\/${PN}/doc\/${PF}/" CMakeLists.txt
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}	-DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON"
+	cmake-utils_src_configure
+}
diff --git a/media-sound/qtgain/Manifest b/media-sound/qtgain/Manifest
new file mode 100644
index 000000000000..545a6460d874
--- /dev/null
+++ b/media-sound/qtgain/Manifest
@@ -0,0 +1 @@
+DIST qtgain-0.9.5.tar.lzma 60433 SHA256 4429bae7c034dd9d8fd263d7fe8eeb94a259617e5a8b8fccfe77a1e44fe07ac2
diff --git a/media-sound/qtgain/metadata.xml b/media-sound/qtgain/metadata.xml
new file mode 100644
index 000000000000..30d1023796f6
--- /dev/null
+++ b/media-sound/qtgain/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <herd>qt</herd>
+</pkgmetadata>
diff --git a/media-sound/qtgain/qtgain-0.9.5.ebuild b/media-sound/qtgain/qtgain-0.9.5.ebuild
new file mode 100644
index 000000000000..2ac6800028be
--- /dev/null
+++ b/media-sound/qtgain/qtgain-0.9.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_PN="QtGain"
+inherit eutils qt4-r2
+
+DESCRIPTION="A simple frontend to mp3gain, vorbisgain and metaflac"
+HOMEPAGE="http://www.qt-apps.org/content/show.php/QtGain?content=56842"
+SRC_URI="http://www.qt-apps.org/CONTENT/content-files/56842-${MY_PN}.tar.lzma
+	-> ${P}.tar.lzma"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac mp3 mp4 vorbis"
+
+DEPEND="dev-qt/qtgui:4"
+RDEPEND="${DEPEND}
+	flac? ( media-libs/flac )
+	mp3? ( media-sound/mp3gain )
+	mp4? ( media-sound/aacgain )
+	vorbis? ( media-sound/vorbisgain )
+	media-sound/id3v2"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_install() {
+	dobin bin/${PN}
+	newicon Icons/lsongs.png ${PN}.png
+	make_desktop_entry ${PN} ${MY_PN}
+}
diff --git a/media-sound/qtmpc/Manifest b/media-sound/qtmpc/Manifest
new file mode 100644
index 000000000000..7bd73a6afcc1
--- /dev/null
+++ b/media-sound/qtmpc/Manifest
@@ -0,0 +1 @@
+DIST QtMPC-0.6.1.tar.bz2 96341 SHA256 82287a26788b36d49db26518b66203f332cf686eefb81ee2d9be095e61123a62
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..721dd1c8d2fa
--- /dev/null
+++ b/media-sound/qtmpc/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+</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..e5062fe1858a
--- /dev/null
+++ b/media-sound/qtmpc/qtmpc-0.6.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..cd28228a34e3
--- /dev/null
+++ b/media-sound/qtractor/Manifest
@@ -0,0 +1,2 @@
+DIST qtractor-0.6.7.tar.gz 1440536 SHA256 4f779fa2e9704f382c16ff987f3dc21231b42c204b0097980844133a1d5db640 SHA512 cc0e55fe19d009b14fd2badebfd2e1449d0c4efb333c67f5d90578d3ab351e432ca915c295c1e01022043186b681fbf7d7c928162e153966b0ffaa1ab5ec8661 WHIRLPOOL f59d14da2738de46af99cc24d61bbb35fc98ecfdd74fc4a0c4b08a496efe6f268de83d11352dcd1bea0205d35562fb18ffaa085c2079d3097f7ac6ae7a7ba05b
+DIST qtractor-0.7.0.tar.gz 1447905 SHA256 5cda28d210e0301dfd1c426b015c0568dab29b8d27f8b5f0a7d0a4ae7eed22e4 SHA512 daa04b477d261ebd6d2af62db7cc708ab03960202332294ac7f62b475cbde5cb94db931674bd693ea4374aff489234ed0cefc5fc191d8ab079685b8039e03399 WHIRLPOOL 11d741a5799c352125f56a7ebcafec49442ffa4103c1be96d9e034ec0025ccbc681d26ea234e835b05d9d252e26d584810fa9dd1f05bd6adf1a866d734f65ec6
diff --git a/media-sound/qtractor/files/qtractor-0.7.0-qt55-includes.patch b/media-sound/qtractor/files/qtractor-0.7.0-qt55-includes.patch
new file mode 100644
index 000000000000..a8c4546eaa70
--- /dev/null
+++ b/media-sound/qtractor/files/qtractor-0.7.0-qt55-includes.patch
@@ -0,0 +1,47 @@
+diff -burN qtractor-0.7.0.orig/src/qtractorCurve.h qtractor-0.7.0/src/qtractorCurve.h
+--- qtractor-0.7.0.orig/src/qtractorCurve.h	2015-07-25 06:06:44.869457637 +0800
++++ qtractor-0.7.0/src/qtractorCurve.h	2015-08-02 23:44:59.664835605 +0800
+@@ -26,7 +26,7 @@
+ #include "qtractorMidiSequence.h"
+ 
+ #include <QColor>
+-
++#include <QObject>
+ 
+ // Forward declarations.
+ class qtractorTimeScale;
+diff -burN qtractor-0.7.0.orig/src/qtractorMidiEngine.h qtractor-0.7.0/src/qtractorMidiEngine.h
+--- qtractor-0.7.0.orig/src/qtractorMidiEngine.h	2015-07-25 06:06:44.887457637 +0800
++++ qtractor-0.7.0/src/qtractorMidiEngine.h	2015-08-02 23:45:24.057834421 +0800
+@@ -30,6 +30,7 @@
+ #include <alsa/asoundlib.h>
+ 
+ #include <QHash>
++#include <QObject>
+ 
+ // Forward declarations.
+ class qtractorMidiBus;
+diff -burN qtractor-0.7.0.orig/src/qtractorMidiTimer.h qtractor-0.7.0/src/qtractorMidiTimer.h
+--- qtractor-0.7.0.orig/src/qtractorMidiTimer.h	2015-07-25 06:06:44.890457637 +0800
++++ qtractor-0.7.0/src/qtractorMidiTimer.h	2015-08-02 23:45:44.008833452 +0800
+@@ -23,7 +23,7 @@
+ #define __qtractorMidiTimer_h
+ 
+ #include <QStringList>
+-
++#include <QObject>
+ 
+ //----------------------------------------------------------------------
+ // class qtractorMidiTimer -- ALSA sequencer timer stuff (singleton).
+diff -burN qtractor-0.7.0.orig/src/qtractorTimeScale.h qtractor-0.7.0/src/qtractorTimeScale.h
+--- qtractor-0.7.0.orig/src/qtractorTimeScale.h	2015-07-25 06:06:44.900457637 +0800
++++ qtractor-0.7.0/src/qtractorTimeScale.h	2015-08-02 23:46:02.666832546 +0800
+@@ -26,7 +26,7 @@
+ 
+ #include <QStringList>
+ #include <QColor>
+-
++#include <QObject>
+ 
+ //----------------------------------------------------------------------
+ // class qtractorTimeScale -- Time scale conversion helper class.
diff --git a/media-sound/qtractor/metadata.xml b/media-sound/qtractor/metadata.xml
new file mode 100644
index 000000000000..2ff56672fdc9
--- /dev/null
+++ b/media-sound/qtractor/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proaudio</herd>
+  <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.6.7.ebuild b/media-sound/qtractor/qtractor-0.6.7.ebuild
new file mode 100644
index 000000000000..16f8edad395a
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.6.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit qt4-r2 flag-o-matic
+
+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 rubberband vorbis cpu_flags_x86_sse zlib"
+
+RDEPEND=">=dev-qt/qtcore-4.2:4
+	>=dev-qt/qtgui-4.7:4
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-sound/jack-audio-connection-kit
+	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"
+
+DOCS="README ChangeLog TODO AUTHORS"
+
+src_configure() {
+	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 rubberband librubberband) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable zlib libz) \
+		$(use_enable debug)
+	eqmake4 qtractor.pro -o qtractor.mak
+}
diff --git a/media-sound/qtractor/qtractor-0.7.0.ebuild b/media-sound/qtractor/qtractor-0.7.0.ebuild
new file mode 100644
index 000000000000..98a9acbd50a9
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.7.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	)
+	media-libs/alsa-lib
+	media-libs/libsndfile
+	media-sound/jack-audio-connection-kit
+	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"
+
+DOCS="README ChangeLog TODO AUTHORS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-qt55-includes.patch
+}
+
+src_configure() {
+	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) \
+		$(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/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
new file mode 100644
index 000000000000..da1264634014
--- /dev/null
+++ b/media-sound/qtscrobbler/Manifest
@@ -0,0 +1 @@
+DIST qtscrob-0.10.tar.bz2 132507 SHA256 b77451625d4943a1e19e4418616417944091339db7b31983c593f4bf7d73ee7b
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..dd2281bd0c8a
--- /dev/null
+++ b/media-sound/qtscrobbler/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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..1ce682cae3fc
--- /dev/null
+++ b/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7155a9b77582
--- /dev/null
+++ b/media-sound/quark/Manifest
@@ -0,0 +1,2 @@
+DIST quark-3.21.tar.gz 204423 SHA256 45b0b17c82f4c4ed58fc76548dba6ca3e766391c5e42ea5f207249056514ac6b
+DIST quark-3.24.tar.gz 215417 SHA256 afac7b03082fd581412cf701187a21a4d6f6eea75c207b366f4b1dc939fff04c SHA512 a34a3160ab4cfe976cbabd6b2d94cc21ca263c069c53ad6244ed23674e17bf713dc759af998d4ae74720c91ba5e452e3996408d6ae11305bf581eb9a71876a01 WHIRLPOOL bb90b6087cc48ef7333332b77f183f222a9cc85260a972694f145ad28a0ae80e377d0533d8719bed8d087f2532b52859858755f6426c81d11fa5e46d6c7751da
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..55d06d8daede
--- /dev/null
+++ b/media-sound/quark/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<use>
+		<flag name="gnome">Provides tray-icon and enables gconf support</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/quark/quark-3.21.ebuild b/media-sound/quark/quark-3.21.ebuild
new file mode 100644
index 000000000000..b1c6b1006fc6
--- /dev/null
+++ b/media-sound/quark/quark-3.21.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+GCONF_DEBUG=yes
+inherit flag-o-matic gnome2
+
+DESCRIPTION="Quark is the Anti-GUI Music Player with a cool Docklet!"
+HOMEPAGE="http://hsgg.github.com/quark/"
+SRC_URI="http://hsgg.github.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+RDEPEND="media-libs/xine-lib
+	x11-libs/gtk+:2
+	>=gnome-base/gconf-2
+	gnome-base/gnome-vfs"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS README"
+
+src_prepare() {
+	sed -i \
+		-e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		strange-quark/Makefile.{am,in} quark/Makefile.{am,in} || die #387823
+}
+
+src_configure() {
+	#367859
+	append-libs X11
+	gnome2_src_configure
+}
diff --git a/media-sound/quark/quark-3.24.ebuild b/media-sound/quark/quark-3.24.ebuild
new file mode 100644
index 000000000000..e06ead59817a
--- /dev/null
+++ b/media-sound/quark/quark-3.24.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://hsgg.github.com/quark/"
+SRC_URI="http://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..faadde9b1591
--- /dev/null
+++ b/media-sound/quimup/Manifest
@@ -0,0 +1,3 @@
+DIST quimup_1.3.1_src.tar.gz 239578 SHA256 4f125a2bc913b2946c98ecc94929e2a30c12dd201d55772b06473cb4a941bf8a SHA512 8f32e43fe72f7c95d79bf035edeb7e6d59ef8b867c348937ad5f1e0c5dae295120b803418e7bf19f7b556fdb0eae87f0425da6ada3db6baf319ec0c2a65322ae WHIRLPOOL 82220789000a451103080820837e6d3ded1ec3e5370591053854ecd429c1d5e866eb6f57265e863d86901d2044d315fc379b614185675732618718cc92dbf73e
+DIST quimup_1.3.2_src.tar.gz 228123 SHA256 a47f9e1e5debcca573acb08ef20e0f41ff74affb3c5857883de8365d741580be SHA512 6a38235f82e0e559bdf0c18503b3def77abd9cda4ae79febaea7dab354f6bc262e7f2c55c4195c5ea890a5c2f72a4e34bdffb3411d03c2c21accc427f9446263 WHIRLPOOL 909e06f9428b0008333dcf075f7e66f1bf7a2d5eb26838997efef91e358076eccdd7a7838bac7823e8c62660ef5c06d33ad6f7e4a95a28f954e6a2d359a70976
+DIST quimup_1.4.0_src.tar.gz 225621 SHA256 b46f8ff651b9154a43cf90b005c160cbbddcc2fb8c6b17dfdee9b6c4a2e131ea SHA512 e5351d33a8082371fa50914381fcb7d0b15fe2d8d65feab64774c2d85476b6135d199a17bf125d2e39fa64916bc3d31da1ba5eec6b274ff6298e0b93237f8b61 WHIRLPOOL c51e3ebe1a686415358f92aa7485f9bb03334f54fa53deaf8fabfcf8ea637f5e0dbd0ee9f10cba7fe2513e0d87586ff053d2f837adee7447fed3f8e7bceed3ce
diff --git a/media-sound/quimup/files/quimup-1.2.0-gcc47.patch b/media-sound/quimup/files/quimup-1.2.0-gcc47.patch
new file mode 100644
index 000000000000..5626ea0733cd
--- /dev/null
+++ b/media-sound/quimup/files/quimup-1.2.0-gcc47.patch
@@ -0,0 +1,13 @@
+diff --git a/src/qm_mpdcom.cpp b/src/qm_mpdcom.cpp
+index 5659c9b..a949798 100644
+--- a/src/qm_mpdcom.cpp
++++ b/src/qm_mpdcom.cpp
+@@ -19,6 +19,8 @@
+  *  along with this program. If not, see http://www.gnu.org/licenses/.
+  */
+ 
++#include <unistd.h>
++
+ #include "qm_mpdcom.h"
+ 
+ qm_mpdCom::qm_mpdCom()
diff --git a/media-sound/quimup/metadata.xml b/media-sound/quimup/metadata.xml
new file mode 100644
index 000000000000..00412319d72b
--- /dev/null
+++ b/media-sound/quimup/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+    <email>angelos@gentoo.org</email>
+    <name>Christoph Mende</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">quimup</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/quimup/quimup-1.3.1.ebuild b/media-sound/quimup/quimup-1.3.1.ebuild
new file mode 100644
index 000000000000..84e651402c36
--- /dev/null
+++ b/media-sound/quimup/quimup-1.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils qt4-r2
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="A Qt4 client for the music player daemon (MPD) written in C++"
+HOMEPAGE="http://mpd.wikia.com/wiki/Client:Quimup"
+SRC_URI="mirror://sourceforge/musicpd/${MY_P}_src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-qt/qtgui:4
+	>=media-libs/libmpdclient-2.3"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( changelog FAQ.txt README )
+
+src_prepare() {
+	sed -i -e "/FLAGS/d" ${PN}.pro || die
+	epatch "${FILESDIR}"/${PN}-1.2.0-gcc47.patch
+}
+
+src_install() {
+	default
+	dobin ${PN}
+
+	newicon src/resources/mn_icon.png ${PN}.png
+	make_desktop_entry ${PN} Quimup
+}
diff --git a/media-sound/quimup/quimup-1.3.2.ebuild b/media-sound/quimup/quimup-1.3.2.ebuild
new file mode 100644
index 000000000000..ebe63bb78f1e
--- /dev/null
+++ b/media-sound/quimup/quimup-1.3.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils qt4-r2
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="A Qt4 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/qtgui:4
+	>=media-libs/libmpdclient-2.3
+	media-libs/taglib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( changelog FAQ.txt README )
+
+src_prepare() {
+	sed -i -e "/FLAGS/d" ${PN}.pro || die
+	epatch "${FILESDIR}"/${PN}-1.2.0-gcc47.patch
+}
+
+src_install() {
+	default
+	dobin ${PN}
+
+	newicon src/resources/mn_icon.png ${PN}.png
+	make_desktop_entry ${PN} Quimup
+}
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..becd4b0a8de3
--- /dev/null
+++ b/media-sound/quimup/quimup-1.4.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qmake-utils
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="A Qt4 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_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..3c0ca2732589
--- /dev/null
+++ b/media-sound/quodlibet/Manifest
@@ -0,0 +1,3 @@
+DIST quodlibet-2.6.3.tar.gz 2507416 SHA256 dff4ebb90c676678f72cecbff8ab15d80154354f40a865b6c9c82bb048d48a46 SHA512 ffbf03a4e0f1e5740b0c87ce62aa0cda33d017d0ee95dc6ecb3aeb8cadcde0fb525289658ea8edee088a382af4b261e44acb53cd0dc170520ed4070c8bf488e6 WHIRLPOOL 1ea653b1620170367cf7fa67519166c783192c0ee442598393699bc248cc697d608bf88903685e4ff39ec17b411c2be91d3807980951c61196436d0d23b88ca1
+DIST quodlibet-3.1.2.tar.gz 2615449 SHA256 3ef6320f4c72e2e759c2190e87749aae7b59c6b154f48d1102a142fbc961edbf SHA512 f2429606098b74b6affabaafe392ad99b2f739de0c858e4ba45a0e6416963f941fc8276f33e6c68ce54f8412c772399f0341757fbade8b57047d743518c37fe1 WHIRLPOOL 513be2c0c0aa9b0881fae9621d76a730417a309b55492031d1f91a5183ab6f4366b9418fd02c785178daf042e2abf726ce9945315f0cac38fd775ec73d529bc7
+DIST quodlibet-3.4.1.tar.gz 3318301 SHA256 0500f8f2e052a67e4397b8f7c634f800c9ce37c0456820aedbbef4003354ba78 SHA512 2f77825b696c9bdf411a039c234383ea728af0ca85d103082a17e3e9c8a13d180f06147c82fad1f0bb06c6e37e66ad99e8e5c227a8a32ed23ca981f33344ffc9 WHIRLPOOL 59858b25a13b2ec24ddd332f846713c65d5081843efdae98505879c21c430e56b0792c55790636977c09098a4aaf8250cbc93e7f4f1862dc2bcc55a7ba2f0871
diff --git a/media-sound/quodlibet/metadata.xml b/media-sound/quodlibet/metadata.xml
new file mode 100644
index 000000000000..c8928e9cea10
--- /dev/null
+++ b/media-sound/quodlibet/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>
+		<email>tamiko@gentoo.org</email>
+		<name>Matthias Maier</name>
+	</maintainer>
+	<herd>sound</herd>
+	<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>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/quodlibet/quodlibet-2.6.3.ebuild b/media-sound/quodlibet/quodlibet-2.6.3.ebuild
new file mode 100644
index 000000000000..cd4939ac1ddd
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-2.6.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 gnome2-utils fdo-mime
+
+DESCRIPTION="audio library tagger, manager, and player for GTK+"
+HOMEPAGE="http://code.google.com/p/quodlibet/"
+SRC_URI="http://bitbucket.org/lazka/${PN}-files/raw/default/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="+dbus gstreamer ipod +udev"
+
+COMMON_DEPEND=">=dev-python/pygtk-2.24[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON_DEPEND}
+	dev-libs/keybinder:0
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=media-libs/mutagen-1.20[${PYTHON_USEDEP}]
+	gstreamer? (
+		>=dev-python/gst-python-0.10.2:0.10[${PYTHON_USEDEP}]
+		media-libs/gst-plugins-good:0.10
+		media-plugins/gst-plugins-meta:0.10
+		)
+	!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 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool"
+REQUIRED_USE="ipod? ( dbus )"
+
+src_prepare() {
+	sed -i -e '/usr.*bin.*env/s:python:python2:' {exfalso,quodlibet}.py || die
+
+	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.1.2.ebuild b/media-sound/quodlibet/quodlibet-3.1.2.ebuild
new file mode 100644
index 000000000000..1e344b165e1b
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-3.1.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 gnome2-utils fdo-mime
+
+DESCRIPTION="audio library tagger, manager, and player for GTK+"
+HOMEPAGE="http://code.google.com/p/quodlibet/"
+SRC_URI="http://bitbucket.org/lazka/${PN}-files/raw/default/releases/${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.22[${PYTHON_USEDEP}]
+	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 )"
+DEPEND="dev-util/intltool"
+REQUIRED_USE="ipod? ( dbus )"
+
+src_prepare() {
+	sed -i -e '/usr.*bin.*env/s:python:python2:' {exfalso,quodlibet}.py || die
+
+	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.4.1.ebuild b/media-sound/quodlibet/quodlibet-3.4.1.ebuild
new file mode 100644
index 000000000000..2f90e18d2b90
--- /dev/null
+++ b/media-sound/quodlibet/quodlibet-3.4.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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.22[${PYTHON_USEDEP}]
+	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/rawrec/Manifest b/media-sound/rawrec/Manifest
new file mode 100644
index 000000000000..f85882e7b518
--- /dev/null
+++ b/media-sound/rawrec/Manifest
@@ -0,0 +1 @@
+DIST rawrec-0.9.991.tar.gz 62134 SHA256 1b65d65ae5f11650cc9cd2c10d54ac379eaaa802b89b08423b6a95046faac03f
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..1421a55ad46b
--- /dev/null
+++ b/media-sound/rawrec/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..6043f036a215
--- /dev/null
+++ b/media-sound/rawrec/rawrec-0.9.991.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..5daa7e38bc45
--- /dev/null
+++ b/media-sound/rcenter/Manifest
@@ -0,0 +1 @@
+DIST rcenter-0.6.2.tgz 15053 RMD160 58840cdd8022be16682803e0904e08a817fd00ef SHA1 d587aff9df68e2290c7cf141ff6eaadf7d0358aa SHA256 53b82756e11bc2e4e64242e0fd7f37aa5ceb5179d45b504c598958b9d101a800
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/rcenter/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..4e6bd14b48f7
--- /dev/null
+++ b/media-sound/rcenter/rcenter-0.6.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..0968cd1df285
--- /dev/null
+++ b/media-sound/redoflacs/Manifest
@@ -0,0 +1,4 @@
+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
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..83782c22fa7c
--- /dev/null
+++ b/media-sound/redoflacs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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..bf796c971d96
--- /dev/null
+++ b/media-sound/redoflacs/redoflacs-0.15.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..3277de9ac6d1
--- /dev/null
+++ b/media-sound/redoflacs/redoflacs-0.16.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a45abf954359
--- /dev/null
+++ b/media-sound/redoflacs/redoflacs-0.19.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a45abf954359
--- /dev/null
+++ b/media-sound/redoflacs/redoflacs-0.30.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..46867a260d5b
--- /dev/null
+++ b/media-sound/retrovol/Manifest
@@ -0,0 +1 @@
+DIST retrovol-0.12.tar.gz 202171 SHA256 f0360f43aef692060fa8d37c7e4d4e8f1d997895a2a93ebcf9e0fbb555b0c66c SHA512 9e485c9c8d086f53c4b0a736bf09fc74d7393014bdffcd50146c288c536e77334dcb224e47b26bc3abe09a4b1694625ab30e126036a7550f46f33a9cec405e81 WHIRLPOOL d7e0a27c569dfa97e771c3b83c58bda64b6e77765cd0112da02da808d5a101eb7566c7259c04121062e0a01e3b9b9e097ebd84e57c2a9c3dd6b5912b5e45ff7d
diff --git a/media-sound/retrovol/metadata.xml b/media-sound/retrovol/metadata.xml
new file mode 100644
index 000000000000..3bf6bcfeb512
--- /dev/null
+++ b/media-sound/retrovol/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+</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..379ff2411efb
--- /dev/null
+++ b/media-sound/retrovol/retrovol-0.12.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..709321941e97
--- /dev/null
+++ b/media-sound/rexima/Manifest
@@ -0,0 +1 @@
+DIST rexima-1.4.tar.gz 15903 SHA256 bd5192bc12b6e3b1149cb936403fddba7985628ae85d9d08f6a79f2aca35bde6
diff --git a/media-sound/rexima/metadata.xml b/media-sound/rexima/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/rexima/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/rexima/rexima-1.4.ebuild b/media-sound/rexima/rexima-1.4.ebuild
new file mode 100644
index 000000000000..c534bdae8631
--- /dev/null
+++ b/media-sound/rexima/rexima-1.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	tc-export CC
+	echo "LDLIBS=-lncurses" > Makefile
+	echo "all: rexima" >> Makefile
+	emake || die "emake failed"
+}
+
+src_install () {
+	dobin rexima || die
+	doman rexima.1 || die
+	dodoc NEWS README ChangeLog
+}
diff --git a/media-sound/rezound/Manifest b/media-sound/rezound/Manifest
new file mode 100644
index 000000000000..8d4af37bee95
--- /dev/null
+++ b/media-sound/rezound/Manifest
@@ -0,0 +1,2 @@
+DIST rezound-0.12.3_beta-patches-6.tar.bz2 14673 SHA256 fd395ba49609e1d4c6e54f291dde2d97b6a8f9ea7905c2428b68a0587bf40f89 SHA512 95b8bd8626b10160e3c74ce75f2ffe675a346f64438df7f3be5cf8b61b0e9b61ba92ec8452406993c3c11adba68d4ac0733eaf43171a535db8c0b3fc2ba606c3 WHIRLPOOL ae6fac793430c3d99fccf583ea22ce68e9647bb285e1dd75131376bed3dc3c1c76654b6db599e0b746bbe6c6e683c1a940dd8619e2cc56fd3d9f09cc6a35f7bc
+DIST rezound-0.12.3beta.tar.gz 1792882 SHA256 9a895f7011048df3485c9ab29b6abf3c4ac8eb4b8842164c42e34b8f0b76426f SHA512 6d043d5fd85ad3b3ea021f62eceeb06064d8f1dc00345bccd7a719c445d5798455b2e014812a99dfd015b4c0d2435c690c98b860efd34ccdfcd5a941b54b7202 WHIRLPOOL db69b0e6ff80c34978d6ea784fdadc2756577f493760cab465d86f4f8c9c360e44e32e73d036f05662afee244cf5053ccb26f8e9f6bb74033da2a0ad1d2aa187
diff --git a/media-sound/rezound/files/undefined-functions.patch b/media-sound/rezound/files/undefined-functions.patch
new file mode 100644
index 000000000000..ef5fbc94e769
--- /dev/null
+++ b/media-sound/rezound/files/undefined-functions.patch
@@ -0,0 +1,38 @@
+--- config/common.h.orig	2004-12-23 20:00:50.710795840 +0100
++++ config/common.h	2004-12-23 20:39:40.271648760 +0100
+@@ -21,6 +21,23 @@
+ #ifndef COMMON_H
+ #define COMMON_H
+ 
++/* Bugfix for ppc, some functions aren't defined */
++#include <cmath>
++
++#undef MAX
++#define MAX(a,b) ((a) > (b)?(a):(b))
++#undef MIN
++#define MIN(a,b) ((a) < (b)?(a):(b))
++#undef ABS
++#define ABS(a) ((a) >= 0?(a):-(a))
++
++#define floorl(l) floor(l)
++#define nearbyintl(l) nearbyint(l)
++#define fabsl(l) fabs(l)
++#define logl(l) log(l)
++#define expl(l) exp(l)
++#define ceill(l) ceil(l)
++
+ /* common.h -- This file will deal with low-level portability problems. It
+  * should be includede at the top of every package file. */
+ 
+--- src/frontend_fox/FXWaveCanvas.cpp.orig	2004-12-23 20:18:55.790838600 +0100
++++ src/frontend_fox/FXWaveCanvas.cpp	2004-12-23 20:39:37.568059768 +0100
+@@ -56,6 +56,9 @@
+ #include "../backend/CSoundPlayerChannel.h"
+ #include "drawPortion.h"
+ 
++#include "../../config/common.h"
++#define max(a,b) MAX(a,b)
++
+ static FXColor playStatusColor=FXRGB(255,0,0);
+ 
+ #define RIGHT_MARGIN 10
diff --git a/media-sound/rezound/metadata.xml b/media-sound/rezound/metadata.xml
new file mode 100644
index 000000000000..5200ae4c725e
--- /dev/null
+++ b/media-sound/rezound/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proaudio</herd>
+  <use>
+    <flag name="16bittmp">Use 16bit temporary files (default 32bit float), useful for slower computers</flag>
+    <flag name="soundtouch">compile with support for soundtouch</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">rezound</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild b/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild
new file mode 100644
index 000000000000..02ae0ade78e4
--- /dev/null
+++ b/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+MY_P=${P/_/}
+PATCHLEVEL=6
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Sound editor and recorder"
+HOMEPAGE="http://rezound.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc -sparc x86"
+IUSE="16bittmp alsa flac jack nls oss portaudio soundtouch vorbis"
+
+RDEPEND="=sci-libs/fftw-2*
+	>=x11-libs/fox-1.6.19:1.6
+	>=media-libs/audiofile-0.2.3
+	>=media-libs/ladspa-sdk-1.12
+	>=media-libs/ladspa-cmt-1.15
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	flac? ( >=media-libs/flac-1.1.2[cxx] )
+	jack? ( media-sound/jack-audio-connection-kit )
+	portaudio? ( >=media-libs/portaudio-18 )
+	soundtouch? ( >=media-libs/libsoundtouch-1.2.1 )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	virtual/pkgconfig
+	sys-devel/flex
+	dev-util/reswrap"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	AT_M4DIR="config/m4" eautoreconf
+}
+
+src_configure() {
+	# fix compilation errors on ppc, where some
+	# of the required functions aren't defined
+	use ppc && epatch "${FILESDIR}/undefined-functions.patch"
+
+	# following features can't be disabled if already installed:
+	# -> flac, oggvorbis, soundtouch
+	local sampletype="--enable-internal-sample-type=float"
+	use 16bittmp && sampletype="--enable-internal-sample-type=int16"
+
+	# -O3 isn't safe wrt #275437
+	replace-flags -O[3-9] -O2
+
+	econf \
+		$(use_enable alsa) \
+		$(use_enable jack) \
+		$(use_enable nls) \
+		$(use_enable oss) \
+		$(use_enable portaudio) \
+		$(use_enable flac) \
+		$(use_enable vorbis) \
+		$(use_enable soundtouch) \
+		${sampletype} \
+		--enable-ladspa \
+		--enable-largefile
+}
+
+src_install() {
+	make DESTDIR="${D}" install
+
+	# remove wrong doc directory
+	rm -rf "${D}/usr/doc"
+
+	dodoc docs/{AUTHORS,NEWS,README*}
+	dodoc docs/{TODO_FOR_USERS_TO_READ,*.txt}
+	newdoc README README.rezound
+
+	docinto code
+	dodoc docs/code/*
+	newicon src/images/icon_logo_32.gif rezound.gif
+	make_desktop_entry rezound Rezound rezound.gif AudioVideo
+}
diff --git a/media-sound/rgain/Manifest b/media-sound/rgain/Manifest
new file mode 100644
index 000000000000..7f916b083eb2
--- /dev/null
+++ b/media-sound/rgain/Manifest
@@ -0,0 +1 @@
+DIST rgain-1.2.1.tar.gz 24741 SHA256 041b4217d506937a7199ed3a406387760f06db38fef817f1aee883af24eb5e32 SHA512 ac9a0c9918e55150d34b07dfbe839a0e497f8c5793ecbaad4f35063f2e00e0ebd1cb9739c5d0022513c2fe9b0aa880941ba848d791a4db31373ad0d421a133df WHIRLPOOL bb2288eda097ff2963c888eb910813a62becf6bdcec777bf324b93cf1ab9f54104251ca154d6c1504639580319e56b2bff55e94bea4ea23ab1bfd253d6a4063d
diff --git a/media-sound/rgain/metadata.xml b/media-sound/rgain/metadata.xml
new file mode 100644
index 000000000000..37ee884db8de
--- /dev/null
+++ b/media-sound/rgain/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>
+    <email>maintainer-needed@gentoo.org</email>
+  </maintainer>
+  <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..c0fd636a96d1
--- /dev/null
+++ b/media-sound/rgain/rgain-1.2.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Set of programmes and Python modules to deal with Replay Gain information"
+HOMEPAGE="http://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..d08f92865ad2
--- /dev/null
+++ b/media-sound/rhythmbox/Manifest
@@ -0,0 +1 @@
+DIST rhythmbox-3.2.1.tar.xz 6833060 SHA256 bf43ca4f5b7531751241f5e67eaba7da6d9748dd827a600eedf9444961537938 SHA512 866d6e4a4a3b5561ac76b38ac87001f20b4cfa4e9ad201060a556eac004c72f834a15368d132c1fa59172d0dbdf73e14f8a2f7ea1f10274a4f7fcd50562e9a34 WHIRLPOOL a4c942245e876766dd9b6fd1ba44b463d6f33d7a568e13c3d76da56045c90c2b34cf43749fa5b243b93d50e566a194753dc9ba6202366c35618aa81cafcebdfc
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
new file mode 100644
index 000000000000..bb30c380f030
--- /dev/null
+++ b/media-sound/rhythmbox/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <herd>gstreamer</herd>
+  <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="html">Use <pkg>net-libs/webkit-gtk</pkg> for detecting and displaying HTML podcast episode descriptions.</flag>
+	<flag name="libsecret">Enable libsecret support to store login credentials</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.2.1.ebuild b/media-sound/rhythmbox/rhythmbox-3.2.1.ebuild
new file mode 100644
index 000000000000..ad1f0db79994
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-3.2.1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{3,4} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 python-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 +libsecret html ipod libnotify lirc mtp nsplugin +python
+test +udev upnp-av visualizer webkit zeitgeist"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	webkit? ( python )
+	python? ( ^^ ( $(python_gen_useflags '*') ) )
+"
+
+# Tests failing for years without upstream caring at all
+# upstream bug #688745
+RESTRICT="test"
+
+# FIXME: double check what to do with fm-radio plugin
+# webkit-gtk-1.10 is needed because it uses gstreamer-1.0
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/libxml2-2.7.8:2
+	>=x11-libs/gtk+-3.6:3[X,introspection]
+	>=x11-libs/gdk-pixbuf-2.18:2
+	>=dev-libs/gobject-introspection-0.10
+	>=dev-libs/libpeas-0.7.3[gtk,python?]
+	>=dev-libs/totem-pl-parser-3.2
+	>=net-libs/libsoup-2.34:2.4
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	>=sys-libs/tdb-1.2.6
+	dev-libs/json-glib
+
+	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.0 )
+	cdr? ( >=app-cdr/brasero-2.91.90 )
+	daap? (
+		>=net-libs/libdmapsharing-2.9.19:3.0
+		media-plugins/gst-plugins-soup:1.0 )
+	libsecret? ( >=app-crypt/libsecret-0.18 )
+	html? ( >=net-libs/webkit-gtk-1.10:3 )
+	libnotify? ( >=x11-libs/libnotify-0.7.0 )
+	lirc? ( app-misc/lirc )
+	python? ( >=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 ) )
+	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/gnome-icon-theme-symbolic
+	upnp-av? (
+		>=media-libs/grilo-0.2:0.2
+		>=media-plugins/grilo-plugins-0.2:0.2[upnp-av] )
+	python? (
+		>=dev-libs/libpeas-0.7.3[${PYTHON_USEDEP}]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+
+		dbus? ( sys-apps/dbus )
+		libsecret? ( >=app-crypt/libsecret-0.18[introspection] )
+		webkit? (
+			dev-python/mako[${PYTHON_USEDEP}]
+			>=net-libs/webkit-gtk-1.10:3[introspection] ) )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	app-text/yelp-tools
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	>=app-text/gnome-doc-utils-0.9.1
+	test? ( dev-libs/check )
+"
+
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+}
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
+		MAINTAINERS MAINTAINERS.old NEWS README THANKS"
+
+	rm -v lib/rb-marshal.{c,h} || die # upstream bug 737831
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# FIXME: bug???
+	export GST_INSPECT=/bin/true
+
+	# --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 html webkit) \
+		$(use_with ipod) \
+		$(use_with libsecret) \
+		$(use_with mtp) \
+		$(use_with udev gudev)
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
diff --git a/media-sound/rip/Manifest b/media-sound/rip/Manifest
new file mode 100644
index 000000000000..fe64d2615296
--- /dev/null
+++ b/media-sound/rip/Manifest
@@ -0,0 +1 @@
+DIST rip-1.07.tar.gz 110261 RMD160 4c181d7032e89d3f9cba952242d23c19b69cfdcb SHA1 a7b60dbc5dbaf5ca0d24c9e554fa3e5885bbccb1 SHA256 3031c5efbfb72bcd80de70b13528702893be45f386764a285c95c42b8550c6a8
diff --git a/media-sound/rip/metadata.xml b/media-sound/rip/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/rip/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..6d80cda02a5a
--- /dev/null
+++ b/media-sound/rip/rip-1.07.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..5cd6e0e0962d
--- /dev/null
+++ b/media-sound/ripperx/Manifest
@@ -0,0 +1 @@
+DIST ripperX-2.7.3.tar.gz 536059 SHA256 7d58f95d9fc3b43890db4c09eafa3880e45880c9385524ce8786024fc5d2198c SHA512 fad4d8ee5e7ea37608b827230446f213c871d425920d0ffae5b0151e2270b36ca67156a78a530a3267141f8c5d0577a17647e4342468662472ea0f88bda69cea WHIRLPOOL 57a6acfad3e3e0701592f77a97980ad2db305c59e8cba4a28031c18e41bc4d67fef49534b2c7c8b469c9d036357dec077a20334c121e116cd36892dbd6295db7
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..29910c778d39
--- /dev/null
+++ b/media-sound/ripperx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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..41c684320349
--- /dev/null
+++ b/media-sound/ripperx/ripperx-2.7.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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..fe301a60d297
--- /dev/null
+++ b/media-sound/rosegarden/Manifest
@@ -0,0 +1,4 @@
+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
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..b1d330caed72
--- /dev/null
+++ b/media-sound/rosegarden/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proaudio</herd>
+  <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..679534a7b89b
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-13.04.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..3275284a799c
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-13.10-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..edb1384731a8
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-14.02.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b4960e032345
--- /dev/null
+++ b/media-sound/rosegarden/rosegarden-14.12.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/rplay/Manifest b/media-sound/rplay/Manifest
new file mode 100644
index 000000000000..ba37455eb237
--- /dev/null
+++ b/media-sound/rplay/Manifest
@@ -0,0 +1,2 @@
+DIST rplay-3.3.2.tar.gz 480015 SHA256 74265153457a44e1e2f0fa38c59c9b12ea5b684db2c83eb055184f86db81fdd8
+DIST rplay_3.3.2-12.diff.gz 25322 SHA256 9f38ea87379e915ffb3fb338baf454f7ce2cbc605616c27b82df25f708220626
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..4acb13994e2f
--- /dev/null
+++ b/media-sound/rplay/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..8ba1e6fba0b1
--- /dev/null
+++ b/media-sound/rplay/rplay-3.3.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/saydate/Manifest b/media-sound/saydate/Manifest
new file mode 100644
index 000000000000..88341abc6f11
--- /dev/null
+++ b/media-sound/saydate/Manifest
@@ -0,0 +1 @@
+DIST saydate-0.3.0.tar.gz 137732 SHA256 d57ceae4daebe64b559dcdf444e59cf965ef1bdc316d0385a6abfbfc6381ee9a
diff --git a/media-sound/saydate/metadata.xml b/media-sound/saydate/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/saydate/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..8cb4dc131e25
--- /dev/null
+++ b/media-sound/saydate/saydate-0.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e2dd5c1db386
--- /dev/null
+++ b/media-sound/schismtracker/Manifest
@@ -0,0 +1,2 @@
+DIST schismtracker-20110101.tar.bz2 1095791 RMD160 4419ffddf55f8cecff6a029a13e4e6186b35f2c4 SHA1 083f5e164a3acd3d5f7de2a2f596e0c8a3cded04 SHA256 6afa58eef7327c9713a4ba49833b79709ae5265ccf21df6fb822e3b7db9a7064
+DIST schismtracker-20120105.tar.bz2 1097124 RMD160 5f49dba67202742bccca87a09dcd7d9510aa83b9 SHA1 26ead2bfc14a1de9152beee8b8294f81c878ab26 SHA256 31cef23e6806027618aef03675a5e4681043a99afa6e9e92d82ad4cec5e6c7db
diff --git a/media-sound/schismtracker/metadata.xml b/media-sound/schismtracker/metadata.xml
new file mode 100644
index 000000000000..3bf6bcfeb512
--- /dev/null
+++ b/media-sound/schismtracker/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/schismtracker/schismtracker-20110101.ebuild b/media-sound/schismtracker/schismtracker-20110101.ebuild
new file mode 100644
index 000000000000..bec9dccbaaf9
--- /dev/null
+++ b/media-sound/schismtracker/schismtracker-20110101.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="a free reimplementation of Impulse Tracker, a program 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_install() {
+	default
+	doicon icons/schism-icon.svg
+	newicon icons/schism-icon-48.png schism-icon.png
+	make_desktop_entry ${PN} "Schism Tracker" schism-icon
+}
diff --git a/media-sound/schismtracker/schismtracker-20120105.ebuild b/media-sound/schismtracker/schismtracker-20120105.ebuild
new file mode 100644
index 000000000000..e23a7b6b3b2c
--- /dev/null
+++ b/media-sound/schismtracker/schismtracker-20120105.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="a free reimplementation of Impulse Tracker, a program 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..cd84a571f004
--- /dev/null
+++ b/media-sound/scmpc/Manifest
@@ -0,0 +1 @@
+DIST scmpc-0.4.1.tar.bz2 88288 SHA256 f89958dc0449f1dfbcbe81b453986812196dc86200153ac700cf606297c3fde3 SHA512 7d9f8aad29d58f2227a6149a6b4c9bfc4d400946ac316cbb34482feffd71619c1f311cb1ce6f02c22912793e866661e4d976c8f4ee99ffd1e76be65c9a06d876 WHIRLPOOL 15036bae6c20670c5bc605f3c4b3a52a97f4527bdde6ac94788ec651c2f785bdc6c705644ae4937a7bf66a4ad498f858a14fbdbe4f821c007349e7026207fc62
diff --git a/media-sound/scmpc/files/scmpc-2.init b/media-sound/scmpc/files/scmpc-2.init
new file mode 100644
index 000000000000..e6165cc0e914
--- /dev/null
+++ b/media-sound/scmpc/files/scmpc-2.init
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/files/scmpc.init b/media-sound/scmpc/files/scmpc.init
new file mode 100644
index 000000000000..e9039da4a628
--- /dev/null
+++ b/media-sound/scmpc/files/scmpc.init
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+	need net
+	use mpd
+}
+
+checkconfig() {
+	if ! [ -f /etc/scmpc.conf ]; then
+		eerror "Configuration file /etc/scmpc.conf does not exist."
+		return 1
+	fi
+  
+	return 0
+}
+
+start () {
+	checkconfig || return 1
+   
+	ebegin "Starting scmpc"
+	start-stop-daemon --start --exec /usr/bin/scmpc
+	eend $?
+}
+
+stop () {
+	ebegin "Stopping scmpc"
+	start-stop-daemon --stop --exec /usr/bin/scmpc || eerror "scmpc is not running"
+	eend $?
+}
diff --git a/media-sound/scmpc/metadata.xml b/media-sound/scmpc/metadata.xml
new file mode 100644
index 000000000000..fb7ec4a9a25a
--- /dev/null
+++ b/media-sound/scmpc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</name>
+	</maintainer>
+</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..f51ad9644106
--- /dev/null
+++ b/media-sound/scmpc/scmpc-0.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="a client for MPD which submits your tracks to last.fm"
+HOMEPAGE="http://cmende.github.com/scmpc/"
+SRC_URI="http://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..5e72b4b8fbb8
--- /dev/null
+++ b/media-sound/seq24/Manifest
@@ -0,0 +1 @@
+DIST seq24-0.9.2.tar.bz2 213059 SHA256 dbcfd18b7744ae739717588dd71a9923e5c08cf8fe1d3e71c897515cab875b0a
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..0dc3775f83d7
--- /dev/null
+++ b/media-sound/seq24/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+</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..e60f933673c2
--- /dev/null
+++ b/media-sound/seq24/seq24-0.9.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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/setmixer/Manifest b/media-sound/setmixer/Manifest
new file mode 100644
index 000000000000..7c1455aacd0b
--- /dev/null
+++ b/media-sound/setmixer/Manifest
@@ -0,0 +1,2 @@
+DIST setmixer_27DEC94ds1-1.diff.gz 3843 RMD160 100713065cd12ef08561a9b3c4c72861e77d6623 SHA1 5e35dfa3de5972c59edcbac40e1b26e181234389 SHA256 922618c8a35208af81b043c1b4f4e08daab18e753acb20fc1d6837d15c435542
+DIST setmixer_27DEC94ds1.orig.tar.gz 2884 RMD160 16478b59a8a437f5f2d652612f673c112e1685a0 SHA1 34d6cf36b551e4f516f7acc17c190c3446b1457b SHA256 e9a570ecb5e02420414fa2aad650d2efd81587777bbe53b6de38423adb493d03
diff --git a/media-sound/setmixer/files/setmixer.rc b/media-sound/setmixer/files/setmixer.rc
new file mode 100644
index 000000000000..8c71076e7607
--- /dev/null
+++ b/media-sound/setmixer/files/setmixer.rc
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/setmixer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..0df5af5cda66
--- /dev/null
+++ b/media-sound/setmixer/setmixer-19941227_p1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..baa9764ca609
--- /dev/null
+++ b/media-sound/sexypsf/Manifest
@@ -0,0 +1 @@
+DIST sexypsf-0.4.7.tar.bz2 83001 RMD160 dc190758a9d457971da0d7b3d788ba0f3d25c88d SHA1 2229ece9b19e321c720d55afe3c77562a38aeab0 SHA256 6a6b4abb8b1cb919eb2d4cd23ae72cc2ec1360590831c131e58fcf99fe2b31aa
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/sexypsf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..f16ce62000a6
--- /dev/null
+++ b/media-sound/sexypsf/sexypsf-0.4.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/sfc/Manifest b/media-sound/sfc/Manifest
new file mode 100644
index 000000000000..f06e512845a2
--- /dev/null
+++ b/media-sound/sfc/Manifest
@@ -0,0 +1 @@
+DIST sfc-0.018.tar.gz 125680 SHA256 6a3566deb8396891107186c63bb576b9f28ac077d40a641a74f6ba221c85d3ee SHA512 9007f00d19acee7150b48718a742cf05df471c69a2f36cdfa9572aece80e1711dde03f9e31ad32892ef8bfc4b33a145d17ccabc29c63cacc40bb071a8b8b6262 WHIRLPOOL e505185e22fbdb9bbbc26d673ba75765fc26ca04b7cb7789bc1cf1d150d922dc449917b8b9c403d1e65b79462f3b4c9e98f50fd49a38b37067f95950711eeac4
diff --git a/media-sound/sfc/metadata.xml b/media-sound/sfc/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/sfc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..1248275277ca
--- /dev/null
+++ b/media-sound/sfc/sfc-0.018-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/shell-fm/Manifest b/media-sound/shell-fm/Manifest
new file mode 100644
index 000000000000..c007d53773e2
--- /dev/null
+++ b/media-sound/shell-fm/Manifest
@@ -0,0 +1 @@
+DIST shell-fm-0.8.tar.gz 54303 SHA256 b6d5b754c6ea0285c060f4989de730101dd6a172bb075a2a04b4649be33a06a3
diff --git a/media-sound/shell-fm/files/shell-fm-0.8-doublefree.patch b/media-sound/shell-fm/files/shell-fm-0.8-doublefree.patch
new file mode 100644
index 000000000000..5054ee1ad024
--- /dev/null
+++ b/media-sound/shell-fm/files/shell-fm-0.8-doublefree.patch
@@ -0,0 +1,24 @@
+Fix double free crash: http://bugs.gentoo.org/392413
+
+--- source/sckif.c
++++ source/sckif.c
+@@ -39,6 +39,8 @@
+ 
+ #include "split.h"
+ 
++#include "ropen.h" /* fshutdown */
++
+ struct hash track;
+ 
+ static int stcpsck = -1, sunixsck = -1;
+@@ -191,9 +193,7 @@
+ 
+ 	if(disconnect) {
+ 		debug("removing client\n");
+-		shutdown(SHUT_RDWR, client_socket);
+-		close(client_socket);
+-		fclose(fd);
++		fshutdown(& fd);
+ 
+ 		remove_handle(client_socket);
+ 	}
diff --git a/media-sound/shell-fm/metadata.xml b/media-sound/shell-fm/metadata.xml
new file mode 100644
index 000000000000..8868a09811d7
--- /dev/null
+++ b/media-sound/shell-fm/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<longdescription lang="en">
+		Shell.FM is a lightweight console based player for Last.FM radio
+		streams. It's written mainly for Linux, but should be able to run on any
+		UNIX based system (even Mac OS X) with some minor tweaks.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jkramer/shell-fm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/shell-fm/shell-fm-0.8-r1.ebuild b/media-sound/shell-fm/shell-fm-0.8-r1.ebuild
new file mode 100644
index 000000000000..76cd0962ebeb
--- /dev/null
+++ b/media-sound/shell-fm/shell-fm-0.8-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit flag-o-matic toolchain-funcs eutils
+
+DESCRIPTION="A lightweight console based player for Last.FM radio streams"
+HOMEPAGE="http://nex.scrapping.cc/shell-fm/"
+SRC_URI="https://github.com/jkramer/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-libs/libao
+	media-libs/libmad
+	media-libs/taglib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-apps/sed"
+
+src_unpack() {
+	unpack ${A}
+	mv *-${PN}-* "${S}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-doublefree.patch #392413
+
+	sed -i -e 's:-Os::' source/Makefile || die
+
+	tc-export CC AR
+	use ppc && append-flags -DWORDS_BIGENDIAN=1
+}
+
+src_install() {
+	dobin source/${PN}
+	doman manual/${PN}.1
+	exeinto /usr/share/${PN}/scripts
+	doexe scripts/{*.sh,*.pl,zcontrol}
+}
diff --git a/media-sound/shnflacverify/Manifest b/media-sound/shnflacverify/Manifest
new file mode 100644
index 000000000000..6d9941271b18
--- /dev/null
+++ b/media-sound/shnflacverify/Manifest
@@ -0,0 +1 @@
+DIST shnflacverify-0.3.zip 11845 SHA256 ce57b0b4bd707dff34b975557e7cc3705c6662a342202128342191a9077e7b5a
diff --git a/media-sound/shnflacverify/metadata.xml b/media-sound/shnflacverify/metadata.xml
new file mode 100644
index 000000000000..14e2445e0a77
--- /dev/null
+++ b/media-sound/shnflacverify/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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>
+</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..b323d9af3ccd
--- /dev/null
+++ b/media-sound/shnflacverify/shnflacverify-0.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="This program helps manage the verification of checksums related to Shorten and FLAC files"
+HOMEPAGE="http://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..1a54a378c760
--- /dev/null
+++ b/media-sound/shntool/Manifest
@@ -0,0 +1 @@
+DIST shntool-3.0.10.tar.gz 216061 RMD160 3c41c5da4ee11127dae02609052d1f1a355aef4a SHA1 7a2bc8801e180cf582f0e39775603582e35d50d2 SHA256 74302eac477ca08fb2b42b9f154cc870593aec8beab308676e4373a5e4ca2102
diff --git a/media-sound/shntool/metadata.xml b/media-sound/shntool/metadata.xml
new file mode 100644
index 000000000000..640e5338ce75
--- /dev/null
+++ b/media-sound/shntool/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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..c34e18591ed6
--- /dev/null
+++ b/media-sound/shntool/shntool-3.0.10-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..032054129721
--- /dev/null
+++ b/media-sound/shorten/Manifest
@@ -0,0 +1 @@
+DIST shorten-3.6.1.tar.gz 597581 SHA256 ce22e0676c93494ee7d094aed9b27ad018eae5f2478e8862ae1e962346405b66
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/shorten/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..3f27b611bf97
--- /dev/null
+++ b/media-sound/shorten/shorten-3.6.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/shoutcast-search/Manifest b/media-sound/shoutcast-search/Manifest
new file mode 100644
index 000000000000..2c9e7b2c230e
--- /dev/null
+++ b/media-sound/shoutcast-search/Manifest
@@ -0,0 +1,2 @@
+DIST shoutcast-search-0.3.1.tar.gz 130203 RMD160 3df0d834e36d8bbe70c9dc1649337b4e313f4bb3 SHA1 c815a8eb4da5e185a74a25d9ac808217835d6a2d SHA256 ee21ffdca8e9f2697fce03ad57597a3ba778c2da8671b7a5ab60bfe66673ec83
+DIST shoutcast-search-0.3.tar.gz 18025 RMD160 81aa5a80e69efdc29cb4c215736b3d60df6d281d SHA1 daa222d1150089a60664059dc252bb9cfa80f29e SHA256 48b51980749e3046c681b2f9652f9132eb6f206ff44f57d282d16ca362470575
diff --git a/media-sound/shoutcast-search/metadata.xml b/media-sound/shoutcast-search/metadata.xml
new file mode 100644
index 000000000000..ae573a60407f
--- /dev/null
+++ b/media-sound/shoutcast-search/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/shoutcast-search/shoutcast-search-0.3.1.ebuild b/media-sound/shoutcast-search/shoutcast-search-0.3.1.ebuild
new file mode 100644
index 000000000000..8c5daa88a9f8
--- /dev/null
+++ b/media-sound/shoutcast-search/shoutcast-search-0.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+PYTHON_MODNAME="shoutcast_search"
+
+inherit distutils
+
+DESCRIPTION="A command-line tool for searching SHOUTcast stations"
+HOMEPAGE="http://www.k2h.se/code/shoutcast-search.html"
+SRC_URI="http://github.com/halhen/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+S=${WORKDIR}/halhen-${PN}-fc6b3aa
+
+src_prepare() {
+	python_convert_shebangs 2 ${PN}
+	distutils_src_prepare
+}
+
+src_install() {
+	distutils_src_install
+	dobin ${PN} || die
+	doman ${PN}.1 || die
+	dodoc documentation.md || die
+}
diff --git a/media-sound/shoutcast-search/shoutcast-search-0.3.ebuild b/media-sound/shoutcast-search/shoutcast-search-0.3.ebuild
new file mode 100644
index 000000000000..a19cfc1513ba
--- /dev/null
+++ b/media-sound/shoutcast-search/shoutcast-search-0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit distutils
+
+DESCRIPTION="A command-line tool for searching SHOUTcast stations"
+HOMEPAGE="http://www.k2h.se/code/shoutcast-search.html"
+SRC_URI="http://www.k2h.se/code/dl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/python-2.4"
+DEPEND="${RDEPEND}
+	dev-python/setuptools"
+
+src_install() {
+	distutils_src_install
+	dobin ${PN} || die "dobin failed"
+	doman ${PN}.1 || die "doman failed"
+	dodoc documentation.md || die "dodoc failed"
+}
diff --git a/media-sound/shoutcast-server-bin/Manifest b/media-sound/shoutcast-server-bin/Manifest
new file mode 100644
index 000000000000..080cf571d457
--- /dev/null
+++ b/media-sound/shoutcast-server-bin/Manifest
@@ -0,0 +1 @@
+DIST sc_serv_1.9.8_Linux.tar.gz 60840 RMD160 b3618ece0a8939b826776fef313707675e846ece SHA1 8edf72fd3891630143f531cdd6b8bf13688b4ee3 SHA256 bb3a6eea5178ee79a014bbf0192bc44447c7a0c4fceb8872b9580153ba434fe6
diff --git a/media-sound/shoutcast-server-bin/files/1.9.8-sc_serv.conf.patch b/media-sound/shoutcast-server-bin/files/1.9.8-sc_serv.conf.patch
new file mode 100644
index 000000000000..09bf6af7980d
--- /dev/null
+++ b/media-sound/shoutcast-server-bin/files/1.9.8-sc_serv.conf.patch
@@ -0,0 +1,44 @@
+--- sc_serv.conf.orig	2007-02-28 21:35:24.000000000 +0200
++++ sc_serv.conf	2009-07-22 17:42:45.000000000 +0300
+@@ -50,17 +50,17 @@
+ ; Note: on win32 systems if no path is specified the location is

+ ; in the same dir as the executable, on *nix systems it is in the

+ ; current directory.

+-LogFile=sc_serv.log

++LogFile=/dev/null

+ 

+ ; RealTime displays a status line that is updated every second

+ ; with the latest information on the current stream (*nix and win32 

+ ; console systems only)

+-RealTime=1

++RealTime=0

+ 

+ ; ScreenLog controls whether logging is printed to the screen or not

+ ; on *nix and win32 console systems. It is useful to disable this when 

+ ; running servers in background without their own terminals. Default is 1

+-ScreenLog=1

++ScreenLog=0

+ 

+ ; ShowLastSongs specifies how many songs to list in the /played.html

+ ; page.  The default is 10.  Acceptable entries are 1 to 20.

+@@ -91,7 +91,7 @@
+ 

+ ; W3CLog describes the name of the logfile for W3C logging.  Default logfile is

+ ; sc_w3c.log, in the same directory wherever the DNAS gets started from.

+-W3CLog=sc_w3c.log

++W3CLog=/dev/null

+ 

+ 

+ ; ***************************

+@@ -153,9 +153,9 @@
+ 

+ ; ContentDir specifies the directory location on disk of where to stream

+ ; on-demand content from.  Subdirectories are supported as of DNAS 1.8.2.

+-; Default is ./content, meaning a directory named content in the same directory

++; Default is ./content/, meaning a directory named content in the same directory

+ ; as where sc_serv was invoked from.

+-; ContentDir=./content

++ContentDir=/opt/shoutcast/content/

+ 

+ ; IntroFile can specify a mp3 file that will be streamed to listeners right

+ ; when they connect before they hear the live stream.

diff --git a/media-sound/shoutcast-server-bin/files/shoutcast.2 b/media-sound/shoutcast-server-bin/files/shoutcast.2
new file mode 100644
index 000000000000..bd8e07b94bd9
--- /dev/null
+++ b/media-sound/shoutcast-server-bin/files/shoutcast.2
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+
+depend() {
+	need localmount
+}
+
+checkconfig() {
+	if ! [ -f /etc/shoutcast/sc_serv.conf ]; then
+		eerror "Can't find /etc/shoutcast/sc_serv.conf!"
+		return 1
+	fi
+
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+        ebegin "Starting SHOUTcast"
+	start-stop-daemon --background --start --quiet --user shoutcast \
+		--group nogroup --make-pidfile --pidfile /var/run/sc_serv.pid \
+		--exec /opt/bin/sc_serv /etc/shoutcast/sc_serv.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping SHOUTcast"
+	start-stop-daemon --stop --pidfile /var/run/sc_serv.pid --name sc_serv
+	eend $?
+}
diff --git a/media-sound/shoutcast-server-bin/metadata.xml b/media-sound/shoutcast-server-bin/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/shoutcast-server-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/shoutcast-server-bin/shoutcast-server-bin-1.9.8-r1.ebuild b/media-sound/shoutcast-server-bin/shoutcast-server-bin-1.9.8-r1.ebuild
new file mode 100644
index 000000000000..192f0d5848fa
--- /dev/null
+++ b/media-sound/shoutcast-server-bin/shoutcast-server-bin-1.9.8-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils user
+
+DESCRIPTION="SHOUTcast is a streaming audio system"
+HOMEPAGE="http://www.shoutcast.com/license"
+SRC_URI="sc_serv_${PV}_Linux.tar.gz"
+
+LICENSE="shoutcast"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+QA_PRESTRIPPED=/opt/bin/sc_serv
+
+RESTRICT="fetch"
+
+S=${WORKDIR}
+
+pkg_nofetch() {
+	elog "Download ${A} from ${HOMEPAGE} and copy it to ${DISTDIR}."
+}
+
+pkg_setup() {
+	enewuser shoutcast -1 -1 -1 nogroup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-sc_serv.conf.patch
+}
+
+src_install() {
+	into /opt
+	dobin sc_serv || die "dobin failed"
+
+	newinitd "${FILESDIR}"/shoutcast.2 shoutcast || die "newinitd failed"
+	dodir /opt/shoutcast/content
+
+	insinto /etc/shoutcast
+	doins sc_serv.conf || die "doins failed"
+
+	dodoc README.TXT
+
+	fowners -R shoutcast:nogroup /{etc,opt}/shoutcast || die "chown failed"
+	fperms -R 700 /{etc,opt}/shoutcast || die "chmod failed"
+}
+
+pkg_postinst() {
+	elog
+	elog "To start shoutcast, use the init.d script by running"
+	elog "/etc/init.d/shoutcast."
+	elog
+	elog "On demand content should be stored in /opt/shoutcast/content"
+	elog "See http://forums.winamp.com/showthread.php?threadid=75736 for"
+	elog "more information on setting up on demand content"
+	elog
+	elog "FAQ's can be found at:"
+	elog "http://forums.winamp.com/showthread.php?threadid=75736 "
+	elog "and can help you with server setup."
+	elog
+	elog "An Gentoo Linux shoutcast guide can be found at "
+	elog "http://www.gentoo.org/doc/en/shoutcast-config.xml"
+	elog
+}
diff --git a/media-sound/shoutcast-trans-bin/Manifest b/media-sound/shoutcast-trans-bin/Manifest
new file mode 100644
index 000000000000..071e4afa1776
--- /dev/null
+++ b/media-sound/shoutcast-trans-bin/Manifest
@@ -0,0 +1 @@
+DIST sc_trans_posix_040.tgz 351390 SHA256 b2aea79b034f227fcadc10c1c45bab769fa00b9a4990d849e73028872c95e232
diff --git a/media-sound/shoutcast-trans-bin/files/shoutcast_trans b/media-sound/shoutcast-trans-bin/files/shoutcast_trans
new file mode 100644
index 000000000000..4d4a779db3e4
--- /dev/null
+++ b/media-sound/shoutcast-trans-bin/files/shoutcast_trans
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+        need localmount
+	need shoutcast
+}
+
+checkconfig() {
+        if ! [ -f /etc/shoutcast/sc_trans.conf ] ; then
+                eerror "Configuration file /etc/shoutcast/sc_trans.conf does not exist!"
+                return 1
+        fi
+
+        return 0
+}
+
+start() {
+        checkconfig || return 1
+
+        ebegin "Starting Shoutcast Trans"
+        start-stop-daemon --start --quiet -m --pidfile /var/run/shoutcast_trans.pid --exec /opt/shoutcast/sc_trans_linux /etc/shoutcast/sc_trans.conf > /dev/null &
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping Shoutcast Trans"
+	start-stop-daemon --stop --quiet --pidfile /var/run/shoutcast_trans.pid
+        eend $?
+}
diff --git a/media-sound/shoutcast-trans-bin/metadata.xml b/media-sound/shoutcast-trans-bin/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/shoutcast-trans-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/shoutcast-trans-bin/shoutcast-trans-bin-0.4.0-r1.ebuild b/media-sound/shoutcast-trans-bin/shoutcast-trans-bin-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..910ebae7510c
--- /dev/null
+++ b/media-sound/shoutcast-trans-bin/shoutcast-trans-bin-0.4.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+SVER=${PV//./}
+
+DESCRIPTION="A transcoder that provides a source for shoutcast-server-bin to stream from"
+HOMEPAGE="http://www.shoutcast.com/"
+SRC_URI="http://yp.shoutcast.com/downloads/sc_trans_posix_${SVER}.tgz"
+
+LICENSE="shoutcast"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+RDEPEND="media-sound/shoutcast-server-bin"
+
+S=${WORKDIR}/sc_trans_${SVER}
+
+RESTRICT="fetch"
+
+pkg_nofetch() {
+	einfo "Download sc_trans_posix_${SVER}.tgz from ${HOMEPAGE}."
+	einfo "Last known working location is ${SRC_URI}."
+}
+
+src_install() {
+	# install executable
+	exeinto /opt/shoutcast
+	doexe sc_trans_linux
+
+	# install the init.d file
+	doinitd "${FILESDIR}"/shoutcast_trans
+
+	# install sample configuration file
+	dodoc example.lst
+	cp sc_trans.conf sc_trans.conf.example
+	dodoc sc_trans.conf.example
+
+	# install configuration file
+	sed -e "s/LogFile=sc_trans\.log/LogFile=\/dev\/null/" -i sc_trans.conf
+	# filter out some midly offensive stuff in the config file
+	sed -e "s|^StreamTitle=.*|StreamTitle=Example Stream|" -i sc_trans.conf
+	sed -e "s|^StreamURL=.*|StreamURL=http://examplestream.com/|" -i sc_trans.conf
+	sed -e "s|^PlaylistFile=.*|PlaylistFile=/opt/shoutcast/playlists/example.lst|" -i sc_trans.conf
+	insinto /etc/shoutcast
+	doins sc_trans.conf
+
+	# create a directory for playlists to be put
+	keepdir /opt/shoutcast/playlists
+
+	# Fix permissions - security bug #63551
+	fperms 600 /etc/shoutcast/sc_trans.conf
+}
+
+pkg_postinst() {
+	elog "Shoutcast-trans can be started via the init.d script provided."
+	elog "start it with /etc/init.d/shoutcast_trans"
+	elog
+	elog "The configuration file is /etc/shoutcast/sc_trans.conf."
+	elog "Please have a look at the playlist file setting."
+	elog "A sample playlist file can be found under /usr/share/doc/$P."
+	elog "It also contains instructions how to build a playlist."
+	elog "A directory /opt/shoutcast/playlists has been created for storing playlists."
+}
diff --git a/media-sound/sidplay/Manifest b/media-sound/sidplay/Manifest
new file mode 100644
index 000000000000..13d2ff7ff496
--- /dev/null
+++ b/media-sound/sidplay/Manifest
@@ -0,0 +1 @@
+DIST sidplay-2.0.9.tar.gz 362140 SHA256 b850986ce9226cb6eecca50057967be313771b67aed721421e74e6c931e02215
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..f13b23f890ed
--- /dev/null
+++ b/media-sound/sidplay/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..89f211a778cb
--- /dev/null
+++ b/media-sound/sidplay/sidplay-2.0.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..acaed24e97be
--- /dev/null
+++ b/media-sound/sidplayfp/Manifest
@@ -0,0 +1,3 @@
+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
diff --git a/media-sound/sidplayfp/metadata.xml b/media-sound/sidplayfp/metadata.xml
new file mode 100644
index 000000000000..8c08b7258eec
--- /dev/null
+++ b/media-sound/sidplayfp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..1a65384acc33
--- /dev/null
+++ b/media-sound/sidplayfp/sidplayfp-0.3.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A sidplay2 fork with resid-fp"
+HOMEPAGE="http://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..2c8215346b0b
--- /dev/null
+++ b/media-sound/sidplayfp/sidplayfp-1.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A sidplay2 fork with resid-fp"
+HOMEPAGE="http://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..981ab7f3a804
--- /dev/null
+++ b/media-sound/sidplayfp/sidplayfp-1.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+DESCRIPTION="A sidplay2 fork with resid-fp"
+HOMEPAGE="http://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..b402edcb6a02
--- /dev/null
+++ b/media-sound/skype-call-recorder/Manifest
@@ -0,0 +1 @@
+DIST skype-call-recorder-0.8.tar.gz 83842 SHA256 b115f728e09602cca7aa51479faa868de1f9b7cf887ed3d7c82f4935309c32c6 SHA512 f93b4aaf4f03b05bd74500485715b0ce97212f82ab9c9c1eeab57cc9589012ff4a96d81829f51605975328db27d0a6ab20c88e78c513ff61bb4e4b8038ca2b3c WHIRLPOOL 1f6fb8bce06bd98cca999fa86afaaa0bb0ba5970414d9fd90e247f95148d9afc7ba5a4a8d7292fc7064d624faa559636a0a5ddf79aa59a5eaeb04934166f81e0
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..f9c2d89f349b
--- /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>
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/skype-call-recorder/skype-call-recorder-0.8.ebuild b/media-sound/skype-call-recorder/skype-call-recorder-0.8.ebuild
new file mode 100644
index 000000000000..ce6bcfcd9eb4
--- /dev/null
+++ b/media-sound/skype-call-recorder/skype-call-recorder-0.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+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}/${P}-cmake.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	append-ldflags $(no-as-needed) -lvorbis -logg # bug 482744
+}
diff --git a/media-sound/smixer/Manifest b/media-sound/smixer/Manifest
new file mode 100644
index 000000000000..21d559741685
--- /dev/null
+++ b/media-sound/smixer/Manifest
@@ -0,0 +1 @@
+DIST smixer1.0.4.tgz 11245 SHA256 3b18b846711f0548a9d0e7563fcfc04195332feb54756b6f8785f7b15237e1b5
diff --git a/media-sound/smixer/metadata.xml b/media-sound/smixer/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/smixer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..25ff7d7de966
--- /dev/null
+++ b/media-sound/smixer/smixer-1.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..cda7e642bf69
--- /dev/null
+++ b/media-sound/snd/Manifest
@@ -0,0 +1 @@
+DIST snd-12.8.tar.gz 15546751 SHA256 1ff683615ec6d0c7e2c8359e921117f4fd78695675bb06eb765667edb55a1939 SHA512 99a8600a175a889ad597053e9f52af69124cab8feca693c852cb03d34df5b80bcc50994ea66d070fe61e318eca715fdfe095a458b22da80d95f88a1d695baebd WHIRLPOOL b8903b138ab31f2ee51aeabe66068943c24e15e2cd82e628bc446224ebb0e697365c0070ec99d126379a02c1ef7544a1c6195e0bb3a0c8ecb167751eb3c673ef
diff --git a/media-sound/snd/files/snd-12.6-as-needed.patch b/media-sound/snd/files/snd-12.6-as-needed.patch
new file mode 100644
index 000000000000..d2f0bcbe9d8b
--- /dev/null
+++ b/media-sound/snd/files/snd-12.6-as-needed.patch
@@ -0,0 +1,37 @@
+--- snd-12.6/configure.ac.orig
++++ snd-12.6/configure.ac
+@@ -1468,7 +1468,7 @@
+         LDSO_FLAGS="-shared"
+         LIBS="$LIBS -lm"
+ 	if test "$ac_cv_header_dlfcn_h" = yes ; then 
+-	  LDFLAGS="$LDFLAGS -ldl" 
++	  LIBS="$LIBS -ldl"
+ 	fi 
+ 	if test "$GCC" = yes ; then
+ 	  SO_FLAGS="-fPIC $SO_FLAGS"
+@@ -1979,7 +1979,7 @@
+ if test "$ac_snd_have_extension_language" = yes ; then
+   if test "$ac_snd_have_gui" = yes ; then
+     if test "$ac_cv_header_pthread_h" = yes ; then
+-      LDFLAGS="$LDFLAGS -lpthread"
++      LIBS="$LIBS -lpthread"
+     fi
+   fi
+ fi
+@@ -1987,14 +1987,14 @@
+ if test "$ac_snd_have_extension_language" = no ; then
+   if test "$ac_snd_have_gui" = no ; then
+     if test "$ac_cv_header_dlfcn_h" = yes ; then
+-      LDFLAGS="$LDFLAGS -ldl"
++      LIBS="$LIBS -ldl"
+     fi
+     AC_MSG_WARN([Snd needs either an extension language (s7, Fth, or Ruby), or a graphics toolkit (Gtk or Motif), or preferably both.  As currently configured, this version of Snd is useless.])
+   fi
+ fi
+ 
+ if test "$ac_snd_have_extension_language" = yes && test "$with_audio" = no && test "$ac_cv_header_dlfcn_h" = yes ; then
+-  LDFLAGS="$LDFLAGS -ldl"
++  LIBS="$LIBS -ldl"
+ fi
+ 
+ 
diff --git a/media-sound/snd/metadata.xml b/media-sound/snd/metadata.xml
new file mode 100644
index 000000000000..54673e45ae1f
--- /dev/null
+++ b/media-sound/snd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+<use>
+  <flag name="s7">Enable the s7 extension language (a version of Scheme)</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/snd/snd-12.8.ebuild b/media-sound/snd/snd-12.8.ebuild
new file mode 100644
index 000000000000..cb670cdbac1e
--- /dev/null
+++ b/media-sound/snd/snd-12.8.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic multilib
+
+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 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="alsa doc fam fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio readline ruby +s7"
+
+RDEPEND="media-libs/audiofile
+	alsa? ( media-libs/alsa-lib )
+	fam? ( virtual/fam )
+	fftw? ( sci-libs/fftw )
+	gmp? ( dev-libs/gmp
+		dev-libs/mpc
+		dev-libs/mpfr )
+	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 )"
+
+REQUIRED_USE="
+	portaudio? ( !pulseaudio )
+	pulseaudio? ( !portaudio )
+	^^ (
+		( !ruby !s7 )
+		( ruby !s7 )
+		( !ruby s7 )
+	)"
+
+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() {
+	epatch "${FILESDIR}"/${PN}-12.6-as-needed.patch
+	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 opengl ; then
+		myconf+=" --with-just-gl"
+	else
+		myconf+=" --without-gl"
+	fi
+
+	if ! use ruby && ! use s7 ; then
+		myconf+=" --without-extension-language"
+	fi
+
+	econf \
+		$(use_with alsa) \
+		$(use_with fam) \
+		$(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_enable readline) \
+		$(use_with ruby) \
+		$(use_with s7) \
+		--with-float-samples \
+		${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
+
+	for i in sndinfo audinfo sndplay ; do
+	   emake ${i}
+	done
+}
+
+src_install () {
+	dobin snd sndplay sndinfo audinfo
+
+	if use ruby ; then
+		insinto /usr/share/snd
+		doins *.rb
+	fi
+
+	if use s7 ; then
+		insinto /usr/share/snd
+		doins *.scm
+	fi
+
+	dodoc README.Snd HISTORY.Snd NEWS
+	use doc && dohtml -r *.html pix/*.png tutorial
+}
diff --git a/media-sound/sndfile-tools/Manifest b/media-sound/sndfile-tools/Manifest
new file mode 100644
index 000000000000..af855c109128
--- /dev/null
+++ b/media-sound/sndfile-tools/Manifest
@@ -0,0 +1 @@
+DIST sndfile-tools-1.03.tar.gz 474494 RMD160 70eee621519e203bddbdff63da545c6f6ed78167 SHA1 df7135f5291c1188f0a8c07c82c2d4ec0520a6e3 SHA256 f75df926a397d4dfa88748d51a3d3a9de1b5de85461bbeeb77edd8ef5b5fb14b
diff --git a/media-sound/sndfile-tools/metadata.xml b/media-sound/sndfile-tools/metadata.xml
new file mode 100644
index 000000000000..a2af0b606f0e
--- /dev/null
+++ b/media-sound/sndfile-tools/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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.ebuild b/media-sound/sndfile-tools/sndfile-tools-1.03.ebuild
new file mode 100644
index 000000000000..f136d7fec96a
--- /dev/null
+++ b/media-sound/sndfile-tools/sndfile-tools-1.03.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7dbbba698c1a
--- /dev/null
+++ b/media-sound/sndpeek/Manifest
@@ -0,0 +1 @@
+DIST sndpeek-1.3.tgz 298983 SHA256 36291830b345338777dd304bacb81b97885d31b33e9e6dba19340f25ac169d08
diff --git a/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.3.patch b/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.3.patch
new file mode 100644
index 000000000000..dcaa930440d4
--- /dev/null
+++ b/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.3.patch
@@ -0,0 +1,26 @@
+diff -ru sndpeek-1.3~/src/marsyas/LPC.h sndpeek-1.3/src/marsyas/LPC.h
+--- sndpeek-1.3~/src/marsyas/LPC.h	2008-06-28 12:37:05.000000000 +0200
++++ sndpeek-1.3/src/marsyas/LPC.h	2008-06-28 12:37:15.000000000 +0200
+@@ -35,7 +35,7 @@
+ #include "MagFFT.h"
+ #include "fvec.h"
+ #include "fmatrix.h"
+-#include <math.h>
++#include <cstdlib>
+ #include "AutoCorrelation.h"
+ #include "MarSignal.h"
+ 
+diff -ru sndpeek-1.3~/src/sndpeek/RtAudio.h sndpeek-1.3/src/sndpeek/RtAudio.h
+--- sndpeek-1.3~/src/sndpeek/RtAudio.h	2008-06-28 12:37:05.000000000 +0200
++++ sndpeek-1.3/src/sndpeek/RtAudio.h	2008-06-28 12:37:15.000000000 +0200
+@@ -43,8 +43,9 @@
+ #define __RTAUDIO_H
+ 
+ #include "RtError.h"
+-#include <string>
++#include <cstring>
+ #include <vector>
++#include <cstdlib>
+ using namespace std;
+ 
+ // Operating system dependent thread functionality.
diff --git a/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.4.patch b/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.4.patch
new file mode 100644
index 000000000000..d92bcdddf3b2
--- /dev/null
+++ b/media-sound/sndpeek/files/sndpeek-1.3-gcc-4.4.patch
@@ -0,0 +1,11 @@
+diff -ur sndpeek-1.3.orig/src/sndpeek/RtAudio.cpp sndpeek-1.3/src/sndpeek/RtAudio.cpp
+--- sndpeek-1.3.orig/src/sndpeek/RtAudio.cpp	2006-01-14 01:38:54.000000000 +0200
++++ sndpeek-1.3/src/sndpeek/RtAudio.cpp	2009-06-06 10:58:48.000000000 +0300
+@@ -40,6 +40,7 @@
+ // RtAudio: Version 3.0.1, 22 March 2004
+ 
+ #include "RtAudio.h"
++#include <cstdio>
+ #include <iostream>
+ 
+ // Static variable definitions.
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/metadata.xml b/media-sound/sndpeek/metadata.xml
new file mode 100644
index 000000000000..278cb636a75f
--- /dev/null
+++ b/media-sound/sndpeek/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<longdescription lang="en">
+		real-time audio visualization
+	</longdescription>
+</pkgmetadata>
+
diff --git a/media-sound/sndpeek/sndpeek-1.3-r2.ebuild b/media-sound/sndpeek/sndpeek-1.3-r2.ebuild
new file mode 100644
index 000000000000..9d7a4050686d
--- /dev/null
+++ b/media-sound/sndpeek/sndpeek-1.3-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+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}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-gcc-4.4.patch
+}
+
+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 one audio engine type"
+	fi
+}
+
+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..b0e3fd5b7709
--- /dev/null
+++ b/media-sound/solfege/Manifest
@@ -0,0 +1 @@
+DIST solfege-3.22.2.tar.gz 6890977 SHA256 e46a0960c83e4998d9dcf7bb07b8269e03fc81fab6c4485f8112c5a3e6488fe4 SHA512 7767d5747b324558fb5ebc82767fd592636acbea78d083992ae100a6b288bb3cc233745e9f12c66f5059a8531a85be2ec82aa856d9251206c737a090b1d42a26 WHIRLPOOL d506661fdff385484c63006a0ab1f92ec787d435e0f56d77a4a57e5cb4636995b1fe49eae5fb982731677f0716cb8fa0f09d2c9913a3ee68768d8f4bc0d7fc67
diff --git a/media-sound/solfege/metadata.xml b/media-sound/solfege/metadata.xml
new file mode 100644
index 000000000000..cc9b6dc7e0d3
--- /dev/null
+++ b/media-sound/solfege/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..380b72a570b8
--- /dev/null
+++ b/media-sound/solfege/solfege-3.22.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://www.solfege.org"
+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..f97451b7bc99
--- /dev/null
+++ b/media-sound/sonata/Manifest
@@ -0,0 +1 @@
+DIST sonata-1.6.2.1.tar.bz2 314333 SHA256 b0fe8ed37e197c2bd0d65441d43690490f2160e0630bc100d6a848950185b85b SHA512 8022b69380714e9c3c685c61d0f1e62be087fc2cbd77a55f32008edea53411f8493d416bd0a446ccb52b4b5603ba9f4a00b655af485d739932dc06af69345c27 WHIRLPOOL 78b427c0dd9e7376801c1ebcebf4ae8f6002605e37aab0370b7fe96d654917310b612457f66e9f880532f816992356fce7b8623ad82eb9bfe345fea7ab55bc36
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 100755
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..77f49ada89be
--- /dev/null
+++ b/media-sound/sonata/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <maintainer>
+    <email>angelos@gentoo.org</email>
+    <name>Christoph Mende</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..cc02643adade
--- /dev/null
+++ b/media-sound/sonata/sonata-1.6.2.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..c35a0c2abeef
--- /dev/null
+++ b/media-sound/sonic-visualiser/Manifest
@@ -0,0 +1,3 @@
+DIST sonic-visualiser-1.9.tar.gz 1867608 SHA256 d899c219403d96c415809521ff71b7f326bf3c5015af496df7ae236de4712f02 SHA512 b626b1ddf59071b280b1da9d8733759784febefb5abcb7ac8fc9bfa1bd7beb45aa8f68e854122cddd6a85b393943c87671298759945ae1f771ccc4fbd9ba2a5e WHIRLPOOL c7e66421e133ec36ad26e7f44da6f1ed2b2378be5d33bb6f3a66f822a7b81422280053d4902e844d1c91dbcb8c4cb40a5000eb30e63bc8722c1c05d3fc94008d
+DIST sonic-visualiser-2.3.tar.gz 2909195 SHA256 0c90198d6974c8dfad7295498277f2ad8bd870b5e32d00e2aa22131bb3e006b8 SHA512 647b8e9a5e3547f7d8546318a63e68282ccec70a6710e90b97f5ddc1425038784f1f2da251dbae5db5b380737181de8e22561b33f4b86f7a6b4af336cdbdb7d3 WHIRLPOOL a7dd137f0d16bec5c462374932bd7e389f59fc19601bd2bd5e6872d4e5ce870f7414179e88bc3c13b46b42e10b06461d366146f09171a79531bece1db3303c89
+DIST sonic-visualiser-2.4.1.tar.gz 4155745 SHA256 cb57cefddd47bdb31130dbc6d6ed53dd1084cbcecf426f4df02bbf098e82d41a SHA512 9eb63ba8de670114d388e5faae6e8a16c732f05950324cee2c414d48cbe2e3a320b6876f4db578c01d08aa76de677ee295d5362160b03ab086eaba40c6f7f59f WHIRLPOOL 601764c75110545147620fe94e089bb0b71d874e7da1f7eb15ba01a39a541d80fa73605ea8d25c48d4d1db41b1eac92ec56e52bd557c7b2f41784274cc162ccd
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch
new file mode 100644
index 000000000000..6f2842c35132
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch
@@ -0,0 +1,37 @@
+Index: sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.cpp
+===================================================================
+--- sonic-visualiser-1.7.1.orig/data/fileio/OggVorbisFileReader.cpp
++++ sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.cpp
+@@ -138,15 +138,15 @@ OggVorbisFileReader::DecodeThread::run()
+ } 
+ 
+ int
+-OggVorbisFileReader::readPacket(OGGZ *, ogg_packet *packet, long, void *data)
++OggVorbisFileReader::readPacket(OGGZ *, oggz_packet *packet, long, void *data)
+ {
+     OggVorbisFileReader *reader = (OggVorbisFileReader *)data;
+     FishSound *fs = reader->m_fishSound;
+ 
+-    fish_sound_prepare_truncation(fs, packet->granulepos, packet->e_o_s);
+-    fish_sound_decode(fs, packet->packet, packet->bytes);
++    fish_sound_prepare_truncation(fs, packet->op.granulepos, packet->op.e_o_s);
++    fish_sound_decode(fs, packet->op.packet, packet->op.bytes);
+ 
+-    reader->m_bytesRead += packet->bytes;
++    reader->m_bytesRead += packet->op.bytes;
+ 
+     // The number of bytes read by this function is smaller than
+     // the file size because of the packet headers
+Index: sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.h
+===================================================================
+--- sonic-visualiser-1.7.1.orig/data/fileio/OggVorbisFileReader.h
++++ sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.h
+@@ -82,7 +82,7 @@ protected:
+     bool m_cancelled;
+     int m_completion;
+  
+-    static int readPacket(OGGZ *, ogg_packet *, long, void *);
++    static int readPacket(OGGZ *, oggz_packet *, long, void *);
+     static int acceptFrames(FishSound *, float **, long, void *);
+ 
+     class DecodeThread : public Thread
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch
new file mode 100644
index 000000000000..02752b746acc
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch
@@ -0,0 +1,11 @@
+--- sonic-visualiser-1.8/configure.orig
++++ sonic-visualiser-1.8/configure
+@@ -18,7 +18,7 @@
+ 	\$(MAKE) --directory=svgui
+ sub-svapp:
+ 	\$(MAKE) --directory=svapp
+-sub-sonic-visualiser:
++sub-sonic-visualiser: sub-svcore sub-svgui sub-svapp
+ 	\$(MAKE) --directory=sonic-visualiser
+ EOF
+ echo " *** Generated Makefile"
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch
new file mode 100644
index 000000000000..47ff291daa97
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch
@@ -0,0 +1,10 @@
+--- sonic-visualiser-1.8/svcore/base/ResizeableBitset.h.orig
++++ sonic-visualiser-1.8/svcore/base/ResizeableBitset.h
+@@ -16,6 +16,7 @@
+ #ifndef _RESIZEABLE_BITMAP_H_
+ #define _RESIZEABLE_BITMAP_H_
+ 
++#include <cstddef>
+ #include <vector>
+ #include <stdint.h>
+ 
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch
new file mode 100644
index 000000000000..19f9fb488f01
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch
@@ -0,0 +1,20 @@
+--- sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp
++++ sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp
+@@ -22,6 +22,7 @@
+ #include "base/Serialiser.h"
+ #include "base/Resampler.h"
+ 
++#include <stdint.h>
+ #include <iostream>
+ #include <QDir>
+ #include <QMutexLocker>
+--- sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp
++++ sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp
+@@ -26,6 +26,7 @@
+ 
+ #include <cassert>
+ #include <iostream>
++#include <stdint.h>
+ 
+ //#define DEBUG_WRITABLE_WAVE_FILE_MODEL 1
+ 
diff --git a/media-sound/sonic-visualiser/metadata.xml b/media-sound/sonic-visualiser/metadata.xml
new file mode 100644
index 000000000000..44897b8eb8c0
--- /dev/null
+++ b/media-sound/sonic-visualiser/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proaudio</herd>
+  <use>
+    <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
+  </use>
+</pkgmetadata>
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild
new file mode 100644
index 000000000000..24f752a4cb34
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils qt4-r2 autotools fdo-mime
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="http://www.sonicvisualiser.org/"
+SRC_URI="http://code.soundsoftware.ac.uk/attachments/download/194/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fftw id3tag jack mad ogg osc +portaudio pulseaudio"
+
+RDEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	media-libs/libsndfile
+	media-libs/libsamplerate
+	fftw? ( sci-libs/fftw:3.0 )
+	app-arch/bzip2
+	>=media-libs/dssi-0.9.1
+	media-libs/liblrdf
+	dev-libs/redland
+	media-libs/ladspa-sdk
+	osc? ( media-libs/liblo )
+	media-libs/speex
+	>=media-libs/vamp-plugin-sdk-2.0
+	media-libs/rubberband
+	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 )
+	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( jack pulseaudio portaudio )"
+
+sv_disable_opt() {
+	einfo "Disabling $1"
+	for i in sonic-visualiser svapp svcore svgui ; do
+		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8-configure.patch
+	epatch "${FILESDIR}"/${PN}-1.9-gcc47.patch
+	cd svcore
+	epatch "${FILESDIR}"/${PN}-1.7.1-liboggz11.patch
+
+	use fftw || sv_disable_opt fftw3f
+	use fftw || sv_disable_opt fftw3
+	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
+
+	for i in sonic-visualiser svapp svcore svgui ; do
+	   pushd "${S}"/$i > /dev/null
+	   eautoreconf
+	   popd > /dev/null
+	done
+}
+
+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-2.3.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-2.3.ebuild
new file mode 100644
index 000000000000..29c3b81a4f07
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-2.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils qt4-r2 autotools fdo-mime
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="http://www.sonicvisualiser.org/"
+SRC_URI="http://code.soundsoftware.ac.uk/attachments/download/918/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="id3tag jack mad ogg osc +portaudio pulseaudio"
+
+RDEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qttest:4
+	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() {
+	econf
+	eqmake4
+}
+
+src_compile() {
+	# de parallelize a bit otherwise it fails...
+	emake sub-dataquay-lib-pro
+	emake sub-svcore
+	emake sub-svgui
+	emake sub-svapp
+	emake
+}
+
+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-2.4.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-2.4.1.ebuild
new file mode 100644
index 000000000000..0584fdc91e39
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-2.4.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils qmake-utils autotools fdo-mime
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="http://www.sonicvisualiser.org/"
+SRC_URI="http://code.soundsoftware.ac.uk/attachments/download/1185/${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/sooperlooper/Manifest b/media-sound/sooperlooper/Manifest
new file mode 100644
index 000000000000..c4996df3a7db
--- /dev/null
+++ b/media-sound/sooperlooper/Manifest
@@ -0,0 +1,3 @@
+DIST sooperlooper-1.6.17.tar.gz 704953 SHA256 f35b1ffb977499f649cd22ed19441ca55618db4e0d4e0805973f228135b3dbdf
+DIST sooperlooper-1.6.18.tar.gz 705462 SHA256 087a52186fefb138ac16deebc1ed4b9ff4945ffb4fe3e2170f60fcf97a3a8c38
+DIST sooperlooper-1.6.5-m4.tar.bz2 1463 SHA256 ee8e3084c3d3d4db29f3d7b4dde0d260b9dfb72be8c9362c7fd711fb7784e0bb
diff --git a/media-sound/sooperlooper/files/sooperlooper-1.6.5-cxxflags.patch b/media-sound/sooperlooper/files/sooperlooper-1.6.5-cxxflags.patch
new file mode 100644
index 000000000000..48997a668774
--- /dev/null
+++ b/media-sound/sooperlooper/files/sooperlooper-1.6.5-cxxflags.patch
@@ -0,0 +1,13 @@
+Index: work/aclocal/optflags.m4
+===================================================================
+--- work.orig/aclocal/optflags.m4
++++ work/aclocal/optflags.m4
+@@ -61,7 +61,7 @@ OPT_FLAGS="$OPT_FLAGS -pipe"
+ # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`"
+ LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ 
+-CXXFLAGS="-g -D_REENTRANT $LARGEFILE_FLAGS"
++CXXFLAGS="$CXXFLAGS -D_REENTRANT $LARGEFILE_FLAGS"
+ if test x"$GXX" = xyes ; then
+    CXXFLAGS="$CXXFLAGS -Wall"
+ fi
diff --git a/media-sound/sooperlooper/metadata.xml b/media-sound/sooperlooper/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/sooperlooper/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/sooperlooper/sooperlooper-1.6.17.ebuild b/media-sound/sooperlooper/sooperlooper-1.6.17.ebuild
new file mode 100644
index 000000000000..7205382661f6
--- /dev/null
+++ b/media-sound/sooperlooper/sooperlooper-1.6.17.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils 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=""
+
+RDEPEND="media-sound/jack-audio-connection-kit
+	x11-libs/wxGTK:2.8
+	media-libs/liblo
+	dev-libs/libsigc++:1.2
+	media-libs/libsndfile
+	media-libs/libsamplerate
+	dev-libs/libxml2
+	media-libs/rubberband
+	sci-libs/fftw:3.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_p*}
+
+DOCS=( OSC README )
+
+src_prepare() {
+	cp -rf "${WORKDIR}"/aclocal "${S}" || die "copying aclocal failed"
+	epatch "${FILESDIR}"/${PN}-1.6.5-cxxflags.patch
+
+	AT_M4DIR="${S}"/aclocal eautoreconf
+	cd "${S}"/libs/midi++
+	AT_M4DIR="${S}"/aclocal eautoreconf
+	cd "${S}"/libs/pbd
+	AT_M4DIR="${S}"/aclocal eautoreconf
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_configure() {
+	WX_GTK_VER="2.8"
+	need-wxwidgets unicode
+
+	econf \
+		--disable-optimize \
+		--with-wxconfig-path="${WX_CONFIG}"
+}
diff --git a/media-sound/sooperlooper/sooperlooper-1.6.18.ebuild b/media-sound/sooperlooper/sooperlooper-1.6.18.ebuild
new file mode 100644
index 000000000000..159f758da040
--- /dev/null
+++ b/media-sound/sooperlooper/sooperlooper-1.6.18.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils 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=""
+
+RDEPEND="media-sound/jack-audio-connection-kit
+	x11-libs/wxGTK:2.8
+	media-libs/liblo
+	dev-libs/libsigc++:1.2
+	media-libs/libsndfile
+	media-libs/libsamplerate
+	dev-libs/libxml2
+	media-libs/rubberband
+	sci-libs/fftw:3.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_p*}
+
+DOCS=( OSC README )
+
+src_prepare() {
+	cp -rf "${WORKDIR}"/aclocal "${S}" || die "copying aclocal failed"
+	epatch "${FILESDIR}"/${PN}-1.6.5-cxxflags.patch
+
+	AT_M4DIR="${S}"/aclocal eautoreconf
+	cd "${S}"/libs/midi++
+	AT_M4DIR="${S}"/aclocal eautoreconf
+	cd "${S}"/libs/pbd
+	AT_M4DIR="${S}"/aclocal eautoreconf
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_configure() {
+	WX_GTK_VER="2.8"
+	need-wxwidgets unicode
+
+	econf \
+		--disable-optimize \
+		--with-wxconfig-path="${WX_CONFIG}"
+}
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
new file mode 100644
index 000000000000..0076ecff9f22
--- /dev/null
+++ b/media-sound/sound-juicer/Manifest
@@ -0,0 +1,2 @@
+DIST sound-juicer-3.14.0.tar.xz 1966204 SHA256 bb21107d57025d39feb499666a4f12152cbbe25a3c6170c330a5d2d8f9bcf54d SHA512 b4060cbe7c783ba6ee219115ea43c05f39e075cef57c01ba7fe237e7fd28eed1568e70c308458fea8f63191d7808e31147a9d477257870d48e726978e7c0cbb1 WHIRLPOOL 8d98bb5d79bd06817f6fd8d837af60bb5136a72befb54d16cb589bfeb1389b88705e3a4d613ab308f6c297e0f7a88e78d491f0ecd3b809022cc06787c0394f6b
+DIST sound-juicer-3.16.1.tar.xz 811148 SHA256 dfb744504a60f8069257584b74d90cba1ce99c744a7106b68627ad1d40b2a657 SHA512 9d9065942f0bdb2609f03cc561186cfdf67042e986a0f4a0e23835e56c210335f87c351a4d7e44a7dbb3960af19a3e6ba2dc3d1d6c6a5ce62bb27cfc2ea52352 WHIRLPOOL 86859d332610f8228660be213495212e89eb09a743214e10229e144858c147c64638c94ff89fef4dffb97477ba8d196e0385e64e3a942fea2e959d14f74c6678
diff --git a/media-sound/sound-juicer/metadata.xml b/media-sound/sound-juicer/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/media-sound/sound-juicer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/media-sound/sound-juicer/sound-juicer-3.14.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.14.0.ebuild
new file mode 100644
index 000000000000..51c3cae5985f
--- /dev/null
+++ b/media-sound/sound-juicer/sound-juicer-3.14.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="CD ripper for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="flac test vorbis"
+
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.4:3
+	media-libs/libcanberra[gtk3]
+	>=app-cdr/brasero-2.90
+	sys-apps/dbus
+	gnome-base/gsettings-desktop-schemas
+
+	media-libs/libdiscid
+	>=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}
+	>=dev-util/intltool-0.50
+	>=app-text/scrollkeeper-0.3.5
+	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 ITSTOOL="$(type -P true)"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if [ -z ${REPLACING_VERSIONS} ]; then
+		ewarn "The list of audio encoding profiles in ${P} is non-customizable."
+		ewarn "A possible workaround is to rip to flac using ${PN}, and convert to"
+		ewarn "your desired format using a separate tool."
+	fi
+}
diff --git a/media-sound/sound-juicer/sound-juicer-3.16.1.ebuild b/media-sound/sound-juicer/sound-juicer-3.16.1.ebuild
new file mode 100644
index 000000000000..b2914190d230
--- /dev/null
+++ b/media-sound/sound-juicer/sound-juicer-3.16.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+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="flac test vorbis"
+
+COMMON_DEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.4:3
+	media-libs/libcanberra[gtk3]
+	>=app-cdr/brasero-2.90
+	sys-apps/dbus
+	gnome-base/gsettings-desktop-schemas
+
+	media-libs/libdiscid
+	>=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}
+	dev-libs/appstream-glib
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+	test? ( ~app-text/docbook-xml-dtd-4.3 )
+"
+# eautoreconf needs gnome-common
+
+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 ITSTOOL="$(type -P true)"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if [ -z ${REPLACING_VERSIONS} ]; then
+		ewarn "The list of audio encoding profiles in ${P} is non-customizable."
+		ewarn "A possible workaround is to rip to flac using ${PN}, and convert to"
+		ewarn "your desired format using a separate tool."
+	fi
+}
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
new file mode 100644
index 000000000000..bdcc404ecc5a
--- /dev/null
+++ b/media-sound/soundconverter/Manifest
@@ -0,0 +1,3 @@
+DIST soundconverter-2.1.3.tar.xz 193176 SHA256 26a78f14210af911c12b71f3452a77bceb5fc6b1f6b626de4d4c961299a76cd1 SHA512 0768630d0fb7e89d37cba793e150eda81b98edd536a41f529e99812451ae8134b7257da7c97ceb3d8780ae640d9c8d23665103d0c08ef0811bbc01ec07ee41d0 WHIRLPOOL 823839018b1f6bb1a914354fd02fcb9c0721d3727b747e908cd97899ef4b6f773d2d98cd724bb15b2b7be0316c9a6e7c3e4e9829db65163a77ef9290168fdc04
+DIST soundconverter-2.1.4.tar.xz 193428 SHA256 2b125dda38f5d494d97fa43c8a238b6354510f9a0540d6e912eea59b4f22bf4a SHA512 27f24c40e965cc4c2f7045956b7856cc4d2b840b95b8da9363d0b987cf8d65616db484f2266516070d8018efdfed33d9a84b64e7cf8cad5e6d4d08b1409d9ad9 WHIRLPOOL 6241a96dfcd4b6ea8f31d945b941a6b0d9f06dc6869f1ad92d18e1e924987e5a4fec743707e763b481718fa92d96ec52a331439ea7ea1adefa47eac5ee2e956d
+DIST soundconverter-2.1.5.tar.xz 195380 SHA256 cace2109b967744325e4ce8938d286b78b86f0615d4f145966f42decc7a74e06 SHA512 6d42bd2cfa200e7af8c69ce94580a4f96bdb0354623207e5d1c3beadee89920363b5b8cee4cdcfa6fcbd036860d50f739b05e34e9a34608fe3d6243876936c6a WHIRLPOOL e3f9ea4bbe012aa8b977321ee85601c69d67324b35654b494ffe6792af8043a21af7d7d429929cea28fe7273e08e11f93da9b00cb4f99c88f22266e6b0c3419d
diff --git a/media-sound/soundconverter/metadata.xml b/media-sound/soundconverter/metadata.xml
new file mode 100644
index 000000000000..091f59ec4098
--- /dev/null
+++ b/media-sound/soundconverter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>gstreamer</herd>
+	<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.3.ebuild b/media-sound/soundconverter/soundconverter-2.1.3.ebuild
new file mode 100644
index 000000000000..ebdc2e33415e
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-2.1.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: convert
+#	dev-python/gconf-python
+#	dev-python/gnome-vfs-python
+#	dev-python/libgnome-python
+# See bug #477814
+
+EAPI=5
+
+GCONF_DEBUG=no
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2 multilib python-single-r1
+
+DESCRIPTION="A simple audiofile converter application for the GNOME environment"
+HOMEPAGE="http://soundconverter.org/"
+SRC_URI="http://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
+	dev-python/gnome-vfs-python
+	=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
+	gnome-base/libglade
+	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}
+	app-arch/xz-utils
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_prepare() {
+	python_fix_shebang .
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
+}
diff --git a/media-sound/soundconverter/soundconverter-2.1.4.ebuild b/media-sound/soundconverter/soundconverter-2.1.4.ebuild
new file mode 100644
index 000000000000..423d5220e0ae
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-2.1.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG=no
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 multilib python-single-r1
+
+DESCRIPTION="A simple audiofile converter application for the GNOME environment"
+HOMEPAGE="http://soundconverter.org/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aac flac mp3 opus vorbis"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/gnome-vfs-python[${PYTHON_USEDEP}]
+	dev-python/gst-python:0.10[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+	dev-python/libgnome-python[${PYTHON_USEDEP}]
+	gnome-base/libglade[${PYTHON_USEDEP}]
+	aac? (
+		media-plugins/gst-plugins-faac:0.10
+		media-plugins/gst-plugins-faad:0.10 )
+	flac? ( media-plugins/gst-plugins-flac:0.10 )
+	mp3? (
+		media-plugins/gst-plugins-lame:0.10
+		media-plugins/gst-plugins-mad:0.10
+		media-plugins/gst-plugins-taglib:0.10 )
+	vorbis? (
+		media-plugins/gst-plugins-ogg:0.10
+		media-plugins/gst-plugins-vorbis:0.10 )
+	opus? (	media-plugins/gst-plugins-opus:0.10 )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_prepare() {
+	python_fix_shebang .
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
+}
diff --git a/media-sound/soundconverter/soundconverter-2.1.5.ebuild b/media-sound/soundconverter/soundconverter-2.1.5.ebuild
new file mode 100644
index 000000000000..119397b9015d
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-2.1.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG=no
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 multilib python-single-r1
+
+DESCRIPTION="A simple audiofile converter application for the GNOME environment"
+HOMEPAGE="http://soundconverter.org/"
+SRC_URI="http://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..8bbc3d8f112b
--- /dev/null
+++ b/media-sound/soundkonverter/Manifest
@@ -0,0 +1,2 @@
+DIST 29024-soundkonverter-2.0.3.tar.gz 591340 SHA256 86e1a62a47433ab446c165c16b8950d3ed00cf73dfb3d411019717e8e5d73f0c SHA512 106620e82162280c96ee809145d7196bec049f2a69c6808dce2528ccda5be1976c5a6aad32e25fb6b5578417e535263f4425edc1ebe4b28f6a2f5fdcb9478c98 WHIRLPOOL 2df0edd1342e63cde2407d8a36484d323304e8bddff89ad9f112e218e5f23a0820c51fb7b03d3303623681348df76a9b5895e243f358c6e3af6115722c8c4139
+DIST 29024-soundkonverter-2.1.2.tar.gz 756039 SHA256 b7b984cfcebb31c5e16fb3e04fc811b58453ef5454ea9e567e8510fcdd498957 SHA512 fdbb782eea4702d1b6bfe0135ed8ca482bd43422bc4c825b8b1afe3226faf315b618b4392223d5b3169e831c8e867ee64a11f22e22c53df7cb6b92dc5f1dda23 WHIRLPOOL 7f19644aff536d1715935b58f3c5bab27f7b967aadf7503ed26d168ba1fe1a92a76ba4bec28709c23053a46f32b593034e4941c2ec0e054e0eb8a79ad6097da2
diff --git a/media-sound/soundkonverter/metadata.xml b/media-sound/soundkonverter/metadata.xml
new file mode 100644
index 000000000000..3cbd34b008ee
--- /dev/null
+++ b/media-sound/soundkonverter/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<herd>kde</herd>
+</pkgmetadata>
diff --git a/media-sound/soundkonverter/soundkonverter-2.0.3.ebuild b/media-sound/soundkonverter/soundkonverter-2.0.3.ebuild
new file mode 100644
index 000000000000..367b0cc1bc89
--- /dev/null
+++ b/media-sound/soundkonverter/soundkonverter-2.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="cs de es et fr hu it pt pt_BR ru"
+inherit kde4-base
+
+DESCRIPTION="Frontend to various audio converters"
+HOMEPAGE="http://www.kde-apps.org/content/show.php/soundKonverter?content=29024"
+SRC_URI="http://kde-apps.org/CONTENT/content-files/29024-${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdeapps_dep libkcddb)
+	media-libs/taglib
+	media-sound/cdparanoia
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+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-2.1.2.ebuild b/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild
new file mode 100644
index 000000000000..c97cd0ad9c4a
--- /dev/null
+++ b/media-sound/soundkonverter/soundkonverter-2.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="ca cs de es et fr hu it pt pt_BR ro ru sl sv zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="Frontend to various audio converters"
+HOMEPAGE="http://www.kde-apps.org/content/show.php/soundKonverter?content=29024"
+SRC_URI="http://kde-apps.org/CONTENT/content-files/29024-${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdeapps_dep libkcddb)
+	media-libs/phonon[qt4]
+	media-libs/taglib
+	media-sound/cdparanoia
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+pkg_postinst() {
+	kde4-base_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..5af964ada4cc
--- /dev/null
+++ b/media-sound/sox/Manifest
@@ -0,0 +1,2 @@
+DIST sox-14.4.1.tar.gz 1111653 SHA256 9a8c2c6fe51e608da346a157e111508a957af9e3ecf3de26781d36e9a67fa89b SHA512 a35c0f424ffaa51d06291e69b28ae7f2248a750fa8aded911dcd7e123877ecb5142c292f943eb723142c50dbd890b58163c6ef24c9c0573377855fad1b36fb25 WHIRLPOOL e1523027ea5221f31b9b6f8ff90503555d25fb68d3a35d5a7442142503140ed702a03d84a833056255cd2efa21b15d31358968ffbd1d252176996ed7e24bcf24
+DIST sox-14.4.2.tar.gz 1134299 SHA256 b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca WHIRLPOOL dbed6c60eb96cf946168666d39d3310c669e22136a982dc3547125a30214916e8ab99542dee124d5dc570d32dda8921ff003e6bfe9fd6292d82df2344b9d5fdb
diff --git a/media-sound/sox/files/sox-14.4.0-avcodec54.patch b/media-sound/sox/files/sox-14.4.0-avcodec54.patch
new file mode 100644
index 000000000000..a9551f8e945d
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.0-avcodec54.patch
@@ -0,0 +1,103 @@
+Fix build with ffmpeg 0.11.
+https://bugs.gentoo.org/show_bug.cgi?id=407621
+
+Index: sox-14.4.0/m4/ffmpeg.m4
+===================================================================
+--- sox-14.4.0.orig/m4/ffmpeg.m4
++++ sox-14.4.0/m4/ffmpeg.m4
+@@ -49,7 +49,7 @@ then
+   LIBS="$LIBS $FFMPEG_LIBS"
+   have_ffmpeg="no"
+   AC_CHECK_HEADERS([libavformat/avformat.h ffmpeg/avformat.h],
+-    [AC_CHECK_LIB(avformat, av_open_input_file,
++    [AC_CHECK_LIB(avformat, avformat_open_input,
+       [AC_CHECK_HEADERS([libavcodec/avcodec.h ffmpeg/avcodec.h],
+         [AC_CHECK_LIB(avcodec, avcodec_decode_audio3, have_ffmpeg=yes)])])
+     break])
+Index: sox-14.4.0/src/ffmpeg.c
+===================================================================
+--- sox-14.4.0.orig/src/ffmpeg.c
++++ sox-14.4.0/src/ffmpeg.c
+@@ -92,8 +92,10 @@ static int stream_component_open(priv_t
+   enc->workaround_bugs = 1;
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+   enc->error_resilience = 1;
+-#else
++#elif LIBAVCODEC_VERSION_INT < ((54<<16)+(0<<8)+0)
+   enc->error_recognition = 1;
++#else
++  ic->error_recognition = 1;
+ #endif
+ 
+   if (!codec || avcodec_open(enc, codec) < 0)
+@@ -157,7 +159,7 @@ static int audio_decode_frame(priv_t * f
+ static int startread(sox_format_t * ft)
+ {
+   priv_t * ffmpeg = (priv_t *)ft->priv;
+-  AVFormatParameters params;
++  AVDictionary *params;
+   int ret;
+   int i;
+ 
+@@ -172,7 +174,7 @@ static int startread(sox_format_t * ft)
+ 
+   /* Open file and get format */
+   memset(&params, 0, sizeof(params));
+-  if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, &params)) < 0) {
++  if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, &params)) < 0) {
+     lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret);
+     return SOX_EOF;
+   }
+@@ -231,7 +233,7 @@ static size_t read_samples(sox_format_t
+     /* If input buffer empty, read more data */
+     if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) {
+       if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 &&
+-	  (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb)))
++	  (ret == AVERROR_EOF || ( ffmpeg->ctxt->pb && ffmpeg->ctxt->pb->error)))
+ 	break;
+       ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE);
+       ffmpeg->audio_buf_index = 0;
+@@ -373,13 +375,6 @@ static int startwrite(sox_format_t * ft)
+       return SOX_EOF;
+   }
+ 
+-  /* set the output parameters (must be done even if no
+-     parameters). */
+-  if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) {
+-    lsx_fail("ffmpeg invalid output format parameters");
+-    return SOX_EOF;
+-  }
+-
+   /* Next line for debugging */
+   /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */
+ 
+@@ -391,14 +386,14 @@ static int startwrite(sox_format_t * ft)
+ 
+   /* open the output file, if needed */
+   if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) {
+-    if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) {
++    if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) {
+       lsx_fail("ffmpeg could not open `%s'", ft->filename);
+       return SOX_EOF;
+     }
+   }
+ 
+   /* write the stream header, if any */
+-  av_write_header(ffmpeg->ctxt);
++  avformat_write_header(ffmpeg->ctxt, NULL);
+ 
+   return SOX_SUCCESS;
+ }
+@@ -475,11 +470,7 @@ static int stopwrite(sox_format_t * ft)
+ 
+   if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) {
+     /* close the output file */
+-#if (LIBAVFORMAT_VERSION_INT < 0x340000)
+-    url_fclose(&ffmpeg->ctxt->pb);
+-#else
+-    url_fclose(ffmpeg->ctxt->pb);
+-#endif
++    avio_close(ffmpeg->ctxt->pb);
+   }
+ 
+   /* Free the output context */
diff --git a/media-sound/sox/files/sox-14.4.0-ffmpeg.patch b/media-sound/sox/files/sox-14.4.0-ffmpeg.patch
new file mode 100644
index 000000000000..74dcc57901d4
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.0-ffmpeg.patch
@@ -0,0 +1,11 @@
+--- sox-14.4.0/src/ffmpeg.h
++++ sox-14.4.0/src/ffmpeg.h
+@@ -27,6 +27,8 @@
+ #include <ffmpeg/avformat.h>
+ #endif
+ 
++#include <libavutil/mathematics.h>
++
+ #if defined __SUNPRO_C
+   #pragma enable_warn
+ #elif defined _MSC_VER
diff --git a/media-sound/sox/files/sox-14.4.0-libav-9.patch b/media-sound/sox/files/sox-14.4.0-libav-9.patch
new file mode 100644
index 000000000000..d969cbc1b32c
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.0-libav-9.patch
@@ -0,0 +1,39 @@
+diff -burN sox-14.4.0.old//src/ffmpeg.c sox-14.4.0/src/ffmpeg.c
+--- sox-14.4.0.old//src/ffmpeg.c	2012-11-25 21:59:45.990825656 +0100
++++ sox-14.4.0/src/ffmpeg.c	2012-11-25 22:07:06.436809624 +0100
+@@ -98,7 +98,7 @@
+   ic->error_recognition = 1;
+ #endif
+ 
+-  if (!codec || avcodec_open(enc, codec) < 0)
++  if (!codec || avcodec_open2(enc, codec, NULL) < 0)
+     return -1;
+   if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
+     lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
+@@ -180,7 +180,7 @@
+   }
+ 
+   /* Get CODEC parameters */
+-  if ((ret = av_find_stream_info(ffmpeg->ctxt)) < 0) {
++  if ((ret = avformat_find_stream_info(ffmpeg->ctxt, NULL)) < 0) {
+     lsx_fail("ffmpeg could not find CODEC parameters for %s", ft->filename);
+     return SOX_EOF;
+   }
+@@ -274,7 +274,7 @@
+   AVCodecContext *c;
+   AVStream *st;
+ 
+-  st = av_new_stream(oc, 1);
++  st = avformat_new_stream(oc, NULL);
+   if (!st) {
+     lsx_fail("ffmpeg could not alloc stream");
+     return NULL;
+@@ -308,7 +308,7 @@
+   }
+ 
+   /* open it */
+-  if (avcodec_open(c, codec) < 0) {
++  if (avcodec_open2(c, codec, NULL) < 0) {
+     lsx_fail("ffmpeg could not open CODEC");
+     return SOX_EOF;
+   }
diff --git a/media-sound/sox/files/sox-14.4.1-ffmpeg2.patch b/media-sound/sox/files/sox-14.4.1-ffmpeg2.patch
new file mode 100644
index 000000000000..2c359363fcf8
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.1-ffmpeg2.patch
@@ -0,0 +1,16 @@
+Index: sox-14.4.1/src/ffmpeg.c
+===================================================================
+--- sox-14.4.1.orig/src/ffmpeg.c
++++ sox-14.4.1/src/ffmpeg.c
+@@ -57,6 +57,11 @@
+ #define PKT_FLAG_KEY AV_PKT_FLAG_KEY
+ #endif
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE (192000 * 4)
++#endif
++
++
+ /* Private data for ffmpeg files */
+ typedef struct {
+   int audio_index;
diff --git a/media-sound/sox/files/sox-14.4.1-ffmpeg24.patch b/media-sound/sox/files/sox-14.4.1-ffmpeg24.patch
new file mode 100644
index 000000000000..88653ccbc817
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.1-ffmpeg24.patch
@@ -0,0 +1,17 @@
+Index: sox-14.4.1/src/ffmpeg.c
+===================================================================
+--- sox-14.4.1.orig/src/ffmpeg.c
++++ sox-14.4.1/src/ffmpeg.c
+@@ -263,8 +263,12 @@ static int stopread(sox_format_t * ft)
+   if (ffmpeg->audio_stream >= 0)
+     stream_component_close(ffmpeg, ffmpeg->audio_stream);
+   if (ffmpeg->ctxt) {
++#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(53,25,0)
++    avformat_close_input(&ffmpeg->ctxt);
++#else
+     av_close_input_file(ffmpeg->ctxt);
+     ffmpeg->ctxt = NULL; /* safety */
++#endif
+   }
+ 
+   free(ffmpeg->audio_buf_raw);
diff --git a/media-sound/sox/files/sox-14.4.1-uclibc.patch b/media-sound/sox/files/sox-14.4.1-uclibc.patch
new file mode 100644
index 000000000000..84a37d346147
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.1-uclibc.patch
@@ -0,0 +1,21 @@
+Index: sox-14.4.1/src/formats.c
+===================================================================
+--- sox-14.4.1.orig/src/formats.c
++++ sox-14.4.1/src/formats.c
+@@ -409,7 +409,7 @@ static void UNUSED rewind_pipe(FILE * fp
+ #if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__
+   fp->_p -= PIPE_AUTO_DETECT_SIZE;
+   fp->_r += PIPE_AUTO_DETECT_SIZE;
+-#elif defined __GLIBC__
++#elif defined __GLIBC__ && ! defined __UCLIBC__
+   fp->_IO_read_ptr = fp->_IO_read_base;
+ #elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || defined _ISO_STDIO_ISO_H
+   fp->_ptr = fp->_base;
+@@ -417,7 +417,6 @@ static void UNUSED rewind_pipe(FILE * fp
+   /* To fix this #error, either simply remove the #error line and live without
+    * file-type detection with pipes, or add support for your compiler in the
+    * lines above.  Test with cat monkey.wav | ./sox --info - */
+-  #error FIX NEEDED HERE
+   #define NO_REWIND_PIPE
+   (void)fp;
+ #endif
diff --git a/media-sound/sox/metadata.xml b/media-sound/sox/metadata.xml
new file mode 100644
index 000000000000..b3cb9b5d9c38
--- /dev/null
+++ b/media-sound/sox/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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.1.ebuild b/media-sound/sox/sox-14.4.1.ebuild
new file mode 100644
index 000000000000..e9f67fe88546
--- /dev/null
+++ b/media-sound/sox/sox-14.4.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils flag-o-matic 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 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="alsa amr ao debug encode ffmpeg flac id3tag ladspa mad ogg openmp oss png pulseaudio sndfile static-libs twolame wavpack"
+
+# libtool required for libltdl
+RDEPEND=">=sys-devel/libtool-2.2.6b
+	>=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 )
+	ffmpeg? ( >=virtual/ffmpeg-0.9 )
+	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 )
+	png? ( media-libs/libpng 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 || die #386027
+
+	epatch \
+		"${FILESDIR}"/${PN}-14.4.1-uclibc.patch \
+		"${FILESDIR}"/${PN}-14.4.0-ffmpeg.patch \
+		"${FILESDIR}"/${PN}-14.4.0-avcodec54.patch \
+		"${FILESDIR}"/${PN}-14.4.0-libav-9.patch
+
+	if has_version '>=media-video/ffmpeg-2' ; then
+		epatch "${FILESDIR}"/${PN}-14.4.1-ffmpeg2.patch
+		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
+			   -e 's/ CodecID/ AVCodecID/g' \
+			   src/ffmpeg.c || die
+		epatch "${FILESDIR}"/${PN}-14.4.1-ffmpeg24.patch
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	# Fixes wav segfaults. See Bug #35745.
+	append-flags -fsigned-char
+
+	econf \
+		$(use_with alsa) \
+		$(use_with amr amrnb) \
+		$(use_with amr amrwb) \
+		$(use_with ao) \
+		$(use_enable debug) \
+		$(use_with encode lame) \
+		$(use_with ffmpeg) \
+		$(use_with flac) \
+		$(use_with id3tag) \
+		$(use_with ladspa) \
+		$(use_with mad) \
+		$(use_enable openmp gomp) \
+		$(use_with ogg oggvorbis) \
+		$(use_with oss) \
+		$(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/sox/sox-14.4.2.ebuild b/media-sound/sox/sox-14.4.2.ebuild
new file mode 100644
index 000000000000..7dc1a267eb8d
--- /dev/null
+++ b/media-sound/sox/sox-14.4.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~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..627bd65f533a
--- /dev/null
+++ b/media-sound/specimen/Manifest
@@ -0,0 +1 @@
+DIST specimen-0.5.2-rc3.tar.gz 267948 SHA256 249cf434ee81828b46c383dbf6b1873564f227f2461c9956b539be0a3c2feb72 SHA512 0fbe298ef9652b8f8535fc4382ec71457c882a7fb05412cb1621e7aa566a293b71f4a2600eaaa4336093ec73b9dd6bb53371565ef0f02d7e400d497718c384f4 WHIRLPOOL dbf93e766280d1f8459f1a08189ebe939c121d89771cab2d5127d8e352d3c143885d371b9c4c468a15b85ffdfa988c781e57671ff33386b757a86799dbda0e81
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..6267d7ad572d
--- /dev/null
+++ b/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch
@@ -0,0 +1,79 @@
+--- configure.ac
++++ 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 != xno; 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			   
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -11,7 +11,7 @@
+ specimen_SOURCES += lashdriver.c lashdriver.h                                                                                                                           
+ endif
+ 
+-INCLUDES = \
++AM_CPPFLAGS = \
+ 	@ALSA_CFLAGS@ \
+ 	@JACK_CFLAGS@ \
+ 	@LIBSAMPLERATE_CFLAGS@ \
+
+--- src/gui/Makefile.am
++++ 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)\"
diff --git a/media-sound/specimen/metadata.xml b/media-sound/specimen/metadata.xml
new file mode 100644
index 000000000000..ea3e2d913f8b
--- /dev/null
+++ b/media-sound/specimen/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..03c7f3a6dc55
--- /dev/null
+++ b/media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/spek/Manifest b/media-sound/spek/Manifest
new file mode 100644
index 000000000000..523ff34a33c9
--- /dev/null
+++ b/media-sound/spek/Manifest
@@ -0,0 +1 @@
+DIST spek-0.8.3.tar.gz 1349573 SHA256 f5c09d0062aaafe882e2e617f6d5db2ab540e2a657c1bee38260f7f0567bf175 SHA512 a4b54746316d295574bc963e650728b23b3730ee6bcc8d78b043a5678baac70a0e859870120de2b0e6a17059e9e3757075f4691e2abde98c083afc393e93e17c WHIRLPOOL f88082cbba6ca51d016034860c4908c5c94a993a9e820733f845afc97ef7af484d2d7ece9cb6c36008f1c3f9910986edf313e8e31557a97492d06baf8a2bbdfa
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-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..a219220a8096
--- /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>
+		<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.ebuild b/media-sound/spek/spek-0.8.3.ebuild
new file mode 100644
index 000000000000..0a96bf69918b
--- /dev/null
+++ b/media-sound/spek/spek-0.8.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="2.8"
+
+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=""
+
+RDEPEND="virtual/ffmpeg
+	x11-libs/wxGTK:2.8[X]"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	>=sys-devel/gcc-4.7
+	sys-devel/gettext"
+
+src_prepare() {
+	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
+	eautoreconf
+}
diff --git a/media-sound/splay/Manifest b/media-sound/splay/Manifest
new file mode 100644
index 000000000000..20cec47acf29
--- /dev/null
+++ b/media-sound/splay/Manifest
@@ -0,0 +1 @@
+DIST splay-0.9.5.2.tar.gz 105510 RMD160 a79d0b429b3e73793c51ad071804e6d6362a6ad4 SHA1 a0638c96b8c9a38da026c957979fe3ec3c560f14 SHA256 38266b7620e8dde9ca39ace245ded4d9fadc3ea9e35772190fcfe90efe8d39bd
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..603901868e6f
--- /dev/null
+++ b/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff
@@ -0,0 +1,17 @@
+--- splay.cc~	2005-04-03 19:56:37.000000000 -0300
++++ splay.cc	2005-04-03 19:58:24.000000000 -0300
+@@ -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-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/files/splay-0.9.5.2-gcc43.patch b/media-sound/splay/files/splay-0.9.5.2-gcc43.patch
new file mode 100644
index 000000000000..70b91137fd75
--- /dev/null
+++ b/media-sound/splay/files/splay-0.9.5.2-gcc43.patch
@@ -0,0 +1,113 @@
+Index: splay-0.9.5.2/apps/splay.cc
+===================================================================
+--- splay-0.9.5.2.orig/apps/splay.cc
++++ splay-0.9.5.2/apps/splay.cc
+@@ -16,14 +16,14 @@
+ 
+ #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>
+ 
+ #include "mpegsound.h"
+ 
+@@ -172,7 +172,7 @@ ostream& operator<<(ostream& s, const ID
+ static void play(char *filename)
+ {
+   if( splay_verbose-- )
+-    cout << filename << ":" << endl;
++    std::cout << filename << ":" << std::endl;
+   if( splay_verbose>0 )
+     {
+       //    cerr << getpid() << endl;
+Index: splay-0.9.5.2/libs/fileplayer.cc
+===================================================================
+--- splay-0.9.5.2.orig/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>
+@@ -55,7 +55,7 @@ bool Mpegfileplayer::openfile(char *file
+       fd=open(device, O_WRONLY|O_NDELAY);
+     }
+     if ( fd == -1 ) {
+-      cerr << "Cannot open /dev/dsp or /dev/sound/dsp!" << endl;
++      std::cerr << "Cannot open /dev/dsp or /dev/sound/dsp!" << std::endl;
+       return seterrorcode(SOUND_ERROR_DEVOPENFAIL);
+     }
+     close(fd);
+@@ -121,8 +121,8 @@ bool Mpegfileplayer::playing(int verbose
+   int totframes=server->gettotalframe();
+   double tottime=1.0*totframes*pcmperframe/frequency;
+   if(frameinfo) {
+-    cout << "Totalframes " <<  totframes;
+-    cout << "; Totaltime " << tominsec(tottime)  << endl;
++    std::cout << "Totalframes " <<  totframes;
++    std::cout << "; Totaltime " << tominsec(tottime)  << std::endl;
+   }
+ 
+   // Playing
+@@ -132,9 +132,9 @@ bool Mpegfileplayer::playing(int verbose
+     if(frameinfo) {
+       int currframe=server-> getcurrentframe();
+       double currtime=1.0*currframe*pcmperframe/frequency;
+-      cout << "Frame " << currframe << " [" << totframes-currframe << "]; ";
+-      cout << "Time " << tominsec(currtime) << " [" ;
+-      cout << tominsec(tottime-currtime) << "]" << endl ;
++      std::cout << "Frame " << currframe << " [" << totframes-currframe << "]; ";
++      std::cout << "Time " << tominsec(currtime) << " [" ;
++      std::cout << tominsec(tottime-currtime) << "]" << std::endl ;
+     }
+   }
+ 
+@@ -161,8 +161,8 @@ bool Mpegfileplayer::playingwiththread(i
+   int totframes=server->gettotalframe();
+   double tottime=1.0*totframes*pcmperframe/frequency;
+   if(frameinfo) {
+-    cout << "Totalframes " <<  totframes;
+-    cout << "; Totaltime " << tominsec(tottime)  << endl;
++    std::cout << "Totalframes " <<  totframes;
++    std::cout << "; Totaltime " << tominsec(tottime)  << std::endl;
+   }
+ 
+   // Playing
+@@ -172,9 +172,9 @@ bool Mpegfileplayer::playingwiththread(i
+     if(frameinfo) {
+       int currframe=server-> getcurrentframe();
+       double currtime=1.0*currframe*pcmperframe/frequency;
+-      cout << "Frame " << currframe << " [" << totframes-currframe << "]; ";
+-      cout << "Time " << tominsec(currtime) << " [" ;
+-      cout << tominsec(tottime-currtime) << "]" << endl ;
++      std::cout << "Frame " << currframe << " [" << totframes-currframe << "]; ";
++      std::cout << "Time " << tominsec(currtime) << " [" ;
++      std::cout << tominsec(tottime-currtime) << "]" << std::endl ;
+     }
+   }
+ 
+Index: splay-0.9.5.2/libs/mpegtoraw.cc
+===================================================================
+--- splay-0.9.5.2.orig/libs/mpegtoraw.cc
++++ splay-0.9.5.2/libs/mpegtoraw.cc
+@@ -552,7 +552,7 @@ int  Mpegtoraw::getframesaved(void)
+ #endif
+ 
+ 
+-#include <iostream.h>
++#include <iostream>
+ // Convert mpeg to raw
+ bool Mpegtoraw::run(int frames)
+ {
diff --git a/media-sound/splay/metadata.xml b/media-sound/splay/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/splay/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/splay/splay-0.9.5.2.ebuild b/media-sound/splay/splay-0.9.5.2.ebuild
new file mode 100644
index 000000000000..23eed982ac70
--- /dev/null
+++ b/media-sound/splay/splay-0.9.5.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+IUSE=""
+
+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"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	cd "${S}/apps"
+	epatch "${FILESDIR}/${P}-external-id3lib.diff"
+	epatch "${FILESDIR}/${P}-gcc43-2.patch"
+}
+
+src_compile() {
+	# Force compilation to omit X support according to BUG #5856
+	# even when qt is present on the system.
+	export ac_cv_lib_qt_main=no
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	# Specify man-page to prevent xsplay.1 from being installed
+	einstall man_MANS=splay.1 || die "einstall failed"
+	dodoc AUTHORS ChangeLog README README.LIB NEWS
+}
diff --git a/media-sound/split2flac/Manifest b/media-sound/split2flac/Manifest
new file mode 100644
index 000000000000..b9a65acabb4e
--- /dev/null
+++ b/media-sound/split2flac/Manifest
@@ -0,0 +1,4 @@
+DIST split2flac-113_p20131017.tar.xz 8700 SHA256 99603fc32f1e357bf84a65c4fb744480ddc99b8cd96889e53da3b081c0eb7907 SHA512 6bfa6ca6cb677ae1affa501c0766f5ea169c741328a8e60d25df5a9a9f12bf63d3b7945d0f6067fb5a8dd922ad33a2972c5b15ecf2e50e232a78e59690777d7b WHIRLPOOL 33cdf4ab8cf66b860086b00ecfbbf7967828e82e8e5f6458266ab96d4b728bd5827aeece538473cdec12f3bfe4b6a4e23f8a2db2a1f130f996d5656f764301e8
+DIST split2flac-114.tar.gz 9188 SHA256 9d4ab230d3a9520a7e1a16eaab0cc69e2b710b11943e3fb245435018547fceed SHA512 8ba3f06b6d3aec75ac84d311d79964f40ac341bd7ddb2b2af83902355192bcda05a1af5f9c6e82a66aca0003cf4652493a4ee244971d913f2950c8d7f6d1ef69 WHIRLPOOL 0aa8ed5f6a18eb9e6c5c1e4e8d70c47bdc34047763aa1600291b707db4688ac2865d936c3f0ee7f024c9cfefbbae8a4842fd284ebbd775b8e7cd14448f93151d
+DIST split2flac-115.tar.gz 9409 SHA256 7f52f1e34fc1cf62720f16d59e2e56302c2466b811fe9819a5ebd9272ed71747 SHA512 c8d362383e84be995af343be7fff7b5bf6b6f1cef5c8ba930c371bdd35e398bed373dcdaaad2ba40c74719311fb91378a4359ca9e2e8e1f6dbc6486f7448bcf2 WHIRLPOOL 17528b108f5adb02110cbe7d6aecf4a1b3123d5fd0c7b72fa47747c94a90cce8556e9b191d25178f2702f3b472537bfb7697df874c4f0c95d01ce8cb0cc5aafa
+DIST split2flac-20111110-r1.sh 22381 SHA256 0e3b9f10bd068c76d71bb7bca1962aa764fa25ea0d90eaa7724b6384f7170cfb
diff --git a/media-sound/split2flac/metadata.xml b/media-sound/split2flac/metadata.xml
new file mode 100644
index 000000000000..5fc663412224
--- /dev/null
+++ b/media-sound/split2flac/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>nikoli@gmx.us</email>
+    <name>Nikoli</name>
+  </maintainer>
+  <maintainer>
+    <email>maksbotan@gentoo.org</email>
+    <name>Maxim Koltsov</name>
+  </maintainer>
+  <herd>sound</herd>
+  <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-0.1_pre20111110-r2.ebuild b/media-sound/split2flac/split2flac-0.1_pre20111110-r2.ebuild
new file mode 100644
index 000000000000..fbd6a8246356
--- /dev/null
+++ b/media-sound/split2flac/split2flac-0.1_pre20111110-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+DESCRIPTION="sh script to split one big APE/FLAC/WV/WAV audio image with CUE sheet into tracks"
+HOMEPAGE="https://code.google.com/p/split2flac/"
+SRC_URI="http://dev.gentoo.org/~maksbotan/${PN}-${PV##*_pre}-r1.sh"
+
+LICENSE="MIT"
+SLOT="0"
+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 )
+"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}"/${PN}-${PV##*_pre}-r1.sh "${WORKDIR}"/${PN}.sh
+}
+
+src_install() {
+	dobin "${PN}.sh"
+	dosym "${PN}.sh" /usr/bin/split2wav.sh
+	for i in mp3 mp4 ogg
+	do
+		use $i && dosym "${PN}.sh" /usr/bin/split2${i/mp4/m4a}.sh
+	done
+}
diff --git a/media-sound/split2flac/split2flac-113_p20131017.ebuild b/media-sound/split2flac/split2flac-113_p20131017.ebuild
new file mode 100644
index 000000000000..f1589aa1daf5
--- /dev/null
+++ b/media-sound/split2flac/split2flac-113_p20131017.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 one big APE/FLAC/WV/WAV audio image with CUE sheet into tracks"
+HOMEPAGE="https://github.com/ftrvxmtrx/split2flac"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="http://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/split2flac/split2flac-114.ebuild b/media-sound/split2flac/split2flac-114.ebuild
new file mode 100644
index 000000000000..a0d3e888308b
--- /dev/null
+++ b/media-sound/split2flac/split2flac-114.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 one big 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-115.ebuild b/media-sound/split2flac/split2flac-115.ebuild
new file mode 100644
index 000000000000..32266e58d894
--- /dev/null
+++ b/media-sound/split2flac/split2flac-115.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 one big 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..f1589aa1daf5
--- /dev/null
+++ b/media-sound/split2flac/split2flac-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 one big APE/FLAC/WV/WAV audio image with CUE sheet into tracks"
+HOMEPAGE="https://github.com/ftrvxmtrx/split2flac"
+[[ ${PV} == *9999* ]] || \
+SRC_URI="http://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..da8a402ac0c1
--- /dev/null
+++ b/media-sound/spotify/Manifest
@@ -0,0 +1 @@
+DIST spotify-client_0.9.17.1.g9b85d43.7-1_amd64.deb 42733568 SHA256 717a878bcfa495852d19ac34bb4b0fa1b2f063ab94547defd32725d1dec10775 SHA512 a19403558c0a641b0264641501c9538f169b9e64d532e5d54dd67b7edbb27d400f07395014c9693fed298a1331c053cc9e62988d1293e9b1f1809d68a74646ad WHIRLPOOL 712ac07a3cd3230e3de17e9209380d0e0cc9a33c77cb4753e04490c5bb9a4e2d3e386ee92ffadecd9888ea701aa2a0c4c1b8c579cfa2f5b61d72981a5736f495
diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
new file mode 100644
index 000000000000..2829164f05f7
--- /dev/null
+++ b/media-sound/spotify/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+<email>prometheanfire@gentoo.org</email>
+<name>Matthew Thode</name>
+</maintainer>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
+
diff --git a/media-sound/spotify/spotify-0.9.17.1-r1.ebuild b/media-sound/spotify/spotify-0.9.17.1-r1.ebuild
new file mode 100644
index 000000000000..57214a63d156
--- /dev/null
+++ b/media-sound/spotify/spotify-0.9.17.1-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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/"
+MY_PV="${PV}.g9b85d43.7-1"
+MY_P="${PN}-client_${MY_PV}"
+SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}/"
+SRC_URI="
+	amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
+	"
+#	x86?   ( ${SRC_BASE}${MY_P}_i386.deb )
+LICENSE="Spotify"
+SLOT="0"
+#amd64 and x86 keywords removed due to security concerns, see bug 474010
+KEYWORDS="~amd64"
+IUSE="gnome pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		x11-libs/libxcb
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXdmcp
+		x11-libs/libXScrnSaver
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		dev-qt/qtcore:4[glib]
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4[glib]
+		dev-qt/qtwebkit:4
+		x11-misc/xdg-utils
+		media-libs/alsa-lib
+		media-libs/fontconfig
+		media-libs/freetype
+		dev-libs/openssl:0
+		dev-libs/glib:2
+		|| ( dev-libs/libgcrypt:11/11 dev-libs/libgcrypt:0/11 )
+		media-libs/libpng:0
+		dev-db/sqlite:3
+		sys-libs/zlib
+		app-arch/bzip2
+		sys-apps/dbus[X]
+		x11-libs/pango[X]
+		sys-apps/util-linux
+		dev-libs/expat
+		>=dev-libs/nspr-4.9
+		gnome-base/gconf:2
+		x11-libs/gtk+:2
+		dev-libs/nss
+		dev-libs/glib:2
+		net-print/cups
+		virtual/udev
+		pulseaudio? ( >=media-sound/pulseaudio-0.9.21 )
+		gnome? ( gnome-extra/gnome-integration-spotify )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="/opt/spotify/spotify-client/spotify
+			/opt/spotify/spotify-client/Data/SpotifyHelper
+			/opt/spotify/spotify-client/Data/libcef.so"
+
+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' \
+		opt/spotify/spotify-client/spotify.desktop || die "sed failed"
+	fi
+	#and fix other stuff in the desktop file as well
+	sed -i \
+		-e 's/x-scheme-handler\/spotify$/x-scheme-handler\/spotify\;/g' \
+		-e 's/AudioVideo$/AudioVideo\;/g' \
+		opt/spotify/spotify-client/spotify.desktop || die "sed failed"
+}
+
+src_install() {
+	dodoc opt/spotify/spotify-client/changelog
+	dodoc usr/share/doc/spotify-client/changelog.Debian.gz
+	dodoc usr/share/doc/spotify-client/copyright
+
+	insinto /usr/share/pixmaps
+	doins opt/spotify/spotify-client/Icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r opt/spotify/spotify-client/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+	fperms +x ${SPOTIFY_HOME}/Data/SpotifyHelper
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	# revdep-rebuild produces a false positive because of symbol versioning
+	dodir /etc/revdep-rebuild
+	cat <<-EOF >"${D}"/etc/revdep-rebuild/10${PN}
+		SEARCH_DIRS_MASK="${SPOTIFY_HOME}"
+	EOF
+
+	for size in 16 22 24 32 48 64 128 256; do
+		newicon -s ${size} "${S}${SPOTIFY_HOME}/Icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_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 C "${ED}${SPOTIFY_HOME}/Data/SpotifyHelper" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/Data/SpotifyHelper" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/Data/SpotifyHelper" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intendto 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
+
+	#TODO fix for x86
+	dosym /usr/lib/libudev.so "${SPOTIFY_HOME}/Data/libudev.so.0"
+}
+
+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 "you need to use the ld.bfd linker with openssl"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/media-sound/squeezeslave/Manifest b/media-sound/squeezeslave/Manifest
new file mode 100644
index 000000000000..9b7f06dee5e5
--- /dev/null
+++ b/media-sound/squeezeslave/Manifest
@@ -0,0 +1,2 @@
+DIST squeezeslave-1.1_p365.tar.xz 122364 SHA256 504099547c449fd865226f84f9e9e9cd0636c0f50659f605cd518addc7b5f4ec SHA512 409ef279b5fe0157e79ccab49cf4bb4fc3c6df6c864175a0160cba1c0be5b1960ee462e60b04df16b627023e4a87dff6ab3928a65aa686d7dc6192496e4e5503 WHIRLPOOL fb440cd1a6748aa7d9dbfaa39292de2ccd211513002e2025de563767faf096e81dc9e75799985921a3785571e7d0954f859f68dafa880b592c7cd3439c8675c4
+DIST squeezeslave-1.1_p381.tar.xz 123164 SHA256 8f898bb7949c2352f9fccc7b396630a6b7a49d80b439ec8792f33f149d6f95c0 SHA512 3c58d5ec814270740db9303b031e83a038b15b518c219f6e73ada1ebf7c5faa2da356a80303a266244bb08b703153d9f5a001377c467e5204256f97b139ca1bb WHIRLPOOL 900656118ed45defb3f4275840c8c061864a122ab74001c425339e988cea0adb8991228ac74fc3d609db14411c80e12e1bafebcb616b5196f619ea5dac8d0708
diff --git a/media-sound/squeezeslave/files/squeezeslave-1.1_p350-tremor-headers.patch b/media-sound/squeezeslave/files/squeezeslave-1.1_p350-tremor-headers.patch
new file mode 100644
index 000000000000..b8d9a1cb1e29
--- /dev/null
+++ b/media-sound/squeezeslave/files/squeezeslave-1.1_p350-tremor-headers.patch
@@ -0,0 +1,22 @@
+--- squeezeslave-1.1_p350/src/slimaudio/slimaudio_decoder_vorbis.c
++++ squeezeslave-1.1_p350/src/slimaudio/slimaudio_decoder_vorbis.c
+@@ -27,7 +27,7 @@
+ #define OV_EXCLUDE_STATIC_CALLBACKS
+ 
+ #ifdef TREMOR_DECODER
+-#include <vorbis/ivorbisfile.h>
++#include <tremor/ivorbisfile.h>
+ #else
+ #include <vorbis/vorbisfile.h>
+ #endif /* TREMOR_DECODER */
+--- squeezeslave-1.1_p350/src/slimaudio/slimaudio.h
++++ squeezeslave-1.1_p350/src/slimaudio/slimaudio.h
+@@ -36,7 +36,7 @@
+ #define OV_EXCLUDE_STATIC_CALLBACKS
+ 
+ #ifdef TREMOR_DECODER
+-#include <vorbis/ivorbisfile.h>
++#include <tremor/ivorbisfile.h>
+ #else
+ #include <vorbis/vorbisfile.h>
+ #endif /* TREMOR_DECODER */
diff --git a/media-sound/squeezeslave/files/squeezeslave-1.1_p381-ffmpeg2.patch b/media-sound/squeezeslave/files/squeezeslave-1.1_p381-ffmpeg2.patch
new file mode 100644
index 000000000000..d72aa04533dd
--- /dev/null
+++ b/media-sound/squeezeslave/files/squeezeslave-1.1_p381-ffmpeg2.patch
@@ -0,0 +1,133 @@
+Index: squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder.c
+===================================================================
+--- squeezeslave-1.1_p381.orig/src/slimaudio/slimaudio_decoder.c
++++ squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder.c
+@@ -69,7 +69,6 @@ void av_lib_setup (void)
+ 		av_register_all();
+ 		DEBUGF("decoder_thread: av_register_all\n");
+ 
+-		avcodec_init();
+ 		avcodec_register_all();
+ 		DEBUGF("decoder_thread: avcodec_register_all\n");
+ 
+Index: squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder_aac.c
+===================================================================
+--- squeezeslave-1.1_p381.orig/src/slimaudio/slimaudio_decoder_aac.c
++++ squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder_aac.c
+@@ -47,6 +47,11 @@
+ 
+ #define AUDIO_INBUF_SIZE (AUDIO_CHUNK_SIZE*2)
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++
++
+ int slimaudio_decoder_aac_init(slimaudio_t *audio)
+ {
+ 	av_lib_setup();
+@@ -164,7 +169,7 @@ int slimaudio_decoder_aac_process(slimau
+ 	}
+ 	else
+ 	{
+-		AVIOCtx->is_streamed = 1;
++		AVIOCtx->seekable = 0;
+ 	}
+ 
+ 	AVInputFormat* pAVInputFormat = av_find_input_format(streamformat);
+@@ -199,7 +204,7 @@ int slimaudio_decoder_aac_process(slimau
+ 	}
+ 	else
+ 	{
+-		iRC = av_find_stream_info(pFormatCtx);
++		iRC = avformat_find_stream_info(pFormatCtx, NULL);
+ 		if ( iRC < 0 )
+ 		{
+ 			DEBUGF("aac: find stream info failed:%d\n", iRC);
+@@ -236,7 +241,7 @@ int slimaudio_decoder_aac_process(slimau
+ 	} 
+ 	
+ 	/* Open codec */
+-	iRC = avcodec_open(pCodecCtx, pCodec);
++	iRC = avcodec_open2(pCodecCtx, pCodec, NULL);
+ 	if ( iRC < 0)
+ 	{
+ 		DEBUGF("aac: could not open codec:%d\n", iRC);
+@@ -274,7 +279,7 @@ int slimaudio_decoder_aac_process(slimau
+ 				eos=true;
+ 			}
+ 
+-			if ( url_ferror(pFormatCtx->pb) )
++			if ( pFormatCtx->pb && pFormatCtx->pb->error )
+ 			{
+ 				DEBUGF("aac: url_ferror\n");
+ #if 0
+@@ -312,7 +317,7 @@ int slimaudio_decoder_aac_process(slimau
+ 
+ 	/* Close the stream */
+ 	DEBUGF ("aac: av_close_input_stream\n");
+-	av_close_input_stream(pFormatCtx);
++	avformat_close_input(&pFormatCtx);
+ 
+ 	return 0;
+ }
+Index: squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder_wma.c
+===================================================================
+--- squeezeslave-1.1_p381.orig/src/slimaudio/slimaudio_decoder_wma.c
++++ squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder_wma.c
+@@ -47,6 +47,10 @@
+ 
+ #define AUDIO_INBUF_SIZE (AUDIO_CHUNK_SIZE*2)
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++
+ int slimaudio_decoder_wma_init(slimaudio_t *audio)
+ {
+ 	av_lib_setup();
+@@ -159,7 +163,7 @@ int slimaudio_decoder_wma_process(slimau
+ 	}
+ 	else
+ 	{
+-		AVIOCtx->is_streamed = 1;
++		AVIOCtx->seekable = 1;
+ 	}
+ 
+ 	AVInputFormat* pAVInputFormat = av_find_input_format(streamformat);
+@@ -194,7 +198,7 @@ int slimaudio_decoder_wma_process(slimau
+ 	}
+ 	else
+ 	{
+-		iRC = av_find_stream_info(pFormatCtx);
++		iRC = avformat_find_stream_info(pFormatCtx,NULL);
+ 		if ( iRC < 0 )
+ 		{
+ 			DEBUGF("wma: find stream info failed:%d\n", iRC);
+@@ -231,7 +235,7 @@ int slimaudio_decoder_wma_process(slimau
+ 	} 
+ 	
+ 	/* Open codec */
+-	iRC = avcodec_open(pCodecCtx, pCodec);
++	iRC = avcodec_open2(pCodecCtx, pCodec, NULL);
+ 	if ( iRC < 0)
+ 	{
+ 		DEBUGF("wma: could not open codec:%d\n", iRC);
+@@ -270,7 +274,7 @@ int slimaudio_decoder_wma_process(slimau
+ 				eos=true;
+ 			}
+ 
+-			if ( url_ferror(pFormatCtx->pb) )
++			if ( pFormatCtx->pb && pFormatCtx->pb->error )
+ 			{
+ 				DEBUGF("wma: url_ferror\n");
+ #if 0
+@@ -308,7 +312,7 @@ int slimaudio_decoder_wma_process(slimau
+ 
+ 	/* Close the stream */
+ 	DEBUGF ("wma: av_close_input_stream\n");
+-	av_close_input_stream(pFormatCtx);
++	avformat_close_input(&pFormatCtx);
+ 
+ 	return 0;
+ }
diff --git a/media-sound/squeezeslave/files/squeezeslave.confd-r1 b/media-sound/squeezeslave/files/squeezeslave.confd-r1
new file mode 100644
index 000000000000..540aea95f656
--- /dev/null
+++ b/media-sound/squeezeslave/files/squeezeslave.confd-r1
@@ -0,0 +1,13 @@
+# /etc/conf.d/squeezeslave: config file for /etc/init.d/squeezeslave
+
+# Log file for squeezeslave
+SS_LOG="/var/log/squeezeslave.log"
+
+# MAC address associated with this instance
+SS_MAC="00:00:00:00:00:01"
+
+# IP address of machine running logitechmediaserver
+LMS_HOST="127.0.0.1"
+
+# Other squeezeslave options
+SS_OPTS=""
diff --git a/media-sound/squeezeslave/files/squeezeslave.initd-r1 b/media-sound/squeezeslave/files/squeezeslave.initd-r1
new file mode 100644
index 000000000000..1d764fb4c4de
--- /dev/null
+++ b/media-sound/squeezeslave/files/squeezeslave.initd-r1
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+command="/usr/bin/${SVCNAME}"
+command_args="--daemonize ${SS_LOG} --mac ${SS_MAC} --retry ${LMS_HOST} ${SS_OPTS}"
+pidfile="/var/run/${SVCNAME}.pid"
+start_stop_daemon_args="--background --quiet --make-pidfile"
+
+depend() {
+	need net
+	use logitechmediaserver
+}
diff --git a/media-sound/squeezeslave/metadata.xml b/media-sound/squeezeslave/metadata.xml
new file mode 100644
index 000000000000..749da791f339
--- /dev/null
+++ b/media-sound/squeezeslave/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>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<use>
+		<flag name="display">Enable a text-based display</flag>
+		<flag name="tremor">Use a fixed-point version of the Ogg Vorbis decoder (<pkg>media-libs/tremor</pkg>)</flag>
+		<flag name="wma">Enable support for streaming Windows Media Audio</flag>
+		<flag name="zones">Pairs surround sound speakers into stereo zones (requires 5.1 setup or better)</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/squeezeslave/squeezeslave-1.1_p365.ebuild b/media-sound/squeezeslave/squeezeslave-1.1_p365.ebuild
new file mode 100644
index 000000000000..e2d46477a761
--- /dev/null
+++ b/media-sound/squeezeslave/squeezeslave-1.1_p365.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A lightweight streaming audio player for Logitech Media Server"
+HOMEPAGE="http://squeezeslave.googlecode.com"
+SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac +alsa display tremor wma zones"
+
+RDEPEND="media-libs/libmad
+	media-libs/flac
+	tremor? ( media-libs/tremor )
+	!tremor? ( media-libs/libvorbis )
+	media-libs/libogg
+	media-libs/portaudio[alsa?]
+	aac? ( virtual/ffmpeg )
+	wma? ( virtual/ffmpeg )
+	display? ( app-misc/lirc )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1_p350-tremor-headers.patch
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+
+	local myconf
+	for i in aac display tremor wma zones ; do
+		use $i && myconf+=" $i=1"
+	done
+
+	emake ${myconf}
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc ChangeLog TODO
+
+	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+}
diff --git a/media-sound/squeezeslave/squeezeslave-1.1_p381.ebuild b/media-sound/squeezeslave/squeezeslave-1.1_p381.ebuild
new file mode 100644
index 000000000000..a120d88e8706
--- /dev/null
+++ b/media-sound/squeezeslave/squeezeslave-1.1_p381.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A lightweight streaming audio player for Logitech Media Server"
+HOMEPAGE="http://squeezeslave.googlecode.com"
+SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac +alsa display tremor wma zones"
+
+RDEPEND="media-libs/libmad
+	media-libs/flac
+	tremor? ( media-libs/tremor )
+	!tremor? ( media-libs/libvorbis )
+	media-libs/libogg
+	media-libs/portaudio[alsa?]
+	aac? ( virtual/ffmpeg )
+	wma? ( virtual/ffmpeg )
+	display? ( app-misc/lirc )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1_p350-tremor-headers.patch
+	epatch "${FILESDIR}"/${PN}-1.1_p381-ffmpeg2.patch
+}
+
+src_compile() {
+	tc-export CC AR RANLIB
+
+	local myconf
+	for i in aac display tremor wma zones ; do
+		use $i && myconf+=" $i=1"
+	done
+
+	emake ${myconf}
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc ChangeLog TODO
+
+	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+}
diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest
new file mode 100644
index 000000000000..e704b48c8a17
--- /dev/null
+++ b/media-sound/streamripper/Manifest
@@ -0,0 +1 @@
+DIST streamripper-1.64.6.tar.gz 900205 SHA256 c1d75f2e9c7b38fd4695be66eff4533395248132f3cc61f375196403c4d8de42 SHA512 8477086d0099f6de861f1c47112476c427073b6e8127bbaaa2dd3e7930fe9a5c6d9b2c68d4a317f1bc0b20c625e665d5c245189049d35468aa83cf51828d4428 WHIRLPOOL dd53b9178b248d8d177cbc1af6fb94782bd648aa91be9f96d072e936068e3a9ad7b1491b00c4ce0e432c53553e491ca91208cb9a0ddb82814cf4d556169fe096
diff --git a/media-sound/streamripper/metadata.xml b/media-sound/streamripper/metadata.xml
new file mode 100644
index 000000000000..f22b3e40ffce
--- /dev/null
+++ b/media-sound/streamripper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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..88c6910bdb29
--- /dev/null
+++ b/media-sound/streamripper/streamripper-1.64.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d6e62dd8b8f1
--- /dev/null
+++ b/media-sound/streamtranscoder/Manifest
@@ -0,0 +1,2 @@
+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
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..07128bb95596
--- /dev/null
+++ b/media-sound/streamtranscoder/files/streamtranscoder-1.2.4-build.patch
@@ -0,0 +1,59 @@
+--- configure.in
++++ 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)
+--- src/Makefile.am
++++ 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
+--- src/libtranscoder/transcurl.cpp
++++ 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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/streamtranscoder/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..5b235109052a
--- /dev/null
+++ b/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="Command line application 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"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc AUTHORS README
+}
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..5bb3ca9ea07f
--- /dev/null
+++ b/media-sound/streamtranscoder/streamtranscoder-3.1.11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MY_P=${PN}v3-${PV}
+
+DESCRIPTION="Command line application 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}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS
+}
diff --git a/media-sound/subsonic-bin/Manifest b/media-sound/subsonic-bin/Manifest
new file mode 100644
index 000000000000..8fc732f70d77
--- /dev/null
+++ b/media-sound/subsonic-bin/Manifest
@@ -0,0 +1 @@
+DIST subsonic-5.2.1-standalone.tar.gz 43671795 SHA256 523fa8357c961c1ae742a15f0ceaabdd41fcba9137c29d244957922af90ee791 SHA512 1251b77cfbee80224d3e332945fecec981c79b27c129cb47f5880a82344db15d1f8d17b11dd272a4ad3d9794f4e3055d4a59826623d543b676de73fe1c83b936 WHIRLPOOL 72f5c38e59afab4cec95ff1b76b3b8be70f5f25508f4044dac4ba795382069ca54e01c1ff75e30c4220489bfe4c0958c5062168121e8f3e74a226d5a4863970d
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..712a578d0626
--- /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>
+		<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..f08b8188be05
--- /dev/null
+++ b/media-sound/subsonic-bin/subsonic-bin-5.2.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..8d1bb8aabd68
--- /dev/null
+++ b/media-sound/substract_wave/Manifest
@@ -0,0 +1 @@
+DIST substract_wave-0.3.tgz 14793 RMD160 adf7c7307911745876552f2025016dcced316632 SHA1 12e39587977c188d705391033aee01dac04cc024 SHA256 c1f833eb892e9acaa48d47e395cbdb127325b7787c78383bf2623289157731e4
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/substract_wave/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..7861f4cb2e90
--- /dev/null
+++ b/media-sound/substract_wave/substract_wave-0.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/sweep/Manifest b/media-sound/sweep/Manifest
new file mode 100644
index 000000000000..69c25de4d2ab
--- /dev/null
+++ b/media-sound/sweep/Manifest
@@ -0,0 +1 @@
+DIST sweep-0.9.3.tar.gz 1248948 SHA256 be65f19e9d63c74d47d79acfc4fbb6fd4b93dfa794417c7b7a3379e217ecd4fc
diff --git a/media-sound/sweep/files/sweep-0.9.3-configure.patch b/media-sound/sweep/files/sweep-0.9.3-configure.patch
new file mode 100644
index 000000000000..38c8717c4cdd
--- /dev/null
+++ b/media-sound/sweep/files/sweep-0.9.3-configure.patch
@@ -0,0 +1,53 @@
+--- sweep-0.9.3/configure.ac.orig
++++ sweep-0.9.3/configure.ac
+@@ -137,13 +137,13 @@
+ 
+ ac_enable_oggvorbis=yes
+ AC_ARG_ENABLE(oggvorbis,
+-     [  --disable-oggvorbis     disable Ogg Vorbis support],
+-     [ ac_enable_oggvorbis=no ], [ ac_enable_oggvorbis=yes ])
++     [  --enable-oggvorbis     enable Ogg Vorbis support],
++     [ ac_enable_oggvorbis=yes ], [ ac_enable_oggvorbis=no ])
+ 
+ ac_enable_speex=yes
+ AC_ARG_ENABLE(speex,
+-     [  --disable-speex         disable Speex support],
+-     [ ac_enable_speex=no ], [ ac_enable_speex=yes ])
++     [  --enable-speex         enable Speex support],
++     [ ac_enable_speex=yes ], [ ac_enable_speex=no ])
+ 
+ dnl Both Vorbis and Speex require Ogg, so check for it first either way
+ if test "x${ac_enable_oggvorbis}" != xno ||
+@@ -274,8 +274,8 @@
+ 
+ ac_enable_mad=yes
+ AC_ARG_ENABLE(mad,
+-     [  --disable-mad           disable libmad (MPEG audio loading) support],
+-     [ ac_enable_mad=no ], [ ac_enable_mad=yes ])
++     [  --enable-mad           enable libmad (MPEG audio loading) support],
++     [ ac_enable_mad=yes ], [ ac_enable_mad=no ])
+ 
+ if test "x${ac_enable_mad}" != xno ; then
+   AC_CHECK_LIB(mad, mad_decoder_init, HAVE_MAD="maybe")
+@@ -301,8 +301,8 @@
+ 
+ ac_enable_src=yes
+ AC_ARG_ENABLE(src,
+-     [  --disable-src            enable secret rabbit code (libsamplerate)],
+-     [ ac_enable_src=no ], [ ac_enable_src=yes])
++     [  --enable-src            enable secret rabbit code (libsamplerate)],
++     [ ac_enable_src=yes ], [ ac_enable_src=no])
+ 
+ if test "x${ac_enable_src}" != xno ; then
+   PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.0.9,
+@@ -324,8 +324,8 @@
+ 
+ ac_enable_alsa=yes
+ AC_ARG_ENABLE(alsa,
+-     [  --disable-alsa           Disable ALSA, and enable use of OSS],
+-     [ ac_enable_alsa=no ])
++     [  --enable-alsa           enable ALSA support],
++     [ ac_enable_alsa=yes ], [ ac_enable_alsa=no ])
+ 
+ if test "x${ac_enable_alsa}" != xno ; then
+ 
diff --git a/media-sound/sweep/metadata.xml b/media-sound/sweep/metadata.xml
new file mode 100644
index 000000000000..c78de3906349
--- /dev/null
+++ b/media-sound/sweep/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<upstream>
+		<remote-id type="sourceforge">sweep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/sweep/sweep-0.9.3-r1.ebuild b/media-sound/sweep/sweep-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..a47e36c1fd9b
--- /dev/null
+++ b/media-sound/sweep/sweep-0.9.3-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="Audio editor and live playback tool"
+HOMEPAGE="http://www.metadecks.org/software/sweep/"
+SRC_URI="mirror://sourceforge/sweep/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+IUSE="alsa ladspa vorbis mp3 libsamplerate speex"
+
+RDEPEND=">=media-libs/libsndfile-1.0
+	>=x11-libs/gtk+-2.4.0:2
+	>=dev-libs/glib-2.2.0:2
+	alsa? ( media-libs/alsa-lib )
+	libsamplerate? ( media-libs/libsamplerate )
+	speex? ( media-libs/speex )
+	vorbis? ( media-libs/libogg media-libs/libvorbis )
+	mp3? ( media-libs/libmad )
+	ladspa? ( media-libs/ladspa-sdk )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=(AUTHORS ChangeLog NEWS README TODO)
+
+LANGS="de el es_ES fr hu it ja pl ru"
+
+for X in ${LANGS}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable vorbis oggvorbis) \
+		$(use_enable mp3 mad) \
+		$(use_enable speex) \
+		$(use_enable libsamplerate src) \
+		$(use_enable alsa)
+}
diff --git a/media-sound/synaesthesia/Manifest b/media-sound/synaesthesia/Manifest
new file mode 100644
index 000000000000..88ad5a75d039
--- /dev/null
+++ b/media-sound/synaesthesia/Manifest
@@ -0,0 +1 @@
+DIST synaesthesia-2.4.tar.gz 259531 RMD160 494837836ccfaca94a58c68095ebf27e080baa60 SHA1 f268387aad92e01dc5fe86f497404df7bab9db27 SHA256 48505975e809ebadf416dc3e35a528ef87f01b117f2f1c5498d728ead8786493
diff --git a/media-sound/synaesthesia/metadata.xml b/media-sound/synaesthesia/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/synaesthesia/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..22a2ac123756
--- /dev/null
+++ b/media-sound/synaesthesia/synaesthesia-2.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..2cdf3b3652bd
--- /dev/null
+++ b/media-sound/taginfo/Manifest
@@ -0,0 +1 @@
+DIST taginfo-1.2.tar.bz2 8272 SHA256 a1669e3b5153e2a9e0bb453e937f448bf90764f4d2a7ecea2c9bb3d35ac9f2a6
diff --git a/media-sound/taginfo/metadata.xml b/media-sound/taginfo/metadata.xml
new file mode 100644
index 000000000000..9b13f666fe41
--- /dev/null
+++ b/media-sound/taginfo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..1e661fe6e78f
--- /dev/null
+++ b/media-sound/taginfo/taginfo-1.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..84881dbe74f0
--- /dev/null
+++ b/media-sound/tagtool/Manifest
@@ -0,0 +1 @@
+DIST tagtool-0.12.3.tar.bz2 303743 SHA256 273f41031dd2ad80c09d1865fdc71d9052831a5ce9cd8c53705cc518a9d3d411
diff --git a/media-sound/tagtool/metadata.xml b/media-sound/tagtool/metadata.xml
new file mode 100644
index 000000000000..03cfae90382d
--- /dev/null
+++ b/media-sound/tagtool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">tagtool</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/tagtool/tagtool-0.12.3.ebuild b/media-sound/tagtool/tagtool-0.12.3.ebuild
new file mode 100644
index 000000000000..36b45511e871
--- /dev/null
+++ b/media-sound/tagtool/tagtool-0.12.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+DESCRIPTION="Audio Tag Tool Ogg/Mp3 Tagger"
+HOMEPAGE="http://pwp.netcabo.pt/paol/tagtool"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE="vorbis mp3"
+
+RDEPEND="x11-libs/gtk+:2
+	>=gnome-base/libglade-2.6
+	mp3? ( >=media-libs/id3lib-3.8.3-r6 )
+	vorbis? ( >=media-libs/libvorbis-1 )
+	!mp3? ( !vorbis? ( >=media-libs/libvorbis-1 ) )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf
+
+	use mp3 || myconf="${myconf} --disable-mp3"
+	use vorbis || myconf="${myconf} --disable-vorbis"
+
+	if ! use mp3 && ! use vorbis; then
+		einfo "One of USE flags is required, enabling vorbis for you."
+		myconf="--disable-mp3"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		GNOME_SYSCONFDIR="${D}/etc" \
+		sysdir="${D}/usr/share/applets/Multimedia" \
+		install || die
+
+	dodoc ChangeLog NEWS README TODO THANKS
+}
diff --git a/media-sound/takcd/Manifest b/media-sound/takcd/Manifest
new file mode 100644
index 000000000000..c8985a61dfaa
--- /dev/null
+++ b/media-sound/takcd/Manifest
@@ -0,0 +1 @@
+DIST takcd-0.10.tar.gz 95457 RMD160 2784989499ba9e999b1b59c8749d702de1ba446e SHA1 a9b4e607a4c2f091d4a7c62539180d823279c45a SHA256 2871ace2ec79b09ea8eff80a2074105fdde33d3fb0a0572dc8e2dd931c8d4802
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..ae573a60407f
--- /dev/null
+++ b/media-sound/takcd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/takcd/takcd-0.10.ebuild b/media-sound/takcd/takcd-0.10.ebuild
new file mode 100644
index 000000000000..912c49debf10
--- /dev/null
+++ b/media-sound/takcd/takcd-0.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils 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=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-overflow.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	doman *.1
+	dodoc AUTHORS ChangeLog NEWS README README.takmulti TODO
+}
diff --git a/media-sound/tap-reverbed/Manifest b/media-sound/tap-reverbed/Manifest
new file mode 100644
index 000000000000..edc43a1ed659
--- /dev/null
+++ b/media-sound/tap-reverbed/Manifest
@@ -0,0 +1 @@
+DIST tap-reverbed-r0.tar.gz 90703 SHA256 95593f47e5fc00178dc03fa8f83bef3d14a30ebe4b3bdb53ebeacf4e709b17e8
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..a70ef12ee880
--- /dev/null
+++ b/media-sound/tap-reverbed/files/tap-reverbed-flags.patch
@@ -0,0 +1,31 @@
+Index: tap-reverbed-r0/configure.ac
+===================================================================
+--- tap-reverbed-r0.orig/configure.ac
++++ tap-reverbed-r0/configure.ac
+@@ -25,8 +25,7 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.0
+ 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,11 +9,11 @@ file_io.h file_io.c \
+ gui_ext.h gui_ext.c \
+ ports.h ports.c \
+ sound.h sound.c
++reverbed_LDADD = $(GTK_LIBS) $(JACK_LIBS)
+ 
+ EXTRA_DIST = .reverbed
+ 
+ INCLUDES =
+-LIBS =
+ #LIBS = $(LDFLAGS)
+ 
+ install: all
diff --git a/media-sound/tap-reverbed/metadata.xml b/media-sound/tap-reverbed/metadata.xml
new file mode 100644
index 000000000000..41e894deb351
--- /dev/null
+++ b/media-sound/tap-reverbed/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<upstream>
+		<remote-id type="sourceforge">tap-plugins</remote-id>
+	</upstream>
+</pkgmetadata>
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..fef1b4c95609
--- /dev/null
+++ b/media-sound/tap-reverbed/tap-reverbed-0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..22e41db527f3
--- /dev/null
+++ b/media-sound/tapestrea/Manifest
@@ -0,0 +1 @@
+DIST tapestrea-0.1.0.5.tgz 21987831 SHA256 85c57e642814c534a0bdb17d1d5c59d1292d3a681ae397a0c07234637a1ac254 SHA512 8df64cb31e85167afb78e4891192dde7d5476c637241e53f6218b013bb8c40e43a626cc2a2c1368498491f00451a719e1126a90ca2d67aa52137a9e1cd034656 WHIRLPOOL c1f0c0e947dbae4ee65fc00b1632a233d6907ec7d7b47debfff589c0d3701287b9ddd0dc6d4a3c441202928deb228d95ad43edf88d618761ffff3f12fed8adb0
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..bf57f871f4a8
--- /dev/null
+++ b/media-sound/tapestrea/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..ca4ed9b69e94
--- /dev/null
+++ b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Techniques + Paradigms for 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..0090b70fd5a7
--- /dev/null
+++ b/media-sound/tapiir/Manifest
@@ -0,0 +1,2 @@
+DIST tapiir-0.7.2.tar.gz 164866 SHA256 633e09f2cbc3470340aca0c3dc15dc138946a609d63fc177c2e0766001cccb21 SHA512 7c6cc6e4aa836d5c952eb0b5bd8bcbef3fc43a68a2629a1106d16b4753b1b686cf41c03515751f560fe7397be37f50c419b1675c80d8cdffdb84222e4a28e8e8 WHIRLPOOL 59d2b94c9fd7c952684d77d8863249eb9c67ddf3befa2ea1e16e07ecadcf399a388918f2b37475d289e2713b25e36049688eb15ef3971cf7416b24d27e1011ac
+DIST tapiir-0.7.3.tgz 168651 SHA256 9b2f6f0c4f642c3b128f5dd5b3b8d44e80a6eb3310f8f59e0b7460f71cc36d5f SHA512 e9b935f775ddcaf9d6a2b963a1d002d400fc34220845122188b82f1d6075176afc195ae4320679d8990b57f71d0a44fb6ba0cee8a74cb732b92957596c13f4b3 WHIRLPOOL 20ea8a3d7e8b7afdea88278df4990fb5acdcb5224d95fb45fdbdbc3990abaf1ebf2f07e24b45e4f4e9ba371ce0575f20589a43d88712779aa2640282f9eda541
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/tapiir/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/tapiir/tapiir-0.7.2.ebuild b/media-sound/tapiir/tapiir-0.7.2.ebuild
new file mode 100644
index 000000000000..5e8e21d8aae3
--- /dev/null
+++ b/media-sound/tapiir/tapiir-0.7.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="a flexible audio effects processor, inspired on the classical magnetic tape delay systems"
+HOMEPAGE="http://www.iua.upf.es/~mdeboer/projects/tapiir/"
+SRC_URI="http://www.iua.upf.es/~mdeboer/projects/tapiir/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~sparc x86"
+IUSE=""
+
+RDEPEND="
+	media-sound/jack-audio-connection-kit
+	media-libs/alsa-lib
+	x11-libs/fltk:1"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	doman doc/${PN}.1
+	dodoc AUTHORS doc/${PN}.txt
+	dohtml doc/*.html doc/images/*.png
+	insinto /usr/share/${PN}/examples
+	doins doc/examples/*.mtd || die "doins failed."
+}
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..200561437ffb
--- /dev/null
+++ b/media-sound/tapiir/tapiir-0.7.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="a flexible audio effects processor, inspired on the classical magnetic 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}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7.2-ldflags.patch
+
+	cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-dependency-tracking
+}
+
+src_install() {
+	default
+	doman doc/${PN}.1
+	dodoc AUTHORS doc/${PN}.txt
+	dohtml doc/*.html doc/images/*.png
+	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..c8ccff53dcb0
--- /dev/null
+++ b/media-sound/teamspeak-client-bin/Manifest
@@ -0,0 +1,4 @@
+DIST TeamSpeak3-Client-linux_amd64-3.0.13.1.run 33207717 SHA256 211aa921c73369e074e59aa4b664c9d288f98a5f1172f9f8b006a46df5dd4856 SHA512 3d5fc5b419cfd683a0c7787f3ec4b6df14bd944db85eb0abffdbc2b14e5c913cbf77353b46cf81c89f8a34127d362f1312c3e7d6a21b9087b78a171ce0349d9c WHIRLPOOL d2ca0eb74ea5393941dc0613c5ff8462bbae484d61a8d1e2a3e7a04905e777d328e34e073c7a2394d0be6385c92e386d74617c39f7ab6fcb47b13ba5201538c0
+DIST TeamSpeak3-Client-linux_amd64-3.0.16.run 35784109 SHA256 62034baddf352dd2fea615f0aac9a6df7eae363bb3ed7cad78c1fb996b86773f SHA512 a65d986fe4860caf1bba8217fcf429fe4571867439e734e5838893e31167fa1f134c4cabbd3ef80d744f22298172d87496e4f025f51fd7c275781a3bc2c56838 WHIRLPOOL bf3bd39f93aa08b625e659d2cdd5ab857e0f940a344f5535f2941cce367a57b5191b61f18c7b5e63c3b051dac57ebb8c3df739ebc0fec1a721e863afc1e833c2
+DIST TeamSpeak3-Client-linux_x86-3.0.13.1.run 33947497 SHA256 0162f1cef570acde7245fb62c3ed52aa606234375a14d0bcce35500b183d9cc2 SHA512 32af801f73de876e667f31b8046baf9df6498a1ad6f71de2ca33257ee685abc80f200750e4c8e6cb5931635d31f261de9cb409f930c1e99e42be5f9543dbf062 WHIRLPOOL 69964e6b757f77c9ba87b3efa19b55ced5aa60a0ee50af3011426682832d307e4eb79554d8928f5647556258d40808eb5259d3606c7b2df27dcdb95c19078482
+DIST TeamSpeak3-Client-linux_x86-3.0.16.run 36484150 SHA256 3fb21e9b428c0b535c90b0a191bcf1baae29bf99be7cf4621b9da276dd5e76ac SHA512 67b1da2769b1a34cd1affc3e36c1d74d7225711666e1c6d0ededbc4c0dc94d52b9d07181ea89db4d8ec09e58f9e61081f981663338ed7d7ec8efac3719f4b0ad WHIRLPOOL 9c2d51ae9d5a77b833ce7ee400cc611df6727e4793de51d6c95fa8e864d5f17bfe2272ac451751250333ac567bb5b3d4366184113f0d74545ed36088dc2bf438
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..2302bbaf42a4
--- /dev/null
+++ b/media-sound/teamspeak-client-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>
+  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>gentoo@karolherbst.de</email>
+    <name>Karol Herbst</name>
+    <description>Proxy-Maintainer. Assign bugs to him</description>
+  </maintainer>
+  <longdescription>TeamSpeak Client (Voice Communication Software)</longdescription>
+</pkgmetadata>
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.13.1.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.13.1.ebuild
new file mode 100644
index 000000000000..ac0ea4b9a0a9
--- /dev/null
+++ b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.13.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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-qt/qtcore:4
+	dev-qt/qtgui:4[accessibility,xinerama]
+	dev-qt/qtsql:4
+	sys-libs/glibc
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+RESTRICT="fetch 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."
+
+	# Remove unwanted soundbackends.
+	if ! use alsa ; then
+		rm soundbackends/libalsa* || die
+	fi
+
+	if ! use pulseaudio ; then
+		rm soundbackends/libpulseaudio* || die
+	fi
+
+	# 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.16-r1.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.16-r1.ebuild
new file mode 100644
index 000000000000..51b1dc5a70c2
--- /dev/null
+++ b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.16-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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:0/0[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="fetch 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 accessible 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.1 || 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..5b0a52835b11
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/Manifest
@@ -0,0 +1,2 @@
+DIST teamspeak3-server_linux-amd64-3.0.11.3.tar.gz 5022929 SHA256 448d35de0de5c0c9b17feba0697fc232920fb68ac2880bbbf022e0386a17b63b SHA512 14267c3d578e64e1a4bab278acf67b28cf80041d0341ba2e73051608643fe2eeaa7e3c7d3f28ae1826c76b5904b824deb68b7430f7e7d808977aeae7fb86beab WHIRLPOOL 2a4cd813b6428074b1d0a0568ebb78cbe5bb8b276d4cb114dd10bb87db03f78b7cd9e3d50a1706af99ae60346db1c2ae6e56c46f58688e1c32fb198743a64626
+DIST teamspeak3-server_linux-x86-3.0.11.3.tar.gz 5177437 SHA256 adf1eaf74056b24ffee798a6668de6c001801546adea2423a626388215729fa6 SHA512 241a86a728fd8990c75d1f509cf13d3ce97744492a5787c00e4294a6acca02a0ad8a6cdf64cc16e2dc41094eb5233b1528bced8c0cf73bdca66c27ee686f8ccd WHIRLPOOL db945e4fa04c2dcbabc6b5d75a7bf30e9e9367d02d57cc5df7d843aaf865c3baf1516c3c0536d99ba9929e143dc10de333764133c1de2c5c826b276e70ba19de
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.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/systemd/teamspeak3.service b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.service
new file mode 100644
index 000000000000..11213cc45a0f
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/systemd/teamspeak3.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/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/teamspeak-server-bin-init-r1 b/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1
new file mode 100644
index 000000000000..a3fe5771f7da
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/files/teamspeak-server-bin-init-r1
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..9d47011f5298
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/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>
+    <email>maintainer-needed@gentoo.org</email>
+  </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.11.3.ebuild b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11.3.ebuild
new file mode 100644
index 000000000000..4dd1d7f477ac
--- /dev/null
+++ b/media-sound/teamspeak-server-bin/teamspeak-server-bin-3.0.11.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib systemd user
+
+DESCRIPTION="Voice Communication Software - Server"
+HOMEPAGE="http://www.teamspeak.com/"
+SRC_URI="
+	amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-amd64-${PV}.tar.gz )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/teamspeak3-server_linux-x86-${PV}.tar.gz )"
+
+SLOT="0"
+LICENSE="teamspeak3 GPL-2"
+IUSE="doc pdf 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}?page=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_linux_${ARCH} ts3server-bin
+	doexe *.sh
+	doins *.so
+	doins -r sql
+
+	# Install documentation and tsdns.
+	dodoc -r CHANGELOG doc/*.txt
+	use doc && dodoc -r serverquerydocs doc/*.pdf && \
+		docompress -x /usr/share/doc/${PF}/serverquerydocs && \
+		dosym ../../usr/share/doc/${PF}/serverquerydocs  ${opt_dir}/serverquerydocs
+
+	if use tsdns; then
+		newsbin tsdns/tsdnsserver_linux_${ARCH} 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_dounit "${FILESDIR}"/systemd/teamspeak3.service
+	systemd_dotmpfilesd "${FILESDIR}"/systemd/teamspeak3.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}
+}
diff --git a/media-sound/tempest_for_eliza/Manifest b/media-sound/tempest_for_eliza/Manifest
new file mode 100644
index 000000000000..dc4a22884334
--- /dev/null
+++ b/media-sound/tempest_for_eliza/Manifest
@@ -0,0 +1 @@
+DIST tempest_for_eliza-1.0.5.tar.gz 45046 SHA256 c10e40b62e65cfd3862c99b31e8996b6c48b8eeb727efb741db5da041c2c1420
diff --git a/media-sound/tempest_for_eliza/metadata.xml b/media-sound/tempest_for_eliza/metadata.xml
new file mode 100644
index 000000000000..ae573a60407f
--- /dev/null
+++ b/media-sound/tempest_for_eliza/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</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..7c8413323764
--- /dev/null
+++ b/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..8e9191d2c7ee
--- /dev/null
+++ b/media-sound/terminatorx/Manifest
@@ -0,0 +1 @@
+DIST terminatorX-3.84.tar.gz 572143 SHA256 0680b94aa3cbe77d1f1193be2b84a7d7b250c213cfa2da68241a2294ac5dfc37 SHA512 9b538007acc98b1dd7bb2e310be53bcf1971a94e5c03ea8ca48c59b05f1a0bddd75bf30ab4cfb03d49165098ba63643eaa3bda117cdf833df2438c29a774db6c WHIRLPOOL 1cf156623ff6ea410a701ac3b5613740b6d55ce9cd40ad22bd75e44fc404241fd6737705beeb75ff7631be0615ab84938f88d6fcb62cc5561be978be66d73290
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/metadata.xml b/media-sound/terminatorx/metadata.xml
new file mode 100644
index 000000000000..0dc3775f83d7
--- /dev/null
+++ b/media-sound/terminatorx/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proaudio</herd>
+</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..f7c4499f6996
--- /dev/null
+++ b/media-sound/terminatorx/terminatorx-3.84-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils
+
+MY_P=${P/terminatorx/terminatorX}
+DESCRIPTION='realtime audio synthesizer that allows you to "scratch" on digitally 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
+	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/timemachine/Manifest b/media-sound/timemachine/Manifest
new file mode 100644
index 000000000000..339498a029f6
--- /dev/null
+++ b/media-sound/timemachine/Manifest
@@ -0,0 +1,2 @@
+DIST timemachine-0.3.1.tar.gz 158344 SHA256 670ce6e9eff6f7b48fdd08be3678c46b997647c9b4541e46c1db66801cf67a87
+DIST timemachine-0.3.3.tar.gz 169021 SHA256 3e798a952b83874e3d60642ca4a7e0c2e2990c4659561009087da95044b21f9d
diff --git a/media-sound/timemachine/metadata.xml b/media-sound/timemachine/metadata.xml
new file mode 100644
index 000000000000..d4dd2647026b
--- /dev/null
+++ b/media-sound/timemachine/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<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.1.ebuild b/media-sound/timemachine/timemachine-0.3.1.ebuild
new file mode 100644
index 000000000000..360164c5e4a5
--- /dev/null
+++ b/media-sound/timemachine/timemachine-0.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+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
+	lash? ( >=media-sound/lash-0.5 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable lash)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog
+}
diff --git a/media-sound/timemachine/timemachine-0.3.3.ebuild b/media-sound/timemachine/timemachine-0.3.3.ebuild
new file mode 100644
index 000000000000..0ceb726769e2
--- /dev/null
+++ b/media-sound/timemachine/timemachine-0.3.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+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"
+
+src_configure() {
+	econf \
+		$(use_enable lash)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc ChangeLog
+}
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
new file mode 100644
index 000000000000..b83a47dd6c34
--- /dev/null
+++ b/media-sound/timidity++/Manifest
@@ -0,0 +1,3 @@
+DIST TiMidity++-2.13.2.tar.bz2 1581230 SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260 SHA512 0e35ad4c8745878daf63932143e60dc4bda0f3ef5d6f046cad74c8c57edf39a7d1d3f0f36758d5b11ace72e2661fba1629d30d90202e9573c07d1ea2b66a6bc1 WHIRLPOOL 134a903ce7f943b538783ee610e074ff279103443bf0b2a9ff10822af376bd31d291197202913aba1325e55ee55b9d20c6087e13a79f135018ed945e8e8c8ff4
+DIST TiMidity++-2.14.0.tar.xz 1356476 SHA256 abf0c8367959e85c9e635b8fbd5183fc27bd380e0ef5e45de4158784538c86fc SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3 WHIRLPOOL 0031a0e6519ead34c73ed3383d1d74b91b3e25c257854bd3325d25ec9c00bb55c036936ef4ef162ad13c255fefc4e46b802173e93b7ed575c92cf076ab03929b
+DIST timidity++-2.13.2-patchset-2.tar.bz2 8465 SHA256 d71bf95d27a87cbf9fbfb3d0a04dfc391f0413e0663b13622111c6325d2fb2dc SHA512 5199a608518f0d92a5dc2d469babe922949b6dd7c07197af3eca167024b20e57466e99baf731abda58a4025fd842d7670dbc01130cdb6eebef11d04f4c2a32ea WHIRLPOOL 2d7281a13512090a22498d5198b4ef2d6b3e74ed23a351b8b187686fdcadea59565b924c5887b04bedf4d3ff289f73952f1bb026ff4e37c30df28d7437453462
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.3 b/media-sound/timidity++/files/init.d.timidity.3
new file mode 100644
index 000000000000..444a914567ab
--- /dev/null
+++ b/media-sound/timidity++/files/init.d.timidity.3
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+ 
+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 \
+	--chuid timidity: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/init.d.timidity.4 b/media-sound/timidity++/files/init.d.timidity.4
new file mode 100644
index 000000000000..e3dac7fc04d5
--- /dev/null
+++ b/media-sound/timidity++/files/init.d.timidity.4
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+ 
+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..3c8a06a44add
--- /dev/null
+++ b/media-sound/timidity++/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">timidity</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/timidity++/timidity++-2.13.2-r13.ebuild b/media-sound/timidity++/timidity++-2.13.2-r13.ebuild
new file mode 100644
index 000000000000..c48ad1aaad2c
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.13.2-r13.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit autotools eutils elisp-common user
+
+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.bz2
+	mirror://gentoo/${P}-patchset-2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm 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 )
+	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 )
+	selinux? ( sec-policy/selinux-timidity )
+	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"
+
+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_SUFFIX="patch" epatch "${WORKDIR}"/patches
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	local audios
+
+	use flac && audios="${audios},flac"
+	use speex && audios="${audios},speex"
+	use vorbis && audios="${audios},vorbis"
+
+	use oss && audios="${audios},oss"
+	use jack && audios="${audios},jack"
+	use ao && audios="${audios},ao"
+
+	if use nas; then
+		audios="${audios},nas"
+		myconf="${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="${audios},alsa"
+		myconf="${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="${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-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 || die "emake install failed"
+
+	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.3 timidity
+	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 "sed failed"
+}
+
+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++/timidity++-2.13.2-r14.ebuild b/media-sound/timidity++/timidity++-2.13.2-r14.ebuild
new file mode 100644
index 000000000000..b1b5e37f3234
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.13.2-r14.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils elisp-common user
+
+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.bz2
+	mirror://gentoo/${P}-patchset-2.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~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 )
+	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 )
+	selinux? ( sec-policy/selinux-timidity )
+	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"
+
+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_SUFFIX="patch" epatch "${WORKDIR}"/patches
+	eautoreconf
+}
+
+src_configure() {
+	export EXTRACFLAGS="${CFLAGS}" #385817
+
+	local myconf
+	local audios
+
+	use flac && audios="${audios},flac"
+	use speex && audios="${audios},speex"
+	use vorbis && audios="${audios},vorbis"
+
+	use oss && audios="${audios},oss"
+	use jack && audios="${audios},jack"
+	use ao && audios="${audios},ao"
+
+	if use nas; then
+		audios="${audios},nas"
+		myconf="${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="${audios},alsa"
+		myconf="${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="${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-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
+	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 "sed failed"
+}
+
+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++/timidity++-2.14.0-r1.ebuild b/media-sound/timidity++/timidity++-2.14.0-r1.ebuild
new file mode 100644
index 000000000000..0757e091e1d9
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.14.0-r1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~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
+
+	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-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++/timidity++-2.14.0-r2.ebuild b/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
new file mode 100644
index 000000000000..d7981003c3a7
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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++/timidity++-2.14.0.ebuild b/media-sound/timidity++/timidity++-2.14.0.ebuild
new file mode 100644
index 000000000000..b06c43d7f378
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.14.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils elisp-common user systemd
+
+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 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 )
+	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
+
+	eautoreconf
+}
+
+src_configure() {
+	export EXTRACFLAGS="${CFLAGS}" #385817
+
+	local myconf
+	local audios
+
+	use flac && audios="${audios},flac"
+	use speex && audios="${audios},speex"
+	use vorbis && audios="${audios},vorbis"
+
+	use oss && audios="${audios},oss"
+	use jack && audios="${audios},jack"
+	use ao && audios="${audios},ao"
+
+	if use nas; then
+		audios="${audios},nas"
+		myconf="${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="${audios},alsa"
+		myconf="${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="${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-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 "sed failed"
+}
+
+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..7eb0a87bf3e1
--- /dev/null
+++ b/media-sound/timidity-eawpatches/Manifest
@@ -0,0 +1 @@
+DIST eawpats12_full.tar.gz 32047230 SHA256 0a1b7368e6e525d62900b34bd061ccc830e6fe1747601ede703e3eb0d1d968b6
diff --git a/media-sound/timidity-eawpatches/metadata.xml b/media-sound/timidity-eawpatches/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/timidity-eawpatches/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..4f4d1bd06920
--- /dev/null
+++ b/media-sound/timidity-eawpatches/timidity-eawpatches-12-r5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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..43a2ddc662e6
--- /dev/null
+++ b/media-sound/timidity-freepats/Manifest
@@ -0,0 +1 @@
+DIST freepats-20060219.tar.bz2 25791733 SHA256 0261ea1057b232183fa472432d5cedb0dca33698a5319328cdf193d4b2193c8a SHA512 6b24bf387a52fac9906906cb52fd5f9d02decdfcecb8d88acea136b200db962ba9beeb3e78bccdd6024b47453d7f093980b01cb0661e1b8d29fedc45ed61cb4f WHIRLPOOL 699d97bde866ad4772a10bd484e3812bf7e1a3f419e2effdb45a72eb4bca5d6ae70e128773a255c90525e85daa3d6f28671dd23eb23770e14e8b41fa09d915cb
diff --git a/media-sound/timidity-freepats/metadata.xml b/media-sound/timidity-freepats/metadata.xml
new file mode 100644
index 000000000000..3bf6bcfeb512
--- /dev/null
+++ b/media-sound/timidity-freepats/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+</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..75b3c1ae4109
--- /dev/null
+++ b/media-sound/timidity-freepats/timidity-freepats-20060219-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..2cc6248c88a7
--- /dev/null
+++ b/media-sound/tk707/Manifest
@@ -0,0 +1,2 @@
+DIST tk707-0.8-updated_tcl2c.patch.gz 7368 RMD160 4061f2e109061f43fd7dd44763c44880011af9a4 SHA1 84e18d72c4f5c34b9d78254b161d841d146d4a9c SHA256 b8b50e392645d3cbdc4d79fd2916f5d0d994e6c235e8de7954409f8d3937dd15
+DIST tk707-0.8.tar.gz 404862 RMD160 f214767e0766c195f72ce223dc43069524b47275 SHA1 5d6d2472735dbeb9cd6abcc9e5c5745646b3895b SHA256 11de4001d19737f7f094ccc9d34b98fe9129714e0cb1f13f995c70775a37b539
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/tk707/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..728e1af990c1
--- /dev/null
+++ b/media-sound/tk707/tk707-0.8-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..3187743feb8d
--- /dev/null
+++ b/media-sound/tomahawk/Manifest
@@ -0,0 +1 @@
+DIST tomahawk-0.8.4.tar.bz2 8611412 SHA256 0fb04bc6b7009e17186b3d384057939727c6f289d22f7f9a5ed2c9c9cd800449 SHA512 5b312f593eac39d06de05e24d4ce429122d0777a9d52d6db8c65309ac283d7ae560c2fc189b186f0f8b1a7bbe1135ed0d59e1d850de6a93655e53efe4f5317c7 WHIRLPOOL 3577f47f13b191f0bea42d7c30c00ad8e6346afc7527eb5f5ecb81185183a8e99dcc0559414afbba485db5d80d2e5f9830fe341d4563d3d7427a98f54382e013
diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch b/media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch
new file mode 100644
index 000000000000..10b71c07c518
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.8.4-qt55.patch
@@ -0,0 +1,34 @@
+From 50e77ce0db45e9c876eba3d8cc6491f62a5de882 Mon Sep 17 00:00:00 2001
+From: Takahiro Hashimoto <kenya888@gmail.com>
+Date: Mon, 22 Jun 2015 14:33:23 +0900
+Subject: [PATCH] fix compilation error with Qt 5.5
+
+---
+ src/libtomahawk/network/acl/AclRegistry.cpp | 1 +
+ src/libtomahawk/utils/TomahawkCache.h       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/libtomahawk/network/acl/AclRegistry.cpp b/src/libtomahawk/network/acl/AclRegistry.cpp
+index b177d19..3bc5056 100644
+--- a/src/libtomahawk/network/acl/AclRegistry.cpp
++++ b/src/libtomahawk/network/acl/AclRegistry.cpp
+@@ -21,6 +21,7 @@
+ 
+ #include <QThread>
+ #include <QVariant>
++#include <QDataStream>
+ 
+ #include "utils/Logger.h"
+ 
+diff --git a/src/libtomahawk/utils/TomahawkCache.h b/src/libtomahawk/utils/TomahawkCache.h
+index b7c3245..6a4aadd 100644
+--- a/src/libtomahawk/utils/TomahawkCache.h
++++ b/src/libtomahawk/utils/TomahawkCache.h
+@@ -27,6 +27,7 @@
+ #include <QObject>
+ #include <QTimer>
+ #include <QDir>
++#include <QDataStream>
+ 
+ namespace TomahawkUtils
+ {
diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
new file mode 100644
index 000000000000..55e1aa0ef2ac
--- /dev/null
+++ b/media-sound/tomahawk/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<maintainer>
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</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.8.4-r1.ebuild b/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..30323bd0e636
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+inherit kde4-base ${GIT_ECLASS}
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Multi-source social music player"
+HOMEPAGE="http://tomahawk-player.org/"
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+IUSE="debug +hatchet kde qt5 telepathy xmpp"
+
+REQUIRED_USE="telepathy? ( kde )"
+
+DEPEND="
+	dev-cpp/lucene++
+	dev-cpp/sparsehash
+	dev-libs/boost:=
+	>=media-libs/taglib-1.8.0
+	>=net-libs/gnutls-3.2
+	x11-libs/libX11
+	hatchet? ( dev-cpp/websocketpp )
+	xmpp? ( net-libs/jreen )
+	!qt5? (
+		app-crypt/qca:2[qt4(+)]
+		>=dev-libs/libattica-0.4.0
+		dev-libs/qjson
+		dev-libs/qtkeychain[qt4]
+		dev-libs/quazip[qt4]
+		dev-qt/designer:4
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtsql:4[sqlite]
+		dev-qt/qtsvg:4
+		dev-qt/qtwebkit:4
+		media-libs/phonon[qt4]
+		>=media-libs/libechonest-2.3.0:=[qt4]
+		media-libs/liblastfm[qt4]
+		telepathy? ( net-libs/telepathy-qt[qt4] )
+	)
+	qt5? (
+		app-crypt/qca:2[qt5(+)]
+		dev-libs/qtkeychain[qt5]
+		dev-libs/quazip[qt5]
+		dev-qt/designer:5
+		dev-qt/qtcore:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		kde-frameworks/attica:5
+		media-libs/phonon[qt5]
+		>=media-libs/libechonest-2.3.0:=[qt5]
+		media-libs/liblastfm[qt5]
+		telepathy? ( net-libs/telepathy-qt[qt5] )
+	)
+"
+RDEPEND="${DEPEND}
+	app-crypt/qca:2[openssl]
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+PATCHES=( "${FILESDIR}/${P}-qt55.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CRASHREPORTER=OFF
+		$(cmake-utils_use_build hatchet)
+		$(cmake-utils_use_with xmpp Jreen)
+		$(cmake-utils_use_with kde KDE4)
+		$(cmake-utils_use_build !qt5 WITH_QT4)
+		$(cmake-utils_use_with telepathy TelepathyQt)
+	)
+
+	if [[ ${PV} != *9999* ]]; then
+		mycmakeargs+=( -DBUILD_RELEASE=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
new file mode 100644
index 000000000000..10d684f91888
--- /dev/null
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+inherit kde4-base ${GIT_ECLASS}
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="http://download.tomahawk-player.org/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="git://github.com/tomahawk-player/${PN}.git"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Multi-source social music player"
+HOMEPAGE="http://tomahawk-player.org/"
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+IUSE="debug +hatchet kde qt5 telepathy xmpp"
+
+REQUIRED_USE="telepathy? ( kde )"
+
+DEPEND="
+	dev-cpp/lucene++
+	dev-cpp/sparsehash
+	dev-libs/boost:=
+	>=media-libs/taglib-1.8.0
+	>=net-libs/gnutls-3.2
+	x11-libs/libX11
+	hatchet? ( dev-cpp/websocketpp )
+	xmpp? ( net-libs/jreen )
+	!qt5? (
+		app-crypt/qca:2[qt4]
+		>=dev-libs/libattica-0.4.0
+		dev-libs/qjson
+		dev-libs/qtkeychain[qt4]
+		dev-libs/quazip[qt4]
+		dev-qt/designer:4
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtsql:4[sqlite]
+		dev-qt/qtsvg:4
+		dev-qt/qtwebkit:4
+		media-libs/phonon[qt4]
+		>=media-libs/libechonest-2.3.0:=[qt4]
+		media-libs/liblastfm[qt4]
+		telepathy? ( net-libs/telepathy-qt[qt4] )
+	)
+	qt5? (
+		app-crypt/qca:2[qt5]
+		dev-libs/qtkeychain[qt5]
+		dev-libs/quazip[qt5]
+		dev-qt/designer:5
+		dev-qt/qtcore:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5
+		kde-frameworks/attica:5
+		media-libs/phonon[qt5]
+		>=media-libs/libechonest-2.3.0:=[qt5]
+		media-libs/liblastfm[qt5]
+		telepathy? ( net-libs/telepathy-qt[qt5] )
+	)
+"
+RDEPEND="${DEPEND}
+	app-crypt/qca:2[openssl]
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CRASHREPORTER=OFF
+		$(cmake-utils_use_build hatchet)
+		$(cmake-utils_use_with xmpp Jreen)
+		$(cmake-utils_use_with kde KDE4)
+		$(cmake-utils_use_build !qt5 WITH_QT4)
+		$(cmake-utils_use_with telepathy TelepathyQt)
+	)
+
+	if [[ ${PV} != *9999* ]]; then
+		mycmakeargs+=( -DBUILD_RELEASE=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+}
diff --git a/media-sound/toolame/Manifest b/media-sound/toolame/Manifest
new file mode 100644
index 000000000000..ce23c7bbaa8c
--- /dev/null
+++ b/media-sound/toolame/Manifest
@@ -0,0 +1 @@
+DIST toolame-02l.tgz 127493 SHA256 3b95cd2504bceac4aab2fca03bb3b5974d1d44b5afdd8eb4cc0f0899521bffc4
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..1b011600e7ef
--- /dev/null
+++ b/media-sound/toolame/files/toolame-02l-gentoo.diff
@@ -0,0 +1,69 @@
+--- Makefile	2003-03-02 08:07:02.000000000 +0100
++++ 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..606e35ac166d
--- /dev/null
+++ b/media-sound/toolame/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">toolame</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/toolame/toolame-02l-r3.ebuild b/media-sound/toolame/toolame-02l-r3.ebuild
new file mode 100644
index 000000000000..49497728423e
--- /dev/null
+++ b/media-sound/toolame/toolame-02l-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.diff \
+		"${FILESDIR}"/${P}-uint.patch \
+		"${FILESDIR}"/${P}-uint32_t.patch
+}
+
+src_compile() {
+	append-lfs-flags
+	tc-export CC
+	emake
+}
+
+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..f7bf97e61150
--- /dev/null
+++ b/media-sound/traverso/Manifest
@@ -0,0 +1,2 @@
+DIST traverso-0.49.2.tar.gz 1437811 SHA256 9edbbb10c4245ee58a7a125c33d86327a877d42bf84c8a1b81587642bd601002 SHA512 eebdb1849846b42b4407b78fcd287b92c328156740a8f664b0ef462b071599b628a7f25d26d66b8fe256c732f6c16b1ccae5229b9025dd2758df4a71cafaf0dc WHIRLPOOL 3bb67064a4bb2ead749507ac0628b5338b159c669536206cc4efce91ae6fc3f604de1317eb3b78fd31299a0be30c53b193a889140313fc0dbf220336ba82142d
+DIST traverso-0.49.3.tar.gz 1391101 SHA256 9e94b9b082c6891d5eaa5a8addb80b88f18bb7864899028eddf91a114a4b7382 SHA512 3db1dbc99ef3b0a9597959a6a3ce93909ec32d5f00648659debe1e8c5cec58ac6ab2108d5c66a1fc4145c2fe110c7db801fda8914664127653457132eac94ef2 WHIRLPOOL 3a44a45d9415071f80b8a788f28fcb38f489449d09dd5a93878f23af95eba1c1e8831db5ca6970ea97df91685051764d9ff21eeafeb3822cf29e478adb7c5a9f
diff --git a/media-sound/traverso/files/traverso-0.49.1-slv2.patch b/media-sound/traverso/files/traverso-0.49.1-slv2.patch
new file mode 100644
index 000000000000..76a13d8d56b2
--- /dev/null
+++ b/media-sound/traverso/files/traverso-0.49.1-slv2.patch
@@ -0,0 +1,13 @@
+Index: traverso-0.49.1/CMakeLists.txt
+===================================================================
+--- traverso-0.49.1.orig/CMakeLists.txt
++++ traverso-0.49.1/CMakeLists.txt
+@@ -198,7 +198,7 @@ IF(WANT_LV2)
+ # 			MESSAGE(FATAL_ERROR "lv2 support requested, but slv2 development headers could not be found!\nPlease install the slv2 development package (Usually called libslv2-dev), remove CMakeCache.txt and run cmake again")
+ # 		ENDIF(NOT HAVE_SLV2_H)
+ 		
+-		PKG_CHECK_MODULES(SLV2  libslv2>=${MINIMAL_SLV2_VERSION})
++		PKG_CHECK_MODULES(SLV2  slv2>=${MINIMAL_SLV2_VERSION})
+ 		IF (SLV2_FOUND)
+ 			MESSAGE("-- slv2 Library Found OK")
+ 			SET(HAVE_SYSTEM_SLV2 TRUE)
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..5e2f54303ee3
--- /dev/null
+++ b/media-sound/traverso/files/traverso-0.49.2-desktop.patch
@@ -0,0 +1,16 @@
+--- resources/traverso.desktop
++++ 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.2-gcc47.patch b/media-sound/traverso/files/traverso-0.49.2-gcc47.patch
new file mode 100644
index 000000000000..33820ea5ab06
--- /dev/null
+++ b/media-sound/traverso/files/traverso-0.49.2-gcc47.patch
@@ -0,0 +1,20 @@
+--- src/core/FileHelpers.cpp
++++ src/core/FileHelpers.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include "FileHelpers.h"
+ 
++#include <unistd.h> /* read and write */
+ #include <sys/stat.h>
+ #include "Config.h"
+ #include <QDir>
+--- src/traverso/Main.cpp
++++ src/traverso/Main.cpp
+@@ -19,6 +19,7 @@
+ 
+ */
+ 
++#include <unistd.h> /* getpgrp */
+ #include <signal.h>
+ #include <stdlib.h>
+ 
diff --git a/media-sound/traverso/files/traverso-0.49.2-gold.patch b/media-sound/traverso/files/traverso-0.49.2-gold.patch
new file mode 100644
index 000000000000..6dcf978a407b
--- /dev/null
+++ b/media-sound/traverso/files/traverso-0.49.2-gold.patch
@@ -0,0 +1,10 @@
+--- src/engine/CMakeLists.txt
++++ src/engine/CMakeLists.txt
+@@ -68,3 +68,7 @@
+ IF(USE_PCH)
+     ADD_DEPENDENCIES(traversoaudiobackend precompiled_headers)
+ ENDIF(USE_PCH)
++
++TARGET_LINK_LIBRARIES(traversoaudiobackend
++	-ldl
++)
diff --git a/media-sound/traverso/metadata.xml b/media-sound/traverso/metadata.xml
new file mode 100644
index 000000000000..4bb017c09afe
--- /dev/null
+++ b/media-sound/traverso/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>proaudio</herd>
+  <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.2-r1.ebuild b/media-sound/traverso/traverso-0.49.2-r1.ebuild
new file mode 100644
index 000000000000..d1d59cbba893
--- /dev/null
+++ b/media-sound/traverso/traverso-0.49.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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/download/releases/current/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack lame lv2 mad pulseaudio"
+
+RDEPEND=">=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
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	lame? ( media-sound/lame )
+	lv2? ( >=media-libs/slv2-0.6.1 )
+	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.1-slv2.patch
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-gold.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	)
+
+src_configure() {
+	use lv2 && append-cppflags "$($(tc-getPKG_CONFIG) --cflags slv2)" #415165
+
+	local mycmakeargs=(
+		$(cmake-utils_use_want jack JACK) $(cmake-utils_use_want alsa ALSA)
+		$(cmake-utils_use_want pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_want lv2 LV2) -DUSE_SYSTEM_SLV2_LIBRARY=ON
+		$(cmake-utils_use_want mad MP3_DECODE) $(cmake-utils_use_want lame MP3_ENCODE)
+		$(cmake-utils_use_want debug TRAVERSO_DEBUG)
+	)
+	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/traverso/traverso-0.49.3.ebuild b/media-sound/traverso/traverso-0.49.3.ebuild
new file mode 100644
index 000000000000..35a04adf5f2e
--- /dev/null
+++ b/media-sound/traverso/traverso-0.49.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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=">=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
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	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
+)
+
+src_configure() {
+	use lv2 && append-cppflags "$($(tc-getPKG_CONFIG) --cflags slv2)" #415165
+
+	local mycmakeargs=(
+		$(cmake-utils_use_want jack JACK)
+		$(cmake-utils_use_want alsa ALSA)
+		$(cmake-utils_use_want pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_want lv2 LV2)
+		$(cmake-utils_use_want mad MP3_DECODE)
+		$(cmake-utils_use_want lame MP3_ENCODE)
+		$(cmake-utils_use_want debug TRAVERSO_DEBUG)
+	)
+	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/trommler/Manifest b/media-sound/trommler/Manifest
new file mode 100644
index 000000000000..c094ab3f1165
--- /dev/null
+++ b/media-sound/trommler/Manifest
@@ -0,0 +1 @@
+DIST trommler.3.8.tar.gz 805792 SHA256 61bce1ddf8a538d1e83cab1927d6317ddf30c1a9cf9542e692a91c1f9682b912
diff --git a/media-sound/trommler/files/trommler.wrapper b/media-sound/trommler/files/trommler.wrapper
new file mode 100644
index 000000000000..78648ee0b1d3
--- /dev/null
+++ b/media-sound/trommler/files/trommler.wrapper
@@ -0,0 +1,4 @@
+#!/bin/sh
+export TROMMLER_DRUM_DIR="/usr/share/trommler/Drums"
+cd /usr/share/trommler/Songs
+exec /usr/libexec/trommler "$@"
diff --git a/media-sound/trommler/metadata.xml b/media-sound/trommler/metadata.xml
new file mode 100644
index 000000000000..ae573a60407f
--- /dev/null
+++ b/media-sound/trommler/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/trommler/trommler-3.8.ebuild b/media-sound/trommler/trommler-3.8.ebuild
new file mode 100644
index 000000000000..52c50781873d
--- /dev/null
+++ b/media-sound/trommler/trommler-3.8.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="GTK+ based drum machine"
+HOMEPAGE="http://muth.org/Robert/Trommler"
+SRC_URI="http://muth.org/Robert/${PN/t/T}/${P/-/.}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
+IUSE="+sox"
+
+RDEPEND="x11-libs/gtk+:2
+	sox? ( media-sound/sox )"
+DEPEND="${RDEPEND}
+	x11-misc/makedepend
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN/t/T}
+
+src_prepare() {
+	sed -i \
+		-e 's:$(CC):$(CC) $(LDFLAGS):' \
+		Makefile || die
+}
+
+src_compile() {
+	tc-export CC
+	emake export.h || die
+	emake CFLAGS="${CFLAGS} -Wall $(pkg-config --cflags gtk+-2.0)" || die
+}
+
+src_install() {
+	exeinto /usr/libexec
+	doexe ${PN} || die
+
+	newbin "${FILESDIR}"/${PN}.wrapper ${PN} || die
+	dobin wav2smp playsample || die
+	use sox && { dobin smp2wav || die; }
+
+	insinto /usr/share/${PN}/Drums
+	doins Drums/*.smp || die
+	insinto /usr/share/${PN}/Songs
+	doins Songs/*.sng || die
+
+	dodoc CHANGES README
+	dohtml index.html style.css
+
+	make_desktop_entry ${PN} Trommler
+}
diff --git a/media-sound/ttaenc/Manifest b/media-sound/ttaenc/Manifest
new file mode 100644
index 000000000000..2b8ec75b510e
--- /dev/null
+++ b/media-sound/ttaenc/Manifest
@@ -0,0 +1 @@
+DIST ttaenc-3.4.1-src.tgz 20835 SHA256 b2c9c8b015acc5864f082a0157f2e09c5117d1445321cb6178e925b448be3dc6
diff --git a/media-sound/ttaenc/metadata.xml b/media-sound/ttaenc/metadata.xml
new file mode 100644
index 000000000000..af7bf4d5d068
--- /dev/null
+++ b/media-sound/ttaenc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..b705b8361b40
--- /dev/null
+++ b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..de70e54b2a2c
--- /dev/null
+++ b/media-sound/tudor-volumed/Manifest
@@ -0,0 +1 @@
+DIST tudor-volumed-0_pre20110427.tar.gz 5651 SHA256 e531a8ddab8910ebe0e639167f9cb81210426b3665eab6da2e36710be774124c SHA512 e05e8fef96985355b2e12b34a8858b98fd508e1849bff377c96593a5fee6cdf542decae2b9f1292c25b886cdd44545d99350c4c614553665fa3c7ea21ce5bd51 WHIRLPOOL 259374ddb24809c4ea99f2dd0cfc7859c7b9fc2aebbdcf0b9ede2999e3ec81fb594c5105506962f32c16cb482668f9505c9835dcf54297470765125d08574107
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..8e4208ba6486
--- /dev/null
+++ b/media-sound/tudor-volumed/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..6ab69e4ba0c2
--- /dev/null
+++ b/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..15123bc772a3
--- /dev/null
+++ b/media-sound/tunapie/Manifest
@@ -0,0 +1 @@
+DIST tunapie-2.1.17.tar.gz 50165 SHA256 d3cf0d102df52da37ee50125fbaa8f9709b18d9f8bc13dd9fa3932e4f28828f6
diff --git a/media-sound/tunapie/metadata.xml b/media-sound/tunapie/metadata.xml
new file mode 100644
index 000000000000..47dc2fb9efa8
--- /dev/null
+++ b/media-sound/tunapie/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="sourceforge">tunapie</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/tunapie/tunapie-2.1.17.ebuild b/media-sound/tunapie/tunapie-2.1.17.ebuild
new file mode 100644
index 000000000000..7c815220255c
--- /dev/null
+++ b/media-sound/tunapie/tunapie-2.1.17.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+PYTHON_DEPEND="2"
+inherit eutils multilib python
+
+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"
+DEPEND=""
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e "s:/usr/local/share:/usr/$(get_libdir):" ${PN} \
+		|| die "sed failed"
+}
+
+src_install() {
+	dobin ${PN} || die "dobin failed"
+	doman ${PN}.1
+	dodoc CHANGELOG README
+
+	doicon src/tplogo.xpm
+	domenu ${PN}.desktop
+
+	insinto /usr/$(get_libdir)/${PN}
+	doins src/{*.py,*.png} || die "doins failed"
+
+	dodir /etc
+
+	if use offensive; then
+		echo 1 > "${D}"/etc/${PN}.config
+	else
+		echo 0 > "${D}"/etc/${PN}.config
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/${PN}
+}
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
new file mode 100644
index 000000000000..a99a6ad71045
--- /dev/null
+++ b/media-sound/twolame/Manifest
@@ -0,0 +1 @@
+DIST twolame-0.3.13.tar.gz 660415 SHA256 98f332f48951f47f23f70fd0379463aff7d7fb26f07e1e24e42ddef22cc6112a SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7 WHIRLPOOL 489943692b60fbb5b63c9c4b95730ce854dcaab278023bb9fb472e0b84755bcfe7d71097bcbb4555a1181b3c27a6e8f2cf0cff2eddd5d515b4a0fa8a19c9a532
diff --git a/media-sound/twolame/metadata.xml b/media-sound/twolame/metadata.xml
new file mode 100644
index 000000000000..9d29a9e027ca
--- /dev/null
+++ b/media-sound/twolame/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..1b1aac1f47d3
--- /dev/null
+++ b/media-sound/twolame/twolame-0.3.13-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/umix/Manifest b/media-sound/umix/Manifest
new file mode 100644
index 000000000000..7ce4d2ab0da1
--- /dev/null
+++ b/media-sound/umix/Manifest
@@ -0,0 +1 @@
+DIST umix-1.0.2.tar.gz 225866 SHA256 ee5425f8f08f6b34fa8785f14a100682b05b8ad8a86c7aec5329c594300d7055
diff --git a/media-sound/umix/metadata.xml b/media-sound/umix/metadata.xml
new file mode 100644
index 000000000000..2bfbe00af0a5
--- /dev/null
+++ b/media-sound/umix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..1beb48fc018f
--- /dev/null
+++ b/media-sound/umix/umix-1.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..171310f726c0
--- /dev/null
+++ b/media-sound/umurmur/Manifest
@@ -0,0 +1 @@
+DIST umurmur-0.2.16a.tar.gz 91187 SHA256 d64df8f77ceaa4951d7f2adbb2dcc173841d1e387ef4cd2082c42150a84349a5 SHA512 432a85e93cb7d53c505caf8b97c1bb7c173c8f625127510de61cc0a1e3abaea9abcf96ab1c0a8c5039ba82af5d29710e4973f70c1438bfd44ba00fa0c3f64c9e WHIRLPOOL 98a01a25dad0427bda0379711f9702ee8ed70bbeb50daa439a9e8c40bfec174f79bfe6ed02e07ff20a4f0f8614de83cbd4806ccbacc0066c769d9e43678b508e
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..3d4183190abb
--- /dev/null
+++ b/media-sound/umurmur/files/umurmurd.initd
@@ -0,0 +1,19 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..3506df7afe67
--- /dev/null
+++ b/media-sound/umurmur/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<maintainer>
+		<email>alex_y_xu@yahoo.ca</email>
+		<name>Alex Xu</name>
+		<description>Co maintainer, CC bugs</description>
+	</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="polarssl">Use <pkg>net-libs/polarssl</pkg>
+			instead of <pkg>dev-libs/openssl</pkg></flag>
+		<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.ebuild b/media-sound/umurmur/umurmur-0.2.16a.ebuild
new file mode 100644
index 000000000000..fafe9f5e6e4a
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.16a.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools systemd eutils readme.gentoo user
+
+DESCRIPTION="Minimalistic Murmur (Mumble server)"
+HOMEPAGE="http://code.google.com/p/umurmur/ 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 polarssl shm"
+
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
+	dev-libs/libconfig
+	gnutls? ( >=net-libs/gnutls-3.0.0 )
+	polarssl? ( >=net-libs/polarssl-1.0.0 )
+	!gnutls? ( !polarssl? ( dev-libs/openssl:0 ) )"
+
+RDEPEND="${DEPEND}"
+
+DOC_CONTENTS="
+	A configuration file has been installed at /etc/umurmur.conf - you may
+	want to review it. See also\n
+	https://github.com/umurmur/umurmur/wiki/Configuration "
+
+pkg_setup() {
+	enewgroup murmur
+	enewuser murmur "" "" "" murmur
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use polarssl && use gnutls; then
+		ewarn "Both gnutls and polarssl requested, defaulting to polarssl."
+	fi
+
+	econf \
+		--with-ssl=$(usev polarssl || 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
+
+	if use polarssl ; then
+		elog
+		elog "Because you have enabled PolarSSL support, umurmurd will use a"
+		elog "predefined test-certificate and key if none are configured, which"
+		elog "is insecure. See http://code.google.com/p/umurmur/wiki/Installing02x#Installing_uMurmur_with_PolarSSL_support"
+		elog "for more information on how to create your certificate and key"
+	fi
+}
diff --git a/media-sound/vb2rip/Manifest b/media-sound/vb2rip/Manifest
new file mode 100644
index 000000000000..eb78a23076f3
--- /dev/null
+++ b/media-sound/vb2rip/Manifest
@@ -0,0 +1 @@
+DIST vb2rip14.zip 22254 RMD160 6f0ba7dcee26602a24b005e89487d85b99195be1 SHA1 98595772fba023f1a1630afa37febccb92beda98 SHA256 aa321e078deca1507b2b670b4a71d48435e80f5ba1375bf33eb26f467f5cc9b3
diff --git a/media-sound/vb2rip/metadata.xml b/media-sound/vb2rip/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/vb2rip/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..cf4acebbff14
--- /dev/null
+++ b/media-sound/vb2rip/vb2rip-1.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e75f12e1f984
--- /dev/null
+++ b/media-sound/vbrfixc/Manifest
@@ -0,0 +1 @@
+DIST vbrfixc-0.24.tar.gz 656877 SHA256 02d6363949407ac0e4b39ed76c60e49de0c286dbdce4f15363f771320430b364
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..63e33ea16cee
--- /dev/null
+++ b/media-sound/vbrfixc/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>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<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..552d2652ebb1
--- /dev/null
+++ b/media-sound/vbrfixc/vbrfixc-0.24.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..7db1520f2d04
--- /dev/null
+++ b/media-sound/vdramgw/Manifest
@@ -0,0 +1 @@
+DIST vdr-amarok-0.0.2.tar.bz2 51816 RMD160 393827e9566d26b93da4fc6a5dc4860ab4674d6c SHA1 c5a22ff55bb0366965aa5a360191d1cfdc17fde2 SHA256 b96b6845eba17d500eeccc85f97cc0480e057801657133302ed7271167372a91
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..b9c00d0c96fd
--- /dev/null
+++ b/media-sound/vdramgw/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>media-tv</herd>
+	<maintainer>
+		<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..be232e01493d
--- /dev/null
+++ b/media-sound/vdramgw/vdramgw-0.0.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..25fb3f3d12f4
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/Manifest
@@ -0,0 +1,2 @@
+DIST ventrilo_srv-2.3.1-Linux-i386.tar.gz 166862 SHA256 5fd929056be6e44e61617080b157680cd3cd3432721a237076c01651ec2bb32f
+DIST ventrilo_srv-3.0.3-Linux-i386.tar.gz 211494 SHA256 702a0cf88234e229b68e7a1f2624e23879541cb4e2c2b2f5f88591a85b364e56
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..4130223817b5
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/files/3.0.3-init.d.ventrilo
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+
+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..56c84a98a174
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/files/init.d.ventrilo
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+
+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..8afc3cbfa0c6
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<maintainer>
+		<email>gurligebis@gentoo.org</email>
+		<name>Bjarke Istrup Pedersen</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..e0318852043f
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/ventrilo-server-bin-2.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..ed37395321bf
--- /dev/null
+++ b/media-sound/ventrilo-server-bin/ventrilo-server-bin-3.0.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e4c4441f4b37
--- /dev/null
+++ b/media-sound/vimpc/Manifest
@@ -0,0 +1,2 @@
+DIST vimpc-0.09.0.tar.gz 597784 SHA256 d406163a8e3e2ffe1e58ff6e49f1249e9d705bcfdd8604ba3e315f1925b16cab SHA512 340609402e459697f56fee323f6667bbe4c5ceccf0461117b021a81423924e87ea9871fa1b68d9b6ea87c452a10843d42290d8c454bfb537d8b0f6b86dc90a02 WHIRLPOOL 1b73bab70c005a0833bfc3ddaf42228f2cbcf761d5e4ff6bf517747d2e80b1d3f3cafacb08c367e6c3a4fd9b9c4e7ef687ba09cd6b963bd63f778c4672f2edc4
+DIST vimpc-0.09.1.tar.gz 583073 SHA256 082fa9974e01bf563335ebf950b2f9bc129c0d05c0c15499f7827e8418306031 SHA512 cf40ae43ac21af80e1b5897f1fa83b4d730fb7dfa4c21b80c296a8e6f2c40e643325fd2aa96bd4dda1abca0ccd2d12545cf91ffcdb8017e5b9cd88917ca96222 WHIRLPOOL 5c1a4213275ae0df06a8e18274df12079f53f8042ee465d19ec776a4d181121f884dfd914dff27cb65ec88751a224bb8a5e4440fa34163b47bd5a3e1f9e93c25
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..9021b40430a1
--- /dev/null
+++ b/media-sound/vimpc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<maintainer>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</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.0.ebuild b/media-sound/vimpc/vimpc-0.09.0.ebuild
new file mode 100644
index 000000000000..1d2d9f0a778e
--- /dev/null
+++ b/media-sound/vimpc/vimpc-0.09.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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_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/vimpc/vimpc-0.09.1.ebuild b/media-sound/vimpc/vimpc-0.09.1.ebuild
new file mode 100644
index 000000000000..39da9f2b5c4d
--- /dev/null
+++ b/media-sound/vimpc/vimpc-0.09.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..29ab0b236e84
--- /dev/null
+++ b/media-sound/vitunes/Manifest
@@ -0,0 +1 @@
+DIST vitunes-2.3.tar.gz 77978 SHA256 52f96e3db94f845cd280c5fd2b35bd53ec97cf0cdb7e4b44d936a77d467eba36
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/vitunes/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..b8fef09415cc
--- /dev/null
+++ b/media-sound/vitunes/vitunes-2.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..703c780f9a24
--- /dev/null
+++ b/media-sound/vkeybd/Manifest
@@ -0,0 +1 @@
+DIST vkeybd-0.1.18d.tar.bz2 38918 RMD160 582fe8fcd877e4c8f3ffd975a4806348feabe754 SHA1 6483326c3ad34f5cd09ac5a5c7a033e491a8497d SHA256 aa683ed57592489e05fdd898368abe3ee245a4d5829385cfe5edb81764590704
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..ae573a60407f
--- /dev/null
+++ b/media-sound/vkeybd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</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..970b6f0233a5
--- /dev/null
+++ b/media-sound/vkeybd/vkeybd-0.1.18d.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 "http://www.gentoo.org/doc/en/guide-localization.xml"
+}
diff --git a/media-sound/vlevel/Manifest b/media-sound/vlevel/Manifest
new file mode 100644
index 000000000000..82cbd731282d
--- /dev/null
+++ b/media-sound/vlevel/Manifest
@@ -0,0 +1 @@
+DIST vlevel-0.5.tar.gz 25873 SHA256 50322c5bb8942aa3a3cf8a65e83d96b8ef3ecdaedb4dabbaa3f912601df09d10
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..c599f7d93efd
--- /dev/null
+++ b/media-sound/vlevel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..7dbe8468272c
--- /dev/null
+++ b/media-sound/vlevel/vlevel-0.5-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..db2db5e663b2
--- /dev/null
+++ b/media-sound/vlorb/Manifest
@@ -0,0 +1 @@
+DIST vlorb-1.2.tar.gz 23935 RMD160 c842955556a78c9fcef2daeb5016d0b590668f0e SHA1 9e53d598c6aaca54a678fc0aa6bbbc83e3e84522 SHA256 9eedd394cebab8ccd328f5df8e10d7baff6bcb368562e412db04eb63746f73c4
diff --git a/media-sound/vlorb/metadata.xml b/media-sound/vlorb/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/vlorb/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..a87937523446
--- /dev/null
+++ b/media-sound/vlorb/vlorb-1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e270cefd6b8e
--- /dev/null
+++ b/media-sound/vmpk/Manifest
@@ -0,0 +1,2 @@
+DIST vmpk-0.5.1.tar.bz2 375019 SHA256 2cbbed5c5817403d1bf776085baf4496cbdfbfa2c78ed44a1129c3a45fb7d885 SHA512 242f2eb979267886237df67770c144085c4190c0bd9aa5944d0034c1151f24e9006ac336daa69b69ea4f9f76df219df3ed8a5f70c65396112745955ec3332eec WHIRLPOOL d9943452a20e9403967e303c3d39e566e4ffc89ac5c08d949ad23719617ac051985f18903c19a0149b82c298dd16c973b57a6dd3f8714fcfb82ec50d4a449fa4
+DIST vmpk-0.6.0.tar.bz2 459655 SHA256 aae17dde9f1edd6d24ea5e13ef899be43bfc740a782a03bf456ce3ad6a25e935 SHA512 bcd3f190867656c09bbd5d14b287fdd205afc3772495cc189b6208e1109bdbe0067912d806133bb611484eaab7a3b06823e70ae0e662be4fb70fd6f943ae2b8d WHIRLPOOL e60ae0fb68903915a8aabf154c63694bd399640ae0ca34fb3f35f237c29f4e09dbaca2af7176c0b7d94bec4f40cf7140e66ab58d1bb380da7a4746c1ac5911d9
diff --git a/media-sound/vmpk/metadata.xml b/media-sound/vmpk/metadata.xml
new file mode 100644
index 000000000000..d2bcdcb7858b
--- /dev/null
+++ b/media-sound/vmpk/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<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.5.1.ebuild b/media-sound/vmpk/vmpk-0.5.1.ebuild
new file mode 100644
index 000000000000..a7c86bb138fb
--- /dev/null
+++ b/media-sound/vmpk/vmpk-0.5.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit cmake-utils eutils
+
+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="alsa dbus jack"
+
+RDEPEND=">=dev-qt/qtcore-4.8:4
+	>=dev-qt/qtgui-4.8:4
+	>=dev-qt/qtsvg-4.8:4
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( >=dev-qt/qtdbus-4.8:4 )
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		"$(cmake-utils_use_enable alsa ALSA)"
+		"$(cmake-utils_use_enable dbus DBUS)"
+		"$(cmake-utils_use_enable jack JACK)"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -rf "${D}/usr/share/doc/packages"
+}
diff --git a/media-sound/vmpk/vmpk-0.6.0.ebuild b/media-sound/vmpk/vmpk-0.6.0.ebuild
new file mode 100644
index 000000000000..5b29d31f88f0
--- /dev/null
+++ b/media-sound/vmpk/vmpk-0.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit cmake-utils eutils
+
+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/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/linguist-tools:5
+	dev-qt/qtx11extras:5
+	x11-libs/libxcb
+	>=media-sound/drumstick-1.0.0
+	dbus? ( dev-qt/qtdbus:5 )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		"$(cmake-utils_use_enable dbus DBUS)"
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -rf "${D}/usr/share/doc/packages"
+}
diff --git a/media-sound/volti/Manifest b/media-sound/volti/Manifest
new file mode 100644
index 000000000000..f13cee13a137
--- /dev/null
+++ b/media-sound/volti/Manifest
@@ -0,0 +1 @@
+DIST volti-0.2.3.tar.gz 164833 SHA256 216ca23cd4e8921ea73922125048e4f23fd3146045c0ef17cc4e10108dbd80dc SHA512 a2af2ad8c5475e6c2a08e5382748e7b5ed64130c6ac988afc8800ec505abf80ef1f73b3506ad4de2fc5177968aee806b779d0f0924ee92b1b734cf662f4266a3 WHIRLPOOL 91b6189ab6e8520244f0f919173aad6663a8bf6ea0d8665ce95c2fdf2b3e8ef3b7e682edcb3aa522e8f160530fdd0f67b368c279f6746f27172531450b6d06a5
diff --git a/media-sound/volti/metadata.xml b/media-sound/volti/metadata.xml
new file mode 100644
index 000000000000..b7f49681830a
--- /dev/null
+++ b/media-sound/volti/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<upstream>
+		<remote-id type="google-code">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..c082652feeee
--- /dev/null
+++ b/media-sound/volti/volti-0.2.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="GTK+ application for controlling audio volume from system tray/notification area"
+HOMEPAGE="http://code.google.com/p/volti/"
+SRC_URI="http://${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/volti/volti-0.2.3.ebuild b/media-sound/volti/volti-0.2.3.ebuild
new file mode 100644
index 000000000000..9fdb21a46c85
--- /dev/null
+++ b/media-sound/volti/volti-0.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils
+
+DESCRIPTION="GTK+ application for controlling audio volume from system tray/notification area"
+HOMEPAGE="http://code.google.com/p/volti/"
+SRC_URI="http://${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.6
+	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..645acb5dc1ef
--- /dev/null
+++ b/media-sound/volumeicon/Manifest
@@ -0,0 +1,2 @@
+DIST volumeicon-0.4.6.tar.gz 136769 SHA256 32f94adc5f346404ae564405dd483ae4bd04212df08e46f18d369b4ba2cb6590
+DIST volumeicon-0.5.0.tar.gz 160089 SHA256 e5f1179f9ec5ab25e3740e4f6bbe0baa75368f0ae87d370197b3fbefb61bd782 SHA512 26c4973a600495886222920e6eea80a7d54ebecf9b9fa46dea6808e25bf3b5edc5b37ff0740da270e77faac687d2151d8cc53259b356e17ce99ed0e38b7fbe38 WHIRLPOOL 1f319c1a671be3677f02272683a36b4714d728d5022f1e640c2b0d130d80dc1958c07a8a5d28637ba47d7ac91d021676774cba90bae050d726c6d05132b980cc
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/volumeicon/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..8796a700a201
--- /dev/null
+++ b/media-sound/volumeicon/volumeicon-0.4.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..b6015935f675
--- /dev/null
+++ b/media-sound/volumeicon/volumeicon-0.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..61d96dd4e38e
--- /dev/null
+++ b/media-sound/volwheel/Manifest
@@ -0,0 +1 @@
+DIST volwheel-0.2.8.tar.gz 43140 SHA256 a14e9b3fb831677937396488466ebbb2a7030f76cf2cc404d63dd0ea8d5b9948 SHA512 ee2d121d2a9e2c987407a30187a313db128f1557932d003421e0fbda683cf80d52b5fb3c4c4ab2d07b642e86bb580bb3764a1c091ea57f5068660a035e78721b WHIRLPOOL ba982fac83ef42ae9403fd326b6aab6d330022c8b0c70f684e35fc620271469b2c11622bd9c5b9f733522f6493bfe9a3a892f63db9db3262f27be5b5b6734243
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..b49e5b281a6f
--- /dev/null
+++ b/media-sound/volwheel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..780c3446aaf5
--- /dev/null
+++ b/media-sound/volwheel/volwheel-0.2.8-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils gnome2-utils
+
+DESCRIPTION="A volume control trayicon with mouse wheel support"
+HOMEPAGE="http://oliwer.net/b/volwheel.html"
+SRC_URI="http://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-perl
+	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..ae5748f1448e
--- /dev/null
+++ b/media-sound/vorbis-tools/Manifest
@@ -0,0 +1 @@
+DIST vorbis-tools-1.4.0.tar.gz 1346532 SHA256 a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99 WHIRLPOOL 7f9116957dc06dbc40db0cba6a3147cdf575cd0939021fe44c984a7fde0ff9a495ed8b51275001266404e14db5e814d9e1dcc5bc57f4d3e9eaeb06b76be67a08
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..3763d957eade
--- /dev/null
+++ b/media-sound/vorbis-tools/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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-r1.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..4eacdcc860f8
--- /dev/null
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-interix ~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
+	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-r2.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..0afb35b2a9b6
--- /dev/null
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-interix ~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.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0.ebuild
new file mode 100644
index 000000000000..baf847b620ad
--- /dev/null
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 ~x86-interix ~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_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..6e6574ff3964
--- /dev/null
+++ b/media-sound/vorbisgain/Manifest
@@ -0,0 +1 @@
+DIST vorbisgain-0.37.tar.gz 208977 RMD160 01de9516a7571c2ecdb3e4645c6c8e7ba8ce80cc SHA1 bd79764a83a8ee327df85c538ec798a6d3f240be SHA256 dd6db051cad972bcac25d47b4a9e40e217bb548a1f16328eddbb4e66613530ec
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/vorbisgain/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/vorbisgain/vorbisgain-0.37-r1.ebuild b/media-sound/vorbisgain/vorbisgain-0.37-r1.ebuild
new file mode 100644
index 000000000000..d55cb5fc2401
--- /dev/null
+++ b/media-sound/vorbisgain/vorbisgain-0.37-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+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/libvorbis-1
+	media-libs/libogg"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-fix-errno-and-warnings.patch # bug 200931
+}
+
+src_compile() {
+	econf --enable-recursive
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc NEWS README *.txt
+}
diff --git a/media-sound/vsound/Manifest b/media-sound/vsound/Manifest
new file mode 100644
index 000000000000..afb38c7252cf
--- /dev/null
+++ b/media-sound/vsound/Manifest
@@ -0,0 +1 @@
+DIST vsound-0.6.tar.gz 118026 RMD160 c39163dc0f7654987730b18dcc9f4f1078f853b0 SHA1 09ecea581546e6fb18427cde9c03b875f83eed80 SHA256 80711f2495f0faffd8b2d46afbdc3623e6701fcc20e6b85be82b6c4fdf467197
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/vsound/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..4e85fbbe27a0
--- /dev/null
+++ b/media-sound/vsound/vsound-0.6-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a1d6bc79a6b5
--- /dev/null
+++ b/media-sound/waheela/Manifest
@@ -0,0 +1 @@
+DIST waheela_0.3.tar.gz 799802 SHA256 c984ea3ef647172d96393b054d738966f26dc5147b109db28d2a1a950f9e2fd8
diff --git a/media-sound/waheela/metadata.xml b/media-sound/waheela/metadata.xml
new file mode 100644
index 000000000000..8d1e86a9cefb
--- /dev/null
+++ b/media-sound/waheela/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+</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..716de47f22f5
--- /dev/null
+++ b/media-sound/waheela/waheela-0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/wavbreaker/Manifest b/media-sound/wavbreaker/Manifest
new file mode 100644
index 000000000000..4a0665f8ada3
--- /dev/null
+++ b/media-sound/wavbreaker/Manifest
@@ -0,0 +1 @@
+DIST wavbreaker-0.11.tar.gz 496733 SHA256 a1d70fc54f92f20fb4cc2ef01beb8f60bc5e8d1cedde6b1e5f8f453b14ead2d1 SHA512 3dee23ef7c0db651cd1ebae78db3f950b5b22ae4f0a323f66e1243a88c0e41390f9f4abde663ef7a1d1c841e0cbb779612d6078cd327a0f1d48e6a812c8ce4e1 WHIRLPOOL e8072cfec4597a1e1ff9da6d65422d96c3586efdfc2829acf5f23e850b66bdf9f0113bd5140a7d69b0d8c352eefc5ee39f814fdaa9a6d8e54c6eaa92b7e4d98d
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..be77b558ac12
--- /dev/null
+++ b/media-sound/wavbreaker/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..0829894cc19a
--- /dev/null
+++ b/media-sound/wavbreaker/wavbreaker-0.11.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..c85b8d0afed4
--- /dev/null
+++ b/media-sound/wavegain/Manifest
@@ -0,0 +1,2 @@
+DIST wavegain-1.3.0srcs.zip 75536 SHA256 0845abed38d361b240ecc061eb9fdf60c7d61908fec943e4c181930ae519c214 SHA512 00c30e37c157cb31e9cc3220a06e9687205fe74f6fe73f81efcdc31fa8ca4abb2654845cdc405edcb7104fbd295ad4e3aff9e61dec12b1706950b53791365e12 WHIRLPOOL 95865bca2cf7223de89dc45e690eda862b105722c5d52de4958e170c8ef4c21e6c0b2a0c04afe83cd2c3afa7abfe386858f3071d4f570917d374b0f37fadff94
+DIST wavegain-1.3.1srcs.zip 72180 SHA256 773aaa8e18a0c130714f4bf21afb9ee0ba29d6c5742002191bfdf52f25b48da0 SHA512 5d0d589259e362a415a5cd5e42464b5e7c7e79c62082ebd423457b6e2d9c3d15300d854e57e2c51c66f1579394bbcdc3d754bb8363d809c2d8d5f03b09dce054 WHIRLPOOL 2a36c8b8b076e0250547041ff7fff01c240677376992aab1edb7a2e09971c39c5b33aa6731d8d34b108a55cdbb666f0bebf165daffcd6ebff59f4cdcbff271d4
diff --git a/media-sound/wavegain/metadata.xml b/media-sound/wavegain/metadata.xml
new file mode 100644
index 000000000000..3bf6bcfeb512
--- /dev/null
+++ b/media-sound/wavegain/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/wavegain/wavegain-1.3.0.ebuild b/media-sound/wavegain/wavegain-1.3.0.ebuild
new file mode 100644
index 000000000000..1ab07bbe554d
--- /dev/null
+++ b/media-sound/wavegain/wavegain-1.3.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/wavegain/wavegain-1.3.1.ebuild b/media-sound/wavegain/wavegain-1.3.1.ebuild
new file mode 100644
index 000000000000..64c07a789c7d
--- /dev/null
+++ b/media-sound/wavegain/wavegain-1.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..0059970f27a0
--- /dev/null
+++ b/media-sound/wavpack/Manifest
@@ -0,0 +1,2 @@
+DIST wavpack-4.60.1.tar.bz2 394434 SHA256 175ee4f2effd6f51e6ec487956f41177256bf892c2e8e07de5d27ed4ee6888c5 SHA512 fae00bba5c6f9c487d5dd4cd4c08ab4ce2a255c12ba3a47614a7b896d7706999b8ebe70c77e9083e943f0fe05b5ddcef206fad1801ce7a21698d5350514ee814 WHIRLPOOL fae37e8c5882a8cdabe81e72ac272ce128056f0101beaad16020c127f466707819542a2c9da7934d43da0fbabf13586747e99443e823682feebde5e170b76e5b
+DIST wavpack-4.70.0.tar.bz2 411878 SHA256 2cade379b0aba99fbc4e442ccc6dac6c609f6212e46516a083e24c8c364430a4 SHA512 6a93e36b3bea5b410142416b4b0329c5f65031418cdd303d395ca2aaad2a1ab02987b9a329dec6d14fe9387a3d5978caaf6345056eece24c5ad0ae9273349449 WHIRLPOOL e9b34aad74e183814f710d038c30946dcf43c6472e25778507494c4c40f9adf166e8cda81916f670150876adcf34979bd88e40fc81ee2a7c036db1b3a285e69b
diff --git a/media-sound/wavpack/metadata.xml b/media-sound/wavpack/metadata.xml
new file mode 100644
index 000000000000..ae573a60407f
--- /dev/null
+++ b/media-sound/wavpack/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/wavpack/wavpack-4.60.1-r1.ebuild b/media-sound/wavpack/wavpack-4.60.1-r1.ebuild
new file mode 100644
index 000000000000..a5481563c7f7
--- /dev/null
+++ b/media-sound/wavpack/wavpack-4.60.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+inherit autotools-multilib
+
+DESCRIPTION="WavPack 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 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cpu_flags_x86_mmx static-libs"
+
+RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	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 )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable cpu_flags_x86_mmx mmx)
+	)
+
+	autotools-multilib_src_configure
+}
diff --git a/media-sound/wavpack/wavpack-4.60.1.ebuild b/media-sound/wavpack/wavpack-4.60.1.ebuild
new file mode 100644
index 000000000000..642af8229f48
--- /dev/null
+++ b/media-sound/wavpack/wavpack-4.60.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit libtool
+
+DESCRIPTION="WavPack 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 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cpu_flags_x86_mmx"
+
+RDEPEND="virtual/libiconv"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README )
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable cpu_flags_x86_mmx mmx)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/media-sound/wavpack/wavpack-4.70.0.ebuild b/media-sound/wavpack/wavpack-4.70.0.ebuild
new file mode 100644
index 000000000000..defeba30e298
--- /dev/null
+++ b/media-sound/wavpack/wavpack-4.70.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+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 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cpu_flags_x86_mmx static-libs"
+
+RDEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	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 )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable cpu_flags_x86_mmx mmx)
+	)
+	autotools-multilib_src_configure
+}
diff --git a/media-sound/wavplay/Manifest b/media-sound/wavplay/Manifest
new file mode 100644
index 000000000000..1b1fdc731c50
--- /dev/null
+++ b/media-sound/wavplay/Manifest
@@ -0,0 +1 @@
+DIST wavplay-2.0.tar.gz 368945 SHA256 256ea0b581d587b482e0c928869e3896845a5299b8e124c01749b4b9edfeb552
diff --git a/media-sound/wavplay/metadata.xml b/media-sound/wavplay/metadata.xml
new file mode 100644
index 000000000000..f57d1923288b
--- /dev/null
+++ b/media-sound/wavplay/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..6a6523bda251
--- /dev/null
+++ b/media-sound/wavplay/wavplay-2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools
+
+DESCRIPTION="A command line player/recorder for wav files"
+HOMEPAGE="http://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..31673cabc03f
--- /dev/null
+++ b/media-sound/wavsplit/Manifest
@@ -0,0 +1 @@
+DIST wavsplit-1.2.1.tar.gz 32246 SHA256 266970b06888a9030573de07adf85c316bd0850eb663ed3a65248b6f64107e8a
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..e7e1a15d4e50
--- /dev/null
+++ b/media-sound/wavsplit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..d93896a736aa
--- /dev/null
+++ b/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="WavSplit is a simple command line tool to split WAV files"
+HOMEPAGE="http://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..cce4fa48e6cc
--- /dev/null
+++ b/media-sound/wildmidi/Manifest
@@ -0,0 +1,4 @@
+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
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..4c1c02eb7dfb
--- /dev/null
+++ b/media-sound/wildmidi/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>
+		<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>
+	</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..5ac007b02c7d
--- /dev/null
+++ b/media-sound/wildmidi/wildmidi-0.2.3.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..a2343251bb90
--- /dev/null
+++ b/media-sound/wildmidi/wildmidi-0.3.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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..5c5ffd6bd187
--- /dev/null
+++ b/media-sound/wildmidi/wildmidi-0.3.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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..10b610d543bc
--- /dev/null
+++ b/media-sound/wildmidi/wildmidi-0.3.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://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..98311900dd46
--- /dev/null
+++ b/media-sound/wmsound-data/Manifest
@@ -0,0 +1,2 @@
+DIST wmsdefault.tar.gz 711376 SHA256 f21433c6a2139dd143ce5d6cb40311fca5378e18794f04a9f9fb72c9bc5d0f7d
+DIST worms2sounds.tar.gz 356608 SHA256 d6646a2d03019db7465bf6f068b76efec601bd49ae30c275a1b249623da21510
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..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/wmsound-data/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</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..f485cff05524
--- /dev/null
+++ b/media-sound/wmsound-data/wmsound-data-1.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..e2476e4ef6d0
--- /dev/null
+++ b/media-sound/xfmpc/Manifest
@@ -0,0 +1 @@
+DIST xfmpc-0.2.2.tar.bz2 404906 SHA256 ed0cc2940bd5928bb30fab1531c22185a97bd0cc5beacd9e3be4d4cd994a6862
diff --git a/media-sound/xfmpc/metadata.xml b/media-sound/xfmpc/metadata.xml
new file mode 100644
index 000000000000..008cf479f615
--- /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>
+    <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..200c17ceb7c9
--- /dev/null
+++ b/media-sound/xfmpc/xfmpc-0.2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Music Player Daemon (MPD) client for the Xfce desktop environment"
+HOMEPAGE="http://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..fcc748869f42
--- /dev/null
+++ b/media-sound/xineadump/Manifest
@@ -0,0 +1 @@
+DIST xineadump-0.1.tar.bz2 233413 SHA256 a00a3377be2df8bcb2639f7e9d40faaf531362e67bd13130764042611a2067eb
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..b7522fc56f9f
--- /dev/null
+++ b/media-sound/xineadump/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <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..5a4383924c0a
--- /dev/null
+++ b/media-sound/xineadump/xineadump-0.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Utility for Xine decoding support in transKode"
+HOMEPAGE="http://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..4f797e5b357d
--- /dev/null
+++ b/media-sound/xmms2-scrobbler/Manifest
@@ -0,0 +1 @@
+DIST xmms2-scrobbler-0.4.0.tar.gz 19831 SHA256 7aed1670f381463e44466083f2e49119636e96005b9b93899edf79d613a2d2bc SHA512 2df20693479413a18e487f16e87f0a711866221dcbc8f96c970be55aac2c495fcb84e9e3ea754473c747d33d5d1ef54823f6a050d5054581454f956c86f6236b WHIRLPOOL ee569f034e6ddfdf3b26b8a5d1185ea8af894275ea573d871460ec0eefe75774cf081196cf1e9ad21bfb640043cf10e4a181edb23798aaf3c89505945c377666
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/metadata.xml b/media-sound/xmms2-scrobbler/metadata.xml
new file mode 100644
index 000000000000..a282ed8ce0e4
--- /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>
+		<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..ad8b6d3164a1
--- /dev/null
+++ b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+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..be39c6eeee9b
--- /dev/null
+++ b/media-sound/xmms2/Manifest
@@ -0,0 +1 @@
+DIST xmms2-0.8DrO_o.tar.bz2 1670726 SHA256 c77e41e7bd5788889d5a2f78331ca8c748b8721bd2e59f36c36ad4c7cae8694a SHA512 478103d80264c0cb32912e828f74d0f5b2f10fe310f530a87ebecda7ca547a69e238cd572788f90bda29494494160d459fa6d1356b4fb87c7a8f0bf02e3b75f8 WHIRLPOOL 741dd85b8c065eea799675588a8d4c389c47fa3dcf129a9fd799bb5da0ffcb1eeffa45cfaca40af7c505908818b5e7960c1a54e947f53358edeb43841f2eaa5c
diff --git a/media-sound/xmms2/files/xmms2-0.7DrNo-XsParse-3.patch b/media-sound/xmms2/files/xmms2-0.7DrNo-XsParse-3.patch
new file mode 100644
index 000000000000..0e3cbc4fd67a
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.7DrNo-XsParse-3.patch
@@ -0,0 +1,28 @@
+diff --git a/wafadmin/Tools/perl.py b/wafadmin/Tools/perl.py
+index 9e3b12a..9005e6a 100644
+--- a/wafadmin/Tools/perl.py
++++ b/wafadmin/Tools/perl.py
+@@ -99,8 +99,8 @@ def check_perl_ext_devel(conf):
+ 	conf.env["CPPPATH_PERLEXT"] = read_out(" -MConfig -e'print \"$Config{archlib}/CORE\"'")
+ 	conf.env["CCFLAGS_PERLEXT"] = read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'")
+ 
+-	conf.env["XSUBPP"] = read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'")
+-	conf.env["EXTUTILS_TYPEMAP"] = read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'")
++	conf.env["XSUBPP"]           = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::xsubpp\")'")
++	conf.env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::typemap\")'")
+ 
+ 	if not getattr(Options.options, 'perlarchdir', None):
+ 		conf.env["ARCHDIR_PERL"] = Utils.cmd_output(perl + " -MConfig -e'print $Config{sitearch}'")
+diff --git a/src/clients/lib/perl/typemap b/src/clients/lib/perl/typemap
+index 6cb033f..54e6c4d 100644
+--- a/src/clients/lib/perl/typemap
++++ b/src/clients/lib/perl/typemap
+@@ -3,6 +3,8 @@ xmmsc_connection_t*			XMMSC_CONNECTION_T
+ xmmsv_coll_t*				XMMSV_COLL_T
+ xmmsv_coll_type_t			XMMSV_COLL_TYPE_T
+ xmmsv_coll_namespace_t		T_PV
++const unsigned char*		T_PV
++xmmsv_t*			T_PV
+ xmmsc_result_t*				XMMSC_RESULT_T
+ xmmsc_result_propdict_t*	XMMSC_RESULT_PROPDICT_T
+ xmms_plugin_type_t			XMMS_PLUGIN_TYPE_T
diff --git a/media-sound/xmms2/files/xmms2-0.7DrNo-missing-protos.patch b/media-sound/xmms2/files/xmms2-0.7DrNo-missing-protos.patch
new file mode 100644
index 000000000000..2c8de0c05b62
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.7DrNo-missing-protos.patch
@@ -0,0 +1,127 @@
+commit 2df15fc79acc7ef5ea9213c87f6700faf138518d
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date:   Sun Oct 10 21:08:05 2010 +0300
+
+    OTHER: one more me in AUTHORS
+    
+    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+diff --git a/AUTHORS b/AUTHORS
+index f2ef9af..e33acb5 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -354,6 +354,7 @@ D: Various fixes
+ 
+ N: Sergei Trofimovich
+ E: slyich@gmail.com
++E: slyfox@gentoo.org
+ E: slyfox@inbox.ru
+ E: st@anti-virus.by
+ D: Various Cleanups
+
+commit fb4eede29ba11d2ecec039de6899f8cce55dde8d
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date:   Sun Oct 10 21:01:49 2010 +0300
+
+    OTHER: explicitely declare xmmsc_mainloop_gmain_init() and _xmmsc_medialib_encode_url()
+    
+    Added according includefiles
+    
+    Was spotted by ZogG on #xmms2
+    And reported as: https://bugs.gentoo.org/show_bug.cgi?id=340361
+    
+    gcc's warning:
+    ../src/clients/medialib-updater/main.c: In function 'updater_connect':
+    ../src/clients/medialib-updater/main.c:135: warning: implicit declaration of function 'xmmsc_mainloop_gmain_init'
+    ../src/clients/medialib-updater/main.c: In function 'updater_remove_directory':
+    ../src/clients/medialib-updater/main.c:468: warning: implicit declaration of function '_xmmsc_medialib_encode_url'
+    ../src/clients/medialib-updater/main.c:468: warning: cast to pointer from integer of different size
+    
+    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+diff --git a/src/clients/medialib-updater/main.c b/src/clients/medialib-updater/main.c
+index 3b36bc9..2dd7b08 100644
+--- a/src/clients/medialib-updater/main.c
++++ b/src/clients/medialib-updater/main.c
+@@ -18,6 +18,9 @@
+ 
+ #include <gio/gio.h>
+ #include <xmmsclient/xmmsclient.h>
++#include <xmmsclient/xmmsclient-glib.h>
++
++#include "xmmsclientpriv/xmmsclient.h" // _xmmsc_medialib_encode_url
+ 
+ #include <xmms_configuration.h>
+ 
+diff --git a/src/clients/medialib-updater/wscript b/src/clients/medialib-updater/wscript
+index 841ae85..cd38b5e 100644
+--- a/src/clients/medialib-updater/wscript
++++ b/src/clients/medialib-updater/wscript
+@@ -4,7 +4,7 @@ def build(bld):
+     obj = bld.new_task_gen('cc', 'program')
+     obj.target = 'xmms2-mlib-updater'
+     obj.source = "main.c"
+-    obj.includes = '. ../../.. ../../include'
++    obj.includes = '. ../../.. ../../include ../../includepriv'
+     obj.uselib = 'glib2 GIO-2.0 GTHREAD-2.0'
+     obj.uselib_local = 'xmmsclient-glib xmmsclient'
+ 
+
+commit a3dff97f048bae91cdfd8b2bc761cd9ebe184eb9
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date:   Sun Oct 10 20:52:30 2010 +0300
+
+    OTHER: explicitely declare g_sprintf()
+    
+    g_sprintf is not defined by glib.h (glib-2.24.2),
+    but it's defined by <glib/gsprintf.h>
+    
+    Was spotted by ZogG on #xmms2
+    And reported as: https://bugs.gentoo.org/show_bug.cgi?id=340361
+    
+    gcc's warning:
+    ../src/xmms/magic.c: In function 'xmms_magic_match':
+    ../src/xmms/magic.c:470: warning: implicit declaration of function 'g_sprintf'
+    
+    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+diff --git a/src/xmms/magic.c b/src/xmms/magic.c
+index 31b0b00..a0f9658 100644
+--- a/src/xmms/magic.c
++++ b/src/xmms/magic.c
+@@ -15,8 +15,8 @@
+  */
+ 
+ 
+-
+ #include <glib.h>
++#include <glib/gprintf.h>
+ #include <string.h>
+ #include <stdlib.h>
+ 
+
+commit 43648e7b701a9598d9a9769caec152fd23b4e2f5
+Author: Sergei Trofimovich <slyfox@gentoo.org>
+Date:   Sun Oct 10 20:47:23 2010 +0300
+
+    OTHER: explicitely declare semtimedop()
+    
+    semtimedop(2) is a GNU extension which needs _GNU_SOURCE
+    to be defined. Was spotted by ZogG on #xmms2
+    And reported as: https://bugs.gentoo.org/show_bug.cgi?id=340361
+    
+    gcc's warning:
+    
+     * ../src/clients/lib/xmmsclient/visualization/unixshm.c:102: warning: implicit declaration of function 'semtimedop'
+    
+    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+
+diff --git a/src/clients/lib/xmmsclient/visualization/unixshm.c b/src/clients/lib/xmmsclient/visualization/unixshm.c
+index 50883a9..3d28ccc 100644
+--- a/src/clients/lib/xmmsclient/visualization/unixshm.c
++++ b/src/clients/lib/xmmsclient/visualization/unixshm.c
+@@ -1,3 +1,4 @@
++#define _GNU_SOURCE // semtimedop is a GNU extension
+ #include "common.h"
+ 
+ #include <sys/shm.h>
diff --git a/media-sound/xmms2/files/xmms2-0.7DrNo-windres-build-fix.patch b/media-sound/xmms2/files/xmms2-0.7DrNo-windres-build-fix.patch
new file mode 100644
index 000000000000..26cdcf914706
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.7DrNo-windres-build-fix.patch
@@ -0,0 +1,52 @@
+commit 3bc7fbff50bfcb065fb89d020c1b3fb8de049b19
+Author: Sergei Trofimovich <st@anti-virus.by>
+Date:   Mon Apr 19 13:16:56 2010 +0300
+
+    OTHER: fix build failure on windres aware binutils (linux host, native build)
+    
+    Trying to use windres under linux (native build) is worthless:
+    
+    [ 26/269] winrc: pixmaps/xmms2.rc -> _build_/default/pixmaps/xmms2.rc.o
+    /usr/bin/windres: can't get BFD_RELOC_RVA relocation type: No error
+    Waf: Leaving directory `/var/tmp/paludis/media-sound-xmms2-9999-r3/work/xmms2-devel/_build_'
+    Build failed
+     -> task failed (err #1):
+            {task: winrc xmms2.rc -> xmms2.rc.o}
+    
+    Signed-off-by: Sergei Trofimovich <st@anti-virus.by>
+
+diff --git a/wscript b/wscript
+index 2a29016..1d73813 100644
+--- a/wscript
++++ b/wscript
+@@ -265,12 +265,6 @@ def configure(conf):
+     conf.check_tool('gcc')
+     conf.check_tool('g++')
+ 
+-    try:
+-        conf.check_tool('winres')
+-        conf.env['WINRCFLAGS'] = '-I' + os.path.abspath('pixmaps')
+-        conf.env['xmms_icon'] = True
+-    except Configure.ConfigurationError:
+-        conf.env['xmms_icon'] = False
+ 
+     if Options.options.target_platform:
+         Options.platform = Options.options.target_platform
+@@ -412,6 +406,17 @@ def configure(conf):
+     else:
+         conf.env['socket_impl'] = 'posix'
+ 
++    # platform does not support icons ...
++    conf.env['xmms_icon'] = False
++    # ... unless we target on windows
++    if Options.platform == 'win32':
++        try:
++            conf.check_tool('winres')
++            conf.env['WINRCFLAGS'] = '-I' + os.path.abspath('pixmaps')
++            conf.env['xmms_icon'] = True
++        except Configure.ConfigurationError:
++            pass
++
+     # Glib is required by everyone, so check for it here and let them
+     # assume its presence.
+     conf.check_cfg(package='glib-2.0', atleast_version='2.8.0', uselib_store='glib2', args='--cflags --libs', mandatory=1)
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.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..d4c10b98548a
--- /dev/null
+++ b/media-sound/xmms2/files/xmms2-0.8DrO_o-waflib-fix-perl.patch
@@ -0,0 +1,26 @@
+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
+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::Build -e'print Module::Build::ModuleInfo->find_module_by_name(\"ExtUtils::xsubpp\")'")
++	env["EXTUTILS_TYPEMAP"] = read_out(" -MModule::Build -e'print Module::Build::ModuleInfo->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/metadata.xml b/media-sound/xmms2/metadata.xml
new file mode 100644
index 000000000000..3a5d57ea7273
--- /dev/null
+++ b/media-sound/xmms2/metadata.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<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="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="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="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-r2.ebuild b/media-sound/xmms2/xmms2-0.8-r2.ebuild
new file mode 100644
index 000000000000..18e8dec49633
--- /dev/null
+++ b/media-sound/xmms2/xmms2-0.8-r2.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit eutils python toolchain-funcs
+
+MY_P="${P}DrO_o"
+
+DESCRIPTION="X(cross)platform Music Multiplexing System. The new generation of the XMMS player"
+HOMEPAGE="http://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 avahi 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 +vorbis vocoder wavpack xml"
+
+RDEPEND="server? (
+		>=dev-db/sqlite-3.3.4
+
+		aac? ( >=media-libs/faad2-2.0 )
+		airplay? ( dev-libs/openssl )
+		alsa? ( media-libs/alsa-lib )
+		ao? ( media-libs/libao )
+		avahi? ( net-dns/avahi[mdnsresponder-compat] )
+		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[smbclient] )
+		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 media-libs/libsamplerate )
+		wavpack? ( media-sound/wavpack )
+		xml? ( dev-libs/libxml2 )
+	)
+
+	>=dev-libs/glib-2.12.9
+	cxx? ( >=dev-libs/boost-1.32 )
+	perl? ( >=dev-lang/perl-5.8.8 )
+	python? ( dev-lang/python )
+	ruby? ( >=dev-lang/ruby-1.8.5 ) "
+
+DEPEND="${RDEPEND}
+	dev-lang/python
+	python? ( dev-python/pyrex )
+	perl? ( dev-perl/Module-Build )
+	virtual/pkgconfig
+	test? ( dev-util/cunit )
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+# 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
+}
+
+pkg_setup() {
+	python_pkg_setup
+}
+
+src_prepare() {
+	./waf # inflate waf
+	cd .waf* || die
+	epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch
+	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
+
+	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
+}
+
+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"
+					"avahi		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}"
+
+	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 README
+
+	use python && python_need_rebuild
+}
+
+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
+
+	use python && python_mod_optimize xmmsclient
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup xmmsclient
+}
diff --git a/media-sound/xmp/Manifest b/media-sound/xmp/Manifest
new file mode 100644
index 000000000000..8af8944b7a3d
--- /dev/null
+++ b/media-sound/xmp/Manifest
@@ -0,0 +1 @@
+DIST xmp-3.5.0.tar.gz 887671 SHA256 e1c7c7f9a59da7901f299e1b93b4ffb4ad17731cbb8f09df5c2d5eab2ef7e3a3
diff --git a/media-sound/xmp/metadata.xml b/media-sound/xmp/metadata.xml
new file mode 100644
index 000000000000..1157eb8fbc38
--- /dev/null
+++ b/media-sound/xmp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>sound</herd>
+  <use>
+    <flag name="audacious">Enable audacious support</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">xmp</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/media-sound/xmp/xmp-3.5.0.ebuild b/media-sound/xmp/xmp-3.5.0.ebuild
new file mode 100644
index 000000000000..83be5d04d790
--- /dev/null
+++ b/media-sound/xmp/xmp-3.5.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Extended Module Player"
+HOMEPAGE="http://xmp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xmp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa audacious nas oss pulseaudio"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	audacious? ( media-sound/audacious )
+	nas? ( media-libs/nas )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	oss? ( virtual/os-headers )"
+
+src_configure() {
+	econf \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable nas) \
+		$(use_enable pulseaudio) \
+		$(use_enable audacious audacious-plugin)
+}
+
+src_install() {
+	default
+
+	doman docs/xmp.1
+	rm -f docs/{COPYING,Makefile,xmp.1}
+	dodoc -r docs/*
+}
diff --git a/media-sound/xnoise/Manifest b/media-sound/xnoise/Manifest
new file mode 100644
index 000000000000..da0b58ed8518
--- /dev/null
+++ b/media-sound/xnoise/Manifest
@@ -0,0 +1,2 @@
+DIST xnoise-0.2.20.tar.gz 3216408 SHA256 59f30d27ed3a7b62c4cc6257c3bddee628c9e430d3b8d26aa592f7dd6b334a8d SHA512 d2bcf7c8fa542ef9703a831583ab90e1a03f00a0740b068966cb8bf5c76475832cf04eb55b9f14ac1c5aa50536d8e3965ac3e0d22503af44e1af8e7f908d2390 WHIRLPOOL 3f89a9ec3bd411e53d0298f314038010c9bdeff9a3f5caca1bca061c66c0ad9c244ae1a362846edd254e237660d35be1635ce0a1b8321c7560b3003295dfe96e
+DIST xnoise-0.2.21.tar.gz 3222030 SHA256 6c501091ac5a59aa0596978aa8d4750cc12d6bc9a823fd57542d9ab8e3366681 SHA512 e25f42795638a5b93f1922f1c761b0bdaf754414dfa0f7172407e0d10514c52844d0dc3146a32f93e6107a0b5bb0f8e9e5d098954e9659f28177c56f607d9851 WHIRLPOOL c2773da98b387b783dcc423a78bae6d5f6310e76f8a88eab4bc92b6de056741578a0c7dbffb455c768f412463dc14133f933d42d3215318a55f1addd0df9fee3
diff --git a/media-sound/xnoise/metadata.xml b/media-sound/xnoise/metadata.xml
new file mode 100644
index 000000000000..b3e227faae4b
--- /dev/null
+++ b/media-sound/xnoise/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<maintainer>
+		<email>angelos@gentoo.org</email>
+		<name>Christoph Mende</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.20.ebuild b/media-sound/xnoise/xnoise-0.2.20.ebuild
new file mode 100644
index 000000000000..c466816e38a8
--- /dev/null
+++ b/media-sound/xnoise/xnoise-0.2.20.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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_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-0.2.21.ebuild b/media-sound/xnoise/xnoise-0.2.21.ebuild
new file mode 100644
index 000000000000..4418b2971331
--- /dev/null
+++ b/media-sound/xnoise/xnoise-0.2.21.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..077e9edae469
--- /dev/null
+++ b/media-sound/xnoise/xnoise-9999.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..704b26559f73
--- /dev/null
+++ b/media-sound/xwax/Manifest
@@ -0,0 +1 @@
+DIST xwax-1.5.tar.gz 77582 SHA256 b67ee78c988e4af2ebce899da98bbb8cadf91792bca1d08ee65a9b5da7b0d4a8 SHA512 b5fb66c35dd5174277417b8973bab63232bdf471fe190ab3df1c37e386a9cdc9e2b5cbdc4f5715bf69d146846c13ce2acd5db6a0881412dabdcd234d6d199b61 WHIRLPOOL 60abdcdfd3cf70b17525e16deeecabe6aaa6838a172e4292655ca5401a15d05952649faaf85f3b616c884222abcb2cbdf105522446f1e1ddc81dcb4bcfe60ec7
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..bc38d7842a65
--- /dev/null
+++ b/media-sound/xwax/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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..dfdf7ed92a9b
--- /dev/null
+++ b/media-sound/xwax/xwax-1.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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..d9722b6dcc3c
--- /dev/null
+++ b/media-sound/yoshimi/Manifest
@@ -0,0 +1,8 @@
+DIST yoshimi-1.0.0.tar.bz2 1424814 SHA256 4c0d6f5a8f856f05ff594cbac7d0dc113f1fccd20d33fd166308a71983d9b1ab SHA512 e6a67a167ff050c1dc2e2c17f687e343982b769a2bc3e0612f085fac882c982c2dd8afa8adf221c18fc85d7b658a24a3b3ebeaa58bd9e769c3f2dab00f265efd WHIRLPOOL b2321e8db999e82eec0fff83d28788fb5e3f0820b58b31398e62267c46674a3b32af050d44949a138fee54c2e0c0b158dc20c1a5cc4d73b2f83e1e66a1dd9a15
+DIST yoshimi-1.1.0.tar.bz2 2210595 SHA256 7be9e7730231f9d7aa8036a4fa429f58ae19e48bca3dd96a1c52298d17c06065 SHA512 a158a6fdd07e3d6dea30be8f110112dd60d8c07d333216e761cfe558cb6f138d1b8cb51f8ebb329514eb90b8d6eaff271b5350462d19b65e79a39ed82638243e WHIRLPOOL b97aa55cd150d063a9a13e14806e1486e728c94fddafaf7574940c318294749096c077c24fcd85039788597350f4ed3d154737e9dd0faf13255835913d114a1d
+DIST yoshimi-1.2.0.tar.bz2 2354987 SHA256 bd8e5d7ab40ee547b79a9202dcdd858f981049e959f5ff95daeeffde671a9b5c SHA512 1831608004e3cf3d5ec445ef9a86dc8b70d8cd394897756e5e8aed05dfdbc4acfe03b1064e4f02cb7504ef25cc487a92c8484a726dc999a47b52b9029ba355af WHIRLPOOL a8270c73f48443582018c0d0ded3be02198c81675c321f907cb268ccf56be85952ba0559026dc9aa95586686de5886dff6b711bf009ad98a4f41f852e3d7f338
+DIST yoshimi-1.2.1.tar.bz2 2373692 SHA256 4c66c21b8736697fa6bc8e5f34e7536ef84653c32c5b2fa572bd8fb99fe793c9 SHA512 6186d2dd92a02c289c98664d47d795f8312c07466bfc6e3aebcf67d7aeaa24e8de8523fe238fda7c9e623d1cb6f27d888d8a274942f59e2dcf6aceca78336a09 WHIRLPOOL 30030b1d6607fe04f72f44d6a9e31caf85b0b0a0ca10dd057d2bdab3df2280226820377037928396b79a9debb6d9a19643b0f174b0c5d37e285612827d011bfb
+DIST yoshimi-1.2.4.tar.bz2 2940606 SHA256 bfcf7d43b451feec21a76e6649f8ec7fc3d4b591127f0e994e2841d0015be273 SHA512 dda861f5534875f1d3d641c65b998d0e982570aa88cd279024295a51e878d8f75dc56e01b258bbc26c668b42bdebd455aaf41bef8c344872323bcd56d078e109 WHIRLPOOL bbb721bb7f225c7edf4bbb18347b374a461abb9195ca3a78e2931cab69e92579a4363187e52012039f9990e2b53f1f20b18af8c66a3ab82d4513ac8364986eea
+DIST yoshimi-1.2.5.tar.bz2 2977758 SHA256 303063cf1c644244841683e84ee1946d2b888d0933f93a41b943370e76cf3d52 SHA512 15343ad6a33341cfbf18de8fc9f8c6a33b24057fd6847c5c0c759d7f35b89229db292639e8ae07f8e866608df547f042101c72558814aaedac54d4a2178fac17 WHIRLPOOL 364202bd7068f22179d6f3a2d9d514244c9b65923a232f809d5ed5f27a3410b7ea87bfc98b55f1401a2ec72421e2a2f234384f88a42a785a272381698c982902
+DIST yoshimi-1.3.1.tar.bz2 2988813 SHA256 14de5ced089918779acde92be3df83084abadb8b3341b3396e17e4276b0f47da SHA512 f58c5a16e9090850467eb025709d49dd5db2a2a5deea98263fa15e173ef6bf51c308b2e98f562fb1d773d4d489c2014489d5224ec633399e734edd43de81bc90 WHIRLPOOL 2cbe78d11b5c6765341f0fdd1b57c76fdc76f30511033a1bf2214af2465ce8e448084a10e922b2c0bebd9460d012f775f1919da382b29da8f33fd1db88bc774e
+DIST yoshimi-1.3.2.tar.bz2 3160607 SHA256 b44a58c7750f4119abd6646b5ec6460082e5cf671242a75f50efeeaf2be38c38 SHA512 a0d9df925dae58aa5ddcbf6da649f0979715c49a8844f6176de819306d6e9b67fc471bc13a1f3ebf5b511afa0bf453c7b64fd2fc6fe2e249d52ecaa94f27b1a7 WHIRLPOOL 891812521641e7646bdf44a6c0e89f8db33485e021a974cbc3d89fd29c5bc089dda1b1ea2fbd752cb4851980b1879e210c044081f30a5e153a48dda7b879ca41
diff --git a/media-sound/yoshimi/files/yoshimi-1.1.0-desktop-version.patch b/media-sound/yoshimi/files/yoshimi-1.1.0-desktop-version.patch
new file mode 100644
index 000000000000..9b159eb1b211
--- /dev/null
+++ b/media-sound/yoshimi/files/yoshimi-1.1.0-desktop-version.patch
@@ -0,0 +1,11 @@
+--- yoshimi-1.1.0/desktop/yoshimi.desktop.in
++++ yoshimi-1.1.0/desktop/yoshimi.desktop.in
+@@ -2,7 +2,7 @@
+ Name=Yoshimi
+ Comment=Real Time Synthesizer
+ GenericName=Synthesizer
+-Version=@YOSHIMI_VERSION@
++Version=1.0
+ Type=Application
+ Categories=AudioVideo;X-Sound;Audio;
+ Exec=yoshimi
diff --git a/media-sound/yoshimi/metadata.xml b/media-sound/yoshimi/metadata.xml
new file mode 100644
index 000000000000..9b0639b50aaf
--- /dev/null
+++ b/media-sound/yoshimi/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sound</herd>
+	<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.0.0.ebuild b/media-sound/yoshimi/yoshimi-1.0.0.ebuild
new file mode 100644
index 000000000000..a85471bb69e7
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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=""
+
+RDEPEND="
+	sys-libs/zlib
+	media-libs/fontconfig
+	x11-libs/fltk:1[opengl]
+	sci-libs/fftw:3.0
+	>=dev-libs/mini-xml-2.5
+	>=media-libs/alsa-lib-1.0.17
+	>=media-sound/jack-audio-connection-kit-0.115.6
+	media-libs/libsndfile"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P}/src
+
+DOCS="../${PV}.notes"
+
+src_prepare() {
+	sed -i \
+		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
+		CMakeLists.txt || die
+}
diff --git a/media-sound/yoshimi/yoshimi-1.1.0.ebuild b/media-sound/yoshimi/yoshimi-1.1.0.ebuild
new file mode 100644
index 000000000000..c1dd63b27ad1
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils 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"
+
+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/zlib
+	x11-libs/cairo
+	x11-libs/fltk:1[opengl]"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P}/src
+
+DOCS="../${PV}.notes"
+
+src_prepare() {
+	sed -i \
+		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
+		CMakeLists.txt || die
+
+	EPATCH_OPTS="-d .." epatch "${FILESDIR}"/${P}-desktop-version.patch
+}
diff --git a/media-sound/yoshimi/yoshimi-1.2.0.ebuild b/media-sound/yoshimi/yoshimi-1.2.0.ebuild
new file mode 100644
index 000000000000..4ebd7d96805b
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils 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"
+
+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/zlib
+	x11-libs/cairo
+	x11-libs/fltk:1[opengl]"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P}/src
+
+DOCS="../${PV}.notes"
+
+src_prepare() {
+	sed -i \
+		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
+		CMakeLists.txt || die
+
+	EPATCH_OPTS="-d .." epatch "${FILESDIR}"/${PN}-1.1.0-desktop-version.patch
+}
diff --git a/media-sound/yoshimi/yoshimi-1.2.1.ebuild b/media-sound/yoshimi/yoshimi-1.2.1.ebuild
new file mode 100644
index 000000000000..4ebd7d96805b
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils 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"
+
+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/zlib
+	x11-libs/cairo
+	x11-libs/fltk:1[opengl]"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P}/src
+
+DOCS="../${PV}.notes"
+
+src_prepare() {
+	sed -i \
+		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
+		CMakeLists.txt || die
+
+	EPATCH_OPTS="-d .." epatch "${FILESDIR}"/${PN}-1.1.0-desktop-version.patch
+}
diff --git a/media-sound/yoshimi/yoshimi-1.2.4.ebuild b/media-sound/yoshimi/yoshimi-1.2.4.ebuild
new file mode 100644
index 000000000000..8736b2e02723
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.2.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils 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"
+
+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/zlib
+	x11-libs/cairo
+	x11-libs/fltk:1[opengl]"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P}/src
+
+DOCS="../Changelog"
+
+src_prepare() {
+	sed -i \
+		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
+		CMakeLists.txt || die
+
+	EPATCH_OPTS="-d .." epatch "${FILESDIR}"/${PN}-1.1.0-desktop-version.patch
+}
diff --git a/media-sound/yoshimi/yoshimi-1.2.5.ebuild b/media-sound/yoshimi/yoshimi-1.2.5.ebuild
new file mode 100644
index 000000000000..8736b2e02723
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.2.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils 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"
+
+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/zlib
+	x11-libs/cairo
+	x11-libs/fltk:1[opengl]"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P}/src
+
+DOCS="../Changelog"
+
+src_prepare() {
+	sed -i \
+		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
+		CMakeLists.txt || die
+
+	EPATCH_OPTS="-d .." epatch "${FILESDIR}"/${PN}-1.1.0-desktop-version.patch
+}
diff --git a/media-sound/yoshimi/yoshimi-1.3.1.ebuild b/media-sound/yoshimi/yoshimi-1.3.1.ebuild
new file mode 100644
index 000000000000..095c16e9ae80
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.3.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils cmake-utils multilib
+
+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/zlib
+	x11-libs/cairo
+	x11-libs/fltk:1[opengl]
+	lv2? ( media-libs/lv2 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P}/src
+
+DOCS="../Changelog"
+
+src_prepare() {
+	sed -i \
+		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
+		-e "s:lib/lv2:$(get_libdir)/lv2:" \
+		CMakeLists.txt || die
+
+	EPATCH_OPTS="-d .." epatch "${FILESDIR}"/${PN}-1.1.0-desktop-version.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBuildLV2Plugin=$(usex lv2 ON OFF)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-sound/yoshimi/yoshimi-1.3.2.ebuild b/media-sound/yoshimi/yoshimi-1.3.2.ebuild
new file mode 100644
index 000000000000..daff522535f3
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.3.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils cmake-utils multilib
+
+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/zlib
+	x11-libs/cairo
+	x11-libs/fltk:1[opengl]
+	lv2? ( media-libs/lv2 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${P}/src
+
+DOCS="../Changelog"
+
+src_prepare() {
+	sed -i \
+		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
+		-e "s:lib/lv2:$(get_libdir)/lv2:" \
+		CMakeLists.txt || die
+
+	EPATCH_OPTS="-d .." epatch "${FILESDIR}"/${PN}-1.1.0-desktop-version.patch
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBuildLV2Plugin=$(usex lv2 ON OFF)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
new file mode 100644
index 000000000000..252f922cf8d0
--- /dev/null
+++ b/media-sound/zynaddsubfx/Manifest
@@ -0,0 +1,5 @@
+DIST ZynAddSubFX-2.4.1.tar.bz2 2449356 SHA256 cf796e23c1f268307373dca3d0dacaf80a19d813da4bd290742b6773e0a3c5fe
+DIST ZynAddSubFX-2.4.2.tar.bz2 2447485 SHA256 7d43bfece3b02625528dab7139e0fbada5768ac2722df137794b157602f8e802 SHA512 558389a62d121242ae8d3f2e9501082a64ef9e2f4540873d4baaaa82bac7113e2941d5119268bbfee375953d0fe8a8d91006f06998de4035705588e9c56b56d7 WHIRLPOOL bdec8e7a05db9b20948e2537cb644836093148a3438db67097e523acd64ee85c86ad6c978c821e840fc4096b380e325609d6d330e3f0e4d61fedc2c0d757876a
+DIST ZynAddSubFX-2.4.3.tar.bz2 2536667 SHA256 b84b595660ccec3ebc364c29c2d29def7d28a6947fc1dfb26bd8c34ca0e7f54d SHA512 2314c456db1a8a032a38b012c7c9e01f0a487c5eeb0027a741a4ffd6a7eea3382fcd26a8cd97b89af40800613c1ba164bb683be800957ea403f97dd6f23df5ff WHIRLPOOL 46aa59378f310105504b0ab5903d35826aa03dd080e6c7313237e34a2c9c82cea1d9c0f2cd986c65da38320b1376477b33424b8c69fd8fa591a53325df0b4a65
+DIST zynaddsubfx-2.5.0.tar.gz 4185453 SHA256 a3810708291367298e04002eda29237ff5f70240e432be84ea48b54895746aa7 SHA512 830388593079690153ae9cdcfb35362bd33208d93d7d56d5f4967c626dc3a12c7717088281d382696fbe22294874e37efd1566874743fb17dba54fee0eb40b0a WHIRLPOOL 81ca9724906846fcfdbc91e04865da9d8d3ebbb5a19ac5cb42639f13228d709815e651c07a4fd80b3c2af7b0f2f2538d50c06b0026119bb7f9e7eb922a9ed6a3
+DIST zynaddsubfx-2.5.1.tar.gz 4214568 SHA256 e2e3b92cfc4c2add5e7af6afc81dc74e31509459034b0680372dabbf68d98405 SHA512 387d96bb5d6dfebd3129c047091380850d80092cf8e397ab1932b7a149d0fd9fb67033768ef68b50d33362f98ba20697ad9e4c25b5cf268484a24ecc156857e0 WHIRLPOOL 323f30cacc6d3c875a1324413aba091cdf4f62925b0deb6faa8500ee0574f2d96e3030151c0bc7c8d044be91c6e38f4283a5251456957e7bc714f914e1daa519
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch
new file mode 100644
index 000000000000..587e4a4219a9
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-docs.patch
@@ -0,0 +1,12 @@
+Index: ZynAddSubFX-2.4.1/CMakeLists.txt
+===================================================================
+--- ZynAddSubFX-2.4.1.orig/CMakeLists.txt
++++ ZynAddSubFX-2.4.1/CMakeLists.txt
+@@ -5,7 +5,3 @@ project(zynaddsubfx)
+ enable_testing()
+ #Currently the only directory that uses cmake
+ add_subdirectory(src)
+-
+-install(FILES AUTHORS.txt COPYING FAQ.txt HISTORY.txt README.txt
+-	DESTINATION share/doc/zynaddsubfx
+-	)
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch
new file mode 100644
index 000000000000..38446d7e11ca
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch
@@ -0,0 +1,38 @@
+Index: ZynAddSubFX-2.4.1/src/CMakeLists.txt
+===================================================================
+--- ZynAddSubFX-2.4.1.orig/src/CMakeLists.txt
++++ ZynAddSubFX-2.4.1/src/CMakeLists.txt
+@@ -96,24 +96,7 @@ if(FltkGui)
+     #message(STATUS "FLTK_LIBRARIES: ${FLTK_LIBRARIES}")
+     #message(STATUS "FLTK_MATH_LIBRARY: ${FLTK_MATH_LIBRARY}")
+ 
+-    #UGLY WORKAROUND
+-    find_program (MYFLTK_CONFIG fltk-config)
+-    if (MYFLTK_CONFIG)
+-        execute_process (COMMAND ${MYFLTK_CONFIG} --ldflags OUTPUT_VARIABLE MYFLTK_LDFLAGS)
+-        string(STRIP ${MYFLTK_LDFLAGS} MYFLTK_LIBRARIES)
+-    endif()
+-    mark_as_advanced(FORCE FLTK_BASE_LIBRARY)
+-    mark_as_advanced(FORCE FLTK_CONFIG_SCRIPT)
+-    mark_as_advanced(FORCE FLTK_DIR)
+-    mark_as_advanced(FORCE FLTK_FLUID_EXECUTABLE)
+-    mark_as_advanced(FORCE FLTK_FORMS_LIBRARY)
+-    mark_as_advanced(FORCE FLTK_GL_LIBRARY)
+-    mark_as_advanced(FORCE FLTK_IMAGES_LIBRARY)
+-    mark_as_advanced(FORCE FLTK_INCLUDE_DIR)
+-    mark_as_advanced(FORCE FLTK_MATH_LIBRARY)
+-
+-
+-    set(GUI_LIBRARIES ${FLTK_LIBRARIES} ${MYFLTK_LIBRARIES} ${OPENGL_LIBRARIES} zynaddsubfx_gui)
++    set(GUI_LIBRARIES ${FLTK_LIBRARIES} ${OPENGL_LIBRARIES} zynaddsubfx_gui)
+     add_definitions(-DFLTK_GUI)
+ 
+     message(STATUS "Will build fltk gui")
+@@ -121,6 +104,7 @@ if(FltkGui)
+ 	include_directories(
+ 			"${CMAKE_CURRENT_SOURCE_DIR}/UI"
+ 			"${CMAKE_CURRENT_BINARY_DIR}/UI"
++                        ${FLTK_INCLUDE_DIR}
+ 			)
+ 
+ 	add_subdirectory(UI)
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
new file mode 100644
index 000000000000..72fa30a68145
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch
@@ -0,0 +1,58 @@
+Sounds hackish but that's the only way I found to force it to generate the
+functions in the .cxx files with fluid 1.3...
+
+Index: ZynAddSubFX-2.4.1/src/UI/BankUI.fl
+===================================================================
+--- ZynAddSubFX-2.4.1.orig/src/UI/BankUI.fl
++++ ZynAddSubFX-2.4.1/src/UI/BankUI.fl
+@@ -32,7 +32,7 @@ decl {\#include "../Misc/Config.h"} {pub
+ 
+ class BankProcess_ {} {
+   Function {process()} {open return_type {virtual void}
+-  } {}
++  } {code{;}}
+   decl {Bank *bank;} {public
+   }
+ } 
+Index: ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl
+===================================================================
+--- ZynAddSubFX-2.4.1.orig/src/UI/OscilGenUI.fl
++++ ZynAddSubFX-2.4.1/src/UI/OscilGenUI.fl
+@@ -129,7 +129,7 @@ delete [] spc;} {selected
+ 
+ class PSlider {: {public Fl_Slider}
+ } {
+-  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {}
++  Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {code{;}}
+   Function {handle(int event)} {return_type int
+   } {
+     code {int X=x(),Y=y(),W=w(),H=h();
+Index: ZynAddSubFX-2.4.1/src/UI/PartUI.fl
+===================================================================
+--- ZynAddSubFX-2.4.1.orig/src/UI/PartUI.fl
++++ ZynAddSubFX-2.4.1/src/UI/PartUI.fl
+@@ -85,7 +85,7 @@ end();} {}
+ 
+ class PartUI_ {} {
+   Function {showparameters(int kititem,int engine)} {return_type virtual
+-  } {}
++  } {code{;}}
+ } 
+ 
+ class PartKitItem {: {public Fl_Group}
+Index: ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl
+===================================================================
+--- ZynAddSubFX-2.4.1.orig/src/UI/PresetsUI.fl
++++ ZynAddSubFX-2.4.1/src/UI/PresetsUI.fl
+@@ -18,9 +18,9 @@ decl {\#include "../Params/Presets.h"} {
+ 
+ class PresetsUI_ {} {
+   Function {refresh()} {open return_type {virtual void}
+-  } {}
++  } {code{;}}
+   Function {~PresetsUI_()} {open return_type virtual
+-  } {}
++  } {code{;}}
+ } 
+ 
+ class PresetsUI {} {
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch
new file mode 100644
index 000000000000..c20828328f26
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.3-nofltk.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/show_bug.cgi?id=437018
+
+Index: ZynAddSubFX-2.4.3/src/main.cpp
+===================================================================
+--- ZynAddSubFX-2.4.3.orig/src/main.cpp
++++ ZynAddSubFX-2.4.3/src/main.cpp
+@@ -37,8 +37,6 @@
+ #include "Misc/Dump.h"
+ extern Dump dump;
+ 
+-#include <FL/Fl.H>
+-
+ //Nio System
+ #include "Nio/Nio.h"
+ 
+@@ -51,6 +49,8 @@ QApplication *app;
+ 
+ #elif defined FLTK_GUI
+ 
++#include <FL/Fl.H>
++
+ #include "UI/MasterUI.h"
+ #endif // FLTK_GUI
+ 
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.0-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.0-docs.patch
new file mode 100644
index 000000000000..a1b7d9332ea5
--- /dev/null
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.0-docs.patch
@@ -0,0 +1,14 @@
+Index: zynaddsubfx-2.5.0/CMakeLists.txt
+===================================================================
+--- zynaddsubfx-2.5.0.orig/CMakeLists.txt
++++ zynaddsubfx-2.5.0/CMakeLists.txt
+@@ -27,9 +27,6 @@ include(CTestConfig.cmake)
+ #Currently the only directory that uses cmake
+ add_subdirectory(src)
+ 
+-install(FILES AUTHORS.txt COPYING FAQ.txt 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..b8228fecd796
--- /dev/null
+++ b/media-sound/zynaddsubfx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proaudio</herd>
+	<upstream>
+		<remote-id type="sourceforge">zynaddsubfx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild
new file mode 100644
index 000000000000..e25e6d7dc9d1
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.4.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils cmake-utils
+
+MY_P=ZynAddSubFX-${PV}
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_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
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	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 )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fltk.patch
+	"${FILESDIR}"/${P}-fltk13.patch
+	"${FILESDIR}"/${P}-docs.patch
+)
+
+DOCS="ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt"
+
+src_configure() {
+	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"`
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/banks "${S}"/examples
+}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.2.ebuild
new file mode 100644
index 000000000000..786770a24d12
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.4.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils cmake-utils
+
+MY_P=ZynAddSubFX-${PV}
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_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
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	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 )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.1-docs.patch
+)
+
+DOCS="ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt"
+
+src_configure() {
+	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"`
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/banks "${S}"/examples
+}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
new file mode 100644
index 000000000000..356c173ac66f
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.4.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils cmake-utils
+
+MY_P=ZynAddSubFX-${PV}
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${MY_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
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	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 )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.1-docs.patch
+	"${FILESDIR}"/${PN}-2.4.3-nofltk.patch
+)
+
+DOCS="ChangeLog FAQ.txt HISTORY.txt README.txt ZynAddSubFX.lsm bugs.txt"
+
+src_configure() {
+	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"`
+	)
+	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-2.5.0.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.5.0.ebuild
new file mode 100644
index 000000000000..668a82f16da5
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.5.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.gz"
+
+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
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	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.0-docs.patch
+)
+
+DOCS="ChangeLog FAQ.txt HISTORY.txt README.adoc bugs.txt"
+
+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"`
+	)
+	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-2.5.1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-2.5.1.ebuild
new file mode 100644
index 000000000000..668a82f16da5
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-2.5.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils flag-o-matic
+
+DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.gz"
+
+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
+	alsa? ( media-libs/alsa-lib )
+	fltk? ( >=x11-libs/fltk-1.3:1 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	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.0-docs.patch
+)
+
+DOCS="ChangeLog FAQ.txt HISTORY.txt README.adoc bugs.txt"
+
+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"`
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	insinto /usr/share/${PN}
+	doins -r "${S}"/instruments/*
+}