[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/

["Andrew Savchenko" <bircoph@gentoo.org>]

commit:     6a2f51bbe5ad97c868f2811743dfba5d6a4fabca
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  7 06:35:39 2016 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Wed Sep  7 06:35:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a2f51bb

media-gfx/zbar: fix bug 589834

Add USE="java" support to fix automagic dependency.

Package-Manager: portage-2.3.0
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 media-gfx/zbar/zbar-0.10_p20121015.ebuild | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/media-gfx/zbar/zbar-0.10_p20121015.ebuild b/media-gfx/zbar/zbar-0.10_p20121015.ebuild
index 5799d94..8a10c4b 100644
--- a/media-gfx/zbar/zbar-0.10_p20121015.ebuild
+++ b/media-gfx/zbar/zbar-0.10_p20121015.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools eutils flag-o-matic python-single-r1
+inherit autotools eutils flag-o-matic java-pkg-opt-2 multilib python-single-r1
 
 DESCRIPTION="Library and tools for reading barcodes from images or video"
 HOMEPAGE="http://zbar.sourceforge.net/"
@@ -15,9 +15,9 @@ 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 jpeg python qt4 static-libs +threads v4l X xv"
+IUSE="gtk imagemagick java jpeg python qt4 static-libs +threads v4l X xv"
 
-RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
+CDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
 	imagemagick? (
 		|| ( media-gfx/imagemagick
 		media-gfx/graphicsmagick[imagemagick] ) )
@@ -27,7 +27,10 @@ RDEPEND="gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 )
 	qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 )
 	X? ( x11-libs/libXext
 		xv? ( x11-libs/libXv ) )"
-DEPEND="${RDEPEND}
+REPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.4 ) "
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.4 )
 	sys-devel/gettext
 	virtual/pkgconfig"
 
@@ -35,6 +38,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
+	java-pkg-opt-2_pkg_setup
 }
 
 src_unpack() {
@@ -49,16 +53,25 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-0.10-v4l2-uvcvideo.patch
 
 	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
 }
 
 src_configure() {
+	if use java; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
+	fi
+
 	append-cppflags -DNDEBUG
 	econf \
+		$(use_with java) \
 		$(use_with jpeg) \
 		$(use_with gtk) \
 		$(use_with imagemagick) \
@@ -77,3 +90,7 @@ src_install() {
 	rm -r "${ED}"/usr/share/doc/${PN}
 	prune_libtool_files --all
 }
+
+pkg_preinst() {
+	java-pkg-opt-2_pkg_preinst
+}