Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/conntrack-tools/01-config-file-path.patch
	community-testing/conntrack-tools/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/gigi/PKGBUILD
	community-testing/glob2/PKGBUILD
	community-testing/megaglest/PKGBUILD
	community-testing/openimageio/PKGBUILD
	community/gtk2hs-buildtools/PKGBUILD
	community/haddock/PKGBUILD
	community/haskell-dataenc/PKGBUILD
	community/haskell-ghc-paths/PKGBUILD
	community/haskell-haskeline/PKGBUILD
	community/haskell-hslogger/PKGBUILD
	community/haskell-tar/PKGBUILD
	community/haskell-terminfo/PKGBUILD
	community/haskell-utf8-string/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/libnetfilter_acct/PKGBUILD
	community/libnetfilter_conntrack/PKGBUILD
	community/libnetfilter_queue/PKGBUILD
	community/libnfnetlink/PKGBUILD
	community/sfk/PKGBUILD
	extra/cabal-install/PKGBUILD
	extra/claws-mail/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-parsec/PKGBUILD
	extra/haskell-text/PKGBUILD
	extra/haskell-transformers/PKGBUILD
	extra/haskell-zlib/PKGBUILD
	extra/nx/PKGBUILD
	extra/ocaml/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/lib32-dbus-core/PKGBUILD
	multilib/lib32-gnutls/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-libxcb/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	social/squirm/PKGBUILD
	staging/kdebindings-python/PKGBUILD
	testing/curl/PKGBUILD
	testing/dnsutils/PKGBUILD
	testing/dnsutils/remove-bind.patch
	testing/mesa/PKGBUILD
	testing/openldap/PKGBUILD
	testing/pam/PKGBUILD
	testing/subversion/PKGBUILD
	testing/systemd/PKGBUILD
	testing/sysvinit/PKGBUILD

1 files changed, 8 insertions, 11 deletions

diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD
index 5e24f32ea..f6ec83a31 100644
--- a/community/bullet/PKGBUILD
+++ b/community/bullet/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 68719 2012-04-01 00:16:22Z svenstaro $
+# $Id: PKGBUILD 77520 2012-10-11 13:39:07Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgbase=bullet
 pkgname=('bullet' 'bullet-docs')
-pkgver=2.80
+_rev=2613
+pkgver=2.81
 pkgrel=1
 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,13 +13,13 @@ url="http://www.bulletphysics.com/Bullet/"
 license=('custom:zlib')
 depends=('freeglut')
 makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu')
-source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev2531.tgz
+source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev${_rev}.tgz
         ${pkgbase}.pc)
-md5sums=('d1eec0332110264a21d0fc0f2fb127c3'
+md5sums=('cec9c9a79c2804dbf6385dd7d061346c'
          'd1da06deba3b08b884d2212f6838905c')
 
 build() {
-  cd ${pkgbase}-${pkgver}-rev2531
+  cd ${pkgbase}-${pkgver}-rev${_rev}
 
   # get a clean build dir
   [[ -d build ]] && rm -rf build
@@ -46,15 +47,11 @@ build() {
 package_bullet() {
   optdepends=('bullet-docs: documentation')
 
-  cd ${pkgbase}-${pkgver}-rev2531/build
+  cd ${pkgbase}-${pkgver}-rev${_rev}/build
 
   # install it
   make DESTDIR=${pkgdir} install
 
-  # fix #29012
-  install -Dm644 ../Extras/HACD/hacdVector.inl ${pkgdir}/usr/include/bullet/HACD/hacdVector.inl
-  install -Dm644 ../Extras/HACD/hacdCircularList.inl ${pkgdir}/usr/include/bullet/HACD/hacdCircularList.inl
-
   # manually handle pkgconfig file
   mkdir -p "${pkgdir}"/usr/lib/pkgconfig
   sed "s|VERSION|${pkgver}|g" ${srcdir}/bullet.pc > ${pkgdir}/usr/lib/pkgconfig/bullet.pc
@@ -67,7 +64,7 @@ package_bullet-docs() {
   pkgdesc="Documentation for bullet"
   depends=()
 
-  cd ${pkgbase}-${pkgver}-rev2531
+  cd ${pkgbase}-${pkgver}-rev${_rev}
 
   # install docs
   install -Dm644 Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf