gentoo auto-resync : 21:10:2022 - 20:03:11

6 files changed, 12 insertions, 7 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a7daa305d233..64be12f1ac21 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index d0cbea506cca..66d338543c8b 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -4,6 +4,6 @@ AUX inkscape-1.2.1-poppler-22.09.0.patch 3129 BLAKE2B ad2125d617b7e06618ec97301a
 DIST inkscape-1.1.2.tar.xz 34222832 BLAKE2B cb9bd271ff209055a6f5c2d99fd93dde29c7cb8c1b7caa7061dd1380ea914d5ccc6f5a91c5356c68bf0fd1462a3a5178e9774d0aeadcfceee9f0ea5f4beee73b SHA512 55884f34e6fcc604027e7ea60f67702a658d3838332c1f3b56ec2cb05ab44992df0651ed741d6e7e807848366b24ee7415d0908ed1143b0bfb33ddbf26ae5c16
 DIST inkscape-1.2.1.tar.xz 98048464 BLAKE2B 2de10beb5a90ba81e2f212710dc78fce7c72acef5d004ab86f443b97dcf12e65fb755d7a2655520bd94561a71664dc75abd1ebf9e6bbba14c912cac487b7f18c SHA512 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521
 EBUILD inkscape-1.1.2-r1.ebuild 4766 BLAKE2B c78b42e3493150529e6acdc3b77b954a3dfdb290a9cda6fd8f13f1cdd20f4d2f6bea6f52ce574a34391e1914060d17a4c05a6738a28031e300f2cf0a82431aa9 SHA512 d7292f0412b6e05dc3204acb6a6e6c3b954d251327be8615c7e0e3e9deb04b4307d2f2f3969b37f627269d5d93edfffb47551b19a6bce56a222699368778845a
-EBUILD inkscape-1.2.1-r2.ebuild 5246 BLAKE2B fa3766c643f963e4a8efef08e4a158bf8f81871074ac4678b09871af7d39545852030a3af1cf33246be63cb0700a31273e665e577c485d367e38e6d7e08104e5 SHA512 aaf9071a08137857024dca1d1f3b551a165e81cc78cb53d638a0ad8917b5b13781b492ecb20d6f3744101127e8c23571fb7b93906775f619972789397a08d948
+EBUILD inkscape-1.2.1-r2.ebuild 5245 BLAKE2B 5dca547affc500e3c298b5abdd03693745af2e8c65d83cb6bbf201a00cadfa77aaddb40245bcf16f1b9ee0c602136d1a6fdb478845560a9967f70157390cee05 SHA512 bf063bda186bd10c2810174ced82bcaee68ae7ef49c46ec17854a59fc2542afd1634f645d83f8085e90c22cc248824dfa15ce35f2cc8e471304f531d2514cd7f
 EBUILD inkscape-9999.ebuild 5097 BLAKE2B 56f3b92587210fb8d495696cc11a07e155faf90374cdc451410869496d285e8fb5abb536ec7ac4c0578aa5839cc9511db9d995d363fb288b525c2d192c56cae5 SHA512 68ea2fa49d1457636da8c4ec039463cb5be12201a599810c1b89b9c9b045854b5ad59ee0555809e0257c69fb15899e854f567619787c6414d774125199039cff
 MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0
diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
index cee8aa000e16..e4746b6d759e 100644
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest
index 947fe9145095..68c203274efd 100644
--- a/media-gfx/xli/Manifest
+++ b/media-gfx/xli/Manifest
@@ -1,8 +1,8 @@
 AUX Xli.ad 123 BLAKE2B 4ea6d6b8b4e0ddf53ac1e5fb1fc67c000b48843e114b3349a9021096ee27af135c998f2013377c2b31cc2885f2eaf627ce343d25fd5cad407a4def92a87bb192 SHA512 a37a8054e1533bc46f0e24b88137bf2ea8a7294f16e37edd6c323f42d28bfa0dc93b74d41fb1cb3df3488754db42fb5a269c42ae08dade61f22b8c42c8cd9c8b
