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

11 files changed, 248 insertions, 23 deletions

diff --git a/libre/distcc-nozeroconf/PKGBUILD b/libre/distcc-nozeroconf/PKGBUILD
new file mode 100644
index 000000000..d58c7a801
--- /dev/null
+++ b/libre/distcc-nozeroconf/PKGBUILD
@@ -0,0 +1,60 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# $Id: PKGBUILD 94163 2013-07-15 11:02:50Z spupykin $
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer (Arch): Judd Vinet <jvinet@zeroflux.org>
+# Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
+
+_pkgname=distcc
+pkgname=distcc-nozeroconf
+pkgver=3.1
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+pkgrel=12
+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 51d33f1cd..104231739 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Joshua Haase <hahj87@gmail.com
+# Contributor: Joshua Haase <hahj87@gmail.com>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Márcio Silva <coadde@lavabit.com>
 
@@ -9,9 +9,11 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20140120.1
-_libretools_commit=641002eff37a30eb2b8237b15b74cc15b4d9f822
+pkgver=20140202
+_libretools_commit=9f28b8f1d7ecc211e4df9f4a16a04960ed1bd582
 _devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd
+md5sums=('6810cb9fe75b0fb543bbc38d130ba71f'
+         'ec69dffa68829f063224de19bbd55fa9')
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -86,6 +88,3 @@ package_libretools-mips64el() {
   cd "$srcdir/$pkgbase-$_libretools_commit"
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
-
-md5sums=('8991b27aed494b60f33c84dd48aea874'
-         'ec69dffa68829f063224de19bbd55fa9')
diff --git a/libre/opencolorio/PKGBUILD b/libre/opencolorio/PKGBUILD
index 56d627d8e..24328ffe8 100644
--- a/libre/opencolorio/PKGBUILD
+++ b/libre/opencolorio/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=opencolorio
 pkgver=1.0.9
-pkgrel=1
+pkgrel=2
 pkgdesc='A color management framework for visual effects and animation (built for the blender-libre package)'
 arch=(
   mips64el
@@ -12,7 +12,13 @@ arch=(
 )
 url=http://opencolorio.org
 license=BSD
-depends=python
+depends=(
+  freeglut
+  glew
+  lcms2
+  openimageio
+  python
+)
 makedepends=cmake
 source=http://github.com/imageworks/OpenColorIO/tarball/v$pkgver
 sha512sums=a3b33949061d16a0e3648c9206291771b9e7532ce56727fe9d323ca15d88e24baf649657286139e1568d5c3564d2b8258d4c3442b3350245f8d2556dc2f1f5d2
@@ -23,8 +29,8 @@ prepare() {
 
 build() {
   cd $pkgname-$pkgver
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
-  make 
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DOCIO_BUILD_DOCS=OFF -DOCIO_PYGLUE_SONAME=ON
+  make
 }
 
 package() {
diff --git a/libre/openimageio/PKGBUILD b/libre/openimageio/PKGBUILD
new file mode 100644
index 000000000..992cd1389
--- /dev/null
+++ b/libre/openimageio/PKGBUILD
@@ -0,0 +1,82 @@
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+# based of Arch pkg
+
+pkgname=openimageio
+pkgver=1.3.12
+pkgrel=1
+pkgdesc='A library for reading and writing images, including classes, utilities, and applications (built for the blender-libre package)'
+arch=(
+  mips64el
+  x86_64
+  i686
+)
+url=http://www.openimageio.org/
+license=custom
+depends=(
+  boost-libs
+  freetype2
+  giflib
+  glew
+  libjpeg-turbo
+  libpng
+  libtiff
+  libwebp
+  opencolorio
+  openexr
+  openjpeg
+  openssl
+  zlib
+)
+makedepends=(
+  boost
+  cmake
+  python2
+  qt4
+)
+optdepends=(
+  'qt4: iv image viewer'
+  'python2: bindings support'
+)
+source=https://github.com/OpenImageIO/oiio/archive/Release-$pkgver.tar.gz
+sha512sums=SKIP
+
+prepare() {
+  cd oiio-Release-$pkgver
+
+  msg 'renaming wrong OS name'
+  _OS=$(uname -o)
+  [[ $_OS == GNU ]] &&\
+    sed -i 's|linux|GNU|i;
+           ' src/{cmake/platform.cmake,make/detectplatform.mk}
+  [[ $_OS == GNU/Linux ]] &&\
+    sed -i 's|[{]uname[}][,]linux]|{uname -o},GNU/Linux|;\|platform| s|linux|GNU/Linux|i
+           ' src/{cmake/platform.cmake,make/detectplatform.mk}
+  [[ $_OS == GNU/kFreeBSD ]] &&\
+    sed -i '\|STREQUAL| s|FreeBSD|kFreeBSD|;\|platform| s|freebsd|GNU/kFreeBSD|i
+           ' src/cmake/platform.cmake
+    sed -i 's|[{]uname[}][,]linux]|{uname -o},GNU/kFreeBSD|;\|platform| s|linux|GNU/kFreeBSD|i
+           ' src/make/detectplatform.mk
+
+  [[ -d build ]] && rm -r build
+  mkdir build
+}
+
+build() {
+  cd oiio-Release-$pkgver/build
+  cmake .. \
+      -DCMAKE_INSTALL_PREFIX=/usr\
+      -DOIIO_BUILD_TESTS=OFF\
+      -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages\
+      -DPYLIB_INCLUDE_SONAME=ON\
+      -DPYLIB_LIB_PREFIX=OFF\
+      -DUSE_EXTERNAL_TBB=OFF
+  make
+}
+
+package() {
+  cd oiio-Release-$pkgver/build
+  make DESTDIR=$pkgdir install
+  install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/pngcrush/PKGBUILD b/libre/pngcrush/PKGBUILD
new file mode 100644
index 000000000..7b43aa0ff
--- /dev/null
+++ b/libre/pngcrush/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=pngcrush
+pkgver=1.7.70
+pkgrel=1
+pkgdesc="A tool for optimizing the compression of PNG files"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://pmt.sourceforge.net/pngcrush/"
+license=('custom')
+depends=('libpng' 'zlib')
+source=(http://downloads.sourceforge.net/pmt/$pkgname-$pkgver-nolib.tar.xz)
+md5sums=('cd1619005f46f4032442bdc0e49d9212')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver-nolib
+  sed -n '10,17s/^\s*//p' cexcept.h > LICENSE.cexcept.txt
+  sed -rn '97,142s/ \* ?//p' pngcrush.c > LICENSE.pngcrush.txt
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver-nolib
+  install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
+  install -Dm644 LICENSE.cexcept.txt "$pkgdir"/usr/share/licenses/$pkgname/cexcept.txt
+  install -Dm644 LICENSE.pngcrush.txt "$pkgdir"/usr/share/licenses/$pkgname/pngcrush.txt
+}
diff --git a/libre/ronn/PKGBUILD b/libre/ronn/PKGBUILD
index 4bd097048..3f8d0470e 100644
--- a/libre/ronn/PKGBUILD
+++ b/libre/ronn/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 _gemname=ronn
 pkgname=$_gemname
@@ -9,7 +9,7 @@ license=('custom:MIT')
 
 provides=(ruby-$_gemname=$pkgver)
 
-pkgrel=4
+pkgrel=5
 arch=('any')
 depends=('ruby' 'ruby-hpricot' 'ruby-rdiscount' 'ruby-mustache')
 makedepends=('rubygems')
@@ -23,8 +23,10 @@ package() {
   gem install --no-user-install  --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
     "$_gemname-$pkgver.gem"
 
-  install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \
-                 "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+  install -d "$pkgdir"/usr/share/licenses/$pkgname
+  ln -sr "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \
+    "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+
   shopt -s nullglob
   for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do
     install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/}
diff --git a/libre/ruby-hpricot/PKGBUILD b/libre/ruby-hpricot/PKGBUILD
new file mode 100644
index 000000000..6a15b2af7
--- /dev/null
+++ b/libre/ruby-hpricot/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_gemname=hpricot
+pkgname=ruby-$_gemname
+pkgver=0.8.6
+pkgdesc="_why's old HTML parser"
+url="http://github.com/hpricot/hpricot"
+license=('custom:MIT')
+
+pkgrel=2
+arch=('i686' 'x86_64')
+depends=('ruby')
+makedepends=('rubygems')
+source=(http://rubygems.org/downloads/${_gemname}-${pkgver}.gem)
+noextract=(${_gemname}-${pkgver}.gem)
+md5sums=('b0f1f02448037f4f6243c33d5f818fa4')
+
+package() {
+  cd "${srcdir}"
+  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+  gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
+    "$_gemname-$pkgver.gem"
+
+  install -d "$pkgdir"/usr/share/licenses/$pkgname
+  ln -sr "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \
+    "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
diff --git a/libre/ruby-mustache/PKGBUILD b/libre/ruby-mustache/PKGBUILD
index d7090cc0d..dbea70158 100644
--- a/libre/ruby-mustache/PKGBUILD
+++ b/libre/ruby-mustache/PKGBUILD
@@ -8,9 +8,9 @@ pkgdesc="A framework-agnostic way to render logic-free views."
 url="http://mustache.github.io/"
 license=('custom:MIT')
 
-pkgrel=3
+pkgrel=4
 arch=('any')
-depends=('ruby>=2')
+depends=('ruby')
 makedepends=('rubygems')
 source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem")
 md5sums=('650194ec2c166feb087377647414b9dc')
@@ -22,8 +22,10 @@ package() {
   gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
     "$_gemname-$pkgver.gem"
 
-  install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/LICENSE \
-                 "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  install -d "$pkgdir"/usr/share/licenses/$pkgname
+  ln -sr "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/LICENSE \
+    "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+
   shopt -s nullglob
   for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do
     install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/}
diff --git a/libre/ruby-rdiscount/PKGBUILD b/libre/ruby-rdiscount/PKGBUILD
index b6cbcc4cc..449a717f7 100644
--- a/libre/ruby-rdiscount/PKGBUILD
+++ b/libre/ruby-rdiscount/PKGBUILD
@@ -4,7 +4,7 @@
 
 _gemname=rdiscount
 pkgname=ruby-$_gemname
-pkgver=2.1.6
+pkgver=2.1.7
 pkgdesc="C implementation of John Gruber's Markdown."
 url="http://dafoster.net/projects/rdiscount/"
 
@@ -14,7 +14,8 @@ pkgrel=1
 arch=('i686' 'x86_64')
 depends=('ruby')
 makedepends=('rubygems')
-source=(http://rubygems.org/downloads/$_gemname-$pkgver.gem)
+source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem)
+md5sums=('33fcd949e204dcacff0002e597cdd7e7')
 noextract=($_gemname-$pkgver.gem)
 
 package() {
@@ -23,12 +24,13 @@ package() {
   gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
     "$_gemname-$pkgver.gem"
 
-  install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \
-                 "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+  install -d "$pkgdir"/usr/share/licenses/$pkgname
+  ln -sr "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \
+    "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+
   shopt -s nullglob
   for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do
     install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/}
   done
 }
 
-md5sums=('99c5a8f33f6796e766f0b8e73b0519c6')