Sat Mar 15 03:58:34 UTC 2014

6 files changed, 31 insertions, 25 deletions

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index c06c8af0b..fd3f3b5ea 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 106748 2014-03-07 08:31:10Z jelle $
+# $Id: PKGBUILD 107204 2014-03-14 14:47:48Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=1.27.0
+pkgver=1.28.0
 pkgrel=1
 pkgdesc="Ebook management application, with unar support"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -30,7 +30,7 @@ install=calibre.install
 source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('d30d39d8a63cb77c8fe04b99ef092dd9'
+md5sums=('7f435bb4b4613c9a1642ce3a8414392d'
          'ece36dfd737fa4a346f0a0e59395e949'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 77d324667..b39575e9c 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -7,8 +7,8 @@
 _pkgname=hplip
 pkgname=hplip-libre
 pkgver=3.14.1
-pkgrel=2
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation (Parabola rebranded)"
+pkgrel=2.1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without printers with nonfree drivers support and hplip-plugin binary blobs recommendation (Parabola rebranded)"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
 license=('GPL')
@@ -37,6 +37,28 @@ md5sums=('11eb45f3d3edf1f03887fd13afc61b51'
 
 prepare() {
  cd $_pkgname-$pkgver
+
+ echo "Removing printers not supported with free drivers from the database"
+
+ # based on http://devel.trisquel.info/gitweb/?p=package-helpers.git;a=blob_plain;f=helpers/make-hplip;hb=refs/heads/toutatis revision 4
+ # keep header license
+ sed  '/\[/,99999d' data/models/models.dat > mktemp
+
+ for model in $(grep '\[' data/models/models.dat | /bin/sed 's/\[//; s/\]//'); do
+   sed -n "/\[$model\]/,/^$/p;" data/models/models.dat > mktemp1
+   grep '^download=True' -q mktemp1 && continue
+   grep '^plugin=1' -q mktemp1 && continue
+   grep '^support-type=0' -q mktemp1 && continue
+   cat mktemp1 >> mktemp
+ done
+
+ sed -i 's/plugin=2/plugin=0/g' mktemp
+
+ cp mktemp data/models/models.dat
+
+ rm -v mktemp{,1}
+
+ echo "Preparing source"
  
  export PYTHON=python2
  
diff --git a/libre/python2-ply/PKGBUILD b/libre/python2-ply/PKGBUILD
deleted file mode 100644
index fec80926a..000000000
--- a/libre/python2-ply/PKGBUILD
+++ /dev/null
@@ -1,16 +0,0 @@
-# Contributor: Marcin "avalan" Falkiewicz <avalatron@gmail.com>
-# Maintainer: C Anthony Risinger <anthony@xtfx.me>
-
-pkgname='python2-ply'
-pkgver=3.4
-pkgrel=1
-pkgdesc='Implementation of lex and yacc parsing tools for Python.'
-arch=('any')
-url='http://www.dabeaz.com/ply/'
-license=('BSD')
-depends=('python2')
-makedepends=('python2-distribute')
-source=("${url}ply-${pkgver}.tar.gz")
-md5sums=('ffdc95858819347bf92d7c2acc074894')
-
-build() { cd "ply-${pkgver}"; python2 setup.py install --root="${pkgdir}"; }
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index 0aec4683d..e56677d76 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -47,7 +47,7 @@ backup=(etc/texmf/web2c/texmf.cnf \
 	etc/texmf/xdvi/XDvi)
 
 mkmd5sums=('7e11e1bf401d0a152ac50ef48d676bb3')
-md5sums=('ce7c019db21ce546d6d7f1df4bc247fe'
+md5sums=('7f276d14c0d715704b1acbc195e72fe6'
          '8b998b0944a766abeb1ff8ca53029084'
          'd5a3f442ec3b7aa1518170f64f9d006b'
          '16ad4dc53deb00029baef1b01ba1d984'
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index fb8697bc6..40ef79a37 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -23,8 +23,8 @@ options=('!emptydirs')
 options=(!strip)
 install=texlive.install
 mkmd5sums=('4953978642ddcfc90854230b57145b5b')
-md5sums=('e6b12e482913169f44c54172316416bc'
-         'f489cc5f762dcdbe6acb11624de7e138')
+md5sums=('0e0d06caf88304ed7988f23962f44b2d'
+         '2ee682ecd2a7defb5f089be09be2ffed')
 
 mksource() {
    mkdir $_pkgname-$pkgver
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index 12b8355a3..48756201a 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -32,7 +32,7 @@ options=('!emptydirs')
 options=(!strip)
 install=texlive.install
 mkmd5sums=('ef7a22d455bcf59aee21fc65274df5b8')
-md5sums=('7e6ff7b61faf268fe2b814c4949ab364'
+md5sums=('f555e017e8157716ead75f3bdc025d58'
          '9e4825f47dac663dd62c4bfa67899e84')
 
 mksource() {