-AUX xli-1.17.0-clang16.patch 402 BLAKE2B 573dd4c4cd06b4d1cc12a3ca646666a3a122c554f4579b9639a6f81b1157ea2edf8c460144e92f9bf5e1450f759dbfed02dc1fa5701bcfa9efe0f097a97b2406 SHA512 58741aa0d0bbc09b8f25477f1752d7c8cb1f3295de91787d855d31d271cc46b353b2714ed1f35a6a9181fe250c9c5cec96b04fe0bcc421a6411f02d20aa7f466
+AUX xli-1.17.0-clang16.patch 564 BLAKE2B 291cdffe92a5d693580b3b157bd1c0d5576ace21fcb8e762365aee8bf1435b5d1a2680615fc64681930e31c71b8546b7ce3a9e61c1757156b6b7f728b23ac589 SHA512 915109038994a77b02c218b2cf507af880087f50874a14f74f05f58d284026180d02dc066973136e5e803a734e81577ee05b70392d448fc4557172b824db65fd
 AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e37116ffa22ccb752840e999d95aa227d74b16f76dd704840be404910c5d1bc340de57e8108b8a7e4edc58cd5fc6dce4299a2 SHA512 b77348b83e26b0684cf7292100bbdbbd2c3f7b025f14588f7b52935d997b7ca51c3aad70479ce74cd9193a045436b39233b7ebb1fea6abcdf3d3a9dc21c8b84f
 AUX xli-1.17.0-libpng14.patch 245 BLAKE2B 681fd31f8d7f812272e54dc67de31ece9a936f4608d339e9d63fe7bdc2ba257d20d7ce01fb00b120662557bdfa44b908bbeb4e136665abdadeb062c1425e7af7 SHA512 079162bfd639994ea6553b49f9370faf5becee8ec1e99a1e71f43e32968f244c5a393433fba8920a399a9eb8bc4a3ec6097903bd2eaff46bdeef55f1f90d1fcf
 AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e
 DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7
-EBUILD xli-1.17.0-r6.ebuild 2223 BLAKE2B bb6a293d9a99e6fde2b3c0b581346a186d50a14b771c4a9007ef1714b28880644344490995d949546e69f5935a7ea5dca50d69f7a14f42f7b4f5b3cbf2eff54f SHA512 8c758306103debfd86a8be2c3d1287ee38eff702f9f29d7d9da6e4eb6ba571ac890eb3030d81a5305ced060034083e03e64144b9bd2aae442b6bde9e18e1cbb8
+EBUILD xli-1.17.0-r6.ebuild 2145 BLAKE2B ca8a689edcade26e9e9d362a78fd46c14eecb2b84fcfd7bbc580e43d326aa77a6b2e2262d40b586e944e842d919022bbad2afb6696b0a53a62b5a58e6c5fef38 SHA512 8d58c6f32a94984381fdd533b69246a59870f242df0f87a7e39c75596b70e6b05b172666790cbeda3a471d46867be1afe202d8f38bf78c880430e2b53a7e42a1
 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
diff --git a/media-gfx/xli/files/xli-1.17.0-clang16.patch b/media-gfx/xli/files/xli-1.17.0-clang16.patch
index 99a5ee44c4eb..bf60765db8b6 100644
--- a/media-gfx/xli/files/xli-1.17.0-clang16.patch
+++ b/media-gfx/xli/files/xli-1.17.0-clang16.patch
@@ -1,4 +1,11 @@
 https://bugs.gentoo.org/870790
+--- a/send.c
++++ b/send.c
+@@ -37,3 +37,3 @@
+ {
+-  int         (*old_handler)();
++  int         (*old_handler)(Display *, XErrorEvent *);
+   Pixmap        pixmap;
 --- a/window.c
 +++ b/window.c
 @@ -211,3 +211,3 @@
diff --git a/media-gfx/xli/xli-1.17.0-r6.ebuild b/media-gfx/xli/xli-1.17.0-r6.ebuild
index 573868770552..a33109d2bef3 100644
--- a/media-gfx/xli/xli-1.17.0-r6.ebuild
+++ b/media-gfx/xli/xli-1.17.0-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 SNAPSHOT="2005-02-27"
 DESCRIPTION="X Load Image: view images or load them to root window"
@@ -61,8 +61,6 @@ src_prepare() {
 }
 
 src_configure() {
-	append-cflags -std=gnu89 # old codebase, incompatible with c2x
-
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
 		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }