gentoo resync : 14.07.2018

5 files changed, 132 insertions, 0 deletions

diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
new file mode 100644
index 000000000000..54dce9a69741
--- /dev/null
+++ b/app-admin/xstow/Manifest
@@ -0,0 +1,5 @@
+AUX 99xstow 65 BLAKE2B c3d3dae69e0ed5251a996ddfb164795718974e1c2464176e680373fab25ceeb8a22392ac8de0dd489462e28bc48512c151f3f438ddc7f9bd093d5c63b46ba29b SHA512 0ade954fc07ba98be74d79e8ce842fc4e3e12f83d59f76eb78810251cc9e1612d963401be99f38002d94a2a32c9c2a32429f73d7ee69e97c12f6a05db14a3476
+AUX xstow-1.0.1-ncurses.patch 1070 BLAKE2B 58782b144bf997d88e1480f7743afb8d6dc2e814a4a412bb0d0ebf8cc83ae0d1aab5605228e7a6228e0aec6b8fca83104249e80e7f2406aafe2f9ab8408cf6eb SHA512 63fce626ad5b376a5aa2d335fdd4d73ce3a1b7fccc5a6ff5ab92182d6f3ca40417926b9d35f3447ed73f386d3022d6dc81ec39a2f790fea46b681d344fdad389
+DIST xstow-1.0.1.tar.bz2 153530 BLAKE2B ad5d2677725f2254bb87a4cf8f73e8158868a206f41e9a2ee7bb2547ae6e8634ab65f58655a04051425e5818071253672ccf96b8ddccd01026e992d085e0c1c5 SHA512 bb4bb0e9d8fbfe3933c2137cd2258e3246ebfba549aec669a7f324e82af0eea4ab7ca38e68d7102c1417c1566029318749139fa91efd7a904b8f742d426a3d4b
+EBUILD xstow-1.0.1.ebuild 1233 BLAKE2B 4e9f6f5dc62d3865a724f13038865faa05567d0677fecae352d001427b8e67ddcf2aa52e7090d46ef7c1c406373240cc9df1c55872d3199f467fbbe1db336c3d SHA512 8fcfc7e9bf0d041bc868a949f96483188dbe0a9070028466d948e6432f249764571c564789ee0476d9e4eb0882efaffcda1753a313ce9c7659d37c3f2d7811f1
+MISC metadata.xml 643 BLAKE2B e6df59691a659e8790b1deadc96f89e8d6e913f76d44ad3c2613060706264cc8733db8f7dde018da313d177ce997eb3c5bcb7ce9afdf2bc40022300e1371be19 SHA512 4c060ddc762544f9f635d8cd4543694ff685caa0994995d0551d2b6f9d0c2f52566007d8bd3ca5ed6e7f8d83528c2983eccd2e5923591c010e00ddeab6909840
diff --git a/app-admin/xstow/files/99xstow b/app-admin/xstow/files/99xstow
new file mode 100644
index 000000000000..07625f392537
--- /dev/null
+++ b/app-admin/xstow/files/99xstow
@@ -0,0 +1,3 @@
+LDPATH=/var/lib/lib
+PATH=/var/lib/bin
+MANPATH=/var/lib/share/man
diff --git a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch
new file mode 100644
index 000000000000..b7d29f287e7f
--- /dev/null
+++ b/app-admin/xstow/files/xstow-1.0.1-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
new file mode 100644
index 000000000000..b3d90cf176bd
--- /dev/null
+++ b/app-admin/xstow/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ewfalor@gmail.com</email>
+		<name>Erik Falor</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>A program that manages the installation of software packages.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xstow</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild
new file mode 100644
index 000000000000..de7357598a6c
--- /dev/null
+++ b/app-admin/xstow/xstow-1.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+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}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ncurses.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with ncurses curses)
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/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" || die "doenvd failed"
+}
+
+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."
+}