Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: sys-apps/gnome-disk-utility/
Date: Fri, 07 Dec 2018 12:16:28
Message-Id: 1544184964.4b67c1b0e07fc5b1738678c4e4ce62205b17aced.leio@gentoo
1 commit: 4b67c1b0e07fc5b1738678c4e4ce62205b17aced
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 7 12:16:04 2018 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 7 12:16:04 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4b67c1b0
7
8 sys-apps/gnome-disk-utility-9999: blind sync
9
10 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
11 Package-Manager: Portage-2.3.52, Repoman-2.3.11
12
13 .../gnome-disk-utility-9999.ebuild | 30 ++++++++++------------
14 1 file changed, 14 insertions(+), 16 deletions(-)
15
16 diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
17 index 7c0c84ba..2a8440c7 100644
18 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
19 +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-9999.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2018 Gentoo Foundation
22 +# Copyright 1999-2018 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=6
26 @@ -12,27 +12,25 @@ if [[ ${PV} = 9999 ]]; then
27 fi
28
29 DESCRIPTION="Disk Utility for GNOME using udisks"
30 -HOMEPAGE="https://git.gnome.org/browse/gnome-disk-utility"
31 +HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
32
33 LICENSE="GPL-2+"
34 SLOT="0"
35 IUSE="fat gnome systemd"
36 -if [[ ${PV} = 9999 ]]; then
37 - KEYWORDS=""
38 -else
39 +if [[ ${PV} != 9999 ]]; then
40 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
41 fi
42
43 COMMON_DEPEND="
44 - >=app-arch/xz-utils-5.0.5
45 + >=dev-libs/glib-2.31:2
46 + >=sys-fs/udisks-2.7.6:2
47 + >=x11-libs/gtk+-3.16.0:3
48 >=app-crypt/libsecret-0.7
49 - >=dev-libs/glib-2.31:2[dbus]
50 - dev-libs/libpwquality
51 + >=dev-libs/libpwquality-1.0.0
52 >=media-libs/libcanberra-0.1[gtk3]
53 >=media-libs/libdvdread-4.2.0
54 - >=sys-fs/udisks-2.7.2:2
55 - >=x11-libs/gtk+-3.16.0:3
56 >=x11-libs/libnotify-0.7:=
57 + >=app-arch/xz-utils-5.0.5
58 systemd? ( >=sys-apps/systemd-209:0= )
59 "
60 RDEPEND="${COMMON_DEPEND}
61 @@ -40,19 +38,19 @@ RDEPEND="${COMMON_DEPEND}
62 fat? ( sys-fs/dosfstools )
63 gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
64 "
65 -# libxml2+gdk-pixbuf required for glib-compile-resources
66 +# appstream-glib for developer_name tag in appdata (gettext-0.19.8.1 own appdata.its file doesn't have it yet)
67 +# libxml2 for xml-stripblanks in gresource
68 DEPEND="${COMMON_DEPEND}
69 dev-libs/appstream-glib
70 - dev-libs/libxslt
71 dev-libs/libxml2:2
72 - >=dev-util/meson-0.41.0
73 + dev-libs/libxslt
74 + dev-util/glib-utils
75 >=sys-devel/gettext-0.19.8
76 virtual/pkgconfig
77 - x11-libs/gdk-pixbuf:2
78 "
79
80 src_configure() {
81 gnome-meson_src_configure \
82 - $(meson_use gnome enable-gsd-plugin) \
83 - $(meson_use systemd enable-libsystemd)
84 + $(meson_use gnome gsd_plugin) \
85 + $(meson_use systemd libsystemd)
86 }