gentoo auto-resync : 24:05:2024 - 00:07:11

3 files changed, 2 insertions, 58 deletions

diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index 8b5f6848a99f..0d63ca60398f 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -1,6 +1,5 @@
 AUX libfpx-1.2.0.13-export-symbols.patch 347 BLAKE2B d0bc3b1fecba641554a549c0241e098f801f0dd1a471427127c99f56945836ca679b14c2bdff3a85c3be32d399bae871911742fa1ea0c74c8a2e50741ae70938 SHA512 a8e9793f78902317fa2aacc9fc61160579fd211f6e36ae817afc1d8963c60eeb930b0f4574bb855b75bfbfa1b678882773b581db91462289132cd44bb2b0be6e
 AUX libfpx-1.3.1_p10-musl-1.2.3-null.patch 1906 BLAKE2B 2dcccc22aa1f163ecc5d3f3de3981950844d89dce57599635eab749af8531b2e31e74dbdfba9c01895f530b15c054e1311a965c63e013c8b9115f91ab2b6c516 SHA512 d37d8315a8e3e1c6ee83e71cf38b1e0656ba59f6d6a9bd24ea9c03366b8d2c5f8a092ab2f39f1b10429eec2bb7aeba83dea94ebd8ea5dcb2146a2f7944f8cf2c
 DIST libfpx-1.3.1-10.tar.bz2 2358246 BLAKE2B d67b5a38e29d8916471ced46005983427ea1e77ff1fa682b67f80e8db71bd5460aafb59753bd901aa40e955cbeb453cf017109577b8d9357e86ac3e7d988d4b4 SHA512 afa96b240ead4d3c56e8e6c66db188d1f4441e7b4d08e12e0e96359cfa2cea9eae5625105d87df65ceacd97d84a386876c62dee5bc1916c420755d9bcc4655d4
-EBUILD libfpx-1.3.1_p10-r1.ebuild 1346 BLAKE2B 3b1a03392cc05ac8b61c48bef6430d8192b47ac39b8dd5819fc7b5484c1ef3384c17b4673143814dda71cac6a09aec187b3b84fd97614e49b5e63bb4f377d997 SHA512 4a71cc273227789d1f2e6557ccf5c369c7faefeba1856b3f9cb8517a661c3f8d101c015a00eddc55c080b1e02b9757887721b54821e2a94f26a7ed36c744e62b
-EBUILD libfpx-1.3.1_p10.ebuild 1247 BLAKE2B 383cf7a7338a795123d7c60b6448f9f2e5660f17f7fc0773d793b099cfbec3cf17f0235a01cd370f9ec9349a0e8d5ecf07cc751680b6c9d6afc7d2eb74af0457 SHA512 769dc7f9257290d33695ca2457a894464da053055002b5c032d757c32dc485151788f6b428a02782054744ab48a9a3ff31ffc493f822546a65916d6fdbc42c47
+EBUILD libfpx-1.3.1_p10-r1.ebuild 1345 BLAKE2B 0c0cd896d083514cbacdb540bf9d73ed123665d29d9a4ab606bb0f82b80c6538a6096fb36db80f784b1a0c6bdb279c3dcc661389e227c0894eeaff10f46c514f SHA512 590214d7c397a37dea6f9283c2123b33dff5f8871a20b2d7c0a4f297c2b01f9aff73e6c1d0df8edc941d247aa701e17709c4b1d789b4f55af2fedef5fa653053
 MISC metadata.xml 334 BLAKE2B 5f2c903be8e07657f0b5ea2f60d1d51cd22c18582227ca2f3d7e86b1911b790e442aed299bd894217c99e106fbcb4a31c3c240eba69338f9de14cfb8ede765da SHA512 b4d167b6a8f3dadcde95c86990d0855862b84e465bf4538c7991d0d581cc0c91d42923435e66d381c91f657b150ac322f25fd7bc1bdb4870cf489534279f5859
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10-r1.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10-r1.ebuild
index 9ba8140d21ac..ab943ae8a6fd 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10-r1.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/_p/-}"
 
 LICENSE="Flashpix"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
deleted file mode 100644
index 782c66231228..000000000000
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic libtool
-
-DESCRIPTION="A library for manipulating FlashPIX images"
-HOMEPAGE="https://github.com/ImageMagick/libfpx"
-SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
-
-LICENSE="Flashpix"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="static-libs"
-
-S=${WORKDIR}/${P/_p/-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.0.13-export-symbols.patch
-	"${FILESDIR}"/${PN}-1.3.1_p10-musl-1.2.3-null.patch
-)
-
-src_prepare() {
-	default
-
-	# we're not windows, even though we don't define __unix by default
-	[[ ${CHOST} == *-darwin* ]] && append-flags -D__unix
-
-	elibtoolize
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/859913
-	# https://github.com/ImageMagick/libfpx/issues/6
-	#
-	# Do not trust for LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	append-ldflags -Wl,--no-undefined
-	econf \
-		$(use_enable static-libs static) \
-		LIBS="-lstdc++ -lm"
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog doc/*.txt
-
-	docinto pdf
-	dodoc doc/*.pdf
-	docompress -x /usr/share/doc/${PF}/pdf
-}