Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre

19 files changed, 465 insertions, 137 deletions

diff --git a/java/antlr2/PKGBUILD b/libre/antlr2/PKGBUILD
index de5262698..a17f070ae 100644
--- a/java/antlr2/PKGBUILD
+++ b/libre/antlr2/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor: George Giorgidze <giorgidze (at) gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -10,12 +10,19 @@ pkgdesc="ANother Tool for Language Recognition"
 url="http://www.antlr2.org/"
 license=('custom:Public Domain')
 
-pkgrel=4.1
+pkgrel=5.1 # newer than Arch's 2.7.7-5
 arch=('i686' 'x86_64')
+options=('staticlibs')
 makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
+
 source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
 	"http://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom"
 	'runantlr2.sh' 'gcc4.4.patch' 'mono.patch')
+md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
+         '78af3de823003f6d8dded39c70bc30ae'
+         '78e9bf86bd44722f232f80bc7b04dcfe'
+         '158677e4c0f357afbb56656231a54815'
+         '0d1960d27ff81f2fea0dd35a8290216f')
 
 build() {
   cd "${srcdir}/antlr-${pkgver}"
@@ -91,9 +98,3 @@ package_antlr2-sharp() {
 
   _install_license
 }
-
-md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
-         '78af3de823003f6d8dded39c70bc30ae'
-         '78e9bf86bd44722f232f80bc7b04dcfe'
-         '158677e4c0f357afbb56656231a54815'
-         '0d1960d27ff81f2fea0dd35a8290216f')
diff --git a/java/antlr2/gcc4.4.patch b/libre/antlr2/gcc4.4.patch
index 15e25fb00..15e25fb00 100644
--- a/java/antlr2/gcc4.4.patch
+++ b/libre/antlr2/gcc4.4.patch
diff --git a/java/antlr2/mono.patch b/libre/antlr2/mono.patch
index 59c78d811..59c78d811 100644
--- a/java/antlr2/mono.patch
+++ b/libre/antlr2/mono.patch
diff --git a/java/antlr2/runantlr2.sh b/libre/antlr2/runantlr2.sh
index aebc9dfa7..aebc9dfa7 100644
--- a/java/antlr2/runantlr2.sh
+++ b/libre/antlr2/runantlr2.sh
diff --git a/java/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD
index ae8967a2f..a635c6e90 100644
--- a/java/apache-ant/PKGBUILD
+++ b/libre/apache-ant/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Andrew Wright <andreww@photism.org>
 
 pkgname=apache-ant
-pkgver=1.9.2
+pkgver=1.9.3
 pkgdesc="A Java-based build tool"
 license=('Apache' 'custom:BSD3')
 url="http://ant.apache.org/"
@@ -12,7 +12,7 @@ provides=("apache-ant-libre=$pkgver")
 replaces=("apache-ant-libre")
 conflicts=("apache-ant-libre")
 
-pkgrel=3.2 # newer than Arch's 1.9.2-3
+pkgrel=2.2 # newer than Arch's 1.9.3-2
 arch=('any')
 depends=('java-environment')
 makedepends=('jh')
@@ -20,6 +20,9 @@ makedepends=('jh')
 _mirror=http://archive.apache.org/dist
 source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
         ${pkgname}.sh ${pkgname}.csh)
+md5sums=('995f21618acdf35beacc465c84d79534'
+         'bd63c881be406f515fc4d22635e8326a'
+         'aaa615512cbe1ed7f3b62c1ff46802f8')
 
 # This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies
 # The format is:
