summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-12-03 10:32:54 +0100
committerAlexis Ballier <aballier@gentoo.org>2015-12-03 10:32:54 +0100
commit74eda9b55eeaae1211fa9198a5967ed3b0d2131e (patch)
treea28a0c6eb3abc97a52dae52f2d8a8cf1a1e37cb3 /media-libs/libbluray
parentmedia-libs/libbluray: add udf useflag, part of bug #539946 by Petri Hintukainen (diff)
downloadgentoo-74eda9b55eeaae1211fa9198a5967ed3b0d2131e.tar.gz
gentoo-74eda9b55eeaae1211fa9198a5967ed3b0d2131e.tar.bz2
gentoo-74eda9b55eeaae1211fa9198a5967ed3b0d2131e.zip
media-libs/libbluray: simplify java useflag handling
Package-Manager: portage-2.2.26 Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'media-libs/libbluray')
-rw-r--r--media-libs/libbluray/libbluray-0.9.1.ebuild13
-rw-r--r--media-libs/libbluray/libbluray-9999.ebuild13
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() {