From f43eaece72c283302cae378ec6285e4f1e26d6ca Mon Sep 17 00:00:00 2001
From: George Rawlinson <george@rawlinson.net.nz>
Date: Wed, 2 Feb 2022 00:00:52 +0000
Subject: [PATCH] nvchecker: use upstream git source for parallel & time

---
 .repo/nvchecker.toml     | 19 +++++++++++--------
 .repo/pkgver/parallel.sh | 33 ---------------------------------
 .repo/pkgver/time.sh     | 34 ----------------------------------
 3 files changed, 11 insertions(+), 75 deletions(-)
 delete mode 100755 .repo/pkgver/parallel.sh
 delete mode 100755 .repo/pkgver/time.sh

diff --git a/.repo/nvchecker.toml b/.repo/nvchecker.toml
index 1d26068..0e03d76 100644
--- a/.repo/nvchecker.toml
+++ b/.repo/nvchecker.toml
@@ -1488,14 +1488,6 @@ cmd = "./.repo/pkgver/html-xml-utils.sh"
 source = "cmd"
 cmd = "./.repo/pkgver/sendmail.sh"
 
-[time]
-source = "cmd"
-cmd = "./.repo/pkgver/time.sh"
-
-[parallel]
-source = "cmd"
-cmd = "./.repo/pkgver/parallel.sh"
-
 # git
 #[plasma-pass-git]
 #source = "git"
@@ -1519,6 +1511,17 @@ use_max_tag = true
 prefix = "libabigail-"
 ignored = "1.0.rc0"
 
+[time]
+source = "git"
+git = "https://git.savannah.gnu.org/git/time.git"
+use_max_tag = true
+prefix = "v"
+
+[parallel]
+source = "git"
+git = "https://git.savannah.gnu.org/git/parallel.git"
+use_max_tag = true
+
 # gems
 
 [ruby-ffi]
diff --git a/.repo/pkgver/parallel.sh b/.repo/pkgver/parallel.sh
deleted file mode 100755
index 2c50d4d..0000000
--- a/.repo/pkgver/parallel.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-set -e
-
-# check dependencies
-count=0
-for dependency in curl tr cut grep sed sort tail; do
-	if [ ! -x "$(command -v $dependency)" ]; then
-		echo "$dependency missing"
-		count=$((count+1))
-	fi
-done
-
-# exit script if any dependencies missing
-if [ $count -ne 0 ]; then
-	exit 1
-fi
-
-# upstream URL
-UPSTREAM_URL="ftp://ftp.gnu.org/gnu/parallel/"
-
-# options to pass to cURL, including custom user agent
-USER_AGENT="parallel-version-checker/1.0 george@rawlinson.net.nz"
-CURL_OPTS=(--ftp-pasv --silent --user-agent "$USER_AGENT")
-
-curl "${CURL_OPTS[@]}" "$UPSTREAM_URL" | \
-	tr -s ' ' | \
-	cut -d ' ' -f 9 | \
-	grep -E "parallel-[[:digit:]]+\.tar\.bz2\.sig$" | \
-	sed -e 's/^parallel-//' -e 's/\.tar\.bz2\.sig$//' | \
-	sort -n | \
-	tail -n 1
-
-exit 0
diff --git a/.repo/pkgver/time.sh b/.repo/pkgver/time.sh
deleted file mode 100755
index edce42c..0000000
--- a/.repo/pkgver/time.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/bash
-set -e
-
-# check dependencies
-count=0
-for dependency in curl tr cut grep sed sort tail; do
-	if [ ! -x "$(command -v $dependency)" ]; then
-		echo "$dependency missing"
-		count=$((count+1))
-	fi
-done
-
-# exit script if any dependencies missing
-if [ $count -ne 0 ]; then
-	exit 1
-fi
-
-# upstream URL
-UPSTREAM_URL="ftp://ftp.gnu.org/gnu/time/"
-
-# options to pass to cURL, including custom user agent
-USER_AGENT="time-version-checker/1.0 george@rawlinson.net.nz"
-CURL_OPTS=(--ftp-pasv --silent --user-agent "$USER_AGENT")
-
-curl "${CURL_OPTS[@]}" "$UPSTREAM_URL" | \
-	tr -s ' ' | \
-	cut -d ' ' -f 9 | \
-	grep ".tar.gz$" | \
-	sort -n | \
-	tail -n 1 | \
-	sed -e "s/^time-//" -e "s/.tar.gz$//"
-
-exit 0
-