commit: 7c2aea1000d2f3c7e4d57ba77c00bb63af686de4 Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Fri Feb 14 21:09:24 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Fri Feb 14 21:09:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c2aea10
app-admin/xstow: drop 1.1.0 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> app-admin/xstow/Manifest | 1 - app-admin/xstow/files/xstow-1.1.0-clang.patch | 37 ------------------- app-admin/xstow/xstow-1.1.0.ebuild | 53 --------------------------- 3 files changed, 91 deletions(-) diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest index 21811777c9b8..e773ffb98d90 100644 --- a/app-admin/xstow/Manifest +++ b/app-admin/xstow/Manifest @@ -1,2 +1 @@ -DIST xstow-1.1.0.tar.bz2 187761 BLAKE2B ed3822e638aedf8900a3baba62a5af9de9d7b98dcdf27ca81a6898353b9f5c7f767ec7d8e68ead4d5ef318af5a6eda2b1cc68a5c80a6a8ad2b9c8adf03ae3377 SHA512 30f2e0be0c2aba668b4cc781fe69ac74c2460cc681c6b47a55ee66af5c0f2ac14dee9fe2e95a288ce06059378407a2b99d2156430a5a6dcbf06def793f579015 DIST xstow-1.1.1.tar.bz2 188334 BLAKE2B 13b079b4c0bdfc68837d3674eb64852d6c8bd341541c927703eed7e302ce36328bc814c618972365b60bd7562a4a2398c6a881a0a42c5778523197e41cfde7df SHA512 86154bd562e1dcb068a2c766a849975a4e6c9c343d89d47f8dd339a03b73aceb2dfb8523e2bc40df3ceb673a1a9f7991737e982c0c1a2cc0bd9fcdf8fd7c3113 diff --git a/app-admin/xstow/files/xstow-1.1.0-clang.patch b/app-admin/xstow/files/xstow-1.1.0-clang.patch deleted file mode 100644 index 0f880b00cb91..000000000000 --- a/app-admin/xstow/files/xstow-1.1.0-clang.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/majorkingleo/xstow/commit/bdcbdb6f6e0f35ed0a0df50f0a9d19441af9c866 - -From: Martin Oberzalek <[email protected]> -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/xstow-1.1.0.ebuild b/app-admin/xstow/xstow-1.1.0.ebuild deleted file mode 100644 index 3f66da863573..000000000000 --- a/app-admin/xstow/xstow-1.1.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Replacement for GNU stow with extensions" -HOMEPAGE="https://xstow.sourceforge.net/"; -SRC_URI="https://downloads.sourceforge.net/xstow/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="ncurses" - -DEPEND="ncurses? ( sys-libs/ncurses:= )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-clang.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 - keepdir /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." -}
