gentoo resync : 15.06.2021

9 files changed, 58 insertions, 480 deletions

diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index ee98cac38519..8eb56131667d 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,16 +1,10 @@
-AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1
-AUX zbar-0.23-r1-nonbash.patch 5528 BLAKE2B f4679013abb66143a5203d861367f51ee8b791addff66347d81622549f954e1bcd54a19695fa4ce8bacbf5aa2fe0a195ec75068ff6b93fa2df0c4f82af9e3d65 SHA512 7705ae4281b92086eda749fb334a59cdc33e79bec0bb9820c78344fcac235b9b3f4314899e8eeeaa44a372adda71f14ec553f3c1c147f57bfe1cba298d3cd0ab
 AUX zbar-0.23.1-autoconf-2.70.patch 1280 BLAKE2B c4e9fd97047c49599477e387590372404c47b66f960bf1e0ffd80c7c694cf59cf080660899e1abc0f33eadd7087e5ba6d40e55e853f0569374a3be0934001450 SHA512 e7317dcd5e3dacce52dd27ce8d37afd07d2b193fa8f40e237a5f4bca911bda1e38ac74b0fd770976c0659ccc44b576775ba291d8135e426ad7a793fbdb104401
 AUX zbar-0.23.1_fix_leftover_on_shell_compatibility.patch 877 BLAKE2B 6eb1778024ba3ab0df8bc64ae80987be0e17cd30b692f0e04766fcad3148fe1ce49f52f7ec147d3f22c34754288fe0f9721ffa91e3e78c5b357c167f372f4e5d SHA512 98c203f122811128e091f8cc31f0c92362cc8693e38f5cdd7a48cf6d5ef57889bd6ccf921631a1646214f070c3be2eb78f08c429351bec275f4b550b2e15b122
 AUX zbar-0.23.1_fix_unittest.patch 2703 BLAKE2B fcbde8262803be3a009a93d052d6866998ca0a214a64f0c2989ded4925394c3cc78755b539defd0560dbc01e318f12a89b16a6065e028eec58db16d58a8bdcb5 SHA512 cc867bcb92094edb94dc699c0929547dd7bf08f71579605b4817e1068da55e0c2455655e535fc560375c773c158f50a79f77846ef06a3566a0deec22a459e120
 AUX zbar-0.23.1_musl_include_locale_h.patch 512 BLAKE2B 9f675b24aecd0a65ef3a2d41731594c10b1086abbfac649b6eeca1ba873c1b54d8287bebb48b2119aa0638d60228f25714f7a1811f7645930bc003395489ca3e SHA512 6addf046928db5743cc58ec67aad891c199f9d839198181cfbf57912cc0780f53fdac9fa15b25e1ffd17cf0aaf74318094f3283facdff2fa259285a5bc2bb957
-AUX zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch 2109 BLAKE2B 8e32a3d0115fe7dc31a8208021659827f959bebbd1a56972765a379e03c7aca704c394d7eecb928f3547b9b42afff6cdaa1e564875bb6a94ac0cdb9a55422fe1 SHA512 dfbbe1caf384dc769d97ecebaf544b81c1fa266c78ca4fa8087673724b3408fe2e77535b60aefe904aa42dd1ed1182676623f98aed565910566c511908b8ecee
+AUX zbar-0.23.1_python_tp_print.patch 1671 BLAKE2B e7d869e64879fb77151b1e8d668659ed1b5ca8061a8b2d3f2bde1bd5ef3384dec208e5f43f6e326c173634e017dd1261ba1d725a68f7a3c5f384e5a2a84bae26 SHA512 67e87f27dd9149e5cf9503613d3458dff5a3fd97084858f5ca88335c5053e7eb9b000cdec215d7b38bf9dd344b2dd9c310de320c60fc308de0ff7c411dcbcb35
 AUX zbar-0.23_fix_Qt5X11Extras_detect.patch 643 BLAKE2B 27485c866503189670424eaf81a0a9b6aefa284576789ba6533af03cb1af59a2c531f22e09adcc8e2b9b6418f861f8b96a1bf602502d0e863ae9785ac2d336c7 SHA512 ee40586c64ded170e314ee2961588518234e22d9cee9e9a55f994231cd50b120e82225c551c5a2e85988de1c14a5c0baf6303fffea0663e2e4808df3a0c8421a
