gentoo resync : 28.04.2021

4 files changed, 75 insertions, 10 deletions

diff --git a/app-admin/xstow/Manifest b/app-admin/xstow/Manifest
index 3e589f8f01b6..e6e75d472de4 100644
--- a/app-admin/xstow/Manifest
+++ b/app-admin/xstow/Manifest
@@ -1,5 +1,7 @@
 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 1210 BLAKE2B e05705c7ca16a1f3767ea0b7520262142ccbd3ba07f880ad92b587f58d065a0c0f96b248799d92f792c30349cf37893e3bd398f5ebbb9c17e81cf925f0279d1b SHA512 c33be296f15d73fc57622ef8cd41ac6984a36ab07932ca84eeed71535add7e1125752f8f324262c02fc06ee1c0963744360d66451f273b27dbeb997b6a05dc98
-MISC metadata.xml 242 BLAKE2B 7633663d830cf12f60d6d815b59e4eacf16e97efcbd7c29001a0e9251a016f13d46de474241f71ec8eb4421d5bdc5ed822437096654af920f1774f394ebec4a0 SHA512 5e943dac60c778c120973997f72f2b3ab35e49eb4e61d64b821a8370cffb1e0b628cc09f9855a569813074facb568a0821d1ed4108f9f24b0f23c14a64178d48
+DIST xstow-1.0.2.tar.bz2 151622 BLAKE2B 45123c2cb018605c2e47940707384ea1824ddf4f542cfad6a73bfc3559803ca6ec7811252221ad80125e1821cac6d65bcc106b4acf294c4fa453e8043c78cf04 SHA512 319dcd57290fcee9fd66811e64af73ddab8abb11d47c0cb79d3e11f1ecdf18ab9511b3a0690621061d2613193cd4895f3bddb3d741159c23c14d278a8a8bf9dd
+EBUILD xstow-1.0.1.ebuild 1227 BLAKE2B 28a7252478623b3d12ae239972643643423f4c44e0a466262f06a0c3b011004959f96c8f0a2f1c54ae7811d44a15dcd139e08016e02b3213ddcefd5802ba403e SHA512 5109811f174a1e69716bb63e71ebc1c72b983de8e0a5eb9c8df4ddfd097d478b63edff3bb9dcfb30dc4f5b0502b547330acb53ddc723d149c0f874d8c9671669
+EBUILD xstow-1.0.2.ebuild 1235 BLAKE2B b50a9841c9c3485d4ab076c93c35602be2a84f6ea6042e11d39fb6dada8cd8761b44918b0700e98d04ca18893f31b99dfa04795e65fe98a9585aaaf5ed54cadd SHA512 d893d068cee08a3be9d1004a613d1f9ee0e131b1bd0836404e5292eecf650cb894927f77df858d3328cf26cc0161b49fb7e7f669e6573b917474ef7c9d42fc54
+MISC metadata.xml 468 BLAKE2B dbffbce7fc3ace2b27959dfe75a6924af492b4b6739fe0b39081529643f911f610783833cf96fb66ed1e0c68f34d0697d3bbc86225851d405cc5fae09eb5be98 SHA512 a9b1c0484d66da413fa2739fdefb7d04d31cb76335c50588cbf4705ef44fd46eab313da0eddbebf01227ea5d5dec23262890106c17a08b44a5f5df47a9f05459
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.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild
index 8bc68e8c4517..5625fbef7050 100644
--- a/app-admin/xstow/xstow-1.0.1.ebuild
+++ b/app-admin/xstow/xstow-1.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
-DESCRIPTION="replacement for GNU stow with extensions"
+DESCRIPTION="Replacement for GNU stow with extensions"
 HOMEPAGE="http://xstow.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xstow/${P}.tar.bz2"
 
@@ -17,8 +17,12 @@ IUSE="ncurses"
 DEPEND="ncurses? ( sys-libs/ncurses:0= )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-ncurses.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-ncurses.patch
+	default
 	eautoreconf
 }
 
@@ -27,11 +31,11 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" 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
+	keepdir /var/lib/xstow
 
 	# install env.d file to add STOWDIR to PATH and LDPATH
 	doenvd "${FILESDIR}/99xstow"
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..30abbbbc0dd2
--- /dev/null
+++ b/app-admin/xstow/xstow-1.0.2.ebuild
@@ -0,0 +1,52 @@
+# 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."
+}