Sun Apr 15 00:01:28 UTC 2012

6 files changed, 21 insertions, 14 deletions

diff --git a/libre/file-roller-libre/rePKGBUILD b/libre/file-roller-libre/rePKGBUILD
index d94638df2..a83d218f1 100644
--- a/libre/file-roller-libre/rePKGBUILD
+++ b/libre/file-roller-libre/rePKGBUILD
@@ -3,7 +3,7 @@ source PKGBUILD
 #CARCH=x86_64
 unset build package md5sums source
 _repo=extra       # Put the repo here
-_mirror=ftp://ftp.archlinux.org # Put mirror here
+_mirror=http://mirrors.kernel.org/archlinux # Put mirror here
 source=(PKGBUILD
         "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT"
         # files for pkg modifications below this line
diff --git a/libre/foomatic/PKGBUILD b/libre/foomatic/PKGBUILD
index bd5f8da17..5446bb579 100644
--- a/libre/foomatic/PKGBUILD
+++ b/libre/foomatic/PKGBUILD
@@ -60,7 +60,7 @@ package_foomatic-filters-libre() {
  optdepends=('perl:      for the "beh" Backend End Handler used by cups'
             'net-snmp:  certain (mostly HP) printers need it to work')
 
-   cd ${srcdir}/foomatic-filters-${_filtersver}
+   cd ${srcdir}/${pkgname}-${_filtersver}
    ./configure --prefix=/usr --sysconfdir=/etc
    make
    make DESTDIR=${pkgdir} install
@@ -87,3 +87,6 @@ package_foomatic-db-engine() {
 }
 
 
+md5sums=('957a07820f47804ce76dbb59cd79cd1b'
+         '5283cd5125a96dc0b35d896326512b1a'
+         'ccb72c201e14bfc5eb23ea839ecc0623')
diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD
index 3c519dc28..a87c3082a 100644
--- a/libre/mariadb/PKGBUILD
+++ b/libre/mariadb/PKGBUILD
@@ -9,9 +9,8 @@ __falsename=MySQL
 pkgbase=mariadb
 _pkgbase=MariaDB
 pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}")
-conflicts=("lib${_falsename}client" "${_falsename}-clients" "${_falsename}")
 pkgver=5.5.23
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.${pkgbase}.org/"
@@ -73,6 +72,7 @@ package_libmariadbclient(){
   pkgdesc="${_pkgbase} client libraries (branch of ${__falsename})"
   depends=('openssl')
   replaces=("lib${_falsename}client")
+  conflicts=("lib${_falsename}client")
   provides=("lib${_falsename}client=${pkgver}")
   
   cd "${srcdir}"/build
@@ -92,6 +92,7 @@ package_mariadb-clients(){
   pkgdesc="${_pkgbase} client tools (branch of ${__falsename})"
   depends=("lib${pkgbase}client")
   replaces=("${_falsename}-clients")
+  conflicts=("${_falsename}-clients")
   provides=("${_falsename}-clients=${pkgver}")
 
   cd "${srcdir}"/build
@@ -114,6 +115,7 @@ package_mariadb(){
   depends=("${pkgbase}-clients")
   optdepends=('perl-dbi' "perl-dbd-${_falsename}")
   replaces=("${_falsename}")
+  conflicts=("${_falsename}")
   provides=("${_falsename}=${pkgver}")
   options=('emptydirs')
 
diff --git a/libre/python2-libre/PKGBUILD b/libre/python2-libre/PKGBUILD
index c4f09188d..e743151b0 100644
--- a/libre/python2-libre/PKGBUILD
+++ b/libre/python2-libre/PKGBUILD
@@ -6,22 +6,23 @@
 _pkgname=python2
 pkgname=python2-libre
 pkgver=2.7.2
-pkgrel=4
+pkgrel=6
 _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')
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
 makedepends=('tk')
 optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
-source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz
+source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-4-any.src.tar.xz
         doc_license_change.patch
         WDAS.patch
         linux2.patch
-        gdbm-magic-values.patch)
+        gdbm-magic-values.patch
+        13156-revert-tls-changeset-subinterpreter.patch)
 provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
 replaces=("$_pkgname")
@@ -33,7 +34,7 @@ build() {
   # 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)
+  # Enable built-in SQLite module to load extensions (fix FS#22122)
   sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
 
   # FS#23997
@@ -47,6 +48,9 @@ build() {
   # http://bugs.python.org/issue13007
   patch -Np1 -i ../gdbm-magic-values.patch
 
+  # http://bugs.python.org/issue13156
+  patch -Np1 -i ../13156-revert-tls-changeset-subinterpreter.patch
+
   # 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
@@ -100,5 +104,6 @@ package() {
 md5sums=('456d053a5d418adc913a4971e95fe918'
          '1e6595f85a1da7f42b69456119924d50'
          '3f8c0e310a0be0bd8b319d6c46bbd427'
-         '74c04694573e0d331e2a99d7b9179460'
-         '2874e9d93f4f46c1460605a5c7751372')
+         '6099a7c1aed80cf04943ee4affa84b5c'
+         '6de394351179c2ada82e95458ceb13e5'
+         'daa5110f092f1406c17de23171529e62')
diff --git a/libre/python2-libre/gdbm-magic-values.patch b/libre/python2-libre/gdbm-magic-values.patch
index 5613ae35c..471faf2c7 100644
--- a/libre/python2-libre/gdbm-magic-values.patch
+++ b/libre/python2-libre/gdbm-magic-values.patch
@@ -10,5 +10,3 @@ diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py
          return "gdbm"
  
      # Check for old Berkeley db hash file format v2
-diff -up Python-2.7.2/Misc/NEWS.gdbm-1.9-magic Python-2.7.2/Misc/NEWS
-
diff --git a/libre/python2-libre/linux2.patch b/libre/python2-libre/linux2.patch
index 74ae2aa12..670510fde 100644
--- a/libre/python2-libre/linux2.patch
+++ b/libre/python2-libre/linux2.patch
@@ -21,4 +21,3 @@ diff --git a/configure.in b/configure.in
 	cygwin*) MACHDEP="cygwin";;
 	darwin*) MACHDEP="darwin";;
 	atheos*) MACHDEP="atheos";;
-