gentoo resync : 21.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-21 20:47:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-21 20:47:17 +0000
commit: 4ab6db5717ef23f29320d4c6fb9ebdb8dec1f193 (patch)
tree: f7640b8b96a04499f1ce44a2cad122d45a8373bd /media-sound
parent: 48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 (diff)
34 files changed, 332 insertions, 1473 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index d2772621fd56..f1c0df419949 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index af688e8b48b4..80a4c1d05a83 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,3 +1,3 @@
-DIST frescobaldi-2.20.0.tar.gz 4478977 BLAKE2B bac6e455656064fc64120a4e30690b55159254562f1b4fb6515fccb74cc113354ac337c68fe91942c42b4aeff14db18f5024dd6b47fb913dafe7bcf95efaf019 SHA512 a875e8d574e77db5e87555aa091b4b0966e4b8df16dc1f7fbcfe100f67d9ccafdd9a26c8f4b8cea13410faaa298185c1ec0e9b5e722b3d37c32d0b573511a3e3
-EBUILD frescobaldi-2.20.0.ebuild 855 BLAKE2B 2157ee4fd660676ee6bbdda7316693318fecb0c662f8d92b71dc5260cdc1a11074ea22dd57060c19f40c46cd2fa20235119e393231b8834990f3ef6511258ac5 SHA512 bc829bdbb726b0f1e2c5c35342e830f81e23867191cc37ed43ef06228d1a4f0a25043561af6ecd978a4e5b97c3bfc88e5bacb25de84a66f2154ce1a4ad05cf5d
-MISC metadata.xml 442 BLAKE2B 71b3500edaf46be59e6f9125c45a8aa9e30a5fd3187b0b58e834991b473650600aa9a53a30abac3b423f32aa37a9df4032c37a6b50888a0fae44fb0dead4b5c0 SHA512 cf86623fdde3cd003175081ac264d109511036d6c0e09a80e7f88dde98ed52568a8412f4b32dadb75c6986dd1d59e7e83c95546aefb17ffc9e349386a94e54ef
+DIST frescobaldi-3.0.0.tar.gz 4895317 BLAKE2B 6a9a2b92d075742f54b3148761f1946c4dd73616482aec9278c0326d5597773ce6eb714f8d31d49f79051294d23d4e43552ce29bde0f464d1a677900b8a276f6 SHA512 e33cbcb70bec74239cd84691725e9978b6c6fee391848c7de8ea32dd5459d953ddda120eeea25a602154d94a84947b6c151237b859450162db0822ef58fd7787
+EBUILD frescobaldi-3.0.0.ebuild 1001 BLAKE2B 58a4456955b5ac9a5e5809f03e2733812ed2d73732b3b9fb184a875b60ed66931a64778cc67571bc5bf2a1e6007f3a5926231c281ff501bd14d80325c5949f04 SHA512 4ee2b26a52f464e1c9e564004b149dbf1de0b5aa9274bd3ca7fa8bcc526afb90be891ad0875b82a6ceede42c86fed0f81712eded7414a8731b471153684a620c
+MISC metadata.xml 437 BLAKE2B 5df0dcf6f211964427c34070f126b8a7b65f4341d5ca0edc899e413d112eb3920197086981537847506148b11b58cfcba80213839e5171baf8c16f05781765f6 SHA512 fee7fc00ca40615d9470bcf15ac3df4541864f825f55021c4b8d59891ea1fbec88f4e5133cceef05791cee1d95be320c7405cdfa67446863bdd2b23e86ca2940
diff --git a/media-sound/frescobaldi/frescobaldi-2.20.0.ebuild b/media-sound/frescobaldi/frescobaldi-2.20.0.ebuild
deleted file mode 100644
index 4b205dbb61d3..000000000000
--- a/media-sound/frescobaldi/frescobaldi-2.20.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="http://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portmidi"
-
-RDEPEND="
-	dev-python/PyQt4[svg,X,${PYTHON_USEDEP}]
-	dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
-	>=dev-python/python-ly-0.9.4[${PYTHON_USEDEP}]
-	>=media-sound/lilypond-2.14.2
-	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild b/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
new file mode 100644
index 000000000000..d6cb86b3d468
--- /dev/null
+++ b/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
@@ -0,0 +1,41 @@
+# 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 distutils-r1 gnome2-utils xdg-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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# 	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] ) # bug 550820
+DEPEND="
+	dev-python/PyQt5[svg,${PYTHON_USEDEP}]
+	>=dev-python/python-ly-0.9.4[${PYTHON_USEDEP}]
+	dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
+	>=media-sound/lilypond-2.14.2"
+RDEPEND="${DEPEND}
+	x11-themes/tango-icon-theme
+"
+
+python_prepare_all() {
+	rm -r frescobaldi_app/icons/Tango || die "failed to remove tango icon theme"
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/frescobaldi/metadata.xml b/media-sound/frescobaldi/metadata.xml
index bb0cc4ccb3ce..468c931f9c42 100644
--- a/media-sound/frescobaldi/metadata.xml
+++ b/media-sound/frescobaldi/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <use>
-    <flag name="portmidi">Enable <pkg>media-libs/portmidi</pkg> support</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">wbsoft/frescobaldi</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+<!--
+	<use>
+		<flag name="portmidi">Enable <pkg>media-libs/portmidi</pkg> support</flag>
+	</use>
+-->
+	<upstream>
+		<remote-id type="github">wbsoft/frescobaldi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 78aace983dad..3b5c34741209 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,6 +1,8 @@
 AUX jack2-1.9.11_rc1-gcc7.patch 889 BLAKE2B e5c31c6688dbcd2cbba44993cff03e612b364a88cac146415471564f983ba07e7d822f2baf38ee0be4eabaf6369fc1f4f3640ea1a5eab51192a782b44b6dec1f SHA512 7cae070880af90bd7ee68dbfae0ea4421a5cb2cfaaf7b1228a4668767e541b263b965bed4b572053678c7dd81f380e6759a46cd97a0a5cfc95921286739e1791
 DIST jack2-1.9.11-RC1.tar.gz 6481650 BLAKE2B b9497efdb72f2e3894a062a3ffdffc3ebf67f5ea7372d993c13581202202e0f0ba7b21563768a984201d8e5eb2854add67fb5c377e2b4ddb23806a38ddddb0f9 SHA512 4fd7d82ab6536b8c6061023858ae5b978903608b149498818971481da75c6e9e0e7e7aef5e1343730c259f4378aebfbf25916b9736e0ad8aa19584a44f894436
+DIST jack2-1.9.12.tar.gz 6487135 BLAKE2B 9140b3892d2321576a7329fbef2f23e340be4b9be967ec173edbbc7a43952c9a3712ead05dbe57f958b88c1e29c8a912a937c0bd34e0122ecc600ac9d48f147d SHA512 f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa
 EBUILD jack2-1.9.11_rc1-r1.ebuild 2298 BLAKE2B 917029b1de9c87f141e7828f7cbd7d508d2015197f88f4dd8fa1201c9b75f861cc709425eead75132f81f147b4e8e8254f4d6eef1e65fb40bc626a8ae278591b SHA512 dfe3a1abb3e5807949ba53911def098695b3e3d497ad6ce915c41b698b335826f8cdf656897e0b16152ddd42bc3502d75f23363441d3e0328759168ce89f77f4
 EBUILD jack2-1.9.11_rc1.ebuild 2231 BLAKE2B f5960181f2eb1bea4f56dc01ed8314490869d4ba549f79dcf9edc31f10b7495b6cf878a1470311e7ba0c833518c8847066a6af9aba80d9a7656a3c64d4632267 SHA512 a7a7af2ca48fe233acd04ac8933910de0e4a6d37e24d411ea0e02d5898f9333dcc9af0ef36893cfd8d2c2332ab86285bbd83e8085afa8a0719fda2dd20fefe6f
-EBUILD jack2-9999.ebuild 2254 BLAKE2B 6ec064096706b262db4719ca5c68fa8a0a34c541600046dc4ed57c9f3aa058ca333110ebfdde7867d47541ebd80e21b195571a7ee34627f16175468eeca6e098 SHA512 ef3dffd92f1778e3649840268c9a96b10f3512eecd00416da00228c678b25b8e8600416e00afc7a5a8c8448b1d29c1651ba60aedf68660449d2cff8a0a5767b1
+EBUILD jack2-1.9.12.ebuild 2248 BLAKE2B 11df609c926f433493d6e68b799d12a19ab225e5e7152998a1cae4cd2aab88e91f7f602a27d65cdba3a9a34e3f299f77b226a31e6845c2003e3c82e61becd750 SHA512 cc0daf80bbe50f81e931b4572e219d97b7166fa7ffdd5cf12eda5f1925e4554a750a8fa4cf1c6ead747e5a52eb0c510aeca90c6234af4c5fed75e1952606c792
+EBUILD jack2-9999.ebuild 2248 BLAKE2B 11df609c926f433493d6e68b799d12a19ab225e5e7152998a1cae4cd2aab88e91f7f602a27d65cdba3a9a34e3f299f77b226a31e6845c2003e3c82e61becd750 SHA512 cc0daf80bbe50f81e931b4572e219d97b7166fa7ffdd5cf12eda5f1925e4554a750a8fa4cf1c6ead747e5a52eb0c510aeca90c6234af4c5fed75e1952606c792
 MISC metadata.xml 679 BLAKE2B 9808048dac5d2d936aa7f6a05f66b0a98a428aa81275b5528684ba2312c49a1212ee38afac0d466e5ed87b91c253f8b973670928dd21b13470208bc84a2ff48f SHA512 8c6fc8ce9dc151cdc8adc2092a661a76ef0fd12fc8f2c922be3e7a75215e40ed5b352f8099906ae6a883fd3a3edb674d0a6784831d2cd9b881b474cf6c419152
diff --git a/media-sound/jack2/jack2-1.9.12.ebuild b/media-sound/jack2/jack2-1.9.12.ebuild
new file mode 100644
index 000000000000..5295a98e976e
--- /dev/null
+++ b/media-sound/jack2/jack2-1.9.12.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+inherit python-single-r1 waf-utils multilib-minimal
+
+DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
+HOMEPAGE="http://jackaudio.org/"
+
+if [[ "${PV}" = "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
+	KEYWORDS=""
+else
+	MY_PV="${PV/_rc/-RC}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="alsa celt dbus doc opus pam +classic sndfile libsamplerate readline"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( classic dbus )"
+
+CDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	sys-libs/readline:0=
+	${PYTHON_DEPS}
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
+	dbus? (
+		dev-libs/expat[${MULTILIB_USEDEP}]
+		sys-apps/dbus[${MULTILIB_USEDEP}]
+	)
+	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+	pam? ( sys-auth/realtime-base )
+	!media-sound/jack-audio-connection-kit:0"
+
+DOCS=( ChangeLog README README_NETJACK2 TODO )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local mywafconfargs=(
+		--htmldir=/usr/share/doc/${PF}/html
+		$(usex dbus --dbus "")
+		$(usex classic --classic "")
+		--alsa=$(usex alsa yes no)
+		--celt=$(usex celt yes no)
+		--doxygen=$(multilib_native_usex doc yes no)
+		--firewire=no
+		--freebob=no
+		--iio=no
+		--opus=$(usex opus yes no)
+		--portaudio=no
+		--readline=$(multilib_native_usex readline yes no)
+		--samplerate=$(multilib_native_usex libsamplerate yes no)
+		--sndfile=$(multilib_native_usex sndfile yes no)
+		--winmme=no
+	)
+
+	waf-utils_src_configure ${mywafconfargs[@]}
+}
+
+multilib_src_compile() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
+}
+
+multilib_src_install() {
+	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+}
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 2794517a02e4..5295a98e976e 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads(+)"
-inherit eutils python-single-r1 waf-utils multilib-minimal
+inherit python-single-r1 waf-utils multilib-minimal
 
 DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
 HOMEPAGE="http://jackaudio.org/"
@@ -24,7 +24,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="alsa celt dbus doc opus pam classic sndfile libsamplerate readline"
+IUSE="alsa celt dbus doc opus pam +classic sndfile libsamplerate readline"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
index 34a95a7a6c28..faf2a258a90f 100644
--- a/media-sound/patchage/Manifest
+++ b/media-sound/patchage/Manifest
@@ -1,6 +1,8 @@
 AUX patchage-0.5.0-desktop.patch 224 BLAKE2B 74bae167f890e5c03043f8906a18576183d2519141d5413780e03091c9b5432044185812d192c12073eadaab0823e8ef1d25c81d57e8614abd120440763d6776 SHA512 ae000bc340d48a9bb89fc067b4b1abba3de39ef9be086c7eeffae71ddca6172ce500ea6ea9854fde8cc19df3117195cb6fdb4ecd0867aa69f332ac0a7d377b69
 DIST patchage-0.5.0.tar.bz2 411848 BLAKE2B 50138309d31c4806072c95af7df46e1b0ca2fe570c606886d9d6eb666cb3a499c12689b3ba1db26c0d59dd0ee732e350a6dffcdb7bee98f78906fa957e1e2609 SHA512 2b6c971f5fb192309734d6f42f17db83979805e6dcafbc95b343c3749afd85ea65c9b7d101b0b4bdf5102b6d60394cabcaa0d511aeb3fe1bf2db924b7e8b46cf
 DIST patchage-1.0.0.tar.bz2 414300 BLAKE2B 4f2fd0a0911cb261508883b73305c2736143d9a165b854b8b4042a3c0f6454e1f79bc3b6cd5d28844e1cdeeaf7dd20effc164aa1151390d4c45af0a339c2ef5a SHA512 0a2be0183257a34a68ec84e6fb17d29a3d8ba7dd54a05fcdd13784ac8f5621eb7a376f17d42168958f5e1a8dab8858a9c5c8c867aa1838736cc2b7775f75f510
-EBUILD patchage-0.5.0-r1.ebuild 1086 BLAKE2B f8eb440e59ae845da99d5050a0094af8f0d08aa12458ad86ff36f158f04cabcc12c6d6366e8aa36ee4d34c38c8852fcd5650047d06109fc6a6c77f7f11fed41f SHA512 47740b4f02296904862aeb732ef24cf4c74901c85983c709124f7e94f3d06daa5051bf3b8fcb2b15b4df680d4bc6df11a7ef2326b7c11278ccb3d42fd755e428
-EBUILD patchage-1.0.0.ebuild 1054 BLAKE2B 3e79bc8183b799eb80a3870511053b8e66cefdf0d19a23a9b98bcf1fd52acc01753da5b1bfea80d9a59516b3f036d3232bc0738249a95423d7dfc8ebe7b0cbb4 SHA512 91f656b6084e36c9f85a8aaf62eb53dae8396f031611a1a20a1f0acc9e454df56835b117a41652de8d2da82a8a11800698d22bb2a43b8c4df127d5514452ec15
+EBUILD patchage-0.5.0-r1.ebuild 1053 BLAKE2B f9325dd2613b625b24a3148c4e3564649be2c54ee8659fef6855fbe2f71a10689ef45b5ae71507052721d94d10305fb0e947d720103a7e775cb9be1366b6e582 SHA512 152269c91e8f51b549ac602ebbd01452789531b28912ee2510fd85950760f40605fe6c4549dbb3261203c493bdb87bc4f0750d8fd9a632608d659aee2ab702cb
+EBUILD patchage-0.5.0-r2.ebuild 1142 BLAKE2B 70b44df31cbd9a2d8a6f883f2daf296547a7ce0eebcc4e0d88b15c2ba933d0a4722812a162aca12fbb6c182609097e4705aed95df951f7c50238ef053fbb2197 SHA512 7ed8905edf25c21bda792405bf6a404deb21074537171b8d432d6ed79557d3ff2ad906f78a19a1085df1ac991ec24de644b4c74056e9d47a56359eb06a5667dc
+EBUILD patchage-1.0.0-r1.ebuild 1122 BLAKE2B de6eb728edca3aa060e87d88624d7a9d706ba1d5ddd51f8b473d705da02784533840fd9f81a8153d660400ede53a737813bb205916233c2c588218e7b70640c2 SHA512 49a4a9dec4509364bf98706d1283278e7cb2313c5d3074f5da6c54a30c76fd825bc1e078affaeeaf5623bea20e824d6abfe6e5d55e516b700203feaa7229a9be
+EBUILD patchage-1.0.0.ebuild 1019 BLAKE2B 3774d94ab2b5008c68c677b678775237ce3133bb0aa5eb0a85bc3ae7daab2b6aad9f2acbe2e2ab211b886446debec098fd78dbd6a1697f5ff66aabaa59b52d3a SHA512 86792e91be4163bc9c00ed0847f71db08e3e5de320c12823d9e2a09a53c58786f126a4533974d5ac93bf97e0426469301b478c6dab465271e1255cc4676e17a2
 MISC metadata.xml 600 BLAKE2B 89bfd8b0da00e90fdd9fb85ca8604c80de0e2a8e471309aec0022f31f844d06c914c7536a3928179256f85b313fefaa3dec8937159f7131a03838276cca86162 SHA512 d08bd05a57ca03d9f91c0904f9a1b92e332e4475fd6729feefb63c75df2c5ad6eebd718b6e7db8482819f463606dcca888400c1560dd9b2c9e426c26634ece77
diff --git a/media-sound/patchage/patchage-0.5.0-r1.ebuild b/media-sound/patchage/patchage-0.5.0-r1.ebuild
index e9ef3beb4975..f7a464d6ad22 100644
--- a/media-sound/patchage/patchage-0.5.0-r1.ebuild
+++ b/media-sound/patchage/patchage-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ RDEPEND=">=media-libs/raul-0.7.0
 	>=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
+	virtual/jack
 	alsa? ( media-libs/alsa-lib )
 	lash? ( dev-libs/dbus-glib )"
 DEPEND="${RDEPEND}
diff --git a/media-sound/patchage/patchage-0.5.0-r2.ebuild b/media-sound/patchage/patchage-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..54e2fcbe5624
--- /dev/null
+++ b/media-sound/patchage/patchage-0.5.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic gnome2-utils waf-utils python-any-r1
+
+DESCRIPTION="Modular patch bay for 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 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
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	lash? ( dev-libs/dbus-glib )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS README ChangeLog )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-desktop.patch
+)
+
+src_configure() {
+	append-cxxflags -std=c++11
+	waf-utils_src_configure \
+		$(use debug && echo "--debug") \
+		$(use alsa || echo "--no-alsa") \
+		$(use lash || echo "--no-lash")
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/patchage/patchage-1.0.0-r1.ebuild b/media-sound/patchage/patchage-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..6fe9924872d5
--- /dev/null
+++ b/media-sound/patchage/patchage-1.0.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+inherit gnome2-utils 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
+	virtual/jack
+	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")
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/patchage/patchage-1.0.0.ebuild b/media-sound/patchage/patchage-1.0.0.ebuild
index 87cdc2f529e1..f8d6244f24dd 100644
--- a/media-sound/patchage/patchage-1.0.0.ebuild
+++ b/media-sound/patchage/patchage-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ RDEPEND=">=dev-cpp/glibmm-2.14:2
 	>=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
+	virtual/jack
 	alsa? ( media-libs/alsa-lib )
 	jack-dbus? ( dev-libs/dbus-glib
 		sys-apps/dbus )"
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 3da3f5cf24c2..1bd1a76b5fb2 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -3,11 +3,7 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-10.0.tar.xz 1608040 BLAKE2B c22e814e0e0c61eb6cde81dff1a161d8698e3ee5b84d42e3213179286bb9fbdac86687c323141721632c614e1760c907ff025ee59777904f94dcfb0f650dec2e SHA512 11d98b4b2000a41bdea92df253409452bc9b77d8bb309b6d14c439e3b902e3f90c69da00daff409e3859a54ad01c63a75be5723616bdcb492801d622a6406481
-DIST pulseaudio-10.99.1.tar.xz 1635836 BLAKE2B a5cd8a2f535f440c0e91440fbcd6f637dcf4a7b0cc154c290edb389a920f30e5310ab1e20a6fb03843606459b138cd3d8b2c322ab682766d610746b5c7d238fa SHA512 410758da3cf3431b5810b9a5790d60ed8fe0bba58f621f4ca8e7ba66be8dcdd53cbd8284105ee6694b04f81a37791c3e8c5fe4af3ee034e89dff0b66fdbde006
-DIST pulseaudio-11.0.tar.xz 1648128 BLAKE2B 2b22a03f587bf00cf6cb424483b9b1f1b5ad8cd41b46125d44643d52b65aa90273b9d9a9d0928e8a30a56e2dac9afacc412ad8b1fc1532068e0287237030377e SHA512 37d0afe343c136cef1906342f17c3473f791fe17b7e6dd463ce120d45285bc12e3680b8b4b6779d79b8ce2e755fe2a0cc4d4c960209b1dae9f924731484ecded
 DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda2338ad8db639ad333598b1589d259acf71ef34e904a240710f5343864fa868789eaa7f7cae1b07902ebd989fe83e12 SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a
 EBUILD pulseaudio-10.0.ebuild 10963 BLAKE2B 90aa6d753f7e66b34318a0493a81a448168d9513142f4108ab8aea1a71b59ba564122ffa02d76237af87671ec24fadeb8b7d580e9107fc663285d8f033f9b20b SHA512 0f4eeac1aa1d2446db522259bd669c67ad06f717964b6272f3ad733a01feecdc00bfd4fd886636a284522a7e766a090fcaba60251a8e65486ec518677425825f
-EBUILD pulseaudio-10.99.1.ebuild 10972 BLAKE2B b2d8a567ebf1f1e5a39f63ecd0fa402374d2d8bd5ae1cbddc070170e567a16af956351815c3fc708e27d47bece7d7c701df4882b4510d3a58982b8de155903b0 SHA512 9140a7bacc08ed57975a5016d7ccca54c585a3c58cc0605f29ace3b2a9c4f7e5af817cd9be75034fa6b8769ae9b314cb2b56d53675308d8fef95edda5079e764
-EBUILD pulseaudio-11.0.ebuild 10960 BLAKE2B b8497dc4d9c738d8668c6956ea5632a82b8f90efb1c5e11be7a115f1aba09b3bcead69fc7f878700ecfcafc9e2fb148aeb2a211c5ca086e7c6255eae8c50da89 SHA512 5857ec66ea36197411d0e42b2234683686f3a6982a5b5168b23f69dec72e4827155d664b6e4164f578758290362d885d7370f068a32c0c37d77d7806895cdb67
 EBUILD pulseaudio-11.1.ebuild 10952 BLAKE2B 1881d0c7604a47841b393125a4282a504c6bdfb86e6d733825da99d01c72967226f102c59beb67e436683bf06f6ffb0b84d6bffa165d72cbfd05d77face5fc69 SHA512 63d8f4616b27990f0aa4d3e93f2963e15c4760d3c7f16b24ae33de6f399613ffc985de3652f0fb4c7ab1bbac7585d58d392d249ee51abedd86194cee952ca25f
 MISC metadata.xml 3415 BLAKE2B cb46d59d9af2a364730ebe48d9ee009659ba8c9b51c8da97c341151784dcb595cc7d6469dae20f5a5da2382d762a984e038077ce95840fcb8e4205b1f0fab06f SHA512 1c7e7a12eeafc6abd5d9bd315e4b512a7b479ae933ee3865b9fc37d994f123beea8208dfe742334d12dd4b20c7eb8077bb37fcd1a862dcf1f5874a0fa8777896
diff --git a/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild b/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild
deleted file mode 100644
index 54df4e0b7f57..000000000000
--- a/media-sound/pulseaudio/pulseaudio-10.99.1.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-# qpaeq equalizer pyqt GUI frontend is AGPL-3+
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
-gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
-+orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
-+webrtc-aec +X zeroconf"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ofono-headset? ( bluetooth )
-	native-headset? ( bluetooth )
-	udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-RDEPEND="
-	|| (
-		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
-		dev-libs/libpcre
-	)
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libICE[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( virtual/jack )
-	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	gnome? ( >=gnome-base/gconf-2.4.0 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		>=sys-apps/dbus-1.0.0
-		media-libs/sbc
-	)
-	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	realtime? ( sys-auth/rtkit )
-	equalizer? ( sci-libs/fftw:3.0 )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	|| (
-		(
-			>=media-libs/speex-1.2.0
-			media-libs/speexdsp
-		)
-		(
-			<media-libs/speex-1.2.0
-			>=media-libs/speex-1.2_rc1
-		)
-	)
-	gdbm? ( sys-libs/gdbm )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-	dev-libs/libltdl:0
-	selinux? ( sec-policy/selinux-pulseaudio )
-"
-# it's a valid RDEPEND, libltdl.so is used for native abi
-
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-libs/check-0.9.10 )
-	X? (
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
-	dev-util/intltool
-	>=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt4 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
-	equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-5 )
-	)
-"
-
-pkg_pretend() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
-	check_extra_config
-
-	if linux_config_exists; then
-		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
-		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
-			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
-			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	gnome2_environment_reset #543364
-
-	enewgroup audio 18 # Just make sure it exists
-
-	if use system-wide; then
-		enewgroup pulse-access
-		enewgroup pulse
-		enewuser pulse -1 -1 /var/run/pulse pulse,audio
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	if use gdbm; then
-		myconf+=( --with-database=gdbm )
-	else
-		myconf+=( --with-database=simple )
-	fi
-
-	if use bluetooth; then
-		if multilib_is_native_abi; then
-			myconf+=( --enable-bluez5 --disable-bluez4
-				$(use_enable native-headset bluez5-native-headset)
-				$(use_enable ofono-headset bluez5-ofono-headset) )
-		fi
-	else
-		myconf+=( --disable-bluez5 --disable-bluez4 )
-	fi
-
-	myconf+=(
-		--enable-largefile
-		$(use_enable glib glib2)
-		--disable-solaris
-		$(use_enable asyncns)
-		$(use_enable oss oss-output)
-		$(use_enable alsa)
-		$(use_enable lirc)
-		$(use_enable neon neon-opt)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable jack)
-		$(use_enable zeroconf avahi)
-		$(use_enable dbus)
-		$(use_enable gnome gconf)
-		$(use_enable gtk gtk3)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable orc)
-		$(use_enable X x11)
-		$(use_enable test default-build-tests)
-		$(use_enable udev)
-		$(use_with sox soxr)
-		$(use_enable systemd systemd-daemon)
-		$(use_enable systemd systemd-login)
-		$(use_enable systemd systemd-journal)
-		$(use_enable ipv6)
-		$(use_enable ssl openssl)
-		$(use_enable webrtc-aec)
-		$(use_with caps)
-		$(use_with equalizer fftw)
-		--disable-adrian-aec
-		--disable-esound
-		--localstatedir="${EPREFIX}"/var
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-	)
-
-	if ! multilib_is_native_abi; then
-		# disable all the modules and stuff
-		myconf+=(
-			--disable-oss-output
-			--disable-alsa
-			--disable-lirc
-			--disable-jack
-			--disable-avahi
-			--disable-gconf
-			--disable-gtk3
-			--disable-samplerate
-			--disable-bluez4
-			--disable-bluez5
-			--disable-udev
-			--disable-openssl
-			--disable-orc
-			--disable-webrtc-aec
-			--without-fftw
-			--without-soxr
-
-			# tests involve random modules, so just do them for the native
-			--disable-default-build-tests
-
-			# hack around unnecessary checks
-			# (results don't matter, we're not building anything using it)
-			ac_cv_lib_ltdl_lt_dladvise_init=yes
-			--with-database=simple
-			LIBSPEEX_CFLAGS=' '
-			LIBSPEEX_LIBS=' '
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-		use doc && emake doxygen
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la
-	fi
-}
-
-multilib_src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_is_native_abi; then
-		emake -C src check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
-		use doc && dohtml -r doxygen/html/
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C src \
-			install-libLTLIBRARIES \
-			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="${targets[*]}" \
-			install-pulseincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	# Drop the script entirely if X is disabled
-	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
-
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-
-		systemd_dounit "${FILESDIR}/${PN}.service"
-	fi
-
-	use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
-
-	dodoc NEWS README todo
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-
-	# We need /var/run/pulse, bug #442852
-	use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
-	# Prevent warnings when system-wide is not used, bug #447694
-	use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use system-wide; then
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-		if use gnome ; then
-			elog
-			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
-			elog "that you might need to remove the gnome USE flag or disable the"
-			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
-			elog "with a system-wide instance."
-		fi
-	fi
-
-	if use equalizer && ! use qt4; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
-		elog "This will build the equalizer module, but the 'qpaeq' tool"
-		elog "which is required to set equalizer levels will not work."
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-	fi
-
-	if use libsamplerate; then
-		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
-		elog "particular advantage over speex. Upstream suggests disabling them."
-	fi
-}
diff --git a/media-sound/pulseaudio/pulseaudio-11.0.ebuild b/media-sound/pulseaudio/pulseaudio-11.0.ebuild
deleted file mode 100644
index 9ca990d07101..000000000000
--- a/media-sound/pulseaudio/pulseaudio-11.0.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user versionator udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-# qpaeq equalizer pyqt GUI frontend is AGPL-3+
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
-gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
-+orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
-+webrtc-aec +X zeroconf"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ofono-headset? ( bluetooth )
-	native-headset? ( bluetooth )
-	udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-RDEPEND="
-	|| (
-		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
-		dev-libs/libpcre
-	)
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libICE[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( virtual/jack )
-	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	gnome? ( >=gnome-base/gconf-2.4.0 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		>=sys-apps/dbus-1.0.0
-		media-libs/sbc
-	)
-	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	realtime? ( sys-auth/rtkit )
-	equalizer? ( sci-libs/fftw:3.0 )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	|| (
-		(
-			>=media-libs/speex-1.2.0
-			media-libs/speexdsp
-		)
-		(
-			<media-libs/speex-1.2.0
-			>=media-libs/speex-1.2_rc1
-		)
-	)
-	gdbm? ( sys-libs/gdbm )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-	dev-libs/libltdl:0
-	selinux? ( sec-policy/selinux-pulseaudio )
-"
-# it's a valid RDEPEND, libltdl.so is used for native abi
-
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-libs/check-0.9.10 )
-	X? (
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
-	dev-util/intltool
-	>=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt4 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
-	equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-5 )
-	)
-"
-
-pkg_pretend() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
-	check_extra_config
-
-	if linux_config_exists; then
-		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
-		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
-			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
-			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	gnome2_environment_reset #543364
-
-	enewgroup audio 18 # Just make sure it exists
-
-	if use system-wide; then
-		enewgroup pulse-access
-		enewgroup pulse
-		enewuser pulse -1 -1 /var/run/pulse pulse,audio
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	if use gdbm; then
-		myconf+=( --with-database=gdbm )
-	else
-		myconf+=( --with-database=simple )
-	fi
-
-	if use bluetooth; then
-		if multilib_is_native_abi; then
-			myconf+=( --enable-bluez5 --disable-bluez4
-				$(use_enable native-headset bluez5-native-headset)
-				$(use_enable ofono-headset bluez5-ofono-headset) )
-		fi
-	else
-		myconf+=( --disable-bluez5 --disable-bluez4 )
-	fi
-
-	myconf+=(
-		--enable-largefile
-		$(use_enable glib glib2)
-		--disable-solaris
-		$(use_enable asyncns)
-		$(use_enable oss oss-output)
-		$(use_enable alsa)
-		$(use_enable lirc)
-		$(use_enable neon neon-opt)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable jack)
-		$(use_enable zeroconf avahi)
-		$(use_enable dbus)
-		$(use_enable gnome gconf)
-		$(use_enable gtk gtk3)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable orc)
-		$(use_enable X x11)
-		$(use_enable test default-build-tests)
-		$(use_enable udev)
-		$(use_with sox soxr)
-		$(use_enable systemd systemd-daemon)
-		$(use_enable systemd systemd-login)
-		$(use_enable systemd systemd-journal)
-		$(use_enable ipv6)
-		$(use_enable ssl openssl)
-		$(use_enable webrtc-aec)
-		$(use_with caps)
-		$(use_with equalizer fftw)
-		--disable-adrian-aec
-		--disable-esound
-		--localstatedir="${EPREFIX}"/var
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-	)
-
-	if ! multilib_is_native_abi; then
-		# disable all the modules and stuff
-		myconf+=(
-			--disable-oss-output
-			--disable-alsa
-			--disable-lirc
-			--disable-jack
-			--disable-avahi
-			--disable-gconf
-			--disable-gtk3
-			--disable-samplerate
-			--disable-bluez4
-			--disable-bluez5
-			--disable-udev
-			--disable-openssl
-			--disable-orc
-			--disable-webrtc-aec
-			--without-fftw
-			--without-soxr
-
-			# tests involve random modules, so just do them for the native
-			--disable-default-build-tests
-
-			# hack around unnecessary checks
-			# (results don't matter, we're not building anything using it)
-			ac_cv_lib_ltdl_lt_dladvise_init=yes
-			--with-database=simple
-			LIBSPEEX_CFLAGS=' '
-			LIBSPEEX_LIBS=' '
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-		use doc && emake doxygen
-	else
-		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake -C src ${targets[*]}
-	fi
-}
-
-multilib_src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_is_native_abi; then
-		emake -C src check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
-		use doc && dohtml -r doxygen/html/
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C src \
-			install-libLTLIBRARIES \
-			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="${targets[*]}" \
-			install-pulseincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	# Drop the script entirely if X is disabled
-	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
-
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-
-		systemd_dounit "${FILESDIR}/${PN}.service"
-	fi
-
-	use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
-
-	dodoc NEWS README todo
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-
-	# We need /var/run/pulse, bug #442852
-	use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
-	# Prevent warnings when system-wide is not used, bug #447694
-	use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use system-wide; then
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-		if use gnome ; then
-			elog
-			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
-			elog "that you might need to remove the gnome USE flag or disable the"
-			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
-			elog "with a system-wide instance."
-		fi
-	fi
-
-	if use equalizer && ! use qt4; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
-		elog "This will build the equalizer module, but the 'qpaeq' tool"
-		elog "which is required to set equalizer levels will not work."
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-	fi
-
-	if use libsamplerate; then
-		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
-		elog "particular advantage over speex. Upstream suggests disabling them."
-	fi
-}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 92b988605654..8895599f0a8e 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,6 +1,8 @@
 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
 EBUILD pulseeffects-3.1.2.ebuild 1399 BLAKE2B dfde05d414a4f6e2f7acadc51e8a32f674175790ad90b1bf6d9d85dbc0b17469457e03e4902635b457e8c1491f0b42a9aff31fac44efa317aed62221796e329e SHA512 f7b416e1d28389e6c9a3d2f009b3a39d94d46124c2b5ebb8369a9da345efe05ba9913167b3ca64f05c39e62547da358e99d867141d2921b3749f7880be904afa
 EBUILD pulseeffects-3.1.3.ebuild 1399 BLAKE2B dfde05d414a4f6e2f7acadc51e8a32f674175790ad90b1bf6d9d85dbc0b17469457e03e4902635b457e8c1491f0b42a9aff31fac44efa317aed62221796e329e SHA512 f7b416e1d28389e6c9a3d2f009b3a39d94d46124c2b5ebb8369a9da345efe05ba9913167b3ca64f05c39e62547da358e99d867141d2921b3749f7880be904afa
-EBUILD pulseeffects-9999.ebuild 1382 BLAKE2B ad31d639425ff10f8498e9691a5986e75baa5bd588d1b052355e90d29cd6bd3ab49af8ee59f8a82d43c9421ca7ad3f741e6f5e3ea67e2149f99cd1f2f9335750 SHA512 4c42030986e7830ef22986a5544966d6ac8cd9ae14f882351703dcf5707c101fd31a4b96d956ce71c51e85836d6779ff7f45d01aaeb02d85d1e4f97a25fee449
+EBUILD pulseeffects-3.1.4.ebuild 1489 BLAKE2B e2dbfba8c9a3649c53613eb1a959f9365f29aac5e58366f5dfe66a36cb9553a4b28605877d8d8d43ac4601ea1d3536119f2c147b1d6ead15a9083d61b9871db2 SHA512 eaa015266a0b4678e2893ba480f9ffee7f859545378875f144f341d733382f20f857acd7f6a26273b90b2ee53fe61828c4168a2cc6a32ed1b1717835496f8f97
+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.4.ebuild b/media-sound/pulseeffects/pulseeffects-3.1.4.ebuild
new file mode 100644
index 000000000000..a339c9081fb9
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-3.1.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( 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-0.24.2-r1
+	>=media-plugins/calf-0.90.0[lv2]
+	>=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-lv2-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-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index 47a858b30f69..a339c9081fb9 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -35,10 +35,13 @@ DEPEND="
 	>=x11-libs/gtk+-3.18:3
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
+	>=media-libs/lilv-0.24.2-r1
+	>=media-plugins/calf-0.90.0[lv2]
 	>=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-lv2-1.12.0:1.0
 	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
 "
 RDEPEND="${DEPEND}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 81fd4d09c18b..8315e7e3a08a 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,10 +1,4 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
-DIST qsynth-0.3.9.tar.gz 255130 BLAKE2B b19043464ebc31c58e41174b8cbddd74ab1ed2bd3e70a6eef84127e3b42d67d61e9194fb31a260eb34148e015d194d65243a550d69d83dfe06d5937596c5f149 SHA512 7702dc9eb3d38d338dcab5587e02e9fcdaffbe6188437e3b0f54b07499553f7a7d083f233cd21963a908578108f82c0d904b68da2f156ca0ab489e989b5787a8
-DIST qsynth-0.4.2.tar.gz 252394 BLAKE2B ece24d08638f2b7f607f02f049132d4a1c79fad7997b92de03a66b2e55f77e477b63dd87b3d6b5c297191896147845b31bcf8ddc3bd88ddc21945d92e655c24a SHA512 d951969b6a4ea185b9c732867559000e91e73b69fcd19974d406516ce79c0040b598ee578cc10aa2ed199f652535e061fe8178c8b37651438e605a0bc3ee674e
-DIST qsynth-0.4.3.tar.gz 258870 BLAKE2B 63c821842109bdc9f76473c631c67499ac76a620ce1bddc231e322554f638b265ceff4a32e6cd0db7193fec9694c18a7c491c603dac8f4e082a717d5b3437049 SHA512 940a664e279890a0a5eaa557376fc10b60c13527ac813be8c3c6b29d04adf8b4c447846a7032c1f37ce6b8213093a7c1891fa7649371edb3cabc7142784b6782
 DIST qsynth-0.4.4.tar.gz 260482 BLAKE2B c36e80bbe71960e83ef2bb7a9f0383625b12bb1f3755319218d8144d3a6749a807634b6babd40891f2ad0fca045b2be55dcbe0c60bdcbd150d32177c38046bdd SHA512 8995881ab992b8d02f83797093d406391327a362d0c331d0c8e023e1695baff5acb589be08427a25563f159067a8965c89be114ce74583db98e5a816f73aa9f0
-EBUILD qsynth-0.3.9.ebuild 1227 BLAKE2B 7a8895cd96a13b475544538f2c46079f22e5ab0716f19df666e0fe3997fbfbd96a21513302722ca8ec37596d8fbe6804eebf9be3b36e36fb5f11324aeae83445 SHA512 b4f62f6dea2d1d990efe150a75a383a905eab1ef2aa10e2d7f9446e32dad454e4ce0e3cf5743f9a1529c335c823ec96a49f48c239e63f8136fb02cf713ac2e7c
-EBUILD qsynth-0.4.2-r1.ebuild 1274 BLAKE2B 5610e40409945517c78afb55040075609ca591c96ec5ee67e66b7d15b1eb4bd83e199fec45d37e0b2cfbc15a09d4711843035e49db7652720c2971fb1aad12a7 SHA512 b714287716436e34fff9676ce471283ed7b123a88766cc0b2eca5fb9c85d2a7aa72ba923bd467b70ba44cd7b0a7ac8b3f5a09c608cf410071bf74cd82b2b3551
-EBUILD qsynth-0.4.3.ebuild 1274 BLAKE2B 5610e40409945517c78afb55040075609ca591c96ec5ee67e66b7d15b1eb4bd83e199fec45d37e0b2cfbc15a09d4711843035e49db7652720c2971fb1aad12a7 SHA512 b714287716436e34fff9676ce471283ed7b123a88766cc0b2eca5fb9c85d2a7aa72ba923bd467b70ba44cd7b0a7ac8b3f5a09c608cf410071bf74cd82b2b3551
 EBUILD qsynth-0.4.4.ebuild 1271 BLAKE2B e134f5acd249f36e9a216c11dd5ff015c148b7721d942723a2414e68af08a8d46e046ef630e0dac07c906eaf4fdeeefdfce09141e319a7daa4322f2a93be81ab SHA512 3c2d79cefc61fc432cc1b515004dcf05964d3adc39b0a4892920a8f0a37675594e1dd558c912946813637427764a9fc0a1ef5156f7a9b72f95bde779e2523478
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.3.9.ebuild b/media-sound/qsynth/qsynth-0.3.9.ebuild
deleted file mode 100644
index 477c7ca4b564..000000000000
--- a/media-sound/qsynth/qsynth-0.3.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-LANGS="cs de fr ru sr"
-
-inherit qt4-r2 eutils
-
-DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="http://qsynth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug jack alsa pulseaudio"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND=">=dev-qt/qtcore-4.2:4
-	>=dev-qt/qtgui-4.2:4
-	>=media-sound/fluidsynth-1.0.7a[jack?,alsa?,pulseaudio?]
-	x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-DOCS="AUTHORS ChangeLog README TODO TRANSLATORS"
-
-src_configure() {
-	econf $(use_enable debug)
-	eqmake4 "${PN}.pro" -o "${PN}.mak"
-}
-
-src_compile() {
-	"$(qt4_get_bindir)"/lupdate "${PN}.pro" || die "lupdate failed"
-	qt4-r2_src_compile
-}
-
-src_install () {
-	qt4-r2_src_install
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm -rf "${D}/usr/share/applications/qsynth.desktop"
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
diff --git a/media-sound/qsynth/qsynth-0.4.2-r1.ebuild b/media-sound/qsynth/qsynth-0.4.2-r1.ebuild
deleted file mode 100644
index a11efc39ab92..000000000000
--- a/media-sound/qsynth/qsynth-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic qmake-utils
-
-DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="http://qsynth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug jack alsa pulseaudio"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-sound/fluidsynth[jack?,alsa?,pulseaudio?]
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		$(use_enable debug) \
-		--with-qt5=$(qt5_get_bindir)/..
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_install () {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${ED}usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
diff --git a/media-sound/qsynth/qsynth-0.4.3.ebuild b/media-sound/qsynth/qsynth-0.4.3.ebuild
deleted file mode 100644
index a11efc39ab92..000000000000
--- a/media-sound/qsynth/qsynth-0.4.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic qmake-utils
-
-DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="http://qsynth.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug jack alsa pulseaudio"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-sound/fluidsynth[jack?,alsa?,pulseaudio?]
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		$(use_enable debug) \
-		--with-qt5=$(qt5_get_bindir)/..
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_install () {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${ED}usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index f6cb56b2a332..d3088a859779 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,16 +1,4 @@
-AUX rosegarden-12.12.25-debug.patch 762 BLAKE2B 420e3eb7d50b6edafb3b5c4bc3e045c0bd9fce9054a0674663fb8d73dfea984344a1c843566e37b952ee609c52d6760954acf692402c65e305d05fca22f4d004 SHA512 20897f94f366c1f8cf0df503a7949fc7b77f84cd893bbf24819e84a061e8b9fd0d179e3d95bbb13edfbd413e8c9bf8db1f92178781566c30a66a56b61bec83ca
-AUX rosegarden-13.10-segfault_at_export_to_lilypond.patch 1714 BLAKE2B 0697fe5e849efdbaafa7d4de698f503c6748958f7891731f56bfe40f1b8aeee8513a781513de5216931022570aca76958fac6f94546a1327bd81e8a45bba2150 SHA512 aee47dd62b49d7ae1edb02b8bc585a81f4277adf812b6a252fe315392a1ae744416fdbe1fb14e1867b8b4c1d755ef83085032694f05c96cfbeda92a15422c911
 AUX rosegarden-17.04-cmake-3.9.1.patch 934 BLAKE2B a59bb497c2fa23f5161ff2953b2338c69d49bd5a5c8d73eefe542dc74c657079ca96d45a2f4db830206d5b71cce66667cf1257a9914da04658136993ce72d8ed SHA512 f3f285597be964aeb9625be9df2443c98ca902f7fe3f7db82ea84f96f0ab461be4762912a6cad30e2c085125394ba37cb0048fca3f8543e1ff41d7776eb671a8
-DIST rosegarden-13.04.tar.bz2 5858085 BLAKE2B 3f7c280cd523f3c6b449203bdaf542b2e7baa442995f51d3c08362f12f8694a00f3cc4e863fc39c928ede41814cb22719ea290588dabd7940ce0f3f052eba13f SHA512 a01bf391be92c564d20d53c03556552cf5e9cd8f1b1eda49de18432dbcb97ed8c65795efb2275ae9a2f91c7701ea71d3497bbf062606331dbe3487a41c33cdfa
-DIST rosegarden-13.10.tar.bz2 6355164 BLAKE2B 0071eefaa7b9ae1571dec8d460241e9f1fc51cbf130b8fc376172467c3e7b68d8f36c4353fa1eaf11da7215f3b00965abfdae0ab86510fe5ea0a5a91c30268d3 SHA512 f65bf1c2098b2e2266131e6c430c598ee881e43a5daf77d6ef843be0e2543a07264af4442335573f4408568dde74357c596d8b99cf77b311fb9a55ca3584d18a
-DIST rosegarden-14.02.tar.bz2 6402898 BLAKE2B 53b5c0fa16274c758e746a929451dfa9e6843d6e3c2064629bc0106aa1e0664ba50946a948801725c6e75eb022cca39d870efbb1c46d437b5ea30f3fa418ec99 SHA512 ed11482dbb65823186cae4b1532b9e38c75a29e209a97a965521091cc7b6d4fdc32571b30a2be38dee06fd2f516fc924ab1a8e72acaa7212b12dd28d61e224f3
-DIST rosegarden-14.12.tar.bz2 6235233 BLAKE2B 718aa0607ea1267aee2daa3d0471a8eec763ef758627bab3a44675f18ecf7fce83ae919df5516def9207394eb5c69b9b02818869b510242bfc658a128865a8d2 SHA512 7820197d97025365c781f95811a9725058b86375654df9915599957f743f5ea335eb468d0b52100e7be5096e9d10bc6fdad4252db48dc5c49d9ed6d8e7db6660
-DIST rosegarden-16.06.tar.bz2 6362923 BLAKE2B dc9baf3fe385d98a334164a173b56eaf372da1d08e50bb2c418c0e16126432c5df81c97c19234843d270c3dbcb5d409206f0326e3c90223a42ced165fc67b48c SHA512 b95c1c9c49967b15cd100fe45c06db9f389adc17161c16c46f1b4c989d6e93373c90f9f2e622b960f83d2fb9fec9f12458b19840b22cb8c233e66d6e25f2d0de
 DIST rosegarden-17.04.tar.bz2 6454603 BLAKE2B cc028a4108f4c51c9f3559bb454a8344d03f31280db6fd51e98a0b39bdc10e29add97272e7dace848dc4b4ac384ba787ade6664d991aed14fa3101b4fdce2743 SHA512 23240522cba8cc3b5d0e3b29ee5b871c911c7634d74f65d04b353f59747bdf6a1bfd9985f16ab331ea2399a797e66b2ebd110e192bb52ba4df453d42d7b8f73b
-EBUILD rosegarden-13.04.ebuild 1366 BLAKE2B 9784f47e8ab97c5d1421de4add8e59b1e4a34a48e109a975f883bae4347ee110c18c8d283d881c7f0cb25977eeb0cb77f0796f84a591f344e87fcce5577e9d2d SHA512 7f8d72f39a9fcfe85b214399fb982ac0e3bdc6b2d36ee12a12637df1746389ab48930a2881258fe5eae38d291865d5cffe5dadd529adec9e89743f48dd3236e2
-EBUILD rosegarden-13.10-r1.ebuild 1398 BLAKE2B 24dbbd029eaa2a2f1530921efcbcf1a20641b73add78461abc1008b3097426133ec723375c048b6abf9817c5045e1b9f2908ba5f7f934dbccb4d7344d747241c SHA512 bd3bb85186146b56a320a7b309bcf1679fd6118c30ef3684a25fc4a125ffce84c1c92aafed469b88f64496d7bd33cbf53e50493f9d5a4cd2394607dce718a723
-EBUILD rosegarden-14.02.ebuild 1333 BLAKE2B 30fdb7ea58db26667382eb5cad5d7c131c9b6bacccd2011dbfa22d59bce666558cdf777f402fae6bee1a1e368df639230431e90d793e33c2890e4974910cf5a1 SHA512 19f3e8e433a94ef403529babecc5573b460bceea60c14605dd29c964d28dfdf32c2e30283176bb5106878fbd0afc272e8ca3c0a1a61c818e233d682523f9e4ca
-EBUILD rosegarden-14.12.ebuild 1333 BLAKE2B 88f20935c25d4917c484c3d39d8beadb09eeee4105db705da6fe01f4502d481d911c144887e4afe390d2c58bc19bf6871bc6c6a901079aaeb8c30721987a7da5 SHA512 1252a5fce78f73b33d046d61db0244a4d5841b498e7625eea5bd853b98158861cb1bf33d71571b65ceb2119f27b72d0badff3148957980e258dfc6a7289a34c4
-EBUILD rosegarden-16.06.ebuild 1218 BLAKE2B 03b80d795f2cbfb942ebf9e2106145cf1e03b083993bd8c8a452c8ebea63a3ff212961637783bcb2ab66776ac3a03cbd33d6a1350e0f2d64483135526eb67d34 SHA512 aecec13cb34f420a9675a940889bf03fd2aa7dba67609f2458fe66617cfb16dd3c11b4a38a8a3204532373de423a98427446d4f6d8358d867781a06acb538f75
 EBUILD rosegarden-17.04.ebuild 1235 BLAKE2B 2fbed7c2c2f3fe2553345170fac28524618c2638c94aed6ef5bdcfbedaf983760cbadc66a812262e9bcc3e191f3d59bb593036d8a5086d74dd05c480ff009ffd SHA512 6a698dba248e5c1b127f67861006b179c3fb5ad45110a83ce0ae7d3a682748119fdcad8ef011478032f8f9a51e5174b1b56a4db8ebc84f77a296f613a57a4694
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/files/rosegarden-12.12.25-debug.patch b/media-sound/rosegarden/files/rosegarden-12.12.25-debug.patch
deleted file mode 100644
index d52b4c6b1928..000000000000
--- a/media-sound/rosegarden/files/rosegarden-12.12.25-debug.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index 5efa65258aa7..000000000000
--- a/media-sound/rosegarden/files/rosegarden-13.10-segfault_at_export_to_lilypond.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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/rosegarden-13.04.ebuild b/media-sound/rosegarden/rosegarden-13.04.ebuild
deleted file mode 100644
index 348496abe461..000000000000
--- a/media-sound/rosegarden/rosegarden-13.04.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils xdg-utils 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
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/rosegarden/rosegarden-13.10-r1.ebuild b/media-sound/rosegarden/rosegarden-13.10-r1.ebuild
deleted file mode 100644
index f59d8da6135a..000000000000
--- a/media-sound/rosegarden/rosegarden-13.10-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils xdg-utils 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
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/rosegarden/rosegarden-14.02.ebuild b/media-sound/rosegarden/rosegarden-14.02.ebuild
deleted file mode 100644
index 234d3a9bc260..000000000000
--- a/media-sound/rosegarden/rosegarden-14.02.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils xdg-utils 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
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/rosegarden/rosegarden-14.12.ebuild b/media-sound/rosegarden/rosegarden-14.12.ebuild
deleted file mode 100644
index d8bc17976ac0..000000000000
--- a/media-sound/rosegarden/rosegarden-14.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils xdg-utils 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
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/rosegarden/rosegarden-16.06.ebuild b/media-sound/rosegarden/rosegarden-16.06.ebuild
deleted file mode 100644
index 34320d5bae27..000000000000
--- a/media-sound/rosegarden/rosegarden-16.06.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils xdg-utils gnome2-utils
-
-DESCRIPTION="MIDI and audio sequencer and notation editor"
-HOMEPAGE="http://www.rosegardenmusic.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="lirc"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	media-libs/ladspa-sdk:=
-	x11-libs/libSM:=
-	media-sound/jack-audio-connection-kit:=
-	media-libs/alsa-lib:=
-	>=media-libs/dssi-1.0.0:=
-	media-libs/liblo:=
-	media-libs/liblrdf:=
-	sci-libs/fftw:3.0
-	media-libs/libsamplerate:=
-	media-libs/libsndfile:=
-	sys-libs/zlib:=
-	lirc? ( app-misc/lirc:= )"
-DEPEND="${RDEPEND}
-	dev-qt/qttest:5
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DDISABLE_LIRC=$(usex lirc OFF ON)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 7193c4380d29..4bb2dc4dcb3e 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,7 +1,4 @@
-DIST spotify-client_1.0.64.407.g9bd02c2d-26_amd64.deb 93425432 BLAKE2B ffa3e929fbbded412fca680708c15ed0ab5a4358e713fa70932788bc4780cb7a291f6f176abfb6a219b98b311be48b687d423df7046e5328e06c4348fc86bebe SHA512 78352ed0cd116b8ef8c2b9ffc3c186d2fecd3dd5f49f0f732ccf0a3a796b72faf60cd4997355bb4f34f450f8af0b7684e28e8e21a14b7902cba2ea49fe4a81eb
-DIST spotify-client_1.0.64.407.g9bd02c2d-26_i386.deb 97705428 BLAKE2B 99222d772c401ba03cc4e452628c84fd71c59b07bdabbe7191724d7f2dee23ab1e28cd4319cd967300276db54a5dd152be2cda039b5eae77cd62d479877669bf SHA512 43342faf26b7530dbb3fecafebcb7dac6ed6b7323c845f373bb63760ab309f4f01c6f4dd1cb4ab1bfd9a97b383fb863ba5f2aa7e73d32d1575bf8964dcdf30a5
 DIST spotify-client_1.0.69.336.g7edcc575-39_amd64.deb 89614954 BLAKE2B a489aa2ad52d06e3651dc7aeb53adadf5f0447d959fca95e7bd49b943188622c8d96868e19d3d3761e4d01432548240a219107de07f1262bc7b8d630cdd64e77 SHA512 cc0cdc5065d21ebb2fa3d05f088b43c49ce95a7ddbedbb474841a11b6a6a79771767e939828cc18ec8f21bb6ba5a3931c6c62ba69321990ed72911c8cd872c04
 DIST spotify-client_1.0.69.336.g7edcc575-39_i386.deb 93798286 BLAKE2B 2ef644a6da0c497aab2347b4fea49966f17ca89b36c85ca48cc1ba6496bd49745028cab934a4077c82968875870243bb84fe5a7576f2319663fc3490ce371427 SHA512 41ab715a247029e1d380387962c554153af734e4eaf6965d1e175f9370d71cefe7559e358b0d402162955bb069a72cd24249d341b1bb7c75fc40b9b65bbc80da
-EBUILD spotify-1.0.64.ebuild 3268 BLAKE2B a979ae00949a41f7944d3d9c2e681669f1fff34625820d8f29c2d456ece43b8b7d1e3532aa48f4eef8199e4fff2cff8eb6b5fb53ecbdd3a2fc83af67c3a9eb01 SHA512 ef1ee3f6edce9364be0a39e0a135a7c3b073fea88d7767e39401d72299f7f582b1bb45c7835e409b4a53c1693dcb2477d9c49e0a1fea197d26df2f827611a6b6
-EBUILD spotify-1.0.69.ebuild 3256 BLAKE2B 9b287ea600bbf08372620f63a3a0ddb75142d4a8d3fe6faa0556a173e97be30779507e2f6bb402a3865b6276d0a35d3ac0fd83b00748ccee5d4bb52acad1e225 SHA512 28f89b901600a8e86f15f50b7b644856cd3c73c95286bef05c995198f751d855999dc2c0580d9b907068d8d9748669672eef9389db19d2899798135f4bc48cff
+EBUILD spotify-1.0.69.ebuild 3254 BLAKE2B c40aa8de27a8135923611d83626fa5712f445be4071ce1ec0579fe731dd1ac1be5ca294adc58bdb02af89b3943cee07714075428ef8dc59c7211421916fd37fe SHA512 97f6f45cfd176ef4d044b4e580979c791d2594e04dc45ee08956f183a06e295342fc050d60727d832f4d7602615715c3a36d4b2afb152bedf1219afc673ce838
 MISC metadata.xml 349 BLAKE2B 961ee21c86e7e1f8bf31b6339003cf2e59c7c6bb38146e63d43b2ac44b41c71e409a6cc9c1460f8ca6a8ff8b2acfb9e7e0b56fff0f7f4260fb6a4c6efcd7a83c SHA512 e39bca3abfb9169f633c009af54681a96b0d1f26d5edd9a0cb5c0a7b2aacfd70fdc4db317bde3273a1e37c04db520fcb0dcbb67167893a40a8fa6766a6637af1
diff --git a/media-sound/spotify/spotify-1.0.64.ebuild b/media-sound/spotify/spotify-1.0.64.ebuild
deleted file mode 100644
index d81b0051b49a..000000000000
--- a/media-sound/spotify/spotify-1.0.64.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils fdo-mime gnome2-utils pax-utils unpacker
-
-DESCRIPTION="Spotify is a social music platform"
-HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-BUILD_ID="407.g9bd02c2d"
-SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-26_amd64.deb )
-	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}-26_i386.deb )"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-DEPEND=""
-# zenety needed for filepicker
-RDEPEND="
-	${DEPEND}
-	dev-libs/nss
-	gnome-base/gconf
-	gnome-extra/zenity
-	media-libs/alsa-lib
-	media-libs/harfbuzz
-	media-libs/fontconfig
-	media-libs/mesa
-	net-misc/curl[ssl,curl_ssl_openssl]
-	net-print/cups[ssl]
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	dev-python/pygobject:3
-	dev-python/dbus-python
-	pulseaudio? ( media-sound/pulseaudio )
-	gnome? ( gnome-extra/gnome-integration-spotify )"
-	#sys-libs/glibc
-
-S=${WORKDIR}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for GNOME integration
-	if use gnome ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-}
-
-src_install() {
-	dodoc usr/share/doc/spotify-client/changelog.gz
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-	ewarn
-	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
-	ewarn "Run"
-	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
-	ewarn "Then log out and log in back to KDE."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
diff --git a/media-sound/spotify/spotify-1.0.69.ebuild b/media-sound/spotify/spotify-1.0.69.ebuild
index 9a0afad07016..ccb79bef70dc 100644
--- a/media-sound/spotify/spotify-1.0.69.ebuild
+++ b/media-sound/spotify/spotify-1.0.69.ebuild
@@ -12,7 +12,7 @@ SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}_amd64.deb )
 	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID}_i386.deb )"
 LICENSE="Spotify"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome pax_kernel pulseaudio"
 RESTRICT="mirror strip"
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-21 20:47:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-21 20:47:17 +0000
commit	4ab6db5717ef23f29320d4c6fb9ebdb8dec1f193 (patch)
tree	f7640b8b96a04499f1ce44a2cad122d45a8373bd /media-sound
parent	48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 (diff)