diff options
Diffstat (limited to 'app-admin/xstow')
-rw-r--r-- | app-admin/xstow/Manifest | 5 | ||||
-rw-r--r-- | app-admin/xstow/files/xstow-1.0.1-gcc12-clang.patch | 33 | ||||
-rw-r--r-- | app-admin/xstow/files/xstow-1.0.1-ncurses.patch | 56 | ||||
-rw-r--r-- | app-admin/xstow/xstow-1.0.2-r1.ebuild | 54 | ||||
-rw-r--r-- | app-admin/xstow/xstow-1.0.2.ebuild | 52 |
5 files changed, 0 insertions, 200 deletions
diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest index 94e406ec46e5..78aa89a48d54 100644 --- a/app-admin/xstow/Manifest +++ b/app-admin/xstow/Manifest @@ -1,10 +1,5 @@ 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 AUX xstow-1.1.0-clang.patch 1092 BLAKE2B b00444730f525ce39c2692e7f1ab120b40d1e671d88c1c4f9b2b85f0c97ef34a89f12ba47c8eabd53464d05e5e3a94f28f84c3ce277072a983c34e188f149edd SHA512 804df13381f1d0f365303547c1b8e8b5fa2dd06e357596bd65ba349fe6b63e906491e78a19a6bf9190e7e8a81ae26b77a66f0f5290ff5b640f91024eca136537 -DIST xstow-1.0.2.tar.bz2 151622 BLAKE2B 45123c2cb018605c2e47940707384ea1824ddf4f542cfad6a73bfc3559803ca6ec7811252221ad80125e1821cac6d65bcc106b4acf294c4fa453e8043c78cf04 SHA512 319dcd57290fcee9fd66811e64af73ddab8abb11d47c0cb79d3e11f1ecdf18ab9511b3a0690621061d2613193cd4895f3bddb3d741159c23c14d278a8a8bf9dd DIST xstow-1.1.0.tar.bz2 187761 BLAKE2B ed3822e638aedf8900a3baba62a5af9de9d7b98dcdf27ca81a6898353b9f5c7f767ec7d8e68ead4d5ef318af5a6eda2b1cc68a5c80a6a8ad2b9c8adf03ae3377 SHA512 30f2e0be0c2aba668b4cc781fe69ac74c2460cc681c6b47a55ee66af5c0f2ac14dee9fe2e95a288ce06059378407a2b99d2156430a5a6dcbf06def793f579015 -EBUILD xstow-1.0.2-r1.ebuild 1283 BLAKE2B d808e405f774c50dd5939076c87fc8827267dc4933e76088bc3b136d2017045c77cf1d26eabd043a02038240d0164ac533634581ea7ece0766f43fd7a07268f9 SHA512 ed6510d9b59242f42694989461807a70035098b572be64aff02f2cffc214a154b31036c65473a1e5675e5ead49b6d822e39998d6e277d6a35d42a776dbc63c33 -EBUILD xstow-1.0.2.ebuild 1232 BLAKE2B b4c313abba4222528ce1f7f92c3a75386ff82344089399706516b0820298a0c96e65296dbb1b72625cc782afb3c88bb5447ec4e2e15f2636a2d9aee7fcc41129 SHA512 cf5b480a23372a207f9c779c1de2c766b1adce38446e1ab8d7dd9d58eabeb55162a4d63abda6ad4e5234b3cc6d9155696171b0c8dceec77e296c268d2b24aafc EBUILD xstow-1.1.0.ebuild 1225 BLAKE2B 7f58c2726265412a7544d99388a9ebb36d990045cca4fa52078005837b2a51369bd3bf132bc045c11ccd4f61e9d90a187e844095b8fd16fcf320949a04b3b98d SHA512 6ce9e4287bd20c77731e30206ecec2d2d740fdcbac36082f10174d43f99d6ce4a0a72c0ef3be165432e661421a0f7a80b7ec456427544e3401a4dca474279100 MISC metadata.xml 301 BLAKE2B aace14f4b6ef5f8874f165c8bf5f6c3df1c8a259a54f48cf8805a62baa9530bdeea7dbe85a9c445151fdac6a53674f1967bf960ef0c9b26e4ccc8923d89cef55 SHA512 dafc481314893bacf1024daa509819b09d99f7f7c2bbb0613ac092cc0e14eb61ec708ba1a6d5b3d48774855707481745d0da462b94a973dd88a22ec64cc667de 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." -} |