14 files changed, 93 insertions, 367 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index c793b4a27ac7..2b3c6dca5865 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 83de3e2421f7..5a1db260a19e 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,17 +1,6 @@
-AUX audacious-3.7.1-c++11-throw-in-dtors.patch 1214 BLAKE2B abb1c28db804b88d8d4698e772750ba3c4bd12b7c910de03d18b39091223e4aaaaa5f898322225ff24af0a6fb8a31822e5bb75e4e72ed14f585eb600a448130e SHA512 dcba1e73f17919634d4c6770029bdba2774c752d8296c29f5c78f69bc454f421bf55a6e5b059ab68ffb462995023f63d6eb855a3242f4e806a0a348571adc417
-DIST audacious-3.6.2-gtk3.tar.bz2 539937 BLAKE2B eb8e704dc97749296625711344ccf68a4ae057a74d8b7f7ae841e703ccaed7c76b824e9a728802fef1e58261b0bce914654d36ac5fe4bdf70c06936041d79cfe SHA512 6667f71de1951265d7c8bfbd83079d67942c2c97323ffc7214394ef3f81b1f58e0432117417281833611964e88c629ef855bd90562da46be1c5d350a51c0d997
-DIST audacious-3.6.2.tar.bz2 539843 BLAKE2B 2e3527f79c6d54e198cca13a777b1d6112437ad87d7bf9f35a87c7c74cbe075a8ecf6891f1bf705fe80ae63ee3024aff80e721981fe2e21b37552b2255fb8f26 SHA512 b2fbf0b0628031ae5c883108cb1963232b50381b44882bf01faa7e11cd645e10a1d686d9ed078305a2cda66d238feaf7bdffd45c512830d20cef6770df327dde
-DIST audacious-3.7.1-gtk3.tar.bz2 571720 BLAKE2B 63d515cdb992508808737a565fdf21d01d25d9a8d1ba6f0e5af819b8ef764e3aed2401580d6d909e03b847e060a1bf73b7fea5a0295c923bcbeda41f82d77ad0 SHA512 0ead2827c74b31e10c555fd1254deb3d11e5aebf8c15d455cf5d6ab258012b293324700693b2b9da48b2b4c25418c7149a1901e1dfe3f210ddf730c25a43a358
-DIST audacious-3.7.1.tar.bz2 571450 BLAKE2B 1577bd480401e6a5321a52f4a221c00d054a1dbe052eddea2bbea91238e84838f3285478f1d78d6d03481afbaea3e88b2c2caaa8290c01a0a7681c97072202e4 SHA512 4c74fcfa6e575375501828905f01ed1e769d88fa346a99162c6800da5bc6aa33ec5598c5de1201c4e24cadb31b8c36768ea390aa4884de6bdbf42b0bea5a31a8
-DIST audacious-3.8.2-gtk3.tar.bz2 591423 BLAKE2B 7e1e6e1bc064d75c06b6f328f4a9f547d1594b579687fd2d9c4943d91dfeda7f002b108a1c070b7de82b9f5001c19186d3c58118c665cf84ff7f92561b458a4c SHA512 fc2c69748c8f044aa8eae1848771b45088d85fbb67baf5dcd3ab2ff52e0848ba626e138d1a37756df98249f32cb3d6c54de29355b218602c6a47ff15c8ba0b96
-DIST audacious-3.8.2.tar.bz2 591209 BLAKE2B c76d6e19a4f61fbd151f7a55bfeeb9300aa227f426f4ab9c7116266544859bec1a663ce6995107abb8f9917641959d95cd5aa2208610906821c9bc51b133cbad SHA512 13914d837ab5f283c45297424033486d9a5158f78f17f5538ecce780125fa76585e9e45852d15f6ecf3ed974e7a2f6289ceaaeffa97b2ea79b2bef449d8c786b
 DIST audacious-3.9-gtk3.tar.bz2 600249 BLAKE2B 08559eafc85236e8e881d0cbe6f08e29c82baf0fc46b9209f1d3eee290460260bfa99e6e8f26940f8c6854f3782da24061226ebdb416b6249d10914093e16276 SHA512 6ff98d027c13b30ea9600a9aba914ec993c69826199b8dc303cb60cebdf2af06a7e3dd4af1d34a86343be5485848a57c8a29e48d2a45a33945585550de4e5f9c
 DIST audacious-3.9.tar.bz2 599488 BLAKE2B 2288fe6919c1770cd283af809629fda72186cc0b87a42821f5fb9b7a20c8e7cd5bc00611d10677a82877c5ebc8a1b5ad728626027b95cc875b66dda732b8747f SHA512 d8ef24c91c84bfa80831075cd9a12fc4bf02cec8bc96bcfa5a941254d194cccdc482482b1c015bc63e1142718c2221034c0f3a87e2cb6e4daf3b4cc428328aaa
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
-EBUILD audacious-3.6.2.ebuild 1737 BLAKE2B eb01766f6cf65523c1df66647a4163c61e7fe23b2b917473f460ef1812f772335c1c980c8a337ad02af45e05bfa8594a205fef372f7cf775ef5d9114c1b6bec1 SHA512 621cfc40a2509302ec34de313427de8f0f5d792ac240396b5c3b508d1cfe287b0930bb834dceb6199622ef07f773294342ce095016e26e1806c987c318a37d80
-EBUILD audacious-3.7.1-r1.ebuild 1981 BLAKE2B 22eb07a1955eb02ea9b8e8bf1f1cd0a8c360c7a9108ac3a5f2db8cc6284bc2fbe1ce5f582d482ee6447e8d7bd6471a2d48f9ca1a7368b1f393248ac99ba566f7 SHA512 f727ab57ec08543af48a383ebe2964a4a7aa7cad41ee20ca59452d0c73c61e233e82720bd64fb0eac06cde0d1b410cf89b1dc4b92fe403081aaf406688854682
-EBUILD audacious-3.7.1.ebuild 1902 BLAKE2B a06ed88635711c55e7fbbf7f4c45f33fca568aae459e9fab6ebd21695d9ba49d98fbbc660be2524e3b3f556d529cc56db9103798fbb2353deae4fbd3811c1d9e SHA512 0e6f4d694c7ec951920ffa87bcfd5fc7bea7bac98c075891ca337a9d382cf280badaabbab38b7889b7a52ac6b1ae45df0d9ecac50459da5c3976eb5b08cf7f83
-EBUILD audacious-3.8.2.ebuild 1835 BLAKE2B 32de60b16d3a468a03c68f2316923bf5e2637a848292c67b790ce807df7523649f4f001d0b0ce7993130571b51ab2f4394ccae4e9532e058e0923cbd5187de45 SHA512 ca51ae6472f8b0bfce6cf355feee68f783a48f4ffc4e097c694b007bae87ff3a1c27432fc27a5a19149d1f09321a5834ce930e43130f2d11e03d920c4a6f15bf
-EBUILD audacious-3.9.ebuild 1935 BLAKE2B ef386e22240ec398ee3dcc06549abc129a4c9d225a5983e3542894d1f4a5f94ed899e2c36c2e0b97f1bf8332e7578516fd0f8d5e4de7be855f1337b5b6c81b52 SHA512 6b009f932c1bc34d9cd8720820d51836ab397bc4d23b82e186a982aa6a84cfc62389f763b77ee17cd994567dbb50a416c0a8d046210cf9472ab165800a0a55fd
-EBUILD audacious-9999.ebuild 1935 BLAKE2B ef386e22240ec398ee3dcc06549abc129a4c9d225a5983e3542894d1f4a5f94ed899e2c36c2e0b97f1bf8332e7578516fd0f8d5e4de7be855f1337b5b6c81b52 SHA512 6b009f932c1bc34d9cd8720820d51836ab397bc4d23b82e186a982aa6a84cfc62389f763b77ee17cd994567dbb50a416c0a8d046210cf9472ab165800a0a55fd
-MISC metadata.xml 572 BLAKE2B 6289f7a090aa6133f2ab8eff65780c4ac8fee190d7e0b9587b726271bd01c5660095c5325fcf77359a004990d50e60cafb812e122804163feb7cdb8738b2bc26 SHA512 f54961e5da4f17200ee622ddfe439fa826dd7a195f1548fc7a7c038a6dc0683ece5e4147b082172d3ea6ff9b2e1f1bc67c62aa4c68057913216e3eaef29d0d25
+EBUILD audacious-3.9.ebuild 2115 BLAKE2B 8db5d409fae6c592150f5b9129f9eb891e79a481f4ac8ec186ca5d77e386297cd832cf901745db2d0852fea9e18b571f4914a455488e101fb69dcb5cad0d352b SHA512 bbd9c0b7549ec8e6da84a6a7ea6529b119ed41118d64f5c04eb2f637decaadb4cff530b589f90d9e402f62dd6fd9be94aa2fd8b0bb5a2273702d06b3b0a6cba9
+EBUILD audacious-9999.ebuild 2115 BLAKE2B 8db5d409fae6c592150f5b9129f9eb891e79a481f4ac8ec186ca5d77e386297cd832cf901745db2d0852fea9e18b571f4914a455488e101fb69dcb5cad0d352b SHA512 bbd9c0b7549ec8e6da84a6a7ea6529b119ed41118d64f5c04eb2f637decaadb4cff530b589f90d9e402f62dd6fd9be94aa2fd8b0bb5a2273702d06b3b0a6cba9
+MISC metadata.xml 486 BLAKE2B 982e0b5a578375d9d67369cf92edcef934c8227e6469aca89417634aca805dea8eba386033a575458d55cce34aceb6adf1de8fdcf3fb3a255c853d6c3be7629d SHA512 365b810cf7b096c86804a87d06a522b5a151559035a1ff5694153081426f5565d6465000bc9618acefc403bda9f675a048aea4dbd3af7dfc25200dd16a1c1dec
diff --git a/media-sound/audacious/audacious-3.6.2.ebuild b/media-sound/audacious/audacious-3.6.2.ebuild
deleted file mode 100644
index de7671aaaa3e..000000000000
--- a/media-sound/audacious/audacious-3.6.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-	 gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="chardet nls gtk3 qt5"
-DOCS="AUTHORS"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.28
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/pango-1.8.0
-	virtual/freedesktop-icon-theme
-	chardet? ( >=app-i18n/libguess-1.2 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	qt5? ( dev-qt/qtcore:5
-	      dev-qt/qtgui:5
-	      dev-qt/qtwidgets:5 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-src_unpack() {
-	default
-	if use gtk3 ; then
-		mv "${MY_P}-gtk3" "${MY_P}"
-	fi
-}
-
-src_configure() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	econf \
-		--enable-dbus \
-		$(use_enable chardet) \
-		$(use_enable nls) \
-		$(use_enable qt5 qt)
-}
-
-src_install() {
-	default
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.7.1-r1.ebuild b/media-sound/audacious/audacious-3.7.1-r1.ebuild
deleted file mode 100644
index 808810c14cbc..000000000000
--- a/media-sound/audacious/audacious-3.7.1-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-	 gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="+chardet nls gtk gtk3 qt5"
-REQUIRED_USE="
-	^^ ( gtk gtk3 qt5 )
-"
-DOCS="AUTHORS"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.28
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/pango-1.8.0
-	virtual/freedesktop-icon-theme
-	chardet? ( >=app-i18n/libguess-1.2 )
-	gtk?  ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	qt5? ( dev-qt/qtcore:5
-	      dev-qt/qtgui:5
-	      dev-qt/qtwidgets:5 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-src_unpack() {
-	default
-	if use gtk3 ; then
-		mv "${MY_P}-gtk3" "${MY_P}"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-c++11-throw-in-dtors.patch
-}
-
-src_configure() {
-	if use gtk ;then
-		gtk="--enable-gtk"
-	elif use gtk3 ;then
-		gtk="--enable-gtk"
-	else
-		gtk="--disable-gtk"
-	fi
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	econf \
-		--enable-dbus \
-		${gtk} \
-		$(use_enable chardet) \
-		$(use_enable nls) \
-		$(use_enable qt5 qt)
-}
-
-src_install() {
-	default
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.7.1.ebuild b/media-sound/audacious/audacious-3.7.1.ebuild
deleted file mode 100644
index 0836b1f236dc..000000000000
--- a/media-sound/audacious/audacious-3.7.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-	 gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="+chardet nls gtk gtk3 qt5"
-REQUIRED_USE="
-	?? ( gtk gtk3 qt5 )
-"
-DOCS="AUTHORS"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.28
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/pango-1.8.0
-	virtual/freedesktop-icon-theme
-	chardet? ( >=app-i18n/libguess-1.2 )
-	gtk?  ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	qt5? ( dev-qt/qtcore:5
-	      dev-qt/qtgui:5
-	      dev-qt/qtwidgets:5 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-src_unpack() {
-	default
-	if use gtk3 ; then
-		mv "${MY_P}-gtk3" "${MY_P}"
-	fi
-}
-
-src_configure() {
-	if use gtk ;then
-		gtk="--enable-gtk"
-	elif use gtk3 ;then
-		gtk="--enable-gtk"
-	else
-		gtk="--disable-gtk"
-	fi
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	econf \
-		--enable-dbus \
-		${gtk} \
-		$(use_enable chardet) \
-		$(use_enable nls) \
-		$(use_enable qt5 qt)
-}
-
-src_install() {
-	default
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.8.2.ebuild b/media-sound/audacious/audacious-3.8.2.ebuild
deleted file mode 100644
index 2e2abf4eedee..000000000000
--- a/media-sound/audacious/audacious-3.8.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
-HOMEPAGE="http://audacious-media-player.org/"
-SRC_URI="!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
-	 gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )
-	 mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="nls gtk gtk3 qt5"
-REQUIRED_USE="
-	^^ ( gtk gtk3 qt5 )
-"
-DOCS="AUTHORS"
-
-RDEPEND=">=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.28
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/pango-1.8.0
-	virtual/freedesktop-icon-theme
-	gtk?  ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	qt5? ( dev-qt/qtcore:5
-	      dev-qt/qtgui:5
-	      dev-qt/qtwidgets:5 )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )"
-
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-src_unpack() {
-	default
-	if use gtk3 ; then
-		mv "${MY_P}-gtk3" "${MY_P}"
-	fi
-}
-
-src_configure() {
-	if use gtk ;then
-		gtk="--enable-gtk"
-	elif use gtk3 ;then
-		gtk="--enable-gtk"
-	else
-		gtk="--disable-gtk"
-	fi
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	econf \
-		--enable-dbus \
-		${gtk} \
-		$(use_enable nls) \
-		$(use_enable qt5 qt)
-}
-
-src_install() {
-	default
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins "${WORKDIR}"/gentoo_ice/*
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-3.9.ebuild b/media-sound/audacious/audacious-3.9.ebuild
index a8910bd0fe3e..d2b1efbb4486 100644
--- a/media-sound/audacious/audacious-3.9.ebuild
+++ b/media-sound/audacious/audacious-3.9.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit gnome2-utils xdg-utils
+
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
 
@@ -80,3 +82,13 @@ src_install() {
 	docinto gentoo_ice
 	dodoc "${WORKDIR}"/README
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-9999.ebuild
index a8910bd0fe3e..d2b1efbb4486 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit gnome2-utils xdg-utils
+
 MY_P="${P/_/-}"
 S="${WORKDIR}/${MY_P}"
 
@@ -80,3 +82,13 @@ src_install() {
 	docinto gentoo_ice
 	dodoc "${WORKDIR}"/README
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/audacious/files/audacious-3.7.1-c++11-throw-in-dtors.patch b/media-sound/audacious/files/audacious-3.7.1-c++11-throw-in-dtors.patch
deleted file mode 100644
index 309dbc0319f2..000000000000
--- a/media-sound/audacious/files/audacious-3.7.1-c++11-throw-in-dtors.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Bug: https://bugs.gentoo.org/600882
-Upstream commit: https://github.com/audacious-media-player/audacious/commit/1cf1a81a16cc70b2d9c78994ad98e26db99943ed
-
-From 1cf1a81a16cc70b2d9c78994ad98e26db99943ed Mon Sep 17 00:00:00 2001
-From: John Lindgren <john.lindgren@aol.com>
-Date: Sun, 8 May 2016 22:39:00 -0400
-Subject: [PATCH] Fix compiler warning.
-
----
- src/libaudcore/objects.h    | 2 +-
- src/libaudcore/stringbuf.cc | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libaudcore/objects.h b/src/libaudcore/objects.h
-index fd57f5e15..4b98cc624 100644
---- a/src/libaudcore/objects.h
-+++ b/src/libaudcore/objects.h
-@@ -250,7 +250,7 @@ class StringBuf
-     }
- 
-     // only allowed for top (or null) string
--    ~StringBuf ();
-+    ~StringBuf () noexcept (false);
- 
-     // only allowed for top (or null) string
-     void resize (int size);
-diff --git a/src/libaudcore/stringbuf.cc b/src/libaudcore/stringbuf.cc
-index 041b1e9de..fc646f6ab 100644
---- a/src/libaudcore/stringbuf.cc
-+++ b/src/libaudcore/stringbuf.cc
-@@ -139,7 +139,7 @@ EXPORT void StringBuf::resize (int len)
-     }
- }
- 
--EXPORT StringBuf::~StringBuf ()
-+EXPORT StringBuf::~StringBuf () noexcept (false)
- {
-     if (m_data)
-     {
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
index 617162bf4a6b..5eeba2c5c268 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
-		<flag name="chardet">Try to handle non-UTF8 chinese/japanese/korean ID3 tags</flag>
 		<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index d3a3546b2a5c..e56530d49983 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,3 +1,3 @@
 DIST frescobaldi-3.0.0.tar.gz 4895317 BLAKE2B 6a9a2b92d075742f54b3148761f1946c4dd73616482aec9278c0326d5597773ce6eb714f8d31d49f79051294d23d4e43552ce29bde0f464d1a677900b8a276f6 SHA512 e33cbcb70bec74239cd84691725e9978b6c6fee391848c7de8ea32dd5459d953ddda120eeea25a602154d94a84947b6c151237b859450162db0822ef58fd7787
-EBUILD frescobaldi-3.0.0.ebuild 1014 BLAKE2B e3ca60d78406f1b3d3283bcb43d58fc955e2970e3243ced88a03f42ec2ba2f564b6ba9a89bdde0fef91d7446ea91d33822f212cca2c8b610604e271c1adee052 SHA512 8d82ff75809df34bfce8a6c7d64818f5ce54c92a9de553a42ff37b32592f422902822f2d8c4e4e5297df83d319404e3937f593cf204e214483594d4223ae423e
+EBUILD frescobaldi-3.0.0.ebuild 1041 BLAKE2B 471703d50885795af637c2594e28a3043b5d051cfe96a16b95c3c2ec403c6dfd66deb3f22a878935c8ba43f9c7b9fc958a3469115cc209f0260e24737a94e560 SHA512 42a5b5b0c30d4f6ea804af438f76446b0b1bfe0a785e893a27174b8517c0e6b252446465781c27e3d6bd009033c07ac2521d9909c483438295884ab8b5b7cd8a
 MISC metadata.xml 437 BLAKE2B 5df0dcf6f211964427c34070f126b8a7b65f4341d5ca0edc899e413d112eb3920197086981537847506148b11b58cfcba80213839e5171baf8c16f05781765f6 SHA512 fee7fc00ca40615d9470bcf15ac3df4541864f825f55021c4b8d59891ea1fbec88f4e5133cceef05791cee1d95be320c7405cdfa67446863bdd2b23e86ca2940
diff --git a/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild b/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
index 5f367834aa3e..6d845d5ce2c0 100644
--- a/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-3.0.0.ebuild
@@ -17,7 +17,7 @@ IUSE=""
 
 # 	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] ) # bug 550820
 DEPEND="
-	dev-python/PyQt5[printsupport,svg,${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,network,printsupport,svg,webkit,widgets,${PYTHON_USEDEP}]
 	>=dev-python/python-ly-0.9.4[${PYTHON_USEDEP}]
 	dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
 	>=media-sound/lilypond-2.14.2"
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 3f5b59c5ce0d..5b70027062ed 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,6 +1,8 @@
 AUX soundconverter-2.1.5-files-dropping.patch 1012 BLAKE2B 1d1d20e19dee85dfd87bdc3ffb7062f46875444ef9be67719b5e784ad80c0f0aff892c298752c09d7006bc60ffde1070455a8aebd504f28f1fd08e4a6d155334 SHA512 bc23f24e7e6c1f37bd78509c78bfba77ed637fc726f4f154ba2a3439b43f6244be52c1f77a4c4e6e450dab79c8a161b9cda4a3450416780f14dbfc7ef4759ae1
 DIST soundconverter-2.1.5.tar.xz 195380 BLAKE2B f168332866ac64c7ccf804af60ad877cb1478253d815a81f9ad92e0d382e3bd0ad78bf3f0ed688482541d15dec964b7387f6a3189c6eeae81a3ea8002c789abc SHA512 6d42bd2cfa200e7af8c69ce94580a4f96bdb0354623207e5d1c3beadee89920363b5b8cee4cdcfa6fcbd036860d50f739b05e34e9a34608fe3d6243876936c6a
 DIST soundconverter-2.1.6.tar.xz 195864 BLAKE2B 0be5f5df492742745f56ca3ba90faa134c11f802aefad359e1c03852c87be87e2c57afac811d4f17d2c9303d41e905fb0c9a8c9985c179d216a511183118d369 SHA512 d607d4c260f0b8d810f7251f9bbcd02359984dd2a8bf3340be14602e3392362b9a6bc54a9f0c20f16bfee2f971f784a4093f535307dfb2d6087fb4492511a9ba
+DIST soundconverter-3.0.0-beta1.tar.xz 196916 BLAKE2B 82832a151e030cbd2be129fe7f4dcd92430aadc71b163c3800cc2108f502020561e2c74291cbb25050ed42bd9d71fdfe310f107af84f612711554cf3e32fd07b SHA512 a27a2c7b4156a6d6c682424c5fa64a4dd82537b1dbfa8176fa39fbfc4d139a21b7dd042de80d088333c0aef0042a76940ab8da5d9708b6aac3399b32b7408f09
 EBUILD soundconverter-2.1.5-r1.ebuild 1591 BLAKE2B 206aa73305d924883aec522070a8c9a41b98c06cda179919327a470e49bc78b77f8132934b3f80398608c5ad70456124f8c544ffb6cd7b048bab12ae50cda8cc SHA512 643bef078b758c5b04eb4bff5b2e28ac9c6219fee5e11a58ee99ac9ddb71a528a710578e93f3b287d9961bc8a8b811df987d98bd2ced0d866631e35c2124f0bd
 EBUILD soundconverter-2.1.6.ebuild 1490 BLAKE2B e297e063dc167e5aedeaa72ab06636b905797a7ff0fd94ad6169317e7163fe199a3feed13231c72971c4d8451347691d6acc1d2291319c5a0816c1a1a151d028 SHA512 d74027db98593fcce85fa8a7a5ae965037ef53c5ac238a4f6a4457b87caa291907991badfecc35c3a9fb89d4128b662a3c61e6fa0b268e2b82c34f5e14f5f229
+EBUILD soundconverter-3.0.0_beta1.ebuild 1725 BLAKE2B 6e78f711e603906dac6f455a153be634fafcb759998a18e188b64d4f2b0c98fa7c710e6313d345ff6e318eaa392bf1e0e9ea35c4b4eb99f96943da98aa1c9bf1 SHA512 ef93fd79a20434c910e64fd65a3476b52fb6bca09d91a504e82373e399e1c9bea4ac2b87d57fca2b0568f9944223c7bb08232c08e007bc3a8511d4586fa839a6
 MISC metadata.xml 422 BLAKE2B c38fb6712043983aeaccb925b572fe26156e10776ff00ff454fd215ddedb0751d3c5f5a973725da4e765907f3c9d0ffe6f4062650a7afa2e092cd9b6930219b2 SHA512 5dc640470aea1b45a59fbc757c1fc57a287a733c7e924cecec2dfda988caf313aa9863e86bc4a538565d9e574207654e62ec2071d03f647d21ef6dff38d15732
diff --git a/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild b/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild
new file mode 100644
index 000000000000..eaeb1703786d
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild
@@ -0,0 +1,62 @@
+# 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 python-single-r1
+
+DESCRIPTION="A simple audiofile converter application for the GNOME environment"
+HOMEPAGE="http://soundconverter.org/"
+MY_PV="${PV/_/-}"
+SRC_URI="https://launchpad.net/${PN}/trunk/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aac flac libnotify mp3 ogg opus vorbis"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/gobject-introspection:=
+	x11-libs/gtk+:3[introspection]
+	media-libs/gstreamer:1.0[introspection]
+"
+
+# gst-plugins-meta for any decoders, USE flags for specific encoders used by code
+# List in soundconverter/gstreamer.py
+# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gconf:2[introspection]
+	x11-libs/pango[introspection]
+	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+	libnotify? ( x11-libs/libnotify[introspection] )
+
+	media-libs/gst-plugins-base:1.0[vorbis?,ogg?]
+	media-plugins/gst-plugins-meta:1.0
+	flac? ( media-plugins/gst-plugins-flac:1.0 )
+	media-libs/gst-plugins-good:1.0
+	mp3? (
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-lame:1.0
+	)
+	aac? ( media-plugins/gst-plugins-faac:1.0 )
+	opus? (	media-plugins/gst-plugins-opus:1.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+src_prepare() {
+	python_fix_shebang .
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
+}