@@ -40,7 +43,7 @@ _library_dependencies=(
   #tcljava.jar:'TCL with <script> task':???????:???????
   beanshell.jar:'BeanShell with <script> task':'beanshell>=1.3':/usr/share/java/bsh.jar
   jruby.jar:'Ruby with <script> task':jruby:/opt/jruby/lib/jruby.jar
-  #judo.jar:Judoscript with <script> task:???????:??????
+  #judo.jar:'Judoscript with <script> task':???????:??????
   commons-logging.jar:'CommonsLoggingListener':java-commons-logging:/usr/share/java/commons-logging/commons-logging.jar
   #log4j.jar:'Log4jListener':???????:???????
   commons-net.jar:'<ftp>, <rexec> and <telnet> tasks':'java-commons-net1>=1.4.0':/usr/share/java/commons-net.jar
@@ -48,9 +51,7 @@ _library_dependencies=(
   mail.jar:'<mimemail> task, mime encoding with <mail>':java-gnumail:/usr/share/java/gnumail.jar
   activation.jar:'<mimemail> task, mime encoding with <mail>':java-activation-gnu:/usr/share/java/activation.jar
   jdepend.jar:'<jdepend> task':java-jdepend:/usr/share/java/jdepend.jar
-# FIXME: When FS#38243 is fixed, 'xerces2-java' should be changed to 'java-resolver'.
-# We use xerces in the mean time because xalan depends on it.
-  resolver.jar:"external files for 'xmlcatalog' datatype":xerces2-java:/usr/share/java/resolver.jar
+  resolver.jar:"external files for 'xmlcatalog' datatype":java-resolver:/usr/share/java/resolver.jar
   jsch.jar:'<sshexec> and <scp> tasks':'java-jsch>=0.1.42':/usr/share/java/jsch.jar
   #jai.jar:'<image> task':???????:???????
 )
@@ -81,14 +82,6 @@ build() {
   sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist
 }
 
-# Create a relative symlink
-_rellink() {
-  local src=$1
-  local dst=$2
-  mkdir -p "${pkgdir}/${dst%/*}"
-  ln -sfv "$(realpath -m "$src" --relative-to="${dst%/*}")" "${pkgdir}/${dst}"
-}
-
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}-bin
   source "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var
@@ -111,7 +104,7 @@ package() {
   local _dep _jarname _desc _pkgname _jarpath
   for _dep in "${_library_dependencies[@]}"; do
     IFS=: read _jarname _desc _pkgname _jarpath <<<"$_dep"
-    _rellink "${_jarpath}" "${ANT_HOME}/lib/${_jarname}"
+    ln -svfr "${pkgdir}/${_jarpath}" "${pkgdir}${ANT_HOME}/lib/${_jarname}"
   done
 
   ## Symlink the /opt distribution to the normal places
@@ -121,22 +114,23 @@ package() {
   for pom in *.pom; do
     a=${pom%.pom}
     base=$(jh mvn-basename org.apache.ant $a $pkgver)
-    _rellink "${ANT_HOME}/lib/$a.pom" "${base}.pom"
-    _rellink "${ANT_HOME}/lib/$a.jar" "${base}.jar"
+    install -d "${pkgdir}/${base%/*}"
+    ln -sfvr "${pkgdir}/${ANT_HOME}/lib/$a.pom" "${pkgdir}/${base}.pom"
+    if [[ -e "${pkgdir}/${ANT_HOME}/lib/$a.jar" ]]; then
+	    ln -sfvr "${pkgdir}/${ANT_HOME}/lib/$a.jar" "${pkgdir}/${base}.jar"
+    fi
   done
 
   cd "${pkgdir}"/${ANT_HOME}/bin
+  install -d "${pkgdir}"/usr/bin
   local prog
   for prog in *; do
-    _rellink "${ANT_HOME}/bin/$prog" "/usr/bin/$prog"
+    ln -sfvr "${pkgdir}/${ANT_HOME}/bin/$prog" "${pkgdir}/usr/bin/$prog"
   done
-  _rellink "${ANT_HOME}/README"   "/usr/share/doc/${pkgname}/README"
-  _rellink "${ANT_HOME}/WHATSNEW" "/usr/share/doc/${pkgname}/WHATSNEW"
-  _rellink "${ANT_HOME}/docs"     "/usr/share/doc/${pkgname}/html"
-  _rellink "${ANT_HOME}/LICENSE"  "/usr/share/licenses/${pkgname}/LICENSE"
-  _rellink "${ANT_HOME}/NOTICE"   "/usr/share/licenses/${pkgname}/NOTICE"
+  install -d "${pkgdir}"/usr/share/{doc,licenses}/${pkgname}
+  ln -sfvr "${pkgdir}/${ANT_HOME}/README"   "${pkgdir}/usr/share/doc/${pkgname}/README"
+  ln -sfvr "${pkgdir}/${ANT_HOME}/WHATSNEW" "${pkgdir}/usr/share/doc/${pkgname}/WHATSNEW"
+  ln -sfvr "${pkgdir}/${ANT_HOME}/manual"   "${pkgdir}/usr/share/doc/${pkgname}/html"
+  ln -sfvr "${pkgdir}/${ANT_HOME}/LICENSE"  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  ln -sfvr "${pkgdir}/${ANT_HOME}/NOTICE"   "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
 }
-
-md5sums=('8f610c1a0183507c2beebbf230f456af'
-         'bd63c881be406f515fc4d22635e8326a'
-         'aaa615512cbe1ed7f3b62c1ff46802f8')
diff --git a/java/apache-ant/apache-ant.csh b/libre/apache-ant/apache-ant.csh
index fdc04b2f8..fdc04b2f8 100644
--- a/java/apache-ant/apache-ant.csh
+++ b/libre/apache-ant/apache-ant.csh
diff --git a/java/apache-ant/apache-ant.sh b/libre/apache-ant/apache-ant.sh
index 6e4809da5..6e4809da5 100644
--- a/java/apache-ant/apache-ant.sh
+++ b/libre/apache-ant/apache-ant.sh
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index 1eb6bb91d..b81fb9cbf 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -6,8 +6,8 @@
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 _debname=iceweasel
-_debver=27.0
-_debrel=deb2
+_debver=27.0.1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -71,85 +71,85 @@ for lang in ${_langpacks[@]}; do
 done
 
 md5sums=('a4593936bf1c7a9ec9368ff249f9cc56'
-         'de575fedef8fd6b811334d8b9c082479'
-         '36043f6b423fd8c0a378c2e5fcb3a3c1'
-         '306ef53afb18ffa3ec57feb0063ab433'
-         '9af26b5177f1b20cb682299345ad1a87'
-         '21d7586f0dcc740835c9d3a6e9cee397'
-         '94c11e19db72eea7a5630bbf6c4a992d'
-         '86f1a539a8f9af7ea81a63f11a882b70'
-         'c62fdd3ce834337d43c4e59af3b87553'
-         '0678ff6935296e17e36c40b3fc17ac96'
-         '680ff4dbae9ce0b9f1bcd092169e6a34'
-         'dc8e478e69b1ee22126cb6addc744fe5'
-         'a513f4af7f608347225cd4180e89dee6'
-         '17d1e0cd0c7023461fc5dde7b97ee4b1'
-         'c08f2cd5a29737b20ecc2f7c2892bd74'
-         '8ff5f9ea03c3fff51142df8c52626b22'
-         'f8a42eb22e2192793a85112adb8e2278'
-         'f1b221697547feff3e69889a9e9dd1b4'
-         '1c106f032476d2443b368e52d9e1bc69'
-         'dbf5e2a01c84e18dc19ed9be5e12920b'
-         '9d6e6b497af88a0b5c44845adf275f9d'
-         'aeb7f058aabd5d7d4e05f8e7917bd59b'
-         '4612bf235fdfd328e176b3e682e61072'
-         'ebf5aefb15834234fbac6a4310b8f8ab'
-         '7591125ee445836f9e1247f5a7f6a474'
-         '410d090d68240f1f304ff94c4847817e'
-         '96a9dbd806a336936a4642ae95d12a26'
-         '4924dd568df7dc0428f3458758eadca1'
-         '62d46770f79074fc90ce4c1e4f5e5169'
-         'c57d361eaa5d0fb90e872dd8f1d3fce1'
-         'dbbba15f93f960c19bab63599b8f771c'
-         '0025e4609f5d1f72bf784f35d42934a9'
-         '638306adb405c506baa2728a00237d50'
-         '7ae2cbe9e2888b95a513eb8238e6e5d2'
-         '8b560d4ae6f62bb64d8fa8c1a62abe27'
-         '52bd4641b6066a2a0596c7b4f64b25c1'
-         '9293f6d596e7586c7955cc0d6d71dbbb'
-         'a634db784e4bb6efda49e2508d58c96c'
-         'ebf52ea0d70699f5d2651054b975dac2'
-         '6fbf98e9d4477d3355369bbf9c33c9aa'
-         'a0c6cb16be15cdca746f52fe07af0ab8'
-         '934f4c14a9242228da3322bd844f001b'
-         '29df15b3dad1764cb236e1913adb6895'
-         '8f4bd42afb2b0042300b50dbd575ed76'
-         '9f1d8951c50f6dd133089824db8e811b'
-         'df683c5a6b64226311f1158e1cfd7387'
-         'ddf59c931fb1d11337dfb30796172222'
-         '3c69e0fa5c10427c9d95b26fecb73366'
-         'fdf86cfbcf7e6084f01fda86b3907d68'
-         '4f602efbc5ee7dbcf315b7c00c5a9824'
-         '30012df56189ba8de7a2be3089ac7037'
-         '90660c135667807a35d5a424a14a03c7'
-         '39e8128c27e68f03db07ec9d3a4661f4'
-         '34c9463b7bd4000cb6c2178568ea5d57'
-         'd6008349e2b26e11b4bf29d182236d15'
-         '1d51c2c91f10f459227a2c4e16e2cf52'
-         '59b1f8e007070d0ac598cc8782cc775d'
-         '23f7deb8fbbf8b74426299cf239e83bd'
-         '81ec70e9b9fdf887d00c9422d94803d0'
-         'b4aea1741607118d5d128df88181c363'
-         '52dbb00c5e7adcdee972b2daf689401b'
-         'a180a40f9651e8ca3ebdb3001fce6fa7'
-         'fed061bc838b9eec2e1c187e64b93176'
-         '09b9eae4bdfbc1f7f4939f01a325bb40'
-         '337f7aaf9a2d7b94a9c33648a9734287'
-         '647abcd745c18a80e5187bc28b1b67b8'
-         'b9c5f0043fe7c26e23ba42450afb57b6'
-         '6c9bb760adb3ae75ddb969c595649732'
-         '70917dca185cf1f150df72eb848b6315'
-         'cc16dd7b22855338055429a3fd1a2367'
-         '236a36024c7660e7ec0ab2c7931b9ea0'
-         '471e98027910bcbfba3957df1e6a3c4a'
-         'cea62f763650bb50e770055288e3bd7c'
-         '0f4abd8240ecc996fd434b0139a9996b'
-         'cec783e074568d1c750ee88a2bbb003f'
-         '437d59dd764666147bfe5d27b0848b94'
-         'f05ac803378d996351a277ebcc99e0e2'
-         '13ddcd0d7c10e381458d5563476d53c3'
-         'f33a663b92b61fa02c28b881deae2376'
-         '4c4b58d49295b0b873f265ffa369a27d'
-         '67e54d3c0058263192700617500045e7'
-         '1022e9f23438b96df2f0dd054ff195b0'
-         '8274a6aafc5b097ab0659675d66b87c6')
+         '0012b126061c39d6098077e6b33e4ed9'
+         'd9489164f0ee7675345a18b415ca4e54'
+         'a5397f32afa3104a1ac48bd9ba100b3f'
+         '86f24dbc33b20eb967927565a1888c43'
+         '8158132a2d9c3eccdf717012c4b22a2a'
+         '65895a635d466f6c8d13c1e22efe0d1c'
+         '9bd0b1bf0f2c25ad7caa41294802417b'
+         '31d37cf374d9b8c38150a655f3e070c3'
+         'e8e17525549e239d19ebe49ab6b7e003'
+         '3f257fee55f0a2337eba89368703bf89'
+         'f40dffe97508d3f92ba862a92a0f050f'
+         '31de87f7bf67104ed1b75eb23c10b130'
+         '42d32cfc145c77f792b05d0437d0e7a8'
+         'd53470958b10bed4daca8fae50851014'
+         '82320a0b6ecb8f966fbab069f59c331c'
+         '4d13543134ee9ea2b30fb0a3748c9c11'
+         '56174d768e00c018d32fed3b713ce64f'
+         '6abba09b0e8fdc4b31ce2c16f752f053'
+         'd46382eff5f7cffc7ebc734ac7fb73d4'
+         '9e88d117a4f64e183c9f1961fe3372ed'
+         '4477aeb5f4d9e553df1b43588370c5ce'
+         '09636cebf0e08e3c4ca9c1d3b0b37b38'
+         '612b09eb39160e4446a86a0083e76d87'
+         'a83730d408f5be941f42d93300387c4d'
+         '16cde47a162d0c99fb2904571b856de0'
+         'e3783933719fa65afa7d86a89a2be3f0'
+         '386f2895fa4e439f49a30d5b739de9ef'
+         'd9a152c6e3a01e37402e9aa1f49569f4'
+         '1628a11d1e4c3da5d3d6caaaf43418c8'
+         '2c8b7615ec21bc3b890e34a8d395241f'
+         '06b6015cf541dc3b9c5f679cf00d13ab'
+         '457379b8f74fce12fc1fa446651ab380'
+         '998f6a12ebfccbc4196799df67f0d342'
+         '4552e34336b3779fd99927d1c78c028f'
+         '147f1cbab567e2222e622471081ef117'
+         'fd798f352f288df2249f8d43957cafbc'
+         '531acff3ede1eda37109f9de0ba58124'
+         '6386ddbda9c73f6f14fcaf4cb64da384'
+         '91ee1c3b72e6681975b033b1bc035ae7'
+         'de7b96d13177aed06f2a39490241d831'
+         'cfadecb7549afed8fddd3ae9f3aa7f12'
+         'f6a7ae7a336a55ac1f48041c91b7a4ba'
+         '5f599453be844e5a1b1fb6967e52f234'
+         '822b9848fdf54927c81b97d04ec67218'
+         'fc69f156b343a3300114a1ff8a3dd9d3'
+         '6d8fcec0d23679c69578bfbff7de7430'
+         'b3312412e56fa60fb97ea155405d23b0'
+         '1b559f7fc37308b361743876c48194ba'
+         'dbfc6bfed57bc048b3be222f90dd488c'
+         '4ba30eb299671f0bddb2ac5f8839e297'
+         '5c78e9fa5288a2127a5f710554ecd650'
+         '1f28c9bb19599b74120d022353d492d9'
+         '564d72774ff35a370972650be87e23a9'
+         '0274871784da1f22d65ba289588f3c13'
+         'f05d9c0759fca383085f2326d16a120d'
+         'ea21cff3fee8a957d1f335ff45335bc9'
+         '1f48c97748964005259fa06ad1c76b5b'
+         '943580007d82d3e102c05dbd4f99f4e2'
+         'd5f20acd424ba9b10e92079f4a13e219'
+         'e42983785c33a4bf38a2b4ddf5b69440'
+         '28ab7d8e35a59056626e38911fdd0232'
+         '8e847f14b9ff0190fa725621ef42121a'
+         'f78d59c251b949261d9504a5c114443f'
+         '5e587c999d8cf836e901eaf93550852b'
+         '9f9b5e6e8647f73cab9c5d731720b89a'
+         '3dc8cc1726466b5781026a466e8559f6'
+         '88913ef378deaf7a43f4190e8dad2dfb'
+         '9cf5d21edbb01aa0418bdc0a2d751c53'
+         'c73a7c12947c7d8c6ea57da163de8f6a'
+         'c490d19bea49b12673fcec849cf6b175'
+         'db22297468a87badb2a95d3a7c743230'
+         '3f148b7670425830e7ed54fd3bd0d572'
+         '84ff51ef9863e7211044bcbee7d9bac4'
+         'daa6f9b0e321d3da1cb04551a6defc2d'
+         '7d147726fe7b11510c13a1496e849f8b'
+         'aa387c05bf9aac8a6478c56c94c90ccf'
+         '0aaf74e72befbadb1bd0128cd407de48'
+         'db46a8a8e3c83d738eab44c200cffcd4'
+         '032c33f88b6f87226af805459970b5a0'
+         'd7ea83ff84de0969de6510abf278bcd4'
+         '6ff5acbf06ae1cdb45bcd0fd9309ebbf'
+         '2d6d43a2682e82216ec3f831d42c0586')
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 5c6313e9e..2c0b6b8ed 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,8 +14,8 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=27.0
-_debrel=deb2
+_debver=27.0.1
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -60,8 +60,8 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel-20.0.1-fixed-loading-icon.png
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
         Fixup-Reset-Firefox-after-bad-merge.patch)
-md5sums=('0baf0b166421f785db79bd33fe7b0748'
-         '2446de5f7844caae8cd7e46b3b72119c'
+md5sums=('fba1a8bfef502635593e2e1b0a653cda'
+         'ea2638a17254cda6cf8b85c39505b6af'
          '023120a970670dc85cea19393f0b94b6'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
          '641e8b54a684161c60209b81f260a19b'
diff --git a/java/jakarta-oro/PKGBUILD b/libre/jakarta-oro/PKGBUILD
index 24f7a2772..18e0ade64 100644
--- a/java/jakarta-oro/PKGBUILD
+++ b/libre/jakarta-oro/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Maintainer (AUR): Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+# Rationale: Build dependency of apache-ant
 
 pkgname=jakarta-oro
 pkgver=2.0.8
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Java regular expression and text-processing library"
 arch=('any')
 url="https://jakarta.apache.org/oro"
diff --git a/java/java-commons-bsf2/PKGBUILD b/libre/java-commons-bsf2/PKGBUILD
index 57a9dfc1a..2f00b024b 100644
--- a/java/java-commons-bsf2/PKGBUILD
+++ b/libre/java-commons-bsf2/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Rationale: Build dependency of apache-ant
 
 pkgname=java-commons-bsf2
 pkgver=2.4.0
@@ -6,7 +7,7 @@ url="https://commons.apache.org/proper/commons-bsf/"
 license=('Apache')
 pkgdesc="Bean Scripting Framework"
 
-pkgrel=1
+pkgrel=1.1
 arch=('any')
 depends=('java-commons-logging')
 makedepends=('apache-ant')
@@ -24,11 +25,8 @@ _opts[java-rhino]="/usr/share/java/js.jar"
 _opts[xalan-java]="/usr/share/java/xalan.jar"
 _opts[junit]="/usr/share/java/junit.jar"
 
-for pkg in "${!_opts[@]}"; do
-  optdepends+=("$pkg")
-  makedepends+=("$pkg")
-  _jars+="${_opts[$pkg]} "
-done
+optdepends+=("${!_opts[@]}")
+makedepends+=("${!_opts[@]}")
 
 prepare() {
   cd "${srcdir}/bsf-${pkgver}"
@@ -38,7 +36,8 @@ prepare() {
 build() {
   cd "${srcdir}/bsf-${pkgver}"
 
-  for jar in $_jars; do
+  local jar
+  for jar in "${_opts[@]}"; do
 	  ln -s "$jar" lib/
   done
 
diff --git a/java/junit/PKGBUILD b/libre/junit/PKGBUILD
index 04dbcb2ac..5c10cc43f 100644
--- a/java/junit/PKGBUILD
+++ b/libre/junit/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 # Maintainer (Arch): Guillaume ALAUX <Guillaume at Arch Linux dot org>
+# Rationale: Arch version isn't built from source.
 
 pkgname=junit
 pkgver=4.11
@@ -7,12 +8,12 @@ pkgdesc="Automated testing framework for Java"
 url="http://www.junit.org/"
 license=('CPL')
 
-pkgrel=3.2
+pkgrel=3.3
 arch=('any')
 depends=('java-runtime' 'java-hamcrest')
 makedepends=('apache-ant' 'jakarta-oro' 'jh')
 
-source=("libre://$pkgname-$pkgver.tar.gz")
+source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('cdaa9856761201de81a61aecb8cfcc9c')
 
 mksource=("$pkgname-$pkgver::git://github.com/junit-team/junit.git#tag=r$pkgver")
diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
index 877805172..4e37ce890 100644
--- a/libre/linux-libre-manpages/PKGBUILD
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 199517 2013-11-13 23:06:20Z thomas $
+# $Id: PKGBUILD 206253 2014-02-22 23:04:56Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=linux-libre-manpages
-pkgver=3.12
+pkgver=3.13
 pkgrel=1
 pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel"
 arch=('any')
@@ -15,7 +15,7 @@ replaces=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages')
 conflicts=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages')
 provides=('kernel26-manpages' 'linux-manpages')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/linux-libre-${pkgver}-gnu.tar.xz")
-md5sums=('254f59707b6676b59ce5ca5c3c698319')
+md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1')
 
 build() {
   cd "${srcdir}/linux-$pkgver"
diff --git a/java/nant/PKGBUILD b/libre/nant/PKGBUILD
index f57c8519f..9f62c70dd 100644
--- a/java/nant/PKGBUILD
+++ b/libre/nant/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Rationale: Build dependency of antlr2
 
 pkgname=nant
 pkgver=0.92
-pkgrel=2
+pkgrel=2.1
 pkgdesc="A free .NET build tool"
 arch=('i686' 'x86_64')
 url="http://nant.sourceforge.net"
diff --git a/java/nant/mono3.patch b/libre/nant/mono3.patch
index 94518d6cd..94518d6cd 100644
--- a/java/nant/mono3.patch
+++ b/libre/nant/mono3.patch
diff --git a/libre/vim-colorsamplerpack-libre/LICENSE b/libre/vim-colorsamplerpack-libre/LICENSE
new file mode 100644
index 000000000..f4a5c1ff4
--- /dev/null
+++ b/libre/vim-colorsamplerpack-libre/LICENSE
@@ -0,0 +1,207 @@
+Compiled licenses for the vim color schemes.
+
+
+==> pkg/usr/share/vim/colors/calmar256-light.vim <==
+" Vim color file:  calmar256-dark.vim
+" Last Change: 21. Aug 2007
+" License: public domain
+" Maintainer:: calmar <mac@calmar.ws>
+"
+
+==> pkg/usr/share/vim/colors/cleanphp.vim <==
+" Vim color file
+" Maintainer:   Billy McIntosh <billymcintosh@ntlworld.com>
+" Last Change:  June 24, 2003
+" Licence:      Public Domain
+
+
+==> pkg/usr/share/vim/colors/dante.vim <==
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" File: "/home/caciano/.vim/dante.vim"
+" Created: "Thu, 23 May 2002 00:12:20 -0300 (caciano)"
+" Updated: "Sat, 24 Aug 2002 14:04:21 -0300 (caciano)"
+" Copyright (C) 2002, Caciano Machado <caciano@inf.ufrgs.br>
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+
+==> pkg/usr/share/vim/colors/ekvoli.vim <==
+" Vim color file
+" Maintainer:   Preben Randhol <randhol+ekvoli@pvv.org>
+" Last Change:  2008 Feb 24
+" License:      GNU Public License (GPL) v2
+"
+
+
+==> pkg/usr/share/vim/colors/lettuce.vim <==
+" Vim color file
+"     Version:    1.2 2007.08.08
+"     Author:     Valyaeff Valentin <hhyperr AT gmail DOT com>
+"     License:    GPL
+"
+" Copyright 2007 Valyaeff Valentin
+"
+" This program is free software: you can redistribute it and/or modify
+" it under the terms of the GNU General Public License as published by
+" the Free Software Foundation, either version 3 of the License, or
+" (at your option) any later version.
+"
+" This program is distributed in the hope that it will be useful,
+" but WITHOUT ANY WARRANTY; without even the implied warranty of
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+" GNU General Public License for more details.
+"
+" You should have received a copy of the GNU General Public License
+" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+==> pkg/usr/share/vim/colors/marklar.vim <==
+" ------------------------------------------------------------------
+" Filename:  marklar.vim
+" Last Modified: Nov, 30 2006 (13:01)
+" Version:       0.5
+" Maintainer:    SM Smithfield (m_smithfield AT yahoo DOT com)
+" Copyright:     2006 SM Smithfield
+"                This script is free software; you can redistribute it and/or 
+"                modify it under the terms of the GNU General Public License as 
+"                published by the Free Software Foundation; either version 2 of 
+"                the License, or (at your option) any later version. 
+" Description:   Vim colorscheme file.
+" Install:       Put this file in the users colors directory (~/.vim/colors)
+"                then load it with :colorscheme marklar
+" ------------------------------------------------------------------
+
+
+==> pkg/usr/share/vim/colors/martin_krischik.vim <==
+"-------------------------------------------------------------------------------
+"  Description: My personal colors
+"          $Id: martin_krischik.vim 458 2006-11-18 09:42:10Z krischik $
+"    Copyright: Copyright (C) 2006 Martin Krischik
+"   Maintainer:	Martin Krischik
+"      $Author: krischik $
+"        $Date: 2006-11-18 10:42:10 +0100 (Sa, 18 Nov 2006) $
+"      Version: 3.2
+"    $Revision: 458 $
+"     $HeadURL: https://svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/colors/martin_krischik.vim $
+"	  Note:	Tried and Tested for 'builtin_gui', 'xterm' (KDE Konsole)
+"		'vt320'" (OpenVMS) and 'linux' (Linux Console).
+"      History: 16.05.2006 MK Check that all vim 7.0 colors are set
+"		16.05.2006 MK Split GUI from terminal.
+"		24.05.2006 MK Unified Headers
+"		24.07.2006 MK Omni-Completion Colors.
+"               15.10.2006 MK Bram's suggestion for runtime integration
+"	 Usage: copy to colors directory
+"------------------------------------------------------------------------------
+
+
+==> pkg/usr/share/vim/colors/motus.vim <==
+" Vim color file
+" Dark (grey on black) color scheme based on on a popular torte config.
+" Maintainer: Sergei Matusevich <motus@motus.kiev.ua>
+" ICQ: 31114346 Yahoo: motus2
+" http://motus.kiev.ua/motus2/Files/motus.vim
+" Last Change: 3 November 2005
+" Orinal torte screme maintainer: Thorsten Maerz <info@netztorte.de>
+" Licence: Public Domain
+
+
+==> pkg/usr/share/vim/colors/railscasts.vim <==
+" Vim color scheme
+"
+" Name:         railscasts.vim
+" Maintainer:   Nick Moffitt <nick@zork.net>
+" Last Change:  01 Mar 2008
+" License:      WTFPL <http://sam.zoy.org/wtfpl/>
+" Version:      2.1
+"
+
+
+==> pkg/usr/share/vim/colors/relaxedgreen.vim <==
+" ----------------------------------------------------------------------------------------------------------------------------------
+" Filename:      relaxedgreen.vim
+" Last Modified: 13 Feb 2007 09:57:24 PM by Dave V
+" Maintainer:    Dave Vehrs (dvehrs at gmail.com)
+" Copyright:     2002,2003,2004,2005,2006,2007 Dave Vehrs
+"                This script is free software; you can redistribute it and/or 
+"                modify it under the terms of the GNU General Public License as 
+"                published by the Free Software Foundation; either version 2 of 
+"                the License, or (at your option) any later version. 
+" Description:   Vim colorscheme file.
+" Install:       Place this file in the users colors directory (~/.vim/colors) or 
+"                in the shared colors directory (/usr/shared/vim/vim<version>/colors/),
+"                then load it with :colorscheme relaxedgreen
+" ----------------------------------------------------------------------------------------------------------------------------------
+
+
+==> pkg/usr/share/vim/colors/synic.vim <==
+" ------------------------------------------------------------------
+" Filename:  synic.vim
+" Last Modified: May, 14 2007 (10:47)
+" Maintainer:    Adam Olsen (arolsen@gmail.com)
+" Copyright:     2007 Adam Olsen
+"                This script is free software; you can redistribute it and/or 
+"                modify it under the terms of the GNU General Public License as 
+"                published by the Free Software Foundation; either version 2 of 
+"                the License, or (at your option) any later version. 
+" Description:   Vim colorscheme file.
+" Install:       Put this file in the users colors directory (~/.vim/colors)
+"                then load it with :colorscheme synic
+" ------------------------------------------------------------------
+
+
+==> pkg/usr/share/vim/colors/tabula.vim <==
+" ============================================================================
+" Filename:  tabula.vim
+" Last Modified: 2007-02-01
+" Version:       1.3
+" Maintainer:    Bernd Pol (bernd.pol AT online DOT de)
+" Copyright:     2006 Bernd Pol
+"                This script is free software; you can redistribute it and/or 
+"                modify it under the terms of the GNU General Public License as 
+"                published by the Free Software Foundation; either version 2 of 
+"                the License, or (at your option) any later version. 
+" Description:   Vim colorscheme based on marklar.vim by SM Smithfield,
+"        slightly modified for harmonic, yet easily distinguishable
+"        display on GUI and a 256 color xterm as well.
+" Install:       Put this file in the users colors directory (~/.vim/colors)
+"                then load it with :colorscheme tabula
+" =============================================================================
+
+
+==> pkg/usr/share/vim/colors/vibrantink.vim <==
+" Vim color scheme
+"
+" Name:         vibrantink.vim
+" Maintainer:   Jo Vermeulen <jo.vermeulen@gmail.com> 
+" Last Change:  30 Jul 2007 
+" License:      public domain
+" Version:      1.2
+"
+
+
+==> pkg/usr/share/vim/colors/vividchalk.vim <==
+" Vim color scheme
+" Name:         vividchalk.vim
+" Author:       Tim Pope <vimNOSPAM@tpope.info>
+" GetLatestVimScripts: 1891 1 :AutoInstall: vividchalk.vim
+" $Id: vividchalk.vim,v 1.8 2007-07-11 18:50:16 tpope Exp $
+
+" Based on the Vibrank Ink theme for TextMate
+" Distributable under the same terms as Vim itself (see :help license)
+
+
+==> pkg/usr/share/vim/colors/xoria256.vim <==
+" Vim color file
+" Name:     xoria256.vim
+" Version:  0.3.2
+" License:  Public Domain
+" Maintainer:   Dmitriy Y. Zotikov (xio) <xio@ungrund.org>
+"
+
+
+==> pkg/usr/share/vim/colors/zenburn.vim <==
+" Vim color file
+" Maintainer:   Jani Nurminen <slinky@iki.fi>
+" Last Change:  $Id: zenburn.vim,v 2.3 2008/07/30 17:34:37 slinky Exp $
+" URL:          http://slinky.imukuppi.org/zenburnpage/
+" License:      GPL
+"
diff --git a/libre/vim-colorsamplerpack-libre/PKGBUILD b/libre/vim-colorsamplerpack-libre/PKGBUILD
new file mode 100644
index 000000000..6d7f800a0
--- /dev/null
+++ b/libre/vim-colorsamplerpack-libre/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 95528 2013-08-13 11:23:39Z svenstaro $
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+_pkgname=vim-colorsamplerpack
+pkgname=vim-colorsamplerpack-libre
+pkgver=2012.10.28
+pkgrel=3
+_scriptid=18915
+pkgdesc="Different colorschemes for vim, without nonfree colorschemes"
+arch=('any')
+url="http://www.vim.org/scripts/script.php?script_id=625"
+license=('GPL2' 'GPL3' 'custom')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+depends=('vim')
+makedepends=('unzip')
+groups=('vim-plugins')
+mksource=(ColorSamplerPack.zip::"http://www.vim.org/scripts/download_script.php?src_id=$_scriptid")
+source=("https://repo.parabolagnulinux.org/other/${pkgname}/ColorSamplerPack-libre.tar.xz"
+        'LICENSE')
+mkmd5sums=('b0f1bd54b396e3d6032c01ef1fb421b6')
+md5sums=('73d62829a9ad2cde3f1d03a3fbe154ee'
+         '6db49cf0613715ff3b7c50072367981c')
+
+mksource() {
+   # Remove nonfree colorschemes
+   cd ${srcdir}
+   mv colors colors-tmp
+   install -d colors
+   install -m644 colors-tmp/{calmar256-light,cleanphp,dante,ekvoli,lettuce,marklar,martin_krischik,motus,railscasts,relaxedgreen,synic,tabula,vibrantink,vividchalk,xoria256,zenburn}.vim colors
+   rm -rv colors-tmp
+}
+
+package() {
+    cd ${srcdir}
+    installpath="${pkgdir}/usr/share/vim/vim74"
+    install -d $installpath/colors/
+    install -m644 colors/* $installpath/colors
+    install -D -m644 plugin/color_sample_pack.vim $installpath/plugin/themes.vim
+    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/pcr/printrun-stable/PKGBUILD b/pcr/printrun-stable/PKGBUILD
new file mode 100644
index 000000000..f8f2bd4df
--- /dev/null
+++ b/pcr/printrun-stable/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=printrun
+pkgname=printrun-stable
+pkgver=20130604
+pkgdesc="Host software for 3D printing"
+url="https://github.com/kliment/Printrun"
+license=('GPL3') # GPLv3+
+
+provides=("${_pkgname}-${pkgver}")
+conflicts=("${_pkgname}")
+
+pkgrel=1
+arch=('any')
+depends=('python2-pyserial' 'python2-pyglet' 'wxpython')
+optdepends=(
+	'python2-numpy: for 3D view'
+	'python2-cairo: for Projector feature'
+#	'python2-tornado: for prontserve'
+)
+
+source=("https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz")
+md5sums=('bc19f5b4570e178d435da04747c18e42')
+
+mkdepends=('git')
+mksource=("$_pkgname-$pkgver::git://github.com/kliment/Printrun.git#tag=$_pkgname-$pkgver")
+mkmd5sums=('SKIP')
+
+build() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	python2 setup.py build
+}
+
+package() {
+	cd "${srcdir}/${_pkgname}-${pkgver}"
+	python2 setup.py install --root="${pkgdir}" --prefix=/usr
+
+	local file
+	for file in "$pkgdir"/usr/bin/*.py; do
+		mv "$file" "${file%.py}"
+	done
+}
diff --git a/pcr/printrun/PKGBUILD b/pcr/printrun/PKGBUILD
new file mode 100644
index 000000000..4d4788911
--- /dev/null
+++ b/pcr/printrun/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=printrun
+pkgver=20140126
+pkgdesc="Host software for 3D printing"
+url="https://github.com/kliment/Printrun"
+license=('GPL3') # GPLv3+
+
+pkgrel=1
+arch=('any')
+depends=('python2-pyserial' 'python2-pyglet' 'wxpython')
+optdepends=(
+	'python2-numpy: for 3D view'
+	'python2-cairo: for Projector feature'
+#	'python2-tornado: for prontserve'
+)
+
+source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('d8b04115306d7b6b07d712af15383db7')
+
+mkdepends=('git')
+mksource=("$pkgname-$pkgver::git://github.com/kliment/Printrun.git#tag=$pkgname-$pkgver")
+mkmd5sums=('SKIP')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	python2 setup.py build
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	python2 setup.py install --root="${pkgdir}" --prefix=/usr
+
+	local file
+	for file in "$pkgdir"/usr/bin/*.py; do
+		mv "$file" "${file%.py}"
+	done
+}