6 files changed, 64 insertions, 3 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9af8dcd634f2..e65c703b9eb0 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 2997620e3ec4..8d0d7cd20b45 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,3 +1,4 @@
+AUX exiv2-0.27.5-musl-tests.patch 2390 BLAKE2B b6e69abee39168f0ecf1cfe6220d017802abae12a22ffaefe96c9a4c3a47748810bbc27bfc65d7b2a1c0b8499b5756123e7d475ef872c87337851d93241012fb SHA512 ba1bffe8a477ec90a8cc83eebaecc9608f5a953bba433cff0d62e807457969f37bdc97c205ffcf8d0fe4c948f2b67172f33adca5edacd68e35ba10366bbc4c85
 DIST exiv2-0.27.5-Source.tar.gz 32720608 BLAKE2B 803cb853fd049b28d309952c2332589a8544ff90c16fc1a588b6f1a2d4ae5e96da7ae746cf2247954ac54e155b84e0ad1f4f2d89f22d07e7bbd34038f0e292a5 SHA512 0f2d2dfbc976052a428dfeb597225d3ea3c725f584d05b99316bd4aa9cbf0ba5e1e37bcde71f9041975cf003b4fdb578c559adb144268d784bfd64494f451491
-EBUILD exiv2-0.27.5-r1.ebuild 2796 BLAKE2B 722afd20b40d471d6c6f1dc0aa03c3de942892b0c237c30b5dac45a08d346b2954cb2eda480feb712a806b6cb2ddd8d9217e01ea6b57a11f84bd302190d63970 SHA512 a70c68d01ac5a961746bcda28b235e400227a39bc051a7563a314d5f6437a653e04e83845e5b2605fe9c0e2303c910247147515eb39ce6252898699652378045
+EBUILD exiv2-0.27.5-r1.ebuild 2854 BLAKE2B cc06969634ab2de47c8ae280a12be743617f4c9e1c501fc50a1ce7a945a21bfc706b0dec1a29f17ad4256e37b95cd77d0ac783ab4ddc07ac453ebafa69adadce SHA512 1f4d2c41c09c11355e2152ad3acfc6885d23c056d57da4945aa62f3b790b2fceb771b30781ba314042d71c50a21af161a039ff06281e1dd72b28372898b394b8
 MISC metadata.xml 631 BLAKE2B f56eead7809df86d63d30f14af67d4af80f04d012d275e387b10daf9736caa6e9d234576a05c8867cfdb6f8bf598f06615d7f4e618d4809978e1a0cd71d29500 SHA512 7bde3126869346c08d949cee95fd61a1a5d5c77081260b102c84e4e1918596bc17b47433fe5a351e28a560efbad0bab0d6813b5b8aad353bfc2bad8b14ed2d33
diff --git a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
index 8655bd0c7eac..e262b7b9c5c8 100644
--- a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
@@ -50,6 +50,10 @@ DEPEND="${DEPEND}
 
 DOCS=( README.md doc/ChangeLog doc/cmd.txt )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.27.5-musl-tests.patch
+)
+
 pkg_setup() {
 	use doc && python-any-r1_pkg_setup
 }
