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 62B321396D0 for ; Thu, 7 Sep 2017 20:31:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3CBCDE0DAC; Thu, 7 Sep 2017 20:31:51 +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 0FEBDE0D88 for ; Thu, 7 Sep 2017 20:31:51 +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 0385233E4AD for ; Thu, 7 Sep 2017 20:31:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2224F8F31 for ; Thu, 7 Sep 2017 20:31:47 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1504816296.75539e8e845df3d64c0ef32c01cc1d31ab84850a.mgorny@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-r2.ebuild X-VCS-Directories: media-gfx/zbar/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 75539e8e845df3d64c0ef32c01cc1d31ab84850a X-VCS-Branch: master Date: Thu, 7 Sep 2017 20:31:47 +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: a4de36d1-70ea-470c-a684-b36effba6062 X-Archives-Hash: 00a2949f55b4ba6ecd59838a18547b23 commit: 75539e8e845df3d64c0ef32c01cc1d31ab84850a Author: Michał Górny gentoo org> AuthorDate: Sun Aug 27 17:14:26 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Sep 7 20:31:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75539e8e media-gfx/zbar: Enable multilib support Bug: https://bugs.gentoo.org/628306 Closes: https://github.com/gentoo/gentoo/pull/5543 media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild | 34 ++++++++++++++++------------ 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild index e7e5d80d924..3a552305df6 100644 --- a/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild +++ b/media-gfx/zbar/zbar-0.10_p20121015-r2.ebuild @@ -5,7 +5,8 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 virtualx +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/" @@ -18,17 +19,19 @@ IUSE="gtk imagemagick java jpeg python qt4 static-libs test +threads v4l X xv" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) test? ( X ${PYTHON_REQUIRED_USE} )" -CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) +CDEPEND="gtk? ( dev-libs/glib:2[${MULTILIB_USEDEP}] + x11-libs/gtk+:2[${MULTILIB_USEDEP}] ) imagemagick? ( virtual/imagemagick-tools ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) python? ( ${PYTHON_DEPS} gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] ) ) - qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) + qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] + dev-qt/qtgui:4[${MULTILIB_USEDEP}] ) X? ( - x11-libs/libXext - xv? ( x11-libs/libXv ) + x11-libs/libXext[${MULTILIB_USEDEP}] + xv? ( x11-libs/libXv[${MULTILIB_USEDEP}] ) )" RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.4 )" @@ -72,33 +75,36 @@ src_prepare() { eautoreconf } -src_configure() { - if use java; then +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)" fi append-cppflags -DNDEBUG + ECONF_SOURCE=${S} \ econf \ - $(use_with java) \ + $(multilib_native_use_with java) \ $(use_with jpeg) \ $(use_with gtk) \ - $(use_with imagemagick) \ - $(use_with python) \ + $(multilib_native_use_with imagemagick) \ + $(multilib_native_use_with python) \ $(use_with qt4 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 default + virtx multilib-minimal_src_test } -src_install() { - emake DESTDIR="${D}" install +multilib_src_install_all() { dodoc HACKING NEWS README TODO find "${D}" -name '*.la' -delete || die }