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@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@gentoo.org>

4 files changed, 118 insertions, 1 deletions

diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index 011dff6a5025..ddfc7e5609fd 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 000000000000..b7d29f287e7f
--- /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 96081f5fce16..4d31fca9f3f5 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 000000000000..3e3265167241
--- /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."
+}