updpkg: libre/reflector 2021.4-1

Signed-off-by: David P <megver83@parabola.nu>

2 files changed, 18 insertions, 19 deletions

diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD
index 09171dea3..d04f72375 100644
--- a/libre/reflector/PKGBUILD
+++ b/libre/reflector/PKGBUILD
@@ -1,10 +1,9 @@
 # Maintainer (Arch): Xyne <ac xunilhcra enyx, backwards>
-# Maintainer (Hyperbola): André Silva <emulatorman@parabola.nu>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: grizzlyuser <grizzlyuser@protonmail.com>
 
 pkgname=reflector
-pkgver=2020.9
+pkgver=2021.4
 pkgrel=1
 pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)'
 arch=(any)
@@ -16,13 +15,12 @@ depends=(python3)
 optdepends=('rsync: rate rsync mirrors')
 backup=(etc/xdg/reflector/reflector.conf)
 source=(
-  https://xyne.archlinux.ca/projects/reflector/src/reflector-${pkgver}.tar.xz
-  https://xyne.archlinux.ca/projects/reflector/src/reflector-${pkgver}.tar.xz.sig
+  https://xyne.archlinux.ca/projects/reflector/src/reflector-${pkgver}.tar.xz{,.sig}
   rebranding.patch
 )
-sha512sums=('2cfad4919cd7cd0c3e4be2d99f2ef7d2df3b39254fc5494b2f858fb8f07f22278688a4b3708aecd109f0602d4b93a335ef15e08c3b48f61c2f2090bbaa58fc4e'
+sha512sums=('4bae2191710a6321128a817cf98f8e2fa4a01e8437ef707488e07dec3f22efa84734766252b53fb0b2ab4fcf72600bd866e9c7a9caae68adaa3f485e5cc066ef'
             'SKIP'
-            '555b7d455ffc29e8d20c938632c0c278959bc4946427680f462e56fb7aa7681780c0f7b0ecf5ff89a9cfca7524d441304fc08feeb4ad167c206003921a09a9ca')
+            '839aa6012ca8b3fad82e0f7480e055a23fda11af2ca9f890e9c2919ecd50869888992169045ae9ddee30271cb6fd7cf864ce1bb090a5c4be4f382051bc9fddd7')
 
 validpgpkeys=('EC3CBE7F607D11E663149E811D1F0DC78F173680')
 
@@ -39,7 +37,6 @@ package ()
 {
   cd "$srcdir/$pkgname-$pkgver"
   python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-  install -Dm755 "$srcdir/$pkgname-$pkgver/$pkgname" "$pkgdir/usr/bin/$pkgname"
   install -Dm644 "man/${pkgname}.1.gz" "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz"
   install -Dm644 'reflector.service' "$pkgdir/usr/lib/systemd/system/reflector.service"
   install -Dm644 'reflector.timer' "$pkgdir/usr/lib/systemd/system/reflector.timer"
diff --git a/libre/reflector/rebranding.patch b/libre/reflector/rebranding.patch
index e035cfaae..fff949891 100644
--- a/libre/reflector/rebranding.patch
+++ b/libre/reflector/rebranding.patch
@@ -1,8 +1,8 @@
 diff --git a/Reflector.py b/Reflector.py
-index 1665090..045fb94 100644
+index 532484f..f3f1948 100644
 --- a/Reflector.py
 +++ b/Reflector.py
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  
  '''
@@ -11,7 +11,7 @@ index 1665090..045fb94 100644
  '''
  
  import argparse
-@@ -49,7 +49,7 @@ import urllib.request
+@@ -50,7 +50,7 @@ import urllib.request
  
  NAME = 'Reflector'
  
@@ -20,7 +20,7 @@ index 1665090..045fb94 100644
  
  DISPLAY_TIME_FORMAT = '%Y-%m-%d %H:%M:%S UTC'
  PARSE_TIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
-@@ -441,7 +441,7 @@ def format_mirrorlist(mirror_status, mtime, include_country=False, command=None,
+@@ -598,7 +598,7 @@ def format_mirrorlist(
  
      width = 80
      colw = 11
@@ -29,7 +29,7 @@ index 1665090..045fb94 100644
      border = '#' * len(header)
      mirrorlist = f'{border}\n{header}\n{border}\n\n' + \
          '\n'.join(
-@@ -495,8 +495,18 @@ class MirrorStatus():
+@@ -653,8 +653,18 @@ class MirrorStatus():
          'extra',
          'gnome-unstable',
          'kde-unstable',
@@ -49,16 +49,18 @@ index 1665090..045fb94 100644
          'staging',
          'testing'
      )
-@@ -656,7 +666,7 @@ def add_arguments(parser):
- 
+@@ -828,8 +838,8 @@ def add_arguments(parser):
      parser.add_argument(
          '--cache-timeout', type=int, metavar='n', default=DEFAULT_CACHE_TIMEOUT,
--        help='The cache timeout in seconds for the data retrieved from the Arch Linux Mirror Status API. The default is %(default)s.'
-+        help='The cache timeout in seconds for the data retrieved from the Parabola GNU/Linux-libre Mirror Status API. The default is %(default)s.'
+         help=(
+-            '''The cache timeout in seconds for the data retrieved from the Arch
+-            Linux Mirror Status API. The default is %(default)s. '''
++            '''The cache timeout in seconds for the data retrieved from the Parabola
++            GNU/Linux-libre Mirror Status API. The default is %(default)s. '''
+         )
      )
  
-     parser.add_argument(
-@@ -790,7 +800,7 @@ def parse_args(args=None):
+@@ -1013,7 +1023,7 @@ def parse_args(args=None):
      Parse command-line arguments.
      '''
      parser = MyArgumentParser(
@@ -68,7 +70,7 @@ index 1665090..045fb94 100644
      )
      parser = add_arguments(parser)
 diff --git a/man/reflector.1 b/man/reflector.1
-index d5751eb..665e74b 100644
+index bd818cc..a543e02 100644
 --- a/man/reflector.1
 +++ b/man/reflector.1
 @@ -11,8 +11,8 @@ reflector - retrieve and filter the latest Pacman mirrorlist