| 1 |
commit: 9027bbe12d28af03cb7cad29f489e28361c3f970 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 12 22:37:27 2018 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 21 18:21:31 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9027bbe1 |
| 7 |
|
| 8 |
media-libs/libbluray: Bring 9999 in sync with latest release |
| 9 |
|
| 10 |
The ebuild had fallen behind. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 13 |
|
| 14 |
media-libs/libbluray/libbluray-9999.ebuild | 13 ++++++------- |
| 15 |
1 file changed, 6 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild |
| 18 |
index a30dae66fdb..81159745968 100644 |
| 19 |
--- a/media-libs/libbluray/libbluray-9999.ebuild |
| 20 |
+++ b/media-libs/libbluray/libbluray-9999.ebuild |
| 21 |
@@ -11,14 +11,14 @@ else |
| 22 |
SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2" |
| 23 |
fi |
| 24 |
|
| 25 |
-inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal |
| 26 |
+inherit autotools java-pkg-opt-2 flag-o-matic multilib-minimal |
| 27 |
|
| 28 |
DESCRIPTION="Blu-ray playback libraries" |
| 29 |
HOMEPAGE="https://www.videolan.org/developers/libbluray.html" |
| 30 |
|
| 31 |
LICENSE="LGPL-2.1" |
| 32 |
SLOT="0/2" |
| 33 |
-IUSE="aacs bdplus +fontconfig java static-libs +truetype udf utils +xml" |
| 34 |
+IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml" |
| 35 |
|
| 36 |
COMMON_DEPEND=" |
| 37 |
xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] ) |
| 38 |
@@ -44,7 +44,7 @@ DOCS=( ChangeLog README.txt ) |
| 39 |
|
| 40 |
src_prepare() { |
| 41 |
default |
| 42 |
- |
| 43 |
+ unset JDK_HOME #621992 |
| 44 |
if use java ; then |
| 45 |
export JDK_HOME="$(java-config -g JAVA_HOME)" |
| 46 |
|
| 47 |
@@ -61,11 +61,10 @@ multilib_src_configure() { |
| 48 |
ECONF_SOURCE="${S}" econf \ |
| 49 |
--disable-optimizations \ |
| 50 |
$(multilib_native_use_enable utils examples) \ |
| 51 |
- $(multilib_native_use_enable java bdjava) \ |
| 52 |
+ $(multilib_native_use_enable java bdjava-jar) \ |
| 53 |
$(use_with fontconfig) \ |
| 54 |
$(use_with truetype freetype) \ |
| 55 |
$(use_enable static-libs static) \ |
| 56 |
- $(use_enable udf) \ |
| 57 |
$(use_with xml libxml2) |
| 58 |
} |
| 59 |
|
| 60 |
@@ -73,7 +72,7 @@ multilib_src_install() { |
| 61 |
emake DESTDIR="${D}" install |
| 62 |
|
| 63 |
if multilib_is_native_abi && use utils; then |
| 64 |
- cd .libs/ |
| 65 |
+ cd .libs/ || die |
| 66 |
dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump |
| 67 |
if use java; then |
| 68 |
dobin bdj_test |
| 69 |
@@ -87,5 +86,5 @@ multilib_src_install() { |
| 70 |
|
| 71 |
multilib_src_install_all() { |
| 72 |
einstalldocs |
| 73 |
- prune_libtool_files |
| 74 |
+ find "${D}" -name '*.la' -delete || die |
| 75 |
} |
Archives