gentoo auto-resync : 27:09:2022 - 03:09:13

3 files changed, 109 insertions, 1 deletions

diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index a084a6d461c5..533cb2e93f8e 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,5 +1,6 @@
 AUX 06zfscloneopts 1467 BLAKE2B e515b70b7d105470a8b32ecd8f2d88446f039424a132215bb149e7716429efc7b726630de9bda9ff0cf197a8ba777ce2f0e14da1709fd89a9f50e88713dc3b1d SHA512 4026af077ebbb2aa4e123af1cffa5125e5b420ac79a13f7c1a510bd6d57dc4e5c439470396ffdf0701ce7a4009044a415bed6a460cf829364b3c48cd71edd37f
 AUX 11gentoo 1992 BLAKE2B 61e4396196b7c6b4695567f74c6f17fe24ab0152a8e57da136ecefa16d30e3127b94c701bc9ba0b923fa0d3aa5ab87811aed64c656d0aa475a37dbb884082749 SHA512 98f549edae1326840f04058442c07fc8e2af70811393c106bea84426c51eea36378b6a863352cc0b2aab8efd8e81b0e70c4d10bdaeda5f2a17f51fbb3ca9abf3
+AUX schroot-1.6.13_p2-build-fixes.patch 3505 BLAKE2B cd5aaf9cab438e0c42999cf49f65a99d4edd2fc8832d8875ded58b44c037972a67d061a01122409bbd25ae3cd1fd52deb8f2ea0a68e64941cd23e6393be358ba SHA512 1c1dc159ee088633b0b98ba6a271de76937a08e7dd2e665e4a43016b05cc009c764c01a783672383205a93efebac189b8d43614b94267d57588af5cf53393494
 AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98
 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
 AUX schroot.tmpfilesd 91 BLAKE2B f731cf3cb0037ec35f8144d2667f3a12fbfcef088454d165cfcdc63d34f433eb7abc9442917c0cccaf48b66cab028db0b04edbd9d1cb2864d257213fe54fd3e6 SHA512 381d715e2a1443d0115a6fa35cc7d43205a1dfa432f40e4903d944c219b8f5f0b076fb93c90c159f1f7edd5cf8a8766653a41e168940da92bae0b186c93eff96
@@ -9,5 +10,5 @@ DIST schroot_1.6.10-12.debian.tar.xz 83636 BLAKE2B 0289848f7e64983c06f47a70346e0
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
 DIST schroot_1.6.13-2.debian.tar.xz 110752 BLAKE2B 77c877e13541968ffd4edaa04c1a846e9deb19a3670088c19cdf3a217acfc2521d2b8d8dec7b8e6188b107f793af6152d5724fd596a9c62f6c9b57f2c30d57b0 SHA512 8fd7e7f95131285ec49bda3d9ccc6ba025976009c382998ef183142d2e3e288b7936e2c8ec6532870b601f62b460d577920d9a801b789f0d1bf7ee31b45356c3
 EBUILD schroot-1.6.10_p12-r2.ebuild 3482 BLAKE2B cba9a46614acfb538b9db92cbba357d10fe930a4de0c9693833c0e906495dbbff332c2e4a9f1ec108864c82f5a30b499fdcae2a79db59fdc7501db2dc75cb75d SHA512 221576e9994192fefe59fad5c80a0a4ef77aa18d61aaf1e0a9a223c9caad3b5a19087ecd38057c30584b3f229e3b285c482b944f0892a761a76666fb81fe27ca
-EBUILD schroot-1.6.13_p2.ebuild 3570 BLAKE2B 34703bfc312133ac73ec6343689e26cf788b95bc52f957dad85eed7116063c5a5e4049e22cab94ae410a02c6ae186b9d2193e60ac468e3d04e55400ec80813d9 SHA512 a2711a48727231e637455a0c90208eceeced4b335d2bad660d14616f8baafbeae29e7defd78a36548071bc414a0389581bb58d2d1f55718d705771aab7310cc5
+EBUILD schroot-1.6.13_p2.ebuild 3632 BLAKE2B 026d45b4df2479a6d9a10f4fb0ba20b271557c244ea39a42f92e29707840828085743b61945cfe1fa2bbca1a3eb3e3a7fc516b76b1878ab2a26fad86c23b41a7 SHA512 a89a431815a38ee1791e99e724bfaecea910ff3bb465e5efca5c8929b4a422f15a3e755da9f856262923b73879d449680ea71c08248fae503d8f9821a7dbe0fb
 MISC metadata.xml 616 BLAKE2B ec6e30d14cf7b8a9b8bfbe68be7d4f044d3ad8c84edea4c98b997426dcf1a29d87d2ef74968184b2aab28b68925687fd04a319f5dec0a594d586b2a7a10d7818 SHA512 18118a20b8c4f02926d27bca2a394611512bb7c353720b092ef79036691c3de24febb29d96b36171158d31534ed1dc994f2e4952517438ff550fb95cfad9dc4c
