* [gentoo-commits] repo/gentoo:master commit in: app-admin/xstow/, app-admin/xstow/files/
@ 2021-04-05 15:08 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-04-05 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 8009b39933d27c43cea5b19c1ab2ebd3ced933d3
Author: Martin Oberzalek <kingleo <AT> gmx <DOT> at>
AuthorDate: Sun Apr 4 19:31:38 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 5 15:04:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8009b399
app-admin/xstow: Bumped to version xstow-1.0.2
update to EAP7, fixes EPREFIX glitches
Assigned Martin Oberzalek as proxy maintainer
Signed-off-by: Martin Oberzalek <kingleo <AT> gmx.at>
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/20255
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-admin/xstow/Manifest | 1 +
app-admin/xstow/files/xstow-1.0.2-ncurses.patch | 56 +++++++++++++++++++++++++
app-admin/xstow/metadata.xml | 9 +++-
app-admin/xstow/xstow-1.0.2.ebuild | 53 +++++++++++++++++++++++
4 files changed, 118 insertions(+), 1 deletion(-)
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index 011dff6a502..ddfc7e5609f 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1 +1,2 @@
DIST xstow-1.0.1.tar.bz2 153530 BLAKE2B ad5d2677725f2254bb87a4cf8f73e8158868a206f41e9a2ee7bb2547ae6e8634ab65f58655a04051425e5818071253672ccf96b8ddccd01026e992d085e0c1c5 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b
+DIST xstow-1.0.2.tar.bz2 151622 BLAKE2B 45123c2cb018605c2e47940707384ea1824ddf4f542cfad6a73bfc3559803ca6ec7811252221ad80125e1821cac6d65bcc106b4acf294c4fa453e8043c78cf04 SHA512 319dcd57290fcee9fd66811e64af73ddab8abb11d47c0cb79d3e11f1ecdf18ab9511b3a0690621061d2613193cd4895f3bddb3d741159c23c14d278a8a8bf9dd
diff --git a/app-admin/xstow/files/xstow-1.0.2-ncurses.patch b/app-admin/xstow/files/xstow-1.0.2-ncurses.patch
new file mode 100644
index 00000000000..b7d29f287e7
--- /dev/null
+++ b/app-admin/xstow/files/xstow-1.0.2-ncurses.patch
@@ -0,0 +1,56 @@
+--- 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/metadata.xml b/app-admin/xstow/metadata.xml
index 96081f5fce1..4d31fca9f3f 100644
--- a/app-admin/xstow/metadata.xml
+++ b/app-admin/xstow/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person" proxied="yes">
+ <email>kingleo@gmx.at</email>
+ <name>Martin Oberzalek</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">xstow</remote-id>
</upstream>
diff --git a/app-admin/xstow/xstow-1.0.2.ebuild b/app-admin/xstow/xstow-1.0.2.ebuild
new file mode 100644
index 00000000000..3e326516724
--- /dev/null
+++ b/app-admin/xstow/xstow-1.0.2.ebuild
@@ -0,0 +1,53 @@
+# 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}"/${P}-ncurses.patch
+)
+
+src_prepare() {
+ eautoreconf
+ default
+}
+
+src_configure() {
+ econf $(use_with ncurses curses)
+ default
+}
+
+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."
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/xstow/, app-admin/xstow/files/
@ 2022-05-07 4:20 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-05-07 4:20 UTC (permalink / raw
To: gentoo-commits
commit: 84a47e6543c593e187987df9fc7dd5fa09be8b35
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 04:19:32 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 7 04:19:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a47e65
app-admin/xstow: update EAPI 7 -> 8; fix build with GCC 12 and Clang
Also dodir -> keepdir, hence revbump.
Closes: https://bugs.gentoo.org/729114
Closes: https://bugs.gentoo.org/840359
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../xstow/files/xstow-1.0.1-gcc12-clang.patch | 33 +++++++++++++
app-admin/xstow/xstow-1.0.2-r1.ebuild | 54 ++++++++++++++++++++++
2 files changed, 87 insertions(+)
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.2-r1.ebuild b/app-admin/xstow/xstow-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..85b4c928574f
--- /dev/null
+++ b/app-admin/xstow/xstow-1.0.2-r1.ebuild
@@ -0,0 +1,54 @@
+# 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."
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/xstow/, app-admin/xstow/files/
@ 2025-02-14 22:02 Petr Vaněk
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vaněk @ 2025-02-14 22:02 UTC (permalink / raw
To: gentoo-commits
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 <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/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."
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-14 22:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-07 4:20 [gentoo-commits] repo/gentoo:master commit in: app-admin/xstow/, app-admin/xstow/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-02-14 22:02 Petr Vaněk
2021-04-05 15:08 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox