[arch-commits] Commit in parallel/repos/community-any (8 files)

George Rawlinson grawlinson at gemini.archlinux.org
Mon Jul 25 08:42:37 UTC 2022


    Date: Monday, July 25, 2022 @ 08:42:36
  Author: grawlinson
Revision: 1257148

archrelease: copy trunk to community-any

Added:
  parallel/repos/community-any/0001-Remove-citation-things.patch
    (from rev 1257145, parallel/trunk/0001-Remove-citation-things.patch)
  parallel/repos/community-any/PKGBUILD
    (from rev 1257146, parallel/trunk/PKGBUILD)
  parallel/repos/community-any/keys/
Deleted:
  parallel/repos/community-any/0001-Remove-citation-things.patch
  parallel/repos/community-any/0002-Fix-makefile.patch
  parallel/repos/community-any/CDA01A4208C4F74506107E7BD1AB451688888888.asc
  parallel/repos/community-any/PKGBUILD
  parallel/repos/community-any/keys/

-----------------------------------+
 0001-Remove-citation-things.patch |  594 +++++++++++++++++-------------------
 0002-Fix-makefile.patch           |   23 -
 PKGBUILD                          |  152 ++++-----
 3 files changed, 369 insertions(+), 400 deletions(-)

Deleted: 0001-Remove-citation-things.patch
===================================================================
--- 0001-Remove-citation-things.patch	2022-07-25 08:42:33 UTC (rev 1257147)
+++ 0001-Remove-citation-things.patch	2022-07-25 08:42:36 UTC (rev 1257148)
@@ -1,298 +0,0 @@
---- a/src/parallel
-+++ b/src/parallel
-@@ -1920,11 +1920,6 @@ sub options_completion_hash() {
- 	 "gnu[Behave like GNU parallel]" => \$opt::gnu,
- 	 "link|xapply[Link input sources]" => \$opt::link,
- 	 "linkinputsource|xapplyinputsource=i" => \@opt::linkinputsource,
--	 # Before changing these lines, please read
--	 # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice
--	 # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
--	 # You accept to be put in a public hall of shame by removing
--	 # these lines.
- 	 ("bibtex|citation".
- 	  "[Print the citation notice and BibTeX entry for GNU parallel, ".
- 	  "silence citation notice for all future runs, and exit. ".
-@@ -2159,15 +2154,6 @@ sub parse_options(@) {
-     my @argv_before = @ARGV;
-     @ARGV = read_options();
- 
--    # Before changing these line, please read
--    # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice
--    # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
--    # You accept to be added to a public hall of shame by
--    # removing the lines.
--    if(defined $opt::citation) {
--	citation(\@argv_before,\@ARGV);
--	wait_and_exit(0);
--    }
-     # no-* overrides *
-     if($opt::nokeeporder) { $opt::keeporder = undef; }
- 
-@@ -2459,81 +2445,6 @@ sub parse_options(@) {
-     if(defined $opt::eta) { $opt::progress = $opt::eta; }
-     if(defined $opt::bar) { $opt::progress = $opt::bar; }
- 
--    # Funding a free software project is hard. GNU Parallel is no
--    # exception. On top of that it seems the less visible a project
--    # is, the harder it is to get funding. And the nature of GNU
--    # Parallel is that it will never be seen by "the guy with the
--    # checkbook", but only by the people doing the actual work.
--    #
--    # This problem has been covered by others - though no solution has
--    # been found:
--    # https://www.slideshare.net/NadiaEghbal/consider-the-maintainer
--    # https://blog.licensezero.com/2019/08/24/process-of-elimination.html
--    # https://www.numfocus.org/blog/why-is-numpy-only-now-getting-funded/
--    #
--    # The FAQ tells you why the citation notice exists:
--    # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
--    #
--    # If you want GNU Parallel to be maintained in the future, and not
--    # just wither away like so many other free software tools, you
--    # need to help finance the development.
--    #
--    # The citation notice is a simple way of doing so, as citations
--    # makes it possible to me to get a job where I can maintain GNU
--    # Parallel as part of the job.
--    #
--    # This means you can help financing development
--    #
--    #	WITHOUT PAYING A SINGLE CENT!
--    #
--    # Before implementing the citation notice it was discussed with
--    # the users:
--    # https://lists.gnu.org/archive/html/parallel/2013-11/msg00006.html
--    #
--    # Having to spend 10 seconds on running 'parallel --citation' once
--    # is no doubt not an ideal solution, but no one has so far come up
--    # with an ideal solution - neither for funding GNU Parallel nor
--    # other free software.
--    #
--    # If you believe you have the perfect solution, you should try it
--    # out, and if it works, you should post it on the email
--    # list. Ideas that will cost work and which have not been tested
--    # are, however, unlikely to be prioritized.
--    #
--    # Please note that GPL version 3 gives you the right to fork GNU
--    # Parallel under a new name, but it does not give you the right to
--    # distribute modified copies with the citation notice disabled in
--    # a way where the software can be confused with GNU Parallel. To
--    # do that you need to be the owner of the GNU Parallel
--    # trademark. The xt:Commerce case shows this.
--    #
--    # Description of the xt:Commerce case in OLG Duesseldorf
--    # http://www.inta.org/INTABulletin/Pages/GERMANYGeneralPublicLicenseDoesNotPermitUseofThird-PartyTrademarksforAdvertisingModifiedVersionsofOpen-SourceSoftware.aspx
--    # https://web.archive.org/web/20180715073746/http://www.inta.org/INTABulletin/Pages/GERMANYGeneralPublicLicenseDoesNotPermitUseofThird-PartyTrademarksforAdvertisingModifiedVersionsofOpen-SourceSoftware.aspx
--    #
--    # The verdict in German
--    # https://www.admody.com/urteilsdatenbank/cafe6fdaeed3/OLG-Duesseldorf_Urteil_vom_28-September-2010_Az_I-20-U-41-09
--    # https://web.archive.org/web/20180715073717/https://www.admody.com/urteilsdatenbank/cafe6fdaeed3/OLG-Duesseldorf_Urteil_vom_28-September-2010_Az_I-20-U-41-09
--    #
--    # Other free software limiting derivates by the same name:
--    # https://en.wikipedia.org/wiki/Red_Hat_Enterprise_Linux_derivatives#Legal_aspects
--    # https://tm.joomla.org/trademark-faq.html
--    # https://www.mozilla.org/en-US/foundation/trademarks/faq/
--    #
--    # Running 'parallel --citation' one single time takes less than 10
--    # seconds, and will silence the citation notice for future
--    # runs. If that is too much trouble for you, why not use one of
--    # the alternatives instead?
--    # See a list in: 'man parallel_alternatives'
--    #
--    # If you want GNU Parallel to be maintained in the future you
--    # should keep this line.
--    citation_notice();
--    # _YOU_ will be harming free software by removing the notice. You
--    # accept to be added to a public hall of shame by removing the
--    # line.  This is because _YOU_ actively make it harder to justify
--    # spending time developing GNU Parallel.
--
-     parse_halt();
- 
-     if($ENV{'PARALLEL_ENV'}) {
-@@ -5521,85 +5432,9 @@ sub usage() {
- 	 "",
- 	 "GNU Parallel can do much more. See 'man $Global::progname' for details",
- 	 "",
--	 "Academic tradition requires you to cite works you base your article on.",
--	 "If you use programs that use GNU Parallel to process data for an article in a",
--	 "scientific publication, please cite:",
--	 "",
--	 "  Tange, O. (2022, June 22). GNU Parallel 20220622 ('Bongbong').",
--	 "  Zenodo. https://doi.org/10.5281/zenodo.6682930",
--	 "",
--	 # Before changing these lines,	 please read
--	 # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice
--	 # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
--	 # You accept to be put in a public hall of shame by removing
--	 # these lines.
--	 "This helps funding further development; AND IT WON'T COST YOU A CENT.",
--	 "If you pay 10000 EUR you should feel free to use GNU Parallel without citing.",
--	 "",
- 	 "",);
- }
- 
--sub citation_notice() {
--    # if --will-cite or --plain: do nothing
--    # if stderr redirected: do nothing
--    # if $PARALLEL_HOME/will-cite: do nothing
--    # else: print citation notice to stderr
--    if($opt::willcite
--       or
--       $opt::plain
--       or
--       not -t $Global::original_stderr
--       or
--       grep { -e "$_/will-cite" } @Global::config_dirs) {
--	# skip
--    } else {
--	::status
--	    ("Academic tradition requires you to cite works you base your article on.",
--	     "If you use programs that use GNU Parallel to process data for an article in a",
--	     "scientific publication, please cite:",
--	     "",
--	     "  Tange, O. (2022, June 22). GNU Parallel 20220622 ('Bongbong').",
--	     "  Zenodo. https://doi.org/10.5281/zenodo.6682930",
--	     "",
--	     # Before changing these line,  please read
--	     # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice and
--	     # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
--	     # You accept to be put in a public hall of shame by
--	     # removing these lines.
--	     "This helps funding further development; AND IT WON'T COST YOU A CENT.",
--	     "If you pay 10000 EUR you should feel free to use GNU Parallel without citing.",
--	     "",
--	     "More about funding GNU Parallel and the citation notice:",
--	     "https://www.gnu.org/software/parallel/parallel_design.html#citation-notice",
--	     "",
--	     "To silence this citation notice: run 'parallel --citation' once.",
--	     ""
--	    );
--	mkdir $Global::config_dir;
--	# Number of times the user has run GNU Parallel without showing
--	# willingness to cite
--	my $runs = 0;
--	if(open (my $fh, "<", $Global::config_dir.
--		 "/runs-without-willing-to-cite")) {
--	    $runs = <$fh>;
--	    close $fh;
--	}
--	$runs++;
--	if(open (my $fh, ">", $Global::config_dir.
--		 "/runs-without-willing-to-cite")) {
--	    print $fh $runs;
--	    close $fh;
--	    if($runs >= 10) {
--		::status("Come on: You have run parallel $runs times. ".
--			 "Isn't it about time ",
--			 "you run 'parallel --citation' once to silence ".
--			 "the citation notice?",
--			 "");
--	    }
--	}
--    }
--}
--
- sub status(@) {
-     my @w = @_;
-     my $fh = $Global::status_fd || *STDERR;
-@@ -5663,98 +5498,8 @@ sub version() {
- 	 "License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>",
- 	 "This is free software: you are free to change and redistribute it.",
- 	 "GNU $Global::progname comes with no warranty.",
--	 "",
--	 "Web site: https://www.gnu.org/software/${Global::progname}\n",
--	 "When using programs that use GNU Parallel to process data for publication",
--	 "please cite as described in 'parallel --citation'.\n",
--	);
--}
--
--sub citation() {
--    # Returns: N/A
--    my ($all_argv_ref,$argv_options_removed_ref) = @_;
--    my $all_argv = "@$all_argv_ref";
--    my $no_opts = "@$argv_options_removed_ref";
--    $all_argv=~s/--citation//;
--    if($all_argv ne $no_opts) {
--	::warning("--citation ignores all other options and arguments.");
--	::status("");
--    }
--
--    ::status(
--	"Academic tradition requires you to cite works you base your article on.",
--	"If you use programs that use GNU Parallel to process data for an article in a",
--	"scientific publication, please cite:",
--	"",
--	"\@software{tange_2022_6682930,",
--	"      author       = {Tange, Ole},",
--	"      title        = {GNU Parallel 20220622 ('Bongbong')},",
--	"      month        = Jun,",
--	"      year         = 2022,",
--	"      note         = {{GNU Parallel is a general parallelizer to run",
--	"                       multiple serial command line programs in parallel",
--	"                       without changing them.}},",
--	"      publisher    = {Zenodo},",
--	"      doi          = {10.5281/zenodo.6682930},",
--	"      url          = {https://doi.org/10.5281/zenodo.6682930}",
--	"}",
--	"",
--	"(Feel free to use \\nocite{tange_2022_6682930})",
--	"",
--	# Before changing these lines, please read
--	# https://www.gnu.org/software/parallel/parallel_design.html#citation-notice and
--	# https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
--	# You accept to be put in a public hall of shame by removing
--	# these lines.
--	"This helps funding further development; AND IT WON'T COST YOU A CENT.",
--	"If you pay 10000 EUR you should feel free to use GNU Parallel without citing.",
--	"",
--	"More about funding GNU Parallel and the citation notice:",
--	"https://lists.gnu.org/archive/html/parallel/2013-11/msg00006.html",
--	"https://www.gnu.org/software/parallel/parallel_design.html#citation-notice",
--	"https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt",
--	"",
--	"If you send a copy of your published article to tange\@gnu.org, it will be",
--	"mentioned in the release notes of next version of GNU Parallel.",
--	""
-+   "",
- 	);
--    while(not grep { -e "$_/will-cite" } @Global::config_dirs) {
--	print "\nType: 'will cite' and press enter.\n> ";
--	my $input = <STDIN>;
--	if(not defined $input) {
--	    exit(255);
--	}
--	if($input =~ /will cite/i) {
--	    mkdir $Global::config_dir;
--	    if(open (my $fh, ">", $Global::config_dir."/will-cite")) {
--		close $fh;
--		::status(
--		    "",
--		    "Thank you for your support: You are the reason why there is funding to",
--		    "continue maintaining GNU Parallel. On behalf of future versions of",
--		    "GNU Parallel, which would not exist without your support:",
--		    "",
--		    "  THANK YOU SO MUCH",
--		    "",
--		    "It is really appreciated. The citation notice is now silenced.",
--		    "");
--	    } else {
--		::status(
--		      "",
--		      "Thank you for your support. It is much appreciated. The citation",
--		      "cannot permanently be silenced. Use '--will-cite' instead.",
--		      "",
--		      "If you use '--will-cite' in scripts to be run by others you are making",
--		      "it harder for others to see the citation notice.  The development of",
--		      "GNU Parallel is indirectly financed through citations, so if users",
--		      "do not know they should cite then you are making it harder to finance",
--		      "development. However, if you pay 10000 EUR, you should feel free to",
--		      "use '--will-cite' in scripts.",
--		      "");
--		last;
--	    }
--	}
--    }
- }
- 
- sub show_limits() {

Copied: parallel/repos/community-any/0001-Remove-citation-things.patch (from rev 1257145, parallel/trunk/0001-Remove-citation-things.patch)
===================================================================
--- 0001-Remove-citation-things.patch	                        (rev 0)
+++ 0001-Remove-citation-things.patch	2022-07-25 08:42:36 UTC (rev 1257148)
@@ -0,0 +1,296 @@
+--- a/src/parallel
++++ b/src/parallel
+@@ -1927,11 +1927,6 @@ sub options_completion_hash() {
+ 	 "gnu[Behave like GNU parallel]" => \$opt::gnu,
+ 	 "link|xapply[Link input sources]" => \$opt::link,
+ 	 "linkinputsource|xapplyinputsource=i" => \@opt::linkinputsource,
+-	 # Before changing these lines, please read
+-	 # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice
+-	 # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
+-	 # You accept to be put in a public hall of shame by removing
+-	 # these lines.
+ 	 ("bibtex|citation".
+ 	  "[Print the citation notice and BibTeX entry for GNU parallel, ".
+ 	  "silence citation notice for all future runs, and exit. ".
+@@ -2166,15 +2161,6 @@ sub parse_options(@) {
+     my @argv_before = @ARGV;
+     @ARGV = read_options();
+ 
+-    # Before changing these line, please read
+-    # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice
+-    # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
+-    # You accept to be added to a public hall of shame by
+-    # removing the lines.
+-    if(defined $opt::citation) {
+-	citation(\@argv_before,\@ARGV);
+-	wait_and_exit(0);
+-    }
+     # no-* overrides *
+     if($opt::nokeeporder) { $opt::keeporder = undef; }
+ 
+@@ -2463,81 +2449,6 @@ sub parse_options(@) {
+     if(defined $opt::eta) { $opt::progress = $opt::eta; }
+     if(defined $opt::bar) { $opt::progress = $opt::bar; }
+ 
+-    # Funding a free software project is hard. GNU Parallel is no
+-    # exception. On top of that it seems the less visible a project
+-    # is, the harder it is to get funding. And the nature of GNU
+-    # Parallel is that it will never be seen by "the guy with the
+-    # checkbook", but only by the people doing the actual work.
+-    #
+-    # This problem has been covered by others - though no solution has
+-    # been found:
+-    # https://www.slideshare.net/NadiaEghbal/consider-the-maintainer
+-    # https://blog.licensezero.com/2019/08/24/process-of-elimination.html
+-    # https://www.numfocus.org/blog/why-is-numpy-only-now-getting-funded/
+-    #
+-    # The FAQ tells you why the citation notice exists:
+-    # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
+-    #
+-    # If you want GNU Parallel to be maintained in the future, and not
+-    # just wither away like so many other free software tools, you
+-    # need to help finance the development.
+-    #
+-    # The citation notice is a simple way of doing so, as citations
+-    # makes it possible to me to get a job where I can maintain GNU
+-    # Parallel as part of the job.
+-    #
+-    # This means you can help financing development
+-    #
+-    #	WITHOUT PAYING A SINGLE CENT!
+-    #
+-    # Before implementing the citation notice it was discussed with
+-    # the users:
+-    # https://lists.gnu.org/archive/html/parallel/2013-11/msg00006.html
+-    #
+-    # Having to spend 10 seconds on running 'parallel --citation' once
+-    # is no doubt not an ideal solution, but no one has so far come up
+-    # with an ideal solution - neither for funding GNU Parallel nor
+-    # other free software.
+-    #
+-    # If you believe you have the perfect solution, you should try it
+-    # out, and if it works, you should post it on the email
+-    # list. Ideas that will cost work and which have not been tested
+-    # are, however, unlikely to be prioritized.
+-    #
+-    # Please note that GPL version 3 gives you the right to fork GNU
+-    # Parallel under a new name, but it does not give you the right to
+-    # distribute modified copies with the citation notice disabled in
+-    # a way where the software can be confused with GNU Parallel. To
+-    # do that you need to be the owner of the GNU Parallel
+-    # trademark. The xt:Commerce case shows this.
+-    #
+-    # Description of the xt:Commerce case in OLG Duesseldorf
+-    # http://www.inta.org/INTABulletin/Pages/GERMANYGeneralPublicLicenseDoesNotPermitUseofThird-PartyTrademarksforAdvertisingModifiedVersionsofOpen-SourceSoftware.aspx
+-    # https://web.archive.org/web/20180715073746/http://www.inta.org/INTABulletin/Pages/GERMANYGeneralPublicLicenseDoesNotPermitUseofThird-PartyTrademarksforAdvertisingModifiedVersionsofOpen-SourceSoftware.aspx
+-    #
+-    # The verdict in German
+-    # https://www.admody.com/urteilsdatenbank/cafe6fdaeed3/OLG-Duesseldorf_Urteil_vom_28-September-2010_Az_I-20-U-41-09
+-    # https://web.archive.org/web/20180715073717/https://www.admody.com/urteilsdatenbank/cafe6fdaeed3/OLG-Duesseldorf_Urteil_vom_28-September-2010_Az_I-20-U-41-09
+-    #
+-    # Other free software limiting derivates by the same name:
+-    # https://en.wikipedia.org/wiki/Red_Hat_Enterprise_Linux_derivatives#Legal_aspects
+-    # https://tm.joomla.org/trademark-faq.html
+-    # https://www.mozilla.org/en-US/foundation/trademarks/faq/
+-    #
+-    # Running 'parallel --citation' one single time takes less than 10
+-    # seconds, and will silence the citation notice for future
+-    # runs. If that is too much trouble for you, why not use one of
+-    # the alternatives instead?
+-    # See a list in: 'man parallel_alternatives'
+-    #
+-    # If you want GNU Parallel to be maintained in the future you
+-    # should keep this line.
+-    citation_notice();
+-    # _YOU_ will be harming free software by removing the notice. You
+-    # accept to be added to a public hall of shame by removing the
+-    # line.  This is because _YOU_ actively make it harder to justify
+-    # spending time developing GNU Parallel.
+-
+     parse_halt();
+ 
+     if($ENV{'PARALLEL_ENV'}) {
+@@ -5531,85 +5442,9 @@ sub usage() {
+ 	 "",
+ 	 "GNU Parallel can do much more. See 'man $Global::progname' for details",
+ 	 "",
+-	 "Academic tradition requires you to cite works you base your article on.",
+-	 "If you use programs that use GNU Parallel to process data for an article in a",
+-	 "scientific publication, please cite:",
+-	 "",
+-	 "  Tange, O. (2022, July 22). GNU Parallel 20220722 ('Roe vs Wade').",
+-	 "  Zenodo. https://doi.org/10.5281/zenodo.6891516",
+-	 "",
+-	 # Before changing these lines,	 please read
+-	 # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice
+-	 # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
+-	 # You accept to be put in a public hall of shame by removing
+-	 # these lines.
+-	 "This helps funding further development; AND IT WON'T COST YOU A CENT.",
+-	 "If you pay 10000 EUR you should feel free to use GNU Parallel without citing.",
+-	 "",
+ 	 "",);
+ }
+ 
+-sub citation_notice() {
+-    # if --will-cite or --plain: do nothing
+-    # if stderr redirected: do nothing
+-    # if $PARALLEL_HOME/will-cite: do nothing
+-    # else: print citation notice to stderr
+-    if($opt::willcite
+-       or
+-       $opt::plain
+-       or
+-       not -t $Global::original_stderr
+-       or
+-       grep { -e "$_/will-cite" } @Global::config_dirs) {
+-	# skip
+-    } else {
+-	::status
+-	    ("Academic tradition requires you to cite works you base your article on.",
+-	     "If you use programs that use GNU Parallel to process data for an article in a",
+-	     "scientific publication, please cite:",
+-	     "",
+-	     "  Tange, O. (2022, July 22). GNU Parallel 20220722 ('Roe vs Wade').",
+-	     "  Zenodo. https://doi.org/10.5281/zenodo.6891516",
+-	     "",
+-	     # Before changing these line,  please read
+-	     # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice and
+-	     # https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
+-	     # You accept to be put in a public hall of shame by
+-	     # removing these lines.
+-	     "This helps funding further development; AND IT WON'T COST YOU A CENT.",
+-	     "If you pay 10000 EUR you should feel free to use GNU Parallel without citing.",
+-	     "",
+-	     "More about funding GNU Parallel and the citation notice:",
+-	     "https://www.gnu.org/software/parallel/parallel_design.html#citation-notice",
+-	     "",
+-	     "To silence this citation notice: run 'parallel --citation' once.",
+-	     ""
+-	    );
+-	mkdir $Global::config_dir;
+-	# Number of times the user has run GNU Parallel without showing
+-	# willingness to cite
+-	my $runs = 0;
+-	if(open (my $fh, "<", $Global::config_dir.
+-		 "/runs-without-willing-to-cite")) {
+-	    $runs = <$fh>;
+-	    close $fh;
+-	}
+-	$runs++;
+-	if(open (my $fh, ">", $Global::config_dir.
+-		 "/runs-without-willing-to-cite")) {
+-	    print $fh $runs;
+-	    close $fh;
+-	    if($runs >= 10) {
+-		::status("Come on: You have run parallel $runs times. ".
+-			 "Isn't it about time ",
+-			 "you run 'parallel --citation' once to silence ".
+-			 "the citation notice?",
+-			 "");
+-	    }
+-	}
+-    }
+-}
+-
+ sub status(@) {
+     my @w = @_;
+     my $fh = $Global::status_fd || *STDERR;
+@@ -5674,97 +5509,7 @@ sub version() {
+ 	 "This is free software: you are free to change and redistribute it.",
+ 	 "GNU $Global::progname comes with no warranty.",
+ 	 "",
+-	 "Web site: https://www.gnu.org/software/${Global::progname}\n",
+-	 "When using programs that use GNU Parallel to process data for publication",
+-	 "please cite as described in 'parallel --citation'.\n",
+-	);
+-}
+-
+-sub citation() {
+-    # Returns: N/A
+-    my ($all_argv_ref,$argv_options_removed_ref) = @_;
+-    my $all_argv = "@$all_argv_ref";
+-    my $no_opts = "@$argv_options_removed_ref";
+-    $all_argv=~s/--citation//;
+-    if($all_argv ne $no_opts) {
+-	::warning("--citation ignores all other options and arguments.");
+-	::status("");
+-    }
+-
+-    ::status(
+-	"Academic tradition requires you to cite works you base your article on.",
+-	"If you use programs that use GNU Parallel to process data for an article in a",
+-	"scientific publication, please cite:",
+-	"",
+-	"\@software{tange_2022_6891516,",
+-	"      author       = {Tange, Ole},",
+-	"      title        = {GNU Parallel 20220722 ('Roe vs Wade')},",
+-	"      month        = Jul,",
+-	"      year         = 2022,",
+-	"      note         = {{GNU Parallel is a general parallelizer to run",
+-	"                       multiple serial command line programs in parallel",
+-	"                       without changing them.}},",
+-	"      publisher    = {Zenodo},",
+-	"      doi          = {10.5281/zenodo.6891516},",
+-	"      url          = {https://doi.org/10.5281/zenodo.6891516}",
+-	"}",
+-	"",
+-	"(Feel free to use \\nocite{tange_2022_6891516})",
+-	"",
+-	# Before changing these lines, please read
+-	# https://www.gnu.org/software/parallel/parallel_design.html#citation-notice and
+-	# https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt
+-	# You accept to be put in a public hall of shame by removing
+-	# these lines.
+-	"This helps funding further development; AND IT WON'T COST YOU A CENT.",
+-	"If you pay 10000 EUR you should feel free to use GNU Parallel without citing.",
+-	"",
+-	"More about funding GNU Parallel and the citation notice:",
+-	"https://lists.gnu.org/archive/html/parallel/2013-11/msg00006.html",
+-	"https://www.gnu.org/software/parallel/parallel_design.html#citation-notice",
+-	"https://git.savannah.gnu.org/cgit/parallel.git/tree/doc/citation-notice-faq.txt",
+-	"",
+-	"If you send a copy of your published article to tange\@gnu.org, it will be",
+-	"mentioned in the release notes of next version of GNU Parallel.",
+-	""
+ 	);
+-    while(not grep { -e "$_/will-cite" } @Global::config_dirs) {
+-	print "\nType: 'will cite' and press enter.\n> ";
+-	my $input = <STDIN>;
+-	if(not defined $input) {
+-	    exit(255);
+-	}
+-	if($input =~ /will cite/i) {
+-	    mkdir $Global::config_dir;
+-	    if(open (my $fh, ">", $Global::config_dir."/will-cite")) {
+-		close $fh;
+-		::status(
+-		    "",
+-		    "Thank you for your support: You are the reason why there is funding to",
+-		    "continue maintaining GNU Parallel. On behalf of future versions of",
+-		    "GNU Parallel, which would not exist without your support:",
+-		    "",
+-		    "  THANK YOU SO MUCH",
+-		    "",
+-		    "It is really appreciated. The citation notice is now silenced.",
+-		    "");
+-	    } else {
+-		::status(
+-		      "",
+-		      "Thank you for your support. It is much appreciated. The citation",
+-		      "cannot permanently be silenced. Use '--will-cite' instead.",
+-		      "",
+-		      "If you use '--will-cite' in scripts to be run by others you are making",
+-		      "it harder for others to see the citation notice.  The development of",
+-		      "GNU Parallel is indirectly financed through citations, so if users",
+-		      "do not know they should cite then you are making it harder to finance",
+-		      "development. However, if you pay 10000 EUR, you should feel free to",
+-		      "use '--will-cite' in scripts.",
+-		      "");
+-		last;
+-	    }
+-	}
+-    }
+ }
+ 
+ sub show_limits() {

Deleted: 0002-Fix-makefile.patch
===================================================================
--- 0002-Fix-makefile.patch	2022-07-25 08:42:33 UTC (rev 1257147)
+++ 0002-Fix-makefile.patch	2022-07-25 08:42:36 UTC (rev 1257148)
@@ -1,23 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -281,7 +281,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = src
--zshcompletiondir = ${datarootdir}/zsh/site-functions
-+zshcompletiondir = ${DESTDIR}/${datarootdir}/zsh/site-functions
- 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 +929,9 @@ 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 ${DESTDIR}/${datarootdir}/bash-completion/completions
- 	mkdir -p ${zshcompletiondir}
--	parallel --shell-completion bash > ${datarootdir}/bash-completion/completions/parallel
-+	./src/parallel --shell-completion bash > ${DESTDIR}/${datarootdir}/bash-completion/completions/parallel
- 	echo '#compdef parallel' > ${zshcompletion}
- 	echo '(( $$+functions[_comp_parallel] )) ||' >> ${zshcompletion}
- 	echo '  eval "$$(parallel --shell-completion auto)" &&' >> ${zshcompletion}

Deleted: CDA01A4208C4F74506107E7BD1AB451688888888.asc
===================================================================
(Binary files differ)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-25 08:42:33 UTC (rev 1257147)
+++ PKGBUILD	2022-07-25 08:42:36 UTC (rev 1257148)
@@ -1,79 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Maintainer: George Rawlinson <grawlinson at archlinux.org>
-# Contributor: Timothy Redaelli <timothy.redaelli at gmail.com>
-# Contributor: Vianney le Clément <vleclement AT gmail·com>
-# Contributor: Peter Simons <simons at cryp.to>
-
-pkgbase=parallel
-pkgname=('parallel' 'parallel-docs')
-pkgver=20220622
-pkgrel=1
-pkgdesc='A shell tool for executing jobs in parallel'
-arch=('any')
-url='https://www.gnu.org/software/parallel/'
-license=('GPL3')
-source=(
-  "https://ftp.gnu.org/gnu/$pkgbase/$pkgbase-$pkgver.tar.bz2"{,.sig}
-  '0001-Remove-citation-things.patch'
-  '0002-Fix-makefile.patch'
-)
-sha512sums=('d01d86cd2ac373534d147eee8aa666fe26e7207362ea9c036c3744125f72c936d15cf2059429636454f21c8e8c6b3a60c8d761ddfde97ba7388d2cd00495bfa4'
-            'SKIP'
-            '5c98641615a391a0e27a0a4091c8e9faa8689fa1fd7fd6c514ad571ee0e5f63219cc8df4e57c38ebd2d977d5fe13192190849c1c949039cc6433d30f673214cd'
-            'b9fd9645a32376244ce075402783d404842445d3d510d7cffe743e07038d304443bc99a01da74ece20709e8c97c8751b1e097b2e5e8b362a23f851686b2c54df')
-b2sums=('a0fdb1ab330360c28d85ea5608760a961e663a5401b900e6e8eee944250bf233ae1e3f66e6a2b9d54f0c32702127593dab787d29eda636bd457dcc5d4b046785'
-        'SKIP'
-        '6c6292c983be25992990f0d307c48f351de7a2fdb2a442ab196f2c6fce708b00e2ee784382acb3b14c755c9a9eb5ee3b5bb4faf3be6672e7d756fee740800902'
-        '5a8fd71c7aec3de071acfd0765cca417a6f4db5ca10e04b7786a70e890ecf608c1b4214b4d8d09d7f9c2d7f83c1beb3c569e80a40986d3fa037dc15b2b58bd66')
-validpgpkeys=('CDA01A4208C4F74506107E7BD1AB451688888888')
-
-prepare() {
-  cd "$pkgbase-$pkgver"
-
-  # remove citation warnings
-  patch -p1 <"$srcdir"/0001-Remove-citation-things.patch
-
-  # patch in DESTDIR support to makefile
-  patch -p1 <"$srcdir"/0002-Fix-makefile.patch
-
-  # remove gnu branding
-  sed \
-    --in-place \
-    --regexp-extended \
-    --expression 's/GNU\s{1,3}Parallel/Parallel/g' \
-    --expression 's/run_gnu_parallel/run_parallel/g' \
-    --expression 's/with_GNU_Parallel/with_Parallel/g' \
-    --expression 's/GNU \$Global::progname/\$Global::progname/g' \
-    --expression 's/@GNU_Parallel/@Parallel/g' \
-    src/parallel
-}
-
-build() {
-  cd "$pkgbase-$pkgver"
-
-  ./configure --prefix=/usr
-
-  make
-}
-
-package_parallel() {
-  depends=('perl' 'procps')
-
-  cd "$pkgbase-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # split documentation out of main package
-  mv "$pkgdir/usr/share/doc" docs
-}
-
-package_parallel-docs() {
-  pkgdesc+=' (documentation)'
-
-  cd "$pkgbase-$pkgver"
-
-  install -vd "$pkgdir/usr/share/doc"
-  mv -v docs/* "$pkgdir/usr/share/doc"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: parallel/repos/community-any/PKGBUILD (from rev 1257146, parallel/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-07-25 08:42:36 UTC (rev 1257148)
@@ -0,0 +1,73 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Maintainer: George Rawlinson <grawlinson at archlinux.org>
+# Contributor: Timothy Redaelli <timothy.redaelli at gmail.com>
+# Contributor: Vianney le Clément <vleclement AT gmail·com>
+# Contributor: Peter Simons <simons at cryp.to>
+
+pkgbase=parallel
+pkgname=('parallel' 'parallel-docs')
+pkgver=20220722
+pkgrel=1
+pkgdesc='A shell tool for executing jobs in parallel'
+arch=('any')
+url='https://www.gnu.org/software/parallel/'
+license=('GPL3')
+source=(
+  "https://ftp.gnu.org/gnu/$pkgbase/$pkgbase-$pkgver.tar.bz2"{,.sig}
+  '0001-Remove-citation-things.patch'
+)
+sha512sums=('b3bee9861ad9537055f00ebc7a1593697cb9f53167bd79fb612b9567a1d19edb7b770e5e68cee410bf2a146f3c48608e7a47254972f28ca0418d725b8d2088d3'
+            'SKIP'
+            '4624afb1e3a00bb61d3a3d307be81e04ab994a272d6ede00b1742e2d423226ed747419cf89c7e10f5714a47d6c91ad1a698eb46ca68248f10b4b214f575da8f3')
+b2sums=('76d9edddac82b5077d6416cf629dc02d427c93a42907f84a467a45805efe99154eaa175755a4a4c9a9d86df480842daef7064b1d324671eeb6c08fdbab3e7b70'
+        'SKIP'
+        '864c0e55b1853fd0b2bca53f2976d3306e560b77c07c729dc45aa839951469caa11642eaba88998bbf24e9c35f9587f0f795701a0cf0719e202a0cf2e2476055')
+validpgpkeys=('CDA01A4208C4F74506107E7BD1AB451688888888')
+
+prepare() {
+  cd "$pkgbase-$pkgver"
+
+  # remove citation warnings
+  patch -p1 <"$srcdir"/0001-Remove-citation-things.patch
+
+  # remove gnu branding
+  sed \
+    --in-place \
+    --regexp-extended \
+    --expression 's/GNU\s{1,3}Parallel/Parallel/g' \
+    --expression 's/run_gnu_parallel/run_parallel/g' \
+    --expression 's/with_GNU_Parallel/with_Parallel/g' \
+    --expression 's/GNU \$Global::progname/\$Global::progname/g' \
+    --expression 's/@GNU_Parallel/@Parallel/g' \
+    src/parallel
+}
+
+build() {
+  cd "$pkgbase-$pkgver"
+
+  ./configure --prefix=/usr
+
+  make
+}
+
+package_parallel() {
+  depends=('perl' 'procps')
+
+  cd "$pkgbase-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # split documentation out of main package
+  mv "$pkgdir/usr/share/doc" docs
+}
+
+package_parallel-docs() {
+  pkgdesc+=' (documentation)'
+
+  cd "$pkgbase-$pkgver"
+
+  install -vd "$pkgdir/usr/share/doc"
+  mv -v docs/* "$pkgdir/usr/share/doc"
+}
+
+# vim:set ts=2 sw=2 et:



More information about the arch-commits mailing list