gentoo resync : 12.05.2022

3 files changed, 44 insertions, 9 deletions

diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index f6ddd9d15328..c9ca92b40c6d 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1,7 +1,7 @@
 AUX 99xstow 65 BLAKE2B c3d3dae69e0ed5251a996ddfb164795718974e1c2464176e680373fab25ceeb8a22392ac8de0dd489462e28bc48512c151f3f438ddc7f9bd093d5c63b46ba29b SHA512 0ade954fc07ba98be74d79e8ce842fc4e3e12f83d59f76eb78810251cc9e1612d963401be99f38002d94a2a32c9c2a32429f73d7ee69e97c12f6a05db14a3476
+AUX xstow-1.0.1-gcc12-clang.patch 1016 BLAKE2B e14b1e6af041fa6c4f0bde9466a7cbba0def66e064cf05eb015643f83395b14e12e9556ae945f3cf4d4e1d08df43b8d334b30bef10f1f3b938d27e54f3fe1114 SHA512 e5861676c5093219048cba1d63c62d3e2c1768553277aba17fad472799c312d9deb54a9864174e30dbb3a72eb923970dcc0dc150b96977da187ced8e8628888a
 AUX xstow-1.0.1-ncurses.patch 1070 BLAKE2B 58782b144bf997d88e1480f7743afb8d6dc2e814a4a412bb0d0ebf8cc83ae0d1aab5605228e7a6228e0aec6b8fca83104249e80e7f2406aafe2f9ab8408cf6eb SHA512 63fce626ad5b376a5aa2d335fdd4d73ce3a1b7fccc5a6ff5ab92182d6f3ca40417926b9d35f3447ed73f386d3022d6dc81ec39a2f790fea46b681d344fdad389
-DIST xstow-1.0.1.tar.bz2 153530 BLAKE2B ad5d2677725f2254bb87a4cf8f73e8158868a206f41e9a2ee7bb2547ae6e8634ab65f58655a04051425e5818071253672ccf96b8ddccd01026e992d085e0c1c5 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b
 DIST xstow-1.0.2.tar.bz2 151622 BLAKE2B 45123c2cb018605c2e47940707384ea1824ddf4f542cfad6a73bfc3559803ca6ec7811252221ad80125e1821cac6d65bcc106b4acf294c4fa453e8043c78cf04 SHA512 319dcd57290fcee9fd66811e64af73ddab8abb11d47c0cb79d3e11f1ecdf18ab9511b3a0690621061d2613193cd4895f3bddb3d741159c23c14d278a8a8bf9dd
-EBUILD xstow-1.0.1.ebuild 1227 BLAKE2B 28a7252478623b3d12ae239972643643423f4c44e0a466262f06a0c3b011004959f96c8f0a2f1c54ae7811d44a15dcd139e08016e02b3213ddcefd5802ba403e SHA512 5109811f174a1e69716bb63e71ebc1c72b983de8e0a5eb9c8df4ddfd097d478b63edff3bb9dcfb30dc4f5b0502b547330acb53ddc723d149c0f874d8c9671669
+EBUILD xstow-1.0.2-r1.ebuild 1283 BLAKE2B d808e405f774c50dd5939076c87fc8827267dc4933e76088bc3b136d2017045c77cf1d26eabd043a02038240d0164ac533634581ea7ece0766f43fd7a07268f9 SHA512 ed6510d9b59242f42694989461807a70035098b572be64aff02f2cffc214a154b31036c65473a1e5675e5ead49b6d822e39998d6e277d6a35d42a776dbc63c33
 EBUILD xstow-1.0.2.ebuild 1232 BLAKE2B b4c313abba4222528ce1f7f92c3a75386ff82344089399706516b0820298a0c96e65296dbb1b72625cc782afb3c88bb5447ec4e2e15f2636a2d9aee7fcc41129 SHA512 cf5b480a23372a207f9c779c1de2c766b1adce38446e1ab8d7dd9d58eabeb55162a4d63abda6ad4e5234b3cc6d9155696171b0c8dceec77e296c268d2b24aafc
 MISC metadata.xml 243 BLAKE2B a06cbed4fff7b21d4f77f230217c539a20af83bd7e33bf636528a509eaef9becdcf3057d475ddcce21ec4ff77e8b0b342dc542ea000e4030100f9a01f74beedf SHA512 5fde535be5478318f25eee6c74260f2bbb525fd1e9dea4e5bb2a0ef079e4f07d66bdd3de5bd6ddf2608f9d82b6c29f6bdfe3ac62a5d9d0c9539f661dc084f1ad
diff --git a/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch b/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch
new file mode 100644
index 000000000000..982d6bc5cb12
--- /dev/null
+++ b/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch
@@ -0,0 +1,33 @@
+https://svnweb.freebsd.org/ports/head/sysutils/xstow/files/patch-src__string_utils.h?revision=319588&view=co&pathrev=319588
+https://svnweb.freebsd.org/ports/head/sysutils/xstow/files/patch-src__leoini.h?revision=319588&view=co&pathrev=319588
+https://bugs.gentoo.org/840359
+https://bugs.gentoo.org/729114
+
+--- a/src/leoini.h
++++ b/src/leoini.h
+@@ -260,11 +260,9 @@
+ 
+     if( start == std::string::npos ||
+ 	end == std::string::npos )
+-      s = "";
+-    else
+-      s = s.substr( start+1, start-end -1 );
++      return s2x<A>("");
+ 
+-    return s2x<A>(s);
++    return s2x<A>(s.substr( start+1, start-end -1 ));
+   }
+ } // namespace Leo
+ 
+--- a/src/string_utils.h
++++ b/src/string_utils.h
+@@ -28,6 +28,9 @@
+ #  define STRSTREAM
+ #endif  
+ 
++typedef std::vector<std::string> vec_string;
++std::ostream& operator<<( std::ostream& out, const vec_string &v );
++
+ std::string toupper( std::string s );
+ std::string strip( const std::string& str, const std::string& what = " \t\n\0" );
+ bool is_int( const std::string &s );
diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.2-r1.ebuild
index 5625fbef7050..85b4c928574f 100644
--- a/app-admin/xstow/xstow-1.0.1.ebuild
+++ b/app-admin/xstow/xstow-1.0.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -11,18 +11,20 @@ SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ncurses"
 
 DEPEND="ncurses? ( sys-libs/ncurses:0= )"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-ncurses.patch
+	"${FILESDIR}"/${PN}-1.0.1-ncurses.patch
+	"${FILESDIR}"/${PN}-1.0.1-gcc12-clang.patch
 )
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
@@ -34,11 +36,11 @@ src_install() {
 	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
 	dodoc AUTHORS ChangeLog NEWS README TODO
 
-	# create new STOWDIR
+	# Create new STOWDIR
 	keepdir /var/lib/xstow
 
-	# install env.d file to add STOWDIR to PATH and LDPATH
-	doenvd "${FILESDIR}/99xstow"
+	# Install env.d file to add STOWDIR to PATH and LDPATH
+	doenvd "${FILESDIR}"/99xstow
 }
 
 pkg_postinst() {