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 36ED1138334 for ; Sun, 25 Nov 2018 17:36:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 558EEE0AFB; Sun, 25 Nov 2018 17:36:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 21812E0AFB for ; Sun, 25 Nov 2018 17:36:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 2EACE335D54 for ; Sun, 25 Nov 2018 17:36:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6FF484CC for ; Sun, 25 Nov 2018 17:36:25 +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: <1543167297.396ae5098d33469763456222de5638ff7e983475.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/zbar/Manifest media-gfx/zbar/zbar-0.20.1.ebuild X-VCS-Directories: media-gfx/zbar/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 396ae5098d33469763456222de5638ff7e983475 X-VCS-Branch: master Date: Sun, 25 Nov 2018 17:36:25 +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: 8ce39dcc-1de5-4cc2-b921-816b65c2c907 X-Archives-Hash: c44c13238af065a7d24053b1893a0ec6 commit: 396ae5098d33469763456222de5638ff7e983475 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 25 11:48:30 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 25 17:34:57 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=396ae509 media-gfx/zbar: 0.20.1 version bump, add USE qt5, graphicsmagick Add missing || die Closes: https://bugs.gentoo.org/667990 Closes: https://bugs.gentoo.org/641920 Closes: https://bugs.gentoo.org/629016 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/zbar/Manifest | 1 + media-gfx/zbar/zbar-0.20.1.ebuild | 148 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+) diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index eae44cfe62f..b5bf4950fae 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1 +1,2 @@ DIST zbar-0.10_p20121015.zip 991578 BLAKE2B 021dfa3920a838fd7bab12b09600ac6949c1495045691c4cc547bfb6ec647658c60984da248b882eabfc0bb123b90401dd3a32adcd66726b1e7072662e303d18 SHA512 7bb74ea5b096093b283c44787547ad0b886281628d012aa7b03ddb477732feb1e12d4d5a661191d34b53b7b272a237f67840e219b0ac5e2803da478a1ddba7a1 +DIST zbar-0.20.1.tar.gz 555199 BLAKE2B f224a2207fa0603da4cc3a0e1d05bc73f3cf0cc9d13c26b3b801d3418f4f6a001b52e468b721552af61f4c8d7357934abd0560c24d3b233107785c69cfe14753 SHA512 21ad9d8fcdecb41bd4b8979366ab8ec6e8eac815f52270b0dc72ce6a126ccef933d048ce8bbe28f46ada5defadf85ba8c97c5c1870c9560a9dab28c585dfaf42 diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild b/media-gfx/zbar/zbar-0.20.1.ebuild new file mode 100644 index 00000000000..045ba2301cb --- /dev/null +++ b/media-gfx/zbar/zbar-0.20.1.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2018 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/procxx/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" +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 + ) + 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.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 || 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 + fi + + ECONF_SOURCE=${S} \ + econf "${myeconfargs[@]}" + + # work-around out-of-source build issue + mkdir gtk pygtk qt test || die +} + +src_test() { + virtx multilib-minimal_src_test +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} + +pkg_preinst() { + java-pkg-opt-2_pkg_preinst +}