Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/fotoxx/PKGBUILD
	community/gtkdialog/PKGBUILD
	community/hubbub/PKGBUILD
	community/libgdamm/PKGBUILD
	community/libparserutils/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mtpaint/PKGBUILD
	community/netsurf/PKGBUILD
	community/patchage/PKGBUILD
	community/qgo/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/tre/PKGBUILD
	community/virtualbox/PKGBUILD
	core/net-tools/PKGBUILD
	core/openldap/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/folks/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/swt/PKGBUILD
	extra/tomcat/PKGBUILD
	extra/totem/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vte/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-atk/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/wine/PKGBUILD
	social/miniupnpc/PKGBUILD
	testing/icedtea-web-java7/PKGBUILD
	testing/sqlite3/PKGBUILD
	~xihh/abiword/PKGBUILD

7 files changed, 160 insertions, 10 deletions

diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD
new file mode 100644
index 000000000..5e71171f9
--- /dev/null
+++ b/libre/cdrkit-libre/PKGBUILD
@@ -0,0 +1,57 @@
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: Henry Jensen <hjensen@connochaetos.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+
+pkgname=cdrkit-libre
+pkgver=1.1.11
+pkgrel=2
+pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
+arch=('i686' 'x86_64')
+url="http://cdrkit.org/"
+license=('GPL2')
+depends=('file' 'bzip2' 'perl')
+makedepends=('cmake')
+provides=('cdrtools' "cdrkit=${pkgver}")
+conflicts=('cdrtools' 'cdrkit')
+replaces=('cdrtools' 'cdrkit')
+source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz)
+
+mksource() {
+    if [ ! -d ${pkgname}-${pkgver} ]; then
+        wget -O - http://cdrkit.org/releases/${pkgname/-libre/}-${pkgver}.tar.gz | \
+        bsdtar xzf -
+
+        mv -v ${pkgname/-libre/}-${pkgver} ${pkgname}-${pkgver}
+    fi
+
+    rm -rvf ${pkgname}-${pkgver}/{doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}}
+
+    tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/
+    rm -r ${pkgname}-${pkgver}/
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make PREFIX="$pkgdir/usr" install
+
+  # Make symlinks for cdrtools compatibility
+  cd "$pkgdir/usr/bin"
+  ln -s wodim cdrecord
+  ln -s readom readcd
+  ln -s genisoimage mkisofs
+  ln -s genisoimage mkhybrid
+  ln -s icedax cdda2wav
+
+  cd "$pkgdir/usr/share/man/man1"
+  ln -s wodim.1 cdrecord.1
+  ln -s readom.1 readcd.1
+  ln -s genisoimage.1 mkisofs.1
+  ln -s genisoimage.1 mkhybrid.1
+  ln -s icedax.1 cdda2wav.1
+}
+md5sums=('e851c2d69ca17df7cfaabfa0d0e8e435')
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index b41e102bb..bf9c3b705 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=file-roller
 pkgname=file-roller-libre
-pkgver=3.0.2
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="Archive manipulator for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -23,8 +23,8 @@ conflicts=("$_pkgname")
 options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('00fc74269978b6e455fea97f22ba81b588bdf3e79548003b75f3328104b418b6')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/libre/file-roller-libre/file-roller.install b/libre/file-roller-libre/file-roller.install
