[gentoo-commits] proj/gnome:master commit in: sys-apps/gnome-disk-utility/

[Gilles Dartiguelongue]

commit:     94588479f279aba93b84e36689d0984439ef5090
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 24 14:43:32 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 19:17:21 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=94588479

sys-apps/gnome-disk-utility: sync live ebuild

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x5A56C8CD0C13248A

 .../gnome-disk-utility-9999.ebuild                 | 40 ++++++++++++----------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild 
b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
index e54f0677..7c0c84ba 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=6
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit gnome-meson
 if [[ ${PV} = 9999 ]]; then
-       inherit gnome2-live
+       SRC_URI=""
+       EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gnome-disk-utility.git";
+       inherit git-r3
 fi
 
 DESCRIPTION="Disk Utility for GNOME using udisks"
@@ -20,35 +20,39 @@ IUSE="fat gnome systemd"
 if [[ ${PV} = 9999 ]]; then
        KEYWORDS=""
 else
-       KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 fi
 
 COMMON_DEPEND="
-       >=dev-libs/glib-2.31:2[dbus]
-       >=sys-fs/udisks-2.1.1:2
-       >=x11-libs/gtk+-3.16.0:3
        >=app-arch/xz-utils-5.0.5
        >=app-crypt/libsecret-0.7
+       >=dev-libs/glib-2.31:2[dbus]
        dev-libs/libpwquality
+       >=media-libs/libcanberra-0.1[gtk3]
+       >=media-libs/libdvdread-4.2.0
+       >=sys-fs/udisks-2.7.2:2
+       >=x11-libs/gtk+-3.16.0:3
+       >=x11-libs/libnotify-0.7:=
        systemd? ( >=sys-apps/systemd-209:0= )
 "
 RDEPEND="${COMMON_DEPEND}
-       >=media-libs/libdvdread-4.2.0
-       >=media-libs/libcanberra-0.1[gtk3]
-       >=x11-libs/libnotify-0.7:=
-       >=x11-themes/gnome-icon-theme-symbolic-2.91
+       x11-themes/adwaita-icon-theme
        fat? ( sys-fs/dosfstools )
        gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
 "
+# libxml2+gdk-pixbuf required for glib-compile-resources
 DEPEND="${COMMON_DEPEND}
-       >=dev-util/intltool-0.50.2
        dev-libs/appstream-glib
        dev-libs/libxslt
+       dev-libs/libxml2:2
+       >=dev-util/meson-0.41.0
+       >=sys-devel/gettext-0.19.8
        virtual/pkgconfig
+       x11-libs/gdk-pixbuf:2
 "
 
 src_configure() {
-       gnome2_src_configure \
-               $(use_enable gnome gsd-plugin) \
-               $(use_enable systemd libsystemd)
+       gnome-meson_src_configure \
+               $(meson_use gnome enable-gsd-plugin) \
+               $(meson_use systemd enable-libsystemd)
 }