gentoo resync : 20.03.2021

4 files changed, 88 insertions, 1 deletions

diff --git a/app-shells/pdsh/Manifest b/app-shells/pdsh/Manifest
index e79339e7a8eb..ad6c602c29fc 100644
--- a/app-shells/pdsh/Manifest
+++ b/app-shells/pdsh/Manifest
@@ -1,3 +1,6 @@
+AUX pdsh-2.34-slibtool.patch 804 BLAKE2B 8a6f03999b8683f7ac92f1e097b5e5fda829037df91f216c77294d9b02e7aae6f8d5da01a8c12b9f4b7547574f77b21d8a34f1bbcf51735819fd9ddd29744a77 SHA512 968570e1cb5a68d92579b359c350c01c5c7c2dc8072b4aff98c9c5e3442a5fcd517f999ebc0a8fbe8342b04a001239a2882104daf06734eca98af1b98dfa0c53
 DIST pdsh-2.26.tar.bz2 490732 BLAKE2B 809a7ee0a1026e0cdaea8bf97c046a3a6e2994199dbbdb2cebe56de0393e8422a07e86f1ff60d6e750bf7279ccb43c03ea3aa4529b6fa6a34e3d77d90f0c3597 SHA512 3f15b3bb4fc2cff27a3b5d68de3e6cb74bb4001288a787763358a0641d0cc77c840b2c6641213ef31bc9d9d69cfe9531b25d7a9375630a5b008b1bcffbe95c0a
+DIST pdsh-2.34.tar.gz 215708 BLAKE2B dba626c66b9a17536fc02d8482b776d539ee680354326c821dc916735d1fc115226fcf22868407830245067cf45ddf9c997cd8c382b0dde0168d9ed6cb4fcc4d SHA512 2d4e090d97f6bad97ee1dbdf2ee29e4d9603edfd5c92a6935131ef7f7bbff797cceb8ad3a72e3d5995d3d5302eac985d129f4968e3fa6744785a3df2d0fda33c
 EBUILD pdsh-2.26-r1.ebuild 1311 BLAKE2B c6267cef6c7ec26205ba3994002b84f9171a28d37f2baacf373ed65f3379d258b8689081c5387e111a3713b92ea60e7faad59d5014f41c1edcd462adc5074748 SHA512 308235f52db4448a3f5d541c6c11c9542e9add603672ced12280e1583382c7eeb71967ea66aee053dab6f35fa710182035727ebf14397ed5d240845d7702b03a
-MISC metadata.xml 1204 BLAKE2B db664f8622eaf0976ab1899583abab0268758d2edcdf0dd038ef59f54f1cf86c30956aa9cac35fa1a28a6760196050da01cfdbfcb56742aa233075aaa77a4eed SHA512 abaa972d578e11c47d16497fecbf7d72a07915b0b57c7f6458f82b0a36b55575b2d94a43f6f6a71a925a0e4ed56346056f9bc1d939a4190f2c899fcf58c9c752
+EBUILD pdsh-2.34.ebuild 1401 BLAKE2B 8acd3731a7be77a52a0321344b5c1d5113e162dd9a4664f468aa4d55cf70b41f93690712416517e1786b86bc9980206fad148e4de32eeb00015e21d594d021de SHA512 562aae7cc58c799b888388937ee897c6cacf7a6587175b9ec124d1acc0a00e17124b21fa272e6e6b99e8dae1367df466368844ca1bc5c57da69603959cf522ae
+MISC metadata.xml 1254 BLAKE2B 442ec3c5c42dfc29b8cd3d8442b689795002f4743f3ccb3e3effa5312d88f394ea01ff213ca139f600339f7c1a23f59b4b5a07edc616fee90ee545041ef1ab98 SHA512 7d2704ab95da12f97aa683762afe80031e37d95940861aab5a920fb7d576677b246382c20bb9a4838b8da053689479e2661bda318bce8c0511b3c765c494e136
diff --git a/app-shells/pdsh/files/pdsh-2.34-slibtool.patch b/app-shells/pdsh/files/pdsh-2.34-slibtool.patch
new file mode 100644
index 000000000000..1be0485b9c6a
--- /dev/null
+++ b/app-shells/pdsh/files/pdsh-2.34-slibtool.patch
@@ -0,0 +1,20 @@
+https://github.com/chaos/pdsh/pull/130
+https://bugs.gentoo.org/775593
+From 258de95760a46c6d4c84e904823425aa1a180211 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 16 Mar 2021 13:25:52 -0700
+Subject: [PATCH] build: Use LDADD instead of LDFLAGS for libcommon.la.
+--- a/src/pdsh/Makefile.am
++++ b/src/pdsh/Makefile.am
+@@ -16,9 +16,9 @@ else
+ MODULE_FLAGS =             -export-dynamic $(AIX_PDSH_LDFLAGS) -ldl
+ endif
+ 
+-pdsh_LDADD =               $(READLINE_LIBS)
+-pdsh_LDFLAGS =             $(MODULE_LIBS) $(MODULE_FLAGS) \
++pdsh_LDADD =               $(READLINE_LIBS) \
+                            $(top_builddir)/src/common/libcommon.la
++pdsh_LDFLAGS =             $(MODULE_LIBS) $(MODULE_FLAGS)
+ 
+ pdsh_inst_LDADD =          $(pdsh_LDADD)
+ pdsh_inst_LDFLAGS =        $(pdsh_LDFLAGS)
diff --git a/app-shells/pdsh/metadata.xml b/app-shells/pdsh/metadata.xml
index 2c51800069f5..46fe03a5e32b 100644
--- a/app-shells/pdsh/metadata.xml
+++ b/app-shells/pdsh/metadata.xml
@@ -24,6 +24,7 @@
 		</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">chaos/pdsh</remote-id>
 		<remote-id type="sourceforge">pdsh</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-shells/pdsh/pdsh-2.34.ebuild b/app-shells/pdsh/pdsh-2.34.ebuild
new file mode 100644
index 000000000000..6fd3cd631503
--- /dev/null
+++ b/app-shells/pdsh/pdsh-2.34.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A high-performance, parallel remote shell utility"
+HOMEPAGE="https://github.com/chaos/pdsh"
+SRC_URI="https://github.com/chaos/pdsh/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt readline rsh test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	crypt? ( net-misc/openssh )
+	rsh? ( net-misc/netkit-rsh )
+	readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-util/dejagnu )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.34-slibtool.patch"
+)
+
+pkg_setup() {
+	PDSH_MODULE_LIST="${PDSH_MODULE_LIST:-netgroup}"
+	MODULE_CONFIG=""
+
+	local m
+	local valid_modules=":xcpu:ssh:exec:qshell:genders:nodeupdown:mrsh:mqshell:dshgroups:netgroup:"
+
+	for m in ${PDSH_MODULE_LIST}; do
+		if [[ "${valid_modules}" == *:${m}:* ]]; then
+			MODULE_CONFIG="${MODULE_CONFIG} --with-${m}"
+		fi
+	done
+
+	elog "Building ${PF} with the following modules:"
+	elog "  ${PDSH_MODULE_LIST}"
+	elog "This list can be changed in /etc/portage/make.conf by setting"
+	elog "PDSH_MODULE_LIST=\"module1 module2...\""
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf ${MODULE_CONFIG} \
+		--with-machines \
+		--enable-shared \
+		--disable-static \
+		$(use_with crypt ssh) \
+		$(use_with rsh) \
+		$(use_with readline)
+}