index 182126c39..10a148241 100644
--- a/libre/file-roller-libre/file-roller.install
+++ b/libre/file-roller-libre/file-roller.install
@@ -20,4 +20,3 @@ post_upgrade() {
 post_remove() {
     post_install $1
 }
-
diff --git a/libre/file-roller-libre/rePKGBUILD b/libre/file-roller-libre/rePKGBUILD
index d94638df2..03652ec06 100644
--- a/libre/file-roller-libre/rePKGBUILD
+++ b/libre/file-roller-libre/rePKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 source PKGBUILD
-#CARCH=x86_64
+CARCH=x86_64
 unset build package md5sums source
 _repo=extra       # Put the repo here
 _mirror=ftp://ftp.archlinux.org # Put mirror here
diff --git a/libre/foomatic/PKGBUILD b/libre/foomatic/PKGBUILD
new file mode 100644
index 000000000..c83ef667b
--- /dev/null
+++ b/libre/foomatic/PKGBUILD
@@ -0,0 +1,94 @@
+# $Id: PKGBUILD 130674 2011-07-07 16:52:03Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+ 
+pkgbase="foomatic"
+pkgname=('foomatic-db' 'foomatic-filters-libre' 'foomatic-db-engine')
+arch=('i686' 'x86_64') # needs to be changed  in the subpackages when makepkg will support it
+_snapdate=20110707
+_relver=4.0.7
+pkgver=${_relver}_${_snapdate}
+pkgrel=1
+epoch=1
+makedepends=('cups>=1.4.7' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
+source=(http://www.linuxprinting.org/download/foomatic/$pkgbase-db-engine-${_relver}.tar.gz
+        http://www.linuxprinting.org/download/foomatic/$pkgbase-db-4.0-${_snapdate}.tar.gz
+        http://repo.parabolagnulinux.org/other/$pkgbase-filters-libre-${_relver}.tar.gz)
+url="http://www.linuxprinting.org/foomatic.html"
+options=('!emptydirs')
+md5sums=('fcfa8eb9ce5494b81b58ae983fc2aeb5'
+         '88d467d9099188b170185564bd33d7b7'
+         'ffda5eb8ab36564e5b28190e6c5406b2')
+
+mksource() {
+    if [ ! -d ${pkgbase}-filters-libre-${_relver}/ ]; then
+        wget -O - http://www.linuxprinting.org/download/foomatic/$pkgbase-filters-${_relver}.tar.gz | \
+        bsdtar xzf -
+
+        mv ${pkgbase}-filters{,-libre}-${_relver}/
+    fi
+
+    rm -rfv ${pkgbase}-filters-libre-${_relver}/test/{lsbfuncs,shfuncs,tcm,tetapi}.sh
+    bsdtar cvzf ${pkgbase}-filters-libre-${_relver}.tar.gz ${pkgbase}-filters-libre-${_relver}/
+}
+
+build() {
+ /bin/true
+}
+
+package_foomatic-db() {
+
+ pkgdesc="Foomatic - The collected knowledge about printers, drivers, and driver options in XML files, used by foomatic-db-engine to generate PPD files."
+# arch=('any')
+ license=('GPL' 'custom')
+ depends=('perl' 'libxml2')
+ replaces=('foomatic-db-ppd' 'foomatic-db-hpijs')
+ conflicts=('foomatic-db-ppd' 'foomatic-db-hpijs')
+ provides=('foomatic-db-hpijs')
+
+   cd ${srcdir}/${pkgname}-${_snapdate}
+   ./configure --prefix=/usr
+   make DESTDIR=${pkgdir} install
+   install -v -Dm644 ${srcdir}/${pkgname}-${_snapdate}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
+
+package_foomatic-filters-libre() {
+
+ pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format."
+# arch=('i686' 'x86_64')
+ license=('GPL')
+ backup=(etc/foomatic/filter.conf)
+ depends=('glibc')
+ provides=("foomatic-filters=${pkgver}")
+ replaces=('foomatic-filters')
+ conflicts=('foomatic-filters')
+ optdepends=('perl:      for the "beh" Backend End Handler used by cups'
+            'net-snmp:  certain (mostly HP) printers need it to work')
+
+#   cd ${srcdir}/${pkgname}-${pkgver}
+   cd ${srcdir}/foomatic-filters-libre-${_relver}
+   ./configure --prefix=/usr --sysconfdir=/etc
+   make
+   make DESTDIR=${pkgdir} install
+}
+
+package_foomatic-db-engine() {
+
+ pkgdesc="Foomatic - Foomatic's database engine generates PPD files from the data in Foomatic's XML database. It also contains scripts to directly generate print queues and handle jobs."
+# arch=(i686 x86_64)
+ license=('GPL')
+ depends=('perl' 'libxml2' 'foomatic-filters' 'bash')
+
+#   cd ${srcdir}/${pkgname}-${pkgver}
+   cd ${srcdir}/foomatic-db-engine-${_relver}
+    ./configure --prefix=/usr
+   make
+   eval `perl -V:archname`
+   make DESTDIR=${pkgdir} \
+        INSTALLARCHLIB=/usr/lib/perl5/vendor_perl/ \
+        INSTALLSITELIB=/usr/lib/perl5/vendor_perl/ \
+        INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install
+   /usr/bin/find ${pkgdir} -name '.packlist' -delete
+   # fix permissions
+   chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl}
+}
+
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index e7e383a6e..ecbbfa808 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -21,7 +21,7 @@
 # * Disabled ContentHandlers and other Google/Yahoo! related services
 
 pkgname=icecat
-pkgver=6.0
+pkgver=7.0
 pkgrel=1
 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
 arch=('i686' 'x86_64' 'mips64el')
@@ -32,7 +32,7 @@ depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss>=3.12.10' 'libxt' 'libxrender'
          'lcms' 'nspr>=4.8.8' 'libevent' 'libpng' 'cairo')
 makedepends=('unzip' 'zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm'
              'mesa' 'autoconf2.13' 'gconf' 'xorg-server-xvfb')
-options=(!buildflags)
+options=(!buildflags !distcc)
 url="http://www.gnu.org/software/gnuzilla/"
 install=icecat.install
 source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
@@ -52,7 +52,7 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
 # Default options
         firefox.js
         region.properties)
-md5sums=('9b752e408717ccb50d50f0bafe18a552'
+md5sums=('f486a11f638e208b45b04c29d41de19b'
          'e7fe1de533599f4ae645ea1661e4006a'
          'e81ad01dbc16ba28bf92ba4b7c309ca7'
          'd93fe402b87cd000a869e1fd6badc6c9'
@@ -91,7 +91,7 @@ build() {
   sed -i 's/@PRE_RELEASE_SUFFIX@//g' \
       browser/base/content/browser.xul
 
-  export LDFLAGS="-Wl,-rpath,/usr/lib/icecat-$pkgver -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-$pkgver"
   export PYTHON="/usr/bin/python2"
 
   # PGO
diff --git a/libre/icecat/firefox-version.patch b/libre/icecat/firefox-version.patch
index 85a8fb18d..a72eab698 100644
--- a/libre/icecat/firefox-version.patch
+++ b/libre/icecat/firefox-version.patch
@@ -5,7 +5,7 @@ diff -Nur mozilla-2.0.orig//browser/installer/Makefile.in mozilla-2.0/browser/in
  
  include $(DEPTH)/config/autoconf.mk
  
-+MOZ_APP_VERSION="4.0"
++MOZ_APP_VERSION="7.0"
 +
  include $(topsrcdir)/config/rules.mk