gentoo resync : 01.01.2018

13 files changed, 297 insertions, 143 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index d1aeb3f34f42..d9fdb0ace216 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index d1e6df3de4ae..4c80ca41d247 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,3 +1,4 @@
 DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
+EBUILD alsaplayer-0.99.81-r1.ebuild 1923 BLAKE2B 64767934a9aa1e2665db11e0b69ce5beef39ea219be0e005bf69d0e74874e17bc46ad11e085c7815bd11cb1ad313551d0c34c2abb0234653b97425837e555b03 SHA512 216d303c6048621be9e3b10b866086c2d8e48a8a25aaa75acb00ea58d6804fbf0d35ebfa4a0851e9e42dbfaf33a2ce8b77970ff68a64a9e9111fc9a5f5737c97
 EBUILD alsaplayer-0.99.81.ebuild 1953 BLAKE2B 9b474fb6a2b00fa7510d105f3c7d42d807e34ce5f547795607dedd2b0a35d345c11ef9431a280bf5713d475b0b3950cd50327d4283a78ceb6e4a7580707772c0 SHA512 2916eb5516a8caa4bc173a0c579b76824f3b3625303f56ef3ce507f46a4e19ed5a1abf74b1851b57b1d8c1cc729ce0c4f00488aee03410fa12e9367cbbf98994
 MISC metadata.xml 337 BLAKE2B 1f60abc42f95db4e9876c4894ddc16175f17d35b53c7d9fcd425e0124d3fdf08978b349cf2364cfc32555408d1e5ec011fc6367ac9d3e4b7260cf0d2d665522e SHA512 eb9f49ef0aaa5f6ec8c8a29f0459cde3fbbcce419217ae9c22ed6f50dea1893e02037b556daa4276de62aa18fd3193d8c213c6b819d701689fea845d64f97f61
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
new file mode 100644
index 000000000000..f1d448e8b1da
--- /dev/null
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools desktop
+
+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? ( virtual/jack )
+	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() {
+	default
+
+	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() {
+	export ac_cv_prog_HAVE_DOXYGEN=$(usex doc true false)
+	export ac_cv_lib_xosd_xosd_create=$(usex xosd)
+
+	econf \
+		--disable-esd \
+		$(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) \
+		$(use_enable oss) \
+		$(use_enable gtk gtk2) \
+		$(use_enable nas)
+}
+
+src_install() {
+	default
+	dodoc docs/*.txt
+
+	newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index a69aadb8db70..d2a097bd1367 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,6 +1,8 @@
 AUX hydrogen-0.9.5-gcc47.patch 761 BLAKE2B 4dcf893c24a6cd8f3669af7f1b5517488adfd6aaf5018959732225f46ce0013faea98554a2e370c0d724100f64cd92308e00bf619271e9de4125dc7b7971f1fe SHA512 ff3a06fbafdce19bf04f9fb71c04ff754e22caa36148a0f5e4a56efc53ce9b9478e9f1aeacdcc037234104762d9fce208aef351c70941b044e2d83bac4131304
 AUX hydrogen-0.9.5-gcc6.patch 609 BLAKE2B f34496e0c3c251f135262ff30efaff243ae4fc0a279ad529f0bceb1e6b854b6b8b513a2f2b1c6e15ce1f68d51032817147ae7a357205345bf64876b5f2c7096b SHA512 0078c02e9cb2de557825cd6119ccfb6247f171ccc4a53ea93241891850c82f0924e9e0a4740764d13f1deefcb5e9469137e5d4a69c2bfceedeae8fb110deea8f
 AUX hydrogen-0.9.5-use_lrdf_pkgconfig.patch 858 BLAKE2B c43e9a0de36e1eee2c184b6405b3a01284dea8f058ba77aa415e85ee5e4e2bc27b975ee5a1d959471c64154f9be6cc0fe51e66db31abd7149e0350f91e8a9735 SHA512 251a74287370f66df9eeecd3b6c7963c2614cf6b17a56fc71dc9f99077c3267a2e79469e2993ae22d017ea7f6cc7c581455c97c125e3be73860321112a67fd31
+AUX hydrogen-gnuinstalldirs.patch 4979 BLAKE2B 02b3894ec8d6893c061a1a7767e44b6d5d0df3fa29fceb731e56dd83be74784195d0da13447c82326638ce7091c26c846d42c70ca6d66ef1a64310de8eab73a3 SHA512 23838dbab56d29f53ff78055f371ce11a57f7cf738c76ce22b684b1de72cefe71767a1237246c24b90034e72a72a16d4999365959563a71906e34b7da6abb3c1
 DIST hydrogen-0.9.5.tar.gz 5239702 BLAKE2B 5fb1e7561b65587a6a4b8e642a4e0262cf8521a6847f04e57d4f99af2ef38fecb05f779cd5b0c25d487360db6455b0912729e7deac0d9959e8c32938a44b1adb SHA512 0053f0cb301c541326b66eb416dc548561a973ade993c055e7bc2acbdf28732e627a605061c8b487644026510f5b8395946bba209ddfd19230c960e9bb619f97
 EBUILD hydrogen-0.9.5-r1.ebuild 1816 BLAKE2B b66901bef46726ad957b37074ec247d7c9d502f324c8a0a2da2bca3af036a204b6f63fb0047672ef6fa38194c263c210efae02ae33d8eb56a4169bbf4a8529cf SHA512 0bd6ded8debf0915399c1dcc56537730d3c8a8b219262223d567f2240f3019de5675196102da55840c039ab30814ef27ec1f7b1c4313e537e07970e353956b86
-MISC metadata.xml 429 BLAKE2B 6d7efaf4823ada77016a5a8b28e27ddbe9c0a3732a3874a85dd6ba82180e2504fd24ce325e3c9b50d6824039c391188e28b9b1f8033537977bdef1f84cdf7041 SHA512 a57c6e234c6e735bc5eb4fbe19218773a0ffe3d741eafdbbc87394552173bb512c0164e23e7c919f4927a82b549b5f60bcbb55cb2396dc77f795c028e9fd6777
+EBUILD hydrogen-9999.ebuild 1831 BLAKE2B b05a1bb7a184ccf69846132a79a82c4677b77ac8e6b51bb8114734bc1ac47e19c7d4a9deb3b3ca14237f17d360a702253b8318ffe4bda7d1811ac572b79b9c63 SHA512 26532173d65743e0b102e2169a32bc1e39464e51bcdc4185080be069e49b66a5eb224a31510e79e4f118e09e617754e26d2da85123d1a79967888bae113bc9ca
+MISC metadata.xml 477 BLAKE2B 16ddf823d0ac8b091a760f0dfba28581991184f7b507ca64123d85cee9c0a4a05958a28adfc53ddff671f4ac4576fcf3041236779d0ce5a54e42f9f1915940ca SHA512 de194a51ad2ef2cca91c59e2dcdfec0d0f26a206d46309f49df36c5499ca39a4458fc0f66bdbcba70be392aef96365bc2680b67595f46be40c0304f7a1fca70f
diff --git a/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
new file mode 100644
index 000000000000..d42b3971d45b
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-gnuinstalldirs.patch
@@ -0,0 +1,112 @@
+From 11c72da8b2bf96f650ca6e1e38af0819c4f49c45 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 1 Jan 2018 11:52:18 +0100
+Subject: [PATCH] Use GNUInstallDirs
+
+Fixes multiarch and deprecated man dir location.
+---
+ CMakeLists.txt            | 14 ++++++++------
+ src/cli/CMakeLists.txt    |  2 +-
+ src/core/CMakeLists.txt   |  6 +++---
+ src/gui/CMakeLists.txt    |  2 +-
+ src/player/CMakeLists.txt |  2 +-
+ 5 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 96dbf47a..2caab298 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,6 +30,8 @@ ELSE()
+ 	SET(DISPLAY_VERSION "${VERSION}-${GIT_REVISION}")
+ ENDIF(VERSION_SUFFIX)
+ 
++include(GNUInstallDirs)
++
+ SET(LIBSNDFILE_VERSION_PREV "1.0.17")
+ 
+ #
+@@ -146,13 +148,13 @@ ELSE(MINGW)
+ 		#Without setting this, installation would go into /usr/local, which does not exist per default
+ 		SET(CMAKE_INSTALL_PREFIX "/usr" )
+     ELSE(APPLE)
+-        SET(OSS_LIB_PATHS "/usr/lib${LIB_SUFFIX}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" )
++        SET(OSS_LIB_PATHS "${CMAKE_INSTALL_LIBDIR}/oss/lib" "/usr/local/lib${LIB_SUFFIX}/oss/lib" )
+     ENDIF(APPLE)
+ ENDIF(MINGW)
+ 
+ #Installation paths
+ # TODO remove data from path
+-SET(SYS_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/hydrogen/data")
++SET(SYS_DATA_PATH "${CMAKE_INSTALL_DATAROOTDIR}/hydrogen/data")
+ # TODO remove data from path, could be .config/hydrogen
+ SET(USR_DATA_PATH ".hydrogen/data")
+ 
+@@ -358,10 +360,10 @@ ELSE()
+ 	INSTALL(DIRECTORY data DESTINATION ${SYS_DATA_PATH}/.. PATTERN ".git" EXCLUDE)
+ ENDIF()
+ IF(NOT MINGW AND NOT APPLE)
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "/usr/share/pixmaps")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pixmaps")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
+ ENDIF()
+ 
+ #
+diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
+index f6cd04eb..7725dc83 100644
+--- a/src/cli/CMakeLists.txt
++++ b/src/cli/CMakeLists.txt
+@@ -20,4 +20,4 @@ TARGET_LINK_LIBRARIES(h2cli
+ 
+ ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION})
+ 
+-INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
++INSTALL(TARGETS h2cli RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index db1333da..0ab61d96 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -57,13 +57,13 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
+ #SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER   "${hydrogen_INCLUDES}" )
+ 
+ INSTALL(TARGETS hydrogen-core-${VERSION}
+-    LIBRARY DESTINATION "lib${LIB_SUFFIX}"
+-    ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
++    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+     # do not copy directory hierarchy
+     #PUBLIC_HEADER DESTINATION include/hydrogen
+ )
+ 
+ IF(NOT APPLE AND NOT WIN32)
+     INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
+-    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_PREFIX}/include/hydrogen" )
++    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
+ ENDIF()
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index fb375e48..9cd18e6a 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -57,4 +57,4 @@ TARGET_LINK_LIBRARIES(hydrogen
+ qt5_use_modules(hydrogen Widgets)
+ ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION})
+ 
+-INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
++INSTALL(TARGETS hydrogen RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
+diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
+index 72c270f3..836fc5b4 100644
+--- a/src/player/CMakeLists.txt
++++ b/src/player/CMakeLists.txt
+@@ -16,4 +16,4 @@ TARGET_LINK_LIBRARIES(h2player
+ 
+ ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION})
+ 
+-INSTALL(TARGETS h2player RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
++INSTALL(TARGETS h2player RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR})
+-- 
+2.15.1
+
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
new file mode 100644
index 000000000000..3d14fb4a6533
--- /dev/null
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils git-r3 xdg-utils
+
+DESCRIPTION="Advanced drum machine"
+HOMEPAGE="http://www.hydrogen-music.org/"
+EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
+
+LICENSE="GPL-2 ZLIB"
+SLOT="0"
+KEYWORDS=""
+IUSE="alsa +archive jack ladspa lash osc oss portaudio portmidi pulseaudio"
+
+REQUIRED_USE="lash? ( alsa )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/libsndfile-1.0.18
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	!archive? ( >=dev-libs/libtar-1.2.11-r3 )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lash? ( media-sound/lash )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
+
+PATCHES=( "${FILESDIR}/${PN}-gnuinstalldirs.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_CPPUNIT=OFF
+		-DWANT_DEBUG=OFF
+		-DWANT_JACK=$(usex jack)
+		-DWANT_JACKSESSION=$(usex jack)
+		-DWANT_LADSPA=$(usex ladspa)
+		-DWANT_LASH=$(usex lash)
+		-DWANT_LIBARCHIVE=$(usex archive)
+		-DWANT_LRDF=$(usex ladspa)
+		-DWANT_OSC=$(usex osc)
+		-DWANT_OSS=$(usex oss)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PORTMIDI=$(usex portmidi)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_RUBBERBAND=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dosym ../../${PN}/data/doc /usr/share/doc/${PF}/html
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/hydrogen/metadata.xml b/media-sound/hydrogen/metadata.xml
index 3881dc28c758..972362fefd42 100644
--- a/media-sound/hydrogen/metadata.xml
+++ b/media-sound/hydrogen/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <use>
-    <flag name="archive">Use libarchive instead of libtar</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">hydrogen</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="archive">Use libarchive instead of libtar</flag>
+		<flag name="portmidi">Add portmidi support</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">hydrogen-music/hydrogen</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 4b6404ff1032..a82146276baf 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,10 +1,6 @@
-DIST pulseeffects-3.1.2.tar.gz 604130 BLAKE2B 48f16a4d218a102e39a776f53986345c3026db3a9f2186ed4bc953cd7c77b7ab4a4f5771d043b9bd90ad4ae956c0bf3f074242ca9f8c1e05b44562fcec34227d SHA512 0b3782bcedbab07b38a8219f7376454874abaadc80f49f981ac20b7c6035bbfebc83b1e4b325098bd1a87a3685896ab82f998c226ae5ed7a9886999c82882cdf
-DIST pulseeffects-3.1.3.tar.gz 604488 BLAKE2B 05de82debe338002106372b57930f3ab354e018d381d2fa6cb46d8e4cfa50cf405b40dda9deed34c85e389873fc057a7c69f5f8cc0efeb7599c7d66d09b1cf8a SHA512 856568f6136bd250864ab5cbe966f1dded63dc09a2ee774e4421e966bd77d4db610402f5d6068564250667036c71933e3fe91398d903516c697912b00ce2d359
-DIST pulseeffects-3.1.4.tar.gz 605979 BLAKE2B d19c4af68b94b2c0616ff6eb4c24188f10bea737d218b1511c4f6ebd4851ef633a28676da23c0fe86c3836e90de79e992289bdaddf71f3c4bf6d59921c125b2e SHA512 fe7c34069531808b21bcc1ef59c4ce12048d60ae1a9f1db860d9406f6c520b1bbc0fb4edcaed360dd3086902ab863666455ff55cc843127d1fa1b6c75b47fb70
 DIST pulseeffects-3.1.5.tar.gz 612665 BLAKE2B 18fd3c8126f0ad53ac0a7c270b5cafa66c8df7a65c9ef99a84469a3a6b0f1c6875c11e163acf9ce8fec6465b561638ca3fce77000631c4c3c5f64f5cc6d9ffc8 SHA512 e24efa5a0313d25cdbd960c176efbe487cb6e6002d7f0887f92d8287fc70f02fa16456c709fbe4a99c3680b3bbe51758dfe05a7a412ce8d4c5cd2c976685cbb4
-EBUILD pulseeffects-3.1.2.ebuild 1399 BLAKE2B dfde05d414a4f6e2f7acadc51e8a32f674175790ad90b1bf6d9d85dbc0b17469457e03e4902635b457e8c1491f0b42a9aff31fac44efa317aed62221796e329e SHA512 f7b416e1d28389e6c9a3d2f009b3a39d94d46124c2b5ebb8369a9da345efe05ba9913167b3ca64f05c39e62547da358e99d867141d2921b3749f7880be904afa
-EBUILD pulseeffects-3.1.3.ebuild 1399 BLAKE2B dfde05d414a4f6e2f7acadc51e8a32f674175790ad90b1bf6d9d85dbc0b17469457e03e4902635b457e8c1491f0b42a9aff31fac44efa317aed62221796e329e SHA512 f7b416e1d28389e6c9a3d2f009b3a39d94d46124c2b5ebb8369a9da345efe05ba9913167b3ca64f05c39e62547da358e99d867141d2921b3749f7880be904afa
-EBUILD pulseeffects-3.1.4.ebuild 1489 BLAKE2B e2dbfba8c9a3649c53613eb1a959f9365f29aac5e58366f5dfe66a36cb9553a4b28605877d8d8d43ac4601ea1d3536119f2c147b1d6ead15a9083d61b9871db2 SHA512 eaa015266a0b4678e2893ba480f9ffee7f859545378875f144f341d733382f20f857acd7f6a26273b90b2ee53fe61828c4168a2cc6a32ed1b1717835496f8f97
+DIST pulseeffects-3.1.6.tar.gz 614441 BLAKE2B bb7461532785cd0ab79d0f506b5b9bcfc006779776e25870ce92b4af4e7cb0f7b3bcfe9c58180e52bdb9b9be20a14644ed8622fd3cc578dd3bdf9ff173c091b6 SHA512 efd9871c57f4b7152e4528927c7371e225980a09acacf4fcf939c468c7cb01b94b1bbb3c94cbd8879a6b41c7c4794ed5f45035a2b185b0a09b31515c964d4722
 EBUILD pulseeffects-3.1.5.ebuild 1489 BLAKE2B e2dbfba8c9a3649c53613eb1a959f9365f29aac5e58366f5dfe66a36cb9553a4b28605877d8d8d43ac4601ea1d3536119f2c147b1d6ead15a9083d61b9871db2 SHA512 eaa015266a0b4678e2893ba480f9ffee7f859545378875f144f341d733382f20f857acd7f6a26273b90b2ee53fe61828c4168a2cc6a32ed1b1717835496f8f97
+EBUILD pulseeffects-3.1.6.ebuild 1489 BLAKE2B d7e167c67de1d3064451adc47144f82de00715ec05b1795fcc0379c85ac4b1178482a393fc5e1fb8fa40e63d558b53a757e0c44826897772bb93f243242ae817 SHA512 3fca264bb9f36b2535d12cbc3db074909a792a23385d0cdca3b4695c9ee03fa24f049162005fbcfe22bb9e76ea622795959d17e23d766015d754c365b1d13af5
 EBUILD pulseeffects-9999.ebuild 1489 BLAKE2B e2dbfba8c9a3649c53613eb1a959f9365f29aac5e58366f5dfe66a36cb9553a4b28605877d8d8d43ac4601ea1d3536119f2c147b1d6ead15a9083d61b9871db2 SHA512 eaa015266a0b4678e2893ba480f9ffee7f859545378875f144f341d733382f20f857acd7f6a26273b90b2ee53fe61828c4168a2cc6a32ed1b1717835496f8f97
 MISC metadata.xml 607 BLAKE2B b9f1bd8b2afd83f2e07b1d5a3c1a82fd1ff7de67182316d868890375b1144edf292181c702fa274da87bd0cc43a5e967ed6f379d0e85764a31834a4ddb3c8c8e SHA512 fa5780c3149aad1d3c5edf76356d521942a85271576f868598c54a7010cf3d31366ad08aa80402479addf8f69111973e7e814abc2df17ea7d0273a5e2a749ac2
diff --git a/media-sound/pulseeffects/pulseeffects-3.1.2.ebuild b/media-sound/pulseeffects/pulseeffects-3.1.2.ebuild
deleted file mode 100644
index f07913972f3c..000000000000
--- a/media-sound/pulseeffects/pulseeffects-3.1.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome2-utils meson python-r1
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
-	KEYWORDS=""
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	python_targets_python3_4? ( dev-python/configparser )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
-	media-plugins/swh-plugins
-	>=x11-libs/gtk+-3.18:3
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
-	media-libs/lilv
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-"
-RDEPEND="${DEPEND}
-	media-sound/pulseaudio[equalizer]
-"
-
-pkg_preinst(){
-	gnome2_schemas_savelist
-}
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-3.1.3.ebuild b/media-sound/pulseeffects/pulseeffects-3.1.3.ebuild
deleted file mode 100644
index f07913972f3c..000000000000
--- a/media-sound/pulseeffects/pulseeffects-3.1.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome2-utils meson python-r1
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
-	KEYWORDS=""
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	python_targets_python3_4? ( dev-python/configparser )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
-	media-plugins/swh-plugins
-	>=x11-libs/gtk+-3.18:3
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
-	media-libs/lilv
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-"
-RDEPEND="${DEPEND}
-	media-sound/pulseaudio[equalizer]
-"
-
-pkg_preinst(){
-	gnome2_schemas_savelist
-}
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-3.1.4.ebuild b/media-sound/pulseeffects/pulseeffects-3.1.6.ebuild
index a339c9081fb9..ca19673c0603 100644
--- a/media-sound/pulseeffects/pulseeffects-3.1.4.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-3.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index ae89e7b033ed..da8824d683ff 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -12,5 +12,5 @@ AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6d
 AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cacc7a89027ec1ce6a555ea01570328d75425b006752d6332cf278642ec9a7c27b9c9adb2cb7621e241e SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.14.0.tar.xz 1356476 BLAKE2B 8d4a360d1c16b250f3bef7c010e1e263fdda13446437ff2454dc2c2a717246c4d27836a3b40586b12b33e175bc54ee211a3a1798005733461cf5833eda11811a SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3
-EBUILD timidity++-2.14.0-r2.ebuild 5145 BLAKE2B 05022218b647af0e16d0491a12b4979f0b4124b767debba71f0f7eb7dbe2ff1b2ac38f52dbdf1b7aeb77e8d719e8aeeabc9ec19784b6a008b60bff0b4d08623d SHA512 2e1d66fb2550d4b86faedf802abd8eda33e32a60da473d5448acc36d8e08e50d507d68aceee8690fa8aed090fff60da50ae3ed6a92c5f608be7228877596ba0f
+EBUILD timidity++-2.14.0-r2.ebuild 5120 BLAKE2B ea61c55377c185c5b8f5ef21f65805903ab81a816932fe356d438bc91e06768ba93a2e0742079322aaef32870350999f1a8dac5898626e07b3c09cc00c4fdfd3 SHA512 331162f1be948e0ad0f8c3d05ace64d654991225cbb654957519b932ed4687a79234381bcdcf6ecd0cad9add9c3575b3d019d10f8725e76ffee8c2992a7ecf16
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/timidity++-2.14.0-r2.ebuild b/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
index fe45d20fa484..355ec9f0d006 100644
--- a/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
+++ b/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,7 +24,7 @@ DEPEND="ncurses? ( >=sys-libs/ncurses-5 )
 	nas? ( >=media-libs/nas-1.4 )
 	alsa? ( media-libs/alsa-lib )
 	slang? ( sys-libs/slang )
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( virtual/jack )
 	vorbis? ( media-libs/libvorbis )
 	flac? ( media-libs/flac )
 	speex? ( media-libs/speex )