gentoo auto-resync : 31:01:2024 - 17:48:49

5 files changed, 75 insertions, 10 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 8c25c35fcc56..5d87fdb53df8 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/isa-l/Manifest b/dev-libs/isa-l/Manifest
index 4b6071b01cdc..087f19515493 100644
--- a/dev-libs/isa-l/Manifest
+++ b/dev-libs/isa-l/Manifest
@@ -1,5 +1,5 @@
 AUX isa-l-2.30.0_makefile-no-D.patch 511 BLAKE2B 64e65daf876cde7a5ca4ba8f8f4e308d9a24eb07449e5728250bf88871ea01b62384c74d92f77ca8ea8c47909a389e9add2741ee053ad7be4d0dbf423e2b965c SHA512 5465bf937401a15bf2e3ed8274d1f2ae45428c29739e835d71474d81bfae78b83cd38c762bcbb25fbe62853c979bdfd5e56bce4f0cd43a949c2b61141feb7415
 AUX isa-l-2.30.0_makefile-x86.patch 223 BLAKE2B ddbe4532bcff110c10d79791e2e8378ed03b6cabc2ec5b86e4f82718b07f09757d0ed903b7e6b412f11504d3beb9c4263b47a1d29243978c277470f1f3272290 SHA512 36da90bb9ac7031485ef18b8a082a682aeb0addb16f71fe864c3f8e16c48f19fedbed30b2acfb1e84bb983305f146866aaf61a38f65ae9d5a28f6a491eaf1b3e
 DIST isa-l-2.30.0.tar.gz 649389 BLAKE2B 3364733d61ce16c91891b6da63d2b4fb2bc004761c91f2076a9a6441adaea24af43b6d32caec011c06206e3811e8c9639f8ceaac89fe97800144c7f78c80c350 SHA512 d3ecfb7326097534b06a74b584100336509525ae7cadc6112d0c27e3d8704f3810e18f583d3cc33fa266bfec96db023607622b22ddbf17988ec4bf1bb3b3b9b2
-EBUILD isa-l-2.30.0-r1.ebuild 977 BLAKE2B ec6702b42dbd01c655601ffcf15b3023763df7c883e1ec08b12ca2bb2f9579c96412cffda46e043904f955d760d71531020e1e6035c679405ca471486bc4c666 SHA512 62d2f099ead996e8b3bf1b4ac2d199fbc0f7711090f1eb823c5e8b02fcc18d9783c5135432e0e5101ca6db5cd44e112906ef7856254be9e865a4bcb3ec39daf7
+EBUILD isa-l-2.30.0-r1.ebuild 1148 BLAKE2B 038ca969c54073a73ce85bed785f9478d83f21a96ca28529a431bb891181653960c576210e7c1acd176543f9e33bcf79ec3c73765fc78dd2d57fbb5f8f99c8f4 SHA512 970ae92ee15772623b7177d694ca355db209ca84db91b4f2dc410ea33cebaabd8d8f95db9992770d38d90856035f9a517761d62e3745399709164e1359f04d14
 MISC metadata.xml 1002 BLAKE2B 2934e906f4d5a6afd5de680fefc934d46f8730fba062834b0d63ca58b0c7cab684daea9c3adafd8e00e44efa7fa09547f8602b724b5cebb557d4ffff1eaf4615 SHA512 6cbf77704f202e8748348b3ee95295ab7d3def3ddf07ede18f4dafdc4374685b7597892d2ba02eaf2d113abeb6f6ece282f8f822528eecd6871c7c0faedcce28
diff --git a/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild b/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild
index 5998011ab3dd..6cb8319addff 100644
--- a/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild
+++ b/dev-libs/isa-l/isa-l-2.30.0-r1.ebuild
@@ -15,13 +15,22 @@ KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="cpu_flags_x86_avx512f"
 
 # AVX512 support in yasm is still work in progress
