Merge branch 'master' into i486

4 files changed, 24 insertions, 68 deletions

diff --git a/community/electron/PKGBUILD b/community/electron/PKGBUILD
index 03e55b2f..b8b43791 100644
--- a/community/electron/PKGBUILD
+++ b/community/electron/PKGBUILD
@@ -4,6 +4,7 @@ sha512sums+=('bce6716f88c0ed7acc72f90ef62f7c4a28b88e98d7fc8dcb6abf545eb6ab7de11e
 eval "$(
   declare -f prepare | \
     sed '
+      2 a find "${srcdir}" \\( '"-name '*.a' -o -name '*.o'"' \\) -delete
       3 a patch -Np1 -i "${srcdir}"/allow-i686.patch
     '
   declare -f build | \
diff --git a/community/pacman-contrib/PKGBUILD b/community/pacman-contrib/PKGBUILD
new file mode 100644
index 00000000..3b82e161
--- /dev/null
+++ b/community/pacman-contrib/PKGBUILD
@@ -0,0 +1,7 @@
+source+=('rankmirror.sh.diff')
+sha256sums+=('7a0fe662825d70decaa613a6d6104c39b3046f4ac710dc0c974316c671af35da')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/rankmirror.sh.diff"
+}
diff --git a/community/pacman-contrib/rankmirror.sh.diff b/community/pacman-contrib/rankmirror.sh.diff
new file mode 100644
index 00000000..c7ea00a1
--- /dev/null
+++ b/community/pacman-contrib/rankmirror.sh.diff
@@ -0,0 +1,16 @@
+diff --git a/src/rankmirrors.sh.in b/src/rankmirrors.sh.in
+index 08f7e28..8f9143f 100644
+--- a/src/rankmirrors.sh.in
++++ b/src/rankmirrors.sh.in
+@@ -79,10 +79,8 @@ getfetchurl() {
+ 	local replacedurl="${strippedurl//'$arch'/$ARCH}"
+ 	if [[ ! $TARGETREPO ]]; then
+ 		replacedurl="${replacedurl//'$repo'/core}"
+-		local tmp="${replacedurl%/*}"
+-		tmp="${tmp%/*}"
+ 
+-		local reponame="${tmp##*/}"
++		local reponame="${replacedurl##*/}"
+ 	else
+ 		replacedurl="${replacedurl//'$repo'/$TARGETREPO}"
+ 		local reponame="$TARGETREPO"
diff --git a/community/python-redis/tmp b/community/python-redis/tmp
deleted file mode 100644
index 6381b912..00000000
--- a/community/python-redis/tmp
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars@archlinux.org>
-# Contributor: Karol 'Kenji Takahashi' Woźniak <kenji.sx>
-# Contributor: Pierre Gueth <pierre.gueth@gmail.com>
-
-pkgbase=python-redis
-pkgname=('python-redis' 'python2-redis')
-pkgver=2.10.6
-pkgrel=1
-pkgdesc='The Python interface to the Redis key-value store'
-arch=('any')
-url="http://github.com/andymccurdy/redis-py"
-license=('MIT')
-makedepends=('python-setuptools' 'python2-setuptools')
-checkdepends=('python-pytest' 'python2-pytest' 'python-mock' 'python2-mock' 'python-pifpaf' 'redis')
-source=("https://pypi.io/packages/source/r/redis/redis-$pkgver.tar.gz" precision.patch)
-sha512sums=('e7df464bc3b26e23f6a0d2d2896306c1e4792b9a2a4ecaea6dd8690ffa17853cc85345f063307295dd3c2da399f7f203f4b21d785f7e073c0501732257419dad' 'SKIP')
-
-prepare() {
-  patch -p0 -i precision.patch
-  cp -a redis-$pkgver{,-py2}
-}
-
-build() {
-  cd redis-$pkgver
-  python setup.py build
-
-  cd ../redis-$pkgver-py2
-  python2 setup.py build
-}
-
-check() {
-  cd redis-$pkgver
-  pifpaf run redis py.test
-
-  cd ../redis-$pkgver-py2
-  pifpaf run redis py.test2
-}
-
-package_python-redis() {
-  depends=('python')
-
-  cd redis-$pkgver
-  python setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_python2-redis() {
-  depends=('python2')
-
-  cd redis-$pkgver-py2
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-# vim:set ts=2 sw=2 et:
-# see https://github.com/andymccurdy/redis-py/issues/899
-
-source+=('precision.patch')
-sha512sums+=('ccefada444c145f78098a37880bf7b1c7a2f2e24e92efc62f084610064c4391e4e0792a3e380ca940b73b15d703d5d0f166a8f7d8d17b9d84772b3e870fb74d5')
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      /^{/ a \
-        patch -p0 -i precision.patch
-    '
-)"