From c3518823c5c5c05d046bbcb07f6dc01a61c260d7 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Fri, 9 Dec 2016 02:10:41 -0500 Subject: [PATCH] media-libs/libbluray: bump to EAPI 6 --- media-libs/libbluray/libbluray-0.9.3.ebuild | 6 ++++-- media-libs/libbluray/libbluray-9999.ebuild | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/media-libs/libbluray/libbluray-0.9.3.ebuild b/media-libs/libbluray/libbluray-0.9.3.ebuild index bc7c11179b32..750769b24e8d 100644 --- a/media-libs/libbluray/libbluray-0.9.3.ebuild +++ b/media-libs/libbluray/libbluray-0.9.3.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -if [ "${PV#9999}" != "${PV}" ] ; then +if [[ "${PV#9999}" != "${PV}" ]] ; then inherit git-r3 KEYWORDS="" EGIT_REPO_URI="git://git.videolan.org/libbluray.git" @@ -46,6 +46,8 @@ DEPEND=" DOCS=( ChangeLog README.txt ) src_prepare() { + default + if use java ; then export JDK_HOME="$(java-config -g JAVA_HOME)" diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild index 9b3bac6a3bb4..750769b24e8d 100644 --- a/media-libs/libbluray/libbluray-9999.ebuild +++ b/media-libs/libbluray/libbluray-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -if [ "${PV#9999}" != "${PV}" ] ; then +if [[ "${PV#9999}" != "${PV}" ]] ; then inherit git-r3 KEYWORDS="" EGIT_REPO_URI="git://git.videolan.org/libbluray.git" @@ -46,6 +46,8 @@ DEPEND=" DOCS=( ChangeLog README.txt ) src_prepare() { + default + if use java ; then export JDK_HOME="$(java-config -g JAVA_HOME)" -- 2.26.2