gentoo resync : 18.12.2020

7 files changed, 5 insertions, 256 deletions

diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index abaa16d7be09..c974b0dd39ea 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,14 +1,7 @@
-AUX libxfce4ui-4.15.3-kb-shortcut.patch 1373 BLAKE2B 7a582825c629a0a578d0aa5687f937dc81beec768293ca89211b6a820dc8ad23763c4ec13c8514003ad45ba7ec158bb6b7c6b3f23e53b58078baa34c1edb5217 SHA512 62dbebb708fa7845f9d36ab623dc7590fd37752ba092c6caf6e6635d358281cf7fd76aedf551d0fb36e95d2c6a11fad0c221aa874d7fcad16c19fc131652f264
 DIST libxfce4ui-4.14.1.tar.bz2 756175 BLAKE2B d487cc0a04b6053ead6670eeb83cafe1c4098818d5ad6a94a81176720d78cfd65160156961cbb526baa1640ae66a5c6958f707b7078c412d81fcd24cc8cf4013 SHA512 f42f41da3a683a0c56c3b1e7ba420c4f50909d2613e681d053b09b50bc0eb7f750f44c892e94b0ee8b9207983a87c0cadbda1ad93d0df74ae351dc8812025407
-DIST libxfce4ui-4.15.3.tar.bz2 756530 BLAKE2B ca2a9d5aae80d22a97b2fe932248756c9f34f71a13342670cdc0ad1c5393eb62d4f5bed8b21a45a60c762a83ebf1458deb7ef629c4dd3c894468ecf16a821dcf SHA512 a0e5a60c54df811fa2815238f9fe506700f6df8a6baa8172a6f8c68f005b54ba94ee31aba87d635fb506700da9c77e25f8c57268018fc8cfa5577f29aab58a6b
-DIST libxfce4ui-4.15.4.tar.bz2 825895 BLAKE2B 46687dea72d17a3693c31f69bd4d1961397bf00d9395935778c8c5b90e6e56585fa2e64fe4be817ad44994841218d7cce98ade033914c56ea82a04ae7e1b70e7 SHA512 af2545f6d72df1a13d926a52b5124c52f34fbee0b2db6664292f74bcc3d93cb42263eab57beb9f882be42b6530649b2c7e42d496817f1b34b7d2b67b29e6deb1
-DIST libxfce4ui-4.15.5.tar.bz2 813220 BLAKE2B 5925ea1e25abf485e04902b47da6e09d228297b7137dbeedb8c60655e2005ded37138d12482f8321928994f2bfb8d351bb18f2eb47f288d810f58ce75e378c06 SHA512 daa666826e2b4d876025a3c93b6caf40b063b456660116f5c4c8b2beb9a9eb26d6228785cc7e6435d2a38b68c15261fc872a8cf3e03af0969342e3396a6b2a49
-DIST libxfce4ui-4.15.6.tar.bz2 823475 BLAKE2B 11193a72be188dc205ad24d7ea06ac21f93679d58bed273d78ff04180226eab14fd211bd2feba9b3ade20539364f90229bdfe226c2b1e4b6f6a17f7444feb26d SHA512 608daf350b8fb43ae4eb70b6d7e684528bcc90360f6d29b182da4f04bc51f5c191e27369dfa1554b6840dbdefbe132cfc66935b6f2d88dcc62f67f929b9423ec
 DIST libxfce4ui-4.15.7.tar.bz2 807676 BLAKE2B 0280d0e35244740d016fc4cd8afebb5a70348226011473117c3b7124abcc597baf8015754bb8aaa2fa3f0560d1a98d68f319c5b5870e1c8f5543c0a9458eb541 SHA512 0fd05bbaa42d3f3a0df552fb7419ebc390e6292f4bae58d4c9d6137421cdd55f17756e51c3adcd5ad6e7c92f277b9485ea1d791ef1295ac3d65d86201fc33a6a
+DIST libxfce4ui-4.15.8.tar.bz2 817242 BLAKE2B f0d85fd6e35f65ed416085fbd5da4a1624d8ea9eb90b692463f41e840cea943dbf25a9d057db6101288000fad46468efa4417be87ef24b02f2f73c0a6d11c144 SHA512 a6ea4b6fc1542f6bbc2a2003e1836f1e24ea8c36460460e9e7eddafc7c3c36206fe94a9ccdc17b3b488e857d11a1f1b21ff248349a9820fe9a584bb9dcc1a90f
 EBUILD libxfce4ui-4.14.1.ebuild 1704 BLAKE2B 83defd465a237ed31b648de09e2f657c3510d3dec1b52a217b4795be00e6206aa7b14f7b073c16cfe0def3155eb577e0a3b0985bc5a582ab6d0f9c264b47c408 SHA512 69d4fb24cc2a9b56e0fa2bc5d4d754cf8e02be58095a96fa0b459c84a8939b36adbd157c1debd42f116f77f484839d518d561d1218c4d1a0acb2c806c3c471cc
