gentoo resync : 15.12.2019

3 files changed, 24 insertions, 28 deletions

diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index c227e730fa48..82fad53d9b6d 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,5 +1,5 @@
-DIST libxfce4ui-4.13.4.tar.bz2 684065 BLAKE2B 1da875832683b5e06b8e91b4078be8122ae85a91560d7b1768cb8c880fcf5e1d7cd07d24927ae3325ba9c500c6c2cd30e717e517775492b9948add0711f5aa40 SHA512 c82d6ff7ea0da4fc0f664bab92f1e9531162996a26bb092e6ba651cfc4551732cbcd8023908d428b47906c17c331c14bf4804256566ca564befa218dc1194206
 DIST libxfce4ui-4.14.1.tar.bz2 756175 BLAKE2B d487cc0a04b6053ead6670eeb83cafe1c4098818d5ad6a94a81176720d78cfd65160156961cbb526baa1640ae66a5c6958f707b7078c412d81fcd24cc8cf4013 SHA512 f42f41da3a683a0c56c3b1e7ba420c4f50909d2613e681d053b09b50bc0eb7f750f44c892e94b0ee8b9207983a87c0cadbda1ad93d0df74ae351dc8812025407
-EBUILD libxfce4ui-4.13.4.ebuild 1711 BLAKE2B a49d29068497e77e2ea67fcc3f4041b14306bb5dab95aca97fb3c013bae3a1aab6296ef8378d52beab4a0b3acbd96586c9709dcbf04cd965458bbda8e5410f14 SHA512 0e0e72bc4854643da866ccaf7de404675ebee935329d872fac59fb9af17d7c38d5f7df3762e4d53fe5ead9fb540c0f93f91d38366ff55bc4454f5168cd4d3111
+DIST libxfce4ui-4.15.0.tar.bz2 711299 BLAKE2B 60e13f3ed415fb138b256f19ec81b13bafb3f1223a996b18ef93b847346b593246012e8bded9c88dc5a905f355eb838b2295c0c91c8eb6d0d966efe748a0e15f SHA512 0a430d79dcc0088b061b020c78235775da5829b9c862e7201db4abca0d1753198c21f43ec0649e6c434ac9b382ff920a250895cb7ca38691a60f86e2e07fe6d0
 EBUILD libxfce4ui-4.14.1.ebuild 1706 BLAKE2B d00bec3f1dbf1214439a3020a244d73b327ea215585982b327ab85c49fbe9fa362510c2657be71a03cd341b201efa714d05120466cd7187031d8017736fe18b4 SHA512 14607aead820a3efeb17cbdab5d7786053a8ee1c35490550ba2de2e8bb8970ec6cc5ea4bcdd2baaa1728a816ff4ad83a1df5238eca3b4a55e4d5aff7750aef4b
-MISC metadata.xml 422 BLAKE2B b6215119e3f826c198e24eca0a32f244fff44e185be8f17e9c568ea54cf5a40e102e48431539f4797bb07e6dcad1374fb1fe560b637be7864711000efd28dc4c SHA512 e66d13a060043bda0b9eb2c632e3564dc0c81fff21bf0e08725b0d95d7c43d6673147e7bd6752660731316d357d8ec8424b4ee82d4e851af8c5ff36222d43d10
+EBUILD libxfce4ui-4.15.0.ebuild 1569 BLAKE2B 7957460abc6d35d29ca998f0be2c490423e2f98e1b9e815eef3bcc350448052cdc6fdf9cd7b77dd4ded97bffd5ac56e0b5ae82aea94d113eef614e7faed5c034 SHA512 e797e1de51807ecd8b69c69195f8c39be0e9b4ba23129253a937a2a0de0870156723047ecce7ba33c1f070743f18bcf2261a3741914951a7be5d6535499c58b1
+MISC metadata.xml 515 BLAKE2B b0ddce75f198a496e2d7f1f658091c1301190aadef8f5a9a65b43e4f1a3c2a915e14329bd512984e13a2189eafb56bf00b571e9c4668fa5026eef01bb718d92c SHA512 ab5ebbf64571d8b5b7c1be3c329fa641ddb7ed5447066d5a207dce7487605bf2f86c13dce27788a17b2262efeec2845d42bf2aa9ca7dc16778b7288b77d29886
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.0.ebuild
index 33e0f2424207..c412d638a219 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.13.4.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.15.0.ebuild
@@ -1,38 +1,37 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils vala
+inherit xdg-utils vala
 
 DESCRIPTION="Unified widget and session management libs for Xfce"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug glade introspection startup-notification vala"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug glade introspection libgtop startup-notification vala"
 REQUIRED_USE="vala? ( introspection )"
 
-RDEPEND=">=dev-libs/glib-2.42:2=
-	>=x11-libs/gtk+-2.24:2=
-	>=x11-libs/gtk+-3.18:3=[introspection?]
-	x11-libs/libX11:=
-	x11-libs/libICE:=
-	x11-libs/libSM:=
+RDEPEND=">=dev-libs/glib-2.42:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
 	>=xfce-base/libxfce4util-4.12:=[introspection?]
 	>=xfce-base/xfconf-4.12:=
-	glade? ( dev-util/glade:3.10= )
+	glade? ( dev-util/glade:3.10 )
 	introspection? ( dev-libs/gobject-introspection:= )
-	startup-notification? ( x11-libs/startup-notification:= )
-	vala? ( $(vala_depend) )
-	!xfce-base/xfce-utils"
-DEPEND="${RDEPEND}
-	dev-lang/perl
+	libgtop? ( gnome-base/libgtop )
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
 	dev-util/intltool
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
 
 src_prepare() {
 	# stupid vala.eclass...
@@ -42,13 +41,9 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		$(use_enable introspection)
+		$(use_enable libgtop glibtop)
 		$(use_enable startup-notification)
 		$(use_enable vala)
-		# 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
 	)
@@ -64,9 +59,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/xfce-base/libxfce4ui/metadata.xml b/xfce-base/libxfce4ui/metadata.xml
index c9c136a2dab2..b16ea0c2efba 100644
--- a/xfce-base/libxfce4ui/metadata.xml
+++ b/xfce-base/libxfce4ui/metadata.xml
@@ -8,5 +8,6 @@
   <use>
     <flag name="glade">Build support for Glade 3's GtkBuilder implementation</flag>
     <flag name="gtk2">Build deprecated GTK+2 libxfce4ui-1 library.</flag>
+    <flag name="libgtop">Enable system information via <pkg>gnome-base/libgtop</pkg>.</flag>
   </use>
 </pkgmetadata>