7 files changed, 44 insertions, 148 deletions
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index de84b67bb529..2f92a34ddb06 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1 +1 @@
-DIST xstow-1.0.2.tar.bz2 151622 BLAKE2B 45123c2cb018605c2e47940707384ea1824ddf4f542cfad6a73bfc3559803ca6ec7811252221ad80125e1821cac6d65bcc106b4acf294c4fa453e8043c78cf04 SHA512 319dcd57290fcee9fd66811e64af73ddab8abb11d47c0cb79d3e11f1ecdf18ab9511b3a0690621061d2613193cd4895f3bddb3d741159c23c14d278a8a8bf9dd
+DIST xstow-1.1.0.tar.bz2 187761 BLAKE2B ed3822e638aedf8900a3baba62a5af9de9d7b98dcdf27ca81a6898353b9f5c7f767ec7d8e68ead4d5ef318af5a6eda2b1cc68a5c80a6a8ad2b9c8adf03ae3377 SHA512 30f2e0be0c2aba668b4cc781fe69ac74c2460cc681c6b47a55ee66af5c0f2ac14dee9fe2e95a288ce06059378407a2b99d2156430a5a6dcbf06def793f579015
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
deleted file mode 100644
index 982d6bc5cb12..000000000000
--- a/app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/files/xstow-1.0.1-ncurses.patch b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch
deleted file mode 100644
index b7d29f287e7f..000000000000
--- a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,11 +91,12 @@
- 			AC_MSG_RESULT(disabled)
- 			support_curses=0
- 		else
-+			AC_MSG_RESULT(enabled)
- 			support_curses=1
- 		fi
- 	],
--	[
--		AC_MSG_RESULT(enabled)
-+	[])
-+if test $support_curses -eq 1; then
- 		AC_CHECK_HEADER([curses.h],
- 				[
- 				  # test which libraray to use
-@@ -146,7 +147,7 @@
- 				  fi
- 
- 				  if test $support_curses -eq 1; then
--				  	AC_SUBST(LDFLAGS_DYNAMIC, "$LDFLAGS -l$curseslib $tinfolib")
-+				  	AC_SUBST(LDFLAGS_DYNAMIC, "-l$curseslib $tinfolib")
- 				        AC_DEFINE(HAVE_CURSES_H, 1, [curses library can be used])
- 				  fi
- 
-@@ -154,8 +155,7 @@
- 				[
- 				  support_curses=0
- 				])
--	])
--
-+fi
- 
- NO_STL_SSTREAM=0
- NO_STL_STRSTREAM=0
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -46,7 +46,7 @@
- 	backtrace.h \
- 	backtrace.cpp
- 
--xstow_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
-+xstow_LDADD= $(LDFLAGS_DYNAMIC)
- 
- if ENABLE_MERGE
- 
-@@ -63,7 +63,7 @@
- 			backtrace.h \
- 			backtrace.cpp
- 
--merge_info_LDFLAGS= $(LDFLAGS) $(LDFLAGS_DYNAMIC)
-+merge_info_LDADD= $(LDFLAGS_DYNAMIC)
- 
- endif
- 
diff --git a/app-admin/xstow/files/xstow-1.1.0-clang.patch b/app-admin/xstow/files/xstow-1.1.0-clang.patch
new file mode 100644
index 000000000000..0f880b00cb91
--- /dev/null
+++ b/app-admin/xstow/files/xstow-1.1.0-clang.patch
@@ -0,0 +1,37 @@
+https://github.com/majorkingleo/xstow/commit/bdcbdb6f6e0f35ed0a0df50f0a9d19441af9c866
+
+From: Martin Oberzalek <kingleo@gmx.at>
+Date: Wed, 27 Jul 2022 09:25:03 +0200
+Subject: [PATCH] Fixed compilation with clang
+
+--- a/src/cpputils/cpputilsshared/cpputilsformat/format2.h
++++ b/src/cpputils/cpputilsshared/cpputilsformat/format2.h
+@@ -40,7 +40,7 @@ namespace Tools {
+       bool _is_string;
+ 
+     public:
+-      BaseArg( bool is_int_, bool is_string_ )
++      BaseArg( bool is_int_ = false, bool is_string_ = false )
+     : _is_int( is_int_ ),
+       _is_string( is_string_ )
+     {}
+--- a/src/cpputils/cpputilsshared/leoini.h
++++ b/src/cpputils/cpputilsshared/leoini.h
+@@ -278,12 +278,11 @@ namespace Leo
+     std::string::size_type end = s.find( ']', start );
+ 
+     if( start == std::string::npos ||
+-	end == std::string::npos )
+-      s = "";
+-    else
+-      s = s.substr( start+1, start-end -1 );
+-
+-    return s2x<A>(s);
++		end == std::string::npos ) {
++      return s2x<A>("");
++    } else {
++      return s2x<A>( s.substr( start+1, start-end -1 ) );
++	}  
+   }
+ } // namespace Leo
+ 
diff --git a/app-admin/xstow/metadata.xml b/app-admin/xstow/metadata.xml
index 8915e8ac0ac4..22daf571c552 100644
--- a/app-admin/xstow/metadata.xml
+++ b/app-admin/xstow/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<remote-id type="github">majorkingleo/xstow</remote-id>
 		<remote-id type="sourceforge">xstow</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/xstow/xstow-1.0.2.ebuild b/app-admin/xstow/xstow-1.0.2.ebuild
deleted file mode 100644
index 879bda8dfbaa..000000000000
--- a/app-admin/xstow/xstow-1.0.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Replacement for GNU stow with extensions"
-HOMEPAGE="http://xstow.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ncurses"
-
-DEPEND="ncurses? ( sys-libs/ncurses:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.1-ncurses.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ncurses curses)
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	# create new STOWDIR
-	dodir /var/lib/xstow
-
-	# install env.d file to add STOWDIR to PATH and LDPATH
-	doenvd "${FILESDIR}/99xstow"
-}
-
-pkg_postinst() {
-	elog "We now recommend that you use /var/lib/xstow as your STOWDIR"
-	elog "instead of /usr/local in order to avoid conflicts with the"
-	elog "symlink from /usr/lib64 -> /usr/lib.  See Bug 246264"
-	elog "(regarding app-admin/stow, equally applicable to XStow) for"
-	elog "more details on this change."
-	elog "For your convenience, PATH has been updated to include"
-	elog "/var/lib/bin."
-}
diff --git a/app-admin/xstow/xstow-1.0.2-r1.ebuild b/app-admin/xstow/xstow-1.1.0.ebuild
index 85b4c928574f..827b9a734e87 100644
--- a/app-admin/xstow/xstow-1.0.2-r1.ebuild
+++ b/app-admin/xstow/xstow-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,20 +6,19 @@ EAPI=8
 inherit autotools
 
 DESCRIPTION="Replacement for GNU stow with extensions"
-HOMEPAGE="http://xstow.sourceforge.net/"
+HOMEPAGE="https://xstow.sourceforge.net/"
 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= )"
+DEPEND="ncurses? ( sys-libs/ncurses:= )"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.1-ncurses.patch
-	"${FILESDIR}"/${PN}-1.0.1-gcc12-clang.patch
+	"${FILESDIR}"/${P}-clang.patch
 )
 
 src_prepare() {