gentoo resync : 05.02.2020

5 files changed, 4 insertions, 633 deletions

diff --git a/media-sound/ario/Manifest b/media-sound/ario/Manifest
index ae9cff76efa0..1e52e42bd56f 100644
--- a/media-sound/ario/Manifest
+++ b/media-sound/ario/Manifest
@@ -1,6 +1,3 @@
-AUX ario-1.5.1-single-includes2.patch 16062 BLAKE2B 1cacda4c7fcf04de122d3a0b960605b384239de7fb779b593f9de3dc13d5aa32cbae0018ca60f32ab003cc282f1d3800e08e6d4efd759d77367a0cea19646b90 SHA512 f832498f2445f2f937a1b9636ba6c75fce3a75e706296a315e0c33c3a852140ba829f6972d8cc2ade3fa4a45f21a964eef8134b315fdfe1155cd221e9ee0cbb2
-DIST ario-1.5.1.tar.gz 1135444 BLAKE2B 2d91a7b8ce9c6c6069ec7230e10e7c358a146272474d0dbb298e038a3fb31d524c6ad7a8428af12f580853bbc6ea484ce3ffa6919cd454060d19e9f4cde42200 SHA512 78c3d881d51c3109b73252da0742da2a77bcc24ec21ff2ff02fd3527d62d49a75e412bf092051a9035863d645cba73e6cd2fc674d97629909b931ae9d3ec002b
 DIST ario-1.6.tar.gz 1151747 BLAKE2B 2a9a5d9c9e528f92a198270a4715a225d254a8fd6800004928ef39c4ed792bda2a82eefaa45824d5422598f9fe242b6b621768780655b009043cc3447d8d5643 SHA512 93057da62616e79f6ba6f7204fabac37417fb34c350b53eeea61508f4c65322fabaef7a9fdbe7beb8dcbf92c8f86f0d33caf1ffa0ad76de8050fe72d57408ec0
