From 1c98fe8bc128858fa999409a779a1a72812bd524 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 7 Feb 2020 16:06:53 +0100
Subject: media-gfx/zbar: Switch to PYTHON_MULTI_USEDEP API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 media-gfx/zbar/zbar-0.20.1-r1.ebuild | 164 --------------------------
 media-gfx/zbar/zbar-0.20.1-r2.ebuild | 168 +++++++++++++++++++++++++++
 media-gfx/zbar/zbar-0.23-r1.ebuild   | 216 +++++++++++++++++++++++++++++++++++
 media-gfx/zbar/zbar-0.23.ebuild      | 214 ----------------------------------
 4 files changed, 384 insertions(+), 378 deletions(-)
 delete mode 100644 media-gfx/zbar/zbar-0.20.1-r1.ebuild
 create mode 100644 media-gfx/zbar/zbar-0.20.1-r2.ebuild
 create mode 100644 media-gfx/zbar/zbar-0.23-r1.ebuild
 delete mode 100644 media-gfx/zbar/zbar-0.23.ebuild

diff --git a/media-gfx/zbar/zbar-0.20.1-r1.ebuild b/media-gfx/zbar/zbar-0.20.1-r1.ebuild
deleted file mode 100644
index 9a6382e3b61f..000000000000
--- a/media-gfx/zbar/zbar-0.20.1-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-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="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( X ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
-	gtk? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
-	)
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:= )
-		graphicsmagick? ( media-gfx/graphicsmagick:= )
-	)
-	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-	)
-	v4l? ( media-libs/libv4l:0= )
-	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}
-	sys-devel/gettext
-	virtual/pkgconfig
-	gtk? ( dev-util/glib-utils )
-	java? (
-		>=virtual/jdk-1.8
-		test? (
-			dev-java/junit:4
-			dev-java/hamcrest-core:1.3
-		)
-	)
-	test? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch )
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch"
-	fi
-
-	use python && python_fix_shebang examples/upcrpc.py test/*.py
-	java-pkg-opt-2_src_prepare
-
-	sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
-		-e '/^AM_CFLAGS=/s: -Werror::' \
-		-i configure.ac || die
-	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
-		-i java/Makefile.am || die
-	eautoreconf
-}
-
-multilib_src_configure() {
-	append-cppflags -DNDEBUG
-
-	local myeconfargs=(
-		$(use_with gtk)
-		$(multilib_native_use_with graphicsmagick graphicsmagick)
-		$(multilib_native_use_with imagemagick)
-		$(multilib_native_use_with java)
-		$(use_with jpeg)
-		$(multilib_native_use_with python python2)
-		$(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
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			export JAVA_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+=(
-				$(use_with qt5 qt)
-				$(use_with qt5)
-			)
-		else
-			myeconfargs+=( --without-qt )
-		fi
-	else
-			myeconfargs+=( --without-qt )
-	fi
-
-	ECONF_SOURCE=${S} \
-		econf "${myeconfargs[@]}"
-
-	# work around out-of-source build issues for multilib systems
-	# https://bugs.gentoo.org/672184
-	mkdir gtk pygtk qt test 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() {
-	java-pkg-opt-2_pkg_preinst
-}
diff --git a/media-gfx/zbar/zbar-0.20.1-r2.ebuild b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
new file mode 100644
index 000000000000..5aba21e790d8
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.20.1-r2.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+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="graphicsmagick gtk imagemagick java jpeg python qt5 static-libs test +threads v4l X xv"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( X ${PYTHON_REQUIRED_USE} )
+"
+
+COMMON_DEPEND="
+	gtk? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	)
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:= )
+		graphicsmagick? ( media-gfx/graphicsmagick:= )
+	)
+	jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		gtk? (
+			$(python_gen_cond_dep '
+				>=dev-python/pygtk-2[${PYTHON_MULTI_USEDEP}]
+			')
+		)
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+	v4l? ( media-libs/libv4l:0= )
+	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}
+	sys-devel/gettext
+	virtual/pkgconfig
+	gtk? ( dev-util/glib-utils )
+	java? (
+		>=virtual/jdk-1.8
+		test? (
+			dev-java/junit:4
+			dev-java/hamcrest-core:1.3
+		)
+	)
+	test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.10-errors.patch )
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		eapply "${FILESDIR}/${PN}-0.10_p20121015-ImageMagick-7.patch"
+	fi
+
+	use python && python_fix_shebang examples/upcrpc.py test/*.py
+	java-pkg-opt-2_src_prepare
+
+	sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \
+		-e '/^AM_CFLAGS=/s: -Werror::' \
+		-i configure.ac || die
+	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
+		-i java/Makefile.am || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-cppflags -DNDEBUG
+
+	local myeconfargs=(
+		$(use_with gtk)
+		$(multilib_native_use_with graphicsmagick graphicsmagick)
+		$(multilib_native_use_with imagemagick)
+		$(multilib_native_use_with java)
+		$(use_with jpeg)
+		$(multilib_native_use_with python python2)
+		$(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
+		if use java; then
+			export JAVACFLAGS="$(java-pkg_javac-args)"
+			export JAVA_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+=(
+				$(use_with qt5 qt)
+				$(use_with qt5)
+			)
+		else
+			myeconfargs+=( --without-qt )
+		fi
+	else
+			myeconfargs+=( --without-qt )
+	fi
+
+	ECONF_SOURCE=${S} \
+		econf "${myeconfargs[@]}"
+
+	# work around out-of-source build issues for multilib systems
+	# https://bugs.gentoo.org/672184
+	mkdir gtk pygtk qt test 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() {
+	java-pkg-opt-2_pkg_preinst
+}
diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild
new file mode 100644
index 000000000000..87656810dce6
--- /dev/null
+++ b/media-gfx/zbar/zbar-0.23-r1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,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}/${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.ebuild b/media-gfx/zbar/zbar-0.23.ebuild
deleted file mode 100644
index 495dc423d47e..000000000000
--- a/media-gfx/zbar/zbar-0.23.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,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}
-		dev-python/pillow[${PYTHON_USEDEP}]
-	)"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	gtk? ( dev-util/glib-utils )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.10-errors.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
-}
-- 
cgit v1.2.3-65-gdbad