gentoo auto-resync : 02:04:2024 - 20:14:09

5 files changed, 49 insertions, 107 deletions

diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 64e0bd010ee9..9f9b22091d64 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,8 +1,7 @@
 AUX libbluray-1.3.4-fix-libudfread-option.patch 1000 BLAKE2B e4096c638bcb5f633338f9149bea37e3a9a27759858f987e42603f55162cce511c6aa7be0a93490a1ec07b81aab44600cfc3ab311b97a8eb317851ad427fa2d4 SHA512 e276d55066c8777e527715b8fb3c5500962c73f664934d034cdd04555a7f2f54e5683a4bbe9a0bcde5cd3ab07f14c8ccdbd4434e598379367ca6de8d3132fea9
+AUX libbluray-1.3.4-min-java.patch 553 BLAKE2B 4fc2467207544d2d1da48f916880bc30bed289adfc312314e5df9082447d8257ebc5e229a8ae1e9d9d03db57ace750e7856a8b3d085bd234654efd546aa48708 SHA512 9c6ef178698bfc9392d28d01d81906484ac758f01849ae17b6949ee4fb58c085b0f679333320a19a3afa527f241a6ed83c7b42c26ef97c51f24333ad651528f3
 AUX libbluray-jars.patch 1371 BLAKE2B 1c32115ec03db19b849248bcdbe4b9868527717b279d9222ad94bf4c3875522db75ba585566b0609d1a27cbd4e25066832b19351acf05f5b00295ed5364c2984 SHA512 2b376149680edf6891f2129de2fc074dfc32a236d8eb19b3d899e1f7d3ac98eaf8cdf6e13c7b548ab59354c558e2c149f06d85c1c5be61c5e05cc5ec4382d86d
-DIST libbluray-1.3.3.tar.bz2 761335 BLAKE2B 3d17e686e363b0692b7d75596089ed12dbe46006738ea23f274b2992a541e6f1b0384ac2afc785359d94f652017284668c3a044db24ef6de5625575fca956bce SHA512 fc36b4eea43f430f5f774129bd5cf075ed0128433779ad0146d59cc87e9625f4b6c31098fed1f5754b84fd08d9c8044d8d43d78c5b9c07937878cf15f517ba6f
 DIST libbluray-1.3.4.tar.bz2 756323 BLAKE2B a53b10fca6f8c049b2771c137e8900c34127554e1ebdeeec825de470b751182163cb1ff79f6dae20d772ba15c9d6c70fe332080ab93f1a47cc5f863922d22723 SHA512 94dbf3b68d1c23fe4648c153cc2f0c251886fac0a6b6bbe3a77caabaa5322682f712afe4a7b6b16ca3f06744fbc0e1ca872209a32898dcf0ae182055d335aec1
-EBUILD libbluray-1.3.3.ebuild 1973 BLAKE2B 03bacb45203eb918a4248642aebe07b9a9f785d7ea684884a8293de7060e6797eda689773395bfbbb516d594286e4467e47fea0c9c34f24d45eea2567099b451 SHA512 a9393e635f52c68c71777b5dd91e682ac2c9a57f22f06d5469f4fa0667984a54781db6fa92d9d6385040aa70f9459e5e42052f47b691ae1aeb013939063a187f
-EBUILD libbluray-1.3.4.ebuild 2098 BLAKE2B 06cacba309f756a234729a1c15bfb56bddca346caa0ab3ca04604fc0f5c8ea5a216675f8c554308a9465d5739fb099617332c62538b8be5b2f48b299b36bd261 SHA512 598bb4cecc5c3fc46ee45ec73a1d9a1632556d95db5d96e856d5387c6cde938941fb4725bdc9dcd3ef8380857cc28d5d3b504cf5986640c80490abf9f26bd014
-EBUILD libbluray-9999.ebuild 2105 BLAKE2B aa288ed9b8672e8916d416827df63be1429485e8f5977b1bffe2ffc8198421006e11bc7976bb11327276aace2defe4cc542aa55b651953f343e1fcc56950bbe7 SHA512 43093efddcbc85e1b16a9c52cdc843f1ed9a44b93dfd8b3db53aaac112f0d78bc76d443a28d22ba13b8673a65f36c8b70335744f7f87c74b17282947e63ec7c7
+EBUILD libbluray-1.3.4-r1.ebuild 2266 BLAKE2B f0b3b6d8db6fef4812ec7b4782b5a2ad353ea4b0189a42d41e90daf4308a76eeb1726a15f58ab13cf112a0138b62182a9dcf6467626098625f17ac70bfe61b8e SHA512 68dee5bd899b7974f806de480305a4354737f8b1e6d5d94f448cf76f8390c3de72f653e6bbe949a9ff5a12003f233cd179487a31fe024dc7138d0ef1895c36cd
+EBUILD libbluray-9999.ebuild 2126 BLAKE2B 9f1873741d70d826a69f9b3bb5d2b4c82ee31d777f9a372c32db466d3c745efb53dde20cdb383c540b57bb43e741c5c0a37e0c564c7fef9f89cb9465e7545af5 SHA512 88efde850473584abafcf7862aacebb14c2be5848f04de682d3ba445501958f93722bc919013490fb73e4ecbd7dab97c43d5bdaddb5328ade4b0b70288d17f69
 MISC metadata.xml 541 BLAKE2B 5a2652471709a6c8784f756ad2d5c9bbfd1611637fede987c298e1b4588ddab74346ac0d607c36bc3fa662a1e80287d2dd9963019b52daad9cd3ac2f0ecff02f SHA512 70349aab49af818166f114ed16c0eaf4264e548e8f204d636da57086b68a17f42a6b119a2533a5fb9f6a60dc3c3a9948910536f4eaecb1a75e682d439b12d558
