media-libs/libbluray: Bump to 1.1.1, EAPI 7, fix versioned jars issue

Closes: https://bugs.gentoo.org/639284
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

4 files changed, 156 insertions, 23 deletions

diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index a6b4ab1d997b..f0f4a53f1b2e 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1 +1,2 @@
 DIST libbluray-1.0.2.tar.bz2 733058 BLAKE2B 6428b3cb8a2339e2c2d7f86663d6917d8484b858fb03aaf3bda6824181d072050625d37280cf011574c07316ef83103b334f654de1a6219e3a33343532cfe986 SHA512 e1360ad08aa6cc67a80efa81a09004faebbe31105f1961494f82f655e3e7378b198ee3bc534b0d0c2bfec726939b11b545cc8bbfa30794fc647432dadf71089b
+DIST libbluray-1.1.1.tar.bz2 746034 BLAKE2B 031d9c4f5ed85cb9128ec6f9b0c4232e889578ca03e131024ce2bc7049ff7990ef1936aa5a525266f8d5402e58d9c2a92b14338259c37dfaebb50c6b9745ca1e SHA512 0a3bcef06d2a58c51c3d46934c32941ec0606dc9b71fe36f72a6e34ab8113cf72cfb6e2fdd51f23e0a44ccd404323f5ac5c666aa1d839ae16cc775267cbce839
diff --git a/media-libs/libbluray/files/libbluray-jars.patch b/media-libs/libbluray/files/libbluray-jars.patch
new file mode 100644
index 000000000000..f313bf22a210
--- /dev/null
+++ b/media-libs/libbluray/files/libbluray-jars.patch
@@ -0,0 +1,46 @@
+diff -Naur a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2019-04-05 09:34:16.000000000 +0100
++++ b/Makefile.am	2019-04-14 20:30:19.570385252 +0100
+@@ -239,10 +239,10 @@
+ awt_src = java-$(BDJ_TYPE)
+ endif
+ 
+-jardir=$(datadir)/java/
++jardir=$(datadir)/libbluray/lib/
+ jar_DATA = \
+-	$(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar \
+-	$(top_builddir)/.libs/libbluray-awt-$(BDJ_TYPE)-$(VERSION).jar
++	$(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-gentoo.jar \
++	$(top_builddir)/.libs/libbluray-awt-$(BDJ_TYPE)-gentoo.jar
+ 
+ $(jar_DATA): all-local
+ 
+@@ -253,13 +253,13 @@
+ 	    -Dsrc_awt=:$(awt_src) \
+ 	    $(java_versions) \
+ 	    -Dbootclasspath="$(BDJ_BOOTCLASSPATH)" \
+-	    -Dversion='$(BDJ_TYPE)-$(VERSION)'
++	    -Dversion='$(BDJ_TYPE)-gentoo'
+ 
+ clean-local:
+ 	ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
+ 	    -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \
+ 	    -Ddist='$(abs_builddir)/.libs' \
+-	    -Dversion='$(BDJ_TYPE)-$(VERSION)' \
++	    -Dversion='$(BDJ_TYPE)-gentoo' \
+ 	    clean
+ endif
+ 
+diff -Naur a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
+--- a/src/libbluray/bdj/bdj.c	2019-04-05 09:34:16.000000000 +0100
++++ b/src/libbluray/bdj/bdj.c	2019-04-14 20:21:01.927193454 +0100
+@@ -22,6 +22,9 @@
+ #include "config.h"
+ #endif
+ 
++#undef VERSION
++#define VERSION "gentoo"
++
+ #include "bdj.h"
+ 
+ #include "native/register_native.h"
diff --git a/media-libs/libbluray/libbluray-1.1.1.ebuild b/media-libs/libbluray/libbluray-1.1.1.ebuild
new file mode 100644
index 000000000000..4a5301a677de
--- /dev/null
+++ b/media-libs/libbluray/libbluray-1.1.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ "${PV#9999}" != "${PV}" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.videolan.org/git/libbluray.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+fi
+
+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 utils +xml"
+
+COMMON_DEPEND="
+	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
+	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
+	java? ( >=virtual/jre-1.6 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.6 )
+"
+BDEPEND="
+	java? (
+		>=virtual/jdk-1.6
+		dev-java/ant-core
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-jars.patch
+)
+
+DOCS=(
+	ChangeLog
+	README.txt
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	use java || unset JDK_HOME # Bug #621992.
+
+	ECONF_SOURCE="${S}" econf \
+		--disable-optimizations \
+		$(multilib_native_use_enable utils examples) \
+		$(multilib_native_use_enable java bdjava-jar) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_enable static-libs static) \
+		$(use_with xml libxml2)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi || return
+
+	use utils &&
+		find .libs/ -type f -executable ! -name "${PN}.*" \
+			 $(use java || echo '! -name bdj_test') -exec dobin {} +
+
+	use java &&
+		java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
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() {