Tue Jun 18 01:11:08 PDT 2013

17 files changed, 181 insertions, 173 deletions

diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index 18a040887..b5d0d6622 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186137 2013-05-21 08:51:28Z heftig $
+# $Id: PKGBUILD 188637 2013-06-17 09:36:56Z jgc $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgbase=anjuta
 pkgname=('libanjuta' 'anjuta')
-pkgver=3.8.3
+pkgver=3.8.4
 pkgrel=1
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme v
 url="http://www.anjuta.org/"
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('06afea1de911067419b774eda2548a729668f93c5463726b353f5db686493f95')
+sha256sums=('eea77ef71dd156a2296cbaf02a343f3b9099aec245ee7d1495f002ff2f81fa17')
 
 build() {
   cd "$pkgbase-$pkgver"
diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD
index 9bbdd6368..4183162fb 100644
--- a/extra/dbus-python/PKGBUILD
+++ b/extra/dbus-python/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168991 2012-10-17 10:19:14Z allan $
+# $Id: PKGBUILD 188645 2013-06-17 09:56:29Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=dbus-python
 pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common')
-pkgver=1.1.1
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="Python bindings for DBUS"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL')
@@ -12,7 +12,7 @@ url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 makedepends=('docutils' 'dbus-glib' 'python' 'python2')
 options=('!libtool')
 source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz)
-md5sums=('742c7432ad0f7c3f98291d58fa2e35dc')
+md5sums=('b09cd2d1a057cc432ce944de3fc06bf7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD
deleted file mode 100755
index 5b7f43f8c..000000000
--- a/extra/efibootmgr/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 187100 2013-06-03 19:31:59Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor : Murtuza Akhtari <inxsible at gmail dot com>
-# Contributor: Keshav P R <skodabenz at rocketmail dot com>
-
-pkgname=efibootmgr
-pkgver=0.6.0
-pkgrel=3
-pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables."
-arch=('i686' 'x86_64')
-url="http://linux.dell.com/efibootmgr/"
-license=('GPL2')
-depends=('zlib' 'pciutils')
-makedepends=()
-provides=()
-options=(strip purge docs zipman !emptydirs)
-
-source=("http://linux.dell.com/efibootmgr/permalink/${pkgname}-${pkgver}.tar.gz"
-        "efibootmgr-tilt_slashes-func.patch"
-)
-
-build () {	
-	rm -rf ${srcdir}/efibootmgr-${pkgver}_build/ || true
-	
-	cp -r ${srcdir}/efibootmgr-${pkgver} ${srcdir}/efibootmgr-${pkgver}_build
-	
-	cd ${srcdir}/efibootmgr-${pkgver}_build/
-	patch -Np1 -i ${srcdir}/efibootmgr-tilt_slashes-func.patch
-	echo
-	
-	CFLAGS= make
-	echo
-	
-}
-
-
-package() {
-	
-	mkdir -p ${pkgdir}/usr/bin/
-	mkdir -p ${pkgdir}/usr/share/man/man8/
-	
-	cd ${srcdir}/efibootmgr-${pkgver}_build/
-	
-	install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/bin/efibootmgr
-	install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8
-	
-}
-md5sums=('9e9a31d79e579644de83a14139b66d10'
-         '3622c0e978cf859cae60803a6b6a0c5e')
diff --git a/extra/efibootmgr/efibootmgr-tilt_slashes-func.patch b/extra/efibootmgr/efibootmgr-tilt_slashes-func.patch
deleted file mode 100644
index ce857bb3c..000000000
--- a/extra/efibootmgr/efibootmgr-tilt_slashes-func.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c
-index 236365a..9883961 100644
---- a/src/efibootmgr/efibootmgr.c
-+++ b/src/efibootmgr/efibootmgr.c
-@@ -803,6 +803,7 @@ usage()
- 	printf("\t-V | --version          return version and exit\n");
- 	printf("\t-w | --write-signature  write unique sig to MBR if needed\n");
- 	printf("\t-@ | --append-binary-args file  append extra args from file (use \"-\" for stdin)\n");
-+	printf("\t   | --help             show help/usage\n");
- }
- 
- static void
-@@ -863,6 +864,7 @@ parse_opts(int argc, char **argv)
- 			{"version",                no_argument, 0, 'V'},
- 			{"write-signature",        no_argument, 0, 'w'},
- 			{"append-binary-args", required_argument, 0, '@'},
-+			{"help",                   no_argument, 0,   2},
- 			{0, 0, 0, 0}
- 		};
- 
-@@ -1014,6 +1016,10 @@ parse_opts(int argc, char **argv)
- 			opts.write_signature = 1;
- 			break;
- 
-+		case 2:
-+			usage();
-+			exit(1);
-+
- 		default:
- 			usage();
- 			exit(1);
-diff --git a/src/lib/efi.c b/src/lib/efi.c
-index a4ce5cf..8ef8be8 100644
---- a/src/lib/efi.c
-+++ b/src/lib/efi.c
-@@ -70,6 +70,16 @@ efi_guid_unparse(efi_guid_t *guid, char *out)
-         return out;
- }
- 
-+char *
-+tilt_slashes(char *s)
-+{
-+	char *p;
-+	for (p = s; *p; p++)
-+		if (*p == '/')
-+			*p = '\\';
-+	return s;
-+}
-+
- void
- set_fs_kernel_calls()
- {
-@@ -535,7 +545,7 @@ char *make_disk_load_option(char *p, char *disk)
- 				     signature,
- 				     mbr_type, signature_type);
- 
--    efichar_from_char(os_loader_path, opts.loader, sizeof(os_loader_path));
-+    efichar_from_char(os_loader_path, tilt_slashes(opts.loader), sizeof(os_loader_path));
-     p += make_file_path_device_path (p, os_loader_path);
-     p += make_end_device_path       (p);
- 
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index 9201400ce..704daff21 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,31 +1,30 @@
-# $Id: PKGBUILD 187887 2013-06-07 21:04:48Z heftig $
+# $Id: PKGBUILD 188610 2013-06-16 23:56:02Z heftig $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
 pkgver=3.8.3
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Library with common API for various GNOME modules"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config' 'iso-codes')
-makedepends=('intltool' 'gobject-introspection' 'itstool')
+arch=(i686 x86_64)
+license=(GPL LGPL)
+depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes)
+makedepends=(intltool gobject-introspection itstool)
 url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool')
