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

Conflicts:
	community/aspell-ca/PKGBUILD
	community/corkscrew/PKGBUILD
	cross/mips64el-unknown-linux-gnu-binutils/PKGBUILD
	extra/gstreamer0.10-base/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/libxi/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/mpc/PKGBUILD
	extra/poppler/PKGBUILD
	extra/xf86-video-siliconmotion/PKGBUILD
	extra/xorg-server/PKGBUILD
	gnome-unstable/gconf/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/network-manager-applet/PKGBUILD
	gnome-unstable/vte3/PKGBUILD
	multilib/chuck/PKGBUILD
	multilib/lib32-libpciaccess/PKGBUILD
	multilib/lib32-libx11/PKGBUILD
	multilib/lib32-libxcb/PKGBUILD
	multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
	multilib/lib32-libxft/PKGBUILD
	multilib/lib32-libxi/PKGBUILD
	multilib/lib32-llvm/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	testing/grep/PKGBUILD
	testing/sudo/PKGBUILD
	testing/xf86-input-joystick/PKGBUILD
	testing/xf86-input-wacom/PKGBUILD

2 files changed, 17 insertions, 22 deletions

diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD
index 729d51907..795342850 100644
--- a/extra/libgphoto2/PKGBUILD
+++ b/extra/libgphoto2/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 145711 2011-12-28 14:52:22Z jgc $
-# Maintainer: Eduardo Romero <eduardo@archlinux.org>
+# $Id: PKGBUILD 152973 2012-03-10 23:27:06Z tomegun $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Tom Gundersen <teg@jklm.no>
+# Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=libgphoto2
-pkgver=2.4.11
+pkgver=2.4.13
 pkgrel=1
 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
 arch=(i686 x86_64 'mips64el')
 url="http://www.gphoto.org"
 license=(LGPL)
-depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat')
+depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat' 'libusb')
 install=libgphoto2.install
 options=('libtool')
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a2230c31e320acb7ececd90bc02fe515')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  udevscriptdir=/lib/udev ./configure --prefix=/usr --with-drivers=all --disable-static --disable-rpath
+  ./configure \
+	--prefix=/usr \
+	--disable-rpath
   make
 }
 
@@ -25,14 +28,16 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  rm -f ${pkgdir}/usr/lib/libgphoto2/${pkgver}/*.a
+  # Remove unused udev helper
+  rm -rf "${pkgdir}/usr/lib/udev"
 
   install -m755 -d "${pkgdir}/lib/udev/rules.d"
   LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
   CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
-      "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 group camera mode 0660 > \
+      "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 > \
       "${pkgdir}/lib/udev/rules.d/40-gphoto.rules"
 
   # Remove recursive symlink
   rm -f "${pkgdir}/usr/include/gphoto2/gphoto2"
 }
+md5sums=('7d8a1d3ae02069af381f07a0bb4bfc15')
diff --git a/extra/libgphoto2/libgphoto2.install b/extra/libgphoto2/libgphoto2.install
index 3aee9ff8a..c7944414f 100644
--- a/extra/libgphoto2/libgphoto2.install
+++ b/extra/libgphoto2/libgphoto2.install
@@ -1,16 +1,6 @@
-post_install() {
-  getent group camera >/dev/null || usr/sbin/groupadd -g 97 camera
-  /bin/cat <<THEEND
-NOTE
-----
-Add your user to group 'camera' to use camera devices.
-THEEND
-}
-
 post_upgrade() {
-  getent group camera >/dev/null || usr/sbin/groupadd -g 97 camera
-}
-
-post_remove() {
-  usr/sbin/groupdel camera &>/dev/null
+if [ "$(vercmp $2 2.14.13)" -lt 0 ]; then
+  groupdel camera &>/dev/null
+  echo "Users no longer need to be in the 'camera' group to use camera devices"
+fi
 }