-EBUILD libxfce4ui-4.15.3-r1.ebuild 1616 BLAKE2B ebc2d2e7089d9a68a08155b6f547e6e82c8d755a406c6a9ea563f8f4ac544ad2918aa4ed07875bfe0a6f3ea9c53601862ffbc8ed665f4e97466cc0adc36c3c5a SHA512 7e0364be788992bd60ae8a1d0493e19c5ccc05d1e4a2fb4f2723d73e7c6dfd1de67ab2cc1c232858f57a69564a38dec50de1a0b1cde6dd6e0f0dd5a89d0da8df
-EBUILD libxfce4ui-4.15.4.ebuild 1565 BLAKE2B ee74c6a252293de607b8a79cfe7688cd59a08a7f6eabfd41242096d2116be8d91137190335944a0f3a21b02bd3020e158b76f21b13e0f3c7f8625db3375d482f SHA512 1dbe43388a3b95bfd70bdd04e8d8b5f5e2fd1717d3ee9fb285456cb35b7a441eb05d7ca1b8d544377133efc2ed30ad3372da65c5f10b36f5976afeba90a241af
-EBUILD libxfce4ui-4.15.5.ebuild 1565 BLAKE2B ee74c6a252293de607b8a79cfe7688cd59a08a7f6eabfd41242096d2116be8d91137190335944a0f3a21b02bd3020e158b76f21b13e0f3c7f8625db3375d482f SHA512 1dbe43388a3b95bfd70bdd04e8d8b5f5e2fd1717d3ee9fb285456cb35b7a441eb05d7ca1b8d544377133efc2ed30ad3372da65c5f10b36f5976afeba90a241af
-EBUILD libxfce4ui-4.15.6.ebuild 1715 BLAKE2B 16a20624a3f4430ae5c0eee6d3f68cfb9a74fdb360e1522ff69645e6e6c2c6486c3c489842b8af5d818d7b2d6adefbd7914a215fa25df5a9b66bfaebba6ebc9e SHA512 42f73013c47ca2689a613e63a769818255afb99619519a7176fba7fa666aa86799d32dabad9e24b2f5a31a1383dd6c4d47181f1f78455f6a04d589c8e217e4e4
 EBUILD libxfce4ui-4.15.7.ebuild 1723 BLAKE2B c50676b7cf95eab5ede993e56fc25a67234e9dd1e6cdc9497c773ce5364ef88686e99937d38819e9acedda4d6c119eb07e350be1f2419acf69a8adf63b58671a SHA512 dedb611fc323942612f1622f2a98047590d4921df3021e6f4d00621277355a4c5a5a961437fd23a844ac94cb370b6e3e0626cdee018547d41b4b85606d4f087c
