| 1 |
commit: 6a2f51bbe5ad97c868f2811743dfba5d6a4fabca |
| 2 |
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 7 06:35:39 2016 +0000 |
| 4 |
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 7 06:35:39 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a2f51bb |
| 7 |
|
| 8 |
media-gfx/zbar: fix bug 589834 |
| 9 |
|
| 10 |
Add USE="java" support to fix automagic dependency. |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0 |
| 13 |
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org> |
| 14 |
|
| 15 |
media-gfx/zbar/zbar-0.10_p20121015.ebuild | 27 ++++++++++++++++++++++----- |
| 16 |
1 file changed, 22 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/zbar/zbar-0.10_p20121015.ebuild b/media-gfx/zbar/zbar-0.10_p20121015.ebuild |
| 19 |
index 5799d94..8a10c4b 100644 |
| 20 |
--- a/media-gfx/zbar/zbar-0.10_p20121015.ebuild |
| 21 |
+++ b/media-gfx/zbar/zbar-0.10_p20121015.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2015 Gentoo Foundation |
| 24 |
+# Copyright 1999-2016 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
# $Id$ |
| 27 |
|
| 28 |
@@ -6,7 +6,7 @@ EAPI=5 |
| 29 |
|
| 30 |
PYTHON_COMPAT=( python2_7 ) |
| 31 |
|
| 32 |
-inherit autotools eutils flag-o-matic python-single-r1 |
| 33 |
+inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1 |
| 34 |
|
| 35 |
DESCRIPTION="Library and tools for reading barcodes from images or video" |
| 36 |
HOMEPAGE="http://zbar.sourceforge.net/" |
| 37 |
@@ -15,9 +15,9 @@ SRC_URI="https://dev.gentoo.org/~xmw/zbar-0.10_p20121015.zip" |
| 38 |
LICENSE="LGPL-2.1" |
| 39 |
SLOT="0" |
| 40 |
KEYWORDS="~amd64 ~arm ~x86" |
| 41 |
-IUSE="gtk imagemagick jpeg python qt4 static-libs +threads v4l X xv" |
| 42 |
+IUSE="gtk imagemagick java jpeg python qt4 static-libs +threads v4l X xv" |
| 43 |
|
| 44 |
-RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) |
| 45 |
+CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) |
| 46 |
imagemagick? ( |
| 47 |
|| ( media-gfx/imagemagick |
| 48 |
media-gfx/graphicsmagick[imagemagick] ) ) |
| 49 |
@@ -27,7 +27,10 @@ RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) |
| 50 |
qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) |
| 51 |
X? ( x11-libs/libXext |
| 52 |
xv? ( x11-libs/libXv ) )" |
| 53 |
-DEPEND="${RDEPEND} |
| 54 |
+REPEND="${CDEPEND} |
| 55 |
+ java? ( >=virtual/jre-1.4 ) " |
| 56 |
+DEPEND="${CDEPEND} |
| 57 |
+ java? ( >=virtual/jdk-1.4 ) |
| 58 |
sys-devel/gettext |
| 59 |
virtual/pkgconfig" |
| 60 |
|
| 61 |
@@ -35,6 +38,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 62 |
|
| 63 |
pkg_setup() { |
| 64 |
use python && python-single-r1_pkg_setup |
| 65 |
+ java-pkg-opt-2_pkg_setup |
| 66 |
} |
| 67 |
|
| 68 |
src_unpack() { |
| 69 |
@@ -49,16 +53,25 @@ src_prepare() { |
| 70 |
"${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch |
| 71 |
|
| 72 |
use python && python_fix_shebang examples/upcrpc.py test/*.py |
| 73 |
+ java-pkg-opt-2_src_prepare |
| 74 |
|
| 75 |
sed -e '/AM_INIT_AUTOMAKE/s: -Werror : :' \ |
| 76 |
-e '/^AM_CFLAGS=/s: -Werror::' \ |
| 77 |
-i configure.ac || die |
| 78 |
+ sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \ |
| 79 |
+ -i java/Makefile.am |
| 80 |
eautoreconf |
| 81 |
} |
| 82 |
|
| 83 |
src_configure() { |
| 84 |
+ if use java; then |
| 85 |
+ export JAVACFLAGS="$(java-pkg_javac-args)" |
| 86 |
+ export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)" |
| 87 |
+ fi |
| 88 |
+ |
| 89 |
append-cppflags -DNDEBUG |
| 90 |
econf \ |
| 91 |
+ $(use_with java) \ |
| 92 |
$(use_with jpeg) \ |
| 93 |
$(use_with gtk) \ |
| 94 |
$(use_with imagemagick) \ |
| 95 |
@@ -77,3 +90,7 @@ src_install() { |
| 96 |
rm -r "${ED}"/usr/share/doc/${PN} |
| 97 |
prune_libtool_files --all |
| 98 |
} |
| 99 |
+ |
| 100 |
+pkg_preinst() { |
| 101 |
+ java-pkg-opt-2_pkg_preinst |
| 102 |
+} |
Archives