gentoo auto-resync : 24:06:2023 - 01:25:35

10 files changed, 175 insertions, 155 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a8eecaadacca..dfb9d34e687e 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 51321ce19e7b..77252a2bc89f 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,6 +1,7 @@
+AUX fontforge-20230101-workaround-broken-translations.patch 5219 BLAKE2B 17ead2e7c178911b48de35c6c86ce60b486a000c05ea5d11e79094851b9e4e68e32335a33ef2b49aeaf0fb161b3823e35f1b281feae426b9b69baabb35c5e02c SHA512 250850a8345511b222faeb7cf6209d412611491a5c9d83f7ad14408b1936059c4fe52cbe834b5d26579281539156b93e692bd8873aea445f23b5d78a0e1684f8
 AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674
 DIST fontforge-20220308.tar.xz 13719032 BLAKE2B 66939a77014b086b95ea21c3af2a2c910c19ebba000d50e514000667a6b193f5a90fc55b6046793811cac3a7330c479973746ac09041f21b0237047105f4d305 SHA512 9975cffec8aa47bcb8c22405bea544cd263dc939b253e8fba2fbaa3b90a60e05b98eaf58365db8ae854d1fff8e641866a7e2e027003ae03a77104d6650dafb6c
 DIST fontforge-20230101.tar.xz 13761728 BLAKE2B 69e79e7c5d8b551a847ba8706157b0f559ae2a85f61711f50e4855eb6a177bbfb25de2650caf9bc8a7dd1d6af074ca5063519b2f3c151d8c784c4750c6ddc1d8 SHA512 7684a2824d5199e230d2e0a654c2119cef422a57b64e6dd75afde6ba623abed6581f596fd5b7509e03f3b3ad3cf69629aafd4c85aeda64fa91a9e1ab88c9b418
 EBUILD fontforge-20220308-r1.ebuild 2782 BLAKE2B e606ee0c6542c488e6af89dc2b6cd064b07b1e7c8e055d34682261be5da5531e12c57b20889bc85d37f7bbf21aedbe9a739323c58f389ddd0ed6745b87b8245a SHA512 af5a9009e57f75e77e1b1bcfffbee3ce31bea35e6732c655b21f5a9d8777c74467d53aa4930852a66e42f6098dfe569711c618778ac7256b1161bed3ae405d12
-EBUILD fontforge-20230101.ebuild 2809 BLAKE2B 47727551a64eb953f9e812f8914bd7d3c64f6ab1056b6c595ed777a630ed10b0bb75530b4748cf6e277059abde21be10334d116371f5b853371db7299c3768eb SHA512 8a0442e8420b160d48e40d4873daf07eded3202c0191dd9a9f6fa8980a686b0e67d03c6f3b38bfd51b1593da121b7c1a7728db5a9f2d8e0410b35d988588735c
+EBUILD fontforge-20230101.ebuild 2876 BLAKE2B 558dd465be9929cc2a9c6b728f46e9f3035f58f991e6c57be8726db73c1950302532fa06c3a7c52cb3a21a6c38c802458aa07d37ed589ab7750166fae2419404 SHA512 954952689766a1b65ccd97ff93fac89ef58c3ad79d6e42b6538378a5a95560749cdc20f8b25be31607280b785c12abd6f5b204b152b75fdb148fac1d587ba7d2
 MISC metadata.xml 863 BLAKE2B 6a87762712128bf3d57122277839008c4ef057491ae1c1680a166194037ed00e66816f2c0c09be8a17909843ad49b807c06405b95332684dbee3b8d60d30d7ae SHA512 8f33c7d38f031fbf85c82b9743db80c2a3c85ddddeb4deb631fbb911a8e6c2e97b43560b82539ac93df0c577abe74ef743fd4ca1a3e2e2f978b7edfd94cba280