-AUX zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch 1122 BLAKE2B e4330ca4ce75a4659466faa618a99280ad7868aa21d1fe30db837917460cb9fc3594421cb2cb70457813611764c7e976e5ba9acc414be5fa95808f91d995eb0b SHA512 c6d6b3bf93f59f87687e03294742ec7a4803308d7395869d8cccefdb186c69ad429c631f2f4d0c4de0a2dd495f3b99342622d01acb1e823ceb9250380549ca20
 AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7
-AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1aa11a79123226ebf91ba0b4d047412b96b12d8ed591e85625c96e3de1fcfd0624b622c4f59c98d4e4e3483c74d6699ae2579a18352d12698b3b0f430 SHA512 c641b83c81c07e850a17672a8ad5a16ab650330ccffcba98d209ed105058cc66664aff76d391803503b6d784daaf2b31d9faad2aa9dd69221598b13187e27dd1
 DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
-DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
-EBUILD zbar-0.23-r1.ebuild 5071 BLAKE2B 92487f7fd2c94a6bee21827729c0ed4bbbde6c1b552e5da271a96a277d2d1c4d20b0b8baf80b769e89bb65bc9fe0ca0db483342bcbcf0daf466edc82f399dbe3 SHA512 f4d5affd6ea81be0b0aaacd168a0a45c854a49b7aeda4d042aa26eef4e0492ece016c21c7887aad1c1644c0095f04eb94277ba12276b0e1c8e5c4d98f977b4b4
-EBUILD zbar-0.23.1.ebuild 5328 BLAKE2B 625e339803ae037096dd0dddae0553cb11d4a0a7f7ae144f7e8e5a85964fba652c66ee05bae302c290d837914d2f95f6aaaf91a0277ea6714ab53b7d12bbd7c6 SHA512 41f92ac81780148a1672306eb185f0d1899a5dd607e831a50d69c2a2c594125221172a9907ed63f15f163421917032e45902a1c8701ababe0048728a8e735c78
+EBUILD zbar-0.23.1.ebuild 5378 BLAKE2B 0a0600179d7dc1812dbaad0446b91d30f4bbbd0d6d2271800afada662ab1bbfdbcdf22c78908594b0dddcf13ce5ea107d5f039a580137cd3e58c1f8c4986358a SHA512 6eb6125996b9b2fb138e489aee1189b1a480dbb1b990cd7996b83fc59a31e0fef7c3b1bec14db7381837784d644e69e6b5f7e40bdf5429411120af04526d3e00
 MISC metadata.xml 737 BLAKE2B 51ad296b25247d05d1872f0ce6ac5ab5dc0c3c0141c19a851a13c5dab881c2c6f7c8b538bf86783ea9138318e369e25d1828d866adb050dd98dbd336b6932a1c SHA512 0811b0674da5175f0ba71238a8ecad01a5d0000dec24988df42ab91748de016e717471822d6903f279ad411cb50207bc6c4dc6de11268e065961a96948434e6f
diff --git a/media-gfx/zbar/files/zbar-0.10-errors.patch b/media-gfx/zbar/files/zbar-0.10-errors.patch
deleted file mode 100644
index 63328ce664bb..000000000000
--- a/media-gfx/zbar/files/zbar-0.10-errors.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- zbar-0.10/include/zbar/Exception.h
-+++ zbar-0.10/include/zbar/Exception.h
-@@ -32,6 +32,7 @@
- 
- #include <exception>
- #include <new>
-+#include <cstddef>
- 
- namespace zbar {
- 
diff --git a/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch
deleted file mode 100644
index 1206a209d458..000000000000
--- a/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-https://bugs.gentoo.org/769716
-
-From 4bd586181dde6196cb60602f228c4deb07818989 Mon Sep 17 00:00:00 2001
-From: Klaus Ethgen <Klaus@Ethgen.de>
-Date: Sun, 7 Feb 2021 14:22:52 +0100
-Subject: [PATCH] =?iso8859-1?q?Configure-Patch=20f=FCr=20nicht-bash?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=iso8859-1
-Content-Transfer-Encoding: 8bit
-
----
- configure.ac | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c2b7819..f6224a1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -489,7 +489,7 @@ AC_ARG_WITH([gtk],
- AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal])
- AC_ARG_VAR([GTK_VERSION_MAJOR])
- 
--AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"],
-+AS_IF([test "x$with_gtk" = "xgtk3" || test "x$with_gtk" = "xauto"],
-   [PKG_CHECK_MODULES([GTK3], [gtk+-3.0],
-     [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
-      GTK_VERSION=`$PKG_CONFIG gtk+-3.0 --modversion`
-@@ -501,7 +501,7 @@ AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"],
-     ])
-   ])
- 
--AS_IF([test "x$with_gtk" == "xgtk2" || test "x$with_gtk" == "xauto"],
-+AS_IF([test "x$with_gtk" = "xgtk2" || test "x$with_gtk" = "xauto"],
-   [PKG_CHECK_MODULES([GTK2], [gtk+-2.0],
-     [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
-      GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`
-@@ -550,11 +550,11 @@ AC_ARG_VAR([PYGTK_CODEGEN], [full path to pygtk-codegen program (python2 only)])
- AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found (python2 only)])
- 
- AS_IF([test -z "$PYTHON"],
--      [AS_IF([test "x$with_python" == "xauto"],
-+      [AS_IF([test "x$with_python" = "xauto"],
-              [AC_PATH_PROGS([PYTHON], [python3 python2 python], [:], [$PATH])],
--             [AS_IF([test "x$with_python" == "xpython3"],
-+             [AS_IF([test "x$with_python" = "xpython3"],
-                     [AC_PATH_PROGS([PYTHON], [python3 python], [:], [$PATH])],
--                    [AS_IF([test "x$with_python" == "xpython2"],
-+                    [AS_IF([test "x$with_python" = "xpython2"],
-                            [AC_PATH_PROGS([PYTHON], [python2 python], [:], [$PATH])],
-                            [with_python="no"])
-                     ])
-@@ -608,7 +608,7 @@ AM_CONDITIONAL([HAVE_PYGTK2], [test "x$with_pygtk2" != "xno"])
- 
- dnl GObject Introspection (GIR)
- 
--AS_IF([test "x$with_gir" == "xyes" && test "x$with_gtk" != "xno"],
-+AS_IF([test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"],
-   [m4_ifdef([GOBJECT_INTROSPECTION_CHECK],
-     [GOBJECT_INTROSPECTION_CHECK([0.6.7])
-      AS_IF([test "x$found_introspection" = "xyes"],
-@@ -696,7 +696,7 @@ AC_ARG_WITH([java],
-   [],
-   [with_java="check"])
- 
--JAVAC=${JAVAC/ecj/ecj -1.5}
-+JAVAC="$(echo $JAVAC | sed 's/ecj/ecj -1.5/')"
- 
- # Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
- # look strictly at the $JAVA_HOME in order to avoid mixing different versions
-@@ -707,13 +707,13 @@ AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"])
- 
- AC_ARG_VAR([JAR], [location of Java archive tool])
- AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH])
--AS_IF([test "x$JAR" == "x:"], [have_java="no"])
-+AS_IF([test "x$JAR" = "x:"], [have_java="no"])
- 
- AC_ARG_VAR([JAVA], [location of Java application launcher])
- AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH])
- 
- AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
--AS_IF([test "x$CLASSPATH" == "x"], [CLASSPATH="."])
-+AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
- 
- dnl Search for Java unit test library
- AS_IF([test -z "$JUNIT_HOME"],
-@@ -850,7 +850,7 @@ echo "GTK                    --with-gtk=$with_gtk          Gtk${GTK_VERSION}"
- echo "GObject introspection  --with-gir=$with_gir"
- echo "Qt                     --with-qt=$with_qt            Qt${QT_VERSION}"
- echo "Java                   --with-java=$with_java"
--AS_IF([test "x$win32" == "xno"],
-+AS_IF([test "x$win32" = "xno"],
-   [echo "Dbus                   --with-dbus=$with_dbus"])
- AS_IF([test "x$have_GM" = "xyes"],
-   [echo "GraphicsMagick         --with-graphicsmagick=yes"],
-@@ -873,13 +873,13 @@ AS_IF([test "x$have_IM" != "xyes" && test "x$have_GM" != "xyes"],
-   [echo "        => the zbarimg file scanner will *NOT* be built"])
- AS_IF([test "x$have_GM" = "xyes"],
-   [echo "        => ImageMagick is preferred, as GraphicsMagick doesn't support https"])
--AS_IF([test "x$with_gtk" == "xno"],
-+AS_IF([test "x$with_gtk" = "xno"],
-   [echo "        => GTK support will *NOT* be built"])
- AS_IF([test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"],
-   [echo "        => the Python 2 GTK widget wrapper will *NOT* be built"])
- AS_IF([test "x$with_qt" != "xyes"],
-   [echo "        => the Qt widget will *NOT* be built"])
--AS_IF([test "x$with_qt" == "xyes" && test "x$enable_static_qt" == "xyes" ],
-+AS_IF([test "x$with_qt" = "xyes" && test "x$enable_static_qt" = "xyes" ],
-   [echo "        => Building a static Qt library"])
- AS_IF([test "x$with_java" != "xyes"],
-   [echo "        => the Java interface will *NOT* be built"])
-@@ -888,5 +888,5 @@ AS_IF([test "x$with_java_unit" != "xyes"],
- #echo "NPAPI Plugin     --with-npapi=$with_npapi"
- #AS_IF([test "x$with_mozilla" != "xyes"],
- #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
--AS_IF([test "x$enable_pdf417" == "xyes"],
-+AS_IF([test "x$enable_pdf417" = "xyes"],
-   [echo "        => the pdf417 code support is incomplete!"])
--- 
-2.30.0
-
diff --git a/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch b/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
new file mode 100644
index 000000000000..8d4d821426d2
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
@@ -0,0 +1,55 @@
+From 938d39716488b545b92c28f48acc94a7b8fc9138 Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+Date: Tue, 28 Jul 2020 10:27:30 +0200
+Subject: [PATCH] python: enum: make it compatible with Python 3.9
+
+As reported by:
+	https://github.com/mchehab/zbar/issues/92
+
+python bindings don't build with Python 3.9, because it is
+using tp_print, which has been silently ignored since Python
+3.0, according with[1]:
+
+	"The tp_print slot of PyTypeObject has been removed.
+	 It was used for printing objects to files in Python 2.7
+	 and before.
+	 Since Python 3.0, it has been ignored and unused."
+
+[1] https://docs.python.org/3.9/whatsnew/3.9.html#id3
+
+Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
+---
+ python/enum.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/python/enum.c b/python/enum.c
+index a1135531..dfe1b1ef 100644
+--- a/python/enum.c
++++ b/python/enum.c
+@@ -76,6 +76,8 @@ enumitem_str (zbarEnumItem *self)
+     return(self->name);
+ }
+ 
++#if PY_MAJOR_VERSION < 3
++/* tp_print was dropped on Python 3.9 */
+ static int
+ enumitem_print (zbarEnumItem *self,
+                 FILE *fp,
+@@ -83,6 +85,7 @@ enumitem_print (zbarEnumItem *self,
+ {
+     return(self->name->ob_type->tp_print(self->name, fp, flags));
+ }
++#endif
+ 
+ static PyObject*
+ enumitem_repr (zbarEnumItem *self)
+@@ -115,7 +118,9 @@ PyTypeObject zbarEnumItem_Type = {
+     .tp_new         = (newfunc)enumitem_new,
+     .tp_dealloc     = (destructor)enumitem_dealloc,
+     .tp_str         = (reprfunc)enumitem_str,
++#if PY_MAJOR_VERSION < 3
+     .tp_print       = (printfunc)enumitem_print,
++#endif
+     .tp_repr        = (reprfunc)enumitem_repr,
+ };
+ 
diff --git a/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch b/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch
deleted file mode 100644
index 3be9c2222776..000000000000
--- a/media-gfx/zbar/files/zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From cac1fffce80f0835e4d8d234023a775b4243b916 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Sun, 20 Oct 2019 01:44:02 +0200
-Subject: [PATCH] Create correct pkconfig file for zbar-qt5
-
-Although zbar supports Qt5, the created pkgconfig file always requested
-the Qt(4) components.
-
-Fixes issue #62.
----
- configure.ac   | 13 ++++++++++---
- zbar-qt5.pc.in | 12 ++++++++++++
- 2 files changed, 22 insertions(+), 3 deletions(-)
- create mode 100644 zbar-qt5.pc.in
-
-diff --git a/configure.ac b/configure.ac
-index 935110a..49ef6a8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -659,15 +659,23 @@ AS_IF([test "x$with_qt" != "xno"],
-      CPPFLAGS="$CPPFLAGS $QT_CPPFLAGS"
- dnl -fPIC has no effect on Windows and breaks windres
-      AS_IF([test "x$win32" = "xno"], [CPPFLAGS="$CPPFLAGS -fPIC"])
--     AC_MSG_NOTICE([using Qt version $QT_VERSION])],
-+     AC_MSG_NOTICE([using Qt version $QT_VERSION])
-+     qt_pkgconfig_file="zbar-qt5.pc"
-+     ],
- 
-     [MOC=`$PKG_CONFIG QtGui --variable=moc_location`
-      AC_MSG_NOTICE([using moc from $MOC])
-      QT_VERSION=`$PKG_CONFIG QtGui --modversion`
--     AC_MSG_NOTICE([using Qt version $QT_VERSION])]))
-+     AC_MSG_NOTICE([using Qt version $QT_VERSION])
-+     qt_pkgconfig_file="zbar-qt.pc"
-+     ]))
- 
- AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
- 
-+AM_COND_IF([HAVE_QT],
-+     [AC_CONFIG_FILES([zbar-qt.pc:"${qt_pkgconfig_file}.in"])]
-+)
-+
- dnl Java
- have_java="maybe"
- 
-@@ -820,7 +828,6 @@ java/Makefile
- zbar/Makefile
- zbar.pc
- zbar-gtk.pc
--zbar-qt.pc
- doc/doxygen.conf])
- 
- AC_CONFIG_FILES([test/test_examples.sh],[chmod 755 test/test_examples.sh])
-diff --git a/zbar-qt5.pc.in b/zbar-qt5.pc.in
-new file mode 100644
-index 0000000..3378993
---- /dev/null
-+++ b/zbar-qt5.pc.in
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: zbar-qt
-+Description: bar code scanning and decoding Qt5 widget
-+URL: http://zbar.sourceforge.net
-+Version: @VERSION@
-+Requires: zbar, Qt5Core >= 5, Qt5Gui >= 5
-+Libs: -L${libdir} -lzbarqt
-+Cflags: -I${includedir}
diff --git a/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch b/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch
deleted file mode 100644
index 8484e31b7375..000000000000
--- a/media-gfx/zbar/files/zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 52a4fa5242af5da770b3cab1713f87e8d899e7ed Mon Sep 17 00:00:00 2001
-From: Dan Fandrich <dan@coneharvesters.com>
-Date: Fri, 27 Dec 2019 18:33:17 +0100
-Subject: [PATCH] Fix detection of errors in the v4l read.
-
-The return type must be signed in order to detect a read failure. Also,
-display an error message after such a failure.
----
- zbar/video/v4l2.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/zbar/video/v4l2.c b/zbar/video/v4l2.c
-index daed38b..c0398ea 100644
---- a/zbar/video/v4l2.c
-+++ b/zbar/video/v4l2.c
-@@ -133,9 +133,11 @@ static zbar_image_t *v4l2_dq (zbar_video_t *vdo)
-             return(NULL);
- 
-         /* FIXME should read entire image */
--        unsigned long datalen = read(fd, (void*)img->data, img->datalen);
--        if(datalen < 0)
-+        ssize_t datalen = read(fd, (void*)img->data, img->datalen);
-+        if(datalen < 0) {
-+            perror("v4l2_dq read");
-             return(NULL);
-+        }
-         else if(datalen != img->datalen)
-             zprintf(0, "WARNING: read() size mismatch: 0x%lx != 0x%lx\n",
-                     datalen, img->datalen);
diff --git a/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch b/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch
deleted file mode 100644
index 75d02cb996a5..000000000000
--- a/media-gfx/zbar/files/zbar-0.23_reset_conversion_descriptor_after_close.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ba0bcb39c4fa57634c05597464352d4e630f1ea2 Mon Sep 17 00:00:00 2001
-From: hz-mk <51707958+hz-mk@users.noreply.github.com>
-Date: Tue, 11 Jun 2019 16:32:18 +0200
-Subject: [PATCH] Reset conversion descriptor after close (prevent double free)
-
----
- zbar/qrcode/qrdectxt.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/zbar/qrcode/qrdectxt.c b/zbar/qrcode/qrdectxt.c
-index 2ab7b9b..4be7635 100644
---- a/zbar/qrcode/qrdectxt.c
-+++ b/zbar/qrcode/qrdectxt.c
-@@ -409,7 +409,10 @@ int qr_code_data_list_extract_text(const qr_code_data_list *_qrlist,
-       /*If eci should be reset between codes, do so.*/
-       if(eci<=QR_ECI_GLI1){
-         eci=-1;
--        if(eci_cd!=(iconv_t)-1)iconv_close(eci_cd);
-+        if(eci_cd!=(iconv_t)-1){
-+	  iconv_close(eci_cd);
-+	  eci_cd=(iconv_t)-1;
-+	}
-       }
- 
-     }
diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild
deleted file mode 100644
index d51457a9e1d8..000000000000
--- a/media-gfx/zbar/zbar-0.23-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx
-
-DESCRIPTION="Library and tools for reading barcodes from images or video"
-HOMEPAGE="https://github.com/mchehab/zbar"
-SRC_URI="https://linuxtv.org/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-
-IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg python qt5 static-libs test +threads v4l X xv"
-REQUIRED_USE="
-	introspection? ( gtk )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? (
-		${PYTHON_REQUIRED_USE}
-		X? ( imagemagick )
-	)
-	xv? ( X )"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	gtk? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-		introspection? ( dev-libs/gobject-introspection )
-	)
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[png,jpeg?] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[png,jpeg?] )
-	)
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-	v4l? ( media-libs/libv4l:0=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] )
-	)"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8 )"
-
-DEPEND="${COMMON_DEPEND}
-	java? (
-		>=virtual/jdk-1.8
-		test? (
-			dev-java/hamcrest-core:1.3
-			dev-java/junit:4
-		)
-	)
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	gtk? ( dev-util/glib-utils )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10-errors.patch"
-	"${FILESDIR}/${PN}-0.23-r1-nonbash.patch"
-	"${FILESDIR}/${P}_create_correct_pkconfig_file_for_zbar-qt5.patch"
-	"${FILESDIR}/${P}_fix_detection_of_errors_in_the_v4l_read.patch"
-	"${FILESDIR}/${P}_fix_python_detect.patch"
-	"${FILESDIR}/${P}_fix_Qt5X11Extras_detect.patch"
-	"${FILESDIR}/${P}_reset_conversion_descriptor_after_close.patch"
-)
-
-DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-	use java && java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if use python || use test; then
-		if use test; then
-			# make tests happy
-			# because one of the test requires loadable py module from the current ${BUILD_DIR}
-			sed -e "s|PYTHONPATH=@abs_top_srcdir@|PYTHONPATH=@builddir@|g" \
-				-i test/Makefile.am.inc || die
-		fi
-
-		python_fix_shebang \
-			examples/*.py \
-			test/{test_python,barcodetest}.py # test_pygtk.py — py2 only
-	fi
-
-	if use java; then
-		java-pkg-opt-2_src_prepare
-		sed -e "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
-			-i java/Makefile.am || die
-	fi
-
-	# do not install {LICENSE,INSTALL,etc}.md doc files with 'make install' (use DOCS=() instead)
-	sed -e "s|^dist_doc_DATA =\(.*\)|dist_doc_DATA =|" -i Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-cppflags -DNDEBUG
-
-	local myeconfargs=(
-		$(use_with dbus)
-		$(use_with gtk gtk gtk3) # default is gtk2
-		$(use_with jpeg)
-		$(multilib_native_use_with introspection gir)
-		$(multilib_native_use_with java)
-		$(multilib_native_use_with python python auto)
-		$(use_enable static-libs static)
-		$(use_enable threads pthread)
-		$(use_enable v4l video)
-		$(use_with X x)
-		$(use_with X xshm)
-		$(use_with xv xv)
-	)
-
-	if multilib_is_native_abi; then
-		# both must be enabled to use GraphicsMagick
-		if use graphicsmagick; then
-			myeconfargs+=(
-				--with-graphicsmagick
-				--without-imagemagick
-			)
-		elif use imagemagick; then
-			myeconfargs+=(
-				--with-imagemagick
-				--without-graphicsmagick
-			)
-		else
-			myeconfargs+=(
-				--without-imagemagick
-				--without-graphicsmagick
-			)
-		fi
-
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			append-cflags "$(java-pkg_get-jni-cflags)"
-			if use test; then # bug 629078
-				java-pkg_append_ CLASSPATH .
-				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only junit-4 junit.jar)
-				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
-			fi
-		fi
-
-		if use qt5; then
-			myeconfargs+=(
-				--with-qt
-				--with-qt5
-			)
-		else
-			myeconfargs+=( --without-qt )
-		fi
-	else
-		myeconfargs+=(
-			--without-qt
-			--without-imagemagick
-			--without-graphicsmagick
-		)
-	fi
-
-	ECONF_SOURCE="${S}" \
-		econf "${myeconfargs[@]}"
-
-	# work around out-of-source build issues for multilib systems (bug 672184)
-	mkdir qt zbarcam || die
-}
-
-src_test() {
-	virtx multilib-minimal_src_test
-}
-
-src_install() {
-	if use qt5; then
-		local MULTILIB_WRAPPED_HEADERS=(
-			/usr/include/zbar/QZBar.h
-			/usr/include/zbar/QZBarImage.h
-		)
-	fi
-	multilib-minimal_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_preinst() {
-	use java && java-pkg-opt-2_pkg_preinst
-}
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
index d74a878a969a..7b07b269b68f 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -87,6 +87,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.23_fix_Qt5X11Extras_detect.patch"
 	"${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
 	"${FILESDIR}/${P}-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-0.23.1_python_tp_print.patch"
 )
 
 DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )