Merge branch 'master' of vparabola:abslibre

25 files changed, 879 insertions, 200 deletions

diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 91832cc42..a2e8a5627 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192495 2013-08-13 09:26:23Z tpowa $
+# $Id: PKGBUILD 193106 2013-08-16 10:56:45Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-pkgver=${_basekernel}.6
-pkgrel=2
+pkgver=${_basekernel}.7
+pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -22,17 +22,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'criu-no-expert.patch'
-        '3.10.6-logitech-dj.patch'
-        '3.10.6-reset-superseed-xhci-hcd.patch')
+        '3.10.6-logitech-dj.patch')
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         'f4810ea4bd977321d76edcde8dc756c9'
+         '8d05dec5772b17c4c21c00b93da42bd8'
          '7dc48829b6bcb5db3779d558c705ab63'
          'f302c931bd85309da9d9792b4cc96467'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '3ff40ca684cfe719723e627e2cef7cea'
-         'e751378a3e94532bfe85fb82c80e26c0')
+         '3ff40ca684cfe719723e627e2cef7cea')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-PAE
@@ -59,9 +57,6 @@ prepare() {
   # fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless
   patch -Np1 -i  "${srcdir}/3.10.6-logitech-dj.patch"
 
-  # fix https://bugs.archlinux.org/task/36296 - [linux] 3.10.3 reset SuperSpeed USB using xhci_hcd
-  patch -Np1 -i  "${srcdir}/3.10.6-reset-superseed-xhci-hcd.patch"
-
   cat "${srcdir}/config" > ./.config # simpler
 
   if [ "${_kernelname}" != "" ]; then
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index b9aa01f1e..227a66426 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192495 2013-08-13 09:26:23Z tpowa $
+# $Id: PKGBUILD 193106 2013-08-16 10:56:45Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-pkgver=${_basekernel}.6
-pkgrel=2
+pkgver=${_basekernel}.7
+pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -22,17 +22,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'criu-no-expert.patch'
-        '3.10.6-logitech-dj.patch'
-        '3.10.6-reset-superseed-xhci-hcd.patch')
+        '3.10.6-logitech-dj.patch')
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '63a1c2aba22871f8e8dacdb4968d9a1f'
+         '8d05dec5772b17c4c21c00b93da42bd8'
          'f104314d8db864b1702c50ea97134be3'
          'b7c2805bb287a644c0a303bf7721e534'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
          'd50c1ac47394e9aec637002ef3392bd1'
-         '3ff40ca684cfe719723e627e2cef7cea'
-         'e751378a3e94532bfe85fb82c80e26c0')
+         '3ff40ca684cfe719723e627e2cef7cea')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-XEN
@@ -59,9 +57,6 @@ prepare() {
   # fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless
   patch -Np1 -i  "${srcdir}/3.10.6-logitech-dj.patch"
 
-  # fix https://bugs.archlinux.org/task/36296 - [linux] 3.10.3 reset SuperSpeed USB using xhci_hcd
-  patch -Np1 -i  "${srcdir}/3.10.6-reset-superseed-xhci-hcd.patch"
-
   cat "${srcdir}/config" > ./.config # simpler
 
   if [ "${_kernelname}" != "" ]; then
diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-libre/PKGBUILD
new file mode 100644
index 000000000..7e53ce898
--- /dev/null
+++ b/libre/bitlbee-libre/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id$
+
+# Contributor: FUBAR <mrfubar@gmail.com>
+# Contributor: simo <simo@archlinux.org>
+# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=bitlbee
+pkgname=bitlbee-libre
+pkgver=3.2
+pkgrel=3
+pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without Skype support'
+url='http://www.bitlbee.org/'
+license=('GPL')
+arch=('i686' 'x86_64' 'mips64el')
+depends=('gnutls' 'glib2')
+makedepends=('asciidoc' 'libotr3')
+optdepends=('libotr3: for OTR encryption support'
+            'xinetd: to run bitlbee through xinetd')
+provides=$_pkgname=$pkgver
+conflicts=$_pkgname
+replaces=("$_pkgname")
+source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
+        'xinetd'
+        'bitlbee.tmpfiles')
+sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e'
+          'ec1a3efff09b9fc3d3e52560d8cdbe23186c819f'
+          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
+backup=('etc/bitlbee/bitlbee.conf'
+        'etc/bitlbee/motd.txt'
+        'etc/xinetd.d/bitlbee')
+install=bitlbee.install
+
+build() {
+  cd "$_pkgname-$pkgver"
+
+  ./configure \
+    --prefix=/usr \
+    --etcdir=/etc/bitlbee \
+    --sbindir=/usr/bin \
+    --pidfile=/run/bitlbee/bitlbee.pid \
+    --ipcsocket=/run/bitlbee/bitlbee.sock \
+    --systemdsystemunitdir=/usr/lib/systemd/system \
+    --ssl=gnutls \
+    --strip=0 \
+    --otr=plugin \
+    --skype=0
+
+  # hacky: build against libotr3
+  sed -i 's,^OTRFLAGS=.*,OTRFLAGS=-lotr3,' Makefile.settings
+  sed -i 's,#include.*libotr,&3,' otr.h
+
+  make
+}
+
+package() {
+  make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
+
+  install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
+  install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
+  install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
+}
diff --git a/nonprism/bitlbee-nonprism/bitlbee.install b/libre/bitlbee-libre/bitlbee.install
index aa5a81a70..aa5a81a70 100644
--- a/nonprism/bitlbee-nonprism/bitlbee.install
+++ b/libre/bitlbee-libre/bitlbee.install
diff --git a/libre/bitlbee-libre/bitlbee.tmpfiles b/libre/bitlbee-libre/bitlbee.tmpfiles
new file mode 100644
index 000000000..da72a0a79
--- /dev/null
+++ b/libre/bitlbee-libre/bitlbee.tmpfiles
@@ -0,0 +1 @@
+d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/nonprism/bitlbee-nonprism/xinetd b/libre/bitlbee-libre/xinetd
index 169134d2b..68d5663b3 100644
--- a/nonprism/bitlbee-nonprism/xinetd
+++ b/libre/bitlbee-libre/xinetd
@@ -6,7 +6,7 @@ service bitlbee
         wait = no
         user = bitlbee
 	group = bitlbee
-        server = /usr/sbin/bitlbee
+        server = /usr/bin/bitlbee
         port = 6667
         disable = yes
-}
\ No newline at end of file
+}
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index a0301db23..ecd2ace16 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95549 2013-08-14 01:57:12Z fyan $
+# $Id: PKGBUILD 96190 2013-08-21 13:06:15Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: monson <holymonson@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
 
 pkgname=cgminer-libre
 _pkgflag=libre
-pkgver=3.3.4
+pkgver=3.4.0
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
@@ -61,6 +61,6 @@ package() {
   install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
 }
 
-md5sums=('cceed50022ee8f63bf6f6416551290c7'
-         'fe4a243fabe24608f5c05e40f0f118f6'
-         'bd76fc92fedce18c59ccea2aa79cc664')
+sha512sums=('2f308c9285755b62608da4a6be3942d08b6cfff218238dbb4c15da7d02c8f2ac46cd7a9fbd69b7a46faa11962a937ba6327aa03852c291e69ff6158e50c1e5b6'
+            '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
+            '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 45294e48e..f1446b23b 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgbase=icedove-l10n
-_pkgver=17.0.7
-pkgver=17.0.7.1
+_pkgver=17.0.8
+pkgver=17.0.8.1
 
 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
 
@@ -64,58 +64,58 @@ done
 
 md5sums=('d5b2567a8cc8f64591f313a6efdaaffc'
          'f3719964e893c1002b7a923e8f95f923'
-         'fb33f8da3bc9f0906baf5222098e9359'
-         '0ceada37eed6ea7986fdffd6b0ea5aac'
-         '612dcc6e280b547efe9d6cebf82a1eb5'
-         'fcc841359ef595fb58e6ef2333453ca0'
-         '69c31584fd7b442b655e58e4556f5034'
-         '479b6a37772b6885c52f26187818c542'
-         'b723a4ae893838f4d332c5118bacd2fb'
-         '8cae26bd3354071f96faaa58f633f7f3'
-         '99fcd0609b232ba167d22200df617ce4'
-         '14e0224981659188f41d15d8a2a116bf'
-         '1da89ba6776c5be68851ab6782809b25'
-         '4e5e74537f138c0a5cfef02931e57c6b'
-         '67bb0b85fd5fd3f7344982cb0f93cc60'
-         'a7120022d3a957f152044f5d7ce155e2'
-         '44a35e42bc9682b42f7fad416f803b83'
-         '149da69e91a018b8c2d2341b62091b18'
-         'e78c3749605674623a5ebd455d1da5e6'
-         '18d4429db86023c3cff4cdfdb3c7db61'
-         '327f085c787a61c95b7904f1d68ba8ba'
-         'c7f83c1d5fac8bae0257f5269d6318a9'
-         '2d8f1bf1e814fc984d791a95c4ef8811'
-         '2513698f14cbc85651c5b752845a9d7f'
-         '5d727ff5a17e105abe44b1e970868ea2'
-         'e233b53dce6072308c190cdb83cb3d08'
-         'f8c1f680d62c76607c12cf517fb4d9b1'
-         '124a5110c4e807bae739fa5542b21e6f'
-         '8031d7162eeb68343d0879550653c13d'
-         'af6f26ef85012c84fb28279230a6bf47'
-         '93a25ac664d66deb4e0e88a9dd0f601f'
-         'f834580781619b97659dc95d8f203d2b'
-         'd54e1e7ed5c5d88db1ef2445bc0c9948'
-         '7a899329dafb829075f735990171823f'
-         '46fb6882a4350a86616dd0859b230602'
-         '80492e996b180062f56f9005d4083608'
-         '9fab024f293084e98e00639bb156b7aa'
-         'a24adcb523efdfb836d7aa8dcb192a8b'
-         '3742697f98cec4bb7c565cdede33263f'
-         'd9362ae826eb8591db5d6cf3f56bba0f'
-         '5e05ee5c2ef8ee9e5869a1f26277df2c'
-         '6cd8b8a4f19df69408ed03e7d09032dd'
-         '5ff06adb7f42975034f29910f5c9698d'
-         '74b76de767b3d1fc5eae3b40f55bca20'
-         'd387e154d9a6d322551a16ac9e9b38e3'
-         '03c41d2d47146ca18aab8dff9023d3aa'
-         '8fb9aa07d7c5244da75192ebaa254d3c'
-         '84377496e3bc15d46f85bef767ca13ba'
-         '07ac58fb12e6744279670c22bbe41d9b'
-         'b12f1a56bc7ce08c2800955257db1799'
-         '36ffa376a0e38e5b7000c2725cca994d'
-         '1fb8619dff3c3ee7c07e659a88094b8f'
-         '158ca3414b6ac982fc0c97d8b4f28c98'
-         '1fdabfde405e2bf54a4c8ad25c04d98f'
-         'ffce5a4d36bc8a42496fda405ac677f7'
-         'e183f1b3c17813399a930cb7b66d545d'
-         '12a93560247c526b0d29cacfc9f4882d')
+         'ad61f2a7632c8ce1251d5952181398df'
+         '3fd84e4b803bca0fedb737440a040e45'
+         '4586a2dabddfcc16855edf6b8d69962a'
+         'c584f31ae8b2c24da15666fc4fa3563b'
+         '702f3257cf019843d74fbaadb99e2886'
+         '6551ad7767aa87ee42e6d31ff9590648'
+         'd1b275d962f96166e2a459f58b1709d6'
+         'ca7a944cd07ee0c0d04a454a2516d49d'
+         '76d452fada4e133f6dc3b3584c6fac08'
+         '3b4b2cee9016abd15da1bcd6286dbc6c'
+         '028c90f0c31ab3a7b071a718d08258bb'
+         '12355d30501f1ac7a10831763bc1f354'
+         '23b28003c65f5df1be2e8008c97edc15'
+         'afc8052118c343e867718ef8561e831e'
+         '65db2679e3a8c1868739da2e27783484'
+         '1334e12708bf352a2be09d5795c95213'
+         'f73ac3d0baedb8f525676118f51426f9'
+         '4c31cb388ccaff76c95d5b46f49c4ecc'
+         '2bd1d5f69bee27da325f8298f0d1e134'
+         '6bdd8f7a3beee272d7cdfc24882d254b'
+         'e6d1dc109c9a934277aaab7e696d389b'
+         '70408d96a8bbd4aceccf1c56d05f15ce'
+         'd8fbf504de160554a9bc1e4fe13492ce'
+         '094d2815ab1668f1ebf8fcb3a764a4ec'
+         'e6b14831bdc3ce639b390175ac04113b'
+         'cf7743c55272ba14d6804a1121f9ab6b'
+         '44be8dbc2d025afa4730bfa025fa7a42'
+         'c4e95ec094792b880a1ddb8b9aff48aa'
+         'b91510b33bc07ae10f97c223f652517f'
+         '2f6364f530d8f57d104cb4f4e7b28409'
+         '5375575fd2e6721505a9fc06b0247c49'
+         '18ee8f5eaa26ec1f60e81541d5ebc6ca'
+         'ba23f860392aefa18ff50bcdc450af52'
+         '36573ca497ecd8ab8df6b1155546e698'
+         '239622a8ed51b43791d34f4c09b3f6ec'
+         '850cc70db0785d88afe03a4d9964ccd3'
+         'ed3293f4b84e4984d67f44977fccccd5'
+         '9604a4e8c42e605c04e77d204bad5664'
+         '9d5a4a6f6a6b905bb509502972682a04'
+         'ad9c38941f4a8ce055406c1bb5e7ef35'
+         '25e04c4c5a1c0c0eff21e94f75a51f5b'
+         'a369031e02f05a10b68d8ef032cb4105'
+         '4657f4f697459aa51a09915dbc3270bb'
+         '09817688b547c5a20bc8422ce1f7eab1'
+         'd194d43d1dbf60c94028a5a718ba7e36'
+         '0ebbfcf410b53596fc8fb99df51ed030'
+         'cfa588e76644846f31fbc5360cfa89a1'
+         '06141e939e5c53251c7af6d23935024d'
+         'd07936ae70c5baa32ac5f4ecdb691c8e'
+         'e5c0f2ebac114fdc2a0db275ea385858'
+         'dac675a37e160aafb0e052ae561fe189'
+         '5e112c628766e03cdae62f64d42020ca'
+         '85d89ffd10bba250f4ce8acd39b3d6f8'
+         'f068603a927801bc0c5386e61bcc8b4e'
+         '2e6f3b969a175bbe2f88b266482f4c2e')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 5fcf9f112..e793f5924 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Sid
 _debname=icedove
-_debver=17.0.7
+_debver=17.0.8
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -33,8 +33,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         ${_pkgname}.desktop
         Icedove-branding.patch)
 options=(!emptydirs)