diff --git a/dev-util/schroot/files/schroot-1.6.13_p2-build-fixes.patch b/dev-util/schroot/files/schroot-1.6.13_p2-build-fixes.patch
new file mode 100644
index 000000000000..b10b8b191f96
--- /dev/null
+++ b/dev-util/schroot/files/schroot-1.6.13_p2-build-fixes.patch
@@ -0,0 +1,103 @@
+https://codeberg.org/shelter/reschroot/pulls/5
+https://bugs.gentoo.org/739034
+https://bugs.gentoo.org/715514
+
+From 56b0c8ac846c18002e32e93629ae04a0a6281706 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 26 Sep 2022 20:52:54 +0100
+Subject: [PATCH 1/3] Fix libcxx build without <tr1/*> (use <memory> if
+ available)
+
+With Clang & libcxx 15, tr1/* doesn't seem to be available,
+which is fine, as we can use the proper <memory> header
+instead.
+
+We already do this in several other locations. Fall back
+to tr1 and Boost as before.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/bin/schroot-base/schroot-base-options.h
++++ b/bin/schroot-base/schroot-base-options.h
+@@ -27,7 +27,9 @@
+ #include <string>
+ #include <stdexcept>
+ 
+-#ifdef HAVE_TR1_MEMORY
++#ifdef HAVE_MEMORY_SHARED_PTR
++#include <memory>
++#elif HAVE_TR1_MEMORY
+ #include <tr1/memory>
+ #elif HAVE_BOOST_SHARED_PTR_HPP
+ #include <boost/shared_ptr.hpp>
+--- a/bin/schroot/schroot-options-base.h
++++ b/bin/schroot/schroot-options-base.h
+@@ -27,7 +27,9 @@
+ #include <string>
+ #include <vector>
+ 
+-#ifdef HAVE_TR1_MEMORY
++#ifdef HAVE_MEMORY_SHARED_PTR
++#include <memory>
++#elif HAVE_TR1_MEMORY
+ #include <tr1/memory>
+ #elif HAVE_BOOST_SHARED_PTR_HPP
+ #include <boost/shared_ptr.hpp>
+From 04a35b2c57b84e098c9cad75d36675a958e9075e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 26 Sep 2022 20:54:16 +0100
+Subject: [PATCH 2/3] Fix localename type
+
+Needs to be a string.
+
+Fixes error:
+```
+/var/tmp/portage/dev-util/schroot-1.6.10_p7/work/schroot-1.6.10/sbuild/sbuild-basic-keyfile.tcc:217:18: error: no viable overloaded '='
+      localename = std::locale::classic();
+      ~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~
+/usr/lib/gcc/x86_64-pc-linux-gnu/10.2.0/include/g++-v10/bits/basic_string.h:665:7: note: candidate function not viable: no known conversion from 'const std::locale' to 'const std::__cxx11::basic_string<char>' for 1st argument
+      operator=(const basic_string& __str)
+      ^
+[...]
+```
+
+Bug: https://bugs.gentoo.org/739034
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/sbuild/sbuild-basic-keyfile.tcc
++++ b/sbuild/sbuild-basic-keyfile.tcc
+@@ -214,7 +214,7 @@ sbuild::basic_keyfile<K, P>::get_locale_string (group_name_type const& group,
+     }
+   catch (std::runtime_error const& e) // Invalid locale
+     {
+-      localename = std::locale::classic();
++      localename = std::locale::classic().name();
+     }
+   std::string::size_type pos;
+   bool status = false;
+From 5b00d06a567fe71328124ea53b92ddbd1bd8c6fd Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 26 Sep 2022 20:54:45 +0100
+Subject: [PATCH 3/3] Add <libintl.h> include for musl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes error:
+```
+/var/tmp/portage/dev-util/schroot-1.6.10_p7/work/schroot-1.6.10/sbuild/sbuild-feature.cc: In static member function ‘static std::ostream& sbuild::feature::print_features(std::ostream&)’:
+/var/tmp/portage/dev-util/schroot-1.6.10_p7/work/schroot-1.6.10/sbuild/sbuild-feature.cc:48:40: error: ‘gettext’ was not declared in this scope
+   48 |       stream << feature % pos->first % gettext(pos->second.c_str());
+      |                                        ^~~~~~~
+```
+
+Bug: https://bugs.gentoo.org/715514
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/sbuild/sbuild-feature.cc
++++ b/sbuild/sbuild-feature.cc
+@@ -19,6 +19,7 @@
+ #include <config.h>
+ 
+ #include <iostream>
++#include <libintl.h>
+ 
+ #include "sbuild-feature.h"
+ 
diff --git a/dev-util/schroot/schroot-1.6.13_p2.ebuild b/dev-util/schroot/schroot-1.6.13_p2.ebuild
index c1283549302e..33e88c52a9d1 100644
--- a/dev-util/schroot/schroot-1.6.13_p2.ebuild
+++ b/dev-util/schroot/schroot-1.6.13_p2.ebuild
@@ -48,6 +48,10 @@ RDEPEND="${COMMON_DEPEND}
 
 S="${WORKDIR}/re${PN}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.13_p2-build-fixes.patch
+)
+
 src_unpack() {
 	unpack "${P/%_p*}".tar.gz
 	cd "${S}"