Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/libnetfilter_log/PKGBUILD
	community/radvd/PKGBUILD
	community/ucarp/PKGBUILD
	extra/ardour/PKGBUILD
	extra/docker/PKGBUILD
	extra/fftw/PKGBUILD

4 files changed, 154 insertions, 57 deletions

diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index 656f49fb5..499f4bab0 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=ghostscript
 pkgname=ghostscript-libre
 pkgver=9.06
-pkgrel=1
+pkgrel=1.1  # rebuild for mips64el -march
 pkgdesc="An interpreter for the PostScript language without non-free files"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3') #non free files removed
@@ -18,12 +18,17 @@ conflicts=('ghostscript')
 replaces=('ghostscript')
 provides=("ghostscript=$pkgver")
 url="http://www.ghostscript.com/"
-source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
-options=('!libtool' '!makeflags')
-md5sums=('46f9ebe40dc52755287b30704270db11')
+source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2
+        ijs-automake.patch)
+options=('!libtool')
+md5sums=('46f9ebe40dc52755287b30704270db11'
+         '686830841eb9004143a0d0f56b73aaaf')
 
 build() {
   cd ${srcdir}/ghostscript-${pkgver}
+
+  # Fix build with recent automake.
+  patch -p1 -i "$srcdir/ijs-automake.patch"
   
   # delete non-free packages
   grep -l "are not altered" Resource/CMap/* | xargs rm -fv
@@ -57,7 +62,7 @@ build() {
 
 package() {
   cd ${srcdir}/ghostscript-${pkgver}
-  make DESTDIR=${pkgdir} \
+  make -j1 DESTDIR=${pkgdir} \
 	cups_serverroot=${pkgdir}/etc/cups \
 	cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
 
@@ -72,5 +77,5 @@ package() {
 
   # install IJS
   cd ${srcdir}/ghostscript-${pkgver}/ijs
-  make DESTDIR=${pkgdir} install
+  make -j1 DESTDIR=${pkgdir} install
 }
diff --git a/libre/ghostscript-libre/ijs-automake.patch b/libre/ghostscript-libre/ijs-automake.patch
new file mode 100644
index 000000000..1b890277a
--- /dev/null
+++ b/libre/ghostscript-libre/ijs-automake.patch
@@ -0,0 +1,10 @@
+--- ghostscript-9.06.orig/ijs/configure.ac	2012-08-08 10:01:36.000000000 +0200
++++ ghostscript-9.06/ijs/configure.ac	2013-02-03 19:33:08.361797799 +0100
+@@ -117,7 +117,6 @@
+ dnl Checks for programs
+ 
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AM_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ AC_ISC_POSIX
diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD
index 8a3d62929..93468bbba 100644
--- a/libre/licenses-libre/PKGBUILD
+++ b/libre/licenses-libre/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 82120 2010-06-08 16:36:51Z dan $
+# $Id: PKGBUILD 176952 2013-02-03 00:38:36Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=licenses-libre
-pkgver=2.9
+pkgver=20130203
 pkgrel=1
 pkgdesc="The standard licenses distribution package"
 arch=('any')
 license=('custom:none')
-url="http://parabolagnulinux.org"
+url="http://parabolagnulinux.org/"
 groups=('base')
 provides=("licenses=${pkgver}")
 conflicts=('licenses')
@@ -29,100 +30,105 @@ source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
         http://www.gnu.org/licenses/fdl-1.2.txt
         http://www.gnu.org/licenses/fdl-1.3.txt
         http://www.latex-project.org/lppl.txt
-        http://www.mozilla.org/MPL/MPL-1.1.txt
+        mpl-1.1.txt::http://www.mozilla.org/MPL/1.1/index.txt
         perlartistic.txt
         http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt
         php-3.0.txt::http://www.php.net/license/3_0.txt
-        ruby-license.txt::http://www.ruby-lang.org/en/LICENSE.txt
+        ruby-license.txt::http://www.ruby-lang.org/en/about/license.txt
         cpl-1.0.txt
         python-2.txt
+        w3c.txt
         ZopePublicLicense.txt)
+md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
+         'ffb24d1bbf8b83d373f0b8edc3feb0c6'
+         '5367190077e12a7f55403d531ef3998e'
+         '77651e5c686cbc0f8cec5ac7e6504235'
+         '6cb35f3976cd093011967fa1abbce386'
+         'f300afd598546add034364cd0a533261'
+         '73f1eb20517c55bf9493b7dd6e480788'
+         'b234ee4d69f5fce4486a80fdaf4a4263'
+         'd32239bcb673463ab874e80d47fae504'
+         '4fbd65380cdd255951079008b364516c'
+         'e6a600fd5e1d9cbde2d983680233ad02'
+         '24ea4c7092233849b4394699333b5c56'
+         '10b9de612d532fdeeb7fe8fcd1435cc6'
+         '9f4337828d782bdea41f03dd2ad1b808'
+         'bfe1f75d606912a4111c90743d6c7325'
+         'd09c120ca7db95ef2aeecec0cb08293b'
+         'b4a94da2a1f918b217ef5156634fc9e0'
+         'a45bb1bbeed9e26b26c5763df1d3913d'
+         'f24b942d957112d759762054b6e7cf34'
+         'f083e41c43db25e18f36c91e57750b64'
+         'a055911c32fb4ed6e96c453ceaeba857'
+         '6f2095b5d61770740852873b195a4d21'
+         'dc8502850eab9e1ff330a12d7ca18a19')
 
-build() {
-  cd $pkgdir
+package() {
+  cd "$pkgdir"
   mkdir -p usr/share/licenses/common
   cd usr/share/licenses/common
 
   mkdir AGPL3
-  cp $srcdir/agpl-3.0.txt AGPL3/license.txt
+  cp "$srcdir"/agpl-3.0.txt AGPL3/license.txt
   ln -s AGPL3 AGPL
 
   mkdir Apache
-  cp $srcdir/apache-2.0.txt Apache/license.txt
+  cp "$srcdir"/apache-2.0.txt Apache/license.txt
   ln -s Apache APACHE
 
   mkdir Artistic2.0
-  cp $srcdir/artistic-2_0.txt Artistic2.0/license.txt
+  cp "$srcdir"/artistic-2_0.txt Artistic2.0/license.txt
 
   mkdir CCPL
-  cp $srcdir/cc-by-3.0.txt CCPL/
-  cp $srcdir/cc-by-sa-3.0.txt CCPL/
-  cp $srcdir/cc-readme.txt CCPL/
+  cp "$srcdir"/cc-by-3.0.txt CCPL/
+  cp "$srcdir"/cc-by-sa-3.0.txt CCPL/
+  cp "$srcdir"/cc-readme.txt CCPL/
 
   mkdir CDDL
-  cp $srcdir/cddl-1.0.txt CDDL/license.txt
+  cp "$srcdir"/cddl-1.0.txt CDDL/license.txt
 
   mkdir CPL
-  cp $srcdir/cpl-1.0.txt CPL/license.txt
+  cp "$srcdir"/cpl-1.0.txt CPL/license.txt
 
   mkdir EPL
-  cp $srcdir/eclipse-1.0.txt EPL/license.txt
+  cp "$srcdir"/eclipse-1.0.txt EPL/license.txt
 
   mkdir {GPL2,GPL3}
-  cp $srcdir/gpl-2.0.txt GPL2/license.txt
-  cp $srcdir/gpl-3.0.txt GPL3/license.txt
+  cp "$srcdir"/gpl-2.0.txt GPL2/license.txt
+  cp "$srcdir"/gpl-3.0.txt GPL3/license.txt
   ln -s GPL2 GPL
 
   mkdir {FDL1.2,FDL1.3}
-  cp $srcdir/fdl-1.2.txt FDL1.2/license.txt
-  cp $srcdir/fdl-1.3.txt FDL1.3/license.txt
+  cp "$srcdir"/fdl-1.2.txt FDL1.2/license.txt
+  cp "$srcdir"/fdl-1.3.txt FDL1.3/license.txt
   ln -s FDL1.2 FDL
 
   mkdir {LGPL2.1,LGPL3}
-  cp $srcdir/lgpl-2.1.txt LGPL2.1/license.txt
-  cp $srcdir/lgpl-3.0.txt LGPL3/license.txt
+  cp "$srcdir"/lgpl-2.1.txt LGPL2.1/license.txt
+  cp "$srcdir"/lgpl-3.0.txt LGPL3/license.txt
   ln -s LGPL2.1 LGPL
 
   mkdir LPPL
-  cp $srcdir/lppl.txt LPPL/license.txt
+  cp "$srcdir"/lppl.txt LPPL/license.txt
 
   mkdir MPL
-  cp $srcdir/MPL-1.1.txt MPL/license.txt
+  cp "$srcdir"/mpl-1.1.txt MPL/license.txt
 
   mkdir PerlArtistic
-  cp $srcdir/perlartistic.txt PerlArtistic/license.txt
+  cp "$srcdir"/perlartistic.txt PerlArtistic/license.txt
 
   mkdir PHP
-  cp $srcdir/php-3.0.txt PHP/license.txt
+  cp "$srcdir"/php-3.0.txt PHP/license.txt
   
   mkdir PSF
-  cp $srcdir/python-2.txt PSF/license.txt
+  cp "$srcdir"/python-2.txt PSF/license.txt
 
   mkdir RUBY
-  cp $srcdir/ruby-license.txt RUBY/license.txt
+  cp "$srcdir"/ruby-license.txt RUBY/license.txt
+
+  mkdir W3C
+  cp "$srcdir"/w3c.txt W3C/license.txt
 
   mkdir ZPL
-  cp $srcdir/ZopePublicLicense.txt ZPL/license.txt
+  cp "$srcdir"/ZopePublicLicense.txt ZPL/license.txt
 }
-md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
-         'ffb24d1bbf8b83d373f0b8edc3feb0c6'
-         '5367190077e12a7f55403d531ef3998e'
-         '77651e5c686cbc0f8cec5ac7e6504235'
-         '6cb35f3976cd093011967fa1abbce386'
-         'f300afd598546add034364cd0a533261'
-         '73f1eb20517c55bf9493b7dd6e480788'
-         'b234ee4d69f5fce4486a80fdaf4a4263'
-         'd32239bcb673463ab874e80d47fae504'
-         '4fbd65380cdd255951079008b364516c'
-         'e6a600fd5e1d9cbde2d983680233ad02'
-         '24ea4c7092233849b4394699333b5c56'
-         '10b9de612d532fdeeb7fe8fcd1435cc6'
-         '9f4337828d782bdea41f03dd2ad1b808'
-         'bfe1f75d606912a4111c90743d6c7325'
-         'd09c120ca7db95ef2aeecec0cb08293b'
-         'b4a94da2a1f918b217ef5156634fc9e0'
-         'a45bb1bbeed9e26b26c5763df1d3913d'
-         'bfecdc446cd2a6a4410ac9e6d0064b3a'
-         'f083e41c43db25e18f36c91e57750b64'
-         'a055911c32fb4ed6e96c453ceaeba857'
-         'dc8502850eab9e1ff330a12d7ca18a19')
diff --git a/libre/licenses-libre/w3c.txt b/libre/licenses-libre/w3c.txt
new file mode 100644
index 000000000..6a29463d3
--- /dev/null
+++ b/libre/licenses-libre/w3c.txt
@@ -0,0 +1,76 @@
+W3C Software Notice and License
+
+This work (and included software, documentation such as READMEs, or
+other related items) is being provided by the copyright holders under
+the following license.  
+
+License
+
+By obtaining, using and/or copying this work, you (the licensee) agree
+that you have read, understood, and will comply with the following
+terms and conditions.
+
+Permission to copy, modify, and distribute this software and its
+documentation, with or without modification, for any purpose and
+without fee or royalty is hereby granted, provided that you include
+the following on ALL copies of the software and documentation or
+portions thereof, including modifications:
+
+    - The full text of this NOTICE in a location viewable to users of
+      the redistributed or derivative work.
+
+    - Any pre-existing intellectual property disclaimers, notices, or
+      terms and conditions. If none exist, the W3C Software Short
+      Notice should be included (hypertext is preferred, text is
+      permitted) within the body of any redistributed or derivative
+      code.  
+        *"W3C Software Short Notice" above links to:
+         www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html
+
+    - Notice of any changes or modifications to the files, including
+      the date changes were made. (We recommend you provide URIs to
+      the location from which the code is derived.)
+
+Disclaimers
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT
+HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR
+DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
+OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to the software without specific,
+written prior permission. Title to copyright in this software and any
+associated documentation will at all times remain with copyright
+holders.  Notes
+
+This version:
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This formulation of W3C's notice and license became active on December
+31 2002. This version removes the copyright ownership notice such that
+this license can be used with materials other than those owned by the
+W3C, reflects that ERCIM is now a host of the W3C, includes references
+to this specific dated version of the license, and removes the
+ambiguous grant of "use". Otherwise, this version is the same as the
+previous version and is written so as to preserve the Free Software
+Foundation's assessment of GPL compatibility and OSI's certification
+under the Open Source Definition.
+
+      *"previous version" above links to:
+       http://www.w3.org/Consortium/Legal/copyright-software-19980720
+
+      *"Free Software Foundation's assessment of GPL compatibility" links to:
+       http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses
+
+      *"OSI's certification" above links to:
+       http://opensource.org/licenses/W3C.php
+
+      *"Open Source Definition" above links to:
+       http://opensource.org/docs/definition.php