gentoo resync : 20.03.2022

3 files changed, 61 insertions, 2 deletions

diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index aee0a8ed5be0..4326685cb2a2 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -1,7 +1,8 @@
 AUX libsixel-meson.patch 1904 BLAKE2B d4e4b4b800e8c8e847893b7f80369f71b2cb99ae4fdbf7ecf8a7eae05efd4e74d5e84d6f3eb8a63eeb0abd998404819bed8d084cf98bbb79faab3877512cb713 SHA512 3c853f577c569f2228d63ed9b63ca8cdc23313b5d76b890186ae7d0741e18f1707f5470cad88daf849f8972d42a9100480e354bbfc80e8be030467cac364a58a
+AUX libsixel-musl.patch 1304 BLAKE2B 09e7a75a94edd944cca9997c74b235f9f27aeff550b2a9a02225c93d60f1faf598b9c5c304c9e8f1f207da37d7712d40115410f65cae17995c3bdaed6cfc99d7 SHA512 39b7227040e523881a9405e7f6b98362a0c4fb7f717bf50a724eabfd5cfe9779f820243f7ae0a83b61b4dd124ec4ff0070d391ea43476388095e1d4160f13cbd
 AUX libsixel-static-libs.patch 240 BLAKE2B ba9091c4991c6e69f83ca7eaa35aa7ceaf81e8542b1edffd1ce64ba1bedf518ad82603cdc610f256b1a0dc4954151b7407202a27c101ef6de59ff0724021faa3 SHA512 d3c6c060e8eba47c98180e5e4e127dfcb6f77f89b11dbaa8595cfd9786eee94a884476d210deb9ca6eaa2f548c6407a9bff714cfc3f18d4fa36b60d2c1fc165e
 DIST libsixel-1.10.3.tar.gz 4272940 BLAKE2B f65d9a3bdd54917f5746b7b1650dfca7084c64b505ea9cae07863c476d1189114d9fb303ec01d8fa209542e891f1d359ec6dbdc9babc4313b06b709813fab020 SHA512 ef16f9ccecec8289728ec84ce9f24145648f8a38184c1ec3df8ead3499c6cf7d3e0a0c738f8bfcb1093e16ee8ae7ce5e46d3890707c8104752ce4ab7eb3bc7ac
 DIST libsixel-1.8.6.tar.gz 4791628 BLAKE2B 5fa197d0d759eecd4040c4c1101e6d85fb9af7405ccdff75be571b3ac6b2b0aab6415bc3fdbb37157795f89190fcc1d0fea1bdf705e83a34762e2b05f5588c69 SHA512 460a5d46bada705b4a7ec2e250e2bde7f4b8ba155281fa5a102d1121f79c1c79145f042cd1f4bf93a2fc29e784e89afd539e963470663fc659d4fe72ea49fdaf
-EBUILD libsixel-1.10.3.ebuild 1904 BLAKE2B 8ff2651e85dd33befb7c9c27c6f83ca121a164e206011c07932f92f4be8c8ef7ae17aa0edaba77829f5d430a1f2216906f7c3a12ea61fa038e7c3ba95c1944a9 SHA512 d70d0c4e051e4e51e5b51e34668a286c2a16155f9de6b822f78bb5ba22327241ca31cde612de8a9e9a8b10dec7b0b234a81e7dbe120ce020aa8acf9e446e7f06
+EBUILD libsixel-1.10.3.ebuild 1936 BLAKE2B fa889fe7e38b2bb8611a96e8899beee9774c1b47bb6a66cb51a3ff49ae92b8bf70148a7b6e399a0c5401ae083047b3c7a5dd63f43936bd1f95de0904f85ab02e SHA512 6dcab43217f9a710b43a18b21ca952b72e07498c52aa7e59556f03535f4059e9c7045482fa0d5a7226c8679ad2babdbb4213264aa807dc86bfe185b9770fd22d
 EBUILD libsixel-1.8.6.ebuild 1848 BLAKE2B 65ebce0c43773581673555da29d7ada4e2bcafb8b2d98dd6e311b1cd9ead95d1a8d52bcc2739b5c1410c2ab776403909bcea1a7198e664d9739db6cabf920f73 SHA512 4a006fd05ba3b344d387dea8c59e6895c28f515094c84bee22fc4479c320964faf768a926bbaee008103fb74fe4b5285e97b31ff61e1e2b12db045508ab548e9
 MISC metadata.xml 387 BLAKE2B 71825e6924d15781b4c819089beabe6b4279b8f408452e97c5121d2892d8539f95205d2c869dc1259b3aecb0e8d7a1389548b44bca7637994afe16da0abcc8d3 SHA512 4481aef804960b1205090e2453f878fc059b009d1548f1a8b28653919443b73cd030b9020b3d0707d98623f39a82775d36f5111ccb1bd65f1f9128183915faa4
diff --git a/media-libs/libsixel/files/libsixel-musl.patch b/media-libs/libsixel/files/libsixel-musl.patch
new file mode 100644
index 000000000000..f353a2f7c8d6
--- /dev/null
+++ b/media-libs/libsixel/files/libsixel-musl.patch
@@ -0,0 +1,57 @@
+https://github.com/libsixel/libsixel/commit/a8d60939d00af520e7139741b58928a9cc2c5f04.patch
+https://bugs.gentoo.org/830074
+
+From: nick black <dankamongmen@gmail.com>
+Date: Wed, 29 Sep 2021 22:31:58 -0400
+Subject: [PATCH] no need for sys/unistd.h
+
+--- a/converters/img2sixel.c
++++ b/converters/img2sixel.c
+@@ -28,7 +28,6 @@
+ #include <string.h>
+ 
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ #include <sys/types.h>
+ # include <getopt.h>
+ # include <inttypes.h>
+--- a/meson.build
++++ b/meson.build
+@@ -66,7 +66,6 @@ needed_headers = [
+   'string.h',
+   'unistd.h',
+   'stdint.h',
+-  'sys/unistd.h',
+   'getopt.h',
+   'sys/types.h',
+   'sys/stat.h',
+--- a/src/decoder.c
++++ b/src/decoder.c
+@@ -26,7 +26,6 @@
+ # include <stdarg.h>
+ # include <string.h>
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ #include <sys/types.h>
+ #include <sys/select.h>
+ # include <time.h>
+--- a/src/encoder.c
++++ b/src/encoder.c
+@@ -27,7 +27,6 @@
+ # include <stdarg.h>
+ #include <string.h>
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ # include <sys/types.h>
+ # include <time.h>
+ # include <sys/time.h>
+--- a/src/tty.c
++++ b/src/tty.c
+@@ -28,7 +28,6 @@
+ # include <sys/time.h>
+ # include <sys/types.h>
+ # include <unistd.h>
+-# include <sys/unistd.h>
+ # include <sys/select.h>
+ # include <errno.h>
+ # include <termios.h>
diff --git a/media-libs/libsixel/libsixel-1.10.3.ebuild b/media-libs/libsixel/libsixel-1.10.3.ebuild
index 4e9128a773dd..636229521e33 100644
--- a/media-libs/libsixel/libsixel-1.10.3.ebuild
+++ b/media-libs/libsixel/libsixel-1.10.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -34,6 +34,7 @@ BDEPEND="virtual/pkgconfig
 PATCHES=(
 	"${FILESDIR}"/${PN}-meson.patch
 	"${FILESDIR}"/${PN}-static-libs.patch
+	"${FILESDIR}"/${PN}-musl.patch
 )
 
 src_prepare() {