-BDEPEND="amd64? (
-	cpu_flags_x86_avx512f? ( >=dev-lang/nasm-2.13 )
-	!cpu_flags_x86_avx512f? ( || (
-		>=dev-lang/nasm-2.11.01
-		>=dev-lang/yasm-1.2.0
-	) )
-)"
+BDEPEND="
+	amd64? (
+		cpu_flags_x86_avx512f? ( >=dev-lang/nasm-2.13 )
+		!cpu_flags_x86_avx512f? ( || (
+			>=dev-lang/nasm-2.11.01
+			>=dev-lang/yasm-1.2.0
+		) )
+	)
+	x86? (
+		cpu_flags_x86_avx512f? ( >=dev-lang/nasm-2.13 )
+		!cpu_flags_x86_avx512f? ( || (
+			>=dev-lang/nasm-2.11.01
+			>=dev-lang/yasm-1.2.0
+		) )
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.30.0_makefile-no-D.patch
@@ -31,9 +40,11 @@ PATCHES=(
 src_prepare() {
 	default
 
-	# isa-l does not support arbitrary assemblers on amd64 (and presumably x86),
+	# isa-l does not support arbitrary assemblers on amd64 and x86,
 	# it must be either nasm or yasm.
-	use amd64 && unset AS
+	if use amd64 || use x86; then
+		unset AS
+	fi
 
 	eautoreconf
 }
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
index 64c8ad1c04e3..7a78a19e753c 100644
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@@ -1,5 +1,7 @@
 DIST libzia-4.52.tar.gz 641867 BLAKE2B 106ec4ad8be1fd32dfc887b2bc57fcb506f3f4a4e25cd054228ddf2ebbd5c8d3df8f5e79f8e77fd8198c16acb55796c875dd3759bd1ec57c69ab51528bd9363a SHA512 d18b7a5ea168276f6f90429be271dd2807000fa7fef938d11cd55349475afe4343b54a7bcd0222606a4d51ea74e10aeede38dd9b80ec0c44fa5ce392ce79c59b
 DIST libzia-4.54.tar.gz 646921 BLAKE2B 43a5575e673b24b9687bf744892dcc823c260760934d983d7b5e4480cad588283b1e830bbf0aac9ff46bc419ebf6f474b7fc7059c25214906756e678371baebe SHA512 818cd7219c7d742236cdbf8f1d7077b85e430c575ad76aea9724023eb7d72771ecf91e9c82f6a6b95bd1119ec46efd1fd7bb08c53b918b803e6051df82e47846
+DIST libzia-4.55.tar.gz 646922 BLAKE2B 0430757bce57458b33dbd7c315b88258b5d1364aea958a6b31e7e90a7f544cf64ba4409ffde9b2ab7088b6c8a33e433a3c334e7fc61e22a4bb8b693b53532000 SHA512 05d91c59b070f1230a0919c07757afa25f4bfca6585501d1ee013ca2c5994967329682624c2a9e13cba686640ddb145ca093e3e341141fd301e780a98c6b30a7
 EBUILD libzia-4.52.ebuild 1067 BLAKE2B 21c485ac1109a8dc4c60b6319a9c0b7e17c4f4e267eb92f9ade39d34ad142d10ada511e697897405b15a05b87b4bb640c4a85a89158272b25ef5c357d6966586 SHA512 a96d7d98885d5dac2ac323c54cd981fb7677dba8b55f9eb2210e5331ff132d463b43bba80d185e1a1480db09939795774886f701826a5f4786496d81af88e36e
 EBUILD libzia-4.54.ebuild 1090 BLAKE2B d16d96ece880bec45cc15b93dee88eff503487bd843f8dca5a821439758b4ae5aadf7f9312f8c16dce3de1b70d71bb3dacf748bcf19689e2d3979f77b9b33c47 SHA512 a8a8c71b25cfd990178f542aff43b5dfac168375de43246b4bae4cc90493d4ebb5aca9b41fe1ac3c3a4755406d50db51afa0b085f8deba369c4a2a9f41736a1f
+EBUILD libzia-4.55.ebuild 1090 BLAKE2B d16d96ece880bec45cc15b93dee88eff503487bd843f8dca5a821439758b4ae5aadf7f9312f8c16dce3de1b70d71bb3dacf748bcf19689e2d3979f77b9b33c47 SHA512 a8a8c71b25cfd990178f542aff43b5dfac168375de43246b4bae4cc90493d4ebb5aca9b41fe1ac3c3a4755406d50db51afa0b085f8deba369c4a2a9f41736a1f
 MISC metadata.xml 326 BLAKE2B 1b8ed6c9d40252f3371cf9a1ec295f593c8898dd8e45173ca05cededf987c7e44e2fafca613f8ad3022e9fbb6886d6aec2d183fd47c3064f35038784f361ebc4 SHA512 0c8a48b1101aa184dc596581feaf47463688801cb0f342177ecfb6fade1d63520ca1b9dcb278279470c181b560f555de332e4d2583e8856eec9057cde34df48f
diff --git a/dev-libs/libzia/libzia-4.55.ebuild b/dev-libs/libzia/libzia-4.55.ebuild
new file mode 100644
index 000000000000..0fe1254dbfda
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.55.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl2
+	media-libs/sdl2-ttf
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:1 )
+	elibc_musl? ( sys-libs/libunwind )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		-e "s/docs_/#docs_/g" Makefile.am || die
+
+	# fix build for MUSL (bug #832235)
+	if use elibc_musl ; then
+		sed -i -e "s/ backtrace(/ unw_backtrace(/" src/zbfd.c || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	use elibc_musl && append-libs -lunwind
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd \
+		--disable-static
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	find "${D}" -name '*.la' -type f -delete || die
+}