diff --git a/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch b/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch
new file mode 100644
index 000000000000..3fa70d739f4a
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch
@@ -0,0 +1,56 @@
+https://github.com/Exiv2/exiv2/commit/82adcb1f86def0555b25713a8b84dba84944b275 (1)
+https://github.com/Exiv2/exiv2/commit/7d8cd00778c3eee9f32af04b009d8a5651eb53e7 (2)
+
+This is basically just commit (1). Though it wasn't directly applicable so I just merged it with (2).
+Easier and it makes the file same as upstream.
+
+diff -u b/unitTests/test_futils.cpp b/unitTests/test_futils.cpp
+--- b/unitTests/test_futils.cpp
++++ b/unitTests/test_futils.cpp
+@@ -42,21 +42,8 @@
+     std::string tmpFile("tmp.dat");
+     std::ofstream auxFile(tmpFile.c_str());
+     auxFile.close();
+-#if   defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW__) || defined(__MSYS__)
+-    const char * expectedString = "No error (errno = 0)";
+-#elif defined(__APPLE__)
+-    const char * expectedString = "Undefined error: 0 (errno = 0)";
+-#elif defined(__sun__)
+-    const char * expectedString = "Error 0 (errno = 0)";
+-#elif defined(__FreeBSD__)
+-    const char * expectedString = "No error: 0 (errno = 0)";
+-#elif defined(__NetBSD__)
+-    const char * expectedString = "Undefined error: 0 (errno = 0)";
+-#else
+-    const char * expectedString = "Success (errno = 0)";
+-#endif
+     std::remove(tmpFile.c_str());
+-    ASSERT_STREQ(expectedString, strError().c_str());
++    ASSERT_TRUE(strError().find("(errno = 0)") != std::string::npos);
+ }
+ 
+ TEST(strError, returnNoSuchFileOrDirectoryWhenTryingToOpenNonExistingFile)
+@@ -68,22 +55,7 @@
+ TEST(strError, doNotRecognizeUnknownError)
+ {
+     errno = 9999;
+-#if   defined(__MINGW__) || defined(__MSYS__) || defined(__CYGWIN__)
+-    const char * expectedString = "Unknown error 9999 (errno = 9999)";
+-#elif defined(_WIN32)
+-    const char * expectedString = "Unknown error (errno = 9999)";
+-#elif defined(__APPLE__)
+-    const char * expectedString = "Unknown error: 9999 (errno = 9999)";
+-#elif defined(__sun__)
+-    const char * expectedString = "Unknown error (errno = 9999)";
+-#elif defined(__FreeBSD__)
+-    const char * expectedString = "Unknown error: 9999 (errno = 9999)";
+-#elif defined(__NetBSD__)
+-    const char * expectedString = "Unknown error: 9999 (errno = 9999)";
+-#else
+-    const char * expectedString = "Unknown error 9999 (errno = 9999)";
+-#endif
+-    ASSERT_STREQ(expectedString, strError().c_str());
++    ASSERT_TRUE(strError().find("(errno = 9999)") != std::string::npos);
+ }
+ 
+ TEST(getEnv, getsDefaultValueWhenExpectedEnvVariableDoesNotExist)
diff --git a/media-gfx/tuxpaint-stamps/Manifest b/media-gfx/tuxpaint-stamps/Manifest
index 5ddde6e3cacf..35dadb2ef48b 100644
--- a/media-gfx/tuxpaint-stamps/Manifest
+++ b/media-gfx/tuxpaint-stamps/Manifest
@@ -4,6 +4,6 @@ DIST tuxpaint-stamps-2009.06.28.tar.gz 48273629 BLAKE2B a9c11b846d60bb4de5bfaa72
 DIST tuxpaint-stamps-2021.11.25.tar.gz 193603076 BLAKE2B 16cf8e9792261608bb77fdb97ba9828671a44b6ba939c5644e9d1c256bc2f9055becf70a336a8acd8b5b8f5e07d1f51a3a39eb7aeb267450ac6d848a500cbb0e SHA512 db353ad0635a0f06960d0ec0c1eabda26bffa4672e5c56099ed02c2db9e109b4dbdd17327eadce8a1779b5d0fe51503988b56dafd4e47e9ad4f978e2a7ba2c10
 DIST tuxpaint-stamps-2022.06.04.tar.gz 215615180 BLAKE2B a01428a1bbb0acc623f533bd2ae36527740e7a8032d5576109c36d4f8c8d3d7d1e9ed8ceaa8f9a3e15f7f932634033bee7c6336184727a3afdafb6bb8eb93731 SHA512 a02b4265b436fb48dd1e06e57c238c78f90a4894691795772a93ffb2287ee6c608e1fb75ff93527d29c73aea1a10ecb3c8acf9e1325ff01aecc443bd01fa6bb8
 EBUILD tuxpaint-stamps-20090628-r1.ebuild 626 BLAKE2B 4531c55c9a3febee023974ac4386001a779bfd487d367dad37fd58690780345ce46c3a679b270f6554e85817c47e61269bf34140c71dbe89e0f2da0c89e2fd68 SHA512 0cb6a1e8b249ee3970c888c7aae9030746003d177b7f14b8541e4b213e5fc7d5b50abb0a3d278b8c6b180f643b8ee3057338cdd5acfee0d85f752402ba2f614f
-EBUILD tuxpaint-stamps-20211125.ebuild 603 BLAKE2B b25c6b17d5257d43850726849035d1d04711a876c7671cac50c2d0141b4bb5bf66a7caaf317aaa032f2b3c29569c1d59325fd0f8a5c0b679e255bdbddf3aac4f SHA512 6e4d94f2f08c59cd533ab6150e8ad0dae789af3ca006a718408034f230593793bcc5aba0f2655564ad48ccb7da7ff609df9c1a2ae46f845b60373e804a323510
+EBUILD tuxpaint-stamps-20211125.ebuild 602 BLAKE2B 56fec5f3a69278ed70c460ee137d5d759200c6303c715d0f22a699eb0f2e171106c26276f4beae28a18cf55d0136798935ef8f225f3baf8bd6352e1b50fc61ad SHA512 44bc679c515b1bb995fcd3849fd873b89ccfbba06325287a147b3a69decbb57106e6b19d1f9a32e484013cf40ebafbec65d55afe9ecf2b114ad5810de14c92ad
 EBUILD tuxpaint-stamps-20220604.ebuild 619 BLAKE2B 468a49c3cd83f004efefcebb316ccdcc9b07c24d5af383a7343893d44b9526d51c8cac06f1223a9d14ff3475b8f498ed999c3791bc39e7bc54508d665816ba6a SHA512 396c5a43eeb9841a143e677ce86e32ad9c62cea3ada1ae250f3a22c41eb5d15d38d76480c43bc9ca7714c34a27b864721db08069a802932f014218ec48c4e2b1
 MISC metadata.xml 499 BLAKE2B ead1a8426af3fe51d9da998dd7ac9f901494af99d82014e39ecc1b61f3cb37bce7b75218924e851ef17c45b1685ebc360b6bd663a4623061fa89b87682741853 SHA512 e10f6a0c47cad6fb045cdc752e5f43e4d1981008f2940ad88baa124c8584625095785c731a9d27e6dca037398ac5cff2713d9a93facd9fd3bf7fe18bee1b09da
diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
index 37bcb6e5a89e..1120a4741b3c 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="media-gfx/tuxpaint"
 DEPEND="${RDEPEND}"