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

14 files changed, 327 insertions, 9 deletions

diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index 541372a2e..9638a6135 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -10,7 +10,7 @@ _srcver=ad6536b0dda8
 
 pkgname=$_bldname-addon-$_srcname
 pkgver=$_pkgver.v$_bldver
-pkgrel=1
+pkgrel=2
 pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)"
 arch=any
 url=http://www.$_srcname.net/
@@ -26,6 +26,12 @@ replaces=$_pkgname
 source=http://src.$_srcname.net/$_pkgname/archive/$_srcver.tar.bz2
 sha512sums=7bfd64abde07d9ad90d5e80a95f6fe5478ff65a8ff6965bd3a6c9671907a9a940affa5fb1a593884dc9eb6a5c967eaa1386a3225edc9cbbbb4c20c5d26198aa1
 
+prepare() {
+  sed -i "\|def find_luxrender_path[(][)]|,+9 d
+          s|find_luxrender_path[(][)]|'/usr/bin'|
+         " $srcdir/$_pkgname-$_srcver/src/$_srcname/__init__.py
+}
+
 package() {
   a=$srcdir/$_pkgname-$_srcver/src/$_srcname
   b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index f01210a1e..fffb0926b 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=blender
 epoch=10
 _pkgver=2.69
-pkgrel=2
+pkgrel=3
 _jpgver=1.5
 _pyver=3.3
 
@@ -46,6 +46,11 @@ depends=(
 optdepends=(
   'bullet: for Rigid Bodies and Physics Simulation'
   'xcftools: for import GIMP images to scene (pcr repo)'
+  'povray-libre: for optional renderer with POV-Ray'
+  'blender-addon-luxrender: for optional renderer and exporter with LuxRender'
+  'blender-addon-mitsuba: for optional renderer and exporter with Mitsuba (pcr repo)'
+  'blender-addon-ogre: for export to Ogre3D formats (pcr repo)'
+  'blender-addon-yafaray: for optional renderer with YafaRay (pcr repo)'
 )
 makedepends=(
   boost
@@ -87,6 +92,11 @@ prepare() {
           s|open-source and free|free|
          ' release/text/readme.html
 
+  msg 'fixing povray-libre path and desc'
+  sed -i "s|FILE_PATH',|FILE_PATH',\n                default='/usr/bin/povray',|
+          s|both POV-Ray 3[.]7 and this script are beta|this script is beta|
+         " release/scripts/addons/render_povray/__init__.py  
+
   mkdir -v build
 }
 
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 5d31f1386..86f9c296c 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=luxrender
 pkgname=$_pkgname-libre
 pkgver=1.3.1
 _pkgver=d0b0e20c47cc
-pkgrel=1
+pkgrel=3
 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.$_pkgname.net/"
@@ -15,17 +15,27 @@ license=('GPL')
 depends=('boost-libs' 'freeimage' 'openexr' 'mesa-libcl' 'mesa-libgl' 'fftw')
 optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \
             'python: Python interface (pylux)')
-makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
-makedepends+=('libtool-lts')
+makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers' \
+             'clang')
 provides=($_pkgname=$pkgver)
 conflicts=$_pkgname
 replaces=$_pkgname
-source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2)
-md5sums=('cbe749f56a1e1976745f5458100efa8a')
+source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2 \
+        force_python3.diff)
+md5sums=('cbe749f56a1e1976745f5458100efa8a'
+         '42692e65eabc5828693e2682e94b7c64')
+
+prepare() {
+  cd "$srcdir"/$_pkgname-lux-$_pkgver
+
+  patch -Np1 < "$srcdir/force_python3.diff" || true
+}
 
 build() {
   cd "$srcdir"/$_pkgname-lux-$_pkgver
 
+  export CC=clang
+  export CXX=clang++
   export CXXFLAGS="$CXXFLAGS -lpthread"
   cmake . -DCMAKE_INSTALL_PREFIX=/usr \
     -DLUXRAYS_DISABLE_OPENCL=OFF \
diff --git a/libre/luxrender-libre/force_python3.diff b/libre/luxrender-libre/force_python3.diff
new file mode 100644
index 000000000..1ee61e872
--- /dev/null
+++ b/libre/luxrender-libre/force_python3.diff
@@ -0,0 +1,12 @@
+diff -rup luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake
+--- luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake	2013-11-04 22:25:45.000000000 +0100
++++ luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake	2013-12-05 19:43:23.414625854 +0100
+@@ -156,7 +156,7 @@ IF(MSVC AND BOOST_python_LIBRARYDIR)
+ 	SET(BOOST_LIBRARYDIR "${BOOST_python_LIBRARYDIR}")
+ ENDIF(MSVC AND BOOST_python_LIBRARYDIR)
+ 
+-FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python REQUIRED)
++FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python3 REQUIRED)
+ 
+ IF(MSVC AND BOOST_python_LIBRARYDIR)
+ 	SET(BOOST_LIBRARYDIR "${_boost_libdir}")
diff --git a/pcr/galera/PKGBUILD b/pcr/galera/PKGBUILD
new file mode 100644
index 000000000..b6ba8890c
--- /dev/null
+++ b/pcr/galera/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Rustam Tsurik <rustam.tsurik@gmail.com>
+# Contributor: Nico Suarez <nicodoggie@gmail.com>
+
+pkgname=galera
+pkgver=25.3.2
+pkgrel=1
+pkgdesc='Galera WSREP provider'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('boost>=1.41' 'openssl')
+makedepends=('check' 'scons' 'patch')
+url='http://www.codership.com'
+options=('!libtool')
+source=(https://launchpad.net/galera/3.x/$pkgver/+download/galera-$pkgver-src.tar.gz)
+sha256sums=('5dd54364720f8854088590bdfea1e3a7f3e37fda3dfe8a5f58ebcc987cc6788d')
+
+build(){
+  cd "$srcdir"
+  cd "$pkgname-$pkgver-src"
+  scons
+}
+
+package(){
+  install -Dm0644 "$srcdir"/$pkgname-$pkgver-src/libgalera_smm.so "$pkgdir"/usr/lib/libgalera_smm.so
+  install -Dm0755 "$srcdir"/$pkgname-$pkgver-src/garb/garbd "$pkgdir"/usr/bin/garbd
+  install -Dm0644 "$srcdir"/$pkgname-$pkgver-src/scripts/packages/README "$pkgdir"/usr/share/doc/galera/README
+  install -m0644 "$srcdir"/$pkgname-$pkgver-src/scripts/packages/README-MySQL "$pkgdir"/usr/share/doc/galera/README-MySQL
+  install -m0644 "$srcdir"/$pkgname-$pkgver-src/COPYING "$pkgdir"/usr/share/doc/galera/COPYING
+}
diff --git a/pcr/lostfiles/PKGBUILD b/pcr/lostfiles/PKGBUILD
new file mode 100644
index 000000000..acc8ddd64
--- /dev/null
+++ b/pcr/lostfiles/PKGBUILD
@@ -0,0 +1,17 @@
+# Contributor: graysky <graysky AT archlinux dot us>
+
+pkgname=lostfiles
+pkgver=3.07
+pkgrel=1
+pkgdesc='Find orphan files - those not owned by any Arch packages.'
+arch=('any')
+license=('GPL2')
+depends=('bash')
+url="https://github.com/graysky2/lostfiles"
+source=("https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz")
+sha256sums=('970d35a619043471067d58a6702443d5e7b9ab9ead96c37ae0811ecb11d2424d')
+
+package() {
+	cd "$pkgname-$pkgver"
+	install -Dm755 $pkgname "$pkgdir/usr/bin/$pkgname"
+}
diff --git a/pcr/mariadb-galera/PKGBUILD b/pcr/mariadb-galera/PKGBUILD
new file mode 100644
index 000000000..920137305
--- /dev/null
+++ b/pcr/mariadb-galera/PKGBUILD
@@ -0,0 +1,107 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+
+pkgname=mariadb-galera
+pkgbase=mariadb-galera
+pkgver=5.5.33a
+_pkgver=${pkgver/.a/a}
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL')
+url='https://mariadb.com/kb/en/galera/'
+pkgdesc='Fast SQL database server, drop-in replacement for MySQL with Galera Cluster'
+backup=('etc/mysql/my.cnf')
+install=mariadb.install
+depends=('mariadb-clients' 'inetutils' 'libaio' 'galera')
+conflicts=('mysql')
+provides=("mysql=$pkgver" "mariadb")
+options=('emptydirs')
+makedepends=('cmake' 'openssl' 'zlib' 'libaio')
+source=(http://ftp.wa.co.za/pub/mariadb/${pkgname}-${pkgver}/kvm-tarbake-jaunty-x86/${pkgname}-${pkgver}.tar.gz
+        mariadb.service
+        mariadb-post.sh
+        mariadb-tmpfile.conf)
+sha256sums=('1b49e41e677d95f7a5b548771a81c6430ec6f0ee16e7ee624fb2fe2b278183b8'
+            'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
+            '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
+            '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
+
+prepare() {
+  mkdir build
+}
+
+build() {
+  cd build
+
+  cmake ../mariadb-$pkgver \
+    -DBUILD_CONFIG=mysql_release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSYSCONFDIR=/etc/mysql \
+    -DMYSQL_DATADIR=/var/lib/mysql \
+    -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+    -DDEFAULT_CHARSET=utf8 \
+    -DDEFAULT_COLLATION=utf8_general_ci \
+    -DENABLED_LOCAL_INFILE=ON \
+    -DINSTALL_INFODIR=share/mysql/docs \
+    -DINSTALL_MANDIR=share/man \
+    -DINSTALL_PLUGINDIR=lib/mysql/plugin \
+    -DINSTALL_SCRIPTDIR=bin \
+    -DINSTALL_INCLUDEDIR=include/mysql \
+    -DINSTALL_DOCREADMEDIR=share/mysql \
+    -DINSTALL_SUPPORTFILESDIR=share/mysql \
+    -DINSTALL_MYSQLSHAREDIR=share/mysql \
+    -DINSTALL_DOCDIR=share/mysql/docs \
+    -DINSTALL_SHAREDIR=share/mysql \
+    -DWITH_READLINE=ON \
+    -DWITH_ZLIB=system \
+    -DWITH_SSL=system \
+    -DWITH_LIBWRAP=OFF \
+    -DWITH_EXTRA_CHARSETS=complex \
+    -DWITH_EMBEDDED_SERVER=ON \
+    -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+    -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
+    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+    -DWITH_PARTITION_STORAGE_ENGINE=1 \
+    -DWITH_TOKUDB_STORAGE_ENGINE=1 \
+    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+    -DWITHOUT_OQGRAPH_STORAGE_ENGINE=1 \
+    -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
+    -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
+    -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
+    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
+    -DWITH_WSREP=ON \
+    -DWITH_INNODB_DISALLOW_WRITES=1
+
+
+  make
+}
+
+package() {
+
+  cd build
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
+  install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
+  install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
+  install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
+
+  # provided by libmariadbclient
+  cd "$pkgdir"
+  rm -f usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  rm -f usr/lib/libmysql*
+  rm -rf usr/include/
+  rm -f usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+  
+  # provided by mariadb-clients
+  rm -f usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm -f usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+  # provided by mytop
+  rm -f usr/bin/mytop
+
+  # not needed
+  rm -rf usr/{data,mysql-test,sql-bench}
+  rm -f usr/share/man/man1/mysql-test-run.pl.1
+}
diff --git a/pcr/mariadb-galera/mariadb-post.sh b/pcr/mariadb-galera/mariadb-post.sh
new file mode 100644
index 000000000..c4ac18171
--- /dev/null
+++ b/pcr/mariadb-galera/mariadb-post.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+while true; do
+    response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
+    echo "$response" | grep -q "mysqld is alive" && break
+    echo "$response" | grep -q "Access denied for user" && break 
+    sleep 1
+done
diff --git a/pcr/mariadb-galera/mariadb-tmpfile.conf b/pcr/mariadb-galera/mariadb-tmpfile.conf
new file mode 100644
index 000000000..6883dc798
--- /dev/null
+++ b/pcr/mariadb-galera/mariadb-tmpfile.conf
@@ -0,0 +1 @@
+d /run/mysqld 0755 mysql mysql -
diff --git a/pcr/mariadb-galera/mariadb.install b/pcr/mariadb-galera/mariadb.install
new file mode 100644
index 000000000..7d3c2ce5c
--- /dev/null
+++ b/pcr/mariadb-galera/mariadb.install
@@ -0,0 +1,47 @@
+if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then
+  datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
+fi
+[[ -z $datadir ]] && datadir=/var/lib/mysql
+
+post_install(){
+  groupadd -g 89 mysql &>/dev/null
+  useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+
+  if [[ ! -e $datadir ]]; then
+    install -dm700 $datadir
+    usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
+    chown -R mysql:mysql var/lib/mysql &>/dev/null
+  fi
+
+  usr/bin/systemd-tmpfiles --create mysql.conf
+
+  echo ">> If you are migrating from MySQL, don't forget to run 'mysql_upgrade'"
+  echo "     after mysqld.service restart." 
+}
+
+post_upgrade(){
+  getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
+  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+
+  if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
+    for x in data/*; do
+      cp -r $x $datadir/
+    done
+    rm -rf data
+  fi
+
+  if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
+    echo ">> mysql.service has been renamed to mysqld.service to keep"
+    echo "    consistency with MySQL package." 
+  fi
+}
+
+post_remove(){
+  if getent passwd mysql >/dev/null 2>&1; then
+    userdel mysql
+
+  fi
+  if getent group mysql >/dev/null 2>&1; then
+    groupdel mysql
+  fi
+}
diff --git a/pcr/mariadb-galera/mariadb.service b/pcr/mariadb-galera/mariadb.service
new file mode 100644
index 000000000..dd65511d7
--- /dev/null
+++ b/pcr/mariadb-galera/mariadb.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=MariaDB database server
+After=syslog.target
+
+[Service]
+User=mysql
+Group=mysql
+
+ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid 
+ExecStartPost=/usr/bin/mysqld-post
+
+Restart=always
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/md5deep/PKGBUILD b/pcr/md5deep/PKGBUILD
new file mode 100755
index 000000000..fe1acb7bd
--- /dev/null
+++ b/pcr/md5deep/PKGBUILD
@@ -0,0 +1,45 @@
+# Contributor: billycongo <billycongo@gmail.com>
+# Maintainer: dkaylor <dpkaylor@gmail.com>
+
+pkgname=md5deep
+pkgver=4.3
+pkgrel=2
+arch=('i686' 'x86_64')
+pkgdesc="Advanced checksum hashing tool"
+url="http://md5deep.sourceforge.net"
+license=('Public Domain')
+
+# Copyright and license stuff:
+#
+# This program is a work of the US Government.
+# In accordance with 17 USC 105, copyright protection is not available for any work of the US Government. 
+# This program is PUBLIC DOMAIN. Portions of this program contain code that is licensed under the terms of the General Public License (GPL). 
+# Those portions retain their original copyright and license. See the file COPYING for more details.
+# There is NO warranty for this program; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+#
+# md5deep was originally developed by Jesse Kornblum <research (a t) jessekornblum ,,dot. com> during his service as a 
+# Special Agent with the United States Air Force Office of Special Investigations (AFOSI).
+# As such, md5deep exists in the public domain under 17 USC 105.
+
+depends=('glibc')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+
+md5sums=('f172e686ca1df83a53308ad90f7f706d')
+sha1sums=('b9dd6444f07c9fc344ebef201baebdf71bda337f')
+sha256sums=('905bcf8bddf0e7e2650b280d5e7af8cb8cd41dad4f299751dfec397dcb4f8d54')
+sha512sums=('fe1240e6ae039b18d35a9de0cf15fb77eaac9d5505b6b550eb32858bf6d603f8186de06114d40325d5071640f46cec70795e9c192fa7b6ca9022a12c212a9b14')
+
+
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR=$pkgdir install
+}
diff --git a/pcr/radicale/radicale.install b/pcr/radicale/radicale.install
new file mode 100644
index 000000000..2bd33ed49
--- /dev/null
+++ b/pcr/radicale/radicale.install
@@ -0,0 +1,10 @@
+post_install() {
+  useradd --create-home \
+          --home-dir /srv/cal \
+          --user-group \
+          --system \
+          --comment "Radicale" \
+          --skel /dev/null \
+          --shell /usr/bin/nologin \
+          cal
+}
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 7d9ab915e..d0fa533d7 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.12.09.1
+pkgver=2013.12.11.2
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -28,5 +28,5 @@ package() {
     "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-md5sums=('65ac7d4f7f619a74383839ce5d16936d'
+md5sums=('9ba12ec6e9174b564069a72db7582563'
          'SKIP')