Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/parallel/files/
Date: Sun, 25 Sep 2022 01:21:19
Message-Id: 1664068759.bcb6957ed4b6125db7dda93637cedca570843b4e.sam@gentoo
1 commit: bcb6957ed4b6125db7dda93637cedca570843b4e
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sat Sep 24 09:59:48 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 25 01:19:19 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcb6957e
7
8 sys-process/parallel: remove unused patch(es)
9
10 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
11 Portage 3.0.37 / pkgdev 0.2.2 / pkgcheck 0.10.15
12 Closes: https://github.com/gentoo/gentoo/pull/27428
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 ...rallel-20220622-makefile-completions-deux.patch | 83 ----------------------
16 1 file changed, 83 deletions(-)
17
18 diff --git a/sys-process/parallel/files/parallel-20220622-makefile-completions-deux.patch b/sys-process/parallel/files/parallel-20220622-makefile-completions-deux.patch
19 deleted file mode 100644
20 index c15a0dad28b1..000000000000
21 --- a/sys-process/parallel/files/parallel-20220622-makefile-completions-deux.patch
22 +++ /dev/null
23 @@ -1,83 +0,0 @@
24 -https://git.savannah.gnu.org/cgit/parallel.git/commit/?id=2ae4b179ac6caf887af37b1e86ec6cbd8c5706f8
25 -https://bugs.gentoo.org/856079
26 -https://bugs.gentoo.org/856076
27 -
28 -From 2ae4b179ac6caf887af37b1e86ec6cbd8c5706f8 Mon Sep 17 00:00:00 2001
29 -From: Ole Tange <ole@×××××.dk>
30 -Date: Sat, 2 Jul 2022 01:54:21 +0800
31 -Subject: Packaged for old RedHats and SuSEs.
32 -
33 ---- a/Makefile.am
34 -+++ b/Makefile.am
35 -@@ -167,12 +167,20 @@ pack_unpack_and_test_build:
36 - cd parallel-$(YYYYMMDD) && \
37 - ./configure && make -j && sudo make -j install
38 -
39 --zshcompletiondir=${datarootdir}/zsh/site-functions
40 -+# This ought to be correct, but fails on Centos
41 -+# bashcompletiondir=$(DESTDIR)${datarootdir}/bash-completion/completions
42 -+# zshcompletiondir=$(DESTDIR)${datarootdir}/zsh/site-functions
43 -+bashcompletiondir=$(DESTDIR)${prefix}/share/bash-completion/completions
44 -+zshcompletiondir=$(DESTDIR)${prefix}/share/zsh/site-functions
45 -+bashcompletion=${bashcompletiondir}/parallel
46 - zshcompletion=${zshcompletiondir}/_parallel
47 - install-data-hook:
48 -- mkdir -p ${datarootdir}/bash-completion/completions
49 -- mkdir -p ${zshcompletiondir}
50 -- parallel --shell-completion bash > ${datarootdir}/bash-completion/completions/parallel
51 -+ mkdir -p ${zshcompletiondir} ${bashcompletiondir}
52 -+ src/parallel --shell-completion bash > ${bashcompletion}
53 -+# Make zsh eval the --shell-completion code dynamically so if
54 -+# a newer version of GNU Parallel is installed by a normal
55 -+# user, this newer version will generate the
56 -+# --shell-completion code.
57 - echo '#compdef parallel' > ${zshcompletion}
58 - echo '(( $$+functions[_comp_parallel] )) ||' >> ${zshcompletion}
59 - echo ' eval "$$(parallel --shell-completion auto)" &&' >> ${zshcompletion}
60 ---- a/Makefile.in
61 -+++ b/Makefile.in
62 -@@ -281,7 +281,13 @@ top_build_prefix = @top_build_prefix@
63 - top_builddir = @top_builddir@
64 - top_srcdir = @top_srcdir@
65 - SUBDIRS = src
66 --zshcompletiondir = ${datarootdir}/zsh/site-functions
67 -+
68 -+# This ought to be correct, but fails on Centos
69 -+# bashcompletiondir=$(DESTDIR)${datarootdir}/bash-completion/completions
70 -+# zshcompletiondir=$(DESTDIR)${datarootdir}/zsh/site-functions
71 -+bashcompletiondir = $(DESTDIR)${prefix}/share/bash-completion/completions
72 -+zshcompletiondir = $(DESTDIR)${prefix}/share/zsh/site-functions
73 -+bashcompletion = ${bashcompletiondir}/parallel
74 - zshcompletion = ${zshcompletiondir}/_parallel
75 - 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
76 - all: config.h
77 -@@ -929,9 +935,12 @@ pack_unpack_and_test_build:
78 - cd parallel-$(YYYYMMDD) && \
79 - ./configure && make -j && sudo make -j install
80 - install-data-hook:
81 -- mkdir -p ${datarootdir}/bash-completion/completions
82 -- mkdir -p ${zshcompletiondir}
83 -- parallel --shell-completion bash > ${datarootdir}/bash-completion/completions/parallel
84 -+ mkdir -p ${zshcompletiondir} ${bashcompletiondir}
85 -+ src/parallel --shell-completion bash > ${bashcompletion}
86 -+# Make zsh eval the --shell-completion code dynamically so if
87 -+# a newer version of GNU Parallel is installed by a normal
88 -+# user, this newer version will generate the
89 -+# --shell-completion code.
90 - echo '#compdef parallel' > ${zshcompletion}
91 - echo '(( $$+functions[_comp_parallel] )) ||' >> ${zshcompletion}
92 - echo ' eval "$$(parallel --shell-completion auto)" &&' >> ${zshcompletion}
93 ---- a/src/parallel.pod
94 -+++ b/src/parallel.pod
95 -@@ -5654,7 +5654,10 @@ the currently running jobs are finished before exiting.
96 - =item $PARALLEL_HOME
97 -
98 - Dir where GNU B<parallel> stores config files, semaphores, and caches
99 --information between invocations. Default: $HOME/.parallel.
100 -+information between invocations. If set to a non-existent dir, the dir
101 -+will be created.
102 -+
103 -+Default: $HOME/.parallel.
104 -
105 -
106 - =item $PARALLEL_ARGHOSTGROUPS