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

Conflicts:
	community/arm-elf-binutils/PKGBUILD
	community/bird/PKGBUILD
	community/cantata/PKGBUILD
	community/dbmail/PKGBUILD
	community/ekg2/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/gigedit/PKGBUILD
	community/gimp-refocus/PKGBUILD
	community/gmime24/PKGBUILD
	community/gmpc/PKGBUILD
	community/gnash/PKGBUILD
	community/id3lib-rcc/PKGBUILD
	community/linuxsampler/PKGBUILD
	community/lwm/PKGBUILD
	community/midori/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mtpaint/PKGBUILD
	community/nestopia/PKGBUILD
	community/preload/PKGBUILD
	community/projectm/PKGBUILD
	community/rusxmms/PKGBUILD
	community/taglib-rcc/PKGBUILD
	community/the_silver_searcher/PKGBUILD
	community/xnee/PKGBUILD
	core/libgcrypt/PKGBUILD
	core/libusbx/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/abook/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cln/PKGBUILD
	extra/exempi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/fluxter/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnet/PKGBUILD
	extra/gnome-vfs/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk/PKGBUILD
	extra/idnkit/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imake/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/libdatrie/PKGBUILD
	extra/libmbim/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/libqmi/PKGBUILD
	extra/libtxc_dxtn/PKGBUILD
	extra/libxfont/PKGBUILD
	extra/mesa/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/nedit/PKGBUILD
	extra/nmap/PKGBUILD
	extra/openexr/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/qemu/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/subversion/PKGBUILD
	extra/transmission/PKGBUILD
	extra/truecrypt/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/wxmaxima/PKGBUILD
	extra/x264/PKGBUILD
	extra/xorg-iceauth/PKGBUILD
	extra/xorg-mkfontscale/PKGBUILD
	extra/xorg-xfd/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/clementine-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

4 files changed, 6 insertions, 37 deletions

diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD
index 71bd4588f..36c2071a1 100644
--- a/community/xdebug/PKGBUILD
+++ b/community/xdebug/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92281 2013-06-03 13:37:54Z spupykin $
+# $Id: PKGBUILD 94986 2013-08-02 13:00:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <arch aur at jonw dot org>
 # Contributor: Jonathan Wiersma <arch aur at jonw dot org>
@@ -6,20 +6,17 @@
 
 pkgname=xdebug
 pkgver=2.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="PHP debugging extension"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xdebug.org"
 license=('GPL')
 depends=('php')
-install="${pkgname}.install"
 backup=('etc/php/conf.d/xdebug.ini')
 source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz
-	xdebug-5.2.ini
 	xdebug.ini)
 md5sums=('e49cec9861b45dc0b36eae33bf8a14fa'
-         '6b7fdbbe0bf381bda40e77e29981f439'
-         '68de800943369d4c76bdf7eb35c8463b')
+         '6a1f2ef91c632d4c9b7b218cd2e278ef')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -39,11 +36,6 @@ package() {
   make DESTDIR=$pkgdir install
 
   cd $srcdir/$pkgname-$pkgver
-  if [ "$PHPVER" \< "5.3.0" ] ; then
-    install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so
-    install -D -m 644 $srcdir/xdebug-5.2.ini $pkgdir/etc/php/conf.d/xdebug.ini
-  else
-    install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so
-    install -D -m 644 $srcdir/xdebug.ini $pkgdir/etc/php/conf.d/xdebug.ini
-  fi
+  make INSTALL_ROOT=$pkgdir install
+  install -D -m 644 $srcdir/xdebug.ini $pkgdir/etc/php/conf.d/xdebug.ini
 }
diff --git a/community/xdebug/xdebug-5.2.ini b/community/xdebug/xdebug-5.2.ini
deleted file mode 100644
index 9beb7fc30..000000000
--- a/community/xdebug/xdebug-5.2.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-zend_extension=/usr/lib/php/xdebug.so
-;xdebug.remote_enable=on
-;xdebug.remote_host=127.0.0.1
-;xdebug.remote_port=9000
-;xdebug.remote_handler=dbgp
diff --git a/community/xdebug/xdebug.ini b/community/xdebug/xdebug.ini
index c6c9222ea..9062dfc8b 100644
--- a/community/xdebug/xdebug.ini
+++ b/community/xdebug/xdebug.ini
@@ -1,4 +1,4 @@
-zend_extension=/usr/lib/php/modules/xdebug.so
+;zend_extension=/usr/lib/php/modules/xdebug.so
 ;xdebug.remote_enable=on
 ;xdebug.remote_host=127.0.0.1
 ;xdebug.remote_port=9000
diff --git a/community/xdebug/xdebug.install b/community/xdebug/xdebug.install
deleted file mode 100644
index a7ec0b9cc..000000000
--- a/community/xdebug/xdebug.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  local _configfile=/etc/php/conf.d/xdebug.ini
-  echo " ==> You may wish to uncomment/change the settings found in "
-  echo "     $_configfile"
-  echo ""
-}
-
-post_upgrade() {
-  local _configfile=/etc/php/conf.d/xdebug.ini
-  local PHPVER=$(php -r 'echo phpversion();')
-  post_install $1
-
-  if [ "$PHPVER" \< "5.3" ] ; then
-    echo " ==> You are currenty running a version of php < 5.3."
-    echo "     When/if you upgrade php to a version >= 5.3, you will need to reinstall $pkgname."
-    echo ""
-  fi
-}