Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apcupsd/PKGBUILD
	community/bmp-musepack/PKGBUILD
	community/bmp-wma/PKGBUILD
	community/bonnie++/PKGBUILD
	community/cantata/PKGBUILD
	community/checkinstall/PKGBUILD
	community/chrootuid/PKGBUILD
	community/compiz-bcop/PKGBUILD
	community/compiz-fusion-plugins-extra/PKGBUILD
	community/compiz-fusion-plugins-main/PKGBUILD
	community/compiz/PKGBUILD
	community/compizconfig-backend-gconf/PKGBUILD
	community/compizconfig-python/PKGBUILD
	community/ekg2/PKGBUILD
	community/emerald/PKGBUILD
	community/fbgetty/PKGBUILD
	community/flumotion/PKGBUILD
	community/leafnode/PKGBUILD
	community/libcompizconfig/PKGBUILD
	community/libdnet/PKGBUILD
	community/libee/PKGBUILD
	community/libtxc_dxtn/PKGBUILD
	community/linux-tools/PKGBUILD
	community/openntpd/PKGBUILD
	community/osiris/PKGBUILD
	community/perl-package-stash-xs/PKGBUILD
	community/perl-params-util/PKGBUILD
	community/procstatd/PKGBUILD
	community/scponly/PKGBUILD
	community/sniffit/PKGBUILD
	community/synergy/PKGBUILD
	community/turbojpeg/PKGBUILD
	community/unbound/PKGBUILD
	community/uucp/PKGBUILD
	core/gawk/PKGBUILD
	core/ifenslave/PKGBUILD
	core/jfsutils/PKGBUILD
	core/openldap/PKGBUILD
	core/rfkill/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	core/xinetd/PKGBUILD
	extra/avahi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/flac/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libdmx/PKGBUILD
	extra/libfs/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxfixes/PKGBUILD
	extra/licq/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/perl-guard/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pigeonhole/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/python/PKGBUILD
	extra/samba/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vde2/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/xscreensaver-libre/PKGBUILD

7 files changed, 202 insertions, 7 deletions

diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD
index 4fe7b534b..430ab93d5 100644
--- a/libre-testing/libretools/PKGBUILD
+++ b/libre-testing/libretools/PKGBUILD
@@ -8,9 +8,9 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20130514
-_libretools_commit=b261c8585cf6aa9e7bf5b960b2a0a047d769dbae
-_devtools_commit=89d15e7697da2169493142f78a90b57a784d8f22
+pkgver=20130528.2
+_libretools_commit=e5c22aaf01484e7fa5926952bbcacd56228dbb64
+_devtools_commit=d197eacf8b7aba0796a0f6ac6ac1667564bd614e
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -19,6 +19,7 @@ source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.ta
 pkgrel=1
 arch=('any')
 makedepends=(emacs) # emacs --batch is used during the build to process text
