From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 78443138332 for ; Thu, 10 May 2018 10:08:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCBBAE0B05; Thu, 10 May 2018 10:08:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 83C24E0B05 for ; Thu, 10 May 2018 10:08:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1990B335C85 for ; Thu, 10 May 2018 10:08:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B451F43 for ; Thu, 10 May 2018 10:08:31 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1525946898.a58e50c4bddb838a269abf71deeff789e17c2fd4.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild X-VCS-Directories: media-gfx/zbar/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a58e50c4bddb838a269abf71deeff789e17c2fd4 X-VCS-Branch: master Date: Thu, 10 May 2018 10:08:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e14c325c-fdcf-4109-b098-f0b1f1b07ee8 X-Archives-Hash: 624e1c591738cc8fe829f05ec55e9a05 commit: a58e50c4bddb838a269abf71deeff789e17c2fd4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 10 10:07:19 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 10 10:08:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a58e50c4 media-gfx/zbar: Drop USE=qt4 Closes: https://bugs.gentoo.org/641920 Package-Manager: Portage-2.3.36, Repoman-2.3.9 media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild | 132 +++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild new file mode 100644 index 00000000000..ecdd0ad2dbf --- /dev/null +++ b/media-gfx/zbar/zbar-0.10_p20121015-r3.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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="http://zbar.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ~arm x86" +IUSE="gtk imagemagick java jpeg python static-libs test +threads v4l X xv" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + test? ( X ${PYTHON_REQUIRED_USE} )" + +CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}] + x11-libs/gtk+:2[${MULTILIB_USEDEP}] ) + imagemagick? ( virtual/imagemagick-tools ) + jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) + ) + X? ( + x11-libs/libXext[${MULTILIB_USEDEP}] + xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) + )" +RDEPEND="${CDEPEND} + java? ( >=virtual/jre-1.4 )" +DEPEND="${CDEPEND} + java? ( >=virtual/jdk-1.4 + test? ( dev-java/junit:4 + dev-java/hamcrest-core:1.3 ) ) + test? ( ${PYTHON_DEPS} ) + app-arch/unzip + sys-devel/gettext + virtual/pkgconfig" + +pkg_setup() { + if use python || use test; then + python-single-r1_pkg_setup + fi + java-pkg-opt-2_pkg_setup +} + +src_unpack() { + #vcs-snapshot doesn't work on .zip + default + mv * ${P} || die +} + +src_prepare() { + eapply "${FILESDIR}"/${PN}-0.10-errors.patch \ + "${FILESDIR}"/${PN}-0.10-python-crash.patch \ + "${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch + + # fix use of deprecated qt4 function, bug 572488 + sed -e 's:numBytes:byteCount:g' \ + -i "${S}"/include/zbar/QZBarImage.h || die + + if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then + eapply "${FILESDIR}/${P}-ImageMagick-7.diff" + 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 + eautoreconf +} + +multilib_src_configure() { + if multilib_is_native_abi && 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 + + append-cppflags -DNDEBUG + + # different flags for image/graphics magick (bug 552350) + myimagemagick="--without-imagemagick" + has_version media-gfx/imagemagick && + myimagemagick="$(multilib_native_use_with imagemagick)" + mygraphicsmagick="--without-graphicsmagick" + has_version media-gfx/graphicsmagick && + mygraphicsmagick="$(multilib_native_use_with imagemagick graphicsmagick)" + ECONF_SOURCE=${S} \ + econf \ + $(multilib_native_use_with java) \ + $(use_with jpeg) \ + $(use_with gtk) \ + ${myimagemagick} \ + ${mygraphicsmagick} \ + $(multilib_native_use_with python) \ + --without-qt \ + $(use_enable static-libs static) \ + $(use_enable threads pthread) \ + $(use_with X x) \ + $(use_with xv xv) \ + $(use_enable v4l video) + + # work-around out-of-source build issue + mkdir gtk pygtk qt test || die +} + +src_test() { + virtx multilib-minimal_src_test +} + +multilib_src_install_all() { + dodoc HACKING NEWS README TODO + find "${D}" -name '*.la' -delete || die +} + +pkg_preinst() { + java-pkg-opt-2_pkg_preinst +}