[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/, media-gfx/zbar/

[Andreas Sturmlechner]

commit:     82144645ee6f94af35d580e1dafd3134bf7120da
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May  8 23:16:28 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May  8 23:29:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82144645

media-gfx/zbar: Drop 0.23.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/zbar/Manifest                            |   1 -
 .../zbar/files/zbar-0.23.1-autoconf-2.70.patch     |  38 ----
 ....23.1_fix_leftover_on_shell_compatibility.patch |  24 ---
 .../zbar/files/zbar-0.23.1_fix_unittest.patch      |  78 -------
 .../files/zbar-0.23.1_musl_include_locale_h.patch  |  23 ---
 .../zbar/files/zbar-0.23.1_python_tp_print.patch   |  55 -----
 .../files/zbar-0.23_fix_Qt5X11Extras_detect.patch  |  18 --
 media-gfx/zbar/zbar-0.23.1.ebuild                  | 229 ---------------------
 8 files changed, 466 deletions(-)

diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 60c7d029a61a..3343fb13b810 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,2 +1 @@
-DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
 DIST zbar-0.23.90.tar.gz 1005314 BLAKE2B 5d0c193509602dfb55741b421e1d28f1424ecec50aa3be584912544a587922c053284c41cf14ff0b4824095d0d376381ed055e7faf9ff394bd8d44fd9ed2971d SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb

diff --git a/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch b/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
deleted file mode 100644
index be9547ead111..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/mchehab/zbar/commit/89e7900d85dd54ef351a7ed582aec6a5a5d7fa37
-https://bugs.gentoo.org/775656
-
-From 89e7900d85dd54ef351a7ed582aec6a5a5d7fa37 Mon Sep 17 00:00:00 2001
-From: Boyuan Yang <byang@××××××.org>
-Date: Thu, 31 Dec 2020 12:56:26 -0500
-Subject: [PATCH] configure.ac: Fix quote issue (autoconf 2.70 compat)
-
-One of the AS_IF() macro was not properly quoted. This commit
-fixes that issue.
-
-This patch closes: #132 (fixes this bug report).
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index df0220a8..db4bc902 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -656,7 +656,7 @@ AS_IF([test "x$with_qt" != "xno"],
- 					    [with_qt="no"])])])
- 
- AS_IF([test "x$with_qt" != "xno"],
--   AS_IF([test "x$with_qt5" != "xno"],
-+   [AS_IF([test "x$with_qt5" != "xno"],
-     [AC_CHECK_PROGS(MOC, [moc-qt5 moc])
-      AC_MSG_NOTICE([using moc from $MOC])
-      QT_VERSION=`$PKG_CONFIG Qt5Gui --modversion`
-@@ -672,7 +672,7 @@ dnl -fPIC has no effect on Windows and breaks windres
-      QT_VERSION=`$PKG_CONFIG QtGui --modversion`
-      AC_MSG_NOTICE([using Qt version $QT_VERSION])
-      qt_pkgconfig_file="zbar-qt.pc"
--     ]))
-+     ])])
- 
- AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
- 

