gentoo resync : 20.03.2022

3 files changed, 101 insertions, 12 deletions

diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 9592f7801e2e..3a99ef269691 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -2,8 +2,10 @@ AUX libbluray-jars.patch 1371 BLAKE2B 1c32115ec03db19b849248bcdbe4b9868527717b27
 DIST libbluray-1.2.0.tar.bz2 747265 BLAKE2B d9f0d1c321faa9008431b17aecba495e44d2795cea2973f9772b5be2c0193af53e3c947b9dd0b2d4d22c4085e163461252f895618e98491184d85eb7fbf5bd54 SHA512 d10413b6b86ff2d2e7c4b0103546f2142727cc5209ddb7b227aa74e27384f2e0b9abee37bf8ccc5b0cdfcaeebfb0669cf20903a247df278a8ad6dbd27469d324
 DIST libbluray-1.2.1.tar.bz2 751063 BLAKE2B af353e03a70b0202776c2190d927506225bbe1147fe5bfb19039839f5d82d0beb4fd7c2813a9ce10a2bc6f9d07e2a2080b54f1442e02e5f8e72564a5bcaf0a2a SHA512 e9eeee433034266e88c05ae3469c0bd2bf700d7f16e17ad706f48426c143c823e83c16ab79a637f1e85e4eb858aa0577630671f87ba35d179db2a1d8bc8545c4
 DIST libbluray-1.3.0.tar.bz2 754069 BLAKE2B d4c699ce28d2e5b1d4dda461a1359d3a446afe72368e9d76066ca4d5c49d1f24b4bcec307608d96913d0c668168a86267416b9db37ad942628c2926b79ec47d9 SHA512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc
+DIST libbluray-1.3.1.tar.bz2 754867 BLAKE2B 471963bc5b77f9da31c2ad900e7bbb1528943d2341aa4f12471e5d9a0db6964e62e917c4f19e29115c8c129bb7f8730780b44dbb1c8939c94c686f39d8521fe8 SHA512 f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a
 EBUILD libbluray-1.2.0.ebuild 2056 BLAKE2B 812ebe0d1aaab6226efa607b79bf8c04f792f7261900b5dcb0a4024b3bfa16d5fe688422bfd3503cd7dc79364bfcad3342d5aaed7bfdbe6abcd429f85607aca9 SHA512 de7cb76efd10b6a5ef3e906bb17c78fbec7bff47d11bf20073b8316e70d6938b8dd87f9aac1f7c7433fe0689c4ea5122848e22901fbe3a46bc9b48c3295ad05d
 EBUILD libbluray-1.2.1.ebuild 2022 BLAKE2B 8c0219e09ebd99b7184e13c36530721479c996c213cebe6990cad3172f152365c141c3e6046d31c6315e97313c1486732f8c855001353a6493aff52ac3e0b57e SHA512 682887926431df5790ef7c1a01a7a91a47100852184ce4d98b80bb9396a268fcb5918ff47b67906d94cdba83463bf73bba95e5a149a33408423546e36c5a59fe
 EBUILD libbluray-1.3.0-r1.ebuild 2026 BLAKE2B afdec663eeda2df1dfda5bab20fadc416b718c0f1fa9198c9d382316f79220dd7773b3e8fc16cb37c96202fd6a2bb2004093b785caf572debe94e410fc70965e SHA512 ad3e56facfd5a192c3787096414baeaf0fd29a7f2e9550739c42ef76670aac2ff8cfd6390f46dd3fc6076b1384217c02b19d8739369fd969ad1913475a3d7b02
-EBUILD libbluray-9999.ebuild 2007 BLAKE2B 478fd75959be666b511ca485c1bceea124b70282273dcdb687c9ae1e6b98d0bc6c7e92fa0ccbb020a29370202c248dc7ec1a0b2b5eaf4269714db18cae12344f SHA512 5a168560da9a4db8f929596176889e3ac7d6ea34c9c9ca2f39f37550909e45502976933d08456dcfe67c815a41564105321aa5f3bfde5e4f52680814b45590f6
+EBUILD libbluray-1.3.1.ebuild 1967 BLAKE2B 6c0d9471ffb0d0e1ddbcab410042d136e5d23455a97e5ed024d027b232001c6e1cfd1aefdc7bc4039004d695ed69649e8695b59418a186a921696666929124f6 SHA512 1cd12292d1918822e668961c233a7b8ffaea9216e64618c903666dc0fcf34f3858bceb3dad3cd2ae7193134b6f303efec57a14fa05a4f0e12d1cacec7c76f4e1
+EBUILD libbluray-9999.ebuild 1967 BLAKE2B 6c0d9471ffb0d0e1ddbcab410042d136e5d23455a97e5ed024d027b232001c6e1cfd1aefdc7bc4039004d695ed69649e8695b59418a186a921696666929124f6 SHA512 1cd12292d1918822e668961c233a7b8ffaea9216e64618c903666dc0fcf34f3858bceb3dad3cd2ae7193134b6f303efec57a14fa05a4f0e12d1cacec7c76f4e1
 MISC metadata.xml 541 BLAKE2B 5a2652471709a6c8784f756ad2d5c9bbfd1611637fede987c298e1b4588ddab74346ac0d607c36bc3fa662a1e80287d2dd9963019b52daad9cd3ac2f0ecff02f SHA512 70349aab49af818166f114ed16c0eaf4264e548e8f204d636da57086b68a17f42a6b119a2533a5fb9f6a60dc3c3a9948910536f4eaecb1a75e682d439b12d558
diff --git a/media-libs/libbluray/libbluray-1.3.1.ebuild b/media-libs/libbluray/libbluray-1.3.1.ebuild
new file mode 100644
index 000000000000..9d617a0039d2
--- /dev/null
+++ b/media-libs/libbluray/libbluray-1.3.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 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 ~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-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index 6781e565d5d8..9d617a0039d2 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-if [[ "${PV#9999}" != "${PV}" ]] ; then
+if [[ ${PV#9999} != ${PV} ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
-inherit autotools java-pkg-opt-2 flag-o-matic multilib-minimal
+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 static-libs +truetype utils +xml"
+IUSE="aacs bdplus +fontconfig java +truetype utils +xml"
 
 RDEPEND="
 	dev-libs/libudfread[${MULTILIB_USEDEP}]
@@ -45,15 +45,17 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-jars.patch
 )
 
-DOCS=( ChangeLog README.txt )
+DOCS=( ChangeLog README.md )
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
 multilib_src_configure() {
-	use java || unset JDK_HOME # Bug #621992.
+	# bug #621992
+	use java || unset JDK_HOME
 
 	ECONF_SOURCE="${S}" econf \
 		--disable-optimizations \
@@ -61,23 +63,23 @@ multilib_src_configure() {
 		$(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
+	use java && java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
 }
 
 multilib_src_install_all() {
 	einstalldocs
+
 	find "${ED}" -name '*.la' -delete || die
 }