+checkdepends=(sh-roundup)
 
 build() {
   cd "$srcdir"
@@ -27,10 +28,23 @@ build() {
   make build-libretools build-libretools-mips64el build-doc
 }
 
+check() {
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+
+  # some tests require 'sudo'; trick those into passing
+  mkdir "$srcdir/bin"
+  ln -s $(which true) "$srcdir/bin/sudo"
+  _PATH=$PATH
+  export PATH="$srcdir/bin:$PATH"
+
+  make check
+
+  export PATH=$_PATH
+}
+
 package_libretools() {
   backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
   install=libretools.install
-  groups=(base-devel)
   replaces=(chroottools)
 
   depends=(
@@ -40,7 +54,7 @@ package_libretools() {
     rsync # `librerelease` and `makechrootpkg.sh`
     subversion # `diff-unfree`
     tokyocabinet # `treepkg`
-    wget # `aur` and `pkgbuild-check-nonfree`
+    wget # `aur` and `lib/blacklist.sh`
   )
   optdepends=('namcap: to check package files')
 
@@ -57,5 +71,5 @@ package_libretools-mips64el() {
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('ce2a406d66033b48cacfb580997c1250'
-         '21d77c519a7496185c40399d1cfa26bf')
+md5sums=('47ff5308a56dd8ae2cf18b82a99b0021'
+         '05b987e6b39c963154489ac6d01d0965')
diff --git a/libre-testing/ronn/PKGBUILD b/libre-testing/ronn/PKGBUILD
new file mode 100644
index 000000000..4bd097048
--- /dev/null
+++ b/libre-testing/ronn/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
+
+_gemname=ronn
+pkgname=$_gemname
+pkgver=0.7.3
+pkgdesc="The opposite of roff; manual authoring tool"
+url="http://rtomayko.github.io/ronn/"
+license=('custom:MIT')
+
+provides=(ruby-$_gemname=$pkgver)
+
+pkgrel=4
+arch=('any')
+depends=('ruby' 'ruby-hpricot' 'ruby-rdiscount' 'ruby-mustache')
+makedepends=('rubygems')
+source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem)
+noextract=($_gemname-$pkgver.gem)
+md5sums=('c5aa4ef58d35d0cc635b769281e03225')
+
+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 -Dm644 "$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
+}
diff --git a/libre-testing/ruby-hpricot/PKGBUILD b/libre-testing/ruby-hpricot/PKGBUILD
new file mode 100644
index 000000000..ad9aefc36
--- /dev/null
+++ b/libre-testing/ruby-hpricot/PKGBUILD
@@ -0,0 +1,25 @@
+# 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=1
+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 -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \
+                 "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
diff --git a/libre-testing/ruby-mustache/PKGBUILD b/libre-testing/ruby-mustache/PKGBUILD
new file mode 100644
index 000000000..d7090cc0d
--- /dev/null
+++ b/libre-testing/ruby-mustache/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): David Campbell <davekong@archlinux.us>
+
+_gemname=mustache
+pkgname=ruby-$_gemname
+pkgver=0.99.4
+pkgdesc="A framework-agnostic way to render logic-free views."
+url="http://mustache.github.io/"
+license=('custom:MIT')
+
+pkgrel=3
+arch=('any')
+depends=('ruby>=2')
+makedepends=('rubygems')
+source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem")
+md5sums=('650194ec2c166feb087377647414b9dc')
+noextract=($_gemname-$pkgver.gem)
+
+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 -Dm644 "$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##*/}
+  done
+}
diff --git a/libre-testing/ruby-rdiscount/PKGBUILD b/libre-testing/ruby-rdiscount/PKGBUILD
new file mode 100644
index 000000000..76e4b58bd
--- /dev/null
+++ b/libre-testing/ruby-rdiscount/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
+# Maintainer (AUR): Alexsandr Pavlov <kidoz at mail dot ru>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail dot com>
+
+_gemname=rdiscount
+pkgname=ruby-$_gemname
+pkgver=1.6.5
+pkgdesc="C implementation of John Gruber's Markdown."
+url="http://dafoster.net/projects/rdiscount/"
+
+# About the license: It is a 4-clause BSD license with the 3rd clause modified
+# to mention documentation instead of advertising.  Not to be confused with
+# "Modified BSD", which the FSF uses to refer to a 3-clause BSD license
+# (dropping the 3rd clause).  Because of the way it is modified, it doesn't have
+# the problems normally associated with the 4-clause BSD license.
+license=('custom:modified-BSD4')
+
+pkgrel=2
+arch=('i686' 'x86_64')
+depends=('ruby')
+makedepends=('rubygems')
+source=(http://rubygems.org/downloads/$_gemname-$pkgver.gem)
+noextract=($_gemname-$pkgver.gem)
+md5sums=('2de321f1ba826f80b84fe45c0d013fcf')
+
+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 -Dm644 "$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
+}
diff --git a/libre-testing/sh-roundup/PKGBUILD b/libre-testing/sh-roundup/PKGBUILD
new file mode 100644
index 000000000..7c17669d3
--- /dev/null
+++ b/libre-testing/sh-roundup/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
+
+pkgname=sh-roundup
+pkgver=0.0.5.git17
+_gitver='commit=695ae7609353a360556e1f465ac81ce447235179'
+
+pkgdesc='A unit testing framework for POSIX shell'
+license=("custom:MIT")
+url="http://bmizerany.github.io/roundup/"
+
+pkgrel=1
+arch=('any')
+depends=(sh)
+makedepends=(ronn)
+
+source=("libre://$pkgname-$pkgver.tar.gz" 'makefile-fix.patch')
+md5sums=('8b1f85316d178eb9e809e168f52d0f2d'
+         '9efcd83d666c1e84302fe611610c60fa')
+
+mksource=("git://github.com/bmizerany/roundup.git#${_gitver}")
+mkmd5sums=('SKIP')
+mksource() {
+  cd "$srcdir"
+  rm -rf $pkgname-*
+  mv roundup $pkgname-$pkgver
+}
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -i ../makefile-fix.patch Makefile
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix="$pkgdir"/usr
+  make -j1 build man
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -j1 install install-man
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+
diff --git a/libre-testing/sh-roundup/makefile-fix.patch b/libre-testing/sh-roundup/makefile-fix.patch
new file mode 100644
index 000000000..b97bebf23
--- /dev/null
+++ b/libre-testing/sh-roundup/makefile-fix.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig
++++ Makefile
+@@ -79,7 +79,7 @@
+ 	chmod 0755 $(bindir)/roundup
+ 
+ install-man: man
+-	-for i in {1..9} ; do cp *.$$i $(mandir)/man$$i 2>/dev/null ; done
++	shopt -s nullglob; for file in *.{1..9}; do install -Dm644 $$file $(mandir)/man$${file##*.}/$${file##*/}; done
+ 
+ .PHONY: pages
+ pages : doc