gentoo resync : 25.01.2018

15 files changed, 383 insertions, 104 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1fa3a8718359..2ad77bfb9b40 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index c28a4ffd9118..55de3f9567a6 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,7 +1,5 @@
 AUX kid3-3.3.2-libdir.patch 1506 BLAKE2B 1265271633d61cab6d4ebb49284645a1528dedde7700145fb59c100b9fc209a84a021c2069291b6fcfb3030e0afa569016151e0545ce6f5375cc485881ecec44 SHA512 b987463eb82b499af757ba2865bfe57f9f9d405eb005822d08521f89700bfcfbb1bd46f9caa8c436b6d73d0b12284db08299d5425299f5803612e7b75b6c12ec
 AUX kid3-3.4.4-deps.patch 1485 BLAKE2B a2c4b9ac6e956dcc2e6415b502e0ca34814d668ceb3e2e315f4da8da382041cf55f6b5531d298ecc00ee242433c09d2095e4357a9814fd9eda60d501672c5a74 SHA512 af386071836e542e178cda38297091817943a3f754e4d14b3cca2ec628bd7c13980932e77b1f9e3c578b095d88ea2b24e89e58b6f726c6f656989fc08bc8a808
-DIST kid3-3.5.0.tar.gz 1414288 BLAKE2B b400c83ae611fe66387686441bfa02a55686f474f14c04589d81693ae6bcc462b641d164088c010a2bbe4b32f253875fa4bcc2c350cf8ef5abd10cc6a2e53923 SHA512 a70aef4c775ec8a2d760856fdda38394384d71fbfb5847ba4da2d6396a1167c740a57a5609ef99a06ca99c090de974e91a87b13344f2e123b33842c51860cf34
 DIST kid3-3.5.1.tar.gz 1414829 BLAKE2B 42d172a443223979e6afbda3f6dec240a5bde22f102fdd4d6d64f3cbe30dc80a4cb09ed0d28176122801211e311441997ae162025ff0460eb803fc3ed1aec34e SHA512 7f1fbd6d1d576d23f9b57baaaa35101fb2e9ea23dec5b5506e25ec5a94dc8516d25b69b4dddb4a9b4835b2502d0a07087c245380483571a68e5972f98ca8ca58
-EBUILD kid3-3.5.0.ebuild 2012 BLAKE2B b9653916a465980ed1e1ad0473a783f697a4f1d54d149814cc71316d144c04177540c248c381844392e1f79fb62f12bdf3ffb7d894788962d473188a41472964 SHA512 c2a9f141724d8073240a76a1c9e9a7c3352bb91f62c05298de81ecc085772dcccd9b0a90fff3c7ac39992dc7ba481c60f3f633e56e5e18cbcc573b275f7a3df6
-EBUILD kid3-3.5.1.ebuild 2014 BLAKE2B 3135e515c02f8a14b9a77676809b81595ff223df6e2803ad1e0cd4a8b3d62bbb370f56b4a3aed7514067149b4444ce76f658278eb5269b5850a78a0d666191ea SHA512 39077f8810c78da6d71ff2ccff9b6ac5d3ae31835844c25a49ac6500604a16c3ff60511fa0ddaebab938f805611ff0ada2b4a5649e093be2160757f543194cf7
+EBUILD kid3-3.5.1.ebuild 2012 BLAKE2B 66fb419abe7ee271b8b7ab60bf53ad8937e262abbb43621c7f9b556434e15cb90f0b43f08fe3de407880a132c546b456083a4d6d47d54a837a2f3ab6656f04a7 SHA512 031081877a9fe56f881f75ec28ca65a8301a9b5c4d9abd7596a0a547ad39eeaab8b6ad99485d2b44dd65dac24395b8f6f95b04becf555ed251099ed2d358c51a
 MISC metadata.xml 672 BLAKE2B 380133bb3cfd6862da40dc672da4c513a53a81adf40ee0552ae6df65afb42979a19e32f0e72d909f15d78f014e19057e0b2db69e087aa6bb222f7d4b7ccde88d SHA512 b76d1d9b77eab5a42ebb2bae4a039a0a9abc5227e37fbe3066ca04aacfaebfdbcd99b3901eba79bb8ee46a64fa58a3aaf6370eeb3706d1773e137b02de1202ed
diff --git a/media-sound/kid3/kid3-3.5.0.ebuild b/media-sound/kid3/kid3-3.5.0.ebuild
deleted file mode 100644
index 64def7acd3df..000000000000
--- a/media-sound/kid3/kid3-3.5.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
-inherit kde5
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		virtual/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-sound/kid3:4
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep linguist-tools)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.3.2-libdir.patch"
-	"${FILESDIR}/${PN}-3.4.4-deps.patch"
-)
-
-src_prepare() {
-	# overengineered upstream build system
-	# kde5 eclass src_prepare leads to compile failure
-
-	# only enable handbook when required
-	if ! use_if_iuse handbook ; then
-		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_PHONON=OFF
-		-DWITH_QT4=OFF
-		-DWITH_QT5=ON
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	kde5_src_configure
-}
diff --git a/media-sound/kid3/kid3-3.5.1.ebuild b/media-sound/kid3/kid3-3.5.1.ebuild
index 98825f9596ae..a2e641496a1d 100644
--- a/media-sound/kid3/kid3-3.5.1.ebuild
+++ b/media-sound/kid3/kid3-3.5.1.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
 
 REQUIRED_USE="flac? ( vorbis )"
diff --git a/media-sound/munt-mt32emu-alsadrv/Manifest b/media-sound/munt-mt32emu-alsadrv/Manifest
new file mode 100644
index 000000000000..21daec9436fc
--- /dev/null
+++ b/media-sound/munt-mt32emu-alsadrv/Manifest
@@ -0,0 +1,3 @@
+DIST munt_2_3_0.tar.gz 418703 BLAKE2B d9c4290f11f4114b26aa45d6591c04a73d56981e7f618c1466db81fd35be3588b2853fb60b9cf65dd523ce8ea120a5a187bd805b58ba2f75719d460929c2e4e1 SHA512 87fe4891628ea33967270fe3c6c3840e40deb14bd7c8d61490d4c0057438af6bc0099c10e24e813ef1613ca9cc9fc1567a0340c7ea1f4254b209f7fc99c8c7a1
+EBUILD munt-mt32emu-alsadrv-2.3.0.ebuild 1136 BLAKE2B 93659786cae61437cf4b723b00b94a9fae11bcbafe901887af3ad8d82bdc4cc4e68063dd9d01f8ca5c67ca9455d8c74563451850b574f3582e57851a534e42d4 SHA512 8e05f033cda128954fda8fd85d61f94afb10ba459e58a929446716a686572665eb7598cf669469bec9bff476064ccabd7dad1d1ed343856ff818f57e20939864
+MISC metadata.xml 619 BLAKE2B 6e281508d1398900dbdab6d3fb338e43ca631ed0032b000b8447c65dc9629f4fdcb2b2af4051b363a816a82c54fac6a9eebfe24db67cba22daff02b1b145ea88 SHA512 f4a36fa2ff28998528db05fa9eff442dc463bbbfc23f57bda48dde0a540f8fb836ce481575a789471e80a0b1a5a9dbf70dd768dd12593562658f10d06da103d8
diff --git a/media-sound/munt-mt32emu-alsadrv/metadata.xml b/media-sound/munt-mt32emu-alsadrv/metadata.xml
new file mode 100644
index 000000000000..3ee0e2c84df7
--- /dev/null
+++ b/media-sound/munt-mt32emu-alsadrv/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">munt</remote-id>
+		<remote-id type="github">munt/munt</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		mt32emu_alsadrv is a module of the Munt project. It uses the mt32emu library and provides an ALSA MIDI driver which emulates (approximately) the Roland MT-32, CM-32L and LAPC-I synthesiser modules.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.3.0.ebuild b/media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.3.0.ebuild
new file mode 100644
index 000000000000..135f9f121553
--- /dev/null
+++ b/media-sound/munt-mt32emu-alsadrv/munt-mt32emu-alsadrv-2.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs prefix
+
+MY_P="munt_${PV//./_}"
+DESCRIPTION="ALSA MIDI driver for emulating the Roland MT-32, CM-32L, CM-64 and LAPC-I"
+HOMEPAGE="https://github.com/munt/munt"
+SRC_URI="https://github.com/munt/munt/archive/${MY_P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="media-libs/alsa-lib
+	media-libs/munt-mt32emu
+	X? (
+		x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXt
+	)"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/munt-${MY_P}/mt32emu_alsadrv"
+DATA="/usr/share/mt32-rom-data"
+
+src_prepare() {
+	default
+
+	# Fix MT32 ROM path.
+	hprefixify src/alsadrv.cpp
+}
+
+src_compile() {
+	emake mt32d CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
+	use X && emake xmt32 CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin mt32d
+	use X && dobin xmt32
+	dodoc {AUTHORS,README}.txt
+	keepdir "${DATA}"
+}
+
+pkg_postinst() {
+	einfo "MT32_CONTROL.ROM and MT32_PCM.ROM cannot be legally included so you must"
+	einfo "obtain them and place them in ${EPREFIX}${DATA}."
+}
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index 05107cde976b..eb85315197b8 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -3,5 +3,5 @@ DIST pragha-1.3.3.tar.bz2 679754 BLAKE2B e9e785998d5ae805aa8427d18d1cbdcdd1e2322
 DIST pragha-1.3.90.tar.bz2 760153 BLAKE2B 22cb90225cad5b19ecd95691bafd11f55b35e5f2b59e877c2c998b2e4744f1298f28469bdb11f00598f31fc154c55427d000a995d952112b238cf84302993564 SHA512 877d27814927ab67a0b1defe70d753466e3ad14a0274a2168eb2521ded4eddeb04bce5177869b19ca57b38e7374047ee36982cce3f7e8a75b801cd060f8460d2
 EBUILD pragha-1.3.1-r1.ebuild 2602 BLAKE2B 31d242654e528af065c91731d624df1e5fdf989a9e1f259603db65fab0bcfecba913478557b67110719d7c284f8c566fd64442ab97201e2451f01a600dc6e9c5 SHA512 c17edf8c79aa6a16803de9cbcc9c9f62a3a5f9f02c427f80548623b087feccd6be5e10584bbe8fe01b6b559e2344b367d1db06328fd9d1081f7c37c3fd7145a4
 EBUILD pragha-1.3.3.ebuild 2288 BLAKE2B 0cad8db3ec862e8e731135eb2e53c2e6fadcc397476512153b1d72531eb74521b4f97c99c3a929f8968046ec98581a41719e75c0c8bee5dd15e2d77a9c7c0215 SHA512 90a7562ed5be7146fb86ea61befd6d145230235020d88f99a0762d2749b05640591343e680b3580654840ebb34ff1c9b1174ee28f73e28fe79c030ab739c6f73
-EBUILD pragha-1.3.90.ebuild 2487 BLAKE2B 198d2d7ff6b546f1f805cb7fd3c5e7ee8e5d6447514522f01c2329b2ffa42c1549ffdc91dc9b39862fe1a5217b92f4e53e71c807d55a0def06ba1a693ce1352f SHA512 57514988c2f5ef8e19d0abf8c329cee174be7d0e15c71bc1d0d8881cad14ceef6f4938a5610c4e3dfadf43144ddb0b87e9de10c2a031549025c8462bc4eb3c72
+EBUILD pragha-1.3.90.ebuild 2502 BLAKE2B ad6086767bf4d14ba02311377ee5009ca66e8a87265119f1476191c81641867804eaa7484b7c04133ca82e4651b4e1cc45f1820227c7d6fa3be609fe2122197f SHA512 27c0cbe0ed8ad4bdb76a0d18dd0d60bdacac7506f36bc68165675c17845b514cdd5a913be34702809b6186a0d26e40fb412e36d1faed1bdd1f86335fcb737d8d
 MISC metadata.xml 1158 BLAKE2B b7d3fe9b4867324351eabb050306806202e4af8f4c4b1cbbd02f0d88eae27fcf0d6e52fe39f7cf470508db1528684fe064c1e0861658c883bb0a3f4a04abd799 SHA512 68257f425b4e8634f4ed696e7066a8b0c328b1bca0794a72a54f438d2aaa174b4cf816cf693046221bfef88e6b8fc08dfe2211e9be98c28da0d119d957bf9812
diff --git a/media-sound/pragha/pragha-1.3.90.ebuild b/media-sound/pragha/pragha-1.3.90.ebuild
index c5dfe2453911..32a9c17084b4 100644
--- a/media-sound/pragha/pragha-1.3.90.ebuild
+++ b/media-sound/pragha/pragha-1.3.90.ebuild
@@ -41,7 +41,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	>=dev-util/xfce4-dev-tools-4.10
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	xfce-base/exo"
 REQUIRED_USE="glyr? ( peas )
 	grilo? ( peas )
 	libnotify? ( peas )
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index a82146276baf..26ce753135ec 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,6 +1,8 @@
 DIST pulseeffects-3.1.5.tar.gz 612665 BLAKE2B 18fd3c8126f0ad53ac0a7c270b5cafa66c8df7a65c9ef99a84469a3a6b0f1c6875c11e163acf9ce8fec6465b561638ca3fce77000631c4c3c5f64f5cc6d9ffc8 SHA512 e24efa5a0313d25cdbd960c176efbe487cb6e6002d7f0887f92d8287fc70f02fa16456c709fbe4a99c3680b3bbe51758dfe05a7a412ce8d4c5cd2c976685cbb4
 DIST pulseeffects-3.1.6.tar.gz 614441 BLAKE2B bb7461532785cd0ab79d0f506b5b9bcfc006779776e25870ce92b4af4e7cb0f7b3bcfe9c58180e52bdb9b9be20a14644ed8622fd3cc578dd3bdf9ff173c091b6 SHA512 efd9871c57f4b7152e4528927c7371e225980a09acacf4fcf939c468c7cb01b94b1bbb3c94cbd8879a6b41c7c4794ed5f45035a2b185b0a09b31515c964d4722
+DIST pulseeffects-3.1.7.tar.gz 610153 BLAKE2B 64746f1eb8f16613183bac30d8e132d8001cfd9183f735fa262a02c1313f452de5cfffde33543dd0a38a629af898ca264a6864c3f005a45a6da18c00079b9f18 SHA512 7812d4b8c3fd88b533d86dcc70f3e219f3c1fe879bd8731741983c53ed00be2d3c39bc1090a674cb1347ee30a9135c86306ea1d3cb46dce7f45d1cc21fe1585c
 EBUILD pulseeffects-3.1.5.ebuild 1489 BLAKE2B e2dbfba8c9a3649c53613eb1a959f9365f29aac5e58366f5dfe66a36cb9553a4b28605877d8d8d43ac4601ea1d3536119f2c147b1d6ead15a9083d61b9871db2 SHA512 eaa015266a0b4678e2893ba480f9ffee7f859545378875f144f341d733382f20f857acd7f6a26273b90b2ee53fe61828c4168a2cc6a32ed1b1717835496f8f97
 EBUILD pulseeffects-3.1.6.ebuild 1489 BLAKE2B d7e167c67de1d3064451adc47144f82de00715ec05b1795fcc0379c85ac4b1178482a393fc5e1fb8fa40e63d558b53a757e0c44826897772bb93f243242ae817 SHA512 3fca264bb9f36b2535d12cbc3db074909a792a23385d0cdca3b4695c9ee03fa24f049162005fbcfe22bb9e76ea622795959d17e23d766015d754c365b1d13af5
+EBUILD pulseeffects-3.1.7.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.7.ebuild b/media-sound/pulseeffects/pulseeffects-3.1.7.ebuild
new file mode 100644
index 000000000000..ca19673c0603
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-3.1.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 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/spotify/Manifest b/media-sound/spotify/Manifest
index 4bb2dc4dcb3e..1e1b502db909 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,4 +1,8 @@
 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
+DIST spotify-client_1.0.70.399.g5ffabd56-26_amd64.deb 89572934 BLAKE2B 70fa53d8bd4fac88133cd57171721636d17ccc1863a224048572c34eba132baf2642c5b51022f4dd59bbe8abe61c43440dc9339687bc2d3c0ba6fbbe5339a0fa SHA512 f5ce65a535daffe251152f6dc1c3affe2cbdf815ce1129e204ef03b589ebf7ac1015a9be2c77d7bcdd506fa23b9f24390b961843bb311366f6839756563912bf
+DIST spotify-client_1.0.70.399.g5ffabd56-27_i386.deb 93896122 BLAKE2B 541de6cddb207440baabff6e43af6bd101ae43e8b30359a14078429506b742faf6bd32719bc6579068196bd01859a24af35677b3b53233b79ff56007fa38a30c SHA512 b72a7b4286d067a0a825b423ff62d426a82d8a7cc111500e1d5ab64df000f0cce024a6c7d9cc5cbf253800152907ae2889f55eead46556739f8d5069e7c0abf2
 EBUILD spotify-1.0.69.ebuild 3254 BLAKE2B c40aa8de27a8135923611d83626fa5712f445be4071ce1ec0579fe731dd1ac1be5ca294adc58bdb02af89b3943cee07714075428ef8dc59c7211421916fd37fe SHA512 97f6f45cfd176ef4d044b4e580979c791d2594e04dc45ee08956f183a06e295342fc050d60727d832f4d7602615715c3a36d4b2afb152bedf1219afc673ce838
-MISC metadata.xml 349 BLAKE2B 961ee21c86e7e1f8bf31b6339003cf2e59c7c6bb38146e63d43b2ac44b41c71e409a6cc9c1460f8ca6a8ff8b2acfb9e7e0b56fff0f7f4260fb6a4c6efcd7a83c SHA512 e39bca3abfb9169f633c009af54681a96b0d1f26d5edd9a0cb5c0a7b2aacfd70fdc4db317bde3273a1e37c04db520fcb0dcbb67167893a40a8fa6766a6637af1
+EBUILD spotify-1.0.70-r1.ebuild 3312 BLAKE2B f87bba06d6caa58b49b4d24b4f7eea10e7c3a20084f965ec6bcaeeb102d4ea0d9c6f2e1e43fbbfb847d82df788a83cedd576c31278ca640c97d51aba6cd61345 SHA512 e6c9372c89ff5cd6e937681fe11bc031c497631beb18592a92e097fbd2662ba33a4d36d3f5ed748bbd4e22f940b9f1bccf7b377225aea5fe5f2cdc9edc815755
+EBUILD spotify-1.0.70.ebuild 3304 BLAKE2B 3a8e82540777d21e2928f7d56a144971acce4c458c12d53df3729c977e9304cee447488a9e006fae6d12efc128f1a69d517e2d5d5ba71225ddb8aee1265b2688 SHA512 75cffbf2c4a8dafefc2ceed986d01331dddee9c1c600d2cc6e37dfd540dc80594b686c4af83bd408ee45bf860f34373c4f7996855f48254c2e93df2180cd5a8d
+MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
index 9ce054e1b38b..1e06c14d2fd1 100644
--- a/media-sound/spotify/metadata.xml
+++ b/media-sound/spotify/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <use>
     <flag name="pax_kernel">Triggers a paxmarking of the main Spotify binary</flag>
+    <flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag>
   </use>
 <maintainer type="person">
 <email>prometheanfire@gentoo.org</email>
diff --git a/media-sound/spotify/spotify-1.0.70-r1.ebuild b/media-sound/spotify/spotify-1.0.70-r1.ebuild
new file mode 100644
index 000000000000..6fa5db4d1378
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.70-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils xdg-utils gnome2-utils pax-utils unpacker
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+BUILD_ID_AMD64="399.g5ffabd56-26"
+BUILD_ID_X86="399.g5ffabd56-27"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
+	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systray 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 )
+	systray? ( 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 systray integration
+	if use systray ; 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
+	xdg_mimeinfo_database_update
+	xdg_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
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/spotify/spotify-1.0.70.ebuild b/media-sound/spotify/spotify-1.0.70.ebuild
new file mode 100644
index 000000000000..1e34e86dd459
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.70.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils xdg-utils gnome2-utils pax-utils unpacker
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+BUILD_ID_AMD64="399.g5ffabd56-26"
+BUILD_ID_X86="399.g5ffabd56-27"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
+	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_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
+	xdg_mimeinfo_database_update
+	xdg_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
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}