gentoo auto-resync : 08:04:2024 - 12:31:06

7 files changed, 22 insertions, 24 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 28e1d4aff20b..13af8631e809 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libpgf/Manifest b/media-libs/libpgf/Manifest
index 509fd921a45d..ecd3fbbe8903 100644
--- a/media-libs/libpgf/Manifest
+++ b/media-libs/libpgf/Manifest
@@ -1,4 +1,4 @@
-AUX libpgf-7.21.7-remove-off64_t.patch 939 BLAKE2B 3446d82705950af3486fd0378c9330d33224cba2176e48c52fd0e1ba32679df8c8b83f6bf0cffab0a263974c2ae8547f4889e6985fbee495bd2dc7a270969468 SHA512 9d34b3445752e523d9e7971256808bd7062dda07ec5fb7c56f16f2474201c33545529885424cb92206f3b7232e0fb8b8de56809132f79160e70601ef28173d17
+AUX libpgf-7.21.7-remove-off64_t.patch 887 BLAKE2B 88f420fb725d6f33f2f50073bbf21da21f7f587728bde4522bad1a0b695222a7704763f02373b35689737e59c4162be5563f84b477748abe88b53bc199d567fc SHA512 987bea1d48dc11bbaee23e411b8a89c78dd04bc90f3beb263277293cfc20578b3819c6b9d97cb9803ddfdeada19cbc80d3521d2288479e28cb0a8a0497b36a9b
 DIST libpgf-7.21.7.zip 2075722 BLAKE2B 31c5ab5930ef5658ca9b320fa3df94b7d8566467a657df6d255781664a4750d6b5cb7b351c828cad7c60b42f8cb8926c51bb0271d5c51e2484426a15f18b5eb2 SHA512 dbc17d9dce1afbeffb272df0d573059914d2ac79d652d1d43e67c49509fd6e643be8594bbd1a3058a5aa3a9d30db100c6dcf641051345049cf8f9375d49e2799
 EBUILD libpgf-7.21.7-r1.ebuild 1185 BLAKE2B 011c77da3a4a53f4e1e2a80ca71bbf13c6dee90c8eb4979f72da7cd40931bd2d55b92900c203675ed713497b8cbfe0df4ff2abfab70b135c3e31b66846d1c995 SHA512 2d5eee0390a2f2a7fe6abe052e77294c2785e10e1f9c6976fec15ad92cf954eee31086b8d5155cad468c0ec965a081567bda8c211a557a199edeb9fdac90c7be
 EBUILD libpgf-7.21.7-r2.ebuild 1236 BLAKE2B 211b69b6817e149ec792b97350b9fb0c3768c60402538deb2d81221bcff1b6083d72a52874382f5c1adb4f374490eab4f20000c6888d0788d620787b5f1db0d4 SHA512 6bcb5ac4dbc822021b642d06a85632fa3be06497a5182fc4cb58fe3186228f1cf7139f359231d33a84c631c1d1fcb934cd13c01c33f0ce9c7c26795f766211c3
diff --git a/media-libs/libpgf/files/libpgf-7.21.7-remove-off64_t.patch b/media-libs/libpgf/files/libpgf-7.21.7-remove-off64_t.patch
index 9844bd589b94..c0ebd6fe431c 100644
--- a/media-libs/libpgf/files/libpgf-7.21.7-remove-off64_t.patch
+++ b/media-libs/libpgf/files/libpgf-7.21.7-remove-off64_t.patch
@@ -1,35 +1,27 @@
 https://bugs.gentoo.org/907091
+https://bugs.gentoo.org/927796
 
-Remove off64_t, add AC_SYS_LARGEFILE to configure.ac instead
+Remove off64_t, lseek64, add AC_SYS_LARGEFILE to configure.ac instead
 
 --- a/include/PGFplatform.h
 +++ b/include/PGFplatform.h
-@@ -341,10 +341,6 @@
- #define __POSIX__ 

- #endif 

- 

--#ifndef off64_t 

--#define off64_t off_t 

--#endif 

--

- #ifndef lseek64 

- #define lseek64 lseek 

- #endif 

-@@ -536,7 +532,7 @@
+@@ -536,8 +536,8 @@
  			return NoError;

  		}

  	#else

 -		off64_t ret;

