Fri Jun 29 00:01:58 UTC 2012

8 files changed, 398 insertions, 3 deletions

diff --git a/testing/kdebindings-python/PKGBUILD b/testing/kdebindings-python/PKGBUILD
new file mode 100644
index 000000000..0c274b94a
--- /dev/null
+++ b/testing/kdebindings-python/PKGBUILD
@@ -0,0 +1,70 @@
+# $Id: PKGBUILD 162682 2012-06-27 22:03:15Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgbase=kdebindings-python
+pkgname=('kdebindings-python'
+         'kdebindings-python2')
+pkgver=4.8.4
+pkgrel=2
+url='http://kde.org/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kdebindings')
+makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
+             'pyqt' 'qscintilla' 'python-sip' 'python2-sip')
+source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
+sha1sums=('e629d7a1d7d1aa1d1dd24769dc5412a60b6ac256')
+
+build() {
+  export PYTHONDONTWRITEBYTECODE="TRUE"
+
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../pykde4-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python \
+    -DPYTHON_LIBRARY=/usr/lib/libpython3.2mu.so.1.0
+  make
+  cd ..
+
+  mkdir build-python2
+  cd build-python2
+  cmake ../pykde4-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package_kdebindings-python() {
+  pkgdesc="A set of Python 3.x bindings for KDE"
+  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
+
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}
+
+package_kdebindings-python2() {
+  pkgdesc="A set of Python 2.x bindings for KDE"
+  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
+  conflicts=('kdebindings-python<4.8.1-2')
+ 
+  cd "${srcdir}"/build-python2
+  make DESTDIR="${pkgdir}" install
+
+  # Fix conflicts
+  rm "${pkgdir}"/usr/bin/pykdeuic4
+  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
+    "${pkgdir}"/usr/bin/python2-pykdeuic4
+
+  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
+    "${pkgdir}"/usr/share/apps/pykde4/python2-examples
+
+  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
+    "${pkgdir}"/usr/share/sip/python2-PyKDE4
+
+  # Use the python2 executable
+  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
+}
diff --git a/testing/pciutils/PKGBUILD b/testing/pciutils/PKGBUILD
new file mode 100644
index 000000000..2f747eb34
--- /dev/null
+++ b/testing/pciutils/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 162650 2012-06-27 15:03:29Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+pkgname=pciutils
+pkgver=3.1.10
+pkgrel=1
+pkgdesc="PCI bus configuration space access library and tools"
+arch=(i686 x86_64)
+license=('GPL2')
+groups=('base')
+url="http://mj.ucw.cz/sw/pciutils/"
+depends=('glibc' 'hwids')
+source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+       ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
+md5sums=('cdb1e5a95ab7ac67349f10c8f77a6d3c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+  cp lib/libpci.a "${srcdir}/"
+  make clean
+  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+  install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
+  # this is now supplied by the hwids package
+  rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}
+}
diff --git a/testing/pyqt/PKGBUILD b/testing/pyqt/PKGBUILD
new file mode 100644
index 000000000..35c1bcffc
--- /dev/null
+++ b/testing/pyqt/PKGBUILD
@@ -0,0 +1,99 @@
+# $Id: PKGBUILD 162684 2012-06-27 22:06:41Z 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.9.3
+pkgrel=3
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro"
+license=('GPL')
+makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
+             'python-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
+source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz"
+        'fix-qthelp-build.patch')
+md5sums=('223f75c55f1c38c46bd164cdd4996a43'
+         '6acfe0a5a00779f946c29d5fac647ce1')
+
+build() {
+  # Build QtHelp (FS#27665)
+  cd "${srcdir}"/PyQt-x11-gpl-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-qthelp-build.patch
+
+  cd "${srcdir}"
+  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
+
+  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  python configure.py \
+    --confirm-license \
+    --qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+
+  ### Python2 version ###
+  cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
+  python2 configure.py \
+    --confirm-license \
+    -v /usr/share/sip \
+    --qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+}
+
+package_pyqt-common(){
+  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
+  
+  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  make -C pyrcc DESTDIR="${pkgdir}" install
+  make -C pylupdate DESTDIR="${pkgdir}" install
+  make -C designer INSTALL_ROOT="${pkgdir}" install
+  
+  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+}
+
+package_pyqt(){
+  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
+  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+              'qscintilla: QScintilla API'
+              'qt-assistant-compat: add PyQt online help in Qt Assistant')
+
+  cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Provided by pyqt-common
+  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
+  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+}
+
+package_python2-pyqt(){
+  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
+  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+              'python-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'qscintilla: QScintilla API'
+              'qt-assistant-compat: add PyQt online help in Qt Assistant')
+  provides=('python2-qt')
+
+  cd "${srcdir}/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
+  mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
+  
+  # Provided by pyqt-common
+  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
+  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+}
diff --git a/testing/pyqt/fix-qthelp-build.patch b/testing/pyqt/fix-qthelp-build.patch
new file mode 100644
index 000000000..6055f9f35
--- /dev/null
+++ b/testing/pyqt/fix-qthelp-build.patch
@@ -0,0 +1,11 @@
+--- PyQt-x11-gpl-4.9.1/configure.py~	2012-02-13 20:16:11.418786488 +0000
++++ PyQt-x11-gpl-4.9.1/configure.py	2012-02-13 20:16:50.561809527 +0000
+@@ -1261,7 +1261,7 @@
+     opengl = (mname == "QtOpenGL")
+ 
+     qt = [mname]
+-    if mname in ("QtOpenGL", "QtWebKit"):
++    if mname in ("QtHelp", "QtOpenGL", "QtWebKit"):
+         qt.append("QtCore")
+ 
+     makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,
diff --git a/testing/qscintilla/PKGBUILD b/testing/qscintilla/PKGBUILD
new file mode 100644
index 000000000..cc7d750c9
--- /dev/null
+++ b/testing/qscintilla/PKGBUILD
@@ -0,0 +1,81 @@
+# $Id: PKGBUILD 162681 2012-06-27 22:03:12Z andrea $
+# Maintainer:
+# Contributor: 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.6.2
+pkgrel=1
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
+makedepends=('python2-pyqt' 'pyqt' 'chrpath')
+source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz"
+        'configure.py-objdir-support.diff')
+md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
+         '8cf9c06252e2f11ab00e62848e322fd3')
+
+build() {
+    cd "${srcdir}/QScintilla-gpl-${pkgver}" 
+    patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
+
+    cd Qt4Qt5
+    qmake qscintilla.pro
+    make
+    
+    cd ../designer-Qt4
+    qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+    make
+
+    cd ../
+    cp -rf Python Python2
+    cd Python
+    python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+    make
+
+    cd ../Python2
+    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+    make    
+}
+
+package_qscintilla() {
+    pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+    depends=('qt')
+
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python-qscintilla-common() {
+    pkgdest="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
+    depends=('qscintilla')
+
+    cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+      
+    # Provided by python-qscintilla
+    rm "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so"
+}
+
+package_python-qscintilla() {
+    pkgdesc="Python 3.x bindings for QScintilla2"
+    depends=('python-qscintilla-common' 'pyqt')
+
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
+    install -Dm755 Qsci.so \
+      "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so"
+}
+
+package_python2-qscintilla() {
+    pkgdesc="Python 2.x bindings for QScintilla2"
+    depends=('python-qscintilla-common' 'python2-pyqt')
+
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
+    install -Dm755 Qsci.so \
+      "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so"
+}
diff --git a/testing/qscintilla/configure.py-objdir-support.diff b/testing/qscintilla/configure.py-objdir-support.diff
new file mode 100644
index 000000000..b595de18c
--- /dev/null
+++ b/testing/qscintilla/configure.py-objdir-support.diff
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_configure.dpatch by Torsten Marek <shlomme@debian.org>
+##
+## DP: patch the configure script for the Python bindings to support object dir builds
+
+@DPATCH@
+Index: qscintilla2-2.4.2/Python/configure.py
+===================================================================
+--- qscintilla2-2.4.2.orig/Python/configure.py	2010-01-20 20:56:09.000000000 +0100
++++ qscintilla2-2.4.2/Python/configure.py	2010-01-27 22:54:35.603870417 +0100
+@@ -33,6 +33,7 @@
+ import glob
+ import optparse
+ 
++src_dir = os.path.dirname(os.path.abspath(__file__))
+ 
+ # Import SIP's configuration module so that we have access to the error
+ # reporting.  Then try and import the configuration modules for both PyQt3 and
+@@ -162,7 +163,7 @@
+     if os.access(sciglobal, os.F_OK):
+         # Get the QScintilla version string.
+         _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
+-
++        return # Debian: do not check for the installed version, we're good this way.
+         if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
+             # Because we include the Python bindings with the C++ code we can
+             # reasonably force the same version to be used and not bother about
+@@ -232,9 +233,9 @@
+     argv.append(buildfile)
+ 
+     if pyqt.pyqt_version >= 0x040000:
+-        argv.append("sip/qscimod4.sip")
++        argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
+     else:
+-        argv.append("sip/qscimod3.sip")
++        argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
+ 
+     os.system(" ".join(argv))
+ 
diff --git a/testing/sip/PKGBUILD b/testing/sip/PKGBUILD
new file mode 100644
index 000000000..18a53f28e
--- /dev/null
+++ b/testing/sip/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id: PKGBUILD 162679 2012-06-27 22:03:02Z 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.13.3
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.com/software/sip/"
+license=('custom:"sip"')
+makedepends=('python' 'python2')
+source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
+md5sums=('76192829cc42ec558db46e4f9e1d8ba9')
+
+build() {
+  cd "${srcdir}"
+  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
+  make
+  
+  ### Python2 version ###
+  cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+  python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
+  make
+}
+
+package_sip() {
+  pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
+  depends=('glibc')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install -C sipgen
+
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python-sip() {
+  pkgdesc="Python 3.x SIP bindings for C and C++ libraries"
+  depends=('sip' 'python')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install -C siplib
+  
+  install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.2/site-packages/sipconfig.py
+  install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.2/site-packages/sipdistutils.py
+  
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python2-sip() {
+  pkgdesc="Python 2.x SIP bindings for C and C++ libraries"
+  depends=('sip' 'python2')
+
+  cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install -C siplib
+  
+  install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py
+  install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipdistutils.py
+  
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
index 2d9323250..2ddf56cb0 100644
--- a/testing/systemd/PKGBUILD
+++ b/testing/systemd/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
 pkgver=185
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -64,7 +64,7 @@ package_systemd() {
            "systemd-tools=$pkgver" 'util-linux' 'xz')
   optdepends=('python2-dbus: systemd-analyze'
               'initscripts: legacy support for hostname and vconsole setup'
-              'initscripts-systemd: native boot and initialization scripts'
+              'initscripts-systemd: legacy generator for initialization scripts'
               'python2-cairo: systemd-analyze'
               'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
               'systemd-sysvcompat: symlink package to provide sysvinit binaries')
@@ -181,7 +181,7 @@ package_libsystemd() {
 package_systemd-tools() {
   pkgdesc='standalone tools from systemd'
   url='http://www.freedesktop.org/wiki/Software/systemd'
-  depends=('acl' 'bash' 'glibc' 'glib2' 'kmod' 'hwids' 'util-linux' 'kbd')
+  depends=('acl' 'bash' 'glibc' 'glib2' 'libsystemd' 'kmod' 'hwids' 'util-linux' 'kbd')
   optdepends=('cryptsetup: required for encrypted block devices')
   provides=("udev=$pkgver")
   conflicts=('udev')