-MISC metadata.xml 593 BLAKE2B 16965dd3af7895be9fe30759384efb4d8bae5db40126efafacfd86fd7854418444a0fceb70427e02805df4fedab5c85722f6d927fa1cdf524bdb3d1b27f247bc SHA512 c270452868990d5cb5f17ac3eef8a19ac44be399f83453f5e7ce542e2dc82ad84fd19ba71a414e9e36040b9cb95dc29f4628ec2d73b1213e9beba29fab914ca3
+EBUILD libxfce4ui-4.15.8.ebuild 1723 BLAKE2B c50676b7cf95eab5ede993e56fc25a67234e9dd1e6cdc9497c773ce5364ef88686e99937d38819e9acedda4d6c119eb07e350be1f2419acf69a8adf63b58671a SHA512 dedb611fc323942612f1622f2a98047590d4921df3021e6f4d00621277355a4c5a5a961437fd23a844ac94cb370b6e3e0626cdee018547d41b4b85606d4f087c
+MISC metadata.xml 500 BLAKE2B 8c4d37d66b1a09a2fe75a1083c83c05ce98d694decbb2aa17d639383c91ab960ca1b729b71ee9a47636f3de4a130a6d0c6ead94a7983090746f355cc4156ba06 SHA512 e1578203a3f9dd88b7df619fdad8ca1ef9e83536f4453b8c302211b6d257d5f5ff09419f769bbf5fb0be0ea10a148107533cf0422bb96833b0d906f4f8ee9155
diff --git a/xfce-base/libxfce4ui/files/libxfce4ui-4.15.3-kb-shortcut.patch b/xfce-base/libxfce4ui/files/libxfce4ui-4.15.3-kb-shortcut.patch
deleted file mode 100644
index bfce065fdef4..000000000000
--- a/xfce-base/libxfce4ui/files/libxfce4ui-4.15.3-kb-shortcut.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0fc934ebee037a91e032d362d83d991309c4ce88 Mon Sep 17 00:00:00 2001
-From: Harald Judt <h.judt@gmx.at>
-Date: Sat, 4 Jul 2020 00:22:31 +0200
-Subject: [PATCH] Always return GTK_RESPONSE_OK for accepted shortcut keys
- (fixes #20)
-
-Commit a41dcb19 replaced the deprecated gtk_keyboard_ungrab code but
-also erroneously put the gtk_dialog_response call inside the
-gdk_seat_grab check, while it should be inside the shortcut_accepted
-check. This commit restores the original logic, thus properly setting
-the accepted shortcut key and closing the dialog.
-
-Closes !4
----
- libxfce4kbd-private/xfce-shortcut-dialog.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libxfce4kbd-private/xfce-shortcut-dialog.c b/libxfce4kbd-private/xfce-shortcut-dialog.c
-index 427855a..ae9c195 100644
---- a/libxfce4kbd-private/xfce-shortcut-dialog.c
-+++ b/libxfce4kbd-private/xfce-shortcut-dialog.c
-@@ -424,10 +424,10 @@ xfce_shortcut_dialog_key_released (XfceShortcutDialog *dialog,
-                          TRUE, NULL, NULL, NULL, NULL))
-         {
-           gdk_seat_ungrab (seat);
--
--          /* Exit dialog with positive response */
--          gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-         }
-+
-+      /* Exit dialog with positive response */
-+      gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-     }
-   else
-     {
--- 
-2.26.2
-
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.3-r1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.3-r1.ebuild
deleted file mode 100644
index 9d9f9229dd38..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.15.3-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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+ GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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+-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 )
-	introspection? ( dev-libs/gobject-introspection:= )
-	libgtop? ( gnome-base/libgtop )
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-kb-shortcut.patch
-)
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable libgtop glibtop)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.4.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.4.ebuild
deleted file mode 100644
index cddd13c8d5ef..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.15.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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+ GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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+-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 )
-	introspection? ( dev-libs/gobject-introspection:= )
-	libgtop? ( gnome-base/libgtop )
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable libgtop glibtop)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.5.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.5.ebuild
deleted file mode 100644
index cddd13c8d5ef..000000000000
--- a/xfce-base/libxfce4ui/libxfce4ui-4.15.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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+ GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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+-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 )
-	introspection? ( dev-libs/gobject-introspection:= )
-	libgtop? ( gnome-base/libgtop )
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# stupid vala.eclass...
-	default
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable libgtop glibtop)
-		$(use_enable startup-notification)
-		$(use_enable vala)
-		$(use_enable glade gladeui2)
-		--with-vendor-info=Gentoo
-	)
-
-	use vala && vala_src_prepare
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.6.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.8.ebuild
index ba60530e9b5b..5ec78d67a32b 100644
--- a/xfce-base/libxfce4ui/libxfce4ui-4.15.6.ebuild
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.15.8.ebuild
@@ -20,7 +20,7 @@ RDEPEND=">=dev-libs/glib-2.50:2
 	x11-libs/libX11
 	x11-libs/libICE
 	x11-libs/libSM
-	>=xfce-base/libxfce4util-4.12:=[introspection?]
+	>=xfce-base/libxfce4util-4.15.6:=[introspection?]
 	>=xfce-base/xfconf-4.12:=
 	glade? ( dev-util/glade:3.10 )
 	introspection? ( dev-libs/gobject-introspection:= )
@@ -28,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.50:2
 	system-info? (
 		dev-libs/libgudev
 		gnome-base/libgtop
-		media-libs/libepoxy
+		>=media-libs/libepoxy-1.2
 	)"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-lang/perl
diff --git a/xfce-base/libxfce4ui/metadata.xml b/xfce-base/libxfce4ui/metadata.xml
index b44a362a8f7f..dec4318de656 100644
--- a/xfce-base/libxfce4ui/metadata.xml
+++ b/xfce-base/libxfce4ui/metadata.xml
@@ -8,7 +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>
     <flag name="system-info">Enable system information in xfce4-about.</flag>
   </use>
 </pkgmetadata>