gentoo auto-resync : 14:07:2022 - 13:40:00

3 files changed, 86 insertions, 2 deletions

diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index f53526809625..2ac22cea6184 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,3 +1,4 @@
+AUX parallel-20220622-makefile-completions-deux.patch 3722 BLAKE2B d5a83709b81f11695b6072c24764626308204cee5f1553a54ad5bf71c1231f3e1725aff7a8717466cd9a8798adec95fdab80aa37570f88458b3cf9d878b4b889 SHA512 cda33f64670dd50d05ad92b5b102478a8e8242a7a7a8a847c786ee31d1d8c634da5f59918de9490155215fe3f9487a06c010df6e59b7b540ac4f51a59160232c
 AUX parallel-20220622-makefile-completions.patch 1294 BLAKE2B a2cbf5479649d6413aad9e014621efc2d46cbdb4b9c2a18dc2d865e28c2e697653ea9ed5149041d368a79532f7923c7902bfb72fabf303aa4c41af77db1d6703 SHA512 ab3b39d71ca13a603e4684920d5127d8f35aa280e7e4a2c7e86738932100e7669e888c9a5ac63baa5caa3d7be8065cf7032465d088614245799fddd7c12e6713
 DIST parallel-20220422.tar.bz2 2367837 BLAKE2B 5630c58a15cc6ce0dac0346188afa9916b18545a9da91854f3cae604fc3c2ced33fd3a5f17a2967693a2e28cbddb198a3e63372125721a8dc67af80cbf03e940 SHA512 b4179c5ad936ed01753d91d75a012d6985dd8fb24f1e0d06fa7806352bfc59aeeedd42b15fd31b8294d25671aa474f885362c887875e79b32b613bfe1f9a262e
 DIST parallel-20220422.tar.bz2.sig 2080 BLAKE2B ae87bf4bee2cdd6952e30bb2b65498ca3f4d51452ff8736ac4c8cfbc9bf940eebad48c0c08d474d02d269eb459cb62441067b0c6f6ad69f8beedad40710637a3 SHA512 a8d023d856722fb7528fa67ff1615643e9bf3036c903665ca94e5c7366b402b1bc1b25defd4d3c9dbacc5178a9c584249639e45d3713c991c21da01158fa85da
@@ -7,5 +8,5 @@ DIST parallel-20220622.tar.bz2 2378286 BLAKE2B a0fdb1ab330360c28d85ea5608760a961
 DIST parallel-20220622.tar.bz2.sig 2080 BLAKE2B f013d329dd3e6d46341638965582ef5eb7358b8dff5e858279808a38d8543dd900fcc248433e30a3a715e1726be10dad5597deec23519bb33a904006f72a92d8 SHA512 097ca0f3ca9afe96045738fe050f94ba588e7728ae7cbf4f695b7f1f6c148ccc1565839aec2ba3ce4ccaf888331365b9b7265aa434806ef2c76139e2ba2f0e82
 EBUILD parallel-20220422.ebuild 902 BLAKE2B a4512917d2f84af15c20c017823678ad5d9ee8218fa7562428baca03bd7de0b2c05f42f004848c8cb2e00b4e2763525d4cc1a8e5097423bf6bd7c44c6d5be0e1 SHA512 0d8150b78add55c45b6a47be0435af29a451056dc2c0e749cc27dcaeb7bce4292cb6ad2c1986fa65ecc88d6736f8e43200222aeac21de0e39d32d6ec68f8beb9
 EBUILD parallel-20220522.ebuild 902 BLAKE2B a4512917d2f84af15c20c017823678ad5d9ee8218fa7562428baca03bd7de0b2c05f42f004848c8cb2e00b4e2763525d4cc1a8e5097423bf6bd7c44c6d5be0e1 SHA512 0d8150b78add55c45b6a47be0435af29a451056dc2c0e749cc27dcaeb7bce4292cb6ad2c1986fa65ecc88d6736f8e43200222aeac21de0e39d32d6ec68f8beb9
-EBUILD parallel-20220622.ebuild 1069 BLAKE2B fd178a351d0375c1a0b53aecba35261bee677592aa015ca618d75010108a906d6c6311c688c702bc22d72ff9c1024bd6ed5f6db026542aaf13bddb351712e4ac SHA512 5e3a6115f2e0cdc928b80aba7d28fd272c6ff69aa025a3c2872e7618bbf380bd0e792183b185ebcba03ff18523ec8b38a7c2605abfd5a38ed64b1929e6f8ea49
+EBUILD parallel-20220622-r1.ebuild 1074 BLAKE2B cf1ec5101469a0ff10f56e78d76e8cea886b822b5282bae5e6545f5f1f2634769c4d0ff5d2590b70a51fcabe4a9182d983e8aa990ad38d47e961f1fc88dba4ff SHA512 cc24de895fd1d80666ed6caca4c171db9e7683119fd042714045c1d067181bac449d8f3508cc253adbd3bf07a69aa80b86f1a250100ce34e8e44247d4b645233
 MISC metadata.xml 1078 BLAKE2B 190d48305a18559658e87132e6be2831db9d8c314b29cf4e5808b6308cf86cb5d46a1b80214fcb8f45f12578a18ebefad8b0b91912c9fbb68126be66ae62ad55 SHA512 80b649870b5b9e12b436f82ce8fd3efad8b3e251c919a90b8c32945332bb3dd88e5bfc96acca6a12a38f2d6e1ce63effa593ef975c8109bad3a85d2d69b2ed98
diff --git a/sys-process/parallel/files/parallel-20220622-makefile-completions-deux.patch b/sys-process/parallel/files/parallel-20220622-makefile-completions-deux.patch
new file mode 100644
index 000000000000..c15a0dad28b1
--- /dev/null
+++ b/sys-process/parallel/files/parallel-20220622-makefile-completions-deux.patch
@@ -0,0 +1,83 @@
+https://git.savannah.gnu.org/cgit/parallel.git/commit/?id=2ae4b179ac6caf887af37b1e86ec6cbd8c5706f8
+https://bugs.gentoo.org/856079
+https://bugs.gentoo.org/856076
+
+From 2ae4b179ac6caf887af37b1e86ec6cbd8c5706f8 Mon Sep 17 00:00:00 2001
+From: Ole Tange <ole@tange.dk>
+Date: Sat, 2 Jul 2022 01:54:21 +0800
+Subject: Packaged for old RedHats and SuSEs.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -167,12 +167,20 @@ pack_unpack_and_test_build:
+ 	cd parallel-$(YYYYMMDD) && \
+ 	./configure && make -j && sudo make -j install
+ 
+-zshcompletiondir=${datarootdir}/zsh/site-functions
++# This ought to be correct, but fails on Centos
++# bashcompletiondir=$(DESTDIR)${datarootdir}/bash-completion/completions
++# zshcompletiondir=$(DESTDIR)${datarootdir}/zsh/site-functions
++bashcompletiondir=$(DESTDIR)${prefix}/share/bash-completion/completions
++zshcompletiondir=$(DESTDIR)${prefix}/share/zsh/site-functions
++bashcompletion=${bashcompletiondir}/parallel
+ zshcompletion=${zshcompletiondir}/_parallel
+ install-data-hook:
+-	mkdir -p ${datarootdir}/bash-completion/completions
+-	mkdir -p ${zshcompletiondir}
+-	parallel --shell-completion bash > ${datarootdir}/bash-completion/completions/parallel
++	mkdir -p ${zshcompletiondir} ${bashcompletiondir}
++	src/parallel --shell-completion bash > ${bashcompletion}
++# Make zsh eval the --shell-completion code dynamically so if
++# a newer version of GNU Parallel is installed by a normal
++# user, this newer version will generate the
++# --shell-completion code.
+ 	echo '#compdef parallel' > ${zshcompletion}
+ 	echo '(( $$+functions[_comp_parallel] )) ||' >> ${zshcompletion}
+ 	echo '  eval "$$(parallel --shell-completion auto)" &&' >> ${zshcompletion}
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -281,7 +281,13 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = src
+-zshcompletiondir = ${datarootdir}/zsh/site-functions
++
++# This ought to be correct, but fails on Centos
++# bashcompletiondir=$(DESTDIR)${datarootdir}/bash-completion/completions
++# zshcompletiondir=$(DESTDIR)${datarootdir}/zsh/site-functions
++bashcompletiondir = $(DESTDIR)${prefix}/share/bash-completion/completions
++zshcompletiondir = $(DESTDIR)${prefix}/share/zsh/site-functions
++bashcompletion = ${bashcompletiondir}/parallel
+ zshcompletion = ${zshcompletiondir}/_parallel
+ EXTRA_DIST = CITATION CITATION.cff CREDITS LICENSES/CC-BY-SA-4.0.txt LICENSES/GFDL-1.3-or-later.txt LICENSES/GPL-3.0-or-later.txt
+ all: config.h
+@@ -929,9 +935,12 @@ pack_unpack_and_test_build:
+ 	cd parallel-$(YYYYMMDD) && \
+ 	./configure && make -j && sudo make -j install
+ install-data-hook:
+-	mkdir -p ${datarootdir}/bash-completion/completions
+-	mkdir -p ${zshcompletiondir}
+-	parallel --shell-completion bash > ${datarootdir}/bash-completion/completions/parallel
++	mkdir -p ${zshcompletiondir} ${bashcompletiondir}
++	src/parallel --shell-completion bash > ${bashcompletion}
++# Make zsh eval the --shell-completion code dynamically so if
++# a newer version of GNU Parallel is installed by a normal
++# user, this newer version will generate the
++# --shell-completion code.
+ 	echo '#compdef parallel' > ${zshcompletion}
+ 	echo '(( $$+functions[_comp_parallel] )) ||' >> ${zshcompletion}
+ 	echo '  eval "$$(parallel --shell-completion auto)" &&' >> ${zshcompletion}
+--- a/src/parallel.pod
++++ b/src/parallel.pod
+@@ -5654,7 +5654,10 @@ the currently running jobs are finished before exiting.
+ =item $PARALLEL_HOME
+ 
+ Dir where GNU B<parallel> stores config files, semaphores, and caches
+-information between invocations. Default: $HOME/.parallel.
++information between invocations. If set to a non-existent dir, the dir
++will be created.
++
++Default: $HOME/.parallel.
+ 
+ 
+ =item $PARALLEL_ARGHOSTGROUPS
diff --git a/sys-process/parallel/parallel-20220622.ebuild b/sys-process/parallel/parallel-20220622-r1.ebuild
index f286660fe2f8..dded39ea7a57 100644
--- a/sys-process/parallel/parallel-20220622.ebuild
+++ b/sys-process/parallel/parallel-20220622-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-oletange-20210423 )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-20220622-makefile-completions.patch
+	"${FILESDIR}"/${PN}-20220622-makefile-completions-deux.patch
 )
 
 src_prepare() {