-EBUILD ario-1.5.1-r1.ebuild 1554 BLAKE2B 124e80d5a4714b1251775ae82ad6b6c19864ddfcd39f29e56644e02a141a1b305a51aecceeeaffd47f668ebc52f9d338d51c26121d6db74576dca5ff9ed8b723 SHA512 6d2a5d70b2974412b2fb9f1d3bc365e8b4eac81fa72da6d192ec2a03969e27a4bc24dd9d2cbadfa6dbf6e2baa4aa8fbb6b543c61abacbc61b627191738e87e31
-EBUILD ario-1.6.ebuild 1205 BLAKE2B 9eebd899e75d6d4086a42e545927249f08877d871256b52ae067c3959d5f621bfc742f7bce689197ce092b388d92cde4f2c75db6aa4adf1de89579b86da9bc39 SHA512 d6326705e40c0a8795f636feb69047608a63784c8a3c0e10ecd036de66078c2f71b1460a58289c15b042f0f79954e1b842e0aed644155d2d0b33d3ca318def37
-MISC metadata.xml 694 BLAKE2B 2e67dc03a24d5593d24d1170d27c406036e82502df12e29b020b0d5932ab09606da3f5f2502c14f453d2415bf4df0d641ee4a634c0ebda2bd45e9e6a0dfef4b9 SHA512 fdf6358cc5ceff526d31e9f1ae43e7b9a5b2d449c4f9bc9011f37675536d99d22edaec439bf5a32dcc66ee24ec4ffcf20206e80afb83235887e500efca18f613
+EBUILD ario-1.6.ebuild 1203 BLAKE2B 0f77060a6fe417ac70cfe7ae51e3fbf8d997f2910740880bdb43661ae25a75ac1795c3c21d19cdff8f556fe3394b80642d8626d1ea2c180156d44802e18b6fcb SHA512 7b7e5f39b7b811d27e5c819ab1ffe7f3ced6ced7cd98a48bf363fd97cead49032fc7e6b56c9f96783f2db25ffee4f64589a9b8d9e829533bb7daae2257bdfa46
+MISC metadata.xml 596 BLAKE2B 2de1c54642e0228e54445c0036d60f652fe1b4f8fb8e3917761819ae2918714646ecae8b9c33f94fdf99feee342d5959eb2ccde95c07c29cb20894efbe8f540b SHA512 aa1a8084967904d6cc2a2b46a87ab39281d562814e28f1dfa2720ed0b6ad185b6b382c41554414415cb08644f0c5393d76bf48f39265cb9935dc28d878c05666
diff --git a/media-sound/ario/ario-1.5.1-r1.ebuild b/media-sound/ario/ario-1.5.1-r1.ebuild
deleted file mode 100644
index 0d303e6f0e3d..000000000000
--- a/media-sound/ario/ario-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2 python-any-r1
-
-DESCRIPTION="GTK2 MPD (Music Player Daemon) client inspired by Rythmbox"
-HOMEPAGE="http://ario-player.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}-player/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus debug +idle libnotify nls python scrobbler taglib zeroconf"
-
-RDEPEND=">=dev-libs/glib-2.14:2
-	dev-libs/libgcrypt:0=
-	dev-libs/libunique:1
-	dev-libs/libxml2:2
-	media-libs/libmpdclient
-	net-misc/curl
-	net-libs/gnutls
-	>=x11-libs/gtk+-2.16:2
-	dbus? ( dev-libs/dbus-glib )
-	libnotify? ( x11-libs/libnotify )
-	python? ( dev-python/pygtk:2
-		dev-python/pygobject:2 )
-	scrobbler? ( net-libs/libsoup:2.4 )
-	taglib? ( media-libs/taglib )
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOCS=( AUTHORS )
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-single-includes2.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-xmms2 \
-		--enable-libmpdclient2 \
-		--enable-search \
-		--enable-playlists \
-		--disable-deprecations \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable idle mpdidle) \
-		$(use_enable libnotify notify) \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable scrobbler audioscrobbler) \
-		$(use_enable taglib) \
-		$(use_enable zeroconf avahi)
-}
diff --git a/media-sound/ario/ario-1.6.ebuild b/media-sound/ario/ario-1.6.ebuild
index a909b0299b6b..c67e1c768eb8 100644
--- a/media-sound/ario/ario-1.6.ebuild
+++ b/media-sound/ario/ario-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}-player/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus debug +idle nls taglib zeroconf"
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-sound/ario/files/ario-1.5.1-single-includes2.patch b/media-sound/ario/files/ario-1.5.1-single-includes2.patch
deleted file mode 100644
index e5936cfbe2c1..000000000000
--- a/media-sound/ario/files/ario-1.5.1-single-includes2.patch
+++ /dev/null
@@ -1,557 +0,0 @@
-Index: plugins/radios/ario-radio.h
-===================================================================
---- plugins/radios/ario-radio.h	(revision 772)
-+++ plugins/radios/ario-radio.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_RADIO_H
- #define __ARIO_RADIO_H
- 
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- #include <config.h>
- #include "widgets/ario-playlist.h"
- #include "sources/ario-source.h"
-Index: plugins/filesystem/ario-filesystem.h
-===================================================================
---- plugins/filesystem/ario-filesystem.h	(revision 772)
-+++ plugins/filesystem/ario-filesystem.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_FILESYSTEM_H
- #define __ARIO_FILESYSTEM_H
- 
--#include <gtk/gtkhpaned.h>
-+#include <gtk/gtk.h>
- #include <config.h>
- #include "widgets/ario-playlist.h"
- #include "sources/ario-source.h"
-Index: plugins/information/ario-information.h
-===================================================================
---- plugins/information/ario-information.h	(revision 772)
-+++ plugins/information/ario-information.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_INFORMATION_H
- #define __ARIO_INFORMATION_H
- 
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- #include <config.h>
- #include "sources/ario-source.h"
- 
-Index: src/plugins/ario-plugin-info.c
-===================================================================
---- src/plugins/ario-plugin-info.c	(revision 772)
-+++ src/plugins/ario-plugin-info.c	(revision 774)
-@@ -27,7 +27,7 @@
- 
- #include <string.h>
- #include <glib/gi18n.h>
--#include <glib/gkeyfile.h>
-+#include <glib.h>
- 
- #include "plugins/ario-plugin-info-priv.h"
- #include "ario-debug.h"
-Index: src/sources/ario-search.h
-===================================================================
---- src/sources/ario-search.h	(revision 772)
-+++ src/sources/ario-search.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_SEARCH_H
- #define __ARIO_SEARCH_H
- 
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- #include <config.h>
- #include "sources/ario-source.h"
- 
-Index: src/sources/ario-storedplaylists.h
-===================================================================
---- src/sources/ario-storedplaylists.h	(revision 772)
-+++ src/sources/ario-storedplaylists.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_STOREDPLAYLISTS_H
- #define __ARIO_STOREDPLAYLISTS_H
- 
--#include <gtk/gtkhpaned.h>
-+#include <gtk/gtk.h>
- #include <config.h>
- #include "sources/ario-source.h"
- 
-Index: src/sources/ario-source-manager.h
-===================================================================
---- src/sources/ario-source-manager.h	(revision 772)
-+++ src/sources/ario-source-manager.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_SOURCE_MANAGER_H
- #define __ARIO_SOURCE_MANAGER_H
- 
--#include <gtk/gtknotebook.h>
-+#include <gtk/gtk.h>
- #include "sources/ario-source.h"
- 
- G_BEGIN_DECLS
-Index: src/sources/ario-browser.h
-===================================================================
---- src/sources/ario-browser.h	(revision 772)
-+++ src/sources/ario-browser.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_BROWSER_H
- #define __ARIO_BROWSER_H
- 
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- #include "sources/ario-source.h"
- 
- #define MAX_TREE_NB 5
-Index: src/sources/ario-tree.h
-===================================================================
---- src/sources/ario-tree.h	(revision 772)
-+++ src/sources/ario-tree.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_TREE_H
- #define __ARIO_TREE_H
- 
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- #include "servers/ario-server.h"
- #include "sources/ario-source.h"
- #include "shell/ario-shell-coverdownloader.h"
-Index: src/ario-util.h
-===================================================================
---- src/ario-util.h	(revision 772)
-+++ src/ario-util.h	(revision 774)
-@@ -18,8 +18,8 @@
-  */
- 
- #include "servers/ario-server.h"
--#include "glib/gslist.h"
--#include "gdk/gdkpixbuf.h"
-+#include <glib.h>
-+#include <gdk/gdk.h>
- 
- /* Number of covers used to generate the drag & drop image */
- #define MAX_COVERS_IN_DRAG 3
-Index: src/ario-main.c
-===================================================================
---- src/ario-main.c	(revision 772)
-+++ src/ario-main.c	(revision 774)
-@@ -21,7 +21,7 @@
- #include <locale.h>
- #include <libintl.h>
- #include <gtk/gtk.h>
--#include <gdk/gdkkeysyms.h>
-+#include <gdk/gdk.h>
- #include <curl/curl.h>
- #include <libxml/parser.h>
- #include <glib/gi18n.h>
-Index: src/ario-profiles.h
-===================================================================
---- src/ario-profiles.h	(revision 772)
-+++ src/ario-profiles.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_PROFILES_H
- #define __ARIO_PROFILES_H
- 
--#include <glib/gslist.h>
-+#include <glib.h>
- #include "servers/ario-server.h"
- 
- G_BEGIN_DECLS
-Index: src/covers/ario-cover-handler.h
-===================================================================
---- src/covers/ario-cover-handler.h	(revision 772)
-+++ src/covers/ario-cover-handler.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkdialog.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __ARIO_COVER_HANDLER_H
- #define __ARIO_COVER_HANDLER_H
-Index: src/covers/ario-cover.c
-===================================================================
---- src/covers/ario-cover.c	(revision 772)
-+++ src/covers/ario-cover.c	(revision 774)
-@@ -19,8 +19,7 @@
- 
- #include "covers/ario-cover.h"
- #include <glib.h>
--#include <gtk/gtkdialog.h>
--#include <gtk/gtkmessagedialog.h>
-+#include <gtk/gtk.h>
- #include <string.h>
- #include <glib/gi18n.h>
- #include "ario-util.h"
-Index: src/preferences/ario-others-preferences.h
-===================================================================
---- src/preferences/ario-others-preferences.h	(revision 772)
-+++ src/preferences/ario-others-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_OTHERS_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-lyrics-preferences.h
-===================================================================
---- src/preferences/ario-lyrics-preferences.h	(revision 772)
-+++ src/preferences/ario-lyrics-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_LYRICS_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-server-preferences.h
-===================================================================
---- src/preferences/ario-server-preferences.h	(revision 772)
-+++ src/preferences/ario-server-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_SERVER_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-cover-preferences.h
-===================================================================
---- src/preferences/ario-cover-preferences.h	(revision 772)
-+++ src/preferences/ario-cover-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_COVER_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-browser-preferences.h
-===================================================================
---- src/preferences/ario-browser-preferences.h	(revision 772)
-+++ src/preferences/ario-browser-preferences.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkdialog.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __ARIO_BROWSER_PREFERENCES_H
- #define __ARIO_BROWSER_PREFERENCES_H
-Index: src/preferences/ario-taskbar-preferences.h
-===================================================================
---- src/preferences/ario-taskbar-preferences.h	(revision 772)
-+++ src/preferences/ario-taskbar-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_TASKBAR_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-stats-preferences.h
-===================================================================
---- src/preferences/ario-stats-preferences.h	(revision 772)
-+++ src/preferences/ario-stats-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_STATS_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-connection-preferences.h
-===================================================================
---- src/preferences/ario-connection-preferences.h	(revision 772)
-+++ src/preferences/ario-connection-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_CONNECTION_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/preferences/ario-playlist-preferences.h
-===================================================================
---- src/preferences/ario-playlist-preferences.h	(revision 772)
-+++ src/preferences/ario-playlist-preferences.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_PLAYLIST_PREFERENCES_H
- 
- #include <glib.h>
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/lib/gtk-builder-helpers.h
-===================================================================
---- src/lib/gtk-builder-helpers.h	(revision 772)
-+++ src/lib/gtk-builder-helpers.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkbuilder.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __GTK_BUILDER_HELPERS_H
- #define __GTK_BUILDER_HELPERS_H
-Index: src/widgets/ario-dnd-tree.h
-===================================================================
---- src/widgets/ario-dnd-tree.h	(revision 772)
-+++ src/widgets/ario-dnd-tree.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_DND_TREE_H
- #define __ARIO_DND_TREE_H
- 
--#include <gtk/gtktreeview.h>
-+#include <gtk/gtk.h>
- #include <config.h>
- 
- G_BEGIN_DECLS
-Index: src/widgets/ario-songlist.h
-===================================================================
---- src/widgets/ario-songlist.h	(revision 772)
-+++ src/widgets/ario-songlist.h	(revision 774)
-@@ -21,10 +21,7 @@
- #define __ARIO_SONGLIST_H
- 
- #include <glib.h>
--#include <gtk/gtkscrolledwindow.h>
--#include <gtk/gtkliststore.h>
--#include <gtk/gtktreeview.h>
--#include <gtk/gtkuimanager.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/widgets/ario-tray-icon.h
-===================================================================
---- src/widgets/ario-tray-icon.h	(revision 772)
-+++ src/widgets/ario-tray-icon.h	(revision 774)
-@@ -26,8 +26,7 @@
- 
- #include <config.h>
- #include "shell/ario-shell.h"
--#include <gtk/gtkuimanager.h>
--#include <gtk/gtkstatusicon.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/widgets/ario-volume.h
-===================================================================
---- src/widgets/ario-volume.h	(revision 772)
-+++ src/widgets/ario-volume.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_VOLUME_H
- #define __ARIO_VOLUME_H
- 
--#include <gtk/gtkeventbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/widgets/ario-connection-widget.h
-===================================================================
---- src/widgets/ario-connection-widget.h	(revision 772)
-+++ src/widgets/ario-connection-widget.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_CONNECTION_WIDGET_H
- #define __ARIO_CONNECTION_WIDGET_H
- 
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- 
- #define ARIO_DEFAULT_TIMEOUT 5000
- 
-Index: src/widgets/ario-firstlaunch.h
-===================================================================
---- src/widgets/ario-firstlaunch.h	(revision 772)
-+++ src/widgets/ario-firstlaunch.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_FIRSTLAUNCH_H
- #define __ARIO_FIRSTLAUNCH_H
- 
--#include <gtk/gtkassistant.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/widgets/ario-header.h
-===================================================================
---- src/widgets/ario-header.h	(revision 772)
-+++ src/widgets/ario-header.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_HEADER_H
- #define __ARIO_HEADER_H
- 
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/widgets/ario-lyrics-editor.h
-===================================================================
---- src/widgets/ario-lyrics-editor.h	(revision 772)
-+++ src/widgets/ario-lyrics-editor.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkvbox.h>
-+#include <gtk/gtk.h>
- #include "lyrics/ario-lyrics-provider.h"
- 
- #ifndef __ARIO_LYRICS_EDITOR_H
-Index: src/widgets/ario-tooltip.h
-===================================================================
---- src/widgets/ario-tooltip.h	(revision 772)
-+++ src/widgets/ario-tooltip.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_TOOLTIP_H
- 
- #include <config.h>
--#include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/shell/ario-shell-coverdownloader.h
-===================================================================
---- src/shell/ario-shell-coverdownloader.h	(revision 772)
-+++ src/shell/ario-shell-coverdownloader.h	(revision 774)
-@@ -21,7 +21,7 @@
- #define __ARIO_SHELL_COVERDOWNLOADER_H
- 
- #include <glib.h>
--#include <gtk/gtkwindow.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/shell/ario-shell-preferences.h
-===================================================================
---- src/shell/ario-shell-preferences.h	(revision 772)
-+++ src/shell/ario-shell-preferences.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkdialog.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __ARIO_SHELL_PREFERENCES_H
- #define __ARIO_SHELL_PREFERENCES_H
-Index: src/shell/ario-shell.h
-===================================================================
---- src/shell/ario-shell.h	(revision 772)
-+++ src/shell/ario-shell.h	(revision 774)
-@@ -20,7 +20,7 @@
- #ifndef __ARIO_SHELL_H
- #define __ARIO_SHELL_H
- 
--#include <gtk/gtkwindow.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-Index: src/shell/ario-shell-lyrics.h
-===================================================================
---- src/shell/ario-shell-lyrics.h	(revision 772)
-+++ src/shell/ario-shell-lyrics.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkwindow.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __ARIO_SHELL_LYRICS_H
- #define __ARIO_SHELL_LYRICS_H
-Index: src/shell/ario-shell-lyricsselect.h
-===================================================================
---- src/shell/ario-shell-lyricsselect.h	(revision 772)
-+++ src/shell/ario-shell-lyricsselect.h	(revision 774)
-@@ -22,7 +22,7 @@
- #define __ARIO_SHELL_LYRICSSELECT_H
- 
- #include <glib.h>
--#include <gtk/gtkdialog.h>
-+#include <gtk/gtk.h>
- #include "lyrics/ario-lyrics.h"
- 
- G_BEGIN_DECLS
-Index: src/shell/ario-shell-songinfos.h
-===================================================================
---- src/shell/ario-shell-songinfos.h	(revision 772)
-+++ src/shell/ario-shell-songinfos.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkdialog.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __ARIO_SHELL_SONGINFOS_H
- #define __ARIO_SHELL_SONGINFOS_H
-Index: src/shell/ario-shell-similarartists.h
-===================================================================
---- src/shell/ario-shell-similarartists.h	(revision 772)
-+++ src/shell/ario-shell-similarartists.h	(revision 774)
-@@ -17,7 +17,7 @@
-  *
-  */
- 
--#include <gtk/gtkwindow.h>
-+#include <gtk/gtk.h>
- 
- #ifndef __ARIO_SHELL_SIMILARARTISTS_H
- #define __ARIO_SHELL_SIMILARARTISTS_H
-Index: src/shell/ario-shell-coverselect.h
-===================================================================
---- src/shell/ario-shell-coverselect.h	(revision 772)
-+++ src/shell/ario-shell-coverselect.h	(revision 774)
-@@ -22,7 +22,7 @@
- #define __ARIO_SHELL_COVERSELECT_H
- 
- #include <glib.h>
--#include <gtk/gtkdialog.h>
-+#include <gtk/gtk.h>
- #include "servers/ario-server.h"
- 
- G_BEGIN_DECLS
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 772)
-+++ configure.ac	(revision 774)
-@@ -298,9 +298,11 @@
- if test x"$enable_deprecations" = xyes; then
-         WARNINGS="$WARNINGS -DG_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
-+-DGTK_DISABLE_SINGLE_INCLUDES \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
---DGSEAL_ENABLE"
-+-DGSEAL_ENABLE \
-+-DG_DISABLE_SINGLE_INCLUDES"
- fi
- AC_SUBST(WARNINGS)
- 
diff --git a/media-sound/ario/metadata.xml b/media-sound/ario/metadata.xml
index 8d7f9eb01e64..948969c65670 100644
--- a/media-sound/ario/metadata.xml
+++ b/media-sound/ario/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="idle">Enable experimental support for MPD's idle command to reduce bandwidth and cpu usage, requires MPD 0.14</flag>
-		<flag name="scrobbler">Enable audioscrobbler/last.fm support <pkg>net-libs/libsoup</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">ario-player</remote-id>