6 files changed, 50 insertions, 11 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 645e0b124a86..5a4c4c22b357 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 4b587826c0df..68f7f1e98aab 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,3 +1,4 @@
+AUX graphviz-6.0.1-private-ghostscript-symbols.patch 1207 BLAKE2B ec966713af13fbfbdea0e6217d3da22884019ef39fb968fcb4f0ccdbb21c170087f00561ac613d78c29917468e925466f4d8e70a881876877fa88f2207d25141 SHA512 7f5434235b4627b0204e7b9c374290b02d805edcbebdca23154c18df6795ecb12016bfeb1ed9c6520e41ad216f81f38ad18791a1de1e06f15125805f1829aee6
 DIST graphviz-2.50.0.tar.xz 23031008 BLAKE2B a1789368a77384366bf813466d4a733765ffc0a04660cfcc002c643264780425b449087306b143cfddd70d2feabb67e82b6c04217684aba175824c3e83062085 SHA512 2b035559da20bad35e046bfa1b2c8ce1b395ff9b812f33bcf612d7f7c65ff9a226c9b209553b4283825330683fb925516563943de7922c2f6434baaf3c3b5ee2
 DIST graphviz-5.0.0.tar.xz 21495572 BLAKE2B b28cbc5a20b202441ed7e98ebbb85b878f9362d1f95816ca89f7aedd62302c77974efc3b63e2ab8b577da59946ca63c7607706da2e79afcae9089f8c2743cd4a SHA512 51576c0d0405aa2005e908b57c3bac5e30069e6efb355b467a35a46559b002b34eaec77c35b6d41c635d6d874351da7261a11cf0f857cea72ff7259d5f6c860d
 DIST graphviz-5.0.1.tar.xz 21493276 BLAKE2B 1eabf7dc175cde4827db682ae7c0cb00f5bec4bee8aa9801bc6ac86b06011588260ce261e25613d6d4a1e708ccb4fd65aba73210df8cf0af84f2e20b7c914167 SHA512 c1c5784558fd6f32cd8ce9b63c2bc5232f47ea1c4abf8fbfc1b8b0175aa30845af452dbc6651642f07f2c5b7a73f5c792934ca99561608a104ae99898eca3bc7
@@ -5,5 +6,5 @@ DIST graphviz-6.0.1.tar.xz 21492876 BLAKE2B 36b8c2e922a73e35cddb2a252138193c9a41
 EBUILD graphviz-2.50.0.ebuild 7752 BLAKE2B 8969610d147f4f40e65202bb8409ea6925e457fbf5456e5b37b96ec73826314ced8ed9a17ba6440c8c5806b69b0efc0914425272febfa11be6041354e30bb1fe SHA512 0a634668da138100dd1c76ea0f1b3865c8c8e43fa1249eeaa8de88a1b5acc80d69ffcffbb31f5652126dee957f40169ac585a1899d0bad96a6004b173dc89161
 EBUILD graphviz-5.0.0.ebuild 6140 BLAKE2B eda5a266f41226dcd0d596898e4c8a011786ee14dabb9dd9a48d7e7493e944b0a3c11719774ff4b4e830f4e5f31efe7dad9955a8fa9c8abe181a434ed436bcce SHA512 32e15bddd89f087faf5d1cce5db901d313759564f99a414e2f8b1c4b4922b8a199dae20e85454e0bda4e267522962aaf59b8e22d94503248af2244273b0712cc
 EBUILD graphviz-5.0.1.ebuild 6132 BLAKE2B 1a1a04d07a4a12476eede89e644cfffd6ac9e3613cd95df6fff56987ed51e9a9d2d73cd14d285b5dd1d185fe2bd11e534d70add1d97d9ca440cc48d95b39ae42 SHA512 895ffb335e9711e742fdcdba5ac32d44c4f4998829387cb9fdfcf9c29d93b5c01a6c52ebe614c8e9aed303b831a175f3cc709c22b79a703328473d6acdb6f3f6
-EBUILD graphviz-6.0.1.ebuild 6135 BLAKE2B 173aeb004d05175deca81920f084a5b3c4fcc5eea04a5d042567bb0a8b23e778031583332a62178b887495c1fafd5ca5dd825a6ff14a30a479ffd38238112568 SHA512 4d9d34eb27670c59ef9efe47cf5ee410b965819744865d5cd9cbb228d5e877482811a2e3b9366bc3ac117246fdf2f9b2ab7cdb3107769d8b283e0ebc640af426
+EBUILD graphviz-6.0.1-r1.ebuild 6214 BLAKE2B f89d3ad34f37bfc8acb1605827970a4702021b06c838fc82b15688bb8360c0f246bc91811cb7468e6ff8cd6216e45da6597fdf20896cc498d31992c9d015e241 SHA512 6b1736bf15ef9ad1cb113980e7ee81756a002a7dd5273e19a39d75d29db253ee8de408ba7b8d14e958b59d6287fb22e91dd6491d6ddcd240fe7731842dc5a6f5
 MISC metadata.xml 2443 BLAKE2B 6e4e513482d6c8db4f3261a1552b4d625ac05dcf528aba81c0b2c1bace0523b145cfb348ce6982a5d4f9bcb8c2f9dd38628641942fbf2f65629d04b948b608e9 SHA512 93c08b7afe4cf256bc22cd5c41db920700110668e03f7f6f55e8fb63c8d22dae467508cf3c514d092cfc4428db7984133ea843e397d0b526407f62cdbddb66d8
diff --git a/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch b/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch
new file mode 100644
index 000000000000..8e409a9b5776
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-6.0.1-private-ghostscript-symbols.patch
@@ -0,0 +1,31 @@
+From 1288e430c6f6be992de09fc1f50ce7fef42b3f0a Mon Sep 17 00:00:00 2001
+From: Mark Hansen <markhansen@google.com>
+Date: Mon, 26 Sep 2022 20:43:39 +1000
+Subject: [PATCH] Stop using now-hidden gs_error_names symbol
+
+GhostScript hid their gs_error_names symbol as part of a global by-default hiding of non-API symbols.
+
+It will probably take a while for GhostScript to get a public API for these symbols back into a release, so let's stop using the symbol for now, until then.
+
+Fixes #2280
+---
+ plugin/gs/gvloadimage_gs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugin/gs/gvloadimage_gs.c b/plugin/gs/gvloadimage_gs.c
+index e909c6f32..d852663af 100644
+--- a/plugin/gs/gvloadimage_gs.c
++++ b/plugin/gs/gvloadimage_gs.c
+@@ -86,8 +86,8 @@ static void gs_error(GVJ_t * job, const char *name, const char *funstr, int err)
+     else
+ 	errsrc = "Ghostscript internal error";
+ 
+-    job->common->errorfn("%s: %s() returned: %d \"%s\" (%s)\n",
+-		name, funstr, err, gs_error_names[-err - 1], errsrc);
++    job->common->errorfn("%s: %s() returned: %d (%s)\n",
++		name, funstr, err, errsrc);
+ }
+ 
+ static int gvloadimage_process_file(GVJ_t *job, usershape_t *us, void *instance)
+-- 
+GitLab
diff --git a/media-gfx/graphviz/graphviz-6.0.1.ebuild b/media-gfx/graphviz/graphviz-6.0.1-r1.ebuild
index e88942bff58b..9c60b9f2702c 100644
--- a/media-gfx/graphviz/graphviz-6.0.1.ebuild
+++ b/media-gfx/graphviz/graphviz-6.0.1-r1.ebuild
@@ -138,6 +138,11 @@ BDEPEND="
 #   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
 #   with flags enabled at configure time
 
+PATCHES=(
+	# backport
+	"${FILESDIR}"/${P}-private-ghostscript-symbols.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 10550d02261e..eeb2a319d98b 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -21,5 +21,5 @@ DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.4.2-r1.ebuild 4000 BLAKE2B 9d315f3c51ba848fda0feea5a22d004cb6010112cba8dda3372bac5a9b9ecb6ee7aec3d9cee254ba0e77305eee99be1bb342180c71a6a8048c0625cbe1b10aa6 SHA512 b42e39b888418f016a2a147aba40a3241a75d7930132a8290163d2ea4e57ee7bf57125d6382229440cf3078482f3a7f2158575d28353ae1d7d9a69bb5f389043
-EBUILD iscan-3.65.0.ebuild 2977 BLAKE2B 5a267dd976353105b3fbf8676d78266a74666947ebcce7b4deff5f48a23cc7aec50c16a3787538b300fa1cc1630b769c961d137e9a08ad40cf6cc9ba390c7187 SHA512 4debede9ce06e030411e7fd7f279f793e1fbbfb31acb34543ce1789d685098cc526b8e81c979a9ba3738a49e064f767bc312c0572ca5382ee21f1a1c91fff9bd
+EBUILD iscan-3.65.0.ebuild 3001 BLAKE2B 57db3835e6c020d520a279ed4e668ecc767fdd140161af4d9d0333aa681cbc3dfb6b14848af5efd7c1e89961a043f61db5a35b19a426fd4b6cb47bb21726ab2c SHA512 c4ed0b13ebcaf968232646d6fe51517bb7c8c46b1dc077eac551221fee76bde3df2a9c5803fe50c16934805e6cc3f6ad7eb3073008d01f947ab14e52b156c040
 MISC metadata.xml 961 BLAKE2B b9c6fb04e94844fb8e7f1d60c5287809c61c3f642f86f55e88ba09a489ebe2b90a698b8a7f5d7c04d38324b97d746f68004c662839862f84a3d1e66cd56c998e SHA512 93c00c3fd4b23cab80f46e3f2a8bedaf92e97473fbdcc707034d86a01ff11269fe6a67648e7a369d71fd60e31d902bc8c94510b37c293df90934a6b2b38cf7f1
diff --git a/media-gfx/iscan/iscan-3.65.0.ebuild b/media-gfx/iscan/iscan-3.65.0.ebuild
index e5b00fcd6f87..b47d4d45f4ae 100644
--- a/media-gfx/iscan/iscan-3.65.0.ebuild
+++ b/media-gfx/iscan/iscan-3.65.0.ebuild
@@ -14,7 +14,16 @@ SLOT="0"
 IUSE="graphicsmagick gui test"
 KEYWORDS="~amd64 ~x86"
 
-BDEPEND="virtual/pkgconfig"
+# Disable opencl as during reorient.utr test it produces inconsistent results
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		app-text/tesseract[png,tiff,training,-opencl]
+		dev-util/uncrustify
+		media-fonts/dejavu
+		virtual/imagemagick-tools[png,tiff]
+	)
+"
 RDEPEND="
 	dev-libs/boost:=
 	media-gfx/sane-backends
@@ -25,14 +34,7 @@ RDEPEND="
 	!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
 	gui? ( dev-cpp/gtkmm:2.4 )
 "
-# Disable opencl as during reorient.utr test it produces inconsistent results
-DEPEND="${RDEPEND}
-	test? (
-		app-text/tesseract[png,tiff,training,-opencl]
-		media-fonts/dejavu
-		virtual/imagemagick-tools[png,tiff]
-	)
-"
+DEPEND="${RDEPEND}"
 RESTRICT="!test? ( test )"
 S="${WORKDIR}/utsushi-0.$(ver_cut 2-3)"