+-		if ((ret = lseek64(hFile, 0, SEEK_CUR)) == -1) {

 +		off_t ret;

- 		if ((ret = lseek64(hFile, 0, SEEK_CUR)) == -1) {

++		if ((ret = lseek(hFile, 0, SEEK_CUR)) == -1) {

  			return errno;

  		} else {

-@@ -554,7 +550,7 @@
+ 			*pos = (UINT64)ret;

+@@ -554,7 +554,7 @@
  			return NoError;

  		}

  	#else

 -		if ((lseek64(hFile, (off64_t)posOff, posMode)) == -1) {

-+		if ((lseek64(hFile, (off_t)posOff, posMode)) == -1) {

++		if ((lseek(hFile, (off_t)posOff, posMode)) == -1) {

  			return errno;

  		} else {

  			return NoError;

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 6fb0eb6435b4..86358b0a7f14 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -9,7 +9,7 @@ DIST netpbm-11.2.8.tar.xz 3781396 BLAKE2B cb74b79b61a88d739071ab85e0ca96a0e51140
 DIST netpbm-11.5.3.tar.xz 3783400 BLAKE2B 45a0169865922dcdd2cba0d91e347aa753153e7a9496c8469ac40039628dc3bf13adbf67f30e6af929f4bb582c09769eac579f7086ee78fa206b564b736492c9 SHA512 f7e58fa086e6f549bb350ca9592ad5df2cdacd80c8cb0f508ab17b5f85c9358df56306d293e5b88bdcb3d2b350731bd7def0098437fdfea2711921b1caa95b95
 DIST netpbm-11.6.0.tar.xz 3792264 BLAKE2B 482e27df7aca081851b5e87cbd2e54d851c73922553a570223c22b4074178caef2e3018c8c2bab8a301bc35a645ea6ce8ac3bb7eb1001c0ca977f53182e0e19f SHA512 911912b0d6b9817ffdf3b9183c51305bc5418497865cd48cb7fad8bc5212e7092df7b2c0714b05f7459123f6ff10bcd128ffabcf2343c503e430d04aff1a837f
 EBUILD netpbm-11.2.7.ebuild 6976 BLAKE2B 18225d4d04fe229802a170d569d297f9231b1c0d46c05239ec4221a10da0e4934b01c6ac294e8d972333e0ab90b8b71c5334ea5a4c85fac006c3fe87060f99f7 SHA512 4da684cb71c45de8b76bae5c7f79269bb25fb4b3fac9cc71cde5707923bdddb7e52e527c1e47755df7185e7fd18c1a19ebbbbc94f9e6a171583415735602de2c
-EBUILD netpbm-11.2.8.ebuild 6980 BLAKE2B 07938deedbf23fe5346246a90c07b8f76b68418d8655f318a5d91c2dc08cb81d5fc979c73a24db3fc16f8c05dc6b450139ca38b4f31b539c4ca7d744a47fa88a SHA512 3e8418800eae8e565c1dabcc4248ac0e946124de4b89c722c910c3f199e5557013ad0c4dc5ca9e01eb8f32688a8506d72c175a8edfacbc858e138f29901e5ac9
-EBUILD netpbm-11.5.3.ebuild 6893 BLAKE2B 51e08ff2753647d36c2bf8bafbbc26ab256e94a3bfe83c4c1690f8ab79ef4eae7246b44fa267abba3393b7617f802598e63ca73a0de6158c668bda1440b8d3d7 SHA512 350e2ceb608be231931cfd4044b8b6f7b570e3c212a45cc27a2c91e6991a977ef3bbbb35b5971a793d260ca11dd28365ef1808dd52b0a6bcc3edf331dcf2f14d
-EBUILD netpbm-11.6.0.ebuild 6843 BLAKE2B 9c918a3cdfa2e5555757e1743a864ea81d2b5ba93bfe39aa8aba9c83d35bea65fd48c7f9c6972d7c8f2c8fdae45d151c868e90e42e8eb204ee055454ca893cdf SHA512 732c3fda6c6c7a9d9de4728ca1a8c936e58b7a6bf82f7a1e81ebc1e0667517ab09cc4b973304d4e6c8742e8b72f33459a4c23f458dec270129c16a6cd820f5ef
+EBUILD netpbm-11.2.8.ebuild 7068 BLAKE2B 13319efacfa64a5e9b306efbdafaaf1ca31580d21e17f2e72eaa3f1df6a1cb0aeef4bc6a9fb9b82d115588dab51ee295f8ad8e453a6bede6ef2c6c6d39068115 SHA512 8dc9ce4a4d64b84b2c3a752fe2ba6fafc5d64219be23f1b9703d76ccc9e0ade030539d7c1108779d79f9e17ebaeaf8893f3fae02032234f8639e5bbbb097e334
+EBUILD netpbm-11.5.3.ebuild 6984 BLAKE2B 23d8dc85e12a8a41f0f485b3eb308714185bbaa48c9016f238a3b4341f243114e7c6398361e21083fcdd42327fe83827c5c72b4941a9d802a9800d8e05f15f29 SHA512 8eb6062eeb78bd2edf00eb8d2b6fc3f1515115e1baf43e517184390384caa318a83a30b84d77c9fb2f66e62acfdd12bbe60c9cd254da2962048cb1b3f434dbb7
+EBUILD netpbm-11.6.0.ebuild 6934 BLAKE2B da524853140b4a2c3968904f607968a9db572a30f50e7b33da7a56e0154a9d49c58faf42e4e6988cdeb40e5ba754cd6fc2166d690bae66587e97cca99aa92635 SHA512 86461347264f11c113c216629ab11a3e662ee182d9f821ee4ce8f2a2705ddd9ffae7541107e9ec4d1358cc8496799259797a71418376221a4002010704ae97a7
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/netpbm-11.2.8.ebuild b/media-libs/netpbm/netpbm-11.2.8.ebuild
index f44fa7eb02c1..72ada702ad14 100644
--- a/media-libs/netpbm/netpbm-11.2.8.ebuild
+++ b/media-libs/netpbm/netpbm-11.2.8.ebuild
@@ -160,12 +160,14 @@ src_prepare() {
 			test/Test-Order || die
 	fi
 
-	# this test requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-utf8 requires locale, not available on musl
 	# ppmpat-random is broken on musl
 	# bug #907295
 	if use elibc_musl; then
-		sed -i \
+		sed \
 			-e 's:pbmtext-iso88591.*::' \
+			-e 's:pbmtext-utf8.*::' \
 			-e 's:ppmpat-random.*::' \
 			-i test/Test-Order || die
 	fi
diff --git a/media-libs/netpbm/netpbm-11.5.3.ebuild b/media-libs/netpbm/netpbm-11.5.3.ebuild
index 0a74a2fd9cea..1870cbbec2ed 100644
--- a/media-libs/netpbm/netpbm-11.5.3.ebuild
+++ b/media-libs/netpbm/netpbm-11.5.3.ebuild
@@ -155,12 +155,14 @@ src_prepare() {
 			-i test/Test-Order || die
 	fi
 
-	# this test requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-utf8 requires locale, not available on musl
 	# ppmpat-random and pnmindex are broken on musl
 	# bug #907295
 	if use elibc_musl; then
 		sed \
 			-e 's:pbmtext-iso88591.*::' \
+			-e 's:pbmtext-utf8.*::' \
 			-e 's:ppmpat-random.*::' \
 			-e 's:pnmindex.*::' \
 			-i test/Test-Order || die
diff --git a/media-libs/netpbm/netpbm-11.6.0.ebuild b/media-libs/netpbm/netpbm-11.6.0.ebuild
index ee6f21f27d5a..80e083e89bc2 100644
--- a/media-libs/netpbm/netpbm-11.6.0.ebuild
+++ b/media-libs/netpbm/netpbm-11.6.0.ebuild
@@ -154,12 +154,14 @@ src_prepare() {
 			-i test/Test-Order || die
 	fi
 
-	# this test requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl
+	# pbmtext-utf8 requires locale, not available on musl
 	# ppmpat-random and pnmindex are broken on musl
 	# bug #907295
 	if use elibc_musl; then
 		sed \
 			-e 's:pbmtext-iso88591.*::' \
+			-e 's:pbmtext-utf8.*::' \
 			-e 's:ppmpat-random.*::' \
 			-e 's:pnmindex.*::' \
 			-i test/Test-Order || die