6 files changed, 45 insertions, 10 deletions
diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 6279272dc..d235728ad 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 123250 2014-11-28 14:54:58Z jelle $
+# $Id: PKGBUILD 123881 2014-12-14 16:38:49Z andrea $
 # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
@@ -10,15 +10,15 @@
 pkgname=calibre
 _pkgname=$pkgname-libre
 pkgver=2.12.0
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://$pkgname-ebook.com/"
 license=('GPL3')
-depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 
+depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
          'python2-mechanize' 'podofo' 'libwmf'
-         'imagemagick' 'chmlib' 'python2-lxml' 'libusbx' 
-         'python2-pillow' 'shared-mime-info' 'python2-dnspython' 
+         'imagemagick' 'chmlib' 'python2-lxml' 'libusbx'
+         'python2-pillow' 'shared-mime-info' 'python2-dnspython'
          'python2-pyqt5' 'python2-psutil' 'icu' 'libmtp' 'python2-dbus'
          'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit'
          'qt5-svg' 'python2-chardet' 'python2-html5lib' 'python2-pygments')
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 404b7abf4..148d6dff7 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=pacman
 pkgver=4.1.2
-pkgrel=7.parabola1
+pkgrel=7.parabola2
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -33,9 +33,9 @@ source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
 md5sums=('063c8b0ff6bdf903dc235445525627cd'
          'SKIP'
          'd0e015b1bf78cbf9762d9c44ea5f77a9'
-         'b70916f89e1f801dd6368a3c4883526d'
-         '75b714d530f7de108b5562d1801bf2e2'
-         '20b328234c49330db780565463064f9b'
+         '9c1454e48b2216b23f931e04d6dab1ee'
+         '7279d086428df483fd60c33f7c88cf3e'
+         'a12b1a4533c170aecc8b9b8561048248'
          'f0f310df411f943dbc4e2dd376c88662'
          '8c339b2bf027979d1edcfc6ac0e7e81d'
          '3cfc5d2867a6672f4f629220632948f4'
diff --git a/libre/pacman/pacman.conf.i686 b/libre/pacman/pacman.conf.i686
index 410bcb17a..d0c45c131 100644
--- a/libre/pacman/pacman.conf.i686
+++ b/libre/pacman/pacman.conf.i686
@@ -68,6 +68,16 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
+# NOTE: Nonprism is a particular repository that aims to provide software built
+# and patched without services under global data surveillance programs like PRISM,
+# XKeyscore and Tempora. For more info see: https://wiki.parabola.nu/Nonprism
+
+#[nonprism]
+#Include = /etc/pacman.d/mirrorlist
+
+#[nonprism-testing]
+#Include = /etc/pacman.d/mirrorlist
+
 #[libre-testing]
 #Include = /etc/pacman.d/mirrorlist
 
diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
index 49faa2af5..136924c96 100644
--- a/libre/pacman/pacman.conf.mips64el
+++ b/libre/pacman/pacman.conf.mips64el
@@ -68,6 +68,16 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
+# NOTE: Nonprism is a particular repository that aims to provide software built
+# and patched without services under global data surveillance programs like PRISM,
+# XKeyscore and Tempora. For more info see: https://wiki.parabola.nu/Nonprism
+
+#[nonprism]
+#Include = /etc/pacman.d/mirrorlist
+
+#[nonprism-testing]
+#Include = /etc/pacman.d/mirrorlist
+
 #[libre-testing]
 #Include = /etc/pacman.d/mirrorlist
 
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
index 9e6c3fe88..07cc0a86c 100644
--- a/libre/pacman/pacman.conf.x86_64
+++ b/libre/pacman/pacman.conf.x86_64
@@ -68,6 +68,16 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
+# NOTE: Nonprism is a particular repository that aims to provide software built
+# and patched without services under global data surveillance programs like PRISM,
+# XKeyscore and Tempora. For more info see: https://wiki.parabola.nu/Nonprism
+
+#[nonprism]
+#Include = /etc/pacman.d/mirrorlist
+
+#[nonprism-testing]
+#Include = /etc/pacman.d/mirrorlist
+
 #[libre-testing]
 #Include = /etc/pacman.d/mirrorlist
 
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 54ffb9e06..13ce2069b 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -5,8 +5,13 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu
 license=('GPL3')
 url="https://projects.parabola.nu/blacklist.git"
 #url="https://lukeshu.com/git/mirror/parabola/blacklist.git"
+<<<<<<< HEAD
 pkgver=20141213
 _gitver=e20783c6f0a66fd05400ca888683f68e0278c6a7
+=======
+pkgver=20141215
+_gitver=883028227ea883c7ae90ac04b961b59c9daa71bb
+>>>>>>> 93dd217e948a8120899d72879def905500a8e4ea
 pkgrel=1
 
 arch=('any')
@@ -16,7 +21,7 @@ install=${pkgname}.install
 makedepends=(librelib)
 source=(blacklist-${_gitver}.txt::https://projects.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver})
 #source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver})
-md5sums=('3ea6c23b5dbc39dee4582de0c7744cb8')
+md5sums=('277564a425ed9a868d932100450844fe')
 
 package() {
 	cd "$srcdir"