Thu Jun 30 23:11:47 UTC 2011

6 files changed, 157 insertions, 15 deletions

diff --git a/staging/perl/PKGBUILD b/staging/perl/PKGBUILD
index 788cda021..d25f2aae4 100644
--- a/staging/perl/PKGBUILD
+++ b/staging/perl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 128405 2011-06-23 21:44:26Z angvp $
+# $Id: PKGBUILD 129898 2011-06-29 17:25:10Z foutrelis $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: kevin <kevin.archlinux.org>
 # Contributor: judd <jvinet.zeroflux.org>
 # Contributor: francois <francois.archlinux.org> 
 pkgname=perl
 pkgver=5.14.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64)
 license=('GPL' 'PerlArtistic')
@@ -21,7 +21,7 @@ install=perl.install
 options=('!makeflags' '!purge')
 md5sums=('97cd306a2c22929cc141a09568f43bb0'
          '5ed2542fdb9a60682f215bd33701e61a'
-         'd76445605c49886c77734446247e439d'
+         '1f0cbbee783e8a6d32f01be5118e0d5e'
          'c25d86206d649046538c3daab7874564')
 
 build() {
diff --git a/staging/perl/perlbin.csh b/staging/perl/perlbin.csh
index cc0d5d553..535f0b18d 100644
--- a/staging/perl/perlbin.csh
+++ b/staging/perl/perlbin.csh
@@ -4,12 +4,10 @@
 # Remove /usr/lib/perl5/*_perl/bin in next release
 
 [ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH
-${PATH}:/usr/lib/perl5/site_perl/bin
+[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin
 
 [ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH
-${PATH}:/usr/lib/perl5/vendor_perl/bin
+[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin
 
 [ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl
 
diff --git a/staging/python2/PKGBUILD b/staging/python2/PKGBUILD
new file mode 100644
index 000000000..e0c363027
--- /dev/null
+++ b/staging/python2/PKGBUILD
@@ -0,0 +1,83 @@
+# $Id: PKGBUILD 129895 2011-06-29 15:22:59Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributer: Allan McRae <allan@archlinux.org>
+# Contributer: Jason Chu <jason@archlinux.org>
+
+pkgname=python2
+pkgver=2.7.2
+pkgrel=2
+_pybasever=2.7
+pkgdesc="A high-level scripting language"
+arch=('i686' 'x86_64')
+license=('PSF')
+url="http://www.python.org/"
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
+makedepends=('tk')
+optdepends=('tk: for IDLE')
+conflicts=('python<3')
+options=('!makeflags')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53')
+
+build() {
+  cd "${srcdir}/Python-${pkgver}"
+
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
+
+  # Enable built-in SQLite3 module to load extensions (fix FS#22122)
+  sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
+
+  # FS#23997
+  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
+
+  # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
+  # rather than copies shipped in the tarball
+  rm -r Modules/expat
+  rm -r Modules/zlib
+  rm -r Modules/_ctypes/{darwin,libffi}*
+
+  export OPT="${CFLAGS}"
+  ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
+              --enable-unicode=ucs4 --with-system-expat --with-system-ffi
+
+  make
+}
+
+package() {
+  cd "${srcdir}/Python-${pkgver}"
+  make DESTDIR="${pkgdir}" altinstall maninstall
+
+  ln -sf python${_pybasever}        "${pkgdir}/usr/bin/python2"
+  ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config"
+  ln -sf python${_pybasever}.1      "${pkgdir}/usr/share/man/man1/python2.1"
+
+  ln -sf ../../libpython${_pybasever}.so \
+    "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so"
+
+  mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/"
+
+  # some useful "stuff"
+  install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
+  install -m755 Tools/i18n/{msgfmt,pygettext}.py \
+    "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/"
+  install -m755 Tools/scripts/{README,*py} \
+    "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/"
+
+  # fix conflicts with python
+  mv "${pkgdir}"/usr/bin/idle{,2}
+  mv "${pkgdir}"/usr/bin/pydoc{,2}
+  mv "${pkgdir}"/usr/bin/2to3{,-2.7}
+
+  # clean up #!s
+  find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \
+    xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+
+  # clean-up reference to build directory
+  sed -i "s#${srcdir}/Python-${pkgver}:##" \
+    "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile"
+
+  # license
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/staging/rasqal/PKGBUILD b/staging/rasqal/PKGBUILD
new file mode 100644
index 000000000..39d56e1cc
--- /dev/null
+++ b/staging/rasqal/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 129908 2011-06-29 19:29:04Z andrea $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Lawrence Lee <valheru@facticius.net>
+
+pkgname=rasqal
+pkgver=0.9.26
+pkgrel=1
+pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings"
+url="http://librdf.org/rasqal"
+license=('GPL' 'LGPL')
+arch=('i686' 'x86_64')
+depends=('raptor>=2.0.3' 'mpfr')
+options=('!libtool')
+source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz)
+md5sums=('1e9fe5423498f10f636319633855e691')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+	--disable-static \
+	--enable-release
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/staging/redland/PKGBUILD b/staging/redland/PKGBUILD
index 32231139e..949804063 100644
--- a/staging/redland/PKGBUILD
+++ b/staging/redland/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 127594 2011-06-16 17:27:35Z andyrtr $
+# $Id: PKGBUILD 129914 2011-06-29 19:31:01Z andrea $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Francois Charette <francois.archlinux.org> 
 
 pkgbase=redland
 epoch=1
 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
-pkgver=1.0.12
-pkgrel=2
+pkgver=1.0.13
+pkgrel=4
 url="http://librdf.org/"
 license=("GPL")
 arch=('i686' 'x86_64')
-makedepends=('rasqal>=0.9.21' 'raptor1' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
+makedepends=('rasqal>=0.9.26' 'raptor>=2.0.3' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
 options=('!libtool')
 source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz
         rpath.diff)
-md5sums=('40f37a5ad97fdfbf984f78dcea0c6115'
+md5sums=('96c15f36f842ad7e1c9d225e4ca97b68'
          'acc85e784f01a656bd56777f95880787')
 
 build() {
@@ -34,9 +34,7 @@ build() {
 
 package_redland() {
  pkgdesc="Library that provides a high-level interface to RDF data"
- depends=('rasqal>=0.9.21' 'raptor1' 'libtool')
- replaces=('redland-compat' 'redland-compat-devel')
- conflicts=('redland-compat' 'redland-compat-devel')
+ depends=('rasqal>=0.9.26' 'raptor>=2.0.3' 'libtool')
  
   cd ${srcdir}/${pkgbase}-${pkgver}
   make DESTDIR=${pkgdir} install
diff --git a/staging/soprano/PKGBUILD b/staging/soprano/PKGBUILD
new file mode 100644
index 000000000..4cca571cf
--- /dev/null
+++ b/staging/soprano/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 129919 2011-06-29 19:31:46Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgname=soprano
+pkgver=2.6.0git20110629
+pkgrel=1
+pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
+arch=('i686' 'x86_64')
+url='http://soprano.sourceforge.net/'
+license=('GPL' 'LGPL')
+depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso')
+makedepends=('cmake' 'openjdk6' 'doxygen')
+#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=soprano.git&a=snapshot&h=3a7a527fd07c0d58146eb9e6770ecbcfb6717bc6&fmt=tbz2")
+md5sums=('21ef1f075062ea13d3e55d89d8f92fd2')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  . /etc/profile.d/openjdk6.sh
+  # we need the rpath
+  cmake ../${pkgname} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSOPRANO_DISABLE_CLUCENE_INDEX=ON
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+}