gentoo resync : 12.05.2022

3 files changed, 11 insertions, 120 deletions

diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index cabbb42c8453..7dd11da5413e 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,9 +1,7 @@
 AUX libjpeg-turbo-2.1.1-arm64-relro.patch 679 BLAKE2B f6ea6f311cc05ff960d76cdc49afc1d14bf4d638052d1f6007defe239757002ecad18823d706a2e5f5e51245a2447c237c97daf0862e2e1889c751b52f3890b7 SHA512 56ef2f905fe54921618a0c4f79de67cf74070d1ee595d3b4b41f19b33e23701d8045b250b28b8c53b1bd8911f4179dd3b1594a5e85ac9dbce8c869feef1ad124
 DIST libjpeg-turbo-2.1.1.tar.gz 2256321 BLAKE2B ad3fc108e0136220586cc59a277735d573a82d740146d2ac091cbb50af84019b7c623ca1c9c2e6e0f8a672b6fde7ed23441b199eef2435a52013abd73a3a7157 SHA512 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673
-DIST libjpeg-turbo-2.1.2.tar.gz 2257645 BLAKE2B ae8b7db9fd634b3b29a916098e2b54a8e045cb7a9d883de1f2e8a34542154a724e5d7788fb4b4d816c36d6503fc2a7427165dc3af9d47c77bfb7c51a42bc1d51 SHA512 f0377b58d00310b2e644da31f807ac6c3425823f362ea88bcbed32991dddbea4e7a478676a7c1c4874a34bc578f262bf1d32c925e2f14fa517a50fd911ba8dd5
 DIST libjpeg-turbo-2.1.3.tar.gz 2260756 BLAKE2B 87ef47105e66b2ee918e95962ac59963b6adea5b49ab0db692810aee0a13a215a0ef7fe0b549ecd5151274549e12d09eb0b42439bf0a4bc1ad2c4e62dcceb77c SHA512 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-2.1.1-r2.ebuild 3248 BLAKE2B a2b9fcc4939e064ebb0f73875ce3a4cfa5e3233c0c8125905f66f8f76320fda29cd4ad4c0c08b66844dc7f36e9bce696ece323798c897c7e03243a8982e9117e SHA512 aa15cb2b8f08cd54d590a8ac76d3eb8b512ad8c62235a239cf36fda55f818a71462834b7e3579f4becc8269e2b3bccdbd6f6f809305fb2f6578587e03338a416
-EBUILD libjpeg-turbo-2.1.2-r1.ebuild 2898 BLAKE2B 0dfb36277ffab99dd91be4b5861ee7f2f09ebfbfdf0e296ed55d6b45d65a05a43bc521a335dafbaeb851c945745974dd5c158fd7731453714658d943353f9f93 SHA512 f70c4d19f544e834369c2087d178b40acef209455ee025f41e78bf47feedd0c99e7f88c4b4689ba70fbefbcc2c083547db151b002e8f71e8474abbba6528ff51
-EBUILD libjpeg-turbo-2.1.3.ebuild 2928 BLAKE2B 37dad1918b06c2953612b3a81a569c9df80728b4c1ecb56cfdd7316ea5e01695ec6e7ad1b9f5b2fcd2dc511313b2a4945f3ba33f3073eb048bcb3b10d913e43a SHA512 34a80fd44958235f3ffc2c919479a3fc24c075c47e5a09c1d895c632b3341f07a81cc6eb34c18b7709662cb1db4066932454b5cedef3171ccc18a1c2fbad5fc8
+EBUILD libjpeg-turbo-2.1.3.ebuild 3187 BLAKE2B 623a11d7914d3dc4b27f27e9e0ed9076f6cb8f7b02c4d9d919e7241580f308f5811087708da4ddf3face0192fd8275293ff5dafa8c594be6574b425b823be020 SHA512 671ae874b977ca8414c300cc9ad393c6764247783dac6874804586ba31c2f991600ec1516422fea4ce095bfaa07721883f52aefcb7d5c7db4162126ae8a51f0d
 MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild
deleted file mode 100644
index aaa564414263..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib java-pkg-opt-2
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG ZLIB"
-SLOT="0/0.2"
-if [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="cpu_flags_arm_neon java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-
-COMMON_DEPEND="!media-libs/jpeg:0
-	!media-libs/jpeg:62"
-
-BDEPEND=">=dev-util/cmake-3.16.5
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
-	x64-cygwin? ( ${ASM_DEPEND} )"
-
-DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:*[-headless-awt] )"
-
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-src_prepare() {
-	local FILE
-	ln -snf ../debian/extra/*.c . || die
-
-	for FILE in ../debian/extra/*.c; do
-		FILE=${FILE##*/}
-		cat >> CMakeLists.txt <<EOF || die
-add_executable(${FILE%.c} ${FILE})
-install(TARGETS ${FILE%.c})
-EOF
-	done
-
-	cmake_src_prepare
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi && use java ; then
-		export JAVACFLAGS="$(java-pkg_javac-args)"
-		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_STATIC="$(usex static-libs)"
-		-DWITH_JAVA="$(multilib_native_usex java)"
-		-DWITH_MEM_SRCDST=ON
-	)
-
-	# Avoid ARM ABI issues by disabling SIMD for CPUs without NEON. #792810
-	if use arm; then
-		mycmakeargs+=(
-			-DWITH_SIMD:BOOL=$(usex cpu_flags_arm_neon ON OFF)
-		)
-	fi
-
-	# mostly for Prefix, ensure that we use our yasm if installed and
-	# not pick up host-provided nasm
-	if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
-		mycmakeargs+=(
-			-DCMAKE_ASM_NASM_COMPILER=$(type -P yasm)
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	if multilib_is_native_abi && use java ; then
-		rm -rf "${ED}"/usr/classes || die
-		java-pkg_dojar java/turbojpeg.jar
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	local -a DOCS=( README.md ChangeLog.md )
-	einstalldocs
-
-	newdoc "${WORKDIR}"/debian/changelog changelog.debian
-	dobin "${WORKDIR}"/debian/extra/exifautotran
-	doman "${WORKDIR}"/debian/extra/*.[0-9]*
-
-	docinto html
-	dodoc -r "${S}"/doc/html/.
-
-	if use java; then
-		docinto html/java
-		dodoc -r "${S}"/java/doc/.
-		newdoc "${S}"/java/README README.java
-	fi
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
index 19d0c5004701..303151384efd 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 LICENSE="BSD IJG ZLIB"
 SLOT="0/0.2"
 if [[ "$(ver_cut 3)" -lt 90 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 fi
 IUSE="cpu_flags_arm_neon java static-libs"
 
@@ -75,6 +75,15 @@ multilib_src_configure() {
 		)
 	fi
 
+	# We should tell the test suite which floating-point flavor we are
+	# expecting: https://github.com/libjpeg-turbo/libjpeg-turbo/issues/597
+	# For now, mark loong as fp-contract.
+	if use loong; then
+		mycmakeargs+=(
+			-DFLOATTEST=fp-contract
+		)
+	fi
+
 	# mostly for Prefix, ensure that we use our yasm if installed and
 	# not pick up host-provided nasm
 	if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then