gentoo auto-resync : 20:07:2024 - 12:29:37

4 files changed, 2 insertions, 261 deletions

diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 702db0b86c04..408af999e5fe 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,13 +1,9 @@
 AUX libjpeg-turbo-3.0.0-tests.patch 4077 BLAKE2B 437adbca7b2689508fbe8e025a1d30b706984e082167c855164bcb250829b9231a29df2117db0cb006f86e9ca9e29ece85707e2047f60483da40ef58c6d7d026 SHA512 c17c81ab4130bcb193ecc0754d00916d53ce6be9cdf6f04f6457c125951263c3a085d2baf440ec988feaf5fc45b593db59def096b3f988e9b704690394e2923e
 DIST libjpeg-turbo-2.1.5.1.tar.gz 2264936 BLAKE2B 9583a0a91e45347d651de6bf5192a23bfe4e64cef67cdbb18f5b578b424fc46fc114e5649e93a467906cf047948e43a11b6d17b48c47f879c51cff1a4ef356ff SHA512 86a7248d064043b26b09755633ef4872a2a6133c9e677a9fe4be6645b2e0fde102cf01e09119967b3b6b85f4cb93f3f7c49ec4973944d5eff99b5b90ce8b0be6
 DIST libjpeg-turbo-3.0.0.tar.gz 2799663 BLAKE2B 9a4b74aad81c2999ab7f3cd7d8695e1132edda141f4cc8a57e671f42cad4ac16b66b0f19cf4b874b61a82c008287ad88cd81d85547c195ed30456e29cb505285 SHA512 2307a2e240faf5b3119cdc5cf6a0255813d74591d4a4201fd2374940683cb9de90cb5926367e633f3624b27edd292209c7cd3c38d64522716e83fc81361289b4
-DIST libjpeg-turbo-3.0.1.tar.gz 2800900 BLAKE2B 9d2c784edd6493c4d9e2379fc4a8f0844e440d7afe774b231f611034d481dcf1be35979fb7d731a5a8f99000780f1343b7934a59df22c1dcaef295b6294ea494 SHA512 26a2c821a023579e82a7c2a00582747f5f24089aa0820ba304f1ff71c6894b7a6bd0468acc5ff90e2655e0a1c23a5a35a779df51f5cfa3e9eba527c709fab55b
-DIST libjpeg-turbo-3.0.2.tar.gz 2831164 BLAKE2B b6eff81657707852ee9ea81099179c6e20914f513fd32b12b1bfbf5233f850f54a1062a98150044aa34476f0c54e42a67c88633a59834a764d3f8bb394f374f0 SHA512 f5eadda0712feb810a8c3bb2621fda24a4c30574998ce30f423b3ffa25225c7a87cb14b696232bc0270485f422a2853a5c32eafb65bc5eeab1b41d8aeb32ad29
 DIST libjpeg-turbo-3.0.3.tar.gz 2832827 BLAKE2B 9d141dadd0dce970bf857b51352c57a8e15180438abd7d6d66f9dfd24e23889add8c6c89120b84026e40ab61611516b0567984bd1db37e9c45b41917cf32e9a6 SHA512 7c3a6660e7a54527eaa40929f5cc3d519842ffb7e961c32630ae7232b71ecaa19e89dbf5600c61038f0c5db289b607c2316fe9b6b03d482d770bcac29288d129
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 EBUILD libjpeg-turbo-2.1.5.1.ebuild 3149 BLAKE2B 8b73e64a8f5386673bda5a5a09da56058abe71f1dde75556f56e0e4c9baf591c89a5b3e38d52491f80a7fdb6b97e911f02ca272c856724f587915783da130805 SHA512 7159ea794deadcb2a964746c41473b8ccab55e95b586caff97f2de0586e2b11aabb16dc9f111b824f6810703b826c6d3af294111aeab2c7fbff37a7837098829
 EBUILD libjpeg-turbo-3.0.0.ebuild 3182 BLAKE2B 472c575770a21a680d3c62c4575641be8ff69fcae6b13943b8fc5ae65694716c9280b3e3a9c3decbe42d2694e5be6db827a79694169397200f1d2709a9c176d2 SHA512 3ab80cca3c3f025d2b2bbef64ba2a46ec2f3ed4b7445e62278d0575084daa0bbe9c14be846b756841f035be191cc8769e5216be1a65315240f350cbd4be32383
-EBUILD libjpeg-turbo-3.0.1.ebuild 3141 BLAKE2B fd2fc17811629aa018df39323ea447164f6371aaabecb98047ea2ec02e7a743dcc375a10d2822f4d54fe7311eb4ee49e7be1cb609a47be4a23293e4f7396be52 SHA512 b7ab892ec8d249e0ae53504646b7879f1ce392888d3d60680e964dbe18ff751095fee79f0da72af4f7b77bbc64f0af881cc101d286363c86c02682dad8c1f0c3
-EBUILD libjpeg-turbo-3.0.2.ebuild 3212 BLAKE2B 6b2f3f58c4f7dd0e87808f7a28bacabd1a39c7971a7238f0d32762f6d310d99cc4203de0f29d68ce679da31e1587431fcacecace023d4400192f331cc4476dcb SHA512 cd6dbb415ef13c0cd342f15f300b937941b993d33a2231b5022dfe443a3ad7b8e421c67b5db79691027b5182b753acae64f29f81b361ebe8f58bad4b5bd06a8d
-EBUILD libjpeg-turbo-3.0.3.ebuild 3212 BLAKE2B 6b2f3f58c4f7dd0e87808f7a28bacabd1a39c7971a7238f0d32762f6d310d99cc4203de0f29d68ce679da31e1587431fcacecace023d4400192f331cc4476dcb SHA512 cd6dbb415ef13c0cd342f15f300b937941b993d33a2231b5022dfe443a3ad7b8e421c67b5db79691027b5182b753acae64f29f81b361ebe8f58bad4b5bd06a8d
+EBUILD libjpeg-turbo-3.0.3-r1.ebuild 3256 BLAKE2B 5aca25133509dcc570c9d852c8265e2fa24f18e1a0124e89e6f4d6e516aa3a993e9967768efacc7395eaa63922d89c443db389c0db2014fadd04eff42c3acc7c SHA512 a5abb5eec7cece80deb2dc48dcb56544fc6d7bc02f0d5a65a72fd5a80c4c8906a99ece74ada219239f81ffe17f44c9751ec178dcaf1a50676de12951deaa82f9
 MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.1.ebuild
deleted file mode 100644
index 43f76e0689fb..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="
-	https://downloads.sourceforge.net/${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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-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
-"
-DEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:*[-headless-awt] )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-BDEPEND="
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
-"
-
-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)"
-	)
-
-	# Avoid ARM ABI issues by disabling SIMD for CPUs without NEON, bug #792810
-	if use arm || use arm64; then
-		mycmakeargs+=(
-			-DWITH_SIMD=$(usex cpu_flags_arm_neon)
-			-DNEON_INTRINSICS=$(usex cpu_flags_arm_neon)
-		)
-	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
-		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-3.0.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3-r1.ebuild
index 8a6082694031..fff7d27ac9d5 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.2.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3-r1.ebuild
@@ -60,6 +60,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	if multilib_is_native_abi && use java ; then
+		export JAVAFLAGS="$(java-pkg_javac-args)"
 		export JAVACFLAGS="$(java-pkg_javac-args)"
 		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
 	fi
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3.ebuild
deleted file mode 100644
index 8a6082694031..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib java-pkg-opt-2
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://github.com/libjpeg-turbo/libjpeg-turbo"
-SRC_URI="
-	https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/${PV}/${P}.tar.gz
-	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-"
-
-LICENSE="BSD IJG ZLIB java? ( GPL-2-with-classpath-exception )"
-SLOT="0/0.2"
-if [[ $(ver_cut 3) -lt 90 ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-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
-"
-DEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:*[-headless-awt] )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.8:* )
-"
-BDEPEND="
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${ASM_DEPEND} )
-"
-
-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)"
-	)
-
-	# Avoid ARM ABI issues by disabling SIMD for CPUs without NEON, bug #792810
-	if use arm || use arm64; then
-		mycmakeargs+=(
-			-DWITH_SIMD=$(usex cpu_flags_arm_neon)
-			-DNEON_INTRINSICS=$(usex cpu_flags_arm_neon)
-		)
-	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
-		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
-}