gentoo auto-resync : 13:11:2024 - 03:02:42

3 files changed, 2 insertions, 77 deletions

diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 1c2d3f63eb00..f07c8efbb65f 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -1,6 +1,4 @@
 AUX libwebp-1.2.3-libpng-pkg-config.patch 1894 BLAKE2B 80c19e65b1f913fdf0e9dd37ca603bcf89bd7dd71cf81ebd8beab6bcf671b76482b3d6d053f53558463c7f3e139897382c90aad5a5cebbd8c49ce4512e7f048c SHA512 3b80c89eb4643a315af594158ca370b71f38ab285cfaa3d1b8d90b09aa420750dccd46f1222b1b9a983af6e9dc501da2d6c732c05a2a3b097ba0437785cc80c7
-DIST libwebp-1.3.2.tar.gz 4162949 BLAKE2B 12b3ff3aa9952dd32ce13656146556d5efb6a66860249a8676721980aee10253a1b0335685a769d995e9954cd305190a8ed1878ba4fefce9dcaf41a3976f9e3d SHA512 2b624d2ecfbff6b4db2719e38f146722638ae262acd96327073a04451dd05fb27ef70c5681187821d251df728a6be7e89209c861c561a13bfb786495a830bc20
 DIST libwebp-1.4.0.tar.gz 4281370 BLAKE2B 022cef190284b69af781718a82b28ee9806d7e6b1e642ee0833e608f64f691ef918a83e99db02335fb9f60d24d6f0cfc58e7e05e99a3f13d2118719d40a71722 SHA512 1217363fbb5c860b17c2ba4612f240f121c74ced6e3e58e8aa61252a9022f59893c5874bfa433cc50a7e65bac1ae2bfa99fa2cede070183b7a467f148cebb0bd
-EBUILD libwebp-1.3.2.ebuild 1935 BLAKE2B 12ac912001515b9aa5ac40cc369f2faded63929b7c606730330f647b82584f782d6911d3a3035f7f8e915f5e1c345b4fa28376b30c5e2a80dea678cbafb69eea SHA512 08e0fffa59f18415cb58573f782bbe4d438eaa6a92bbaa0e156622b6fcd522962ba2655a7f822cb20b1ff596e8711855d5de89c6956fec608db3530a489bc515
-EBUILD libwebp-1.4.0.ebuild 1936 BLAKE2B dfec6a72ab74dc0fbb85c616fb36bb7d62ade8de46db6e8f595619eada37019e43aa040d8a35c8ff9cac6d9e248d9e931968e22bba21cff320f890a86e576d32 SHA512 aea1bac3678c246232f0250366d5efa0ffd46daba631565062c274b8a792f421ff504d96ece258590683771a3f94043d9a8b8dea2f95a780573ead5e4275d7f5
+EBUILD libwebp-1.4.0.ebuild 1935 BLAKE2B be40243cca62c5e29b23ba33bd783f23420b5643589d5d89838f82fe58f9aa54e3c8f96aee673bbf658a847263398985d28799b6ca6d2fc66256301d1712ac5f SHA512 b199bf4f16b9f5d8fd6a4575c186eab8cec38e70c3460776759a36096324529f22830122e0c6b9c10c6084aa3916b889497afa8080e7b7854fb41ab8260a5e39
 MISC metadata.xml 442 BLAKE2B 3700315ba8872e208756f663236158c42f967eab7bec9b440b238b14f76357fe7721e571b7c11d79fff0f8df90f9ad35504cef3f6dc2803b8e5394ac0e3ea437 SHA512 5fceda7410ea654e3d9297f3adcad43b99c298b436ec5d77a9396259b61a0c9dd2945b98f7fa7d0b7d38622e14bf82bcfbbbdc18f011f0b949ae61a9a8794800
diff --git a/media-libs/libwebp/libwebp-1.3.2.ebuild b/media-libs/libwebp/libwebp-1.3.2.ebuild
deleted file mode 100644
index da91a5f0e278..000000000000
--- a/media-libs/libwebp/libwebp-1.3.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="A lossy image compression format"
-HOMEPAGE="https://developers.google.com/speed/webp/download"
-SRC_URI="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0/7" # subslot = libwebp soname version
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-fi
-IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"
-
-# TODO: dev-lang/swig bindings in swig/ subdirectory
-RDEPEND="gif? ( media-libs/giflib:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	opengl? (
-		media-libs/freeglut
-		virtual/opengl
-	)
-	png? ( media-libs/libpng:= )
-	tiff? ( media-libs/tiff:= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.3-libpng-pkg-config.patch
-)
-
-src_prepare() {
-	default
-	# Needed for pkg-config patch; use elibtoolize instead if that's ever dropped
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local args=(
-		--enable-libwebpmux
-		--enable-libwebpdemux
-		--enable-libwebpdecoder
-		$(use_enable static-libs static)
-		$(use_enable swap-16bit-csp)
-		$(use_enable jpeg)
-		$(use_enable png)
-		$(use_enable opengl gl)
-		$(use_enable tiff)
-
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_sse4_1 sse4.1)
-		$(use_enable cpu_flags_arm_neon neon)
-
-		# Only used for gif2webp binary wrt bug #486646
-		$(multilib_native_use_enable gif)
-	)
-
-	ECONF_SOURCE="${S}" econf "${args[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name "*.la" -delete || die
-	dodoc AUTHORS ChangeLog doc/*.txt NEWS README.md
-}
diff --git a/media-libs/libwebp/libwebp-1.4.0.ebuild b/media-libs/libwebp/libwebp-1.4.0.ebuild
index 288198fd97fa..8e5165f38fcf 100644
--- a/media-libs/libwebp/libwebp-1.4.0.ebuild
+++ b/media-libs/libwebp/libwebp-1.4.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0/7" # subslot = libwebp soname version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg opengl +png static-libs swap-16bit-csp tiff"