From ff1ea73630a1d4ee43c7d9f06cce6946c032da6b Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 10 Jan 2018 13:45:42 +0000
Subject: [PATCH] community/distcc to 3.2rc1-3

---
 community/distcc/PKGBUILD        | 68 ++++++++++++++++----------------
 community/distcc/distccd.conf.d  |  2 +
 community/distcc/distccd.service |  2 +-
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD
index fae492566..4b59e8330 100644
--- a/community/distcc/PKGBUILD
+++ b/community/distcc/PKGBUILD
@@ -1,6 +1,7 @@
-# $Id: PKGBUILD 57046 2011-10-19 10:30:08Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
+# $Id$
+# Maintainer: Alexander F Rødseth <xyproto@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
@@ -10,34 +11,37 @@
 
 pkgname=distcc
 pkgver=3.2rc1
-pkgrel=2
-pkgdesc="A distributed C, C++, Obj C compiler"
-arch=('i686' 'x86_64')
-url="https://github.com/distcc/distcc"
+pkgrel=3
+pkgdesc='Distributed C, C++ and Objective-C compiler'
+arch=('x86_64')
+url='https://github.com/distcc/distcc'
 license=('GPL')
-depends=('gcc' 'popt')
-makedepends=('gtk2' 'pkgconfig' 'python2')
+depends=('popt')
+makedepends=('gtk2' 'python2')
 optdepends=('python2')
 backup=('etc/conf.d/distccd'
-	'etc/distcc/hosts')
-source=(http://distcc.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
+        'etc/distcc/hosts')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
         distccd.conf.d
         distccd.service
         allow-zero-timeout.patch)
-md5sums=('18cd4f33f5cfc3e75675cafc568fb9cf'
-         '239aae53250e3e35288cba566bc0bbf1'
-         '09f0688da9c1840e518d2593bd5c3830'
-         '6d6abde46f321355eb0eaafc03c2ad1d')
+sha256sums=('33e85981ff6afd94efc38b23b2d8b9036b3dff2dc6eac6982b9ff0ae1de64caa'
+            '43e02b461841ca2976816c244a0eca8b24820ca143f73cc0924403d75a8c012f'
+            '0f18ffb58647eeba643f28e9029a5d307100df3470eb228097f2b3f4196d8098'
+            '73ac95393ee94bcb28f49499e8eec61bfd29a7de38889eaebd237fbbcba6e2c6')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ../allow-zero-timeout.patch
+  cd "$srcdir/$pkgname-$pkgver"
+    patch -p1 -i ../allow-zero-timeout.patch
+  ./autogen.sh
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  [ -f Makefile ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+  [ -f Makefile ] || PYTHON=/usr/bin/python2 \
+    ./configure \
+    --prefix=/usr \
 	--sysconfdir=/etc \
 	--mandir=/usr/share/man \
 	--enable-rfc2553 \
@@ -46,22 +50,18 @@ build() {
   make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python2
 }
 
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-#  make TEST_PYTHON=/usr/bin/python2 check
-}
-
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}/" INCLUDESERVER_PYTHON=/usr/bin/python2 install
-  install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd
+  cd "$srcdir/$pkgname-$pkgver"
 
-  install -d ${pkgdir}/usr/lib/${pkgname}/bin
-  ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/cc
-  ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/gcc
-  ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/g++
-  ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/c++
-  ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/cpp
+  make DESTDIR="$pkgdir" INCLUDESERVER_PYTHON=/usr/bin/python2 install
 
-  install -Dm0644 $srcdir/distccd.service $pkgdir/usr/lib/systemd/system/distccd.service
+  install -d "$pkgdir/usr/lib/$pkgname/bin"
+  for bin in cc gcc g++ c++ cpp; do
+    ln -sf "/usr/bin/$pkgname" "$pkgdir/usr/lib/$pkgname/bin/$bin"
+  done
+
+  install -Dm644 "$srcdir/distccd.conf.d" "$pkgdir/etc/conf.d/distccd"
+  install -Dm644 "$srcdir/distccd.service" "$pkgdir/usr/lib/systemd/system/distccd.service"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/distcc/distccd.conf.d b/community/distcc/distccd.conf.d
index 2fe7a4cc6..a0365fecf 100644
--- a/community/distcc/distccd.conf.d
+++ b/community/distcc/distccd.conf.d
@@ -4,4 +4,6 @@
 # You must explicitly add IPs (or subnets) that are allowed to connect,
 # using the --allow switch.  See the distccd manpage for more info.
 #
+
 DISTCC_ARGS="--allow 127.0.0.1"
+#DISTCC_ARGS="--allow 192.168.0.0/24 --log-level error --log-file /tmp/distccd.log"
diff --git a/community/distcc/distccd.service b/community/distcc/distccd.service
index 0b72fecc3..535ceecf4 100644
--- a/community/distcc/distccd.service
+++ b/community/distcc/distccd.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=A distributed C/C++ compiler
+Description=Distributed C, C++ and Objective-C compiler
 Documentation=man:distccd(1)
 After=network.target