Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libbluray/
Date: Thu, 03 Dec 2015 09:35:22
Message-Id: 1449135174.74eda9b55eeaae1211fa9198a5967ed3b0d2131e.aballier@gentoo
1 commit: 74eda9b55eeaae1211fa9198a5967ed3b0d2131e
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 3 09:32:54 2015 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 3 09:32:54 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74eda9b5
7
8 media-libs/libbluray: simplify java useflag handling
9
10 Package-Manager: portage-2.2.26
11 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
12
13 media-libs/libbluray/libbluray-0.9.1.ebuild | 13 ++-----------
14 media-libs/libbluray/libbluray-9999.ebuild | 13 ++-----------
15 2 files changed, 4 insertions(+), 22 deletions(-)
16
17 diff --git a/media-libs/libbluray/libbluray-0.9.1.ebuild b/media-libs/libbluray/libbluray-0.9.1.ebuild
18 index 9d88120..4ec2cb0 100644
19 --- a/media-libs/libbluray/libbluray-0.9.1.ebuild
20 +++ b/media-libs/libbluray/libbluray-0.9.1.ebuild
21 @@ -60,24 +60,15 @@ src_prepare() {
22 }
23
24 multilib_src_configure() {
25 - local myconf
26 - if multilib_is_native_abi && use java; then
27 - export JAVACFLAGS="$(java-pkg_javac-args)"
28 - append-cflags "$(java-pkg_get-jni-cflags)"
29 - myconf="--enable-bdjava"
30 - else
31 - myconf="--disable-bdjava"
32 - fi
33 -
34 ECONF_SOURCE="${S}" econf \
35 --disable-optimizations \
36 $(multilib_native_use_enable utils examples) \
37 + $(multilib_native_use_enable java bdjava) \
38 $(use_with fontconfig) \
39 $(use_with truetype freetype) \
40 $(use_enable static-libs static) \
41 $(use_enable udf) \
42 - $(use_with xml libxml2) \
43 - ${myconf}
44 + $(use_with xml libxml2)
45 }
46
47 multilib_src_install() {
48
49 diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
50 index 9d88120..4ec2cb0 100644
51 --- a/media-libs/libbluray/libbluray-9999.ebuild
52 +++ b/media-libs/libbluray/libbluray-9999.ebuild
53 @@ -60,24 +60,15 @@ src_prepare() {
54 }
55
56 multilib_src_configure() {
57 - local myconf
58 - if multilib_is_native_abi && use java; then
59 - export JAVACFLAGS="$(java-pkg_javac-args)"
60 - append-cflags "$(java-pkg_get-jni-cflags)"
61 - myconf="--enable-bdjava"
62 - else
63 - myconf="--disable-bdjava"
64 - fi
65 -
66 ECONF_SOURCE="${S}" econf \
67 --disable-optimizations \
68 $(multilib_native_use_enable utils examples) \
69 + $(multilib_native_use_enable java bdjava) \
70 $(use_with fontconfig) \
71 $(use_with truetype freetype) \
72 $(use_enable static-libs static) \
73 $(use_enable udf) \
74 - $(use_with xml libxml2) \
75 - ${myconf}
76 + $(use_with xml libxml2)
77 }
78
79 multilib_src_install() {