summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-04-21 07:39:41 +0000
committerMichał Górny <mgorny@gentoo.org>2014-04-21 07:39:41 +0000
commitd742171cd09edc0924a6521015428fc02b10ddc9 (patch)
tree9f8251d6b017ae777d293151960f6529c43d25ca /media-libs/libbluray
parentUse the new multilib_native_use* functions. (diff)
downloadgentoo-2-d742171cd09edc0924a6521015428fc02b10ddc9.tar.gz
gentoo-2-d742171cd09edc0924a6521015428fc02b10ddc9.tar.bz2
gentoo-2-d742171cd09edc0924a6521015428fc02b10ddc9.zip
Use multilib_build_binaries consistently, and the new multilib_native_use* functions.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'media-libs/libbluray')
-rw-r--r--media-libs/libbluray/ChangeLog6
-rw-r--r--media-libs/libbluray/libbluray-0.5.0-r1.ebuild8
2 files changed, 9 insertions, 5 deletions
diff --git a/media-libs/libbluray/ChangeLog b/media-libs/libbluray/ChangeLog
index bb154be8b578..fc7fb9f094e5 100644
--- a/media-libs/libbluray/ChangeLog
+++ b/media-libs/libbluray/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libbluray
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.55 2014/04/11 05:37:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.56 2014/04/21 07:39:41 mgorny Exp $
+
+ 21 Apr 2014; Michał Górny <mgorny@gentoo.org> libbluray-0.5.0-r1.ebuild:
+ Use multilib_build_binaries consistently, and the new multilib_native_use*
+ functions.
*libbluray-0.5.0-r1 (11 Apr 2014)
diff --git a/media-libs/libbluray/libbluray-0.5.0-r1.ebuild b/media-libs/libbluray/libbluray-0.5.0-r1.ebuild
index 17dd274f962d..ff078bfc737e 100644
--- a/media-libs/libbluray/libbluray-0.5.0-r1.ebuild
+++ b/media-libs/libbluray/libbluray-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-0.5.0-r1.ebuild,v 1.1 2014/04/11 05:37:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-0.5.0-r1.ebuild,v 1.2 2014/04/21 07:39:41 mgorny Exp $
EAPI=5
@@ -50,7 +50,7 @@ src_prepare() {
multilib_src_configure() {
local myconf
- if multilib_is_native_abi && use java; then
+ if multilib_build_binaries && use java; then
export JAVACFLAGS="$(java-pkg_javac-args)"
append-cflags "$(java-pkg_get-jni-cflags)"
myconf="--enable-bdjava"
@@ -60,7 +60,7 @@ multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
--disable-optimizations \
- $(multilib_build_binaries && use_enable utils examples || echo "--disable-examples") \
+ $(multilib_native_use_enable utils examples) \
$(use_with truetype freetype) \
$(use_enable static-libs static) \
$(use_with xml libxml2) \
@@ -80,7 +80,7 @@ multilib_src_install() {
fi
fi
- if multilib_is_native_abi && use java; then
+ if multilib_build_binaries && use java; then
java-pkg_dojar "${BUILD_DIR}"/src/.libs/${PN}.jar
doenvd "${FILESDIR}"/90${PN}
fi