summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-12-21 21:50:17 +0000
committerSam James <sam@gentoo.org>2022-12-21 22:25:15 +0000
commit39af75bc0c837317eee3ce6edf360e4560fcc992 (patch)
tree29a671a2769e916a99611d409b57b15452c9ea2d /app-admin/xstow
parentapp-arch/arc: drop 5.21p (diff)
downloadgentoo-39af75bc0c837317eee3ce6edf360e4560fcc992.tar.gz
gentoo-39af75bc0c837317eee3ce6edf360e4560fcc992.tar.bz2
gentoo-39af75bc0c837317eee3ce6edf360e4560fcc992.zip
app-admin/xstow: drop 1.0.2, 1.0.2-r1
Bug: https://bugs.gentoo.org/886655 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-admin/xstow')
-rw-r--r--app-admin/xstow/Manifest1
-rw-r--r--app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch33
-rw-r--r--app-admin/xstow/files/xstow-1.0.1-ncurses.patch56
-rw-r--r--app-admin/xstow/xstow-1.0.2-r1.ebuild54
-rw-r--r--app-admin/xstow/xstow-1.0.2.ebuild52
5 files changed, 0 insertions, 196 deletions
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index de4aba8d61de..2f92a34ddb06 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1,2 +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/xstow-1.0.2-r1.ebuild b/app-admin/xstow/xstow-1.0.2-r1.ebuild
deleted file mode 100644
index 85b4c928574f..000000000000
--- a/app-admin/xstow/xstow-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 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="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
- "${FILESDIR}"/${PN}-1.0.1-gcc12-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."
-}
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."
-}