gentoo auto-resync : 02:02:2024 - 05:44:58

3 files changed, 15 insertions, 140 deletions

diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index ee2939e038a2..012628740ab5 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,13 +1,11 @@
 AUX libjpeg-turbo-3.0.0-tests.patch 4077 BLAKE2B 437adbca7b2689508fbe8e025a1d30b706984e082167c855164bcb250829b9231a29df2117db0cb006f86e9ca9e29ece85707e2047f60483da40ef58c6d7d026 SHA512 c17c81ab4130bcb193ecc0754d00916d53ce6be9cdf6f04f6457c125951263c3a085d2baf440ec988feaf5fc45b593db59def096b3f988e9b704690394e2923e
-DIST libjpeg-turbo-2.1.3.tar.gz 2260756 BLAKE2B 87ef47105e66b2ee918e95962ac59963b6adea5b49ab0db692810aee0a13a215a0ef7fe0b549ecd5151274549e12d09eb0b42439bf0a4bc1ad2c4e62dcceb77c SHA512 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d
-DIST libjpeg-turbo-2.1.4.tar.gz 2261822 BLAKE2B 80ffd77d58a37eae0bdc1868d994f34ea52c13e2624c720b1d0b6ec4d6d14b16911163ccd4009c8d6eda214f31e1fff78bb7eb4739ae6589d0fd8c7008c0e972 SHA512 511f065767c022da06b6c36299686fa44f83441646f7e33b766c6cfab03f91b0e6bfa456962184071dadaed4057ba9a29cba685383f3eb86a4370a1a53731a70
 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 libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
-EBUILD libjpeg-turbo-2.1.3.ebuild 3136 BLAKE2B 7fa89be134ff2be2dc768740245cb196678f119116dcd92561963778555f6300cb2228e6b21cfcee659d598733faf5b4e55c4c27925f6ea45e1ec71b98a64b9d SHA512 08792c3741f7463e8318211cced5399d607bfb394a66e606e6053d2e3892ae9f30dd0bfbabc8c60c4bdfe5e6370586b94e91d98383ebb22dc0ca5154f9187f1e
-EBUILD libjpeg-turbo-2.1.4.ebuild 3120 BLAKE2B e3d070e19bbe3e2bd308ddd062e3a4a96d627655e5602579b34090cce05706bd699e343e91e5ffeb2bdc4eed3c43d6eaa10890601fa3a23694e8f593f2eb088e SHA512 b607bf5308c23b64d9fbd77d9015227d7b58a228a0e3d9a40353ba061582a8284c3430873a9282417a360f9e55acdfd8af50b56596b9394739d5120441614b5d
 EBUILD libjpeg-turbo-2.1.5.1.ebuild 3136 BLAKE2B 3eddebb52183591f3d5f15d6bc2bc28cf090d91c265efc4a214e41d0f6af771fe9a15ca2c773052c3de5926a9b1b6a31ccafec678a1201b6fcabf91df0f68f02 SHA512 61ed92cbde855620a86b0894d2bbd3921c87056cd9c258e7f3c1754044d3e1457a26f71a12792702c2d9c27b5faae3130e580b48c65ce1d0f9914b368ab979fd
 EBUILD libjpeg-turbo-3.0.0.ebuild 3169 BLAKE2B 2587d49f88bf2d2ab7cd717863d5911877f4a4e5ddb3c28b7e5016e32d874fd8d004eb03ce05d5762addbc0b0e622b0ec0cfe97f9c21b9aa0a39a5a284c2f8b9 SHA512 39054961507d7c7bf6c35744d061e515d3b5aeeffab7ed14052433627b653bfb93b83ad8189b6601d661e4bdb32c79ff32d0c92bebbcf5ab9372c8a7a226f64a
 EBUILD libjpeg-turbo-3.0.1.ebuild 3128 BLAKE2B be6b7269d96feef188abb9a2cbe0319deda1a576210beb8e8b48ede1da70986bf3252ecf0f311e83f96700b269260942059a89f54a30b2ceb3b58c31e9d83f76 SHA512 cfbe0c5d2cb8e5111825c76961b6857dceb94bf501f455b73b695306375ed403587bcdffd39a45d8e9e1cc9099a42192d8826d31a38103bfe5e6c46c7b84f827
+EBUILD libjpeg-turbo-3.0.2.ebuild 3212 BLAKE2B 6b2f3f58c4f7dd0e87808f7a28bacabd1a39c7971a7238f0d32762f6d310d99cc4203de0f29d68ce679da31e1587431fcacecace023d4400192f331cc4476dcb SHA512 cd6dbb415ef13c0cd342f15f300b937941b993d33a2231b5022dfe443a3ad7b8e421c67b5db79691027b5182b753acae64f29f81b361ebe8f58bad4b5bd06a8d
 MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
deleted file mode 100644
index e708ac1f5770..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
+++ /dev/null
@@ -1,124 +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="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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~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"
-
-BDEPEND=">=dev-build/cmake-3.16.5
-	amd64? ( ${ASM_DEPEND} )
-	x86? ( ${ASM_DEPEND} )
-	amd64-linux? ( ${ASM_DEPEND} )
-	x86-linux? ( ${ASM_DEPEND} )
-	x64-macos? ( ${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 || 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-2.1.4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.2.ebuild
index 4242ea996790..8a6082694031 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.4.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-3.0.2.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
@@ -6,14 +6,16 @@ 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="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+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"
+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 ~x64-macos ~x64-solaris"
+	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"
 
@@ -46,10 +48,10 @@ src_prepare() {
 
 	for FILE in ../debian/extra/*.c; do
 		FILE=${FILE##*/}
-		cat >> CMakeLists.txt <<EOF || die
-add_executable(${FILE%.c} ${FILE})
-install(TARGETS ${FILE%.c})
-EOF
+		cat >> CMakeLists.txt <<-EOF || die
+		add_executable(${FILE%.c} ${FILE})
+		install(TARGETS ${FILE%.c})
+		EOF
 	done
 
 	cmake_src_prepare
@@ -66,7 +68,6 @@ multilib_src_configure() {
 		-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, bug #792810
@@ -86,7 +87,7 @@ multilib_src_configure() {
 		)
 	fi
 
-	# mostly for Prefix, ensure that we use our yasm if installed and
+	# 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+=(