summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2018-09-12 23:37:27 +0100
committerJames Le Cuirot <chewi@gentoo.org>2018-09-21 19:21:31 +0100
commit9027bbe12d28af03cb7cad29f489e28361c3f970 (patch)
tree7893c34268f7da58ed7b2f00eee47f076ae9063a
parentmedia-libs/libbluray: Install new awt jar for 9999 (diff)
downloadgentoo-9027bbe12d28af03cb7cad29f489e28361c3f970.tar.gz
gentoo-9027bbe12d28af03cb7cad29f489e28361c3f970.tar.bz2
gentoo-9027bbe12d28af03cb7cad29f489e28361c3f970.zip
media-libs/libbluray: Bring 9999 in sync with latest release
The ebuild had fallen behind. Package-Manager: Portage-2.3.49, Repoman-2.3.10
-rw-r--r--media-libs/libbluray/libbluray-9999.ebuild13
1 files changed, 6 insertions, 7 deletions
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index a30dae66fdbd..811597459685 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -11,14 +11,14 @@ else
SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
fi
-inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal
+inherit autotools java-pkg-opt-2 flag-o-matic multilib-minimal
DESCRIPTION="Blu-ray playback libraries"
HOMEPAGE="https://www.videolan.org/developers/libbluray.html"
LICENSE="LGPL-2.1"
SLOT="0/2"
-IUSE="aacs bdplus +fontconfig java static-libs +truetype udf utils +xml"
+IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
COMMON_DEPEND="
xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
@@ -44,7 +44,7 @@ DOCS=( ChangeLog README.txt )
src_prepare() {
default
-
+ unset JDK_HOME #621992
if use java ; then
export JDK_HOME="$(java-config -g JAVA_HOME)"
@@ -61,11 +61,10 @@ multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
--disable-optimizations \
$(multilib_native_use_enable utils examples) \
- $(multilib_native_use_enable java bdjava) \
+ $(multilib_native_use_enable java bdjava-jar) \
$(use_with fontconfig) \
$(use_with truetype freetype) \
$(use_enable static-libs static) \
- $(use_enable udf) \
$(use_with xml libxml2)
}
@@ -73,7 +72,7 @@ multilib_src_install() {
emake DESTDIR="${D}" install
if multilib_is_native_abi && use utils; then
- cd .libs/
+ cd .libs/ || die
dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
if use java; then
dobin bdj_test
@@ -87,5 +86,5 @@ multilib_src_install() {
multilib_src_install_all() {
einstalldocs
- prune_libtool_files
+ find "${D}" -name '*.la' -delete || die
}