diff --git a/media-gfx/fontforge/files/fontforge-20230101-workaround-broken-translations.patch b/media-gfx/fontforge/files/fontforge-20230101-workaround-broken-translations.patch
new file mode 100644
index 000000000000..e195e433be4e
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20230101-workaround-broken-translations.patch
@@ -0,0 +1,159 @@
+https://bugs.gentoo.org/908868
+https://savannah.gnu.org/bugs/index.php?64333
+https://github.com/fontforge/fontforge/issues/5251
+
+From f80f80871c6e3777f9974a44058f494eb5353c66 Mon Sep 17 00:00:00 2001
+From: blockiv <blockiv@tuta.io>
+Date: Thu, 22 Jun 2023 04:39:16 +0000
+Subject: [PATCH] Mark breaking translations as fuzzy
+
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -289,7 +289,7 @@ msgstr "chaîne %1$.30s pour %2$.30s"
+ #. GT: $2 is the glyph's encoding
+ #. GT: $3 is the font name
+ #. GT: $4 is the changed flag ('*' for the changed items)
+-#, c-format
++#, c-format, fuzzy
+ msgid "%1$.80s at %2$d from %3$.90s%4$s"
+ msgstr "%1$.80s à %2$d de %3$.90hs%4$s"
+ 
+@@ -300,7 +300,7 @@ msgstr "%1$.80s à %2$d de %3$.90hs%4$s"
+ #. GT: $2 is the glyph's encoding
+ #. GT: $3 is the pixel size of the bitmap font
+ #. GT: $4 is the font name
+-#, c-format
++#, c-format, fuzzy
+ msgid "%1$.80s at %2$d size %3$d from %4$.80s"
+ msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs"
+ 
+@@ -7427,7 +7427,7 @@ msgstr ""
+ "La fonte %1$.40s dans le fichier %2$.40s a été modifiée.\n"
+ "Voulez-vous l'enregistrer ?"
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid ""
+ "Font %1$.40s in file %2$.40s has been changed.\n"
+ "Reverting the file will lose those changes.\n"
+@@ -19920,7 +19920,7 @@ msgstr ""
+ "Le nom de la fonte commence avec une séquence d'ordre d'octet utf8.  Ceci "
+ "n'est pas permis.  %s"
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid ""
+ "The fonts %1$.30s and %2$.30s have a different number of glyphs or different "
+ "encodings"
+@@ -19928,7 +19928,7 @@ msgstr ""
+ "Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des "
+ "codages différents"
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid ""
+ "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, "
+ "one cubic)"
+@@ -19963,7 +19963,7 @@ msgstr ""
+ "Le glyphe %1$.30s dans %2$.30s a à la fois des références et des contours. "
+ "Ceci n'est pas supporté dans une fonte MM"
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid ""
+ "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours "
+ "than in %3$.30s"
+@@ -19979,7 +19979,7 @@ msgstr ""
+ "Le glyphe %1$.30s de la fonte %2$.30s a un nombre de points (ou de points de "
+ "contrôle) différent que dans %3$.30s"
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid ""
+ "The glyph %1$.30s in font %2$.30s has a different number of references than "
+ "in %3$.30s"
+@@ -20454,7 +20454,7 @@ msgstr ""
+ "individuellement. Cela peut être utile si vous vouliez\n"
+ "conserver les versions quadratiques et cubiques d'une fonte."
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s"
+ msgstr ""
+ "Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs"
+@@ -21040,7 +21040,7 @@ msgstr ""
+ msgid "There is already a subtable with that name, please pick another."
+ msgstr "Il y a déjà une sous-table avec ce nom, changez de nom SVP"
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid "There is already an anchor point named %1$.40s in %2$.40s."
+ msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs."
+ 
+@@ -21435,7 +21435,7 @@ msgstr ""
+ "Cette fonte ne précise pas de 'unitsPerEm', alors nous assumons que c'est "
+ "1000."
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid ""
+ "This font is based on the charset %1$.20s-%2$.20s-%3$d, but the best I've "
+ "been able to find is %1$.20s-%2$.20s-%4$d.\n"
+@@ -21764,7 +21764,7 @@ msgstr ""
+ "Et sur в, г, д, е, ж, л, м, ц, щ, ъ, ђ\n"
+ "Et sur toutes les lettres grecques minuscules. Et peut être tout le reste."
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid ""
+ "This kerning pair (%.20s and %.20s) is currently part of a kerning class "
+ "with a 0 offset for this combination. Would you like to alter this kerning "
+@@ -24544,7 +24544,7 @@ msgstr ""
+ "Vous voulez effacer %.30s qui est référencé par un\n"
+ "autre glyphe. Êtes-vous sûr(e) de vouloir poursuivre ?"
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid ""
+ "You are attempting to paste a reference to %1$s into %2$s.\n"
+ "But %1$s does not exist in this font, nor can I find the original character "
+@@ -24556,7 +24556,7 @@ msgstr ""
+ "glyphe auquel il se référait.\n"
+ "Le glyphe ne sera pas copié."
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid ""
+ "You are attempting to paste a reference to %1$s into %2$s.\n"
+ "But %1$s does not exist in this font.\n"
+--- a/po/it.po
++++ b/po/it.po
+@@ -2297,7 +2297,7 @@ msgstr "Riferimento invertito"
+ msgid "Flipping"
+ msgstr "Ribaltamento"
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid ""
+ "Font %1$.40s in file %2$.40s has been changed.\n"
+ "Reverting the file will lose those changes.\n"
+@@ -5830,7 +5830,7 @@ msgstr ""
+ msgid "The font does not contain a glyph named %s."
+ msgstr "Questo font non contiene un glifo chiamato %s."
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid ""
+ "The glyph %1$.30s has a different number of contours in font %2$.30s than in "
+ "%3$.30s"
+@@ -6229,7 +6229,7 @@ msgstr ""
+ msgid "This font does not specify font-face\n"
+ msgstr "Questo font non specifica il font-face\n"
+ 
+-#, c-format
++#, c-format, fuzzy
+ msgid ""
+ "This font is based on the charset %1$.20s-%2$.20s-%3$d, but the best I've "
+ "been able to find is %1$.20s-%2$.20s-%4$d.\n"
+-- 
+2.41.0
diff --git a/media-gfx/fontforge/fontforge-20230101.ebuild b/media-gfx/fontforge/fontforge-20230101.ebuild
index c8d28d29388a..001bb06fc921 100644
--- a/media-gfx/fontforge/fontforge-20230101.ebuild
+++ b/media-gfx/fontforge/fontforge-20230101.ebuild
@@ -52,6 +52,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/fontforge-doc-no-warn-error.patch
+	"${FILESDIR}"/${PN}-20230101-workaround-broken-translations.patch
 )
 
 pkg_setup() {
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 952fe9adea39..5599a9b11b7e 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,4 +1,3 @@
-AUX inkscape-1.2.1-poppler-22.09.0.patch 3129 BLAKE2B ad2125d617b7e06618ec97301add563fbf1aa99873a6da144438ac94cd79e715be3f7403e3af7769bbd13614bccbe855ac3c76dcac9f533fb745a6c538444b54 SHA512 937dd6662e86ee13d04ff5c2007d71f10bf7ed84f8a8a8162138d054076b85d9b2c835f55dc217b7abd688ee4524711f3ef907a5dce641beacd0e9f8c6514de9
 AUX inkscape-1.2.2-fix-compile.patch 1948 BLAKE2B 4482e3f021f9cdee4a26e0d179e5e18e21d2a0649d1801979ee08b2428a1b9ae8850a09cacaa2121a25069d763758123f0c550e1e7dac2a91c04198eb6bc960f SHA512 ccc4a593c903ce467e0076a8b036aac421a3f5a943815d6d7cf91c48acb07d49c76fb73b58ad01fc3a3f45af2c6e4bc78d6a13848ed3f91de42c3a074b1aeb17
 DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f
 EBUILD inkscape-1.2.2-r4.ebuild 5248 BLAKE2B a62930236da7e5f2c84af678aa88abb031fb10ebc40c7113843b3b414fa1ce935fc868153a3c2e2ec353fd2102b3ec252f4e9925ef815b9fb946c19d8762ac3a SHA512 647372b52e794b88a899a5f07aae5f919bd9346875af34471a6d685a02e9b1058c75d6bc98c1c937cc941f60ca95ba120a8eb029471172ec63516490444d85fd
diff --git a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
deleted file mode 100644
index 80d071d51b0b..000000000000
--- a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-https://gitlab.com/inkscape/inkscape/-/merge_requests/4719
-
-From dce083204c62f1185ad079fc124f7fb40a1d0bb6 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 2 Sep 2022 06:21:28 +0100
-Subject: [PATCH] Fix build with Poppler 22.09.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With Poppler 22.09.0, inkscape fails to build with:
-```
-/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:394:23: error: no matching function for call to ‘GfxState::getLineDash(double**, int*, double*)’
-  394 |     state->getLineDash(&dash_pattern, &dash_length, &dash_start);
-      |     ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In file included from /var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:44:
-/usr/include/poppler/GfxState.h:1506:32: note: candidate: ‘const std::vector<double>& GfxState::getLineDash(double*)’
- 1506 |     const std::vector<double> &getLineDash(double *start)
-      |                                ^~~~~~~~~~~
-[...]
-/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/pdf-parser.cpp:700:21: error: no matching function for call to ‘GfxState::setLineDash(double*&, int&, double)’
-  700 |   state->setLineDash(dash, length, args[1].getNum());
-      |   ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-```
-
-Poppler changed the getLineDash interface:
-```
--    void getLineDash(double **dash, int *length, double *start)
-+    const std::vector<double> &getLineDash(double *start)
-```
-
-... and the setLineDash interface:
-````
--    void setLineDash(double *dash, int length, double start);
-+    void setLineDash(std::vector<double> &&dash, double start);
-```
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/extension/internal/pdfinput/pdf-parser.cpp
-+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/)
-       _POPPLER_FREE(obj);
-     }
-   }
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+  state->setLineDash(std::vector<double> (dash, dash + length), args[1].getNum());
-+#else
-   state->setLineDash(dash, length, args[1].getNum());
-+#endif
-   builder->updateStyle(state);
- }
- 
---- a/src/extension/internal/pdfinput/svg-builder.cpp
-+++ b/src/extension/internal/pdfinput/svg-builder.cpp
-@@ -388,10 +388,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
-     sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str());
- 
-     // Line dash
--    double *dash_pattern;
-     int dash_length;
-     double dash_start;
-+#if POPPLER_CHECK_VERSION(22, 9, 0)
-+    const double *dash_pattern;
-+    const std::vector<double> &dash = state->getLineDash(&dash_start);
-+    dash_pattern = dash.data();
-+    dash_length = dash.size();
-+#else
-+    double *dash_pattern;
-     state->getLineDash(&dash_pattern, &dash_length, &dash_start);
-+#endif
-     if ( dash_length > 0 ) {
-         Inkscape::CSSOStringStream os_array;
-         for ( int i = 0 ; i < dash_length ; i++ ) {
diff --git a/media-gfx/ueberzugpp/Manifest b/media-gfx/ueberzugpp/Manifest
index 3435e7d526f4..cca765d67e4d 100644
--- a/media-gfx/ueberzugpp/Manifest
+++ b/media-gfx/ueberzugpp/Manifest
@@ -1,7 +1,5 @@
-DIST ueberzugpp-2.8.4.tar.gz 43906 BLAKE2B db36ea8dc74713673ac7ea9f62f12fd9d4f77e12030db3920eb193523599f6bd6f520faa821cacb18192c699439cae35f18bb208056f4c92d6f50b02f5fac014 SHA512 402887a8734bb034c3cd0975ddd6e584f865f6545726d5bf033f59552e0a026883dd845080cccee5340217d1782c70fb2e309bfda36207627d0455c5cc7b75db
-DIST ueberzugpp-2.8.6.tar.gz 51156 BLAKE2B 8eb661f86c55a0dcd0bc78e70437a59df4783919769e8e3514fa385e30ee44c8bdf58e47824882d11eb9bf94be2836c44b983b8d67bc2e576f60432a65dcb70d SHA512 86f10e593277d240d5d348acd81ffdf23814250d694fd34f06bd461c908fba81cfdfdb1b3b104a851b3703a1e186ef57f5bf14eda9a59a9305894e8998247fb3
 DIST ueberzugpp-2.8.7.tar.gz 53658 BLAKE2B 7d6c8ea082360f98bcce90cdc0eb0d8c5fc6e4765eece225be778c07f1cf91e6550e2c74b75f4edb1eaa8eaf5fd1861493c05610343693aafc428adb1d784fda SHA512 e418576f1c01919cd8997d8bcc4169405ef85f6ae74f28790e37a1ad82bbdb1ee3296396243e5ea9d3b99ffb40a9608d0345c51650cbb4b097191c3ce64f578d
-EBUILD ueberzugpp-2.8.4.ebuild 1271 BLAKE2B 52ca5ba8a99ea787bbed19226dafa6922a06b0d3f47badf9e5007933249da7e43aff5524258f5d3531dcf255ad0b5eed65cf658bd9aae9429389cbb7cc7dc1ee SHA512 f8e512c21415536428ecb00c607ade458adefbd8d078b2dac5e38ffe2c263131b6bdaf020b887d568a38935ba4f5604b0f580bc2bfd07600cbf78928800bde79
-EBUILD ueberzugpp-2.8.6.ebuild 1475 BLAKE2B e24459bb64d7ef33f88926fc8dc554e12537d8212eaefb7e5744253c5ee2a362bc3192343c3ffb5a868521294c983a13a6a634d9605a2fbf94ddde0d45db9b36 SHA512 48d2b8d33ce1212dcb6bf69470c69d82e45648822af416cbfdde5ab1978909bc85602052c45d0ed4408cf2b7d898581382dccb53c04765ce49723cee98ff64b4
+DIST ueberzugpp-2.8.8.tar.gz 56141 BLAKE2B 9faea08c400822db86ea3963c653581e9ab8ec76989107cd072df8071ba238395a57fd820d3dc9a51d55e1820adbd7c67dc0dcce9a60aab3596e885bb1d15f50 SHA512 4354d00a3d07ddb68132a0581aeec182fce61873123d2a78f32d83db3c0227be80c5430b00bebcbda863e8fc23a35d65247a463d3f411ea09ad7b9d6cff39f92
 EBUILD ueberzugpp-2.8.7.ebuild 1174 BLAKE2B efcc29c6cff95318d31ec0427a2750e7e0f449b34b5f318417f7a713d0df753c784bba82617dfed29744a9a266d2fdd54d1d74cdb6123bf5298804ec3bfd5e36 SHA512 179148fbf94788572c466994a40d800a3a02e8ee1c60beaab2c7da1e65b2b95eb54939245becdfd23b361ed0dacc45e8451e3dbce7ff622f240ce1434fc9ebd9
-MISC metadata.xml 587 BLAKE2B f2f61d4bb44f3218a61897efcd92af977da2b595de6734e5e0f5a8284e6097e91d2f4a9078025125123ad0a36db95841d7b1ae4c0c0dff231862da5cf8feb907 SHA512 f3c85ab99d15536d70f5b951b14eb2693277168c59cadc5afaa3bd3222eb4c8dfd8f9b350d116fd75c22ada205c2b9a8d6185393b2b9083e8a83d7f5eeb6ae19
+EBUILD ueberzugpp-2.8.8.ebuild 1453 BLAKE2B 78720debf3407c3b0efd4019467a34f3bbe9c0397f44ada45159f28c02938998d2464dadd434648cd71ea01ace73ee8cffdd634047c96ff7063e9d04e3cfb48e SHA512 d0a25a98c718464b7719603bb4322b3a1f721682894476525237aab74bcba655463a95e26e114f910eb872ad69f72fa5ea56d5000fb7f6349defc6431ee9d793
+MISC metadata.xml 694 BLAKE2B e39b88b981e8c6d55a41714197b03c014a6ffd95522eb0ff92559a178b193419bd587903c75271167fba097593ac15ecacdba3b0f23e7859c3f1fd9569b4f6c2 SHA512 e86e8942c84ec38c198b513b0eaf63d522017665d559a1843c08030ec6bc6a32d7f32651d5b283e3d82784b81ea15b7d81889ab0c68850f88733ae90add17060
diff --git a/media-gfx/ueberzugpp/metadata.xml b/media-gfx/ueberzugpp/metadata.xml
index 8728c0dd5768..fc6c73e0ed27 100644
--- a/media-gfx/ueberzugpp/metadata.xml
+++ b/media-gfx/ueberzugpp/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="opencv">Use <pkg>media-libs/opencv</pkg> for additional image formats and OpenCL accelerated scaling</flag>
 		<flag name="wayland">Enable wayland support (proper window positioning is only supported with some compositors)</flag>
+		<flag name="xcb-errors">Use <pkg>x11-libs/xcb-util-errors</pkg> for better error reporting with X</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">jstkdng/ueberzugpp</remote-id>
diff --git a/media-gfx/ueberzugpp/ueberzugpp-2.8.4.ebuild b/media-gfx/ueberzugpp/ueberzugpp-2.8.4.ebuild
deleted file mode 100644
index 86718aa1b41b..000000000000
--- a/media-gfx/ueberzugpp/ueberzugpp-2.8.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Drop in replacement for ueberzug written in C++"
-HOMEPAGE="https://github.com/jstkdng/ueberzugpp/"
-SRC_URI="https://github.com/jstkdng/ueberzugpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="X opencv"
-
-RDEPEND="
-	dev-cpp/tbb:=
-	dev-libs/glib:2
-	dev-libs/libfmt:=
-	dev-libs/openssl:=
-	dev-libs/spdlog:=
-	media-gfx/chafa
-	media-libs/libsixel
-	media-libs/vips:=
-	net-libs/zeromq:=
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util-image
-	)
-	opencv? ( media-libs/opencv:= )
-	!media-gfx/ueberzug"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/cli11
-	dev-cpp/ms-gsl
-	dev-cpp/nlohmann_json
-	net-libs/cppzmq
-	X? ( x11-base/xorg-proto )"
-
-src_configure() {
-	CMAKE_BUILD_TYPE=Release # install target wants this
-
-	local mycmakeargs=(
-		-DENABLE_OPENCV=$(usex opencv)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_TURBOBASE64=no # not packaged
-		-DFETCHCONTENT_FULLY_DISCONNECTED=yes
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# not handled by cmake, but upstream creates the pp symlink in their
-	# self-maintained AUR package and some scripts like ytfzf look for it
-	dosym ueberzug /usr/bin/${PN}
-}
diff --git a/media-gfx/ueberzugpp/ueberzugpp-2.8.6.ebuild b/media-gfx/ueberzugpp/ueberzugpp-2.8.8.ebuild
index e1196341687e..245e11f2f9c0 100644
--- a/media-gfx/ueberzugpp/ueberzugpp-2.8.6.ebuild
+++ b/media-gfx/ueberzugpp/ueberzugpp-2.8.8.ebuild
@@ -11,8 +11,10 @@ SRC_URI="https://github.com/jstkdng/ueberzugpp/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="X opencv wayland"
+# unkeyworded for now given X backend fails with ytfzf (needs investigation)
+#KEYWORDS="~amd64"
+IUSE="X opencv opengl wayland xcb-errors"
+REQUIRED_USE="xcb-errors? ( X )"
 
 RDEPEND="
 	dev-cpp/tbb:=
@@ -26,8 +28,10 @@ RDEPEND="
 	X? (
 		x11-libs/libxcb:=
 		x11-libs/xcb-util-image
+		xcb-errors? ( x11-libs/xcb-util-errors )
 	)
 	opencv? ( media-libs/opencv:= )
+	opengl? ( media-libs/libglvnd )
 	wayland? ( dev-libs/wayland )
 	!media-gfx/ueberzug"
 DEPEND="
@@ -46,23 +50,13 @@ BDEPEND="
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENGL=$(usex opengl)
 		-DENABLE_TURBOBASE64=no # not packaged
-		-DENABLE_WLROOTS=$(usex wayland)
+		-DENABLE_WAYLAND=$(usex wayland)
 		-DENABLE_X11=$(usex X)
+		-DENABLE_XCB_ERRORS=$(usex xcb-errors)
 		-DFETCHCONTENT_FULLY_DISCONNECTED=yes
 	)
 
 	cmake_src_configure
 }
-
-src_install() {
-	# cmake install target is basic (misses the man page and symlinks) and
-	# is gated behind CMAKE_BUILD_TYPE, simpler to do manual for now
-	dobin "${BUILD_DIR}"/ueberzug
-	dosym ueberzug /usr/bin/${PN}
-
-	doman docs/${PN}.1
-	dosym ${PN}.1 /usr/share/man/man1/ueberzug.1
-
-	einstalldocs
-}