[gentoo-commits] repo/gentoo:master commit in: xfce-base/libxfce4ui/

["Michał Górny" <mgorny@gentoo.org>]

commit:     a393734630094aec17dfc998cc778205f877c4e9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 26 14:23:05 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 14:42:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3937346

xfce-base/libxfce4ui: Bump to 4.13.2, EAPI=6

 xfce-base/libxfce4ui/Manifest                      |  2 +-
 ...e4ui-4.13.1.ebuild => libxfce4ui-4.13.2.ebuild} | 42 ++++++++++++++--------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index dbf23da77d9..92100af05a4 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,2 +1,2 @@
 DIST libxfce4ui-4.13.0.tar.bz2 688646 SHA256 22f0b66a33945f347952249589f71618418f1e47ca847850eb0ee1bdb0c353d4 SHA512 342c4fb09b3f13e066b994c54cd557a65c116566b8201217cb663851ba387932cdd4ebf2274f32bdc97a98b3a2bd1b59de75ef6cc4c6f5d0e5f1910b7eca591e WHIRLPOOL 37d9d68af580482186e5f1bd078b72b48339ee032b85e38ea944b2a08e80deead2887fbee9f30b15251214bb0aae7cc92857f2559db116767c96f630ad5b7d80
-DIST libxfce4ui-4.13.1.tar.bz2 691839 SHA256 2a257d73ccf30c1939df2e6ba879c925a1290ae2877a79b27d389e09e01c917d SHA512 056f6c944f1060f43037427304fccc7bb835a0ba5263d9c2f41c5cd2f980a61d4c45f9aa4b97004bae0b57e0020de0af43345b28f53748cea94fcd97fe785523 WHIRLPOOL 6f4b2879d9e930efff4c0f10746a879b67c81367f5c0960da29617147a8e1571f64538f2aa03e7fcf91d75e466b8b11d36f8aa8c272b6483b051fe5502d814d5
+DIST libxfce4ui-4.13.2.tar.bz2 705425 SHA256 8d881273e6be286f0c6c6f1aa1df2dbd3d92114b2e7fbe02979043fc80d8f4f1 SHA512 fbf823283f46b1cd73e830c70d848a2e15ecef2037e2249390ecf580f66f23f8ea766f5f19e46e1513b2ce3a692c2bff53f1c54ef00eaede065ac0c7a85c1908 WHIRLPOOL 74aa1fef4679a878d4e65224676de4683cdac32ce8d9fbdf5b00aeb030bb3f037d798b3cdf7259e7fbfa33cdd413f0f69c2e8906e910b0efcfe7ca5ec10e8953

diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.13.2.ebuild
similarity index 62%
rename from xfce-base/libxfce4ui/libxfce4ui-4.13.1.ebuild
rename to xfce-base/libxfce4ui/libxfce4ui-4.13.2.ebuild
index 4e1d31fb152..90846401101 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.13.1.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.13.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit xfconf
+EAPI=6
+
+inherit gnome2-utils
 
 DESCRIPTION="Unified widget and session management libs for Xfce"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -11,17 +12,18 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug glade startup-notification"
+IUSE="debug glade introspection startup-notification"
 
-RDEPEND=">=dev-libs/glib-2.30:2=
+RDEPEND=">=dev-libs/glib-2.42:2=
 	>=x11-libs/gtk+-2.24:2=
-	>=x11-libs/gtk+-3.2:3=
+	>=x11-libs/gtk+-3.18:3=[introspection?]
 	x11-libs/libX11:=
 	x11-libs/libICE:=
 	x11-libs/libSM:=
-	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/libxfce4util-4.12:=[introspection?]
 	>=xfce-base/xfconf-4.12:=
 	glade? ( dev-util/glade:3.10= )
+	introspection? ( dev-libs/gobject-introspection:= )
 	startup-notification? ( x11-libs/startup-notification:= )
 	!xfce-base/xfce-utils"
 DEPEND="${RDEPEND}
@@ -30,20 +32,32 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-pkg_setup() {
-	XFCONF=(
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
 		$(use_enable startup-notification)
-		$(xfconf_use_debug)
-		# does not build without GTK+3, #585684
-		--enable-gtk3
+		# TODO: check revdeps and make it optional one day
+		--enable-gtk2
 		# requires deprecated glade:3 (gladeui-1.0), bug #551296
 		--disable-gladeui
 		# this one's for :3.10
 		$(use_enable glade gladeui2)
 		--with-vendor-info=Gentoo
-		)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
 
-	[[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
 
-	DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+pkg_postrm() {
+	gnome2_icon_cache_update
 }