diff --git a/media-libs/libbluray/files/libbluray-1.3.4-min-java.patch b/media-libs/libbluray/files/libbluray-1.3.4-min-java.patch
new file mode 100644
index 000000000000..2005cb29ca89
--- /dev/null
+++ b/media-libs/libbluray/files/libbluray-1.3.4-min-java.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -242,12 +242,12 @@ pkginclude_HEADERS = \
+ if USING_BDJAVA_BUILD_JAR
+ 
+ if USING_JAVAC_12
+-java_versions = -Djava_version_asm=1.7 -Djava_version_bdj=1.7
++java_versions = -Djava_version_asm=1.8 -Djava_version_bdj=1.8
+ else
+ if USING_JAVAC_9
+-java_versions = -Djava_version_asm=1.6 -Djava_version_bdj=1.6
++java_versions = -Djava_version_asm=1.8 -Djava_version_bdj=1.8
+ else
+-java_versions = -Djava_version_asm=1.5 -Djava_version_bdj=1.4
++java_versions = -Djava_version_asm=1.8 -Djava_version_bdj=1.8
+ endif
+ endif
+ 
diff --git a/media-libs/libbluray/libbluray-1.3.3.ebuild b/media-libs/libbluray/libbluray-1.3.3.ebuild
deleted file mode 100644
index 264c8099faf5..000000000000
--- a/media-libs/libbluray/libbluray-1.3.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV#9999} != ${PV} ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
-else
-	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-fi
-
-inherit autotools java-pkg-opt-2 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 +truetype utils +xml"
-
-RDEPEND="
-	dev-libs/libudfread[${MULTILIB_USEDEP}]
-	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
-	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8:* )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-"
-BDEPEND="
-	virtual/pkgconfig
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.8:*
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-jars.patch
-)
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# bug #621992
-	use java || unset JDK_HOME
-
-	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_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 "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libbluray/libbluray-1.3.4.ebuild b/media-libs/libbluray/libbluray-1.3.4-r1.ebuild
index 72bb75b8a06a..f087cc50c5a3 100644
--- a/media-libs/libbluray/libbluray-1.3.4.ebuild
+++ b/media-libs/libbluray/libbluray-1.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,28 +20,31 @@ LICENSE="LGPL-2.1"
 SLOT="0/2"
 IUSE="aacs bdplus +fontconfig java +truetype utils +xml"
 
-RDEPEND="
+COMMON_DEPEND="
 	>=dev-libs/libudfread-1.1.0[${MULTILIB_USEDEP}]
 	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
 	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
 	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8:* )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
 	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
 "
 DEPEND="
-	${RDEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-"
-BDEPEND="
-	virtual/pkgconfig
+	${COMMON_DEPEND}
 	java? (
-		dev-java/ant-core
+		>=dev-java/ant-1.10.14-r3:0
 		>=virtual/jdk-1.8:*
 	)
 "
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 PATCHES=(
+	"${FILESDIR}/libbluray-1.3.4-min-java.patch"
 	"${FILESDIR}"/${PN}-jars.patch
 	"${FILESDIR}"/${PN}-1.3.4-fix-libudfread-option.patch
 )
@@ -51,6 +54,11 @@ DOCS=( ChangeLog README.md )
 src_prepare() {
 	default
 
+	cat > src/libbluray/bdj/build.properties <<-EOF
+		java_version_asm=1.8
+		java_version_bdj=1.8
+	EOF
+
 	eautoreconf
 }
 
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index 6445acaac890..2369aabc99a1 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,26 +20,28 @@ LICENSE="LGPL-2.1"
 SLOT="0/2"
 IUSE="aacs bdplus +fontconfig java +truetype utils +xml"
 
-RDEPEND="
+COMMON_DEPEND="
 	>=dev-libs/libudfread-1.1.0[${MULTILIB_USEDEP}]
 	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
 	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
 	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8:* )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
 	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
 "
 DEPEND="
-	${RDEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-"
-BDEPEND="
-	virtual/pkgconfig
+	${COMMON_DEPEND}
 	java? (
-		dev-java/ant-core
+		>=dev-java/ant-1.10.14-r3:0
 		>=virtual/jdk-1.8:*
 	)
 "
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-jars.patch