gentoo auto-resync : 08:12:2022 - 21:16:36

3 files changed, 2 insertions, 39 deletions

diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index 43667169b44c..0f2ed86d8985 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1,6 +1,5 @@
-AUX libICE-1.1.0-static-assert-fix.patch 1040 BLAKE2B fb50f4c5ddc227f468bf69a91d5de9ac275f6f37bd3e12082f1d7084bcf9feb46862a33f1109e6572fa66fe094221d428266b14e032dc8d490d32d9bf800e424 SHA512 07e462df794f5b12eaa045c66deb7685994814c45155089339efc094895b197179d1bd9766049cf900374c2c70a004ddd9bed5662fc96276f71cc4fe61682d8c
 DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f SHA512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
-DIST libICE-1.1.0.tar.xz 335864 BLAKE2B c18ae08d61632d6a495b479045cafadaabb556fc55d5107b8b6c323cc7523a153d083a89016e2a84aa810735c542ba7bac7fa70620036b74125f65bdf920c40d SHA512 bf8ca11a20bc120337003a8ef1c190e26e3650dede653287aae7893abd8c72191401d90ddc4bb9b367ae832eee23a22d02b0d4a3b9071c392f865379034b2838
+DIST libICE-1.1.1.tar.xz 335960 BLAKE2B 2849418aa0a66a9137481194bb91208fae4a1eb9a4f9f509b52da7668b8281b6c36f4ba4bdc686eb008a2561b89801fb9270b22887b7c5044e6c14a1ae94dfae SHA512 2f7833a25f31cc743ca95cb88f9a8403b50e19ffb5bf43bfef87ba405857d359789daaa9ec2391351237d958f16d35dbf082adb76d301e46d3a54162a6b452d3
 EBUILD libICE-1.0.10-r1.ebuild 705 BLAKE2B ec84151d3792e185d97aee46735e9702f5396623b1ecb184b6efd125f534e2420686570e7e7153f1f52cebd90f45ee7551b749107ca5f9980995d6f9fe3d5d37 SHA512 5400d1d21ac457b08b33c0b78104fe2e1d4563465803853c119b412c33b7dabd8010f68a2f30ea2e0b532e8a82f8472bbad9cd7d0164d9e89fe37b5c44da11d0
-EBUILD libICE-1.1.0-r1.ebuild 763 BLAKE2B 4ec6b574097f36a405fb26f8374a8243b880ef9a5e89a9286ba0701ff73f3573c447ce5f97585adbd8bbe307ab7888ccccab8ab54d34331ab21ef046de28c1c5 SHA512 8c3aa394e54351b8e8cf5e0abdb7c78f5f252eee44948026b1b8fcf47d5e530b5c2691f5143974403f50e65371e40d3b3e46aa1574c4f54bfd624d121f7a66c6
+EBUILD libICE-1.1.1.ebuild 699 BLAKE2B 8a4aed4393d107ba69e7d7b23a81999e9176acc168aa283133454bbedb6fb841df39241649aff8197e2e29877b8331c644a4500221ade297ff55e1872937503e SHA512 2362caae0fde4fcd8ebb5696cd7ec44da8122282bd165b0d8dd49c49870bc082be4f9643d916ed4b8b15c27b118ec0b890264db76aa0df6a83f0f8f77ec1479c
 MISC metadata.xml 337 BLAKE2B c895594110c07848bd58cf4a28df82dbdc5f26671689386a667afd32f3925d4b401887d992282416213be51536ee4d24fd00c0f85d52c98eb71d66854209055b SHA512 2718c47a51ba70e9622bd3bf5e6d987fa2f57d122e25aa972f71585ddf3dbdb8bf34eaa0492846e6230d951f8d557948e1d7e3f54ee27765b63e8f9f2e6fe604
diff --git a/x11-libs/libICE/files/libICE-1.1.0-static-assert-fix.patch b/x11-libs/libICE/files/libICE-1.1.0-static-assert-fix.patch
deleted file mode 100644
index 5d6d4bbc441d..000000000000
--- a/x11-libs/libICE/files/libICE-1.1.0-static-assert-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e176b676cff17948d68299c00dddefe41638c752 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
-Date: Sun, 4 Dec 2022 22:19:20 +0100
-Subject: [PATCH] ICEmsg: Fix C++ interoperability error due to static_assert
- define
-
-Commit 0269c687e954db7aca2a4344e32cb203315a00b6 added a static_assert helper
-that gets defined to blank if left undefined by assert.h.  As this is not a
-macro in other languages that use this header, this can lead to a compile-time
-error.
-
-Bug: https://bugs.gentoo.org/884369
----
- include/X11/ICE/ICEmsg.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/X11/ICE/ICEmsg.h b/include/X11/ICE/ICEmsg.h
-index b6bad13..13e1509 100644
---- a/include/X11/ICE/ICEmsg.h
-+++ b/include/X11/ICE/ICEmsg.h
-@@ -34,7 +34,7 @@ Author: Ralph Mor, X Consortium
- #include <X11/ICE/ICEconn.h>
- 
- #include <assert.h>
--#ifndef static_assert
-+#if !defined(__cplusplus) && !defined(static_assert)
- #define static_assert(cond, msg) /* skip for non-C11 compilers */
- #endif
- 
--- 
-GitLab
-
diff --git a/x11-libs/libICE/libICE-1.1.0-r1.ebuild b/x11-libs/libICE/libICE-1.1.1.ebuild
index 1d54eb6c66d3..4166e1d11bec 100644
--- a/x11-libs/libICE/libICE-1.1.0-r1.ebuild
+++ b/x11-libs/libICE/libICE-1.1.1.ebuild
@@ -18,10 +18,6 @@ RDEPEND="${DEPEND}
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-static-assert-fix.patch"
-)
-
 XORG_CONFIGURE_OPTIONS=(
 	--enable-ipv6
 	--disable-docs