summaryrefslogtreecommitdiff
path: root/media-sound
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/alsamixer-app/metadata.xml5
-rw-r--r--media-sound/amsynth/amsynth-1.5.1.ebuild2
-rw-r--r--media-sound/apulse/apulse-0.1.6-r1.ebuild2
-rw-r--r--media-sound/ardour/ardour-4.6.ebuild17
-rw-r--r--media-sound/ardour/ardour-9999.ebuild17
-rw-r--r--media-sound/clementine/Manifest1
-rw-r--r--media-sound/clementine/clementine-1.3_rc1.ebuild167
-rw-r--r--media-sound/clementine/files/clementine-1.3_rc1-cmake.patch41
-rw-r--r--media-sound/dagrab/dagrab-0.513-r1.ebuild35
-rw-r--r--media-sound/dagrab/files/dagrab-0.513-freedb.patch8
-rw-r--r--media-sound/daudio/daudio-0.3-r1.ebuild45
-rw-r--r--media-sound/daudio/files/daudio-0.3-qa-implicit-declarations.patch98
-rw-r--r--media-sound/gbsplay/files/gbsplay-0.0.91-fix-buildsystem.patch32
-rw-r--r--media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild57
-rw-r--r--media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild59
-rw-r--r--media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch32
-rw-r--r--media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch193
-rw-r--r--media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild58
-rw-r--r--media-sound/ncmpcpp/ncmpcpp-0.7.ebuild2
-rw-r--r--media-sound/protux/protux-0.50.100.ebuild4
-rw-r--r--media-sound/qmmp/Manifest4
-rw-r--r--media-sound/qmmp/qmmp-0.9.6.ebuild (renamed from media-sound/qmmp/qmmp-0.9.3.ebuild)2
-rw-r--r--media-sound/qmmp/qmmp-1.0.5.ebuild (renamed from media-sound/qmmp/qmmp-1.0.2.ebuild)2
-rw-r--r--media-sound/quodlibet/quodlibet-3.5.1.ebuild2
-rw-r--r--media-sound/spotify/spotify-1.0.19.106-r1.ebuild2
-rw-r--r--media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.18.2.ebuild10
-rw-r--r--media-sound/toolame/files/toolame-02l-gentoo.diff4
-rw-r--r--media-sound/toolame/toolame-02l-r4.ebuild36
28 files changed, 903 insertions, 34 deletions
diff --git a/media-sound/alsamixer-app/metadata.xml b/media-sound/alsamixer-app/metadata.xml
index 06a7d236d55..6cca9a9b261 100644
--- a/media-sound/alsamixer-app/metadata.xml
+++ b/media-sound/alsamixer-app/metadata.xml
@@ -2,5 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>desktop-dock</herd>
+<maintainer>
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+</maintainer>
+
<herd>sound</herd>
</pkgmetadata>
diff --git a/media-sound/amsynth/amsynth-1.5.1.ebuild b/media-sound/amsynth/amsynth-1.5.1.ebuild
index a514a483723..cce6179a278 100644
--- a/media-sound/amsynth/amsynth-1.5.1.ebuild
+++ b/media-sound/amsynth/amsynth-1.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nixxcode/${PN}/archive/release-${PV}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="alsa dssi jack lash oss sndfile"
RDEPEND="dev-cpp/gtkmm:2.4
diff --git a/media-sound/apulse/apulse-0.1.6-r1.ebuild b/media-sound/apulse/apulse-0.1.6-r1.ebuild
index dde232ef389..5311f441e86 100644
--- a/media-sound/apulse/apulse-0.1.6-r1.ebuild
+++ b/media-sound/apulse/apulse-0.1.6-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~x86"
DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
media-libs/alsa-lib[${MULTILIB_USEDEP}]"
diff --git a/media-sound/ardour/ardour-4.6.ebuild b/media-sound/ardour/ardour-4.6.ebuild
index 450dc30067f..6ef94c0916b 100644
--- a/media-sound/ardour/ardour-4.6.ebuild
+++ b/media-sound/ardour/ardour-4.6.ebuild
@@ -5,6 +5,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
DESCRIPTION="Digital Audio Workstation"
@@ -64,7 +65,7 @@ RDEPEND="
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- >=media-sound/jack-audio-connection-kit-0.120
+ jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
sys-devel/gettext
virtual/pkgconfig
doc? ( app-doc/doxygen[dot] )"
@@ -73,6 +74,7 @@ pkg_setup() {
if has_version \>=dev-libs/libsigc++-2.6 ; then
append-cxxflags -std=c++11
fi
+ python-any-r1_pkg_setup
}
src_prepare(){
@@ -81,12 +83,13 @@ src_prepare(){
touch "${S}/libs/ardour/revision.cc"
fi
use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript
+ sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
MARCH=$(get-flag march)
+ OPTFLAGS=""
if use cpu_flags_x86_sse; then
if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
elog "You enabled sse but use an march that does not support sse!"
- elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
+ elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
fi
OPTFLAGS="sse"
fi
@@ -99,10 +102,12 @@ src_prepare(){
if use cpu_flags_x86_3dnow; then
OPTFLAGS="${OPTFLAGS} 3dnow"
fi
- sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '${OPTFLAGS}' just some place holders\"/' \
- -i "${S}"/wscript
- sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
+ sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+ -i "${S}"/wscript || die
+ sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
append-flags "-lboost_system"
+ python_fix_shebang "${S}"/wscript
+ python_fix_shebang "${S}"/waf
}
src_configure() {
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 450dc30067f..6ef94c0916b 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -5,6 +5,7 @@
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
DESCRIPTION="Digital Audio Workstation"
@@ -64,7 +65,7 @@ RDEPEND="
DEPEND="${RDEPEND}
${PYTHON_DEPS}
- >=media-sound/jack-audio-connection-kit-0.120
+ jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
sys-devel/gettext
virtual/pkgconfig
doc? ( app-doc/doxygen[dot] )"
@@ -73,6 +74,7 @@ pkg_setup() {
if has_version \>=dev-libs/libsigc++-2.6 ; then
append-cxxflags -std=c++11
fi
+ python-any-r1_pkg_setup
}
src_prepare(){
@@ -81,12 +83,13 @@ src_prepare(){
touch "${S}/libs/ardour/revision.cc"
fi
use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript
+ sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
MARCH=$(get-flag march)
+ OPTFLAGS=""
if use cpu_flags_x86_sse; then
if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
elog "You enabled sse but use an march that does not support sse!"
- elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
+ elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
fi
OPTFLAGS="sse"
fi
@@ -99,10 +102,12 @@ src_prepare(){
if use cpu_flags_x86_3dnow; then
OPTFLAGS="${OPTFLAGS} 3dnow"
fi
- sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '${OPTFLAGS}' just some place holders\"/' \
- -i "${S}"/wscript
- sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
+ sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+ -i "${S}"/wscript || die
+ sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
append-flags "-lboost_system"
+ python_fix_shebang "${S}"/wscript
+ python_fix_shebang "${S}"/waf
}
src_configure() {
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 25001dc8bee..9a18ea585de 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,2 +1,3 @@
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
+DIST clementine-1.3_rc1.tar.gz 8477665 SHA256 f08b797b47305b8a0b7e1713d11977df12e09911f05c577c9f81641369f252a0 SHA512 973410a0d2baf0646a77eb5bcbea2af3f34a4baa5671f7a81fa99203703c478d38dd2f32ce0ccac9babf8add56717fd5fdec8a4bacefe8b9b8fa0256ec509edb WHIRLPOOL 968ca43b4a15169926ad68a009c568ae03ef17e8b0542fe6c4ebd07fc4e64ae6782ab63d3a05851064e288522e44e885a9a1dc52b94246e016c60c91e41e0a76
diff --git a/media-sound/clementine/clementine-1.3_rc1.ebuild b/media-sound/clementine/clementine-1.3_rc1.ebuild
new file mode 100644
index 00000000000..4c4758a16b5
--- /dev/null
+++ b/media-sound/clementine/clementine-1.3_rc1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2016 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="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm skydrive test ubuntu-one +udisks wiimote"
+IUSE+="${LANGS// / linguas_}"
+
+REQUIRED_USE="
+ udisks? ( dbus )
+ wiimote? ( dbus )
+"
+
+# qca dep is temporary for bug #489850
+COMMON_DEPEND="
+ dev-db/sqlite:=
+ >=dev-libs/glib-2.24.1-r1
+ dev-libs/libxml2
+ dev-libs/protobuf:=
+ dev-libs/qjson
+ >=dev-qt/qtcore-4.5:4
+ >=dev-qt/qtgui-4.5:4
+ >=dev-qt/qtopengl-4.5:4
+ >=dev-qt/qtsql-4.5:4[sqlite]
+ >=media-libs/chromaprint-0.6
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/libechonest:=
+ >=media-libs/libmygpo-qt-1.0.8
+ >=media-libs/taglib-1.8[mp4]
+ sys-libs/zlib
+ virtual/glu
+ virtual/opengl
+ x11-libs/libX11
+ cdda? ( dev-libs/libcdio )
+ dbus? ( >=dev-qt/qtdbus-4.5:4 )
+ ipod? ( >=media-libs/libgpod-0.8.0 )
+ lastfm? ( >=media-libs/liblastfm-1[qt4(+)] )
+ mtp? ( >=media-libs/libmtp-1.0.0 )
+ moodbar? ( sci-libs/fftw:3.0 )
+ projectm? ( media-libs/glew:= )
+"
+# 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:1.0 )
+ mtp? ( gnome-base/gvfs )
+ projectm? ( >=media-libs/libprojectm-1.2.0 )
+ media-plugins/gst-plugins-meta:1.0
+ media-plugins/gst-plugins-soup:1.0
+ media-plugins/gst-plugins-taglib:1.0
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.39
+ virtual/pkgconfig
+ sys-devel/gettext
+ dev-qt/qttest:4
+ dev-cpp/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"
+
+MY_P="${P/_}"
+# Switch to ^ when we switch to EAPI=6.
+[[ ${PV} == *9999* ]] || \
+S="${WORKDIR}/C${MY_P:1}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3_rc1-cmake.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
+ -DUSE_SYSTEM_PROJECTM=ON
+ $(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)
+ $(usex projectm '-DUSE_SYSTEM_PROJECTM=ON' '')
+ $(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/files/clementine-1.3_rc1-cmake.patch b/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch
new file mode 100644
index 00000000000..8aefe97c124
--- /dev/null
+++ b/media-sound/clementine/files/clementine-1.3_rc1-cmake.patch
@@ -0,0 +1,41 @@
+--- Clementine-1.3rc1/CMakeLists.txt
++++ Clementine-1.3rc1/CMakeLists.txt
+@@ -60,7 +60,7 @@
+
+ pkg_check_modules(CDIO libcdio)
+ pkg_check_modules(CHROMAPRINT REQUIRED libchromaprint)
+-pkg_search_module(CRYPTOPP cryptopp libcrypto++)
++#pkg_search_module(CRYPTOPP cryptopp libcrypto++)
+ pkg_check_modules(GIO gio-2.0)
+ pkg_check_modules(GLIB REQUIRED glib-2.0)
+ pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
+@@ -71,7 +71,7 @@
+ pkg_check_modules(GSTREAMER_TAG REQUIRED gstreamer-tag-1.0)
+ pkg_check_modules(LIBGPOD libgpod-1.0>=0.7.92)
+ pkg_check_modules(LIBMTP libmtp>=1.0)
+-pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.9)
++pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.8)
+ pkg_check_modules(LIBPULSE libpulse)
+ pkg_check_modules(LIBXML libxml-2.0)
+ pkg_check_modules(QJSON REQUIRED QJson)
+@@ -275,13 +275,14 @@
+
+ optional_component(VISUALISATIONS ON "Visualisations")
+
+-if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
+- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
+- "code must be compiled in")
+-elseif(CRYPTOPP_FOUND)
++#if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
++# message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
++# "code must be compiled in")
++#elseif(CRYPTOPP_FOUND)
+ set(HAVE_CRYPTOPP ON)
+- set(HAVE_SPOTIFY_DOWNLOADER ON)
+-endif()
++ set(HAVE_SPOTIFY_DOWNLOADER OFF)
++ set(HAVE_SPOTIFY_BLOB OFF)
++#endif()
+
+ # Find DBus if it's enabled
+ if (HAVE_DBUS)
diff --git a/media-sound/dagrab/dagrab-0.513-r1.ebuild b/media-sound/dagrab/dagrab-0.513-r1.ebuild
new file mode 100644
index 00000000000..e901d83ba7b
--- /dev/null
+++ b/media-sound/dagrab/dagrab-0.513-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic
+
+MY_P="${PN}-S${PV}"
+DESCRIPTION="fixed point cd ripper"
+HOMEPAGE="http://vertigo.fme.vutbr.cz/~stibor/dagrab.html"
+SRC_URI="http://ashtray.jz.gts.cz/~smsti/archiv/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}/${MY_P}
+PATCHES=(
+ "${FILESDIR}/${P}-build.patch"
+ "${FILESDIR}/${P}-freedb.patch"
+)
+
+src_prepare() {
+ # fix #570732 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+
+ default
+}
+
+src_install() {
+ dobin dagrab
+ dodoc BUGS CHANGES FAQ grab TODO
+ doman dagrab.1
+}
diff --git a/media-sound/dagrab/files/dagrab-0.513-freedb.patch b/media-sound/dagrab/files/dagrab-0.513-freedb.patch
index 6a65576497d..5725867a26e 100644
--- a/media-sound/dagrab/files/dagrab-0.513-freedb.patch
+++ b/media-sound/dagrab/files/dagrab-0.513-freedb.patch
@@ -1,5 +1,5 @@
---- dagrab.1
-+++ dagrab.1
+--- dagrab-S0.513/dagrab.1
++++ dagrab-S0.513/dagrab.1
@@ -209,7 +209,7 @@
.B -H
.I [host][:port]
@@ -9,8 +9,8 @@
.RE
.B -D
---- const.h
-+++ const.h
+--- dagrab-S0.513/const.h
++++ dagrab-S0.513/const.h
@@ -18,9 +18,9 @@
#define BLEN 1024 /* length in chars of command/trackname */
#define OVERLAP 1 /* minimum number of sectors for overlapping */
diff --git a/media-sound/daudio/daudio-0.3-r1.ebuild b/media-sound/daudio/daudio-0.3-r1.ebuild
new file mode 100644
index 00000000000..2ff9aab2797
--- /dev/null
+++ b/media-sound/daudio/daudio-0.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Distributed audio on the local network"
+HOMEPAGE="http://daudio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-sparc: 0.3: static audio on local daemon. No audio when client connects to amd64 daemon
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+
+IUSE=""
+DEPEND=">=media-libs/libmad-0.15.0b-r1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-makefile.patch"
+ "${FILESDIR}/${P}-qa-implicit-declarations.patch"
+)
+
+src_prepare() {
+ # fix #570582 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+
+ tc-export CC
+ default
+}
+
+src_compile() {
+ emake -C client
+ emake -C server
+ emake -C streamer
+}
+
+src_install() {
+ dobin client/daudioc server/daudiod streamer/dstreamer
+ newinitd "${FILESDIR}"/daudio.rc daudio
+ dodoc doc/*
+}
diff --git a/media-sound/daudio/files/daudio-0.3-qa-implicit-declarations.patch b/media-sound/daudio/files/daudio-0.3-qa-implicit-declarations.patch
new file mode 100644
index 00000000000..d60be6f64e6
--- /dev/null
+++ b/media-sound/daudio/files/daudio-0.3-qa-implicit-declarations.patch
@@ -0,0 +1,98 @@
+Fix implicit declarations, such as:
+
+main.c: In function ‘main’:
+main.c:45:2: warning: incompatible implicit declaration of built-in function ‘exit’
+ exit(1);
+ ^
+--- daudio-0.3/client/main.c
++++ daudio-0.3/client/main.c
+@@ -22,6 +22,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <sched.h>
++#include <stdlib.h>
+
+ int main(int argc, char **argv) {
+ int s;
+@@ -50,7 +51,7 @@
+
+ /* drop priveledges */
+ uid = getuid();
+- seteuid(uid);
++ if(seteuid(uid)){};
+
+ set_default_options(void);
+
+--- daudio-0.3/client/net.c
++++ daudio-0.3/client/net.c
+@@ -27,6 +27,7 @@
+ #include <asm/unistd.h>
+ #include <mad.h>
+ #include <pthread.h>
++#include <stdlib.h>
+
+ #include "net.h"
+ #include "../common/frame.h"
+--- daudio-0.3/server/local.c
++++ daudio-0.3/server/local.c
+@@ -25,6 +25,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <netinet/in.h>
++#include <stdlib.h>
+
+ #include "timer.h"
+ #include "data.h"
+@@ -71,7 +72,7 @@
+
+ /* drop priveleges */
+ uid = getuid();
+- seteuid(uid);
++ if(seteuid(uid)){};
+
+ current = bigbuf.buffer;
+
+--- daudio-0.3/server/main.c
++++ daudio-0.3/server/main.c
+@@ -25,6 +25,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <signal.h>
++#include <stdlib.h>
+
+ int main () {
+ int r;
+@@ -40,19 +41,19 @@
+ uid = getuid();
+ r = d_init();
+ if(r == -1) {
+- seteuid(uid);
++ if(seteuid(uid)){};
+ perror("d_init failed");
+ exit(1);
+ }
+ r = b_init();
+ if(r == -1) {
+- seteuid(uid);
++ if(seteuid(uid)){};
+ perror("b_init failed");
+ exit(1);
+ }
+ r = t_init();
+ /* drop priveleges */
+- seteuid(uid);
++ if(seteuid(uid)){};
+ if(r == -1) {
+ perror("t_init failed");
+ exit(1);
+--- daudio-0.3/server/timer.c
++++ daudio-0.3/server/timer.c
+@@ -124,7 +124,7 @@
+
+ /* drop priveleges */
+ uid = getuid();
+- seteuid(uid);
++ if(seteuid(uid)){};
+
+ mytimer.it_value.tv_sec = 0;
+ mytimer.it_value.tv_usec = 0;
diff --git a/media-sound/gbsplay/files/gbsplay-0.0.91-fix-buildsystem.patch b/media-sound/gbsplay/files/gbsplay-0.0.91-fix-buildsystem.patch
new file mode 100644
index 00000000000..82089f9553a
--- /dev/null
+++ b/media-sound/gbsplay/files/gbsplay-0.0.91-fix-buildsystem.patch
@@ -0,0 +1,32 @@
+Fix linking failure due to different GCC5 inline semantics
+https://bugs.gentoo.org/show_bug.cgi?id=571000
+
+In addition, fix QA warnings caused by passing
+an unformatted string to printf().
+
+--- gbsplay-0.0.91/Makefile
++++ gbsplay-0.0.91/Makefile
+@@ -35,7 +35,7 @@
+ -predboolothers \
+ -shiftnegative \
+ -shiftimplementation
+-GBSCFLAGS := -Wall -fsigned-char -D_FORTIFY_SOURCE=2
++GBSCFLAGS := -Wall -fsigned-char -std=gnu89
+ GBSLDFLAGS := -Wl,-O1 -lm
+ GBSPLAYLDFLAGS :=
+
+--- gbsplay-0.0.91/plugout.c
++++ gbsplay-0.0.91/plugout.c
+@@ -55,10 +55,10 @@
+ {
+ long idx;
+
+- printf(_("Available output plugins:\n\n"));
++ fputs(_("Available output plugins:\n\n"), stdout);
+
+ if (plugouts[0] == NULL) {
+- printf(_("No output plugins available.\n\n"));
++ fputs(_("No output plugins available.\n\n"), stdout);
+ return;
+ }
+
diff --git a/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild b/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild
new file mode 100644
index 00000000000..6e9a8663a80
--- /dev/null
+++ b/media-sound/gbsplay/gbsplay-0.0.91-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PLOCALES="de en"
+inherit l10n toolchain-funcs
+
+DESCRIPTION="Nintendo Gameboy sound player for GBS format"
+HOMEPAGE="https://www.cgarbs.de/gbsplay.en.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa nas nls oss"
+
+RDEPEND="alsa? ( media-libs/alsa-lib:0 )
+ nas? ( media-libs/nas:0 )"
+
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext:0 )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_configure() {
+ tc-export AR CC
+
+ # No econf, because "unknown option '--build=x86_64-pc-linux-gnu'"
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --docdir=/usr/share/doc/${PF} \
+ --without-xmmsplugin \
+ --without-test \
+ $(use_enable nls i18n) \
+ $(use_enable oss devdsp) \
+ $(use_enable alsa) \
+ $(use_enable nas) || die "Configure failed."
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" SPLINT="true"
+}
+
+remove_disabled_locale() {
+ rm -r "${D}"/usr/share/locale/$1 || die
+}
+
+src_install() {
+ default
+
+ l10n_for_each_disabled_locale_do remove_disabled_locale
+}
diff --git a/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild b/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild
new file mode 100644
index 00000000000..70075baba0d
--- /dev/null
+++ b/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils gnome2-utils qmake-utils
+
+MY_PN=MP3Diags
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Qt-based MP3 diagnosis and repair tool"
+HOMEPAGE="http://mp3diags.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ >=dev-libs/boost-1.37
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+ dev-qt/qtsvg:4
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ eqmake4 ${PN}.pro
+}
+
+src_install() {
+ dobin bin/${MY_PN}
+ dodoc changelog.txt
+
+ local size
+ for size in 16 22 24 32 36 40 48; do
+ insinto /usr/share/icons/hicolor/${size}x${size}/apps
+ newins desktop/${MY_PN}${size}.png ${MY_PN}.png
+ done
+ domenu desktop/${MY_PN}.desktop
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch b/media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch
new file mode 100644
index 00000000000..0fb96ae1ff0
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.8.1-fix-underlinking.patch
@@ -0,0 +1,32 @@
+Fix libm (and ncurses) underlinking issues.
+https://bugs.gentoo.org/show_bug.cgi?id=529490
+
+--- mpfc-1.3.8.1/configure.ac
++++ mpfc-1.3.8.1/configure.ac
+@@ -13,13 +13,13 @@
+ COMMON_LIBS=""
+ AC_SUBST(COMMON_LIBS)
+
++dnl Check for libm for rintf()
++AC_SEARCH_LIBS([rintf], [m], [], [
++ AC_MSG_ERROR([unable to find the rintf() function])
++])
++
+ # Check for ncurses
+-LIBS_save=$LIBS
+-AC_CHECK_HEADERS([curses.h],,[AC_MSG_ERROR(*** Can't find curses.h ***)])
+-AC_CHECK_LIB(ncursesw, waddch,,[AC_MSG_ERROR(*** Can't find ncurses library ***)])
+-CURSES_LIBS="-lncursesw"
+-AC_SUBST(CURSES_LIBS)
+-LIBS=$LIBS_save
++PKG_CHECK_MODULES([CURSES], [ncursesw])
+
+ # Check for pthread
+ LIBS_save=$LIBS
+--- mpfc-1.3.8.1/libmpfcwnd/Makefile.am
++++ mpfc-1.3.8.1/libmpfcwnd/Makefile.am
+@@ -1,3 +1,4 @@
++AM_CPPFLAGS = @CURSES_CFLAGS@
+ lib_LTLIBRARIES = libmpfcwnd.la
+ libmpfcwndhdrdir = $(includedir)/mpfc/libmpfcwnd
+ libmpfcwndhdr_HEADERS = wnd.h wnd_print.h wnd_msg.h wnd_kbd.h \
diff --git a/media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch b/media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch
new file mode 100644
index 00000000000..31958582e90
--- /dev/null
+++ b/media-sound/mpfc/files/mpfc-1.3.8.1-qa-implicit-declarations.patch
@@ -0,0 +1,193 @@
+Fix QA warnings caused by implicit declarations, such as
+
+* QA Notice: Package triggers severe warnings which indicate that it
+* may exhibit random runtime failures.
+* wnd.c:1081:4: warning: implicit declaration of function ‘add_wch’ [-Wimplicit-function-declaration]
+
+--- mpfc-1.3.8.1/libmpfc/file_http.c
++++ mpfc-1.3.8.1/libmpfc/file_http.c
+@@ -35,6 +35,7 @@
+ #include "file.h"
+ #include "file_http.h"
+ #include "mystring.h"
++#include "util.h"
+
+ /* Get file data */
+ #define FHTTP_GET_DATA(data, file) \
+--- mpfc-1.3.8.1/libmpfc/id3.c
++++ mpfc-1.3.8.1/libmpfc/id3.c
+@@ -26,6 +26,7 @@
+ #include <unicode/ucnv.h>
+ #include "types.h"
+ #include "myid3.h"
++#include "util.h"
+
+ /* Create a new empty tag */
+ id3_tag_t *id3_new( void )
+--- mpfc-1.3.8.1/libmpfc/logger.c
++++ mpfc-1.3.8.1/libmpfc/logger.c
+@@ -28,6 +28,8 @@
+ #include "cfg.h"
+ #include "logger.h"
+
++int logger_get_level( logger_t *log );
++
+ /* Initialize logger */
+ logger_t *logger_new( cfg_node_t *cfg_list, char *file_name )
+ {
+--- mpfc-1.3.8.1/libmpfcwnd/wnd.h
++++ mpfc-1.3.8.1/libmpfcwnd/wnd.h
+@@ -23,7 +23,6 @@
+ #ifndef __SG_MPFC_WND_H__
+ #define __SG_MPFC_WND_H__
+
+-#define _XOPEN_SOURCE_EXTENDED
+ #include <curses.h>
+ #include "types.h"
+ #include "cfg.h"
+--- mpfc-1.3.8.1/libmpfcwnd/wnd.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd.c
+@@ -29,6 +29,8 @@
+ #include "logger.h"
+ #include "wnd.h"
+ #include "wnd_root.h"
++#include "util.h"
++#include <curses.h>
+
+ /* Initialize window system and create root window */
+ wnd_t *wnd_init( cfg_node_t *cfg_list, logger_t *log )
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_combobox.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_combobox.c
+@@ -28,6 +28,8 @@
+ #include "wnd_dlgitem.h"
+ #include "wnd_editbox.h"
+ #include "wnd_hbox.h"
++#include "wnd_label.h"
++#include "util.h"
+
+ /* Create a new combo box */
+ combo_t *combo_new( wnd_t *parent, char *id, char *text, char letter,
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_filebox.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_filebox.c
+@@ -24,7 +24,6 @@
+ #include <fnmatch.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#define __USE_GNU
+ #include <string.h>
+ #include <unistd.h>
+ #include "types.h"
+@@ -33,6 +32,8 @@
+ #include "wnd_editbox.h"
+ #include "wnd_filebox.h"
+ #include "wnd_hbox.h"
++#include "wnd_label.h"
++#include "util.h"
+
+ /* Create a new file box */
+ filebox_t *filebox_new( wnd_t *parent, char *id, char *text, char letter,
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_mouse.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_mouse.c
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include "wnd.h"
++#include "util.h"
+
+ /* Initialize mouse */
+ wnd_mouse_data_t *wnd_mouse_init( wnd_global_data_t *global )
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_print.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_print.c
+@@ -32,6 +32,7 @@
+ #include "types.h"
+ #include "wnd.h"
+ #include "wnd_print.h"
++#include "util.h"
+
+ /* Move cursor to a specified position */
+ void wnd_move( wnd_t *wnd, wnd_move_style_t style, int x, int y )
+--- mpfc-1.3.8.1/libmpfcwnd/wnd_repval.c
++++ mpfc-1.3.8.1/libmpfcwnd/wnd_repval.c
+@@ -25,6 +25,7 @@
+ #include "wnd_dialog.h"
+ #include "wnd_editbox.h"
+ #include "wnd_repval.h"
++#include "wnd_label.h"
+
+ /* Create a repeat value dialog */
+ dialog_t *wnd_repval_new( wnd_t *parent, void *on_ok, int dig )
+--- mpfc-1.3.8.1/src/browser.c
++++ mpfc-1.3.8.1/src/browser.c
+@@ -24,6 +24,7 @@
+ #include <glob.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <fnmatch.h>
+ #include "types.h"
+ #include "browser.h"
+ #include "help_screen.h"
+--- mpfc-1.3.8.1/src/info_rw_thread.c
++++ mpfc-1.3.8.1/src/info_rw_thread.c
+@@ -27,6 +27,7 @@
+ #include "info_rw_thread.h"
+ #include "player.h"
+ #include "song.h"
++#include "util.h"
+
+ /* Thread queue */
+ irw_queue_t *irw_head, *irw_tail;
+--- mpfc-1.3.8.1/src/player.c
++++ mpfc-1.3.8.1/src/player.c
+@@ -35,6 +35,7 @@
+ #include "command.h"
+ #include "eqwnd.h"
+ #include "file.h"
++#include "genp.h"
+ #include "help_screen.h"
+ #include "logger.h"
+ #include "logger_view.h"
+@@ -57,8 +58,13 @@
+ #include "wnd_listbox.h"
+ #include "wnd_multiview_dialog.h"
+ #include "wnd_radio.h"
++#include "wnd_repval.h"
+ #include "wnd_root.h"
+ #include "xconvert.h"
++#include "info_rw_thread.h"
++
++void pmng_hook( pmng_t *pmng, char *hook );
++void outp_set_mixer_type( out_plugin_t *p, plugin_mixer_type_t type );
+
+ /*****
+ *
+--- mpfc-1.3.8.1/src/plist.c
++++ mpfc-1.3.8.1/src/plist.c
+@@ -36,6 +36,7 @@
+ #include "util.h"
+ #include "undo.h"
+ #include "wnd.h"
++#include "info_rw_thread.h"
+
+ extern void pmng_hook( pmng_t *pmng, char *hook );
+
+--- mpfc-1.3.8.1/src/util.h
++++ mpfc-1.3.8.1/src/util.h
+@@ -26,6 +26,8 @@
+ #include <stdio.h>
+ #include "types.h"
+
++int mbslen( char *str );
++
+ /* Write message to log file */
+ void util_log( char *format, ... );
+
+--- mpfc-1.3.8.1/src/vfs.h
++++ mpfc-1.3.8.1/src/vfs.h
+@@ -36,6 +36,7 @@
+ } vfs_t;
+
+ /* Check that input plugin uses VFS */
++dword inp_get_flags( in_plugin_t *p );
+ #define VFS_INP_HAS(inp) (inp_get_flags(inp) & INP_VFS)
+
+ /* Get logger object */
diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
new file mode 100644
index 00000000000..e92361e1fbd
--- /dev/null
+++ b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="Music Player For Console"
+HOMEPAGE="http://mpfc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa cdda flac gpm mad nls oss static-libs vorbis wav"
+
+RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 )
+ flac? ( media-libs/flac )
+ gpm? ( >=sys-libs/gpm-1.19.3 )
+ mad? ( media-libs/libmad )
+ vorbis? ( media-libs/libvorbis )
+ sys-libs/ncurses:0=[unicode]
+ dev-libs/icu:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-underlinking.patch"
+ "${FILESDIR}/${P}-qa-implicit-declarations.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable alsa) \
+ $(use_enable cdda audiocd) \
+ $(use_enable flac) \
+ $(use_enable gpm) \
+ $(use_enable mad mp3) \
+ $(use_enable nls) \
+ $(use_enable oss) \
+ $(use_enable static-libs static) \
+ $(use_enable vorbis ogg) \
+ $(use_enable wav)
+}
+
+src_install() {
+ default
+
+ insinto /etc
+ doins mpfcrc
+
+ prune_libtool_files --all
+}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.ebuild
index af7ef85a61e..7a0d40c040e 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86"
IUSE="clock curl outputs taglib unicode visualizer"
RDEPEND="
diff --git a/media-sound/protux/protux-0.50.100.ebuild b/media-sound/protux/protux-0.50.100.ebuild
index 5534c62283a..d9bb7f50654 100644
--- a/media-sound/protux/protux-0.50.100.ebuild
+++ b/media-sound/protux/protux-0.50.100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.sourceforge.net/releases/${P}.tar.gz"
IUSE="source"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 x86"
DEPEND=">=virtual/jdk-1.5
source? ( app-arch/zip )"
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 593a16fe27f..e6555178e12 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,5 +1,5 @@
DIST qmmp-0.9.2.tar.bz2 1112974 SHA256 90ac69a21779df5073efe71b25f28a7461d6a928deb1afbaa1ef8268f62ae9c5 SHA512 fc6cb0ec4bbf52e2ceb9e87a3585f25bd58b3a323ef07ddb9fd9f21a065ef0f5deb0b014f29b9648fe9e0a8b412f3b04643f8128638558089a25d867577690ad WHIRLPOOL 47a596b0f7d9e516737bfeb10a962f79edb74f61e2985b01f2cee80c8ff252a1709459f5712700784faef824e24ff3567d73f0d5759e2cd2c0c53c267cc6a026
-DIST qmmp-0.9.3.tar.bz2 1113475 SHA256 5d8901d14066efaada789589aa64e28be0514c3226798d68a0b67750fea4c735 SHA512 8f023acd3906c382d9af78785944744449b3ff2155b8d697f2dc0074275d390a34eb1211b4f06f399fd391ed8891731e9db0f281c301037a561dd5021540f541 WHIRLPOOL 33eb797ddabb23f2033241df5b632c0f8c22773cc048d871a77b047784512fd5a34e8f831ebcad331f4c222f506ce5a5e1f49596ac74618398271b7b79c8833d
DIST qmmp-0.9.5.tar.bz2 1121832 SHA256 628a017b2327437ff77ccf5b77b4756bd1e73186f030f4bb34b93c1135ea353e SHA512 21963852a10da4af88b7ab4050c86824e0f8d0f49ea5650f49b5794e6b34690b28724b292d8fb0828da44673201658d2441c8bd306bbdadf40cfa07076403d00 WHIRLPOOL 83dc441c089162dd9458b9dc5541ed47f76eafc7f3635d52a555c9624ef585e3570199cab30c81ab59fafd66c3048a3bb7f044a21061b2168e4f3d1a8e497c7b
-DIST qmmp-1.0.2.tar.bz2 1095127 SHA256 5c3e72f0effa2f2a5c7b41507d751599bf01d80316da6eaef7f2f20b91be8221 SHA512 44a485ac670943a1bfc89cc9d7e483c64e42e78a5e405bce26a0665b68080f4fede8224c5527b1679e5316bf77bf4eb6636b97fb59207ad7a50f0f903a5d0a27 WHIRLPOOL addbe0978926c19c8699238e940bad786f990b2985b53f3e8ac70310a664894631e84fae0d0facf80458ce3d6285a0c8851826d639dafa4b78550759dc849d57
+DIST qmmp-0.9.6.tar.bz2 1124762 SHA256 8d0ab2a8d3de49e34e8f7208ab3832aeea23a36307b271262ee1c0d637dec50b SHA512 92c240b163def08c9d68276384e34f916edfd7a9d0d2bdf0478f76c2da524119cfd20c5379329c75395f9930586b05f3c381f93328f6c50a4ea43ce106928578 WHIRLPOOL fb8db9d684e7a93923b34a8e6f2b34e4ad0716fe4b23d821440da80a5dfa06845be0808d61e541dc92751ebe58a631456369ff60db5f7e77fa9fe668521204b5
DIST qmmp-1.0.4.tar.bz2 1102390 SHA256 9867fcb7ad7389f1c01d3bf31829fbe40a89eb8b05c104225257cea98c49ea85 SHA512 068e6de33af6675f326c90d3262bb350b0e513eb52f9ca1cdd680bf4562cc866516a34aa326ec3ad3a439c15727d902de7d80f7ba3d65e5a53f6b35be6dbadf2 WHIRLPOOL e2d7671fd27bd8adf447c972c467adc16adf5e91f71ad82e3d80fad15c7093a0c087bbf3644a6185f4b5dcbf296f928c94e1c5f089cd650eaf90f04258db1a23
+DIST qmmp-1.0.5.tar.bz2 1105704 SHA256 64952bfbe8b4bc6b74e04c4384fb923d0495f8380773ad7170b5a87fd2661ce1 SHA512 b4546457d3a4127a1911572233c367255fbbc6c08470bfb38b821062e516890186b6bd31960796bcb540b9c08610c9b9fcd193362d465dee9f722d431f70e699 WHIRLPOOL 28039c4b3cb16b3a7139534f37773081f96499eeb9b9f44b5f95bc010d290718d9f0a5cc7eb5b32565d16f7736e484053b4bd0ecb9d8eeeeb9734aeae8efea49
diff --git a/media-sound/qmmp/qmmp-0.9.3.ebuild b/media-sound/qmmp/qmmp-0.9.6.ebuild
index 5f82a4d0c16..d90953185b4 100644
--- a/media-sound/qmmp/qmmp-0.9.3.ebuild
+++ b/media-sound/qmmp/qmmp-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/media-sound/qmmp/qmmp-1.0.2.ebuild b/media-sound/qmmp/qmmp-1.0.5.ebuild
index 4cba7f4c13a..9eb2da36a38 100644
--- a/media-sound/qmmp/qmmp-1.0.2.ebuild
+++ b/media-sound/qmmp/qmmp-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/media-sound/quodlibet/quodlibet-3.5.1.ebuild b/media-sound/quodlibet/quodlibet-3.5.1.ebuild
index cc3bacb90eb..2f90e18d2b9 100644
--- a/media-sound/quodlibet/quodlibet-3.5.1.ebuild
+++ b/media-sound/quodlibet/quodlibet-3.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 ~x86"
IUSE="+dbus gstreamer ipod +udev"
RDEPEND="dev-libs/keybinder:3[introspection]
diff --git a/media-sound/spotify/spotify-1.0.19.106-r1.ebuild b/media-sound/spotify/spotify-1.0.19.106-r1.ebuild
index 3c84fac8aef..ddf9290d680 100644
--- a/media-sound/spotify/spotify-1.0.19.106-r1.ebuild
+++ b/media-sound/spotify/spotify-1.0.19.106-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
x86? ( ${SRC_BASE}${MY_P}_i386.deb )"
LICENSE="Spotify"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="gnome pax_kernel pulseaudio"
RESTRICT="mirror strip"
diff --git a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.18.2.ebuild b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.18.2.ebuild
index 338a48b2bb8..695ae7760d1 100644
--- a/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.18.2.ebuild
+++ b/media-sound/teamspeak-client-bin/teamspeak-client-bin-3.0.18.2.ebuild
@@ -21,11 +21,11 @@ REQUIRED_USE="|| ( alsa pulseaudio )"
RDEPEND="
dev-libs/quazip:0/0[qt5]
- >=dev-qt/qtcore-5.5
- >=dev-qt/qtgui-5.5[accessibility]
- >=dev-qt/qtnetwork-5.5
- >=dev-qt/qtsql-5.5[sqlite]
- >=dev-qt/qtwidgets-5.5
+ >=dev-qt/qtcore-5.5:5
+ >=dev-qt/qtgui-5.5:5[accessibility]
+ >=dev-qt/qtnetwork-5.5:5
+ >=dev-qt/qtsql-5.5:5[sqlite]
+ >=dev-qt/qtwidgets-5.5:5
sys-libs/glibc
sys-libs/zlib
alsa? ( media-libs/alsa-lib )
diff --git a/media-sound/toolame/files/toolame-02l-gentoo.diff b/media-sound/toolame/files/toolame-02l-gentoo.diff
index 1b011600e7e..f96020f0a81 100644
--- a/media-sound/toolame/files/toolame-02l-gentoo.diff
+++ b/media-sound/toolame/files/toolame-02l-gentoo.diff
@@ -1,5 +1,5 @@
---- Makefile 2003-03-02 08:07:02.000000000 +0100
-+++ Makefile.new 2003-04-14 14:00:10.000000000 +0200
+--- toolame-02l/Makefile 2003-03-02 08:07:02.000000000 +0100
++++ toolame-02l/Makefile.new 2003-04-14 14:00:10.000000000 +0200
@@ -1,6 +1,3 @@
-
-CC = gcc
diff --git a/media-sound/toolame/toolame-02l-r4.ebuild b/media-sound/toolame/toolame-02l-r4.ebuild
new file mode 100644
index 00000000000..19717aba0a5
--- /dev/null
+++ b/media-sound/toolame/toolame-02l-r4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="tooLAME - an optimized mpeg 1/2 layer 2 audio encoder"
+HOMEPAGE="http://www.planckenergy.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}/${P}-gentoo.diff"
+ "${FILESDIR}/${P}-uint.patch"
+ "${FILESDIR}/${P}-uint32_t.patch"
+)
+
+src_prepare() {
+ # fix #571774 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+
+ append-lfs-flags
+ tc-export CC
+
+ default
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc README HISTORY FUTURE html/* text/*
+}