gentoo auto-resync : 19:08:2022 - 02:35:40

3 files changed, 62 insertions, 1 deletions

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)