Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/notify-osd/
Date: Mon, 02 Apr 2018 09:13:51
Message-Id: 1522660421.ab99b6be02c03c34b1315038efb01beb097197b5.pacho@gentoo
1 commit: ab99b6be02c03c34b1315038efb01beb097197b5
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 2 08:57:18 2018 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 2 09:13:41 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab99b6be
7
8 x11-misc/notify-osd: gsettings-desktop-schemas needed (#559010)
9
10 Package-Manager: Portage-2.3.27, Repoman-2.3.9
11
12 ...d-0.9.34.ebuild => notify-osd-0.9.34-r1.ebuild} | 31 +++++++++++++---------
13 1 file changed, 19 insertions(+), 12 deletions(-)
14
15 diff --git a/x11-misc/notify-osd/notify-osd-0.9.34.ebuild b/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
16 similarity index 72%
17 rename from x11-misc/notify-osd/notify-osd-0.9.34.ebuild
18 rename to x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
19 index 70ae583ebe5..95bd82cc072 100644
20 --- a/x11-misc/notify-osd/notify-osd-0.9.34.ebuild
21 +++ b/x11-misc/notify-osd/notify-osd-0.9.34-r1.ebuild
22 @@ -1,8 +1,8 @@
23 -# Copyright 1999-2012 Gentoo Foundation
24 +# Copyright 1999-2018 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26
27 -EAPI=4
28 -inherit autotools gnome2-utils multilib savedconfig
29 +EAPI=6
30 +inherit autotools gnome2-utils savedconfig
31
32 DESCRIPTION="Canonical's on-screen-display notification agent"
33 HOMEPAGE="https://launchpad.net/notify-osd"
34 @@ -13,34 +13,39 @@ SLOT="0"
35 KEYWORDS="~amd64 ~x86"
36 IUSE="minimal"
37
38 -COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
39 - >=dev-libs/glib-2.16
40 +COMMON_DEPEND="
41 + >=dev-libs/dbus-glib-0.98
42 + >=dev-libs/glib-2.16:2
43 >=x11-libs/gtk+-3.2:3
44 >=x11-libs/libnotify-0.7
45 - >=x11-libs/libwnck-3
46 + >=x11-libs/libwnck-3:3
47 x11-libs/libX11
48 x11-libs/pixman
49 !x11-misc/notification-daemon
50 - !x11-misc/qtnotifydaemon"
51 + !x11-misc/qtnotifydaemon
52 +"
53 RDEPEND="${COMMON_DEPEND}
54 - !minimal? ( x11-themes/notify-osd-icons )"
55 + gnome-base/gsettings-desktop-schemas
56 + !minimal? ( x11-themes/notify-osd-icons )
57 +"
58 DEPEND="${COMMON_DEPEND}
59 virtual/pkgconfig
60 gnome-base/gnome-common
61 - x11-proto/xproto"
62 + x11-proto/xproto
63 +"
64
65 RESTRICT="test" # virtualx.eclass: 1 of 1: FAIL: test-modules
66
67 -DOCS=( AUTHORS ChangeLog NEWS README TODO )
68 -
69 src_prepare() {
70 + default
71 sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
72 restore_config src/{bubble,defaults,dnd}.c #428134
73 + mv configure.in configure.ac || die
74 eautoreconf
75 }
76
77 src_configure() {
78 - econf --libexecdir=/usr/$(get_libdir)/${PN}
79 + econf --libexecdir="/usr/$(get_libdir)/${PN}"
80 }
81
82 src_install() {
83 @@ -53,10 +58,12 @@ pkg_preinst() {
84 gnome2_icon_savelist
85 gnome2_schemas_savelist
86 }
87 +
88 pkg_postinst() {
89 gnome2_icon_cache_update
90 gnome2_schemas_update
91 }
92 +
93 pkg_postrm() {
94 gnome2_icon_cache_update
95 gnome2_schemas_update