+groups=(gnome)
+options=(!libtool)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
 sha256sums=('c9c8d1888e28cb30e466be46909efe640fb3cb348909cae2664489508790e5a2')
 
 build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-desktop \
-      --with-gnome-distributor="Arch Linux"
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname --disable-static \
+    --with-gnome-distributor="Arch Linux"
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD
index a892a6114..468b3f8be 100644
--- a/extra/gphoto2/PKGBUILD
+++ b/extra/gphoto2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179980 2013-03-13 20:13:10Z jgc $
+# $Id: PKGBUILD 188639 2013-06-17 09:41:26Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 pkgname=gphoto2
-pkgver=2.5.1
+pkgver=2.5.2
 pkgrel=1
 pkgdesc="A digital camera download and access program."
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ url="http://www.gphoto.org"
 license=('GPL' 'LGPL')
 depends=('libgphoto2' 'popt' 'readline')
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('03cda6d5b7c647ac4c90d0081f2cb7c7')
+md5sums=('7e59e7e06a58febd35820978c6e48287')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index caa72c9ba..00fefb855 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=0.9.0.8
+pkgver=0.9.0.9
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic
             'openconnect: Cisco AnyConnect compatible VPN client')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2")
-sha256sums=('c3b4458faf3bea75c5952ffe20b55724246c9cc3cd751a484b3e1832240d3ad6')
+sha256sums=('d6a7603df2a48e14cef4c44dcaee5773d7ed3cad5b8780307b356df4639231ca')
 
 build() {
   mkdir build
diff --git a/extra/kscreen/PKGBUILD b/extra/kscreen/PKGBUILD
new file mode 100644
index 000000000..ff0a6b34a
--- /dev/null
+++ b/extra/kscreen/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 188671 2013-06-17 16:27:52Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: birdflesh <antkoul at gmail dot com>
+
+pkgname=kscreen
+pkgver=1.0
+pkgrel=1
+pkgdesc="KDE's screen management software"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/kscreen'
+license=('GPL' 'LGPL')
+depends=('kdebase-runtime' "libkscreen>=${pkgver}")
+makedepends=('cmake' 'automoc4')
+install=$pkgname.install
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('52a0fef238ed71c08ee853f55e53f8bb')
+
+prepare() {
+  mkdir build
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}
diff --git a/extra/kscreen/kscreen.install b/extra/kscreen/kscreen.install
new file mode 100644
index 000000000..53d2ba911
--- /dev/null
+++ b/extra/kscreen/kscreen.install
@@ -0,0 +1,16 @@
+post_install() {
+    printf "==> To enable KSceen, run in a terminal:\n"
+    printf "    qdbus org.kde.kded /kded org.kde.kded.unloadModule randrmonitor\n"
+    printf "    qdbus org.kde.kded /kded org.kde.kded.setModuleAutoloading randrmonitor false\n"
+    printf "    qdbus org.kde.kded /kded org.kde.kded.loadModule kscreen\n"
+
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_remove() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
diff --git a/extra/libkeybinder3/PKGBUILD b/extra/libkeybinder3/PKGBUILD
index 6f6964d20..55bbfa97b 100644
--- a/extra/libkeybinder3/PKGBUILD
+++ b/extra/libkeybinder3/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 188580 2013-06-16 02:22:32Z eric $
+# $Id: PKGBUILD 188643 2013-06-17 09:55:24Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: speps <speps at aur dot archlinux dot org>
 
 pkgname=libkeybinder3
 pkgver=0.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A library for registering global keyboard shortcuts"
 arch=('i686' 'x86_64')
 url="http://kaizer.se/wiki/keybinder/"
 license=('MIT')
 depends=('gtk3')
-makedepends=('gtk-doc')
+makedepends=('gtk-doc' 'gobject-introspection')
 optdepends=('lua-lgi: lua bindings')
 options=('!libtool')
 source=(http://archive.ubuntu.com/ubuntu/pool/universe/k/keybinder-3.0/keybinder-3.0_${pkgver}.orig.tar.gz)
diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD
new file mode 100644
index 000000000..00d84af60
--- /dev/null
+++ b/extra/libkscreen/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 188666 2013-06-17 16:24:53Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: birdflesh <antkoul at gmail dot com>
+
+pkgname=libkscreen
+pkgver=1.0
+pkgrel=1
+pkgdesc="KDE's screen management library"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/libkscreen'
+license=('GPL')
+depends=('kdelibs' 'qjson')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('83dc38c6ff5d33f253f7d9a43bc986cb')
+
+prepare() {
+  mkdir build
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libusb-compat/PKGBUILD b/extra/libusb-compat/PKGBUILD
new file mode 100644
index 000000000..40d88dfe7
--- /dev/null
+++ b/extra/libusb-compat/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 188653 2013-06-17 10:53:32Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: arjan <arjan@archlinux.org>
+
+pkgname=libusb-compat
+pkgver=0.1.5
+pkgrel=1
+pkgdesc="Library to enable user space application programs to communicate with USB devices"
+arch=('i686' 'x86_64')
+url="http://libusb.sourceforge.net/"
+license=('LGPL')
+depends=('libusb' 'sh')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2")
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+
+md5sums=('2780b6a758a1e2c2943bdbf7faf740e4')
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index 970692754..c7932fe24 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183320 2013-04-21 22:06:39Z heftig $
+# $Id: PKGBUILD 188611 2013-06-16 23:57:46Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=nautilus
 pkgname=(nautilus libnautilus-extension)
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="GNOME file manager"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ makedepends=(intltool gobject-introspection python)
 url="http://www.gnome.org"
 options=('!libtool' '!emptydirs')
 source=(http://download.gnome.org/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('9827e939aa0621041754379ca0227ceb82877785f013dd5935ecc4b791314892')
+sha256sums=('dbddfdaac52d077d46d48a2f8dbecf6d13788d8f6b5fc9aa70826a24681d8a75')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt4/PKGBUILD
index 6ed0b16ad..1bdd0f4a8 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt4/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 183563 2013-04-23 13:10:46Z andrea $
+# $Id: PKGBUILD 188683 2013-06-17 19:05:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
-pkgbase=pyqt
-pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.10.1
-pkgrel=1
+pkgbase=pyqt4
+pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4')
+pkgver=4.10.2
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
 makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
              'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
-source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('e5973c4ec0b0469f329bc00209d2ad9c')
+source=("http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-${pkgver}.tar.gz")
+md5sums=('9257e12fec9b1b21e5a0d76d455d1691')
 
 build() {
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
@@ -43,9 +43,12 @@ build() {
   make
 }
 
-package_pyqt-common(){
-  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
+package_pyqt4-common(){
+  pkgdesc="Common PyQt files shared between python-pyqt4 and python2-pyqt4"
   depends=('qt4')
+  replaces=('pyqt-common')
+  conflicts=('pyqt-common')
+  provides=("pyqt-common=${pkgver}")
   
   cd PyQt-x11-gpl-${pkgver}
   make -C pyrcc DESTDIR="${pkgdir}" install
@@ -54,12 +57,15 @@ package_pyqt-common(){
   install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
 }
 
-package_pyqt(){
+package_python-pyqt4(){
   pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
+  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt4-common')
   optdepends=('phonon: enable audio and video in PyQt applications'
               'qscintilla: QScintilla API'
               'qt-assistant-compat: add PyQt online help in Qt Assistant')
+  replaces=('pyqt')
+  conflicts=('pyqt')
+  provides=("pyqt=${pkgver}")
 
   cd PyQt-x11-gpl-${pkgver}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
@@ -70,24 +76,26 @@ package_pyqt(){
   rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
 }
 
-package_python2-pyqt(){
+package_python2-pyqt4(){
   pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
+  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt4-common')
   optdepends=('phonon: enable audio and video in PyQt applications'
               'python2-opengl: enable OpenGL 3D graphics in PyQt applications'
               'qscintilla: QScintilla API'
               'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  provides=('python2-qt')
+  replaces=('python2-pyqt')
+  conflicts=('python2-pyqt')
+  provides=("python2-pyqt=${pkgver}")
 
   cd Py2Qt-x11-gpl-${pkgver}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
-  # Fix conflicts with pyqt
+  # Fix conflicts with python-pyqt4
   mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
   
-  # Provided by pyqt
+  # Provided by python-pyqt4
   rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpythonplugin.so
+  rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpyqt4.so
   rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
 }
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index 53a7449a8..e8e899005 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 179562 2013-03-07 08:19:46Z andrea $
+# $Id: PKGBUILD 188680 2013-06-17 18:07:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
          'python-qscintilla-common')
-pkgver=2.7.1
+pkgver=2.7.2
 pkgrel=1
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 makedepends=('python2-pyqt' 'pyqt' 'chrpath')
 source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py-objdir-support.diff')
-md5sums=('da8939b5679a075e30c6632e54dc5abf'
+md5sums=('0fbfb06078f206a241a62c94861cce21'
          'eae1bd23117c5f1f7f172a1c1e11f600')
 
 build() {
@@ -21,21 +21,21 @@ build() {
     patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
 
     cd Qt4Qt5
-    qmake qscintilla.pro
+    qmake-qt4 qscintilla.pro
     make
     
     cd ../designer-Qt4Qt5
-    qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+    qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
     make
 
     cd ../
     cp -rf Python Python2
     cd Python
-    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
+    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
     make
 
     cd ../Python2
-    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
+    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
     make    
 }
 
diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD
index d932b06ab..a7cb7ced6 100644
--- a/extra/sg3_utils/PKGBUILD
+++ b/extra/sg3_utils/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 180167 2013-03-18 13:36:39Z jgc $
+#$Id: PKGBUILD 188647 2013-06-17 10:00:27Z jgc $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=sg3_utils
-pkgver=1.35
+pkgver=1.36
 pkgrel=1
 pkgdesc="Generic SCSI utilities"
 arch=(i686 x86_64)
@@ -10,8 +10,8 @@ url="http://sg.danny.cz/sg/sg3_utils.html"
 license=('GPL' 'custom:BSD')
 depends=('glibc')
 options=('!libtool')
-source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz)
-md5sums=('55c32fb95a5b3907687b023f392fbd3c')
+source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz)
+md5sums=('5d1846c8aa03a2e39e1368cf05bf1cfd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 7dd7e4693..69b7828ca 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 183493 2013-04-22 09:21:24Z andrea $
+# $Id: PKGBUILD 188678 2013-06-17 18:06:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.14.6
+pkgver=4.14.7
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
 source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('d6493b9f0a7911566545f694327314c4')
+md5sums=('f5c8001f16ecffd711708de0e07d542f')
 
 build() {
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}