Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 81 insertions, 3 deletions

diff --git a/libre/distcc-nozeroconf/PKGBUILD b/libre/distcc-nozeroconf/PKGBUILD
new file mode 100644
index 000000000..2537b2f87
--- /dev/null
+++ b/libre/distcc-nozeroconf/PKGBUILD
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 90657 2013-05-13 14:21:37Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Judd Vinet <jvinet@zeroflux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+_pkgname=distcc
+pkgname=distcc-nozeroconf
+pkgver=3.1
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+pkgrel=11
+pkgdesc="A distributed C, C++, Obj C compiler (without zeroconf support)"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/distcc/"
+license=('GPL')
+depends=('gcc' 'popt')
+makedepends=('gtk2' 'pkgconfig' 'python2')
+optdepends=('gtk2: for distccmon-gnome'
+	    'python2')
+backup=('etc/conf.d/distccd'
+	'etc/distcc/hosts')
+source=(http://distcc.googlecode.com/files/${_pkgname}-${pkgver}.tar.bz2
+	distccd.conf.d
+	distccd.service)
+md5sums=('a1a9d3853df7133669fffec2a9aab9f3'
+         '239aae53250e3e35288cba566bc0bbf1'
+         '09f0688da9c1840e518d2593bd5c3830')
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  [ -f Makefile ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+	--with-gtk \
+	--sysconfdir=/etc \
+	--mandir=/usr/share/man \
+	--without-avahi
+
+  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
+
+  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
+
+  install -Dm0644 $srcdir/distccd.service $pkgdir/usr/lib/systemd/system/distccd.service
+}
diff --git a/libre/distcc-nozeroconf/distccd.conf.d b/libre/distcc-nozeroconf/distccd.conf.d
new file mode 100644
index 000000000..2fe7a4cc6
--- /dev/null
+++ b/libre/distcc-nozeroconf/distccd.conf.d
@@ -0,0 +1,7 @@
+#
+# Parameters to be passed to distccd
+#
+# 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"
diff --git a/libre/distcc-nozeroconf/distccd.service b/libre/distcc-nozeroconf/distccd.service
new file mode 100644
index 000000000..0b72fecc3
--- /dev/null
+++ b/libre/distcc-nozeroconf/distccd.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=A distributed C/C++ compiler
+Documentation=man:distccd(1)
+After=network.target
+
+[Service]
+User=nobody
+EnvironmentFile=/etc/conf.d/distccd
+ExecStart=/usr/bin/distccd --no-detach --daemon $DISTCC_ARGS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 29fedec00..49dc7feb2 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,8 +9,8 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20130608
-_libretools_commit=9fc855b9c4af0e372fa50e1da1ec26d4f2fc5661
+pkgver=20130611
+_libretools_commit=e6944bc03f587ad177c6b825e3f4c116fb9b9b12
 _devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f
 
 _packages_url=https://projects.parabolagnulinux.org/packages
@@ -64,5 +64,5 @@ package_libretools-mips64el() {
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('5de4fdcc9db5e6f52915b6a721cadb37'
+md5sums=('3d5645488481fab48954e194274f70ac'
          'b28b1492fda205be7c577fc03cbc3399')