Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: xfce-base/libxfce4ui/
Date: Mon, 26 Jun 2017 14:42:58
Message-Id: 1498488166.a393734630094aec17dfc998cc778205f877c4e9.mgorny@gentoo
1 commit: a393734630094aec17dfc998cc778205f877c4e9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 26 14:23:05 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 26 14:42:46 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3937346
7
8 xfce-base/libxfce4ui: Bump to 4.13.2, EAPI=6
9
10 xfce-base/libxfce4ui/Manifest | 2 +-
11 ...e4ui-4.13.1.ebuild => libxfce4ui-4.13.2.ebuild} | 42 ++++++++++++++--------
12 2 files changed, 29 insertions(+), 15 deletions(-)
13
14 diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
15 index dbf23da77d9..92100af05a4 100644
16 --- a/xfce-base/libxfce4ui/Manifest
17 +++ b/xfce-base/libxfce4ui/Manifest
18 @@ -1,2 +1,2 @@
19 DIST libxfce4ui-4.13.0.tar.bz2 688646 SHA256 22f0b66a33945f347952249589f71618418f1e47ca847850eb0ee1bdb0c353d4 SHA512 342c4fb09b3f13e066b994c54cd557a65c116566b8201217cb663851ba387932cdd4ebf2274f32bdc97a98b3a2bd1b59de75ef6cc4c6f5d0e5f1910b7eca591e WHIRLPOOL 37d9d68af580482186e5f1bd078b72b48339ee032b85e38ea944b2a08e80deead2887fbee9f30b15251214bb0aae7cc92857f2559db116767c96f630ad5b7d80
20 -DIST libxfce4ui-4.13.1.tar.bz2 691839 SHA256 2a257d73ccf30c1939df2e6ba879c925a1290ae2877a79b27d389e09e01c917d SHA512 056f6c944f1060f43037427304fccc7bb835a0ba5263d9c2f41c5cd2f980a61d4c45f9aa4b97004bae0b57e0020de0af43345b28f53748cea94fcd97fe785523 WHIRLPOOL 6f4b2879d9e930efff4c0f10746a879b67c81367f5c0960da29617147a8e1571f64538f2aa03e7fcf91d75e466b8b11d36f8aa8c272b6483b051fe5502d814d5
21 +DIST libxfce4ui-4.13.2.tar.bz2 705425 SHA256 8d881273e6be286f0c6c6f1aa1df2dbd3d92114b2e7fbe02979043fc80d8f4f1 SHA512 fbf823283f46b1cd73e830c70d848a2e15ecef2037e2249390ecf580f66f23f8ea766f5f19e46e1513b2ce3a692c2bff53f1c54ef00eaede065ac0c7a85c1908 WHIRLPOOL 74aa1fef4679a878d4e65224676de4683cdac32ce8d9fbdf5b00aeb030bb3f037d798b3cdf7259e7fbfa33cdd413f0f69c2e8906e910b0efcfe7ca5ec10e8953
22
23 diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.13.2.ebuild
24 similarity index 62%
25 rename from xfce-base/libxfce4ui/libxfce4ui-4.13.1.ebuild
26 rename to xfce-base/libxfce4ui/libxfce4ui-4.13.2.ebuild
27 index 4e1d31fb152..90846401101 100644
28 --- a/xfce-base/libxfce4ui/libxfce4ui-4.13.1.ebuild
29 +++ b/xfce-base/libxfce4ui/libxfce4ui-4.13.2.ebuild
30 @@ -1,8 +1,9 @@
31 # Copyright 1999-2017 Gentoo Foundation
32 # Distributed under the terms of the GNU General Public License v2
33
34 -EAPI=5
35 -inherit xfconf
36 +EAPI=6
37 +
38 +inherit gnome2-utils
39
40 DESCRIPTION="Unified widget and session management libs for Xfce"
41 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
42 @@ -11,17 +12,18 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
43 LICENSE="LGPL-2"
44 SLOT="0"
45 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
46 -IUSE="debug glade startup-notification"
47 +IUSE="debug glade introspection startup-notification"
48
49 -RDEPEND=">=dev-libs/glib-2.30:2=
50 +RDEPEND=">=dev-libs/glib-2.42:2=
51 >=x11-libs/gtk+-2.24:2=
52 - >=x11-libs/gtk+-3.2:3=
53 + >=x11-libs/gtk+-3.18:3=[introspection?]
54 x11-libs/libX11:=
55 x11-libs/libICE:=
56 x11-libs/libSM:=
57 - >=xfce-base/libxfce4util-4.12:=
58 + >=xfce-base/libxfce4util-4.12:=[introspection?]
59 >=xfce-base/xfconf-4.12:=
60 glade? ( dev-util/glade:3.10= )
61 + introspection? ( dev-libs/gobject-introspection:= )
62 startup-notification? ( x11-libs/startup-notification:= )
63 !xfce-base/xfce-utils"
64 DEPEND="${RDEPEND}
65 @@ -30,20 +32,32 @@ DEPEND="${RDEPEND}
66 sys-devel/gettext
67 virtual/pkgconfig"
68
69 -pkg_setup() {
70 - XFCONF=(
71 +src_configure() {
72 + local myconf=(
73 + $(use_enable introspection)
74 $(use_enable startup-notification)
75 - $(xfconf_use_debug)
76 - # does not build without GTK+3, #585684
77 - --enable-gtk3
78 + # TODO: check revdeps and make it optional one day
79 + --enable-gtk2
80 # requires deprecated glade:3 (gladeui-1.0), bug #551296
81 --disable-gladeui
82 # this one's for :3.10
83 $(use_enable glade gladeui2)
84 --with-vendor-info=Gentoo
85 - )
86 + )
87 +
88 + econf "${myconf[@]}"
89 +}
90 +
91 +src_install() {
92 + default
93
94 - [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
95 + find "${D}" -name '*.la' -delete || die
96 +}
97 +
98 +pkg_postinst() {
99 + gnome2_icon_cache_update
100 +}
101
102 - DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
103 +pkg_postrm() {
104 + gnome2_icon_cache_update
105 }