gentoo auto-resync : 26:07:2022 - 08:58:19

4 files changed, 2 insertions, 90 deletions

diff --git a/xfce-extra/xfce4-wavelan-plugin/Manifest b/xfce-extra/xfce4-wavelan-plugin/Manifest
index 6578782c34f3..a5b795295a8f 100644
--- a/xfce-extra/xfce4-wavelan-plugin/Manifest
+++ b/xfce-extra/xfce4-wavelan-plugin/Manifest
@@ -1,6 +1,3 @@
-AUX xfce4-wavelan-plugin-0.6.2-close-definition.patch 1551 BLAKE2B d4d13dc82bcc990562b2fd40207e0ecf39b51fbc157eff92ce726e34708691531da3fa35d9c3245f00a1ae5b738ee35d12019c9adb24b455c15b256bbceacf5d SHA512 ad15a7fcae2a3254d59c5a856d6e3e4a523748ad58edae3aeec1bb7044dd025c0d7dab83f756715813a64f32ddd94ba73deddef5f846198fd8c35c36ca3a01f9
-DIST xfce4-wavelan-plugin-0.6.2.tar.bz2 356954 BLAKE2B 982ffbc5f72d5771650b4e8d6c64f468bf927febca8c65d8a20258043e1c9433ee9c4631eb501e620f6a1037852494e3f66fe2700e08063ee770cedcad857475 SHA512 90e0d5f2e9add1f177f0f69e537ccdeeaf518a122feb776cb8bce139b9af6ea7d248e758ae381b69041bbdefe2d38f2162d08b25fd246d98c3a028d743892123
 DIST xfce4-wavelan-plugin-0.6.3.tar.bz2 364789 BLAKE2B 3d39eb0716efaccd8effd6f6a89da9e0f749cbffdf2bdebeb021ebd8ed9c8f3f5eb728db8ebacf52cc977db827d9b0536c9c42a94caa40469172fce800fc71ef SHA512 a49af2c59f59890790081525a793638c673446b4a3f77584013cf87201fc0cf3218622834c32918daeb3fd2d87511db19512b903c60f8ccd58ae5c4f78507b7a
-EBUILD xfce4-wavelan-plugin-0.6.2-r1.ebuild 755 BLAKE2B 22550aee14b753c70e2e07fd5f3d99a969e06ea625238dbaf134e969d68aa008a8ee7623b3e7725bd5cb4a941c8b20b0868548ddd947b6a9312bbc18eb7b051a SHA512 14c538a8652329187b4aa3596c3cca137fa61bc3c16da1b9e49fb9e8a82672015e6baeaa3e5d6f953d50ef61741a728973e7ad0bdf6c0a1aa184b29dcb18c992
-EBUILD xfce4-wavelan-plugin-0.6.3.ebuild 708 BLAKE2B 3dc1d744c4b01f031b0eaf3c429a3e7fd52f50a9d112c35efe1b2009f05c683aa7a94f43d99ea7d0df623e934ad1a0273c585122954e20fdf3ccce5893472def SHA512 46c253e81d2d949c5c9304954a5cc263a3524f89b5ed7e46823d3ffe7988576f4390acfb726e64895708c82c71eede4e294a7fd4b393e1ceb569c397bc617b9c
+EBUILD xfce4-wavelan-plugin-0.6.3.ebuild 706 BLAKE2B 910de66061319a49aeab654cab682346c5a1c69bad5b8f93de9fc3ba1b89f6bbc98b066b71a7a2346cd179c694115ec3caaedf1ceee1d8732bccce2e5728a428 SHA512 ec71896b0a9ba6cb26c68c14574dd2ae1a51c03db478830c9b494881c3d156f630c6d5d97817a4a70a8826f3dd39c3a5ed400e7bc2de7c1f60e6d0e61997feb4
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.6.2-close-definition.patch b/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.6.2-close-definition.patch
deleted file mode 100644
index bc27e2c12afc..000000000000
--- a/xfce-extra/xfce4-wavelan-plugin/files/xfce4-wavelan-plugin-0.6.2-close-definition.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/merge_requests/4
-https://bugs.gentoo.org/799827
-
-From: Olaf Hering <olaf@aepfle.de>
-Date: Fri, 25 Jun 2021 19:37:09 +0200
-Subject: [PATCH] remove bogus close function
-
-Just close the file descriptor, instead of doing shutdown.
-
-Not doing so was already wrong in 2006.
-
-wi_linux.c:83:1: error: conflicting types for 'close'
- close(int fd)
- ^~~~~
-In file included from /usr/include/glib-2.0/gio/gcredentials.h:32:0,
-                 from /usr/include/glib-2.0/gio/gio.h:46,
-                 from /usr/include/xfce4/libxfce4util/xfce-gio-extensions.h:28,
-                 from /usr/include/xfce4/libxfce4util/libxfce4util.h:40,
-                 from wi_linux.c:32:
-/usr/include/unistd.h:353:12: note: previous declaration of 'close' was here
- extern int close (int __fd);
-            ^~~~~
-make[2]: *** [Makefile:525: libwavelan_la-wi_linux.lo] Error 1
-make[2]: Leaving directory '/home/abuild/rpmbuild/BUILD/xfce4-wavelan-plugin-20210505T194034.7ba466b/panel-plugin'
-
-Signed-off-by: Olaf Hering <olaf@aepfle.de>
---- a/panel-plugin/wi_linux.c
-+++ b/panel-plugin/wi_linux.c
-@@ -31,6 +31,7 @@
- 
- #include <libxfce4util/libxfce4util.h>
- 
-+#include <unistd.h>
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -79,17 +80,9 @@ wi_open(const char *interface)
-   return(device);
- }
- 
--static void
--close(int fd)
--{
--  shutdown(fd, SHUT_RDWR);
--}
--
- void
- wi_close(struct wi_device *device)
- {
--  g_return_if_fail(device != NULL);
--
-   close(device->socket);
-   g_free(device);
- }
-GitLab
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.2-r1.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.2-r1.ebuild
deleted file mode 100644
index 32d002845fc5..000000000000
--- a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A panel plug-in to display wireless interface statistics"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86"
-
-DEPEND=">=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
-	>=xfce-base/xfce4-panel-4.12:="
-RDEPEND="${DEPEND}
-	kernel_linux? ( sys-apps/net-tools )"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-close-definition.patch
-)
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.3.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.3.ebuild
index 8e5e6922eea5..ea587e91560f 100644
--- a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.3.ebuild
+++ b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]