From 74eda9b55eeaae1211fa9198a5967ed3b0d2131e Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 3 Dec 2015 10:32:54 +0100 Subject: [PATCH] media-libs/libbluray: simplify java useflag handling Package-Manager: portage-2.2.26 Signed-off-by: Alexis Ballier --- media-libs/libbluray/libbluray-0.9.1.ebuild | 13 ++----------- media-libs/libbluray/libbluray-9999.ebuild | 13 ++----------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/media-libs/libbluray/libbluray-0.9.1.ebuild b/media-libs/libbluray/libbluray-0.9.1.ebuild index 9d88120f4c96..4ec2cb0a496c 100644 --- a/media-libs/libbluray/libbluray-0.9.1.ebuild +++ b/media-libs/libbluray/libbluray-0.9.1.ebuild @@ -60,24 +60,15 @@ src_prepare() { } multilib_src_configure() { - local myconf - if multilib_is_native_abi && use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - append-cflags "$(java-pkg_get-jni-cflags)" - myconf="--enable-bdjava" - else - myconf="--disable-bdjava" - fi - ECONF_SOURCE="${S}" econf \ --disable-optimizations \ $(multilib_native_use_enable utils examples) \ + $(multilib_native_use_enable java bdjava) \ $(use_with fontconfig) \ $(use_with truetype freetype) \ $(use_enable static-libs static) \ $(use_enable udf) \ - $(use_with xml libxml2) \ - ${myconf} + $(use_with xml libxml2) } multilib_src_install() { diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild index 9d88120f4c96..4ec2cb0a496c 100644 --- a/media-libs/libbluray/libbluray-9999.ebuild +++ b/media-libs/libbluray/libbluray-9999.ebuild @@ -60,24 +60,15 @@ src_prepare() { } multilib_src_configure() { - local myconf - if multilib_is_native_abi && use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - append-cflags "$(java-pkg_get-jni-cflags)" - myconf="--enable-bdjava" - else - myconf="--disable-bdjava" - fi - ECONF_SOURCE="${S}" econf \ --disable-optimizations \ $(multilib_native_use_enable utils examples) \ + $(multilib_native_use_enable java bdjava) \ $(use_with fontconfig) \ $(use_with truetype freetype) \ $(use_enable static-libs static) \ $(use_enable udf) \ - $(use_with xml libxml2) \ - ${myconf} + $(use_with xml libxml2) } multilib_src_install() { -- 2.26.2