reflector-2014.8-1: updating version

2 files changed, 20 insertions, 19 deletions

diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD
index 3fcfa4750..7cee826e8 100644
--- a/libre/reflector/PKGBUILD
+++ b/libre/reflector/PKGBUILD
@@ -1,8 +1,8 @@
 #Maintainer (Arch): Xyne <ac xunilhcra enyx, backwards>
 #Maintainer: André Silva <emulatorman@parabola.nu>
 pkgname=reflector
-pkgver=2014
-pkgrel=4
+pkgver=2014.8
+pkgrel=1
 pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)'
 arch=(any)
 license=(GPL)
@@ -10,19 +10,19 @@ url="http://xyne.archlinux.ca/projects/reflector"
 depends=(python3)
 optdepends=('rsync: rate rsync mirrors')
 source=(
-  http://xyne.archlinux.ca/projects/reflector/src/reflector-2014.tar.xz
-  http://xyne.archlinux.ca/projects/reflector/src/reflector-2014.tar.xz.sig
+  http://xyne.archlinux.ca/projects/reflector/src/reflector-2014.8.tar.xz
+  http://xyne.archlinux.ca/projects/reflector/src/reflector-2014.8.tar.xz.sig
   rebranding.patch
 )
 sha512sums=(
-  ac9e0026019048c96be5dd4d156bf79b7d7616f764b5d8fb169cb09cbf629a3e2b1efb1ee7cb53b4e0cd109b985f598d9f80941714e47ed0f21c6417df9b073b
-  SKIP
-  83609177f88c0412f1a543f0431ecfb8be229bfef76d7087c35e9273988faedaf24a98ca45d98248eb5dfaa9a27e321dea99a256c68c5bc86a8a0ba53ed56d02
+  c548a5fe638c465803ff7962bdebeef3740b0cbfc65ba5fbbfb1b07d485e90ee1ea35c71e07f9ac3cb9964cf754b28edd81b3df2f3a14c7686ca7fb84cc471eb
+  e9177dcc04b498ffaeadfd83278b0f51dfd7167267e6556ca55768afbe01b1d712ade2ab7252a191002d12da07e5330ade410d8dfa99112ec2aaa93b24d46beb
+  fc042cd3ffa67445a874d460659e43a55607271a2b776a4c810507443babe3a505014a2c48e0e4760cb7c19d6d66797e09c6b1b200985f4685eb8ed5c2347819
 )
 md5sums=(
-  69ab92b948ffe842189229d09bfbf1c0
-  SKIP
-  24c2a21bc1ac0d3758d8043f36d95add
+  b7bf2653b68e79ee40fc715bf180490e
+  583a9a95465c5daa6c0ca6bb86e96f0d
+  d938639a354d46e9819f1f36b3aa5fb3
 )
 
 prepare ()
diff --git a/libre/reflector/rebranding.patch b/libre/reflector/rebranding.patch
index d78462b06..b29653ffd 100644
--- a/libre/reflector/rebranding.patch
+++ b/libre/reflector/rebranding.patch
@@ -1,22 +1,23 @@
 diff --git a/Reflector.py b/Reflector.py
-index c046d23..ddf3ac8 100644
+index 20b7fc7..22e5f9d 100644
 --- a/Reflector.py
 +++ b/Reflector.py
 @@ -63,7 +63,7 @@ def get_cache_file():
  
- class MirrorStatus():
+ class MirrorStatus(object):
    # JSON URI
 -  URL = 'https://www.archlinux.org/mirrors/status/json/'
 +  URL = 'https://parabolagnulinux.org/mirrors/status/json/'
    # Mirror URL format. Accepts server base URL, repository, and architecture.
    MIRROR_URL_FORMAT = '{0}{1}/os/{2}'
    MIRRORLIST_ENTRY_FORMAT = "Server = " + MIRROR_URL_FORMAT + "\n"
-@@ -92,8 +92,12 @@ class MirrorStatus():
+@@ -92,8 +92,13 @@ class MirrorStatus(object):
      'extra',
      'gnome-unstable',
      'kde-unstable',
 +    'libre',
 +    'libre-testing',
++    'libre-multilib',
      'multilib',
 -    'multilib-testing'
 +    'multilib-testing',
@@ -25,7 +26,7 @@ index c046d23..ddf3ac8 100644
      'staging',
      'testing'
    )
-@@ -449,7 +453,7 @@ class MirrorStatus():
+@@ -453,7 +458,7 @@ class MirrorStatus(object):
  
      width = 80
      colw = 11
@@ -34,7 +35,7 @@ index c046d23..ddf3ac8 100644
      border = '#' * len(header)
      mirrorlist = '{}\n{}\n{}\n'.format(border, header, border) + \
        '\n' + \
-@@ -516,7 +520,7 @@ def add_arguments(parser):
+@@ -542,7 +547,7 @@ def add_arguments(parser):
    '''
    Add reflector arguments to the argument parser.
    '''
@@ -42,17 +43,17 @@ index c046d23..ddf3ac8 100644
 +  parser = argparse.ArgumentParser(description='retrieve and filter a list of the latest Parabola GNU/Linux-libre mirrors')
  
    parser.add_argument(
-     '--connection-timeout', dest='connection_timeout', type=int, metavar='n', default=5,
-@@ -535,7 +539,7 @@ def add_arguments(parser):
+     '--connection-timeout', type=int, metavar='n', default=5,
+@@ -561,7 +566,7 @@ def add_arguments(parser):
  
    parser.add_argument(
-     '--cache-timeout', dest='cache_timeout', type=int, metavar='n', default=300,
+     '--cache-timeout', type=int, metavar='n', default=300,
 -    help='The cache timeout in seconds for the data retrieved from the Arch Linux Mirror Status API. The default is 300 (5 minutes).'
 +    help='The cache timeout in seconds for the data retrieved from the Parabola GNU/Linux-libre Mirror Status API. The default is 300 (5 minutes).'
    )
  
    parser.add_argument(
-@@ -615,7 +619,7 @@ def parse_args(args=None):
+@@ -646,7 +651,7 @@ def parse_args(args=None):
    Parse command-line arguments.
    '''
    parser = argparse.ArgumentParser(