diff --git a/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch b/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch
deleted file mode 100644
index 62993a8b2b25..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8e74a2e223bd40e8cf95ac2580df56ac8500a859 Mon Sep 17 00:00:00 2001
-From: Boyuan Yang <byang@××××××.org>
-Date: Wed, 22 Apr 2020 10:29:39 -0400
-Subject: [PATCH] configure.ac: Fix leftover on shell compatibility
-
-Uses "=" instead of "==" in string comparision for POSIX
-compatibility.  This is a leftover of previous similar fix.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 105da09..df0220a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -845,7 +845,7 @@ dnl summary log
- echo ""
- echo "please verify that the detected configuration matches your expectations:"
- echo "------------------------------------------------------------------------"
--AS_IF([test "x$USE_NLS" == "xyes"],
-+AS_IF([test "x$USE_NLS" = "xyes"],
-   [echo    "gettext                $USE_NLS"]
- )
- AS_IF([test "x$win32" != "xno"],

diff --git a/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch b/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch
deleted file mode 100644
index 3f538c81138f..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2020-04-21 00:09:21.000000000 +0300
-+++ b/configure.ac	2020-04-23 16:53:06.654339488 +0300
-@@ -336,6 +336,14 @@
-   AC_SUBST(DBUS_CONFDIR)
- ])
- 
-+dnl zbarimg tests
-+AC_ARG_WITH([zbarimg_tests],
-+  [AS_HELP_STRING([--without-zbarimg-tests],
-+    [disable tests for zbarimg])],
-+  [],
-+  [with_zbarimg_tests="yes"])
-+AM_CONDITIONAL([HAVE_ZBARIMG_TESTS], [test "x$with_zbarimg_tests" = "xyes"])
-+
- dnl libjpeg
- AC_ARG_WITH([jpeg],
-   [AS_HELP_STRING([--without-jpeg],
-@@ -724,25 +732,12 @@
- 
- AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
- AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
-+AC_SUBST(CLASSPATH)
- 
--dnl Search for Java unit test library
--AS_IF([test -z "$JUNIT_HOME"],
--      [JUNIT_HOME="/usr/share/java"])
--
--AS_IF([test -f "$JUNIT_HOME/junit4.jar"],
--      [JUNIT="$JUNIT_HOME/junit4.jar"],
--      [AS_IF([test -f "$JUNIT_HOME/junit.jar"],
--	    [JUNIT="$JUNIT_HOME/junit.jar"])])
--
--AS_IF([test "x$JUNIT" != "x"],
--      [AS_IF([test -f "/usr/share/java/hamcrest/all.jar"],
--	     [CLASSPATH="$JUNIT:/usr/share/java/hamcrest/all.jar:$CLASSPATH"
--              AC_SUBST(CLASSPATH)
--              with_java_unit="yes"])],
--      [AS_IF([test -f "/usr/share/java/hamcrest-all.jar"],
--             [CLASSPATH="$JUNIT:/usr/share/java/hamcrest-all.jar:$CLASSPATH"
--              AC_SUBST(CLASSPATH)
--              with_java_unit="yes"])])
-+AC_ARG_WITH([java_unit],
-+  [AS_HELP_STRING([--without-java-unit],
-+    [Enable java unittest])],
-+  [with_java_unit="yes"])
- 
- AM_CONDITIONAL([HAVE_JAVA_UNIT], [test "x$with_java_unit" = "xyes"])
- 
-@@ -905,6 +900,8 @@
-   [echo "        => the Java interface will *NOT* be built"])
- AS_IF([test "x$with_java_unit" != "xyes"],
-   [echo "        => the Java unit test will *NOT* be enabled"])
-+AS_IF([test "x$with_zbarimg_tests" != "xyes"],
-+  [echo "        => zbarimg tests will *NOT* be enabled"])
- #echo "NPAPI Plugin     --with-npapi=$with_npapi"
- #AS_IF([test "x$with_mozilla" != "xyes"],
- #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
-diff -ur a/test/Makefile.am.inc b/test/Makefile.am.inc
---- a/test/Makefile.am.inc	2020-04-21 00:09:21.000000000 +0300
-+++ b/test/Makefile.am.inc	2020-04-23 17:03:07.819999370 +0300
-@@ -91,11 +91,16 @@
- regress-decoder: test/test_decode
- 	@abs_top_builddir@/test/test_decode -q -n 100000
- 
-+if HAVE_ZBARIMG_TESTS
- check-images-py: zbarimg/zbarimg
- 	@PYTHON@ @abs_top_srcdir@/test/barcodetest.py
- 
- check-images: zbarimg/zbarimg
- 	@abs_top_builddir@/test/test_examples.sh
-+else
-+check-images-py:
-+check-images:
-+endif
- 
- check-convert: test/test_convert
- 	@abs_top_srcdir@/test/test_convert

diff --git a/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
deleted file mode 100644
index 916dee61d431..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/mchehab/zbar/pull/115
---- a/zbarcam/zbarcam.c
-+++ b/zbarcam/zbarcam.c
-@@ -37,6 +37,7 @@
- #ifdef ENABLE_NLS
- #include "../zbar/gettext.h"
- # include <libintl.h>
-+# include <locale.h>
- # define _(string) gettext(string)
- #else
- # define _(string) string
---- a/zbarimg/zbarimg.c
-+++ b/zbarimg/zbarimg.c
-@@ -42,6 +42,7 @@
- #ifdef ENABLE_NLS
- #include "../zbar/gettext.h"
- # include <libintl.h>
-+# include <locale.h>
- # define _(string) gettext(string)
- #else
- # define _(string) string
--- 
-2.26.2

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
deleted file mode 100644
index 8d4d821426d2..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 938d39716488b545b92c28f48acc94a7b8fc9138 Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab+huawei@××××××.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@××××××.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_fix_Qt5X11Extras_detect.patch b/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch
deleted file mode 100644
index 7692db41e0da..000000000000
--- a/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2019-05-23 23:37:12.000000000 +0300
-+++ b/configure.ac	2020-01-22 12:27:14.190755156 +0300
-@@ -638,13 +638,9 @@
- 
- AC_ARG_VAR([MOC], [full path to Qt moc program])
- 
--AS_IF([test "x$have_x" = "xyes"],
--      [qt_extra="Qt5X11Extras >= 5.0"],
--      [qt_extra=""])
--
- AS_IF([test "x$with_qt" != "xno"],
-       [PKG_CHECK_MODULES([QT],
--		         [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 $qt_extra],,
-+		         [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0],,
- 		         [with_qt5 = "no"
- 		          PKG_CHECK_MODULES([QT],
- 					    [QtCore >= 4 QtGui >= 4],,

diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
deleted file mode 100644
index 56e14bbc04eb..000000000000
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-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://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls 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_USEDEP}]
-		')
-	)"
-
-BDEPEND="
-	app-text/xmlto
-	virtual/pkgconfig
-	gtk? ( dev-util/glib-utils )
-	nls? (
-		sys-devel/gettext
-		virtual/libiconv
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}_fix_leftover_on_shell_compatibility.patch"
-	"${FILESDIR}/${P}_fix_unittest.patch"
-	"${FILESDIR}/${P}_musl_include_locale_h.patch"
-	"${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 )
-
-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} 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 nls)
-		$(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
-				myeconfargs+=( --with-java-unit )
-				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-graphicsmagick
-			--without-imagemagick
-			--without-qt
-		)
-
-		# zbarimg tests with native abi only
-		# (this option from the patch above, stay up to date)
-		use test && myeconfargs+=( --without-zbarimg-tests )
-	fi
-
-	# use bash (bug 721370)
-	CONFIG_SHELL='/bin/bash' \
-	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
-}