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

George Rawlinson grawlinson at gemini.archlinux.org
Tue May 24 01:10:42 UTC 2022


    Date: Tuesday, May 24, 2022 @ 01:10:41
  Author: grawlinson
Revision: 1210150

archrelease: copy trunk to community-any

Added:
  parallel/repos/community-any/0001-Remove-citation-things.patch
    (from rev 1210149, parallel/trunk/0001-Remove-citation-things.patch)
  parallel/repos/community-any/CDA01A4208C4F74506107E7BD1AB451688888888.asc
    (from rev 1210149, parallel/trunk/CDA01A4208C4F74506107E7BD1AB451688888888.asc)
  parallel/repos/community-any/PKGBUILD
    (from rev 1210149, parallel/trunk/PKGBUILD)
Deleted:
  parallel/repos/community-any/0001-Remove-citation-things.patch
  parallel/repos/community-any/CDA01A4208C4F74506107E7BD1AB451688888888.asc
  parallel/repos/community-any/PKGBUILD

-----------------------------------+
 0001-Remove-citation-things.patch |  596 ++++++++++++++++++------------------
 PKGBUILD                          |  146 ++++----
 2 files changed, 373 insertions(+), 369 deletions(-)

Deleted: 0001-Remove-citation-things.patch
===================================================================
--- 0001-Remove-citation-things.patch	2022-05-24 01:09:40 UTC (rev 1210149)
+++ 0001-Remove-citation-things.patch	2022-05-24 01:10:41 UTC (rev 1210150)
@@ -1,296 +0,0 @@
---- a/src/parallel
-+++ b/src/parallel
-@@ -1889,11 +1889,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. It will not run any commands]"
- 	  => \$opt::citation),
-@@ -2115,15 +2110,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; }
- 
-@@ -2404,81 +2390,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'}) {
-@@ -5433,84 +5344,9 @@ sub usage() {
- 	 "--recstart str  Record start separator for --pipe.",
- 	 "",
- 	 "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, April 22). GNU Parallel 20220422 ('Буча').",
--	 "  Zenodo. https://doi.org/10.5281/zenodo.6479152",
--	 "",
--	 # 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, April 22). GNU Parallel 20220422 ('Буча').",
--	     "  Zenodo. https://doi.org/10.5281/zenodo.6479152",
--	     "",
--	     # 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;
-@@ -5574,98 +5410,7 @@ 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_6479152,",
--	"      author       = {Tange, Ole},",
--	"      title        = {GNU Parallel 20220422 ('Буча')},",
--	"      month        = Apr,",
--	"      year         = 2021,",
--	"      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.6479152},",
--	"      url          = {https://doi.org/10.5281/zenodo.6479152}",
--	"}",
--	"",
--	"(Feel free to use \\nocite{tange_2022_6479152})",
--	"",
--	# 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 1210149, parallel/trunk/0001-Remove-citation-things.patch)
===================================================================
--- 0001-Remove-citation-things.patch	                        (rev 0)
+++ 0001-Remove-citation-things.patch	2022-05-24 01:10:41 UTC (rev 1210150)
@@ -0,0 +1,300 @@
+diff --git a/src/parallel b/src/parallel
+index 551c066..eb4819e 100755
+--- 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'}) {
+@@ -5507,85 +5418,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, May 22). GNU Parallel 20220522 ('NATO').",
+-	 "  Zenodo. https://doi.org/10.5281/zenodo.6570228",
+-	 "",
+-	 # 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, May 22). GNU Parallel 20220522 ('NATO').",
+-	     "  Zenodo. https://doi.org/10.5281/zenodo.6570228",
+-	     "",
+-	     # 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;
+@@ -5649,98 +5484,7 @@ 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_6570228,",
+-	"      author       = {Tange, Ole},",
+-	"      title        = {GNU Parallel 20220522 ('NATO')},",
+-	"      month        = May,",
+-	"      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.6570228},",
+-	"      url          = {https://doi.org/10.5281/zenodo.6570228}",
+-	"}",
+-	"",
+-	"(Feel free to use \\nocite{tange_2022_6570228})",
+-	"",
+-	# 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: CDA01A4208C4F74506107E7BD1AB451688888888.asc
===================================================================
(Binary files differ)

Copied: parallel/repos/community-any/CDA01A4208C4F74506107E7BD1AB451688888888.asc (from rev 1210149, parallel/trunk/CDA01A4208C4F74506107E7BD1AB451688888888.asc)
===================================================================
(Binary files differ)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-24 01:09:40 UTC (rev 1210149)
+++ PKGBUILD	2022-05-24 01:10:41 UTC (rev 1210150)
@@ -1,73 +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=20220422
-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=('b4179c5ad936ed01753d91d75a012d6985dd8fb24f1e0d06fa7806352bfc59aeeedd42b15fd31b8294d25671aa474f885362c887875e79b32b613bfe1f9a262e'
-            'SKIP'
-            '255f50448b791c53087f68b1650a2aab86b5f80efb13228ffa2903ab1b3465faf50a17be8e9a6eba6d6e46e83a11781c4c8480e14ec125d826fd1253cdae7ed0')
-b2sums=('5630c58a15cc6ce0dac0346188afa9916b18545a9da91854f3cae604fc3c2ced33fd3a5f17a2967693a2e28cbddb198a3e63372125721a8dc67af80cbf03e940'
-        'SKIP'
-        '410317d7ea9146d373daeba8d27738ed21598bb50b0a6ecb78a8b31eed4ebf0d1c2baf2a6f2bada62fce7ec2840e507604f48d00820498330fdfedbb18874e7a')
-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:

Copied: parallel/repos/community-any/PKGBUILD (from rev 1210149, parallel/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-05-24 01:10:41 UTC (rev 1210150)
@@ -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=20220522
+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=('45dd1abe8652d29cd054505263b4ed792f42d7d6799ebdbfec07c21d54437d7243a054adff1d6c987eb85260d7ead2a9bb4dacb9d54a8a5b332218e27cf4f62c'
+            'SKIP'
+            '0222471b1e59a8864d79674e147df0a9452f24f9fdefad336eada8f50da3bd21caefdc98705cdf6ab0b3194962f032f63be118c3ae2eec7b1239023012281eab')
+b2sums=('e32f62930a4147dc950f5bdab1da58bef19c83b75e7257511d44257ef1569b40a34c670c63831f46daabcb390a197b7293aabb66f2dacd9848dd64910fd3b912'
+        'SKIP'
+        '26509c87a6b45aa4659e5cad9b3251e0fcdb44634ddecb29789e25b303d17fb9805967c5fafdcba7720015c2e6c445dfe771bd7538c5800cc6534bddd95dc4a6')
+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