-md5sums=('d5c0351b374b6caf536c11522929d822'
-         '0c9fc53103e7168edd972466a29cc8cf'
+md5sums=('37a706e6b2c17049ab70739600ef47b0'
+         '0524d248bd0e83fa62c261700640ac0d'
          '5cf95ea94f69cdd36604890cfbf7b954'
          'a8fc4658d45b6bf9350023e5c3f34e56'
          '4eecc4fc5aafaf0da651a09eadc90bee'
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 8e5aaa32e..fae6951dd 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -11,8 +11,8 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=23.0
-_debrel=2
+_debver=23.0.1
+_debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -75,91 +75,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
 done
 
 md5sums=('e88728730ecf9f0f145de5f70e362b15'
-         '7c6f5f3b396fe5b604a0309df56887d8'
-         '29f6867a0dcce51100b1b2de81226344'
-         '98187eb4f9c2b39f15f4845f2619a370'
-         '30aff6be2c29b7edc1e2f25e2ba17aa5'
-         '34280eb2088de420f0b30a5c4edfea47'
-         '5e0c60ed96e7c0e7423626f1bf7887aa'
-         'b493334142eb2fc34e7b8437a9a2c3a9'
-         '107ce703c94f5f2ee2e0ed995553720c'
-         'ec51a9f71f03b0b3f956d89b72fdf716'
-         '44cb3ef84c64b774822b77ee98563159'
-         'e00bb35327d3ce89e4a8ccb2b8d657c2'
-         '51749d9725048b3ff984589b98868905'
-         'e7eba955b7e1cbf3382f9d22704aa14c'
-         'eda9f403384eea2f7a6c1aa2a2847008'
-         'd5c6022989fbdb43ec30a9d8309fb1c2'
-         '15fba3ea4b680218fd6ca6ccd1bf0f33'
-         '4df74467841935c3dad15d3c7934105c'
-         '58b9cf0787d14874a8f8d00e16367e2a'
-         'c0f4e54fa68297daead97224ac4e082a'
-         'eb9a40bb22d5e2f90a044f7bb2bf3694'
-         'a859688826673daac45691269ffb23db'
-         '14e8a7ac44eda8396713caef5c0f3698'
-         '40ffb8a42d3f5cfe45a18dbdca332cda'
-         'c37c630294cf249f568f2690a7893a5d'
-         '8138ad1ffe9da5c2761dcbbc17956580'
-         '232b28c8b786cae84da0f9b17b81f77e'
-         'ff058341e40c2298e93781537e1e16a4'
-         '8ee84a80ec21062da79ac4f890011138'
-         'c87c957434ff5e3a358169d8deb82289'
-         '3b214ba1561a9fd68496bc15741f0ef6'
-         'a31fdc5c8f18b3da9f6da6eb40b6826f'
-         '38c0029092f63fb242a5cfcaeea62a46'
-         '1aa8d60bae24e311cc59c204c8d25acb'
-         '3dcea0e04413a8cf09b0f170c46b54be'
-         '42a11ebf551cb9ea4cc0ebfc0fa9c729'
-         '60711351dbc78103da6498bfe8d36bf2'
-         'c1d6462bf15a3c1caffe95ffa1207b49'
-         '63304afbf85a4c9b9e120bbaa56e083a'
-         '5c352f049345c59643c973aae4d47397'
-         '4f6c187da9ccee9d3118c14ea38d66a6'
-         '6743c258d7551a50f63a08ec8bfedcf0'
-         '27e98c22c2bf48b16a5662b183802e9c'
-         'c0a3726a0b620bdc0ab6ecf8a91ed9c7'
-         '69892a62d19395ef3d58fbc8d234dc2b'
-         '5c9dc60dc8884f6ec8e7077ea2656799'
-         '78d395912439bd82633189089318d840'
-         '27987170519cf7ba136b1cc7c6e15567'
-         '8e508fdd2c4d161fce32e58310ca1f62'
-         'fa2c5b8c0d03a881c74f1970ed87e6d4'
-         '17e05880fdf46e5c4012bbd16a870791'
-         '4263c88956b91163726ab6c2a36d79e1'
-         'c93fe46191308c2d0a4dfd92943e49c9'
-         '04375a5d4398ca422cba1ebc8d9af376'
-         '5a5baabc68c3acec54012fc853c88a49'
-         '1ec7474e2a71ce34557e65cc52e55ac6'
-         'ac283316aa0d99e45ef29bce02ce25f9'
-         'cf7e92c9e94be22c0ecd150f77e6ef64'
-         '83f9dfe29a82e453490e0f19b976a7a8'
-         'c2b5ab62490ce83a7c3da5b14cffb11a'
-         'e8d8c354955612efb71ba70210930433'
-         'ae986053d93e5a9fdf58c01d330224d9'
-         '46e43ef58e09d267ce8b598e630b189d'
-         '61dae968369c1082d6ce9a4f9b892d7f'
-         'b6fb62a0c4ad8ec8f57df4ce61ed6c1c'
-         '6a56a9ab83575f5204a0d650a02e23c9'
-         'db9a303e815c36c9251845170b68f59a'
-         '1cc89f8bfee7126f68596d52a6a38cd9'
-         'ff5e0688537f43b489d4ea54e84eb9c5'
-         '8ce1171fb621f8deb14b16946caa2990'
-         '103c6469f89695601ccdc2998bc94345'
-         '130085a16099eec0dd5b0b43c80c20d7'
-         'cc8eb036c9d97803c2be648eed65cbd5'
-         'd5e2d5852eb645fadc793023f7df6cec'
-         '50d9019186336d288197067a7c7bdcd7'
-         'f8534e0a81a6e92212932958472f90fd'
-         'd46aa872ad6edc66881aa9909f6c60bd'
-         '7f1d3f04f5fc0a321edb3956a241ed2f'
-         '80d70939c6275dc8e06174b3d2980f01'
-         '699f460331e5d884d31cfb8b9dff5d30'
-         '6a89ddca19edbacad1a124eb57a701c3'
-         '25585aa164b53a18c35e84674cd9ea70'
-         '7bf050cbd0b6312d4d7700a6acaee52f'
-         'b91f594dbabff5f18e6328224b18b990'
-         '61f0f4160e16acbe94f9af66420d4cab'
-         '474363d9627ad332c92e669f95bb3089'
-         '91e8ab4c43dcbdb79759e3321386a544'
-         'e6fab14157f96f30b4dd0d4ab1956caf'
-         'e1ac39329cce36a76df1404471cbe15a')
+         'beec7ff5243399aaa490eeb908f89635'
+         'd76b30288dc5aa89c5c73327dd93e1f1'
+         '0d7a7d3f9afd4f4f535813ddbe295979'
+         'a3e395704283a7b04f5a2b622f4a3639'
+         '4957794086a29eb2aab2f9486a0749dd'
+         'd42f22d4e8f0877b94e129d5898074ea'
+         '8d87c38d9e07847e774152f7f34b0d3a'
+         'd5442982475a1948794267c6f2e8dab7'
+         'cbe6d536bb393a71827721acc8b5a592'
+         '92966282e3cb266006c1814af8e0ff0a'
+         '8dc3cd2b6892457752e8232ff0bdacd2'
+         '36fa29d00055b28c40276ada3008da20'
+         '4535bbb5f058fad2635c65a77ca948af'
+         'd55e19c70c143893334d76d803c6ad19'
+         '48ecdc05f12a84745e1f170790ab427f'
+         'c50af900a16d3e7f95dd7768dd04e8a2'
+         'd8f113de7e79743d4cb9beb127f0f95b'
+         'ee686438c9a3ea9041c19bb75f53651a'
+         '358203acae7af9752fa65550ca98f02e'
+         '726be61d6cfefcd671c24f2f49e3bf21'
+         'c15c9b35ef2bf000f3f7f8b2946aee6d'
+         '086b14122e3e45dac497ffe7f0873c02'
+         'c9c80acbc1651ebf9d025d0d3d1cd022'
+         '15ef0474ce040d9600690cdd2b257ffd'
+         '4da96de48891501d947bce50f30d0f1a'
+         '05945026206a9b0f99b09c5ce788ca6b'
+         'd636a741c3711d111ad0e04d905b2fd0'
+         '05d3bac10f8d7fc19f7941b479f44363'
+         '5abaab886f963e387444e47d993d9c1a'
+         '1a89211f0ec11c0541e4d4e983209ce9'
+         '815e0f6a34ed7c63c21403473bab0ac6'
+         'b2e768d738718f20cf6e27f6a393f093'
+         'ea65c30d06da6172848c84dc6e4e2be4'
+         '49e108b2ed86ae25acae56731685170d'
+         '8222761ee3bea5d67cd66d461e698fe6'
+         'a04b35692c4df0f410bf2d196de96928'
+         '861e047041ef3a8f6a92967d40fe8e5f'
+         'd43c967887b437c67c6d39d3c4273c49'
+         'fb8a80a7d82d5a37b926e0a946240df8'
+         'ffdcc759130ad0f23adee6ca8933190d'
+         'dcd9b3889b7050bc3e977cfa013fc2c1'
+         'd59b7828235ed96da7e309e43093923c'
+         '723db17fbf3ac58ed3402b44eb25c953'
+         '3f27760db7543ad953bf3b87bd1f61b1'
+         'ac675403c62a5b898c58ab3e95770275'
+         '7295a8115d6a0d8706ee5ea4a4a0e1fc'
+         '4073b8aca4a5eb905df761ab90e8d63a'
+         'f437bf5c2bdc9a29b6deff2bf3913af2'
+         '1a4f3e90be3aaf92763b6aa7c09db41c'
+         'dbd3ae230ca8f898f55d73406881fb4b'
+         '2d99549940ab6ec77cabb6dacf1ecc22'
+         '71eba86c8ba6c60aedccbac67d730f64'
+         '327e3808ed2318335ddb17480254098b'
+         'b3880a5392906d7547cf6f1f460fb587'
+         'd3831ed5839155fedd6afe140d9b82d3'
+         '4bbc2b071e3a691c7e31eb203473e4fe'
+         'b6a0a5958b8d7715bff75998f7a2db5a'
+         '12d766edda51a500763cab832d456f1c'
+         '7d8836f1beba05abd2f4980a739b88f6'
+         '6e6c387f87e66fcd0256e7dd493bd3b0'
+         'acf3313e15e39c40a5e4a81a8ad8f082'
+         'b297d9639d918543c6d49be2b41ecb7a'
+         '1a44e1284df3dea096ba6d66babcb627'
+         '59eff511de5712076688a1fdc1ad7cab'
+         '2c6d376215919347a3700e5ca189fbae'
+         'c4721d42d1c5ca7c864ea676fb0eaa67'
+         '099efdf95306a754ff96b3b40e9442aa'
+         '41800618dfebb2793473d24469b42648'
+         'd3af544bb441f124434a8494ea90803d'
+         '279690d65ff8c2d8327476df378cb560'
+         'ec8d0c327f8ab2b1a4a4db2956e35aa1'
+         '6ac9eddd9eb0080bc0ed130f293212a6'
+         'f18b1756afbfc609e474987713463cb0'
+         '5aa659699e413ee6c1581dd5f8abc982'
+         '51d5f2d0832b3e112505d097f927e237'
+         '194772120040d425c0f9caf7e39cd859'
+         '16e341fc147ac7c59927aa9fcd1d9bda'
+         '0f03f21b274f83dab26b13f24c62b10c'
+         '08e4f2dbb5812c26108043c921f96f52'
+         'e698080ded6dd46631a82d4c5e2714a4'
+         '1ec71119addcae00dc488bce157e730b'
+         '52a0d08f300889601ede8f7ab149c402'
+         '75a0dd75f495e8b45dc8b5529cdac123'
+         '751faf67d7395acdf647e944582f1720'
+         '58da93b8de0d043e2c875bede1d339b7'
+         'c7472e6661159c338b29a9f0d67534eb'
+         '90df70450031fbeeef121170875e2a56'
+         'c34f1814457e56a2f922da4c630d6c98')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 824a815a4..6172155ef 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,15 +14,15 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=23.0
-_debrel=2
+_debver=23.0.1
+_debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=$_debver.$_debrel
-pkgrel=2
+pkgrel=1
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -54,8 +54,8 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         replace-urls.txt
         $_pkgname-20.0.1-fixed-loading-icon.png
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('567bfd5b1bc0639b4f2e53a6e921ed5d'
-         '1681363327ec8642ddb615bc20cb41c2'
+md5sums=('43ca6c80e00f5812cb1a38d87f838e06'
+         '0eb0d65b6dbb035b7b8d753c68fda6aa'
          '2d7ac85c32df6a4ccfcc6de7a1420bf7'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
          '4f656688fe7bc0b11899369e0e23e516'
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 3d7c5e7fc..2876fd947 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $
+# $Id: PKGBUILD 193480 2013-08-21 08:55:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-_pkgbase=kdepim
 
+_pkgbase=kdepim
 pkgbase=kdepim-libre
 pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-akregator-libre'
@@ -23,7 +23,7 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
 pkgver=4.11.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -179,7 +179,7 @@ package_kdepim-kmail-libre() {
 	provides=("kdepim-kmail=${pkgver}")
 	for i in kmail doc/kmail kmailcvt archivemailagent \
 	importwizard ksendemail libksieve messagelist mailfilteragent \
-	ontologies kontact/plugins/kmail headerthemeeditor sendlateragent; do
+	ontologies kontact/plugins/kmail headerthemeeditor; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
 	done
@@ -301,7 +301,7 @@ package_kdepim-libkdepim-libre() {
 	for i in akonadi_next calendarsupport incidenceeditor-ng \
 	kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
 	mailcommon mailimporter messagecomposer messagecore messageviewer \
-	icons templateparser plugins/messageviewer grammar \
+	icons templateparser plugins/messageviewer grammar sendlateragent \
 	plugins/ktexteditor pimactivity pimcommon pimsettingexporter; do
 		cd "${srcdir}"/build/${i}
 		make DESTDIR="${pkgdir}" install
diff --git a/nonprism/bitlbee-nonprism/PKGBUILD b/nonprism/bitlbee-libre-nonprism/PKGBUILD
index d181f3b9f..e48667d52 100644
--- a/nonprism/bitlbee-nonprism/PKGBUILD
+++ b/nonprism/bitlbee-libre-nonprism/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186656 2013-05-30 12:19:35Z dreisner $
+# $Id$
 
 # Contributor: FUBAR <mrfubar@gmail.com>
 # Contributor: simo <simo@archlinux.org>
@@ -6,28 +6,29 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=bitlbee
-pkgname=bitlbee-nonprism
+pkgname=bitlbee-libre-nonprism
 pkgver=3.2
 pkgrel=3
 pkgdesc='Brings XMPP to IRC, without support for unsafe and dangerous for privacy protocols'
 url='http://www.bitlbee.org/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gnutls' 'glib2')
 makedepends=('asciidoc' 'libotr3')
 optdepends=('libotr3: for OTR encryption support'
             'xinetd: to run bitlbee through xinetd')
-replaces=("$_pkgname" 'bitlbee-coherence')
-conflicts=$_pkgname
 provides=$_pkgname=$pkgver
+conflicts=$_pkgname
+replaces=("$_pkgname" "$_pkgname-libre" "$_pkgname-coherence")
 source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
         'xinetd'
         'bitlbee.tmpfiles')
 sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e'
-          '81c1185b09bee9520b7b58e295a0ffe43a9b0093'
-          '64b05c7ba522fcdbd0fb57d89ea8320713cc18e9')
+          'ec1a3efff09b9fc3d3e52560d8cdbe23186c819f'
+          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
 backup=('etc/bitlbee/bitlbee.conf'
         'etc/bitlbee/motd.txt'
         'etc/xinetd.d/bitlbee')
diff --git a/nonprism/bitlbee-libre-nonprism/bitlbee.install b/nonprism/bitlbee-libre-nonprism/bitlbee.install
new file mode 100644
index 000000000..aa5a81a70
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/bitlbee.install
@@ -0,0 +1,15 @@
+post_install() {
+	getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null
+	getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
+	systemd-tmpfiles --create bitlbee.conf
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
+	getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
+	true
+}
diff --git a/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles b/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles
new file mode 100644
index 000000000..da72a0a79
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/bitlbee.tmpfiles
@@ -0,0 +1 @@
+d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/nonprism/bitlbee-libre-nonprism/xinetd b/nonprism/bitlbee-libre-nonprism/xinetd
new file mode 100644
index 000000000..68d5663b3
--- /dev/null
+++ b/nonprism/bitlbee-libre-nonprism/xinetd
@@ -0,0 +1,12 @@
+service bitlbee
+{
+        type = UNLISTED
+        socket_type = stream
+        protocol = tcp
+        wait = no
+        user = bitlbee
+	group = bitlbee
+        server = /usr/bin/bitlbee
+        port = 6667
+        disable = yes
+}
diff --git a/nonprism/bitlbee-nonprism/bitlbee.tmpfiles b/nonprism/bitlbee-nonprism/bitlbee.tmpfiles
deleted file mode 100644
index ebd909675..000000000
--- a/nonprism/bitlbee-nonprism/bitlbee.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/bitlbee 0755 bitlbee bitlbee - -
\ No newline at end of file
diff --git a/nonprism/bti-nonprism/PKGBUILD b/nonprism/bti-nonprism/PKGBUILD
new file mode 100644
index 000000000..378664976
--- /dev/null
+++ b/nonprism/bti-nonprism/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# Contributor: uvok <uvok at online dot de>
+# Contributor: Urist <9362773 at gmail.com>
+
+_pkgname=bti
+pkgname=bti-nonprism
+pkgver=033
+pkgrel=1.1
+pkgdesc='Console client for status.net, without Twitter support'
+arch=('i686' 'x86_64' 'mips64el')
+url='http://gregkh.github.com/bti/'
+license=('GPL')
+depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c')
+provides=$_pkgname
+conflicts=$_pkgname
+replaces=$_pkgname
+source=(http://www.kernel.org/pub/software/web/$_pkgname/$_pkgname-$pkgver.tar.xz
+        nonprism.patch)
+sha256sums=('a3d9d8a86a718a4820387c75ac2af24fecfe754ee562163d700acb7cf795d753'
+            '184f2a134d44ae4c901ffdc824f833b477148f146e23f5d3680496658c9ca393')
+
+prepare() {
+  cd ${srcdir}/$_pkgname-$pkgver
+  patch -Np1 -i ${srcdir}/nonprism.patch
+}
+
+build() {
+  cd ${srcdir}/$_pkgname-$pkgver
+  ./configure --prefix=/usr
+
+  make
+}
+
+package() {
+  cd ${srcdir}/$_pkgname-$pkgver
+  
+  make DESTDIR=${pkgdir} install
+}
+
diff --git a/nonprism/bti-nonprism/nonprism.patch b/nonprism/bti-nonprism/nonprism.patch
new file mode 100644
index 000000000..009c26d1e
--- /dev/null
+++ b/nonprism/bti-nonprism/nonprism.patch
@@ -0,0 +1,443 @@
+diff -Nur bti-033/bti.1 bti-nonprism/bti.1
+--- bti-033/bti.1	2013-06-27 18:23:38.000000000 -0300
++++ bti-nonprism/bti.1	2013-08-21 18:24:32.693871946 -0300
+@@ -28,23 +28,23 @@
+ .\" * MAIN CONTENT STARTS HERE *
+ .\" -----------------------------------------------------------------
+ .SH "NAME"
+-bti \- send a tweet to twitter\&.com or identi\&.ca from the command line
++bti \- send a tweet to status\&.net from the command line
+ .SH "SYNOPSIS"
+ .HP \w'\fBbti\fR\ 'u
+ \fBbti\fR [\fB\-\-account\ account\fR] [\fB\-\-password\ password\fR] [\fB\-\-action\ action\fR] [\fB\-\-user\ screenname\fR] [\fB\-\-host\ HOST_NAME\fR] [\fB\-\-proxy\ PROXY:PORT\fR] [\fB\-\-logfile\ LOGFILE\fR] [\fB\-\-config\ CONFIGFILE\fR] [\fB\-\-replyto\ ID\fR] [\fB\-\-retweet\ ID\fR] [\fB\-\-page\ PAGENUMBER\fR] [\fB\-\-bash\fR] [\fB\-\-shrink\-urls\fR] [\fB\-\-debug\fR] [\fB\-\-dry\-run\fR] [\fB\-\-verbose\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
+ .SH "DESCRIPTION"
+ .PP
+-bti sends a tweet message to twitter\&.com or identi\&.ca\&.
++bti sends a tweet message to status\&.net\&.
+ .SH "OPTIONS"
+ .PP
+ \fB\-\-account account\fR
+ .RS 4
+-Specify the twitter\&.com or identi\&.ca account name\&.
++Specify the status\&.net account name\&.
+ .RE
+ .PP
+ \fB\-\-password password\fR
+ .RS 4
+-Specify the password of your twitter\&.com or identi\&.ca account\&.
++Specify the password of your status\&.net account\&.
+ .RE
+ .PP
+ \fB\-\-action action\fR
+@@ -59,9 +59,9 @@
+ .PP
+ \fB\-\-host HOST_NAME\fR
+ .RS 4
+-Specify the host which you want to send your message to\&. Valid options are "twitter" to send to twitter\&.com and "identica" to send to identi\&.ca\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example identi\&.ca\*(Aqs URI is: https://identi\&.ca/api/statuses
++Specify the host which you want to send your message to\&. Valid options are "statusnet" to send to status\&.net\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example status\&.net\*(Aqs URI is: https://status\&.net/api/statuses
+ .sp
+-If no host is specified, the default is to send to twitter\&.com\&.
++If no host is specified, the default is to send to status\&.net\&.
+ .RE
+ .PP
+ \fB\-\-proxy PROXY:PORT\fR
+@@ -85,8 +85,6 @@
+ .RS 4
+ Status ID of a single post to which you want to create a threaded reply to\&.
+ .sp
+-For twitter, this is ignored unless the message starts with the @name of the owner of the post with the status ID\&.
+-.sp
+ For status\&.net, this can link any two messages into context with each other\&. Status\&.net will also link a message that contains an @name without this without regard to context\&.
+ .RE
+ .PP
+@@ -167,12 +165,12 @@
+ .PP
+ \fBaccount\fR
+ .RS 4
+-The twitter\&.com or identi\&.ca account name you wish to use to send this message with\&.
++The status\&.net account name you wish to use to send this message with\&.
+ .RE
+ .PP
+ \fBpassword\fR
+ .RS 4
+-The twitter\&.com or identi\&.ca password for the account you wish to use to send this message with\&.
++The status\&.net password for the account you wish to use to send this message with\&.
+ .RE
+ .PP
+ \fB\-\-action action\fR
+@@ -187,7 +185,7 @@
+ .PP
+ \fBhost\fR
+ .RS 4
+-The host you want to use to send the message to\&. Valid options are either "twitter" or "identica" to send to twitter\&.com or identi\&.ca respectively\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example identi\&.ca\*(Aqs URI is: https://identi\&.ca/api/statuses\&.
++The host you want to use to send the message to\&. Valid options are either "statusnet" to send to status\&.net respectively\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example status\&.net\*(Aqs URI is: https://status\&.net/api/statuses\&.
+ .RE
+ .PP
+ \fBproxy\fR
+diff -Nur bti-033/bti-bashcompletion bti-nonprism/bti-bashcompletion
+--- bti-033/bti-bashcompletion	2013-06-27 18:23:38.000000000 -0300
++++ bti-nonprism/bti-bashcompletion	2013-08-21 18:19:46.889928804 -0300
+@@ -12,7 +12,7 @@
+ 	fi
+ 
+ 	if [[ "${prev}" == "--host" ]] ; then
+-		COMPREPLY=( $(compgen -W "twitter identica" -- ${cur} ) )
++		COMPREPLY=( $(compgen -W "statusnet" -- ${cur} ) )
+ 	fi
+ 
+ 	if [[ "${prev}" == "--action" ]] ; then
+diff -Nur bti-033/bti.c bti-nonprism/bti.c
+--- bti-033/bti.c	2013-06-27 18:23:38.000000000 -0300
++++ bti-nonprism/bti.c	2013-08-21 18:31:54.013583020 -0300
+@@ -53,7 +53,7 @@
+ 
+ static void display_help(void)
+ {
+-	fprintf(stdout, "bti - send tweet to twitter or identi.ca\n"
++	fprintf(stdout, "bti - send tweet to status.net\n"
+ 		"Version: %s\n"
+ 		"Usage:\n"
+ 		"  bti [options]\n"
+@@ -258,19 +258,12 @@
+ 	free(buffer);
+ }
+ 
+-const char twitter_host[]  = "http://api.twitter.com/1.1/statuses";
+-const char twitter_host_stream[]  = "https://stream.twitter.com/1.1/statuses"; /*this is not reset, and doesnt work */
+-const char twitter_host_simple[]  = "http://api.twitter.com/1.1";
+-const char identica_host[] = "https://identi.ca/api/statuses";
+-const char twitter_name[]  = "twitter";
+-const char identica_name[] = "identi.ca";
+-
+-static const char twitter_request_token_uri[]  = "https://twitter.com/oauth/request_token";
+-static const char twitter_access_token_uri[]   = "https://twitter.com/oauth/access_token";
+-static const char twitter_authorize_uri[]      = "https://twitter.com/oauth/authorize?oauth_token=";
+-static const char identica_request_token_uri[] = "https://identi.ca/api/oauth/request_token?oauth_callback=oob";
+-static const char identica_access_token_uri[]  = "https://identi.ca/api/oauth/access_token";
+-static const char identica_authorize_uri[]     = "https://identi.ca/api/oauth/authorize?oauth_token=";
++const char statusnet_host[] = "https://status.net/api/statuses";
++const char statusnet_name[] = "status.net";
++
++static const char statusnet_request_token_uri[] = "https://status.net/api/oauth/request_token?oauth_callback=oob";
++static const char statusnet_access_token_uri[]  = "https://status.net/api/oauth/access_token";
++static const char statusnet_authorize_uri[]     = "https://status.net/api/oauth/authorize?oauth_token=";
+ static const char custom_request_token_uri[]   = "/../oauth/request_token?oauth_callback=oob";
+ static const char custom_access_token_uri[]    = "/../oauth/access_token";
+ static const char custom_authorize_uri[]       = "/../oauth/authorize?oauth_token=";
+@@ -855,14 +848,9 @@
+ 	if (!session)
+ 		return -EINVAL;
+ 
+-	if (session->host == HOST_TWITTER)
+-		request_url = oauth_sign_url2(
+-				twitter_request_token_uri, NULL,
+-				OA_HMAC, NULL, session->consumer_key,
+-				session->consumer_secret, NULL, NULL);
+-	else if (session->host == HOST_IDENTICA)
++	if (session->host == HOST_STATUSNET)
+ 		request_url = oauth_sign_url2(
+-				identica_request_token_uri, NULL,
++				statusnet_request_token_uri, NULL,
+ 				OA_HMAC, NULL, session->consumer_key,
+ 				session->consumer_secret, NULL, NULL);
+ 	else {
+@@ -893,16 +881,11 @@
+ 		"Please open the following link in your browser, and "
+ 		"allow 'bti' to access your account. Then paste "
+ 		"back the provided PIN in here.\n");
+-	if (session->host == HOST_TWITTER) {
+-		fprintf(stdout, "%s%s\nPIN: ", twitter_authorize_uri, at_key);
++	if (session->host == HOST_STATUSNET) {
++		fprintf(stdout, "%s%s\nPIN: ", statusnet_authorize_uri, at_key);
+ 		verifier = session->readline(NULL);
+ 		sprintf(at_uri, "%s?oauth_verifier=%s",
+-			twitter_access_token_uri, verifier);
+-	} else if (session->host == HOST_IDENTICA) {
+-		fprintf(stdout, "%s%s\nPIN: ", identica_authorize_uri, at_key);
+-		verifier = session->readline(NULL);
+-		sprintf(at_uri, "%s?oauth_verifier=%s",
+-			identica_access_token_uri, verifier);
++			statusnet_access_token_uri, verifier);
+ 	} else {
+ 		fprintf(stdout, "%s%s%s\nPIN: ",
+ 			session->hosturl, custom_authorize_uri, at_key);
+@@ -956,7 +939,7 @@
+ 		return -EINVAL;
+ 
+ 	if (!session->hosturl)
+-		session->hosturl = strdup(twitter_host);
++		session->hosturl = strdup(statusnet_host);
+ 
+ 	if (session->no_oauth || session->guest) {
+ 		curl_buf = bti_curl_buffer_alloc(session->action);
+@@ -971,7 +954,7 @@
+ 		}
+ 
+ 		if (!session->hosturl)
+-			session->hosturl = strdup(twitter_host);
++			session->hosturl = strdup(statusnet_host);
+ 
+ 		switch (session->action) {
+ 		case ACTION_UPDATE:
+@@ -1032,7 +1015,7 @@
+ 
+ 		case ACTION_PUBLIC:
+ 			/*snprintf(endpoint, endpoint_size, "%s%s?page=%d", session->hosturl,*/
+-			snprintf(endpoint, endpoint_size, "%s%s", twitter_host_stream,
++			snprintf(endpoint, endpoint_size, "%s%s", statusnet_host,
+ 				public_uri);
+ 			curl_easy_setopt(curl, CURLOPT_URL, endpoint);
+ 			break;
+@@ -1045,7 +1028,6 @@
+ 			break;
+ 
+ 		case ACTION_DIRECT:
+-		    /* NOT IMPLEMENTED - twitter requires authentication anyway */
+ 			break;
+ 
+ 		default:
+@@ -1125,7 +1107,6 @@
+ 	} else {
+ 		switch (session->action) {
+ 		case ACTION_UPDATE:
+-			/* dont test it here, let twitter return an error that we show */
+ 			if (strlen_utf8(session->tweet) > 140 + 1000 ) {
+ 				printf("E: tweet is too long!\n");
+ 				goto skip_tweet;
+@@ -1156,7 +1137,7 @@
+ 				mentions_uri, session->page);
+ 			break;
+ 		case ACTION_PUBLIC:
+-			sprintf(endpoint, "%s%s", twitter_host_stream,
++			sprintf(endpoint, "%s%s", statusnet_host,
+ 				public_uri);
+ 			break;
+ 		case ACTION_GROUP:
+@@ -1175,7 +1156,7 @@
+ 			break;
+ 		case ACTION_DIRECT:
+ 			escaped_tweet = oauth_url_escape(session->tweet);
+-			sprintf(endpoint, "%s%s?user=%s&text=%s", twitter_host_simple,
++			sprintf(endpoint, "%s%s?user=%s&text=%s", statusnet_host,
+ 				direct_uri, session->user, escaped_tweet);
+ 			is_post = 1;
+ 			break;
+@@ -1766,14 +1747,10 @@
+ 				free(session->hosturl);
+ 			if (session->hostname)
+ 				free(session->hostname);
+-			if (strcasecmp(optarg, "twitter") == 0) {
+-				session->host = HOST_TWITTER;
+-				session->hosturl = strdup(twitter_host);
+-				session->hostname = strdup(twitter_name);
+-			} else if (strcasecmp(optarg, "identica") == 0) {
+-				session->host = HOST_IDENTICA;
+-				session->hosturl = strdup(identica_host);
+-				session->hostname = strdup(identica_name);
++			if (strcasecmp(optarg, "statusnet") == 0) {
++				session->host = HOST_STATUSNET;
++				session->hosturl = strdup(statusnet_host);
++				session->hostname = strdup(statusnet_name);
+ 			} else {
+ 				session->host = HOST_CUSTOM;
+ 				session->hosturl = strdup(optarg);
+@@ -1829,31 +1806,8 @@
+ 	if (debug)
+ 		display_version();
+ 
+-	if (session->host == HOST_TWITTER) {
+-		if (!session->consumer_key || !session->consumer_secret) {
+-			if (session->action == ACTION_USER ||
+-					session->action == ACTION_PUBLIC) {
+-				/*
+-				 * Some actions may still work without
+-				 * authentication
+-				 */
+-				session->guest = 1;
+-			} else {
+-				fprintf(stderr,
+-						"Twitter no longer supports HTTP basic authentication.\n"
+-						"Both consumer key, and consumer secret are required"
+-						" for bti in order to behave as an OAuth consumer.\n");
+-				goto exit;
+-			}
+-		}
+-		if (session->action == ACTION_GROUP) {
+-			fprintf(stderr, "Groups only work in Identi.ca.\n");
+-			goto exit;
+-		}
+-	} else {
+-		if (!session->consumer_key || !session->consumer_secret)
+-			session->no_oauth = 1;
+-	}
++	if (!session->consumer_key || !session->consumer_secret)
++		session->no_oauth = 1;
+ 
+ 	if (session->no_oauth) {
+ 		if (!session->account) {
+diff -Nur bti-033/bti.example bti-nonprism/bti.example
+--- bti-033/bti.example	2012-06-22 18:45:42.000000000 -0300
++++ bti-nonprism/bti.example	2013-08-21 18:24:54.398011375 -0300
+@@ -5,7 +5,7 @@
+ # a message.
+ account=twitmaster
+ password=icanhascheezburger
+-host=identica
++host=statusnet
+ # Example of a custom StatusNet installation
+ #host=http://army.twit.tv/api/statuses
+ logfile=.bti.log
+diff -Nur bti-033/bti.h bti-nonprism/bti.h
+--- bti-033/bti.h	2013-06-27 18:23:38.000000000 -0300
++++ bti-nonprism/bti.h	2013-08-21 18:19:22.865702111 -0300
+@@ -17,8 +17,7 @@
+ #define __BTI_H
+ 
+ enum host {
+-	HOST_TWITTER  = 0,
+-	HOST_IDENTICA = 1,
++	HOST_STATUSNET = 1,
+ 	HOST_CUSTOM   = 2
+ };
+ 
+@@ -76,10 +75,8 @@
+ 	int length;
+ };
+ 
+-extern const char twitter_host[];
+-extern const char identica_host[];
+-extern const char twitter_name[];
+-extern const char identica_name[];
++extern const char statusnet_host[];
++extern const char statusnet_name[];
+ extern int debug;
+ 
+ extern void bti_parse_configfile(struct session *session);
+diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
+--- bti-033/bti.xml	2013-06-27 18:23:38.000000000 -0300
++++ bti-nonprism/bti.xml	2013-08-21 18:22:20.722310079 -0300
+@@ -21,7 +21,7 @@
+ 
+       <refnamediv>
+         <refname>bti</refname>
+-        <refpurpose>send a tweet to twitter.com or identi.ca from the command line</refpurpose>
++        <refpurpose>send a tweet to status.net from the command line</refpurpose>
+       </refnamediv>
+ 
+       <refsynopsisdiv>
+@@ -49,7 +49,7 @@
+       </refsynopsisdiv>
+ 
+       <refsect1><title>DESCRIPTION</title>
+-        <para>bti sends a tweet message to twitter.com or identi.ca.
++        <para>bti sends a tweet message or status.net.
+         </para>
+       </refsect1>
+ 
+@@ -59,7 +59,7 @@
+             <term><option>--account account</option></term>
+             <listitem>
+               <para>
+-	        Specify the twitter.com or identi.ca account name.
++	        Specify the status.net account name.
+ 	      </para>
+             </listitem>
+           </varlistentry>
+@@ -67,7 +67,7 @@
+             <term><option>--password password</option></term>
+             <listitem>
+               <para>
+-                Specify the password of your twitter.com or identi.ca account.
++                Specify the password of your status.net account.
+               </para>
+             </listitem>
+           </varlistentry>
+@@ -100,15 +100,15 @@
+             <listitem>
+               <para>
+ 		Specify the host which you want to send your message to.  Valid
+-		options are "twitter" to send to twitter.com and "identica" to
+-        send to identi.ca.
++		options are "statusnet" to
++        send to status.net.
+ 
+         If you want to send the message to a custom StatusNet installation,
+-        you should specify the API URI. For example identi.ca's URI is:
+-        https://identi.ca/api/statuses
++        you should specify the API URI. For example status.net's URI is:
++        https://status.net/api/statuses
+               </para>
+               <para>
+-		If no host is specified, the default is to send to twitter.com.
++		If no host is specified, the default is to send to status.net.
+               </para>
+             </listitem>
+           </varlistentry>
+@@ -154,10 +154,6 @@
+ 		reply to.
+ 	      </para>
+ 	      <para>
+-	        For twitter, this is ignored unless the message starts with the
+-		@name of the owner of the post with the status ID.
+-	      </para>
+-	      <para>
+ 	        For status.net, this can link any two messages into context with
+ 		each other. Status.net will also link a message that contains an
+ 		@name without this without regard to context.
+@@ -306,7 +302,7 @@
+              <term><option>account</option></term>
+              <listitem>
+                <para>
+-                 The twitter.com or identi.ca account name you wish to use to send this
++                 The status.net account name you wish to use to send this
+                  message with.
+                </para>
+              </listitem>
+@@ -315,7 +311,7 @@
+              <term><option>password</option></term>
+              <listitem>
+                <para>
+-                 The twitter.com or identi.ca password for the account you wish to use
++                 The status.net password for the account you wish to use
+                  to send this message with.
+                </para>
+              </listitem>
+@@ -346,12 +342,12 @@
+              <listitem>
+                <para>
+ 		 The host you want to use to send the message to.  Valid
+-		 options are either "twitter" or "identica" to send to
+-		 twitter.com or identi.ca respectively.
++		 options are either "statusnet" to send to
++		 status.net respectively.
+ 
+          If you want to send the message to a custom StatusNet installation,
+-         you should specify the API URI. For example identi.ca's URI is:
+-         https://identi.ca/api/statuses.
++         you should specify the API URI. For example status.net's URI is:
++         https://status.net/api/statuses.
+                </para>
+              </listitem>
+            </varlistentry>
+diff -Nur bti-033/config.c bti-nonprism/config.c
+--- bti-033/config.c	2013-04-23 20:18:04.000000000 -0300
++++ bti-nonprism/config.c	2013-08-21 18:17:39.798533227 -0300
+@@ -219,14 +219,10 @@
+ 
+ static int host_callback(struct session *session, char *value)
+ {
+-	if (strcasecmp(value, "twitter") == 0) {
+-		session->host = HOST_TWITTER;
+-		session->hosturl = strdup(twitter_host);
+-		session->hostname = strdup(twitter_name);
+-	} else if (strcasecmp(value, "identica") == 0) {
+-		session->host = HOST_IDENTICA;
+-		session->hosturl = strdup(identica_host);
+-		session->hostname = strdup(identica_name);
++	if (strcasecmp(value, "statusnet") == 0) {
++		session->host = HOST_STATUSNET;
++		session->hosturl = strdup(statusnet_host);
++		session->hostname = strdup(statusnet_name);
+ 	} else {
+ 		session->host = HOST_CUSTOM;
+ 		session->hosturl = strdup(value);
diff --git a/nonprism/centerim-nonprism/PKGBUILD b/nonprism/centerim-nonprism/PKGBUILD
new file mode 100644
index 000000000..1863e006b
--- /dev/null
+++ b/nonprism/centerim-nonprism/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+# Contributor: shild <sxp@bk.ru>
+
+_pkgname=centerim
+pkgname=centerim-nonprism
+pkgver=4.22.10
+pkgrel=2
+pkgdesc="Fork of CenterICQ - A text mode menu- and window-driven IM interface, without support for unsafe and dangerous for privacy protocols"
+arch=('i686' 'x86_64')
+url="http://www.centerim.org"
+license=('GPL')
+depends=('python2' 'libjpeg' 'gpgme')
+replaces=("$_pkgname" 'centericq')
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=("http://www.centerim.org/download/releases/$_pkgname-$pkgver.tar.gz"
+        'nonprism.patch')
+md5sums=('7565c3c8cac98a4e2d8524076a44676f'
+         '74887744683b68ea37d4d020c80fb675')
+
+prepare() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  # add patch to remove more protocols
+  patch -Np1 -i "${srcdir}/nonprism.patch"
+}
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  sed -i 's#python#python2#' misc/CenterIMLog2HTML.py
+  sed -i '1,1i#include <stdio.h>' libicq2000/libicq2000/sigslot.h
+  ./configure --prefix=/usr \
+              --with-ssl \
+              --with-openssl \
+              --enable-locales-fix \
+              --disable-icq \
+              --disable-yahoo \
+              --disable-aim \
+              --disable-gg \
+              --disable-msn
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/nonprism/centerim-nonprism/nonprism.patch b/nonprism/centerim-nonprism/nonprism.patch
new file mode 100644
index 000000000..43c732966
--- /dev/null
+++ b/nonprism/centerim-nonprism/nonprism.patch
@@ -0,0 +1,14 @@
+diff --git a/firetalk/Makefile.am b/firetalk/Makefile.am
+index cf14403..dab773d 100644
+--- a/firetalk/Makefile.am
++++ b/firetalk/Makefile.am
+@@ -1,7 +1,7 @@
+ noinst_LIBRARIES = libfiretalk.a
+-EXTRA_DIST = aim.c irc.c toc.c firetalk.c safestring.c oscar.c aim.h toc.h firetalk-int.h firetalk.h safestring.h oscar.h toc2_uuids.h
++EXTRA_DIST = irc.c firetalk.c safestring.c firetalk-int.h firetalk.h safestring.h
+ AUTOMAKE_OPTIONS = foreign
+-libfiretalk_a_SOURCES =  aim.c irc.c toc.c firetalk.c safestring.c oscar.c
++libfiretalk_a_SOURCES =  irc.c firetalk.c safestring.c
+ 
+ SUBDIRS = 
+ AM_CPPFLAGS = -I$(top_srcdir)/../connwrap -I$(top_srcdir)/../connwrap
diff --git a/nonprism/eog-plugins-nonprism/PKGBUILD b/nonprism/eog-plugins-nonprism/PKGBUILD
new file mode 100644
index 000000000..010f3eb7b
--- /dev/null
+++ b/nonprism/eog-plugins-nonprism/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+_pkgname=eog-plugins
+pkgname=eog-plugins-nonprism
+pkgver=3.8.1
+pkgrel=2
+pkgdesc="Plugins for Eye of Gnome, without libgdata support"
+arch=('i686' 'x86_64')
+url="http://www.gnome.org/"
+license=('GPL2')
+depends=('eog' 'libchamplain')
+makedepends=('intltool')
+provides=("$_pkgname=$pkgver")
+conflicts=$_pkgname
+replaces=$_pkgname
+install=eog-plugins.install
+options=('!libtool')
+source=(http://download.gnome.org/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('5cf8dab5b6622b9e712da4094185112cc84baa96f2775cc76bf654b1c443cfb9')
+
+build() {
+  cd $_pkgname-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/nonprism/eog-plugins-nonprism/eog-plugins.install b/nonprism/eog-plugins-nonprism/eog-plugins.install
new file mode 100644
index 000000000..24072f316
--- /dev/null
+++ b/nonprism/eog-plugins-nonprism/eog-plugins.install
@@ -0,0 +1,11 @@
+post_install() {
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
index 5c9172188..7b541c715 100644
--- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD
+++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgname=gnome-online-accounts
 pkgname=gnome-online-accounts-nonprism
 pkgver=3.8.2
-pkgrel=2
+pkgrel=2.1
 pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
@@ -35,7 +35,7 @@ build() {
   cd $_pkgname-$pkgver
   ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts \
     --disable-google \
-    --disable-owncloud \
+    --enable-owncloud \
     --disable-facebook \
     --disable-windows-live \
     --disable-exchange \
diff --git a/pcr/xcftools/PKGBUILD b/pcr/xcftools/PKGBUILD
index 979453d24..414149f85 100644
--- a/pcr/xcftools/PKGBUILD
+++ b/pcr/xcftools/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 pkgname=xcftools
 pkgver=1.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Miscellaneous command line tools for use with the open ${pkgname::3} format used by The GIMP."
 url=http://henning.makholm.net/software
 arch=(