diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
| commit | b7ebc951da8800f711142f69d9d958bde67a112d (patch) | |
| tree | e318514216845acb8f2e49fff7a5cba4027e9d91 /media-libs/libbluray/libbluray-9999.ebuild | |
| parent | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff) | |
gentoo resync : 28.04.2019
Diffstat (limited to 'media-libs/libbluray/libbluray-9999.ebuild')
| -rw-r--r-- | media-libs/libbluray/libbluray-9999.ebuild | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild index 811597459685..4a5301a677de 100644 --- a/media-libs/libbluray/libbluray-9999.ebuild +++ b/media-libs/libbluray/libbluray-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ "${PV#9999}" != "${PV}" ]] ; then inherit git-r3 @@ -33,6 +33,9 @@ RDEPEND=" " DEPEND=" ${COMMON_DEPEND} + java? ( >=virtual/jdk-1.6 ) +" +BDEPEND=" java? ( >=virtual/jdk-1.6 dev-java/ant-core @@ -40,24 +43,23 @@ DEPEND=" virtual/pkgconfig " -DOCS=( ChangeLog README.txt ) +PATCHES=( + "${FILESDIR}"/${PN}-jars.patch +) + +DOCS=( + ChangeLog + README.txt +) src_prepare() { default - unset JDK_HOME #621992 - if use java ; then - export JDK_HOME="$(java-config -g JAVA_HOME)" - - # don't install a duplicate jar file - sed -i '/^jar_DATA/d' Makefile.am || die - - java-pkg-opt-2_src_prepare - fi - eautoreconf } multilib_src_configure() { + use java || unset JDK_HOME # Bug #621992. + ECONF_SOURCE="${S}" econf \ --disable-optimizations \ $(multilib_native_use_enable utils examples) \ @@ -70,18 +72,14 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install + multilib_is_native_abi || return - if multilib_is_native_abi && use utils; then - 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 - fi - fi + use utils && + find .libs/ -type f -executable ! -name "${PN}.*" \ + $(use java || echo '! -name bdj_test') -exec dobin {} + - if multilib_is_native_abi && use java; then - java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}{,-awt}-j2se-*.jar - fi + use java && + java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar } multilib_src_install_all() { |