pcr/apertium: updated to 3.4.2

84 files changed, 12 insertions, 3354 deletions

diff --git a/pcr/apertium/PKGBUILD b/pcr/apertium/PKGBUILD
index d8ee96a5e..0a566a18e 100644
--- a/pcr/apertium/PKGBUILD
+++ b/pcr/apertium/PKGBUILD
@@ -1,18 +1,22 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@fsfe.org>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@fsfe.org>
+# Contributor (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org>
+# Maintainer (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org>
+
+# parabola changes and rationale:
+#  no changes
+
 pkgname=apertium
-pkgver=3.4.0
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Language-independent machine translation engine and tools to manage language data."
 url="http://apertium.org"
 license=('GPL2')
 makedepends=('pkgconfig' 'flex')
-depends=('lttoolbox>=3.3.1' 'pcre' 'gawk' 'expat' 'libxslt')
+depends=('lttoolbox>=3.3.3' 'pcre' 'gawk' 'expat' 'libxslt')
 options=('!libtool')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv7h')
 source=(http://downloads.sourceforge.net/sourceforge/apertium/apertium-${pkgver}.tar.gz)
-md5sums=('5aa356d4840d6ffb1490a3b6639930bd')
-sha256sums=('2bd7f44b794615ebca1c5d3949b2139b665e2a5af24c40931ea0856e268fc3da')
+md5sums=('c739b10e0a69c43e98590b1c064bcf89')
+sha256sums=('67b787c342cbd44d4bcafffdb5da3db265d4ce07003be21e73821c44102d7dd5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -23,4 +27,4 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
+}
diff --git a/pcr/apertium/apertium-af-nl/PKGBUILD b/pcr/apertium/apertium-af-nl/PKGBUILD
deleted file mode 100644
index 1ccf42366..000000000
--- a/pcr/apertium/apertium-af-nl/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-af-nl
-pkgver=0.2.0
-pkgrel=1
-pkgdesc="Apertium language data for the Afrikaans-Nederlands (Dutch) translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.2' 'apertium>=3.2')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz")
-md5sums=('c6e048623ab18cf58d6a2d7c2daafc63')
-
-build() {
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-br-fr/PKGBUILD b/pcr/apertium/apertium-br-fr/PKGBUILD
deleted file mode 100644
index c1b2d274d..000000000
--- a/pcr/apertium/apertium-br-fr/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-br-fr
-pkgver=0.5.0
-pkgrel=1
-pkgdesc="Apertium language data for the Breton-French translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.2' 'apertium>=3.2' 'vislcg3>=0.9.7.7823')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz")
-md5sums=('65992f979f243e1f6a0f0b850b5a8a10')
-
-build() {
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  export PATH="/usr/bin:${PATH}" # override /usr/local/bin
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-ca-it/PKGBUILD b/pcr/apertium/apertium-ca-it/PKGBUILD
deleted file mode 100644
index 2558c4e2a..000000000
--- a/pcr/apertium/apertium-ca-it/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@fsfe.org>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@fsfe.org>
-pkgname=apertium-ca-it
-pkgver=0.1.1
-pkgrel=1
-pkgdesc="Apertium language data for the Catalan-Italian translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.2' 'apertium>=3.2')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz")
-md5sums=('08b3d5a949ddce7fc8b3539490ef11f8')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  export PATH="/usr/bin:${PATH}" # override /usr/local/bin
-  ./configure --prefix=/usr && make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-cy-en/Makefile.am.patch b/pcr/apertium/apertium-cy-en/Makefile.am.patch
deleted file mode 100644
index 125dbc73c..000000000
--- a/pcr/apertium/apertium-cy-en/Makefile.am.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ../apertium-cy-en-0.1.0/Makefile.am	2008-08-01 18:42:09.000000000 +0200
-+++ apertium-cy-en-0.1.0/Makefile.am	2010-09-15 17:29:02.000000000 +0200
-@@ -22,7 +22,7 @@
- 	xmllint --xinclude $(BASENAME).$(LANG2).dix.xml > $(BASENAME).$(LANG2).dix
- $(BASENAME).$(LANG1)-$(LANG2).dix:
- 	xmllint --xinclude $(BASENAME).$(LANG1)-$(LANG2).dix.xml > $(BASENAME).$(LANG1)-$(LANG2).dix
--     
-+
- $(PREFIX1).automorf.bin: $(BASENAME).$(LANG1).dix
- 	apertium-validate-dictionary $(BASENAME).$(LANG1).dix
- 	lt-comp lr $(BASENAME).$(LANG1).dix $@ $(BASENAME).$(LANG1).acx
-@@ -117,7 +117,7 @@
- 	rm $(BASENAME).$(LANG1).dix
- 	rm $(BASENAME).$(LANG2).dix
- 	rm $(BASENAME).$(PREFIX1).dix
--	
-+
- apertium_cy_endir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_cy_modesdir=$(prefix)/share/apertium/modes/
- 
-@@ -132,23 +132,23 @@
-                     $(PREFIX1).autogen.bin $(PREFIX2).autogen.bin \
-                     $(PREFIX1).autopgen.bin \
-                     $(PREFIX2).autopgen.bin \
--     		    $(PREFIX2).autoorth.bin \
-+		    $(PREFIX2).autoorth.bin \
-                     $(PREFIX1).prob $(PREFIX2).prob \
- 		    $(PREFIX1).cg.bin \
- 		    $(PREFIX1).t1x.bin $(PREFIX1).t2x.bin $(PREFIX1).t3x.bin \
- 		    $(PREFIX2).t1x.bin $(PREFIX2).t2x.bin $(PREFIX2).t3x.bin pre-$(LANG1).t1x.bin \
- 		    $(PREFIX1).mode 
--		    
-+
- #$(PREFIX2).mode
--		  
-+
- #$(INSTALL_DATA) $(PREFIX2).mode $(apertium_cy_modesdir)
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_cy_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(apertium_cy_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX2).t1x $(apertium_cy_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(apertium_cy_endir)
--	$(INSTALL_DATA) $(BASENAME).pre-$(LANG1).t1x $(apertium_cy_endir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_cy_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_cy_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX2).t1x $(DESTDIR)$(apertium_cy_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(DESTDIR)$(apertium_cy_endir)
-+	$(INSTALL_DATA) $(BASENAME).pre-$(LANG1).t1x $(DESTDIR)$(apertium_cy_endir)
- 
- CLEANFILES = -rf $(TARGETS_COMMON) modes
diff --git a/pcr/apertium/apertium-cy-en/PKGBUILD b/pcr/apertium/apertium-cy-en/PKGBUILD
deleted file mode 100644
index dc8002ef7..000000000
--- a/pcr/apertium/apertium-cy-en/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-cy-en
-pkgver=0.1.0
-pkgrel=1
-pkgdesc="Apertium language data for the Welsh-English translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig' 'autoconf')
-depends=('lttoolbox>=3.0' 'apertium>=3.0' 'vislcg3>=0.9.7.6010')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch")
-md5sums=('7067869350719ba2347e0a52d0143938'
-         '7c267173fc4f2a6bfce946bb81c6c3a0'
-         '687597e2eda763211d1594ba6b1a151a')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-cy-en/configure.ac.patch b/pcr/apertium/apertium-cy-en/configure.ac.patch
deleted file mode 100644
index a3bde0a18..000000000
--- a/pcr/apertium/apertium-cy-en/configure.ac.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- ../apertium-cy-en-0.1.0/configure.ac	2008-08-01 10:21:25.000000000 +0200
-+++ apertium-cy-en-0.1.0/configure.ac	2010-09-15 17:34:36.000000000 +0200
-@@ -10,8 +10,60 @@
- AC_PROG_AWK
- AC_CONFIG_HEADER([config])
- 
--PKG_CHECK_MODULES(LTTOOLBOX, lttoolbox-3.0 >= 3.0.3)
--PKG_CHECK_MODULES(APERTIUM, apertium-3.0 >= 3.0.9)
-+m4_define([required_apertium_version], [3.0.3])
-+m4_define([required_lttolbox_version], [3.0.9])
-+
-+AC_DEFUN([PKG_CHECK_APERTIUM], [
-+  APERTIUM_VER=0
-+  PKG_CHECK_MODULES(APERTIUM, apertium-1.0 >= 1.0.0,
-+  [
-+      APERTIUM_VER=10
-+  ],
-+  [
-+      PKG_CHECK_MODULES(APERTIUM, apertium-2.0 >= 2.0.0,
-+      [
-+          APERTIUM_VER=20
-+      ],
-+      [
-+          PKG_CHECK_MODULES(APERTIUM, apertium-3.0 >= 3.0.0,
-+          [
-+              APERTIUM_VER=30
-+          ],
-+          [
-+              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+              [
-+                  APERTIUM_VER=31
-+              ],
-+              [
-+                  PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+                  APERTIUM_VER=32
-+              ])
-+          ])
-+      ])
-+  ])
-+  AC_SUBST(APERTIUM_VER)
-+])
-+AC_DEFUN([PKG_CHECK_LTTOOLBOX], [
-+  LTTOOLBOX_VER=0
-+  PKG_CHECK_MODULES(LTTOOLBOX, lttoolbox-3.0 >= 3.0.0,
-+  [
-+    LTTOOLBOX_VER=30
-+  ],
-+  [
-+    PKG_CHECK_MODULES(LTTOOLBOX, lttoolbox-3.1 >= 3.1.0,
-+    [
-+      LTTOOLBOX_VER=31
-+    ],
-+    [
-+      PKG_CHECK_MODULES(LTTOOLBOX, lttoolbox-3.2 >= 3.2.0)
-+      LTTOOLBOX_VER=32
-+    ])
-+  ])
-+  AC_SUBST(LTTOOLBOX_VER)
-+])
-+
-+PKG_CHECK_APERTIUM
-+PKG_CHECK_LTTOOLBOX
- 
- APERTIUM_VER=30
- 
diff --git a/pcr/apertium/apertium-dbus-svn/PKGBUILD b/pcr/apertium/apertium-dbus-svn/PKGBUILD
deleted file mode 100644
index 31513b9f0..000000000
--- a/pcr/apertium/apertium-dbus-svn/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-dbus-svn
-pkgver=25849
-pkgrel=1
-pkgdesc="D-Bus service for apertium"
-arch=('i686' 'x86_64')
-url="http://wiki.apertium.org/wiki/D-Bus_service_for_Apertium"
-license=('GPL2')
-depends=('dbus-python' 'apertium')
-makedepends=('automake' 'autoconf')
-conflicts=('apertium-dbus')
-provides=('apertium-dbus')
-source=()
-md5sums=()
-
-_svntrunk=https://apertium.svn.sourceforge.net/svnroot/apertium/trunk/apertium-dbus
-_svnmod=apertium-dbus
-
-build() {
-  cd "$srcdir"
-
-  if [ "$(ls -A $_svnmod 2> /dev/null)" ]; then
-    (cd $_svnmod && svn update -r $pkgver) || return 1
-  else
-    svn co ${_svntrunk} ${_svnmod} -r ${pkgver} || return 1
-  fi
-
-  msg "SVN checkout done or server timeout"
-
-  cd ${srcdir}/${_svnmod}
-  
-  sh autogen.sh
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-en-ca/Makefile.am.patch b/pcr/apertium/apertium-en-ca/Makefile.am.patch
deleted file mode 100644
index e2578d941..000000000
--- a/pcr/apertium/apertium-en-ca/Makefile.am.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/apertium-en-ca-0.9.3/Makefile.am.old	2011-10-21 11:50:27.000000000 +0200
-+++ src/apertium-en-ca-0.9.3/Makefile.am	2015-08-06 15:10:49.742491212 +0200
-@@ -14,16 +14,14 @@
- 
- TARGETS_COMMON = $(PREFIX1).automorf.bin $(PREFIX1).autobil.bin $(PREFIX1).autogen.bin \
-      $(PREFIX1).autopgen.bin $(PREFIX2).automorf.bin $(PREFIX2).autobil.bin \
--     $(PREFIX2).autogen.bin $(PREFIX2).autopgen.bin $(PREFIX1).lextormono.bin $(PREFIX2).lextormono.bin \
--     $(PREFIX1).lextorbil.bin $(PREFIX2).lextorbil.bin $(PREFIX1).genitive.bin \
-+     $(PREFIX2).autogen.bin $(PREFIX2).autopgen.bin  \
-+     $(PREFIX1).genitive.bin \
-      $(PREFIX1).t1x.bin $(PREFIX1).t2x.bin $(PREFIX1).t3x.bin \
-      $(PREFIX1)-poly.autobil.bin $(PREFIX2)-poly.autobil.bin empty.bin \
-      $(PREFIX2).t1x.bin $(PREFIX2).t2x.bin $(PREFIX2).t3x.bin modes \
-      $(PREFIX2b).autogen.bin $(PREFVAR2)$(PREFIX1).autobil.bin
- 
--TARGETS = $(TARGETS_COMMON) \
--	  $(BASENAME).$(LANG1)-lextor.dix $(BASENAME).$(LANG2)-lextor.dix \
--	  $(BASENAME).$(PREFIX1)-lextor.dix $(BASENAME).$(PREFIX2)-lextor.dix 
-+TARGETS = $(TARGETS_COMMON)
- 
- .deps/$(LANG1).metadix: $(BASENAME).$(LANG1).metadix
- 	if [ ! -d .deps ]; then mkdir .deps; fi
-@@ -251,7 +249,6 @@
- 	   $(BASENAME).$(PREFIX1)-poly.dix $(BASENAME).$(PREFIX2)-poly.dix \
- 	   $(PREFIX1).prob $(PREFIX2).prob \
- 	   buscaPar.xsl principal.xsl apertium-en-ca.en.metadix \
--	   $(PREFIX1).lextor $(PREFIX2).lextor \
- 	   $(PREFIX1)-supervised.make $(PREFIX1)-unsupervised.make \
- 	   $(PREFIX2)-supervised.make $(PREFIX2)-unsupervised.make \
- 	   $(LANG1)-tagger-data/README $(LANG2)-tagger-data/README \
-@@ -272,8 +269,6 @@
- 		    $(PREFVAR2)$(PREFIX1).autogen.bin $(PREFVAR2)$(PREFIX1).autopgen.bin\
- 		    $(PREFIX1)-poly.autobil.bin $(PREFIX2)-poly.autobil.bin \
- 		    $(PREFIX1).prob $(PREFIX2).prob \
--		    $(PREFIX1).lextormono.bin $(PREFIX2).lextormono.bin \
--		    $(PREFIX1).lextorbil.bin $(PREFIX2).lextorbil.bin \
- 	            $(BASENAME).$(PREFIX1).genitive.t1x \
- 		    $(PREFIX1).genitive.bin  \
- 		    $(PREFIX1).t1x.bin $(PREFIX1).t2x.bin $(PREFIX1).t3x.bin \
diff --git a/pcr/apertium/apertium-en-ca/PKGBUILD b/pcr/apertium/apertium-en-ca/PKGBUILD
deleted file mode 100644
index 70cecd785..000000000
--- a/pcr/apertium/apertium-en-ca/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@fsfe.org>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@fsfe.org>
-pkgname=apertium-en-ca
-pkgver=0.9.3
-pkgrel=2
-pkgdesc="Apertium language data for the English-Catalan (including Valencian) translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.2' 'apertium>=3.2')
-arch=('i686' 'x86_64')
-source=("https://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch")
-md5sums=('c984145a73c10c332c45b92bb676c37a'
-         '452356ce2ca88ad9c7cba79c879f8961'
-         '69cf23698c83a2d4456a0b5c0f7d8a13')
-sha256sums=('c56e1f1c3fece009dc7c6b68af70f04ca9fbdee8e4b5e2ed8ea603f2f22ef0d5'
-            'fd8d3d4b91201a4c451c9ca39dd1ccae26749d1e9a319bd1c6e5e899878be2de'
-            'f8e473ed4b180976d09a772f5d5f0827a019c4ad3ca420a818e38c9402da72e3')
-
-build() {
-  patch -p1 < configure.ac.patch
-  patch -p1 < Makefile.am.patch
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -fi
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/pcr/apertium/apertium-en-ca/configure.ac.patch b/pcr/apertium/apertium-en-ca/configure.ac.patch
deleted file mode 100644
index a98d5fd31..000000000
--- a/pcr/apertium/apertium-en-ca/configure.ac.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/apertium-en-ca-0.9.3/configure.ac.old	2014-10-06 08:20:42.497145582 +0200
-+++ src/apertium-en-ca-0.9.3/configure.ac	2014-10-06 08:20:54.236332341 +0200
-@@ -12,39 +12,8 @@
- AC_PROG_AWK
- AC_CONFIG_HEADER([config])
- 
-+PKG_CHECK_MODULES(APERTIUM,   apertium >= required_apertium_version, [], [PKG_CHECK_MODULES(APERTIUM,   apertium-3.2 >= required_apertium_version)])
- 
--AC_DEFUN([PKG_CHECK_APERTIUM], [
--  APERTIUM_VER=0
--  PKG_CHECK_MODULES(APERTIUM, apertium-1.0 >= 1.0.0,
--  [
--      APERTIUM_VER=10
--  ],
--  [
--      PKG_CHECK_MODULES(APERTIUM, apertium-2.0 >= 2.0.0,
--      [
--          APERTIUM_VER=20
--      ],
--      [
--          PKG_CHECK_MODULES(APERTIUM, apertium-3.0 >= 3.0.0,
--          [
--              APERTIUM_VER=30
--          ],
--          [
--              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
--              [
--                APERTIUM_VER=31
--              ],
--              [
--                PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
--                APERTIUM_VER=32
--              ])
--          ])
--      ])
--  ])
--  AC_SUBST(APERTIUM_VER)
--])
--
--PKG_CHECK_APERTIUM
- 
- AC_PATH_PROG(XSLTPROC, xsltproc, no)
- if test x$ac_cv_path_XSLTPROC = x
-@@ -55,5 +24,5 @@
- then
-   AC_MSG_ERROR([You don't have xsltproc installed.])
- fi
--                     
-+
- AC_OUTPUT([Makefile])
diff --git a/pcr/apertium/apertium-en-es/Makefile.am.patch b/pcr/apertium/apertium-en-es/Makefile.am.patch
deleted file mode 100644
index 29a51cfed..000000000
--- a/pcr/apertium/apertium-en-es/Makefile.am.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- apertium-en-es-0.8.0/Makefile.am	2011-08-03 20:20:35.000000000 +0200
-+++ src/apertium-en-es-0.8.0/Makefile.am	2014-10-06 10:41:50.408342594 +0200
-@@ -21,7 +21,7 @@
- 		 $(BASENAME).$(PREFIX1)-lextor.dix $(BASENAME).$(PREFIX2)-lextor.dix
- 
- 
--TARGETS = $(TARGETS_COMMON) 
-+TARGETS = $(TARGETS_COMMON)
- 
- $(BASENAME).$(LANG1)-lextor.dix: $(BASENAME).$(PREFIX1).dix
- 	apertium-validate-dictionary $(BASENAME).$(PREFIX1).dix
-@@ -61,8 +61,8 @@
- 	lt-comp lr .deps/$(LANG1).dix $@ $(BASENAME).$(LANG1).acx
- 
- #$(PREFIX1).automorf.bin: $(BASENAME).$(LANG1).metadix $(BASENAME).$(LANG1).acx
--#	@xsltproc buscaPar.xsl apertium-en-es.en.metadix | uniq > tmp1gen.xsl 	 
--#	@xsltproc tmp1gen.xsl apertium-en-es.en.metadix >$(BASENAME).$(LANG1).dixtmp1 
-+#	@xsltproc buscaPar.xsl apertium-en-es.en.metadix | uniq > tmp1gen.xsl
-+#	@xsltproc tmp1gen.xsl apertium-en-es.en.metadix >$(BASENAME).$(LANG1).dixtmp1
- #	@rm tmp1gen.xsl
- #	apertium-validate-acx $(BASENAME).$(LANG1).acx
- #	apertium-validate-dictionary $(BASENAME).$(LANG1).dixtmp1
-@@ -106,15 +106,15 @@
- 	lt-comp rl .deps/$(LANG1b).dix $@
- 
- #$(PREFIX2).autogen.bin: $(BASENAME).$(LANG1).metadix
--#	@xsltproc buscaPar.xsl apertium-en-es.en.metadix | uniq > tmp2gen.xsl 	 
-+#	@xsltproc buscaPar.xsl apertium-en-es.en.metadix | uniq > tmp2gen.xsl
- #	@xsltproc tmp2gen.xsl apertium-en-es.en.metadix >$(BASENAME).$(LANG1).dixtmp2
- #	@rm tmp2gen.xsl
- #	apertium-validate-dictionary $(BASENAME).$(LANG1).dixtmp2
- #	lt-comp rl $(BASENAME).$(LANG1).dixtmp2 $@
- #	@rm $(BASENAME).$(LANG1).dixtmp2
- #	@rm $(BASENAME).$(LANG1).metadix
--#	@rm $(BASENAME).$(LANG2).dix	
--#	@rm $(BASENAME).$(LANG1)-$(LANG2).dix	
-+#	@rm $(BASENAME).$(LANG2).dix
-+#	@rm $(BASENAME).$(LANG1)-$(LANG2).dix
- 
- $(PREFIX2).autopgen.bin: $(BASENAME).post-$(LANG1).dix
- 	apertium-validate-dictionary $(BASENAME).post-$(LANG1).dix
-@@ -207,13 +207,13 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_en_modesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_en_modesdir)
--	$(INSTALL_DATA) $(PREFIX2b).mode $(apertium_en_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).genitive.t1x $(apertium_en_esdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(apertium_en_esdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX2).t1x $(apertium_en_esdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(apertium_en_esdir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_en_modesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_en_modesdir)
-+	$(INSTALL_DATA) $(PREFIX2b).mode $(DESTDIR)$(apertium_en_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).genitive.t1x $(DESTDIR)$(apertium_en_esdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_en_esdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX2).t1x $(DESTDIR)$(apertium_en_esdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(DESTDIR)$(apertium_en_esdir)
- 
- CLEANFILES = -rf $(TARGETS) modes
- 
diff --git a/pcr/apertium/apertium-en-es/Makefile.in.patch b/pcr/apertium/apertium-en-es/Makefile.in.patch
deleted file mode 100644
index fe7214320..000000000
--- a/pcr/apertium/apertium-en-es/Makefile.in.patch
+++ /dev/null
@@ -1,529 +0,0 @@
---- apertium-en-es-0.8.0/Makefile.in	2011-08-03 20:23:44.000000000 +0200
-+++ src/apertium-en-es-0.8.0/Makefile.in	2014-10-06 10:41:57.714504506 +0200
-@@ -1,9 +1,8 @@
--# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# Makefile.in generated by automake 1.14.1 from Makefile.am.
- # @configure_input@
- 
--# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
--# Inc.
-+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-+
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,6 +15,51 @@
- @SET_MAKE@
- 
- VPATH = @srcdir@
-+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-+am__make_running_with_option = \
-+  case $${target_option-} in \
-+      ?) ;; \
-+      *) echo "am__make_running_with_option: internal error: invalid" \
-+              "target option '$${target_option-}' specified" >&2; \
-+         exit 1;; \
-+  esac; \
-+  has_opt=no; \
-+  sane_makeflags=$$MAKEFLAGS; \
-+  if $(am__is_gnu_make); then \
-+    sane_makeflags=$$MFLAGS; \
-+  else \
-+    case $$MAKEFLAGS in \
-+      *\\[\ \	]*) \
-+        bs=\\; \
-+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-+    esac; \
-+  fi; \
-+  skip_next=no; \
-+  strip_trailopt () \
-+  { \
-+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-+  }; \
-+  for flg in $$sane_makeflags; do \
-+    test $$skip_next = yes && { skip_next=no; continue; }; \
-+    case $$flg in \
-+      *=*|--*) continue;; \
-+        -*I) strip_trailopt 'I'; skip_next=yes;; \
-+      -*I?*) strip_trailopt 'I';; \
-+        -*O) strip_trailopt 'O'; skip_next=yes;; \
-+      -*O?*) strip_trailopt 'O';; \
-+        -*l) strip_trailopt 'l'; skip_next=yes;; \
-+      -*l?*) strip_trailopt 'l';; \
-+      -[dEDm]) skip_next=yes;; \
-+      -[JT]) skip_next=yes;; \
-+    esac; \
-+    case $$flg in \
-+      *$$target_option*) has_opt=yes; break;; \
-+    esac; \
-+  done; \
-+  test $$has_opt = yes
-+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
- pkgdatadir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
-@@ -33,10 +77,10 @@
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
- subdir = .
--DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
--	$(srcdir)/Makefile.in $(srcdir)/config.in \
--	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
--	install-sh missing
-+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
-+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-+	$(top_srcdir)/configure $(am__configure_deps) \
-+	$(srcdir)/config.in COPYING install-sh missing
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-@@ -47,8 +91,25 @@
- CONFIG_HEADER = config
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-+AM_V_P = $(am__v_P_@AM_V@)
-+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-+am__v_P_0 = false
-+am__v_P_1 = :
-+AM_V_GEN = $(am__v_GEN_@AM_V@)
-+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-+am__v_GEN_0 = @echo "  GEN     " $@;
-+am__v_GEN_1 =
-+AM_V_at = $(am__v_at_@AM_V@)
-+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-+am__v_at_0 = @
-+am__v_at_1 =
- SOURCES =
- DIST_SOURCES =
-+am__can_run_installinfo = \
-+  case $$AM_UPDATE_INFO_DIR in \
-+    n|no|NO) false;; \
-+    *) (install-info --version) >/dev/null 2>&1;; \
-+  esac
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
-     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -70,25 +131,59 @@
- am__base_list = \
-   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+am__uninstall_files_from_dir = { \
-+  test -z "$$files" \
-+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-+         $(am__cd) "$$dir" && rm -f $$files; }; \
-+  }
- am__installdirs = "$(DESTDIR)$(apertium_en_esdir)"
- DATA = $(apertium_en_es_DATA)
-+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-+	$(LISP)config.in
-+# Read a list of newline-separated strings from the standard input,
-+# and print each of them once, without duplicates.  Input order is
-+# *not* preserved.
-+am__uniquify_input = $(AWK) '\
-+  BEGIN { nonempty = 0; } \
-+  { items[$$0] = 1; nonempty = 1; } \
-+  END { if (nonempty) { for (i in items) print i; }; } \
-+'
-+# Make sure the list of sources is unique.  This is necessary because,
-+# e.g., the same source file might be shared among _SOURCES variables
-+# for different programs/libraries.
-+am__define_uniq_tagged_files = \
-+  list='$(am__tagged_files)'; \
-+  unique=`for i in $$list; do \
-+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+  done | $(am__uniquify_input)`
-+ETAGS = etags
-+CTAGS = ctags
-+CSCOPE = cscope
-+AM_RECURSIVE_TARGETS = cscope
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
- am__remove_distdir = \
--  { test ! -d "$(distdir)" \
--    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
--         && rm -fr "$(distdir)"; }; }
-+  if test -d "$(distdir)"; then \
-+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-+      && rm -rf "$(distdir)" \
-+      || { sleep 5 && rm -rf "$(distdir)"; }; \
-+  else :; fi
-+am__post_remove_distdir = $(am__remove_distdir)
- DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
-+DIST_TARGETS = dist-gzip
- distuninstallcheck_listfiles = find . -type f -print
-+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
- distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
- ALTXSL = @ALTXSL@
- AMTAR = @AMTAR@
-+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
- APERTIUM_CFLAGS = @APERTIUM_CFLAGS@
- APERTIUM_LIBS = @APERTIUM_LIBS@
--APERTIUM_VER = @APERTIUM_VER@
- AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
-@@ -183,7 +278,7 @@
- 		 $(BASENAME).$(LANG1)-lextor.dix $(BASENAME).$(LANG2)-lextor.dix \
- 		 $(BASENAME).$(PREFIX1)-lextor.dix $(BASENAME).$(PREFIX2)-lextor.dix
- 
--TARGETS = $(TARGETS_COMMON) 
-+TARGETS = $(TARGETS_COMMON)
- EXTRA_DIST = $(BASENAME).post-$(LANG1).dix $(BASENAME).post-$(LANG2).dix \
- 	   $(BASENAME).$(LANG1).tsx \
- 	   $(BASENAME).$(LANG2).tsx \
-@@ -221,7 +316,7 @@
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
- .SUFFIXES:
--am--refresh:
-+am--refresh: Makefile
- 	@:
- $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
- 	@for dep in $?; do \
-@@ -257,15 +352,13 @@
- $(am__aclocal_m4_deps):
- 
- config: stamp-h1
--	@if test ! -f $@; then \
--	  rm -f stamp-h1; \
--	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
--	else :; fi
-+	@test -f $@ || rm -f stamp-h1
-+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
- 
- stamp-h1: $(srcdir)/config.in $(top_builddir)/config.status
- 	@rm -f stamp-h1
- 	cd $(top_builddir) && $(SHELL) ./config.status config
--$(srcdir)/config.in:  $(am__configure_deps) 
-+$(srcdir)/config.in:  $(am__configure_deps)
- 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- 	rm -f stamp-h1
- 	touch $@
-@@ -274,8 +367,11 @@
- 	-rm -f config stamp-h1
- install-apertium_en_esDATA: $(apertium_en_es_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(apertium_en_esdir)" || $(MKDIR_P) "$(DESTDIR)$(apertium_en_esdir)"
- 	@list='$(apertium_en_es_DATA)'; test -n "$(apertium_en_esdir)" || list=; \
-+	if test -n "$$list"; then \
-+	  echo " $(MKDIR_P) '$(DESTDIR)$(apertium_en_esdir)'"; \
-+	  $(MKDIR_P) "$(DESTDIR)$(apertium_en_esdir)" || exit 1; \
-+	fi; \
- 	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  echo "$$d$$p"; \
-@@ -289,15 +385,66 @@
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(apertium_en_es_DATA)'; test -n "$(apertium_en_esdir)" || list=; \
- 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
--	test -n "$$files" || exit 0; \
--	echo " ( cd '$(DESTDIR)$(apertium_en_esdir)' && rm -f" $$files ")"; \
--	cd "$(DESTDIR)$(apertium_en_esdir)" && rm -f $$files
--tags: TAGS
--TAGS:
-+	dir='$(DESTDIR)$(apertium_en_esdir)'; $(am__uninstall_files_from_dir)
-+
-+ID: $(am__tagged_files)
-+	$(am__define_uniq_tagged_files); mkid -fID $$unique
-+tags: tags-am
-+TAGS: tags
-+
-+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-+	set x; \
-+	here=`pwd`; \
-+	$(am__define_uniq_tagged_files); \
-+	shift; \
-+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  if test $$# -gt 0; then \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      "$$@" $$unique; \
-+	  else \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      $$unique; \
-+	  fi; \
-+	fi
-+ctags: ctags-am
- 
--ctags: CTAGS
--CTAGS:
-+CTAGS: ctags
-+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-+	$(am__define_uniq_tagged_files); \
-+	test -z "$(CTAGS_ARGS)$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && $(am__cd) $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) "$$here"
-+cscope: cscope.files
-+	test ! -s cscope.files \
-+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-+clean-cscope:
-+	-rm -f cscope.files
-+cscope.files: clean-cscope cscopelist
-+cscopelist: cscopelist-am
-+
-+cscopelist-am: $(am__tagged_files)
-+	list='$(am__tagged_files)'; \
-+	case "$(srcdir)" in \
-+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-+	  *) sdir=$(subdir)/$(srcdir) ;; \
-+	esac; \
-+	for i in $$list; do \
-+	  if test -f "$$i"; then \
-+	    echo "$(subdir)/$$i"; \
-+	  else \
-+	    echo "$$sdir/$$i"; \
-+	  fi; \
-+	done >> $(top_builddir)/cscope.files
- 
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
- 
- distdir: $(DISTFILES)
- 	$(am__remove_distdir)
-@@ -340,36 +487,42 @@
- 	|| chmod -R a+r "$(distdir)"
- dist-gzip: distdir
- 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
--	$(am__remove_distdir)
-+	$(am__post_remove_distdir)
- 
- dist-bzip2: distdir
--	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
--	$(am__remove_distdir)
-+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-+	$(am__post_remove_distdir)
- 
--dist-lzma: distdir
--	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
--	$(am__remove_distdir)
-+dist-lzip: distdir
-+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-+	$(am__post_remove_distdir)
- 
- dist-xz: distdir
--	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
--	$(am__remove_distdir)
-+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-+	$(am__post_remove_distdir)
- 
- dist-tarZ: distdir
-+	@echo WARNING: "Support for shar distribution archives is" \
-+	               "deprecated." >&2
-+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
--	$(am__remove_distdir)
-+	$(am__post_remove_distdir)
- 
- dist-shar: distdir
-+	@echo WARNING: "Support for distribution archives compressed with" \
-+		       "legacy program 'compress' is deprecated." >&2
-+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
--	$(am__remove_distdir)
-+	$(am__post_remove_distdir)
- 
- dist-zip: distdir
- 	-rm -f $(distdir).zip
- 	zip -rq $(distdir).zip $(distdir)
--	$(am__remove_distdir)
-+	$(am__post_remove_distdir)
- 
--dist dist-all: distdir
--	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
--	$(am__remove_distdir)
-+dist dist-all:
-+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-+	$(am__post_remove_distdir)
- 
- # This target untars the dist file and tries a VPATH configuration.  Then
- # it guarantees that the distribution is self-contained by making another
-@@ -380,8 +533,8 @@
- 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- 	*.tar.bz2*) \
- 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
--	*.tar.lzma*) \
--	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-+	*.tar.lz*) \
-+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
- 	*.tar.xz*) \
- 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- 	*.tar.Z*) \
-@@ -391,17 +544,19 @@
- 	*.zip*) \
- 	  unzip $(distdir).zip ;;\
- 	esac
--	chmod -R a-w $(distdir); chmod a+w $(distdir)
--	mkdir $(distdir)/_build
--	mkdir $(distdir)/_inst
-+	chmod -R a-w $(distdir)
-+	chmod u+w $(distdir)
-+	mkdir $(distdir)/_build $(distdir)/_inst
- 	chmod a-w $(distdir)
- 	test -d $(distdir)/_build || exit 0; \
- 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- 	  && am__cwd=`pwd` \
- 	  && $(am__cd) $(distdir)/_build \
--	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+	  && ../configure \
-+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
- 	    $(DISTCHECK_CONFIGURE_FLAGS) \
-+	    --srcdir=.. --prefix="$$dc_install_base" \
- 	  && $(MAKE) $(AM_MAKEFLAGS) \
- 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
- 	  && $(MAKE) $(AM_MAKEFLAGS) check \
-@@ -424,13 +579,21 @@
- 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
- 	  && cd "$$am__cwd" \
- 	  || exit 1
--	$(am__remove_distdir)
-+	$(am__post_remove_distdir)
- 	@(echo "$(distdir) archives ready for distribution: "; \
- 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
- distuninstallcheck:
--	@$(am__cd) '$(distuninstallcheck_dir)' \
--	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+	@test -n '$(distuninstallcheck_dir)' || { \
-+	  echo 'ERROR: trying to run $@ with an empty' \
-+	       '$$(distuninstallcheck_dir)' >&2; \
-+	  exit 1; \
-+	}; \
-+	$(am__cd) '$(distuninstallcheck_dir)' || { \
-+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-+	  exit 1; \
-+	}; \
-+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
- 	   || { echo "ERROR: files left after uninstall:" ; \
- 	        if test -n "$(DESTDIR)"; then \
- 	          echo "  (check DESTDIR support)"; \
-@@ -463,10 +626,15 @@
- 
- installcheck: installcheck-am
- install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
--	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
--	  `test -z '$(STRIP)' || \
--	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+	if test -z '$(STRIP)'; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	      install; \
-+	else \
-+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-+	fi
- mostlyclean-generic:
- 
- clean-generic:
-@@ -486,7 +654,7 @@
- distclean: distclean-am
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-hdr
-+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
- 
- dvi: dvi-am
- 
-@@ -550,20 +718,21 @@
- 
- .MAKE: all install-am install-strip
- 
--.PHONY: all all-am am--refresh check check-am clean clean-generic dist \
--	dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
--	dist-xz dist-zip distcheck distclean distclean-generic \
--	distclean-hdr distcleancheck distdir distuninstallcheck dvi \
--	dvi-am html html-am info info-am install install-am \
--	install-apertium_en_esDATA install-data install-data-am \
--	install-data-local install-dvi install-dvi-am install-exec \
--	install-exec-am install-html install-html-am install-info \
--	install-info-am install-man install-pdf install-pdf-am \
--	install-ps install-ps-am install-strip installcheck \
--	installcheck-am installdirs maintainer-clean \
--	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
--	pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-apertium_en_esDATA
-+.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
-+	clean-cscope clean-generic cscope cscopelist-am ctags ctags-am \
-+	dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \
-+	dist-tarZ dist-xz dist-zip distcheck distclean \
-+	distclean-generic distclean-hdr distclean-tags distcleancheck \
-+	distdir distuninstallcheck dvi dvi-am html html-am info \
-+	info-am install install-am install-apertium_en_esDATA \
-+	install-data install-data-am install-data-local install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-+	uninstall-am uninstall-apertium_en_esDATA
- 
- 
- $(BASENAME).$(LANG1)-lextor.dix: $(BASENAME).$(PREFIX1).dix
-@@ -604,8 +773,8 @@
- 	lt-comp lr .deps/$(LANG1).dix $@ $(BASENAME).$(LANG1).acx
- 
- #$(PREFIX1).automorf.bin: $(BASENAME).$(LANG1).metadix $(BASENAME).$(LANG1).acx
--#	@xsltproc buscaPar.xsl apertium-en-es.en.metadix | uniq > tmp1gen.xsl 	 
--#	@xsltproc tmp1gen.xsl apertium-en-es.en.metadix >$(BASENAME).$(LANG1).dixtmp1 
-+#	@xsltproc buscaPar.xsl apertium-en-es.en.metadix | uniq > tmp1gen.xsl
-+#	@xsltproc tmp1gen.xsl apertium-en-es.en.metadix >$(BASENAME).$(LANG1).dixtmp1
- #	@rm tmp1gen.xsl
- #	apertium-validate-acx $(BASENAME).$(LANG1).acx
- #	apertium-validate-dictionary $(BASENAME).$(LANG1).dixtmp1
-@@ -646,15 +815,15 @@
- 	lt-comp rl .deps/$(LANG1b).dix $@
- 
- #$(PREFIX2).autogen.bin: $(BASENAME).$(LANG1).metadix
--#	@xsltproc buscaPar.xsl apertium-en-es.en.metadix | uniq > tmp2gen.xsl 	 
-+#	@xsltproc buscaPar.xsl apertium-en-es.en.metadix | uniq > tmp2gen.xsl
- #	@xsltproc tmp2gen.xsl apertium-en-es.en.metadix >$(BASENAME).$(LANG1).dixtmp2
- #	@rm tmp2gen.xsl
- #	apertium-validate-dictionary $(BASENAME).$(LANG1).dixtmp2
- #	lt-comp rl $(BASENAME).$(LANG1).dixtmp2 $@
- #	@rm $(BASENAME).$(LANG1).dixtmp2
- #	@rm $(BASENAME).$(LANG1).metadix
--#	@rm $(BASENAME).$(LANG2).dix	
--#	@rm $(BASENAME).$(LANG1)-$(LANG2).dix	
-+#	@rm $(BASENAME).$(LANG2).dix
-+#	@rm $(BASENAME).$(LANG1)-$(LANG2).dix
- 
- $(PREFIX2).autopgen.bin: $(BASENAME).post-$(LANG1).dix
- 	apertium-validate-dictionary $(BASENAME).post-$(LANG1).dix
-@@ -713,13 +882,13 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_en_modesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_en_modesdir)
--	$(INSTALL_DATA) $(PREFIX2b).mode $(apertium_en_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).genitive.t1x $(apertium_en_esdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(apertium_en_esdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX2).t1x $(apertium_en_esdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(apertium_en_esdir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_en_modesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_en_modesdir)
-+	$(INSTALL_DATA) $(PREFIX2b).mode $(DESTDIR)$(apertium_en_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).genitive.t1x $(DESTDIR)$(apertium_en_esdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_en_esdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX2).t1x $(DESTDIR)$(apertium_en_esdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(DESTDIR)$(apertium_en_esdir)
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/pcr/apertium/apertium-en-es/PKGBUILD b/pcr/apertium/apertium-en-es/PKGBUILD
deleted file mode 100644
index 406aca2bb..000000000
--- a/pcr/apertium/apertium-en-es/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@fsfe.org>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@fsfe.org>
-pkgname=apertium-en-es
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="Apertium language data for the English-Spanish translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.2' 'apertium>=3.2')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "configure.ac.patch"
-	"Makefile.am.patch"
-	"Makefile.in.patch")
-md5sums=('4b82c32edbd5315432192799ed641930'
-         '4968bf33612ae8fc3f0d253d81de2c4b'
-         'dfae1753dac1a8720de76829a79c3401'
-         'a93870ddb3343f9913582b44d2a70a12')
-sha256sums=('b497b545982491d6e4c46b69e3167291bfdfae3d988917a996e5c44265f9fcdf'
-            'f8345047daf60bf45f9218a551f4207c5b08ce8d318e1f5462909695e2151875'
-            '35bd9284dcbbded62436f672fa32e5846b21897f23d526f90a1b53b5302e87c1'
-            '1be3c6d97cfd3677df4e85742c3e199e512abf301411a5df05b9ff71b29c5e39')
-
-build() {
-  patch -p1 < configure.ac.patch
-  patch -p1 < Makefile.am.patch
-  patch -p1 < Makefile.in.patch
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -fi
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-en-es/configure.ac.patch b/pcr/apertium/apertium-en-es/configure.ac.patch
deleted file mode 100644
index 38219b361..000000000
--- a/pcr/apertium/apertium-en-es/configure.ac.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/apertium-en-es-0.8.0/configure.ac.old	2014-10-06 10:34:40.274729186 +0200
-+++ src/apertium-en-es-0.8.0/configure.ac	2014-10-06 10:34:47.024262162 +0200
-@@ -10,38 +10,7 @@
- AC_PROG_AWK
- AC_CONFIG_HEADER([config])
- 
--AC_DEFUN([PKG_CHECK_APERTIUM], [
--  APERTIUM_VER=0
--  PKG_CHECK_MODULES(APERTIUM, apertium-1.0 >= 1.0.0,
--  [
--      APERTIUM_VER=10
--  ],
--  [
--      PKG_CHECK_MODULES(APERTIUM, apertium-2.0 >= 2.0.0,
--      [
--          APERTIUM_VER=20
--      ],
--      [
--          PKG_CHECK_MODULES(APERTIUM, apertium-3.0 >= 3.0.0,
--          [
--              APERTIUM_VER=30
--          ],
--          [
--              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
--              [
--                  APERTIUM_VER=31
--              ],
--              [
--                  PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
--                  APERTIUM_VER=32
--              ])
--          ])
--      ])
--  ])
--  AC_SUBST(APERTIUM_VER)
--])
--                          
--PKG_CHECK_APERTIUM
-+PKG_CHECK_MODULES(APERTIUM,   apertium >= required_apertium_version, [], [PKG_CHECK_MODULES(APERTIUM,   apertium-3.2 >= required_apertium_version)])
- 
- if test $APERTIUM_VER = 10;
- then MODES="";
-@@ -53,5 +22,5 @@
- AC_SUBST(MODES)
- AC_SUBST(ALTXSL)
- 
--  
-+
- AC_OUTPUT([Makefile])
diff --git a/pcr/apertium/apertium-en-gl/Makefile.am.patch b/pcr/apertium/apertium-en-gl/Makefile.am.patch
deleted file mode 100644
index 6d2a491d0..000000000
--- a/pcr/apertium/apertium-en-gl/Makefile.am.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ../apertium-en-gl-0.5.1/Makefile.am	2008-11-19 08:57:38.000000000 +0100
-+++ apertium-en-gl-0.5.1/Makefile.am	2010-09-15 16:26:33.000000000 +0200
-@@ -104,7 +104,7 @@
-            $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x \
- 	   modes.xml
- 
--	
-+
- apertium_en_gl_DATA=$(PREFIX1).automorf.bin $(PREFIX2).automorf.bin \
- 		    $(PREFIX1).autobil.bin $(PREFIX2).autobil.bin \
- 		    $(PREFIX1).autogen.bin $(PREFIX2).autogen.bin \
-@@ -130,11 +130,11 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_en_modesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_en_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(apertium_en_gldir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX2).t1x $(apertium_en_gldir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(apertium_en_gldir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_en_modesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_en_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_en_gldir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX2).t1x $(DESTDIR)$(apertium_en_gldir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(DESTDIR)$(apertium_en_gldir)
- 
- CLEANFILES = -rf $(TARGETS) modes
- 
diff --git a/pcr/apertium/apertium-en-gl/PKGBUILD b/pcr/apertium/apertium-en-gl/PKGBUILD
deleted file mode 100644
index 2926e33ce..000000000
--- a/pcr/apertium/apertium-en-gl/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-en-gl
-pkgver=0.5.1
-pkgrel=2
-pkgdesc="Apertium language data for the English-Galician translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig' 'autoconf')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch")
-md5sums=('daaba4c47ed5cbfbdd9c9410044ffa31'
-         '106b362aa9693eee1c94c55f0f00fa33'
-         '0040d866c8c2baed89a744c699e0179d')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-en-gl/configure.ac.patch b/pcr/apertium/apertium-en-gl/configure.ac.patch
deleted file mode 100644
index 4b9b093f3..000000000
--- a/pcr/apertium/apertium-en-gl/configure.ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../apertium-en-gl-0.5.1/configure.ac	2008-11-19 08:41:42.000000000 +0100
-+++ apertium-en-gl-0.5.1/configure.ac	2010-09-21 15:43:39.507405444 +0200
-@@ -27,8 +27,14 @@
-               APERTIUM_VER=30
-           ],
-           [
--              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0)
--              APERTIUM_VER=31
-+              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+	      [
-+	          APERTIUM_VER=31
-+	      ],
-+	      [
-+	          PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+ 		  APERTIUM_VER=32
-+              ])
-           ])
-       ])
-   ])
diff --git a/pcr/apertium/apertium-eo-ca/Makefile.am.patch b/pcr/apertium/apertium-eo-ca/Makefile.am.patch
deleted file mode 100644
index d8bb61a65..000000000
--- a/pcr/apertium/apertium-eo-ca/Makefile.am.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- ../apertium-eo-ca-0.9.1/Makefile.am	2009-07-04 17:23:58.000000000 +0200
-+++ apertium-eo-ca-0.9.1/Makefile.am	2010-09-15 15:41:11.000000000 +0200
-@@ -32,7 +32,7 @@
- $(PREFIX1).autogen.bin: $(BASENAME).$(LANG1).dix
- 	apertium-validate-dictionary $(BASENAME).$(LANG1).dix
- 	lt-comp rl $(BASENAME).$(LANG1).dix $@
--	
-+
- $(BASENAME).$(LANG1).dix.translit: $(BASENAME).$(LANG1).dix
- 	./transliterate.sh $(BASENAME).$(LANG1).dix >$@
- 
-@@ -43,7 +43,7 @@
- $(PREFIX1).autopgen.bin: $(BASENAME).post-$(LANG1).dix
- 	apertium-validate-dictionary $(BASENAME).post-$(LANG1).dix
- 	lt-comp lr $(BASENAME).post-$(LANG1).dix $@
--	
-+
- $(BASENAME).post-$(LANG1).dix.translit: $(BASENAME).post-$(LANG1).dix
- 	./transliterate.sh $(BASENAME).post-$(LANG1).dix >$@
- 
-@@ -122,11 +122,11 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_eo_camodesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_eo_camodesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(apertium_eo_cadir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX1).t1x.translit $(apertium_eo_cadir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x.translit $(BASENAME).$(PREFIX1).t3x.translit $(apertium_eo_cadir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_eo_camodesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_eo_camodesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_eo_cadir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX1).t1x.translit $(DESTDIR)$(apertium_eo_cadir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x.translit $(BASENAME).$(PREFIX1).t3x.translit $(DESTDIR)$(apertium_eo_cadir)
- 
- 
- CLEANFILES = -rf $(TARGETS) *.translit modes 
diff --git a/pcr/apertium/apertium-eo-ca/PKGBUILD b/pcr/apertium/apertium-eo-ca/PKGBUILD
deleted file mode 100644
index 0827bc97e..000000000
--- a/pcr/apertium/apertium-eo-ca/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-eo-ca
-pkgver=0.9.1
-pkgrel=2
-pkgdesc="Apertium language data for the Esperanto-Catalan translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch")
-md5sums=('75b027c23e031bfdb645fbd120e82d72'
-         '99ff6b39e16ef8314a82951414bb2d66'
-         '4695b4ad4f6eb089b528bef0d2820a3f')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-eo-ca/configure.ac.patch b/pcr/apertium/apertium-eo-ca/configure.ac.patch
deleted file mode 100644
index c5b707674..000000000
--- a/pcr/apertium/apertium-eo-ca/configure.ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../apertium-eo-ca-0.9.1/configure.ac	2009-07-04 17:19:42.000000000 +0200
-+++ apertium-eo-ca-0.9.1/configure.ac	2010-09-21 15:53:29.670738778 +0200
-@@ -19,8 +19,14 @@
-     APERTIUM_VER=30
-   ],
-   [
--    PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0)
--    APERTIUM_VER=31
-+    PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+    [
-+      APERTIUM_VER=31
-+    ],
-+    [
-+      PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+      APERTIUM_VER=32
-+    ])
-   ])
-   AC_SUBST(APERTIUM_VER)
- ])
diff --git a/pcr/apertium/apertium-eo-en/Makefile.am.patch b/pcr/apertium/apertium-eo-en/Makefile.am.patch
deleted file mode 100644
index aa737b7e2..000000000
--- a/pcr/apertium/apertium-eo-en/Makefile.am.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- ../apertium-eo-en-1.0.0/Makefile.am	2010-02-03 15:43:40.000000000 +0100
-+++ apertium-eo-en-1.0.0/Makefile.am	2010-09-15 14:18:53.000000000 +0200
-@@ -149,9 +149,9 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_eo_modesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_eo_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).antaux_t2x $(BASENAME).$(PREFIX1).t2x $(BASENAME).$(PREFIX1).t3x $(apertium_eo_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(BASENAME).$(PREFIX2).genitive.t1x  $(BASENAME).$(PREFIX2).antaux_t2x $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(apertium_eo_endir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_eo_modesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_eo_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).antaux_t2x $(BASENAME).$(PREFIX1).t2x $(BASENAME).$(PREFIX1).t3x $(DESTDIR)$(apertium_eo_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(BASENAME).$(PREFIX2).genitive.t1x  $(BASENAME).$(PREFIX2).antaux_t2x $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(DESTDIR)$(apertium_eo_endir)
- 
- CLEANFILES = -rf $(TARGETS_COMMON) tmp1_$(BASENAME).$(LANG2).dix  $(TARGETS) modes *.mode *.bin apertium-eo-en.eo-multiwords.xml
diff --git a/pcr/apertium/apertium-eo-en/Makefile.in.patch b/pcr/apertium/apertium-eo-en/Makefile.in.patch
deleted file mode 100644
index 0ba03e985..000000000
--- a/pcr/apertium/apertium-eo-en/Makefile.in.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ../apertium-eo-en-1.0.0/Makefile.in	2010-02-03 15:44:38.000000000 +0100
-+++ apertium-eo-en-1.0.0/Makefile.in	2010-09-15 14:19:00.000000000 +0200
-@@ -653,10 +653,10 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_eo_modesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_eo_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).antaux_t2x $(BASENAME).$(PREFIX1).t2x $(BASENAME).$(PREFIX1).t3x $(apertium_eo_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(BASENAME).$(PREFIX2).genitive.t1x  $(BASENAME).$(PREFIX2).antaux_t2x $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(apertium_eo_endir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_eo_modesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_eo_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).antaux_t2x $(BASENAME).$(PREFIX1).t2x $(BASENAME).$(PREFIX1).t3x $(DESTDIR)$(apertium_eo_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(BASENAME).$(PREFIX2).genitive.t1x  $(BASENAME).$(PREFIX2).antaux_t2x $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(DESTDIR)$(apertium_eo_endir)
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/pcr/apertium/apertium-eo-en/PKGBUILD b/pcr/apertium/apertium-eo-en/PKGBUILD
deleted file mode 100644
index 3362d0f05..000000000
--- a/pcr/apertium/apertium-eo-en/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-eo-en
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="Apertium language data for the Esperanto-English translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "Makefile.in.patch")
-md5sums=('df00059573f4a87d90dc56394daf6793'
-         '31dfb82e3412a1159786ce65a2748910'
-         '6145fc4ec2ceddd7270fa2111d11bb73')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < Makefile.in.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-eo-es/Makefile.am.patch b/pcr/apertium/apertium-eo-es/Makefile.am.patch
deleted file mode 100644
index fa88a4edf..000000000
--- a/pcr/apertium/apertium-eo-es/Makefile.am.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- ../apertium-eo-es-1.0.0/Makefile.am	2009-11-18 19:58:26.000000000 +0100
-+++ apertium-eo-es-1.0.0/Makefile.am	2010-09-15 15:28:18.000000000 +0200
-@@ -32,7 +32,7 @@
- $(PREFIX1).autogen.bin: $(BASENAME).$(LANG1).dix
- 	apertium-validate-dictionary $(BASENAME).$(LANG1).dix
- 	lt-comp rl $(BASENAME).$(LANG1).dix $@
--	
-+
- $(BASENAME).$(LANG1).dix.translit: $(BASENAME).$(LANG1).dix
- 	./transliterate.sh $(BASENAME).$(LANG1).dix >$@
- 
-@@ -43,7 +43,7 @@
- $(PREFIX1).autopgen.bin: $(BASENAME).post-$(LANG1).dix
- 	apertium-validate-dictionary $(BASENAME).post-$(LANG1).dix
- 	lt-comp lr $(BASENAME).post-$(LANG1).dix $@
--	
-+
- $(BASENAME).post-$(LANG1).dix.translit: $(BASENAME).post-$(LANG1).dix
- 	./transliterate.sh $(BASENAME).post-$(LANG1).dix >$@
- 
-@@ -121,11 +121,11 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_eo_esmodesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_eo_esmodesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(apertium_eo_esdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX1).t1x.translit $(apertium_eo_esdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x.translit $(BASENAME).$(PREFIX1).t3x.translit $(apertium_eo_esdir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_eo_esmodesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_eo_esmodesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_eo_esdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX1).t1x.translit $(DESTDIR)$(apertium_eo_esdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x.translit $(BASENAME).$(PREFIX1).t3x.translit $(DESTDIR)$(apertium_eo_esdir)
- 
- 
- CLEANFILES = -rf $(TARGETS) *.translit modes 
diff --git a/pcr/apertium/apertium-eo-es/PKGBUILD b/pcr/apertium/apertium-eo-es/PKGBUILD
deleted file mode 100644
index 83f5986eb..000000000
--- a/pcr/apertium/apertium-eo-es/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-eo-es
-pkgver=1.0.0
-pkgrel=2
-pkgdesc="Apertium language data for the Esperanto-Spanish translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch")
-md5sums=('92db1e1e1cae12b93f300dbb1f1138c0'
-         'd543d8d7c17fedd791b38a1694defdb3'
-         'd9c2eeea53f85b61b8a225310cca9cd7')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-eo-es/configure.ac.patch b/pcr/apertium/apertium-eo-es/configure.ac.patch
deleted file mode 100644
index 73dc6b592..000000000
--- a/pcr/apertium/apertium-eo-es/configure.ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../apertium-eo-es-1.0.0/configure.ac	2009-11-18 19:58:54.000000000 +0100
-+++ apertium-eo-es-1.0.0/configure.ac	2010-09-21 15:57:51.560738783 +0200
-@@ -19,8 +19,14 @@
-     APERTIUM_VER=30
-   ],
-   [
--    PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0)
--    APERTIUM_VER=31
-+    PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+    [
-+      APERTIUM_VER=31
-+    ],
-+    [
-+      PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+      APERTIUM_VER=32
-+    ])
-   ])
-   AC_SUBST(APERTIUM_VER)
- ])
diff --git a/pcr/apertium/apertium-eo-fr/Makefile.am.patch b/pcr/apertium/apertium-eo-fr/Makefile.am.patch
deleted file mode 100644
index 98535465d..000000000
--- a/pcr/apertium/apertium-eo-fr/Makefile.am.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- apertium-eo-fr-0.9.0/Makefile.am.orig	2011-05-28 13:14:57.955419683 +0400
-+++ apertium-eo-fr-0.9.0/Makefile.am	2011-05-28 13:16:12.248463272 +0400
-@@ -90,9 +90,9 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_eo_camodesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).antaux1_t2x  $(BASENAME).$(PREFIX1).antaux2_t2x $(BASENAME).$(PREFIX1).antaux3_t2x $(BASENAME).$(PREFIX1).antaux4_t2x $(BASENAME).$(PREFIX1).t2x $(BASENAME).$(PREFIX1).post_t2x $(apertium_eo_cadir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(apertium_eo_cadir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_eo_camodesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).antaux1_t2x  $(BASENAME).$(PREFIX1).antaux2_t2x $(BASENAME).$(PREFIX1).antaux3_t2x $(BASENAME).$(PREFIX1).antaux4_t2x $(BASENAME).$(PREFIX1).t2x $(BASENAME).$(PREFIX1).post_t2x $(DESTDIR)$(apertium_eo_cadir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(DESTDIR)$(apertium_eo_cadir)
- 
- 
- #	$(INSTALL_DATA) $(PREFIX2)-pn.mode $(apertium_es_modesdir)
diff --git a/pcr/apertium/apertium-eo-fr/PKGBUILD b/pcr/apertium/apertium-eo-fr/PKGBUILD
deleted file mode 100644
index ecd460bf0..000000000
--- a/pcr/apertium/apertium-eo-fr/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-pkgname=apertium-eo-fr
-pkgver=0.9.0
-pkgrel=1
-pkgdesc="Apertium language data for the Esperanto-French translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch")
-md5sums=('c3c4efa6e8faa990ae213a1707a1bd63'
-         '74b0b10ddcc8bf3f64613dca3f2c34b0')
-
-build() {
-  patch -p0 < Makefile.am.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-es-ast/PKGBUILD b/pcr/apertium/apertium-es-ast/PKGBUILD
deleted file mode 100644
index e2bd8e815..000000000
--- a/pcr/apertium/apertium-es-ast/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@fsfe.org>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@fsfe.org>
-pkgname=apertium-es-ast
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="Apertium language data for the Spanish-Asturian translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/apertium-es-ast_NO-PN-${pkgver}.tar.gz")
-md5sums=('3e94345c525b2c6de87a50d599f1ce04')
-
-build() {
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-es-ca/Makefile.am.patch b/pcr/apertium/apertium-es-ca/Makefile.am.patch
deleted file mode 100644
index b0f9b7bfa..000000000
--- a/pcr/apertium/apertium-es-ca/Makefile.am.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ../apertium-es-ca-1.2.0/Makefile.am	2009-10-15 12:51:50.000000000 +0200
-+++ apertium-es-ca-1.2.0/Makefile.am	2010-02-15 12:40:14.000000000 +0100
-@@ -229,14 +229,14 @@
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
- 	cp *.mode modes/
--	$(INSTALL_DATA) $(PREFVAR1)$(PREFIX1).mode $(apertium_es_modesdir)
--	$(INSTALL_DATA) $(PREFVAR1)$(PREFIX2).mode $(apertium_es_modesdir)
--	$(INSTALL_DATA) $(PREFVAR2)$(PREFIX1).mode $(apertium_es_modesdir)
--	$(INSTALL_DATA) $(PREFVAR2)$(PREFIX2).mode $(apertium_es_modesdir)
--	$(INSTALL_DATA) es-ca_valencia.mode $(apertium_es_modesdir)	
--	$(INSTALL_DATA) $(PREFVAR1)$(PREFIX1)-multi.mode $(apertium_es_modesdir)
--	$(INSTALL_DATA) $(PREFVAR1)$(PREFIX2)-multi.mode $(apertium_es_modesdir)
--	$(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(BASENAME).trules-$(PREFIX1).xml $(apertium_es_cadir)
-+	$(INSTALL_DATA) $(PREFVAR1)$(PREFIX1).mode $(DESTDIR)$(apertium_es_modesdir)
-+	$(INSTALL_DATA) $(PREFVAR1)$(PREFIX2).mode $(DESTDIR)$(apertium_es_modesdir)
-+	$(INSTALL_DATA) $(PREFVAR2)$(PREFIX1).mode $(DESTDIR)$(apertium_es_modesdir)
-+	$(INSTALL_DATA) $(PREFVAR2)$(PREFIX2).mode $(DESTDIR)$(apertium_es_modesdir)
-+	$(INSTALL_DATA) es-ca_valencia.mode $(DESTDIR)$(apertium_es_modesdir)	
-+	$(INSTALL_DATA) $(PREFVAR1)$(PREFIX1)-multi.mode $(DESTDIR)$(apertium_es_modesdir)
-+	$(INSTALL_DATA) $(PREFVAR1)$(PREFIX2)-multi.mode $(DESTDIR)$(apertium_es_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(BASENAME).trules-$(PREFIX1).xml $(DESTDIR)$(apertium_es_cadir)
- 
- CLEANFILES = -rf $(TARGETS) modes $(PREFVAR2)$(PREFIX1).automorf.bin $(PREFVAR2)$(PREFIX1).autobil.bin \
- 		$(PREFVAR2)$(PREFIX2).automorf.bin $(PREFVAR2)$(PREFIX2).autobil.bin \
diff --git a/pcr/apertium/apertium-es-ca/PKGBUILD b/pcr/apertium/apertium-es-ca/PKGBUILD
deleted file mode 100644
index 18df73eac..000000000
--- a/pcr/apertium/apertium-es-ca/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-es-ca
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="Apertium language data for the Spanish-Catalan translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/apertium-es-ca-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch")
-md5sums=('0cc9676a152947adf703ec81b67654bf'
-         'b75136e67d4ac876e024f3147f149c97'
-         '6e8507366d33e85af7988de36f366fa2')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-es-ca/configure.ac.patch b/pcr/apertium/apertium-es-ca/configure.ac.patch
deleted file mode 100644
index b67902c92..000000000
--- a/pcr/apertium/apertium-es-ca/configure.ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../apertium-es-ca-1.2.0/configure.ac	2009-10-15 11:36:01.000000000 +0200
-+++ apertium-es-ca-1.2.0/configure.ac	2010-09-21 16:02:34.987405444 +0200
-@@ -27,8 +27,14 @@
-               APERTIUM_VER=30
-           ],
-           [
--              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0)
--              APERTIUM_VER=31
-+              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+              [
-+                APERTIUM_VER=31
-+              ],
-+              [
-+                PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+                APERTIUM_VER=32
-+              ])
-           ])
-       ])
-   ])
diff --git a/pcr/apertium/apertium-es-gl/Makefile.am.patch b/pcr/apertium/apertium-es-gl/Makefile.am.patch
deleted file mode 100644
index be662d9da..000000000
--- a/pcr/apertium/apertium-es-gl/Makefile.am.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- ../apertium-es-gl-1.0.7/Makefile.am	2009-03-11 22:20:58.000000000 +0100
-+++ apertium-es-gl-1.0.7/Makefile.am	2010-09-15 15:57:44.000000000 +0200
-@@ -20,7 +20,7 @@
- 	xmllint --xinclude $(BASENAME).$(LANG2).dix.xml > $(BASENAME).$(LANG2).dix
- $(BASENAME).$(LANG1)-$(LANG2).dix:
- 	xmllint --xinclude $(BASENAME).$(LANG1)-$(LANG2).dix.xml > $(BASENAME).$(LANG1)-$(LANG2).dix
--     
-+
- $(PREFIX1).automorf.bin: $(BASENAME).$(LANG1).dix
- 	apertium-validate-dictionary $(BASENAME).$(LANG1).dix
- 	lt-comp lr $(BASENAME).$(LANG1).dix $@
-@@ -97,7 +97,7 @@
- 	rm $(BASENAME).$(LANG1).dix
- 	rm $(BASENAME).$(LANG2).dix
- 	rm $(BASENAME).$(PREFIX1).dix
--	
-+
- apertium_es_gldir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_es_modesdir=$(prefix)/share/apertium/modes/
- 
-@@ -116,12 +116,12 @@
- 		    $(PREFIX1).t1x.bin \
- 		    $(PREFIX2).t1x.bin \
- 	            $(PREFIX1).mode $(PREFIX2).mode modes.xml apertium-$(PREFIX1).symbols.xml
--		  
-+
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_es_modesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_es_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(apertium_es_gldir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(apertium_es_gldir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_es_modesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_es_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(DESTDIR)$(apertium_es_gldir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(DESTDIR)$(apertium_es_gldir)
- 
- CLEANFILES = -rf $(TARGETS_COMMON) modes
diff --git a/pcr/apertium/apertium-es-gl/PKGBUILD b/pcr/apertium/apertium-es-gl/PKGBUILD
deleted file mode 100644
index b48ee82b7..000000000
--- a/pcr/apertium/apertium-es-gl/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-es-gl
-pkgver=1.0.7
-pkgrel=2
-pkgdesc="Apertium language data for the Spanish-Galician translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch")
-md5sums=('17e5dd2df012f8848479ed9205d9248c'
-         'b60a40523e1104ed8ce1d03bd8c9f54d'
-         'b3c34766a80291fb1bbb221d8b93cf18')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-es-gl/configure.ac.patch b/pcr/apertium/apertium-es-gl/configure.ac.patch
deleted file mode 100644
index 0b77ae270..000000000
--- a/pcr/apertium/apertium-es-gl/configure.ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../apertium-es-gl-1.0.7/configure.ac	2009-03-11 22:22:18.000000000 +0100
-+++ apertium-es-gl-1.0.7/configure.ac	2010-09-21 16:04:49.907405446 +0200
-@@ -29,8 +29,14 @@
-               APERTIUM_VER=30
-           ],
-           [
--              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0)
--              APERTIUM_VER=31
-+              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+              [
-+                APERTIUM_VER=31
-+              ],
-+              [
-+                PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+                APERTIUM_VER=32
-+              ])
-           ])
-       ])
-   ])
diff --git a/pcr/apertium/apertium-es-pt/Makefile.am.patch b/pcr/apertium/apertium-es-pt/Makefile.am.patch
deleted file mode 100644
index 332c327b1..000000000
--- a/pcr/apertium/apertium-es-pt/Makefile.am.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- ../apertium-es-pt-1.0.3/Makefile.am	2007-10-02 10:38:51.000000000 +0200
-+++ apertium-es-pt-1.0.3/Makefile.am	2010-09-15 16:34:42.000000000 +0200
-@@ -31,11 +31,11 @@
- $(PREFIX1b).autobil.bin: es-pt_BR.dix
- 	apertium-validate-dictionary es-pt_BR.dix
- 	lt-comp lr es-pt_BR.dix $@
--                
-+
- $(PREFIX1b).autogen.bin: pt_BR.dix
- 	apertium-validate-dictionary pt_BR.dix
- 	lt-comp rl pt_BR.dix $@
--                                
-+
- $(PREFIX1).autopgen.bin: $(BASENAME).post-$(LANG2).dix
- 	apertium-validate-dictionary $(BASENAME).post-$(LANG2).dix
- 	lt-comp lr $(BASENAME).post-$(LANG2).dix $@
-@@ -60,13 +60,13 @@
- 	apertium-validate-transfer $(BASENAME).trules-$(PREFIX2).xml
- 	apertium-preprocess-transfer $(BASENAME).trules-$(PREFIX2).xml \
- 	                             trules-$(PREFIX2).bin
--	                         
-+
- trules-$(PREFIX1).xml: $(BASENAME).trules-$(PREFIX1).xml
- 	./filterrules.sh pt_PT $(BASENAME).trules-$(PREFIX1).xml >$@
- 
- trules-$(PREFIX1b).xml: $(BASENAME).trules-$(PREFIX1).xml
- 	./filterrules.sh pt_BR $(BASENAME).trules-$(PREFIX1).xml >$@	                      
--	                             
-+
- trules-$(PREFIX1).bin: trules-$(PREFIX1).xml
- 	apertium-validate-transfer trules-$(PREFIX1).xml
- 	apertium-preprocess-transfer trules-$(PREFIX1).xml $@
-@@ -87,20 +87,20 @@
-            $(PREFIX2)-supervised.make $(PREFIX2)-unsupervised.make \
- 	   $(LANG2).dix $(LANG2b).dix $(PREFIX1).dix $(PREFIX1b).dix \
-            filter.sh filter.xsl filterrules.sh filterrules.xsl modes.xml
--                                  
-+
- apertium_es_ptdir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_es_modesdir=$(prefix)/share/apertium/modes/
- 
- 
- pt.dix: $(BASENAME).$(LANG2).dix
- 	./filter.sh pt left $(BASENAME).$(LANG2).dix >$@
--        
-+
- pt_BR.dix: $(BASENAME).$(LANG2).dix
- 	./filter.sh br left $(BASENAME).$(LANG2).dix >$@
--                 
-+
- es-pt.dix: $(BASENAME).$(PREFIX1).dix
- 	./filter.sh pt right $(BASENAME).$(PREFIX1).dix >$@
--                         
-+
- es-pt_BR.dix: $(BASENAME).$(PREFIX1).dix
- 	./filter.sh br right $(BASENAME).$(PREFIX1).dix >$@
- 
-@@ -115,7 +115,7 @@
- 
- modes: modes.xml
- 	apertium-gen-modes modes.xml
--           
-+
- apertium_es_pt_DATA=$(PREFIX1).automorf.bin $(PREFIX2).automorf.bin \
- 	$(PREFIX1).autobil.bin $(PREFIX2).autobil.bin \
- 	$(PREFIX1b).autobil.bin $(PREFIX1b).autogen.bin \
-@@ -128,10 +128,10 @@
- 
- install-data-local:
- 	$(prefix)/bin/apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_es_modesdir)
--	$(INSTALL_DATA) $(PREFIX1b).mode $(apertium_es_modesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_es_modesdir)
--	$(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(BASENAME).trules-$(PREFIX1).xml trules-$(PREFIX1b).xml $(apertium_es_ptdir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_es_modesdir)
-+	$(INSTALL_DATA) $(PREFIX1b).mode $(DESTDIR)$(apertium_es_modesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_es_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(BASENAME).trules-$(PREFIX1).xml trules-$(PREFIX1b).xml $(DESTDIR)$(apertium_es_ptdir)
- 
- 
- CLEANFILES = -rf $(TARGETS) pt.dix pt_BR.dix es-pt.dix es-pt_BR.dix  modes
diff --git a/pcr/apertium/apertium-es-pt/PKGBUILD b/pcr/apertium/apertium-es-pt/PKGBUILD
deleted file mode 100644
index 97011a735..000000000
--- a/pcr/apertium/apertium-es-pt/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-es-pt
-pkgver=1.0.3
-pkgrel=2
-pkgdesc="Apertium language data for the Spanish-Portuguese translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig' 'autoconf')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-	"configure.ac.patch")
-md5sums=('0549493582ed682c6369b6a3ab3f09b5'
-         '980ec38601b6da839b0f98fab5821cde'
-         '29e1b3e85af2d026f3d48d19a4924986')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-es-pt/configure.ac.patch b/pcr/apertium/apertium-es-pt/configure.ac.patch
deleted file mode 100644
index 6ee8c4be8..000000000
--- a/pcr/apertium/apertium-es-pt/configure.ac.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../apertium-es-pt-1.0.3/configure.ac	2007-10-02 12:39:06.000000000 +0200
-+++ apertium-es-pt-1.0.3/configure.ac	2010-09-21 16:08:38.124072111 +0200
-@@ -10,9 +10,14 @@
- AC_PROG_AWK
- AC_CONFIG_HEADER([config])
- 
--PKG_CHECK_MODULES(APERTIUM, apertium-3.0 >= 3.0.0)
--
--APERTIUM_VER=30
-+PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+[
-+  APERTIUM_VER=31
-+],
-+[
-+  PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+  APERTIUM_VER=32
-+])
- 
- AC_SUBST(APERTIUM_VER)
- 
diff --git a/pcr/apertium/apertium-es-ro/Makefile.am.patch b/pcr/apertium/apertium-es-ro/Makefile.am.patch
deleted file mode 100644
index 7f41f13ed..000000000
--- a/pcr/apertium/apertium-es-ro/Makefile.am.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- ../apertium-es-ro-0.7.1/Makefile.am	2007-10-11 21:06:30.000000000 +0200
-+++ apertium-es-ro-0.7.1/Makefile.am	2010-09-15 17:21:24.000000000 +0200
-@@ -49,7 +49,7 @@
- 	apertium-validate-transfer $(BASENAME).trules-$(PREFIX1).xml
- 	apertium-preprocess-transfer $(BASENAME).trules-$(PREFIX1).xml \
- 	                             trules-$(PREFIX1).bin
--	                             
-+
- trules-$(PREFIX2).bin: $(BASENAME).trules-$(PREFIX2).xml
- 	apertium-validate-transfer $(BASENAME).trules-$(PREFIX2).xml
- 	apertium-preprocess-transfer $(BASENAME).trules-$(PREFIX2).xml \
-@@ -67,7 +67,7 @@
-            $(BASENAME).$(LANG2).tsx $(BASENAME).trules-$(PREFIX1).xml \
-            $(BASENAME).trules-$(PREFIX2).xml $(PREFIX1).prob $(PREFIX2).prob \
-            modes.xml
--           
-+
- apertium_es_rodir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_es_modesdir=$(prefix)/share/apertium/modes/
- 
-@@ -79,20 +79,21 @@
- 
- modes: modes.xml
- 	apertium-gen-modes modes.xml
--           
-+
- apertium_es_ro_DATA=$(PREFIX1).automorf.bin $(PREFIX2).automorf.bin \
- 	$(PREFIX1).autobil.bin $(PREFIX2).autobil.bin \
- 	$(PREFIX1).autogen.bin $(PREFIX2).autogen.bin \
- 	$(PREFIX1).autopgen.bin $(PREFIX2).autopgen.bin \
- 	$(PREFIX1).prob $(PREFIX2).prob trules-$(PREFIX1).xml \
- 	trules-$(PREFIX2).xml trules-$(PREFIX1).bin \
--	trules-$(PREFIX2).bin $(PREFIX1).mode $(PREFIX2).mode
-+	trules-$(PREFIX2).bin $(PREFIX2).mode
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_es_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(BASENAME).trules-$(PREFIX1).xml $(DESTDIR)$(apertium_es_rodir)
-+
- # spanish -> romanian is not currently functional ~fmt
- #	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_es_modesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_es_modesdir)
--	$(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(BASENAME).trules-$(PREFIX1).xml $(apertium_es_rodir)
- 
- CLEANFILES = -rf $(TARGETS) modes
diff --git a/pcr/apertium/apertium-es-ro/PKGBUILD b/pcr/apertium/apertium-es-ro/PKGBUILD
deleted file mode 100644
index b5fb54588..000000000
--- a/pcr/apertium/apertium-es-ro/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-es-ro
-pkgver=0.7.1
-pkgrel=1
-pkgdesc="Apertium language data for the Spanish-Romanian translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig' 'autoconf')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch"
-        "trules.patch")
-md5sums=('9de6e21ddf8dfb65a6b09b430e8ab600'
-         'e0d964dad84346f98b500505d428b687'
-         'f4067b2a28d94dc08feff01a41f2d107'
-         '0a6caa9170cca54ba1146803e6cdb1e6')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-  patch -p0 < trules.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-es-ro/configure.ac.patch b/pcr/apertium/apertium-es-ro/configure.ac.patch
deleted file mode 100644
index 11d0e3e47..000000000
--- a/pcr/apertium/apertium-es-ro/configure.ac.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- ../apertium-es-ro-0.7.1/configure.ac	2007-10-11 21:06:44.000000000 +0200
-+++ apertium-es-ro-0.7.1/configure.ac	2010-09-15 17:16:41.000000000 +0200
-@@ -12,7 +12,37 @@
- AC_PROG_AWK
- AC_CONFIG_HEADER([config])
- 
--PKG_CHECK_MODULES(apertium, [dnl
--  apertium-3.0 >= required_apertium_version])
-+AC_DEFUN([PKG_CHECK_APERTIUM], [
-+  APERTIUM_VER=0
-+  PKG_CHECK_MODULES(APERTIUM, apertium-1.0 >= 1.0.0,
-+  [
-+      APERTIUM_VER=10
-+  ],
-+  [
-+      PKG_CHECK_MODULES(APERTIUM, apertium-2.0 >= 2.0.0,
-+      [
-+          APERTIUM_VER=20
-+      ],
-+      [
-+          PKG_CHECK_MODULES(APERTIUM, apertium-3.0 >= 3.0.0,
-+          [
-+              APERTIUM_VER=30
-+          ],
-+          [
-+              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+              [
-+                  APERTIUM_VER=31
-+              ],
-+              [
-+                  PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+                  APERTIUM_VER=32
-+              ])
-+          ])
-+      ])
-+  ])
-+  AC_SUBST(APERTIUM_VER)
-+])
-+
-+PKG_CHECK_APERTIUM
-   
- AC_OUTPUT([Makefile])
diff --git a/pcr/apertium/apertium-es-ro/trules.patch b/pcr/apertium/apertium-es-ro/trules.patch
deleted file mode 100644
index 352f03e65..000000000
--- a/pcr/apertium/apertium-es-ro/trules.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- ../apertium-es-ro-0.7.1/apertium-es-ro.trules-ro-es.xml	2007-10-11 21:04:49.000000000 +0200
-+++ apertium-es-ro-0.7.1/apertium-es-ro.trules-ro-es.xml	2010-09-15 17:18:56.000000000 +0200
-@@ -4545,8 +4545,6 @@
-                   <clip pos="3" side="sl" part="a_case"/>
-                   <lit-tag v="nom"/>
-                 </equal>
--              </and>
--              <and>
-                 <equal>
-                   <clip pos="4" side="sl" part="a_def"/>
-                   <lit-tag v="def"/>
-@@ -4676,8 +4674,6 @@
-                   <clip pos="2" side="sl" part="a_case"/>
-                   <lit-tag v="nom"/>
-                 </equal>
--              </and>
--              <and>
-                 <equal>
-                   <clip pos="3" side="sl" part="a_def"/>
-                   <lit-tag v="def"/>
-@@ -4984,8 +4980,6 @@
-                   <clip pos="2" side="sl" part="a_case"/>
-                   <lit-tag v="nom"/>
-                 </equal>
--              </and>
--              <and>
-                 <equal>
-                   <clip pos="3" side="sl" part="a_def"/>
-                   <lit-tag v="def"/>
-@@ -5115,8 +5109,6 @@
-                   <clip pos="2" side="sl" part="a_case"/>
-                   <lit-tag v="nom"/>
-                 </equal>
--              </and>
--              <and>
-                 <equal>
-                   <clip pos="3" side="sl" part="a_def"/>
-                   <lit-tag v="def"/>
-@@ -5757,7 +5749,7 @@
-         </call-macro>    
-          <choose>
-           <when>
--             <test>
-+             <test><and>
-                <equal>
-                   <clip pos="1" side="sl" part="a_case"/>
-                   <lit-tag v="nom"/>
-@@ -5766,7 +5758,7 @@
- 	        <clip pos="1" side="sl" part="a_def"/>
- 		<lit-tag v="def"/>
- 	      </equal>
--             </test>
-+             </and></test>
-              <call-macro n="modcase">
-                <with-param pos="1"/>
-             </call-macro>
diff --git a/pcr/apertium/apertium-eu-es/Makefile.am.patch b/pcr/apertium/apertium-eu-es/Makefile.am.patch
deleted file mode 100644
index 9da0248a4..000000000
--- a/pcr/apertium/apertium-eu-es/Makefile.am.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- ../apertium-eu-es-0.3.1/Makefile.am	2009-04-24 09:55:48.000000000 +0200
-+++ apertium-eu-es-0.3.1/Makefile.am	2010-09-21 16:17:49.880738777 +0200
-@@ -10,13 +10,13 @@
- 	$(PREFIX1).autopgen.bin $(PREFIX1).t1x.bin $(PREFIX1).t2x.bin $(PREFIX1).t3x.bin \
- 	$(PREFIX1).ordinals.t1x.bin modes
- #$(PREFIX1).rlx.bin modes
--     
-+
- TARGETS = $(TARGETS_COMMON) trules-$(PREFIX1).bin trules-$(PREFIX2).bin \
-           trules-$(PREFIX1).xml trules-$(PREFIX2).xml 
-           # $(BASENAME).$(LANG1)-lextor.dix $(BASENAME).$(LANG2)-lextor.dix \
- 	  # $(BASENAME).$(PREFIX1)-lextor.dix $(BASENAME).$(PREFIX2)-lextor.dix 
- 
--	  
-+
- $(PREFIX1).automorf.bin: $(BASENAME).$(LANG1).dix
- 	apertium-validate-dictionary $(BASENAME).$(LANG1).dix
- 	lt-comp lr $(BASENAME).$(LANG1).dix $@
-@@ -63,7 +63,7 @@
- ##	apertium-validate-transfer $(BASENAME).trules-$(PREFIX1).xml
- ##	apertium-preprocess-transfer $(BASENAME).trules-$(PREFIX1).xml \
- ##	                             trules-$(PREFIX1).bin
--	                             
-+
- ##trules-$(PREFIX2).bin: $(BASENAME).trules-$(PREFIX2).xml
- ##	apertium-validate-transfer $(BASENAME).trules-$(PREFIX2).xml
- ##	apertium-preprocess-transfer $(BASENAME).trules-$(PREFIX2).xml \
-@@ -79,14 +79,14 @@
- ##$(BASENAME).$(LANG1)-lextor.dix: $(BASENAME).$(PREFIX1).dix
- ##	apertium-validate-dictionary $(BASENAME).$(PREFIX1).dix
- ##	apertium-gen-lextormono rl $(BASENAME).$(PREFIX1).dix $@
--	
-+
- ##$(BASENAME).$(LANG2)-lextor.dix: $(BASENAME).$(PREFIX1).dix
- ##	apertium-validate-dictionary $(BASENAME).$(PREFIX1).dix
- ##	apertium-gen-lextormono lr $(BASENAME).$(PREFIX1).dix $@
- 
- ##$(PREFIX1).lextormono.bin: $(BASENAME).$(LANG1)-lextor.dix
- ##	lt-comp lr $(BASENAME).$(LANG1)-lextor.dix $@
--	
-+
- ##$(PREFIX2).lextormono.bin: $(BASENAME).$(LANG2)-lextor.dix
- ##	lt-comp lr $(BASENAME).$(LANG2)-lextor.dix $@
- 
-@@ -94,14 +94,14 @@
- ##$(BASENAME).$(PREFIX1)-lextor.dix: $(BASENAME).$(PREFIX1).dix
- ##	apertium-validate-dictionary $(BASENAME).$(PREFIX1).dix
- ##	apertium-gen-lextorbil rl $(BASENAME).$(PREFIX1).dix $@
--	
-+
- ##$(BASENAME).$(PREFIX2)-lextor.dix: $(BASENAME).$(PREFIX1).dix
- ##	apertium-validate-dictionary $(BASENAME).$(PREFIX1).dix
- ##	apertium-gen-lextorbil lr $(BASENAME).$(PREFIX1).dix $@
- 
- ##$(PREFIX1).lextorbil.bin: $(BASENAME).$(PREFIX1)-lextor.dix
- ##	lt-comp lr $(BASENAME).$(PREFIX1)-lextor.dix $@
--	
-+
- ##$(PREFIX2).lextorbil.bin: $(BASENAME).$(PREFIX2)-lextor.dix
- ##	lt-comp lr $(BASENAME).$(PREFIX2)-lextor.dix $@
- 
-@@ -152,7 +152,7 @@
- #	    $(BASENAME).$(PREFIX2).t1x 
- #	    $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x 
- #	    $(BASENAME).$(LANG2).tsx 
--           	            	            	            	            	            	  	 
-+
- modes: modes.xml
- 	apertium-gen-modes modes.xml
- 
-@@ -161,7 +161,7 @@
- 	apertium-gen-modes modes.xml
- 	mkdir -p modes/
- 	cp $(PREFIX1).mode modes/
--	
-+
- apertium_eu_esdir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_eu_modesdir=$(prefix)/share/apertium/modes/
- 
-@@ -169,15 +169,15 @@
-                     $(PREFIX1).autobil.bin \
-                     $(PREFIX1).autogen.bin \
-                     $(PREFIX1).autopgen.bin \
--                    $(PREFIX1).prob $(PREFIX1).ordinals.t1x.bin \
-+                    $(PREFIX1).prob \
- 		    $(PREFIX1).t1x.bin $(PREFIX1).t2x.bin $(PREFIX1).t3x.bin  $(PREFIX1).ordinals.t1x.bin\
- 		    $(PREFIX1).mode	  
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_eu_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(apertium_eu_esdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(apertium_eu_esdir)
--	$(INSTALL_DATA) $(BASENAME).ordinals.t1x $(apertium_eu_esdir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_eu_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_eu_esdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(DESTDIR)$(apertium_eu_esdir)
-+	$(INSTALL_DATA) $(BASENAME).ordinals.t1x $(DESTDIR)$(apertium_eu_esdir)
- 
- CLEANFILES = -r $(TARGETS) 
diff --git a/pcr/apertium/apertium-eu-es/PKGBUILD b/pcr/apertium/apertium-eu-es/PKGBUILD
deleted file mode 100644
index f4c002690..000000000
--- a/pcr/apertium/apertium-eu-es/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-eu-es
-pkgver=0.3.1
-pkgrel=2
-pkgdesc="Apertium language data for the Basque-Spanish translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig' 'autoconf')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch")
-md5sums=('990cbc06d639d7e1ecda0132405fe07a'
-         '7ce5bc046e8b9d3b23134332fee6143c'
-         '846c24b12b3528ae9e257b8d3c6796a8')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-eu-es/configure.ac.patch b/pcr/apertium/apertium-eu-es/configure.ac.patch
deleted file mode 100644
index 8c8eace77..000000000
--- a/pcr/apertium/apertium-eu-es/configure.ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../apertium-eu-es-0.3.1/configure.ac	2009-04-23 22:40:45.000000000 +0200
-+++ apertium-eu-es-0.3.1/configure.ac	2010-09-21 16:11:38.740738737 +0200
-@@ -27,8 +27,14 @@
-               APERTIUM_VER=30
-           ],
-           [
--              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0)
--              APERTIUM_VER=31
-+              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+              [
-+                APERTIUM_VER=31
-+              ],
-+              [
-+                PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+                APERTIUM_VER=32
-+              ])
-           ])
-       ])
-   ])
diff --git a/pcr/apertium/apertium-fr-ca/Makefile.am.patch b/pcr/apertium/apertium-fr-ca/Makefile.am.patch
deleted file mode 100644
index 30bb29327..000000000
--- a/pcr/apertium/apertium-fr-ca/Makefile.am.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- ../apertium-fr-ca-1.0.2/Makefile.am	2009-03-12 20:49:44.000000000 +0100
-+++ apertium-fr-ca-1.0.2/Makefile.am	2010-09-15 15:49:32.000000000 +0200
-@@ -48,7 +48,7 @@
- 	apertium-validate-transfer $(BASENAME).$(PREFIX1).t1x
- 	apertium-preprocess-transfer $(BASENAME).$(PREFIX1).t1x \
- 	                             $(PREFIX1).t1x.bin
--	                             
-+
- $(PREFIX2).t1x.bin: $(BASENAME).$(PREFIX2).t1x
- 	apertium-validate-transfer $(BASENAME).$(PREFIX2).t1x
- 	apertium-preprocess-transfer $(BASENAME).$(PREFIX2).t1x \
-@@ -64,12 +64,12 @@
-            $(PREFIX1)-supervised.make $(PREFIX1)-unsupervised.make \
-            $(PREFIX2)-supervised.make $(PREFIX2)-unsupervised.make \
-            $(LANG1)-tagger-data/README $(LANG2)-tagger-data/README
--           
-+
- apertium-fr-ca.fr.dix: apertium-fr-ca.fr.metadix
- 	@xsltproc buscaPar.xsl apertium-fr-ca.fr.metadix | uniq > $$gen.xsl
- 	@xsltproc $$gen.xsl apertium-fr-ca.fr.metadix >$@
- 	@rm $$gen.xsl
--           
-+
- apertium_fr_cadir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_fr_modesdir=$(prefix)/share/apertium/modes/
- 
-@@ -91,8 +91,8 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_fr_modesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_fr_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(BASENAME).$(PREFIX1).t1x $(apertium_fr_cadir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_fr_modesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_fr_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(BASENAME).$(PREFIX1).t1x $(DESTDIR)$(apertium_fr_cadir)
- 
- CLEANFILES = -rf $(TARGETS) modes $(BASENAME).$(LANG1).dix *.mode
diff --git a/pcr/apertium/apertium-fr-ca/PKGBUILD b/pcr/apertium/apertium-fr-ca/PKGBUILD
deleted file mode 100644
index 5a78cc3e2..000000000
--- a/pcr/apertium/apertium-fr-ca/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-fr-ca
-pkgver=1.0.2
-pkgrel=2
-pkgdesc="Apertium language data for the French-Catalan translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig' 'autoconf')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch")
-md5sums=('f04cb595c342a623a5d17cd1f5bfa1f3'
-         '25adf0c47d303ec33e8859e153f8f500'
-         '4ec3f673513fa04ca595878d79707849')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-fr-ca/configure.ac.patch b/pcr/apertium/apertium-fr-ca/configure.ac.patch
deleted file mode 100644
index 5006f7e0d..000000000
--- a/pcr/apertium/apertium-fr-ca/configure.ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../apertium-fr-ca-1.0.2/configure.ac	2009-03-12 20:55:15.000000000 +0100
-+++ apertium-fr-ca-1.0.2/configure.ac	2010-09-21 16:13:21.567405445 +0200
-@@ -27,8 +27,14 @@
-               APERTIUM_VER=30
-           ],
-           [
--              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0)
--              APERTIUM_VER=31
-+              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+              [
-+                APERTIUM_VER=31
-+              ],
-+              [
-+                PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+                APERTIUM_VER=32
-+              ])
-           ])
-       ])
-   ])
diff --git a/pcr/apertium/apertium-fr-es/Makefile.am.patch b/pcr/apertium/apertium-fr-es/Makefile.am.patch
deleted file mode 100644
index 84de3f05c..000000000
--- a/pcr/apertium/apertium-fr-es/Makefile.am.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- ../apertium-fr-es-0.9.2/Makefile.am	2009-12-03 17:18:28.000000000 +0100
-+++ apertium-fr-es-0.9.2/Makefile.am	2010-09-15 15:04:20.000000000 +0200
-@@ -14,7 +14,7 @@
-      $(PREFIX2).autogen.bin $(PREFIX2).autopgen.bin \
-      $(PREFIX1).t1x.bin $(PREFIX1).t2x.bin $(PREFIX1).t3x.bin \
-      $(PREFIX2).t1x.bin $(PREFIX2).t2x.bin $(PREFIX2).t3x.bin modes
--     
-+
- TARGETS = $(TARGETS_COMMON) trules-$(PREFIX1).bin trules-$(PREFIX2).bin \
-           trules-$(PREFIX1).xml trules-$(PREFIX2).xml
- 
-@@ -29,10 +29,10 @@
- 
- $(PREFVAR2)$(LANG2).dix: $(BASENAME).$(LANG2).dix
- 	xsltproc --stringparam alt $(VAR2) alt.xsl $< >$@
--	
-+
- common-$(PREFIX1).dix: $(BASENAME).$(PREFIX1).dix
- 	xsltproc translate-to-default-equivalent.xsl $< >$@
--	
-+
- $(PREFVAR1)$(PREFIX1).dix: common-$(PREFIX1).dix
- 	xsltproc --stringparam alt $(VAR1) alt.xsl $< >$@
- 
-@@ -173,7 +173,7 @@
- 	@xsltproc buscaPar.xsl apertium-fr-es.fr.metadix | uniq > $$gen.xsl
- 	@xsltproc $$gen.xsl apertium-fr-es.fr.metadix >$@
- 	@rm $$gen.xsl
--	
-+
- apertium_fr_esdir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_fr_modesdir=$(prefix)/share/apertium/modes/
- 
-@@ -197,13 +197,13 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFVAR1)$(PREFIX1).mode $(apertium_fr_modesdir)
--	$(INSTALL_DATA) $(PREFVAR1)$(PREFIX2).mode $(apertium_fr_modesdir)
--	$(INSTALL_DATA) $(PREFVAR2)$(PREFIX1).mode $(apertium_fr_modesdir)
--	$(INSTALL_DATA) $(PREFVAR2)$(PREFIX2).mode $(apertium_fr_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(apertium_fr_esdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX2).t1x $(apertium_fr_esdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(apertium_fr_esdir)
-+	$(INSTALL_DATA) $(PREFVAR1)$(PREFIX1).mode $(DESTDIR)$(apertium_fr_modesdir)
-+	$(INSTALL_DATA) $(PREFVAR1)$(PREFIX2).mode $(DESTDIR)$(apertium_fr_modesdir)
-+	$(INSTALL_DATA) $(PREFVAR2)$(PREFIX1).mode $(DESTDIR)$(apertium_fr_modesdir)
-+	$(INSTALL_DATA) $(PREFVAR2)$(PREFIX2).mode $(DESTDIR)$(apertium_fr_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_fr_esdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX2).t1x $(DESTDIR)$(apertium_fr_esdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t2x $(BASENAME).$(PREFIX2).t3x $(DESTDIR)$(apertium_fr_esdir)
- 
- CLEANFILES = -rf $(TARGETS) modes $(BASENAME).$(LANG1).dix *.mode  $(PREFVAR2)$(LANG1).dix \
- 		$(PREFVAR2)$(PREFIX1).automorf.bin $(PREFVAR2)$(PREFIX1).autobil.bin $(PREFVAR2)$(PREFIX1).autogen.bin \
diff --git a/pcr/apertium/apertium-fr-es/PKGBUILD b/pcr/apertium/apertium-fr-es/PKGBUILD
deleted file mode 100644
index 22c83752b..000000000
--- a/pcr/apertium/apertium-fr-es/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-fr-es
-pkgver=0.9.2
-pkgrel=1
-pkgdesc="Apertium language data for the French-Spanish translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig' 'autoconf')
-depends=('lttoolbox>=3.2.0' 'apertium>=3.2.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch")
-md5sums=('0b04ee8f1694f95adafb2589c802829e'
-         '0020317ca43e1b16f6584d7365351df0')
-
-build() {
-  patch -p0 < Makefile.am.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i	      # or we could patch the huge configure script...
-
-  export PATH="/usr/bin:${PATH}" # override /usr/local/bin
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-ht-en/Makefile.am.patch b/pcr/apertium/apertium-ht-en/Makefile.am.patch
deleted file mode 100644
index 815935806..000000000
--- a/pcr/apertium/apertium-ht-en/Makefile.am.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../apertium-ht-en-0.1.0/Makefile.am	2010-01-24 23:36:34.000000000 +0100
-+++ apertium-ht-en-0.1.0/Makefile.am	2010-09-15 14:24:05.000000000 +0200
-@@ -78,11 +78,11 @@
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
- 	rm -rf modes
- 	mv modes.bak modes
--	test -d $(apertium_ht_modesdir) || mkdir $(apertium_ht_modesdir)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_ht_modesdir)
-+	test -d $(DESTDIR)$(apertium_ht_modesdir) || mkdir $(DESTDIR)$(apertium_ht_modesdir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_ht_modesdir)
- 	rm $(PREFIX1).mode 
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(apertium_ht_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x $(apertium_ht_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(apertium_ht_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(DESTDIR)$(apertium_ht_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_ht_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(DESTDIR)$(apertium_ht_endir)
- 
- CLEANFILES = -rf $(TARGETS_COMMON) modes
diff --git a/pcr/apertium/apertium-ht-en/Makefile.in.patch b/pcr/apertium/apertium-ht-en/Makefile.in.patch
deleted file mode 100644
index 5f9f2d6cd..000000000
--- a/pcr/apertium/apertium-ht-en/Makefile.in.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../apertium-ht-en-0.1.0/Makefile.in	2010-01-24 23:37:07.000000000 +0100
-+++ apertium-ht-en-0.1.0/Makefile.in	2010-09-15 14:24:23.000000000 +0200
-@@ -567,12 +567,12 @@
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
- 	rm -rf modes
- 	mv modes.bak modes
--	test -d $(apertium_ht_modesdir) || mkdir $(apertium_ht_modesdir)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_ht_modesdir)
-+	test -d $(DESTDIR)$(apertium_ht_modesdir) || mkdir $(DESTDIR)$(apertium_ht_modesdir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_ht_modesdir)
- 	rm $(PREFIX1).mode 
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(apertium_ht_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x $(apertium_ht_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(apertium_ht_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(DESTDIR)$(apertium_ht_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_ht_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(DESTDIR)$(apertium_ht_endir)
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/pcr/apertium/apertium-ht-en/PKGBUILD b/pcr/apertium/apertium-ht-en/PKGBUILD
deleted file mode 100644
index d700f89b0..000000000
--- a/pcr/apertium/apertium-ht-en/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-ht-en
-pkgver=0.1.0
-pkgrel=1
-pkgdesc="Apertium language data for the Haitian Creole-English translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "Makefile.in.patch"
-	"t1x.patch")
-md5sums=('73d6dbbb2c1ad50b8e6c5428f4fc7a9e'
-         'e99487bbc9df970596882bdc1b152218'
-         '8625b7f9ee07b3696e71a49129db01fd'
-         'b8f420edd5577fabef485dcb6d08a5e6')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < Makefile.in.patch
-  # remove the c (comment) attribute, not in the DTD in apertium<=3.1.1:
-  patch -p0 < t1x.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-ht-en/t1x.patch b/pcr/apertium/apertium-ht-en/t1x.patch
deleted file mode 100644
index a60469dfb..000000000
--- a/pcr/apertium/apertium-ht-en/t1x.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ../apertium-ht-en-0.1.0/apertium-ht-en.ht-en.t1x	2010-01-24 23:11:45.000000000 +0100
-+++ apertium-ht-en-0.1.0/apertium-ht-en.ht-en.t1x	2010-09-15 14:25:40.000000000 +0200
-@@ -228,10 +228,7 @@
-   </section-def-lists>
-   <section-def-macros>
-     <def-macro n="set_temps_chunk" npar="1"
--               c="Guess temps for lone verbs based on stative/dynamic.
--                  In the present non-progressive tense, one just uses the basic verb form for
--                  stative verbs. Note that when the basic form of action verbs is used without any
--                  verb markers, it is generally understood as referring to the past.">
-+>
-       <choose>
-         <when>
-           <test>
diff --git a/pcr/apertium/apertium-is-en/Makefile.am.patch b/pcr/apertium/apertium-is-en/Makefile.am.patch
deleted file mode 100644
index 8e52340ae..000000000
--- a/pcr/apertium/apertium-is-en/Makefile.am.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ../apertium-is-en-0.1.0/Makefile.am	2010-03-05 13:33:18.000000000 +0100
-+++ apertium-is-en-0.1.0/Makefile.am	2010-09-15 13:54:17.000000000 +0200
-@@ -119,10 +119,10 @@
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
- 	cp *.mode modes/
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_is_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(apertium_is_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x $(apertium_is_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(apertium_is_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t4x $(apertium_is_endir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_is_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(DESTDIR)$(apertium_is_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_is_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(DESTDIR)$(apertium_is_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t4x $(DESTDIR)$(apertium_is_endir)
- 
- CLEANFILES = -rf $(TARGETS_COMMON) .deps modes
diff --git a/pcr/apertium/apertium-is-en/Makefile.in.patch b/pcr/apertium/apertium-is-en/Makefile.in.patch
deleted file mode 100644
index 98932b71f..000000000
--- a/pcr/apertium/apertium-is-en/Makefile.in.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../apertium-is-en-0.1.0/Makefile.in	2010-03-05 13:33:27.000000000 +0100
-+++ apertium-is-en-0.1.0/Makefile.in	2010-09-15 13:54:27.000000000 +0200
-@@ -534,11 +534,11 @@
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
- 	cp *.mode modes/
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_is_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(apertium_is_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x $(apertium_is_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(apertium_is_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t4x $(apertium_is_endir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_is_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(DESTDIR)$(apertium_is_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_is_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(DESTDIR)$(apertium_is_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t4x $(DESTDIR)$(apertium_is_endir)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/pcr/apertium/apertium-is-en/PKGBUILD b/pcr/apertium/apertium-is-en/PKGBUILD
deleted file mode 100644
index 35cc56d0c..000000000
--- a/pcr/apertium/apertium-is-en/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-is-en
-pkgver=0.1.0
-pkgrel=1
-pkgdesc="Apertium language data for the Icelandic-English translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.2.0' 'apertium>=3.2.0' 'vislcg3>=0.9.7.6010')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "Makefile.in.patch")
-md5sums=('a53f884fc72d69de1e57b56581258978'
-         '9b49f260b71cbd2a68b46d99e01248fe'
-         'a3974fcdb318c511a0624be504558601')
-
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < Makefile.in.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-mk-bg/Makefile.am.patch b/pcr/apertium/apertium-mk-bg/Makefile.am.patch
deleted file mode 100644
index d0819346b..000000000
--- a/pcr/apertium/apertium-mk-bg/Makefile.am.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- ../apertium-mk-bg-0.2.0/Makefile.am	2010-10-26 13:44:25.000000000 +0200
-+++ apertium-mk-bg-0.2.0/Makefile.am	2012-02-09 08:49:22.128894204 +0100
-@@ -77,7 +77,7 @@
- clean-dicts:
- 	touch $(BASENAME).$(LANG1).dix $(BASENAME).$(LANG2).dix $(BASENAME).$(PREFIX1).dix
- 	rm $(BASENAME).$(LANG1).dix
--	
-+
- apertium_mk_bgmodesdir=$(prefix)/share/apertium/modes/
- apertium_mk_bgdir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_mk_bg_DATA=$(PREFIX1).automorf.bin $(PREFIX2).automorf.bin \
-@@ -95,11 +95,11 @@
- 		    $(PREFIX1).autopgen.bin \
- 		    $(PREFIX1).mode \
- 		    $(PREFIX2).mode
--		  
-+
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_mk_bgmodesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_mk_bgmodesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX2).t1x $(apertium_mk_bgdir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_mk_bgmodesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_mk_bgmodesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX2).t1x $(DESTDIR)$(apertium_mk_bgdir)
- 
- CLEANFILES = -r $(TARGETS_COMMON) 
diff --git a/pcr/apertium/apertium-mk-bg/Makefile.in.patch b/pcr/apertium/apertium-mk-bg/Makefile.in.patch
deleted file mode 100644
index 10eeeca7c..000000000
--- a/pcr/apertium/apertium-mk-bg/Makefile.in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../apertium-mk-bg-0.2.0/Makefile.in	2010-10-26 13:44:30.000000000 +0200
-+++ apertium-mk-bg-0.2.0/Makefile.in	2012-02-09 08:49:07.935637762 +0100
-@@ -515,9 +515,9 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_mk_bgmodesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_mk_bgmodesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX2).t1x $(apertium_mk_bgdir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_mk_bgmodesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_mk_bgmodesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX2).t1x $(DESTDIR)$(apertium_mk_bgdir)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/pcr/apertium/apertium-mk-bg/PKGBUILD b/pcr/apertium/apertium-mk-bg/PKGBUILD
deleted file mode 100644
index 1225cce9a..000000000
--- a/pcr/apertium/apertium-mk-bg/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-mk-bg
-pkgver=0.2.0
-pkgrel=1
-pkgdesc="Apertium language data for the Macedonian-Bulgarian translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.2' 'apertium>=3.2' 'vislcg3>=0.9.7.6010')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "Makefile.in.patch")
-md5sums=('a0f12e989097c67eb3d3a96e06a0fa38'
-         'b66ee552f3e54e767c052cd36828e667'
-         'cbe4d1dd0f37737b3aa98fdaa3770763')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < Makefile.in.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  export PATH="/usr/bin:${PATH}" # override /usr/local/bin
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-mk-en/Makefile.am.patch b/pcr/apertium/apertium-mk-en/Makefile.am.patch
deleted file mode 100644
index 7d988dc2f..000000000
--- a/pcr/apertium/apertium-mk-en/Makefile.am.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../apertium-mk-en-0.1.1/Makefile.am	2012-02-08 22:55:49.000000000 +0100
-+++ apertium-mk-en-0.1.1/Makefile.am	2012-02-09 08:27:51.750590033 +0100
-@@ -79,7 +79,7 @@
- clean-dicts:
- 	touch $(BASENAME).$(LANG1).dix $(BASENAME).$(LANG2).dix $(BASENAME).$(PREFIX1).dix
- 	rm $(BASENAME).$(LANG1).dix
--	
-+
- apertium_mk_enmodesdir=$(prefix)/share/apertium/modes/
- apertium_mk_endir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_mk_en_DATA=$(PREFIX1).automorf.bin $(PREFIX2).automorf.bin \
-@@ -98,12 +98,12 @@
- 		    $(BASENAME).$(PREFIX1).t3x \
- 		    $(PREFIX1).autopgen.bin \
- 		    $(PREFIX1).mode 
--		  
-+
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_mk_enmodesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(apertium_mk_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x $(apertium_mk_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(apertium_mk_endir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_mk_enmodesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(DESTDIR)$(apertium_mk_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_mk_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(DESTDIR)$(apertium_mk_endir)
- 
- CLEANFILES = -r $(TARGETS_COMMON) 
diff --git a/pcr/apertium/apertium-mk-en/Makefile.in.patch b/pcr/apertium/apertium-mk-en/Makefile.in.patch
deleted file mode 100644
index 4563f9749..000000000
--- a/pcr/apertium/apertium-mk-en/Makefile.in.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ../apertium-mk-en-0.1.1/Makefile.in	2012-02-08 22:56:07.000000000 +0100
-+++ apertium-mk-en-0.1.1/Makefile.in	2012-02-09 08:27:26.272791534 +0100
-@@ -595,10 +595,10 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_mk_enmodesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(apertium_mk_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x $(apertium_mk_endir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(apertium_mk_endir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_mk_enmodesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(DESTDIR)$(apertium_mk_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t2x $(DESTDIR)$(apertium_mk_endir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t3x $(DESTDIR)$(apertium_mk_endir)
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/pcr/apertium/apertium-mk-en/PKGBUILD b/pcr/apertium/apertium-mk-en/PKGBUILD
deleted file mode 100644
index e55feaeba..000000000
--- a/pcr/apertium/apertium-mk-en/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-mk-en
-pkgver=0.1.1
-pkgrel=1
-pkgdesc="Apertium language data for the Macedonian-English translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.2' 'apertium>=3.2' 'vislcg3>=0.9.7.6010')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "Makefile.in.patch")
-md5sums=('46bd7cfcb16afeea7a731b574ae439d8'
-         'fcedcd77d631ff01f38dcfe244e6325d'
-         '44a0cf3352b887866f0e15a0eda48510')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < Makefile.in.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  export PATH="/usr/bin:${PATH}" # override /usr/local/bin
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-nn-nb/PKGBUILD b/pcr/apertium/apertium-nn-nb/PKGBUILD
deleted file mode 100644
index 44118be73..000000000
--- a/pcr/apertium/apertium-nn-nb/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-nn-nb
-pkgver=0.7.0
-pkgrel=2
-pkgdesc="Apertium language data for the Norwegian Nynorsk-Norwegian Bokmål translator."
-url="http://wiki.apertium.org/wiki/Norwegian_Nynorsk_and_Norwegian_Bokmål"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.2.0' 'apertium>=3.2.0' 'vislcg3>=0.9.7.6010')
-# TODO: This package must be recompiled for _every_ new vislcg3 release (that's just the vislcg3 policy)
-optdepends=('lttoolbox-java: for compound analysis (use mode nb-nn-cp or nb-nn_a-cp)')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz")
-md5sums=('708ece31d9017963f2adac14a30fdf62')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-oc-ca/Makefile.am.patch b/pcr/apertium/apertium-oc-ca/Makefile.am.patch
deleted file mode 100644
index 472285377..000000000
--- a/pcr/apertium/apertium-oc-ca/Makefile.am.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- ../apertium-oc-ca-1.0.5/Makefile.am	2008-07-21 13:02:56.000000000 +0200
-+++ apertium-oc-ca-1.0.5/Makefile.am	2010-09-15 16:32:22.000000000 +0200
-@@ -19,7 +19,7 @@
-                  $(PREFIX2).autogen.bin $(PREFIX2b).autogen.bin \
-                  $(PREFIX1).autopgen.bin $(PREFIX1b).autopgen.bin \
-                  $(PREFIX2).autopgen.bin $(PREFIX2b).autopgen.bin modes
--     
-+
- TARGETS = $(TARGETS_COMMON) $(PREFIX1).t1x.bin $(PREFIX1).t2x.bin $(PREFIX1).t3x.bin \
-           $(PREFIX1b).t1x.bin $(PREFIX1b).t2x.bin $(PREFIX1b).t3x.bin \
-           $(PREFIX2).t1x.bin $(PREFIX2).t2x.bin $(PREFIX2).t3x.bin \
-@@ -72,7 +72,7 @@
- 
- .deps/$(LANG2b).post.dix: $(BASENAME).post-$(LANG2).dix
- 	xsltproc --stringparam alt $(LANG1b) alt.xsl $(BASENAME).post-$(LANG2).dix >$@
--		             
-+
- $(PREFIX1).automorf.bin: .deps/$(LANG1).dix
- 	apertium-validate-dictionary .deps/$(LANG1).dix
- 	lt-comp lr .deps/$(LANG1).dix $@
-@@ -136,7 +136,7 @@
- $(PREFIX2b).autopgen.bin: .deps/$(LANG1b).post.dix
- 	apertium-validate-dictionary .deps/$(LANG1b).post.dix
- 	lt-comp lr .deps/$(LANG1b).post.dix $@
--	
-+
- $(PREFIX1).t1x: $(BASENAME).$(PREFIX1).t1x
- 	xsltproc --stringparam alt $(LANG1) alt.xsl $(BASENAME).$(PREFIX1).t1x > $@
- 	apertium-validate-transfer $@
-@@ -168,7 +168,7 @@
- $(PREFIX2b).t2x: $(BASENAME).$(PREFIX2).t2x
- 	xsltproc --stringparam alt $(LANG1b) alt.xsl $(BASENAME).$(PREFIX2).t2x > $@
- 	apertium-validate-interchunk $@
--	
-+
- $(PREFIX1).t3x: $(BASENAME).$(PREFIX1).t3x
- 	xsltproc --stringparam alt $(LANG1) alt.xsl $(BASENAME).$(PREFIX1).t3x > $@
- 	apertium-validate-postchunk $@
-@@ -233,19 +233,18 @@
-            $(BASENAME).$(PREFIX1).t1x $(BASENAME).$(PREFIX2).t1x \
-            $(BASENAME).$(PREFIX1).t2x $(BASENAME).$(PREFIX2).t2x \
-            $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX2).t3x 
--	
--                                  
-+
- modes: modes.xml Makefile.am
- 	apertium-gen-modes modes.xml
- 	@cp *.mode modes
--	
-+
- $(INSTALL_MODES): modes.xml Makefile.am
- 	apertium-gen-modes modes.xml
- 	@cp *.mode modes
- 
- apertium_oc_cadir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_oc_camodesdir=$(prefix)/share/apertium/modes/
--	           
-+
- apertium_oc_ca_DATA=$(PREFIX1).automorf.bin $(PREFIX2).automorf.bin \
-                     $(PREFIX1).autobil.bin $(PREFIX2).autobil.bin \
-                     $(PREFIX1).autogen.bin $(PREFIX2).autogen.bin \
-@@ -267,9 +266,9 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) oc-ca.mode $(apertium_oc_camodesdir)
--	$(INSTALL_DATA) ca-oc.mode $(apertium_oc_camodesdir)
--	$(INSTALL_DATA) oc_aran-ca.mode $(apertium_oc_camodesdir)
--	$(INSTALL_DATA) ca-oc_aran.mode $(apertium_oc_camodesdir)
--	
-+	$(INSTALL_DATA) oc-ca.mode $(DESTDIR)$(apertium_oc_camodesdir)
-+	$(INSTALL_DATA) ca-oc.mode $(DESTDIR)$(apertium_oc_camodesdir)
-+	$(INSTALL_DATA) oc_aran-ca.mode $(DESTDIR)$(apertium_oc_camodesdir)
-+	$(INSTALL_DATA) ca-oc_aran.mode $(DESTDIR)$(apertium_oc_camodesdir)
-+
- CLEANFILES = -r $(TARGETS)
diff --git a/pcr/apertium/apertium-oc-ca/PKGBUILD b/pcr/apertium/apertium-oc-ca/PKGBUILD
deleted file mode 100644
index 8cb7da86b..000000000
--- a/pcr/apertium/apertium-oc-ca/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-oc-ca
-pkgver=1.0.5
-pkgrel=2
-pkgdesc="Apertium language data for the Occitan-Catalan translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig' 'autoconf')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch"
-        "ca-oc.t1x.patch"
-        "oc-ca.t1x.patch")
-md5sums=('902a96a35ae43d3f9437ae92f812459e'
-         '38067f63d1bce99f424d3c49b86f2a6f'
-         '3ade075d16b703044bde8bbd8d5d4ff3'
-         '10de3a78ace592fd2d38dec074d3ec85'
-         '4cd0d20adb084351c6ee04078c22fc25')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-
-  patch -p0 < ca-oc.t1x.patch # this didn't compile when it was released even...
-  patch -p0 < oc-ca.t1x.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-oc-ca/ca-oc.t1x.patch b/pcr/apertium/apertium-oc-ca/ca-oc.t1x.patch
deleted file mode 100644
index 23cb4fedb..000000000
--- a/pcr/apertium/apertium-oc-ca/ca-oc.t1x.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- ../apertium-oc-ca-1.0.5/apertium-oc-ca.ca-oc.t1x	2008-07-21 13:02:56.000000000 +0200
-+++ apertium-oc-ca-1.0.5/apertium-oc-ca.ca-oc.t1x	2010-09-21 16:29:10.240738777 +0200
-@@ -987,7 +987,7 @@
- 			</choose>
- 			<choose><!-- aquests no són ref-->
- 				<when>
--					<test>
-+					<test><and>
- 						<equal caseless="yes">
- 							<clip pos="2" side="sl" part="pers"/>
- 							<lit-tag v="p3"/>
-@@ -996,7 +996,7 @@
- 							<clip pos="2" side="sl" part="nbr"/>
- 							<lit-tag v="sg"/>
- 						</equal>
--					</test>
-+					</and></test>
- 					<choose>
- 						<when><!-- m'ha passat-> m'a arribat-->
- 							<test>
-@@ -1202,7 +1202,7 @@
- 			</choose>
- 			<choose><!-- aquests no són ref-->
- 				<when>
--					<test>
-+					<test><and>
- 						<equal caseless="yes">
- 							<clip pos="2" side="sl" part="pers"/>
- 							<lit-tag v="p3"/>
-@@ -1211,7 +1211,7 @@
- 							<clip pos="2" side="sl" part="nbr"/>
- 							<lit-tag v="sg"/>
- 						</equal>
--					</test>
-+					</and></test>
- 					<choose>
- 						<when><!-- m'ha passat-> m'a arribat-->
- 							<test>
diff --git a/pcr/apertium/apertium-oc-ca/configure.ac.patch b/pcr/apertium/apertium-oc-ca/configure.ac.patch
deleted file mode 100644
index 54847cb1b..000000000
--- a/pcr/apertium/apertium-oc-ca/configure.ac.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ../apertium-oc-ca-1.0.5/configure.ac	2008-07-21 13:02:56.000000000 +0200
-+++ apertium-oc-ca-1.0.5/configure.ac	2010-09-15 16:41:22.000000000 +0200
-@@ -11,7 +11,7 @@
- AC_PROG_AWK
- AC_CONFIG_HEADER([config])
- 
--AC_DEFUN(PKG_CHECK_APERTIUM, [
-+AC_DEFUN([PKG_CHECK_APERTIUM], [
-   APERTIUM_VER=0
-   PKG_CHECK_MODULES(APERTIUM, apertium-1.0 >= 1.0.0,
-   [
-@@ -23,8 +23,20 @@
-           APERTIUM_VER=20
-       ],
-       [
--          PKG_CHECK_MODULES(APERTIUM, apertium-3.0 >= 3.0.0)
--          APERTIUM_VER=30
-+          PKG_CHECK_MODULES(APERTIUM, apertium-3.0 >= 3.0.0,
-+          [
-+              APERTIUM_VER=30
-+          ],
-+          [
-+              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+              [
-+                  APERTIUM_VER=31
-+              ],
-+              [
-+                  PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+                  APERTIUM_VER=32
-+              ])
-+          ])
-       ])
-   ])
-   AC_SUBST(APERTIUM_VER)
diff --git a/pcr/apertium/apertium-oc-ca/oc-ca.t1x.patch b/pcr/apertium/apertium-oc-ca/oc-ca.t1x.patch
deleted file mode 100644
index 1d4371478..000000000
--- a/pcr/apertium/apertium-oc-ca/oc-ca.t1x.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../apertium-oc-ca-1.0.5/apertium-oc-ca.oc-ca.t1x	2008-07-21 13:02:56.000000000 +0200
-+++ apertium-oc-ca-1.0.5/apertium-oc-ca.oc-ca.t1x	2010-09-15 16:49:14.000000000 +0200
-@@ -1282,7 +1282,7 @@
- 			</choose>
- 			<choose><!-- aquests no són ref-->
- 				<when>
--					<test>
-+					<test><and>
- 						<equal caseless="yes">
- 							<clip pos="2" side="sl" part="pers"/>
- 							<lit-tag v="p3"/>
-@@ -1291,7 +1291,7 @@
- 							<clip pos="2" side="sl" part="nbr"/>
- 							<lit-tag v="sg"/>
- 						</equal>
--					</test>
-+					</and></test>
- 					<choose>
- 						<when>
- 							<test>
diff --git a/pcr/apertium/apertium-oc-es/Makefile.am.patch b/pcr/apertium/apertium-oc-es/Makefile.am.patch
deleted file mode 100644
index 5afc6cd6f..000000000
--- a/pcr/apertium/apertium-oc-es/Makefile.am.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- ../apertium-oc-es-1.0.5/Makefile.am	2008-07-21 14:53:50.000000000 +0200
-+++ apertium-oc-es-1.0.5/Makefile.am	2010-09-15 16:29:38.000000000 +0200
-@@ -19,7 +19,7 @@
-                  $(PREFIX2).autogen.bin $(PREFIX2b).autogen.bin \
-                  $(PREFIX1).autopgen.bin $(PREFIX1b).autopgen.bin \
-                  $(PREFIX2).autopgen.bin $(PREFIX2b).autopgen.bin modes
--     
-+
- TARGETS = $(TARGETS_COMMON) $(PREFIX1).t1x.bin $(PREFIX1).t2x.bin $(PREFIX1).t3x.bin \
-           $(PREFIX1b).t1x.bin $(PREFIX1b).t2x.bin $(PREFIX1b).t3x.bin \
-           $(PREFIX2).t1x.bin $(PREFIX2).t2x.bin $(PREFIX2).t3x.bin \
-@@ -72,7 +72,7 @@
- 
- .deps/$(LANG2b).post.dix: $(BASENAME).post-$(LANG2).dix
- 	xsltproc --stringparam alt $(LANG1b) alt.xsl $(BASENAME).post-$(LANG2).dix >$@
--		             
-+
- $(PREFIX1).automorf.bin: .deps/$(LANG1).dix
- 	apertium-validate-dictionary .deps/$(LANG1).dix
- 	lt-comp lr .deps/$(LANG1).dix $@
-@@ -136,7 +136,7 @@
- $(PREFIX2b).autopgen.bin: .deps/$(LANG1b).post.dix
- 	apertium-validate-dictionary .deps/$(LANG1b).post.dix
- 	lt-comp lr .deps/$(LANG1b).post.dix $@
--	
-+
- $(PREFIX1).t1x: $(BASENAME).$(PREFIX1).t1x
- 	xsltproc --stringparam alt $(LANG1) alt.xsl $(BASENAME).$(PREFIX1).t1x > $@
- 	apertium-validate-transfer $@
-@@ -168,7 +168,7 @@
- $(PREFIX2b).t2x: $(BASENAME).$(PREFIX2).t2x
- 	xsltproc --stringparam alt $(LANG1b) alt.xsl $(BASENAME).$(PREFIX2).t2x > $@
- 	apertium-validate-interchunk $@
--	
-+
- $(PREFIX1).t3x: $(BASENAME).$(PREFIX1).t3x
- 	xsltproc --stringparam alt $(LANG1) alt.xsl $(BASENAME).$(PREFIX1).t3x > $@
- 	apertium-validate-postchunk $@
-@@ -234,18 +234,18 @@
- 	   $(BASENAME).$(PREFIX1).t2x $(BASENAME).$(PREFIX2).t2x \
- 	   $(BASENAME).$(PREFIX1).t3x $(BASENAME).$(PREFIX2).t3x 
- 
--                                  
-+
- modes: modes.xml Makefile.am
- 	apertium-gen-modes modes.xml
- 	@cp *.mode modes/
--	
-+
- $(INSTALL_MODES): modes.xml Makefile.am
- 	apertium-gen-modes modes.xml
- 	@cp *.mode modes/
- 
- apertium_oc_esdir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_oc_esmodesdir=$(prefix)/share/apertium/modes/
--	           
-+
- apertium_oc_es_DATA=$(PREFIX1).automorf.bin $(PREFIX2).automorf.bin \
-                     $(PREFIX1).autobil.bin $(PREFIX2).autobil.bin \
-                     $(PREFIX1).autogen.bin $(PREFIX2).autogen.bin \
-@@ -267,9 +267,9 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) oc-es.mode $(apertium_oc_esmodesdir)
--	$(INSTALL_DATA) es-oc.mode $(apertium_oc_esmodesdir)
--	$(INSTALL_DATA) oc_aran-es.mode $(apertium_oc_esmodesdir)
--	$(INSTALL_DATA) es-oc_aran.mode $(apertium_oc_esmodesdir)
--	
-+	$(INSTALL_DATA) oc-es.mode $(DESTDIR)$(apertium_oc_esmodesdir)
-+	$(INSTALL_DATA) es-oc.mode $(DESTDIR)$(apertium_oc_esmodesdir)
-+	$(INSTALL_DATA) oc_aran-es.mode $(DESTDIR)$(apertium_oc_esmodesdir)
-+	$(INSTALL_DATA) es-oc_aran.mode $(DESTDIR)$(apertium_oc_esmodesdir)
-+
- CLEANFILES = -r $(TARGETS)
diff --git a/pcr/apertium/apertium-oc-es/PKGBUILD b/pcr/apertium/apertium-oc-es/PKGBUILD
deleted file mode 100644
index c77245309..000000000
--- a/pcr/apertium/apertium-oc-es/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-oc-es
-pkgver=1.0.5
-pkgrel=1
-pkgdesc="Apertium language data for the Occitan-Spanish translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch"
-        "oc-es.t1x.patch"
-        "es-oc.t1x.patch")
-md5sums=('c3d7f9d2c5b0ee050e7219ea590c019e'
-         'a5f5705c9de36ec1ec46ab31bf148b3e'
-         '26cc63e7e3e830a5f6fd76590f5e22de'
-         'a65e5c80e5cec7490665dd4a3a232fe7'
-         'd41d8cd98f00b204e9800998ecf8427e')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-  patch -p0 < oc-es.t1x.patch
-  patch -p0 < es-oc.t1x.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-oc-es/configure.ac.patch b/pcr/apertium/apertium-oc-es/configure.ac.patch
deleted file mode 100644
index f15712550..000000000
--- a/pcr/apertium/apertium-oc-es/configure.ac.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ../apertium-oc-es-1.0.5/configure.ac	2008-07-21 14:53:50.000000000 +0200
-+++ apertium-oc-es-1.0.5/configure.ac	2010-09-15 16:57:39.000000000 +0200
-@@ -11,7 +11,7 @@
- AC_PROG_AWK
- AC_CONFIG_HEADER([config])
- 
--AC_DEFUN(PKG_CHECK_APERTIUM, [
-+AC_DEFUN([PKG_CHECK_APERTIUM], [
-   APERTIUM_VER=0
-   PKG_CHECK_MODULES(APERTIUM, apertium-1.0 >= 1.0.0,
-   [
-@@ -23,8 +23,20 @@
-           APERTIUM_VER=20
-       ],
-       [
--          PKG_CHECK_MODULES(APERTIUM, apertium-3.0 >= 3.0.0)
--          APERTIUM_VER=30
-+          PKG_CHECK_MODULES(APERTIUM, apertium-3.0 >= 3.0.0,
-+          [
-+              APERTIUM_VER=30
-+          ],
-+          [
-+              PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+              [
-+                  APERTIUM_VER=31
-+              ],
-+              [
-+                  PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+                  APERTIUM_VER=32
-+              ])
-+          ])
-       ])
-   ])
-   AC_SUBST(APERTIUM_VER)
diff --git a/pcr/apertium/apertium-oc-es/es-oc.t1x.patch b/pcr/apertium/apertium-oc-es/es-oc.t1x.patch
deleted file mode 100644
index e69de29bb..000000000
--- a/pcr/apertium/apertium-oc-es/es-oc.t1x.patch
+++ /dev/null
diff --git a/pcr/apertium/apertium-oc-es/oc-es.t1x.patch b/pcr/apertium/apertium-oc-es/oc-es.t1x.patch
deleted file mode 100644
index e6a756a76..000000000
--- a/pcr/apertium/apertium-oc-es/oc-es.t1x.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../apertium-oc-es-1.0.5/apertium-oc-es.oc-es.t1x	2008-07-18 20:19:11.000000000 +0200
-+++ apertium-oc-es-1.0.5/apertium-oc-es.oc-es.t1x	2010-09-15 17:10:00.000000000 +0200
-@@ -1189,7 +1189,7 @@
-       </choose>
-       <choose><!-- aquests no són ref-->
- 	<when>
--	  <test>
-+	  <test><and>
- 	    <equal caseless="yes">
- 	      <clip pos="2" side="sl" part="pers"/>
- 	      <lit-tag v="p3"/>
-@@ -1198,7 +1198,7 @@
- 	      <clip pos="2" side="sl" part="nbr"/>
- 	      <lit-tag v="sg"/>
- 	    </equal>
--	  </test>
-+	  </and></test>
- 	  <choose>
- 	    <when>
- 	      <test>
diff --git a/pcr/apertium/apertium-pt-ca/Makefile.am.patch b/pcr/apertium/apertium-pt-ca/Makefile.am.patch
deleted file mode 100644
index 623921ce9..000000000
--- a/pcr/apertium/apertium-pt-ca/Makefile.am.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../apertium-pt-ca-0.8.1/Makefile.am	2009-03-04 09:23:13.000000000 +0100
-+++ apertium-pt-ca-0.8.1/Makefile.am	2010-09-15 16:02:22.000000000 +0200
-@@ -69,7 +69,7 @@
- 	rm $(BASENAME).$(LANG1).dix
- 	rm $(BASENAME).$(LANG2).dix
- 	rm $(BASENAME).$(PREFIX1).dix
--	
-+
- apertium_pt_cadir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_pt_modesdir=$(prefix)/share/apertium/modes/
- 
-@@ -88,12 +88,12 @@
- 		    $(PREFIX1).t1x.bin \
- 		    $(PREFIX2).t1x.bin \
- 	            $(PREFIX1).mode $(PREFIX2).mode modes.xml
--		  
-+
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_pt_modesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_pt_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(apertium_pt_cadir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(apertium_pt_cadir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_pt_modesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_pt_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(DESTDIR)$(apertium_pt_cadir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(DESTDIR)$(apertium_pt_cadir)
- 
- CLEANFILES = -rf $(TARGETS_COMMON) modes
diff --git a/pcr/apertium/apertium-pt-ca/PKGBUILD b/pcr/apertium/apertium-pt-ca/PKGBUILD
deleted file mode 100644
index 2436273c5..000000000
--- a/pcr/apertium/apertium-pt-ca/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-pt-ca
-pkgver=0.8.1
-pkgrel=2
-pkgdesc="Apertium language data for the Portuguese-Catalan translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig' 'autoconf')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch")
-md5sums=('615df78d702ca48bf96c55f2d3eaf1f9'
-         '4faa12bc68e3f7190f71de562328872c'
-         '7db5c971f2d683acb51d44d4e5d44f67')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-pt-ca/configure.ac.patch b/pcr/apertium/apertium-pt-ca/configure.ac.patch
deleted file mode 100644
index d0d0a65aa..000000000
--- a/pcr/apertium/apertium-pt-ca/configure.ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../apertium-pt-ca-0.8.1/configure.ac	2009-03-04 09:23:25.000000000 +0100
-+++ apertium-pt-ca-0.8.1/configure.ac	2010-09-21 16:33:40.230738778 +0200
-@@ -19,8 +19,14 @@
-     APERTIUM_VER=30
-   ],
-   [
--    PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0)
--    APERTIUM_VER=31
-+    PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+    [
-+      APERTIUM_VER=31
-+    ],
-+    [
-+      PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+      APERTIUM_VER=32
-+    ])
-   ])
-   AC_SUBST(APERTIUM_VER)
- ])
diff --git a/pcr/apertium/apertium-pt-gl/Makefile.am.patch b/pcr/apertium/apertium-pt-gl/Makefile.am.patch
deleted file mode 100644
index 4bf675a5d..000000000
--- a/pcr/apertium/apertium-pt-gl/Makefile.am.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ../apertium-pt-gl-0.9.1/Makefile.am	2009-03-03 20:36:19.000000000 +0100
-+++ apertium-pt-gl-0.9.1/Makefile.am	2010-09-15 16:24:56.000000000 +0200
-@@ -49,7 +49,7 @@
- 	apertium-validate-transfer $(BASENAME).trules-$(PREFIX1).xml
- 	apertium-preprocess-transfer $(BASENAME).trules-$(PREFIX1).xml \
- 				     trules-$(PREFIX1).bin
--				     
-+
- trules-$(PREFIX2).bin: $(BASENAME).trules-$(PREFIX2).xml
- 	apertium-validate-transfer $(BASENAME).trules-$(PREFIX2).xml
- 	apertium-preprocess-transfer $(BASENAME).trules-$(PREFIX2).xml \
-@@ -68,7 +68,7 @@
- 	   $(BASENAME).trules-$(PREFIX2).xml $(PREFIX1).prob $(PREFIX2).prob \
- 	   $(PREFIX1)-latin1.prob $(PREFIX2)-latin1.prob \
- 	   modes.xml
--	   
-+
- apertium_pt_gldir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_pt_modesdir=$(prefix)/share/apertium/modes/
- apertium_pt_gl_DATA=$(PREFIX1).automorf.bin $(PREFIX2).automorf.bin \
-@@ -87,9 +87,9 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_pt_modesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_pt_modesdir)
--	$(INSTALL_DATA) $(BASENAME).trules-$(PREFIX1).xml $(apertium_pt_gldir)
--	$(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(apertium_pt_gldir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_pt_modesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_pt_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).trules-$(PREFIX1).xml $(DESTDIR)$(apertium_pt_gldir)
-+	$(INSTALL_DATA) $(BASENAME).trules-$(PREFIX2).xml $(DESTDIR)$(apertium_pt_gldir)
- 
- CLEANFILES = -rf $(TARGETS_COMMON) modes trules-$(PREFIX1).xml trules-$(PREFIX2).xml trules-$(PREFIX1).bin trules-$(PREFIX2).bin
diff --git a/pcr/apertium/apertium-pt-gl/PKGBUILD b/pcr/apertium/apertium-pt-gl/PKGBUILD
deleted file mode 100644
index 4078e56a8..000000000
--- a/pcr/apertium/apertium-pt-gl/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-pt-gl
-pkgver=0.9.1
-pkgrel=2
-pkgdesc="Apertium language data for the Portuguese-Galician translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig' 'autoconf')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch")
-md5sums=('3629d1967374f76d51ad58de24d65875'
-         'a00fb565b4270a3864f39cadcf2c1831'
-         'de1df1d4a94d1852c584b8de14207168')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-pt-gl/configure.ac.patch b/pcr/apertium/apertium-pt-gl/configure.ac.patch
deleted file mode 100644
index 29df734c4..000000000
--- a/pcr/apertium/apertium-pt-gl/configure.ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../apertium-pt-gl-0.9.1/configure.ac	2009-03-03 20:36:40.000000000 +0100
-+++ apertium-pt-gl-0.9.1/configure.ac	2010-09-21 16:37:31.294072111 +0200
-@@ -19,8 +19,14 @@
-     APERTIUM_VER=30
-   ],
-   [
--    PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0)
--    APERTIUM_VER=31
-+    PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+    [
-+      APERTIUM_VER=31
-+    ],
-+    [
-+      PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+      APERTIUM_VER=32
-+    ])
-   ])
-   AC_SUBST(APERTIUM_VER)
- ])
diff --git a/pcr/apertium/apertium-sv-da/Makefile.am.patch b/pcr/apertium/apertium-sv-da/Makefile.am.patch
deleted file mode 100644
index 13542d70c..000000000
--- a/pcr/apertium/apertium-sv-da/Makefile.am.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- ../apertium-sv-da-0.5.0/Makefile.am	2009-09-22 14:53:23.000000000 +0200
-+++ apertium-sv-da-0.5.0/Makefile.am	2010-09-15 15:34:16.000000000 +0200
-@@ -53,7 +53,7 @@
- 	apertium-validate-transfer $(BASENAME).$(PREFIX2).t1x
- 	apertium-preprocess-transfer $(BASENAME).$(PREFIX2).t1x \
- 	                             $(PREFIX2).t1x.bin
--	                             
-+
- 
- $(PREFIX1).mode: modes.xml 
- 	apertium-gen-modes modes.xml
-@@ -68,7 +68,7 @@
-            $(BASENAME).$(LANG2).dix $(BASENAME).$(LANG1).tsx \
-            $(BASENAME).$(LANG2).tsx $(BASENAME).$(PREFIX1).t1x \
-            $(BASENAME).$(PREFIX2).t1x $(PREFIX1).prob $(PREFIX2).prob modes.xml
--           
-+
- apertium_sv_modesdir=$(prefix)/share/apertium/modes/
- apertium_sv_dadir=$(prefix)/share/apertium/apertium-$(PREFIX1)/
- apertium_sv_da_DATA=$(PREFIX1).automorf.bin $(PREFIX2).automorf.bin \
-@@ -82,10 +82,10 @@
- 
- install-data-local:
- 	apertium-gen-modes modes.xml apertium-$(PREFIX1)
--	$(INSTALL_DATA) $(PREFIX1).mode $(apertium_sv_modesdir)
--	$(INSTALL_DATA) $(PREFIX2).mode $(apertium_sv_modesdir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(apertium_sv_dadir)
--	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(apertium_sv_dadir)
-+	$(INSTALL_DATA) $(PREFIX1).mode $(DESTDIR)$(apertium_sv_modesdir)
-+	$(INSTALL_DATA) $(PREFIX2).mode $(DESTDIR)$(apertium_sv_modesdir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX1).t1x $(DESTDIR)$(apertium_sv_dadir)
-+	$(INSTALL_DATA) $(BASENAME).$(PREFIX2).t1x $(DESTDIR)$(apertium_sv_dadir)
- 	cp *.mode modes/
- 
- 
diff --git a/pcr/apertium/apertium-sv-da/PKGBUILD b/pcr/apertium/apertium-sv-da/PKGBUILD
deleted file mode 100644
index bbd1b2a34..000000000
--- a/pcr/apertium/apertium-sv-da/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Kevin Brubeck Unhammer <unhammer@gmail.com>
-# Maintainer: Kevin Brubeck Unhammer <unhammer@gmail.com>
-pkgname=apertium-sv-da
-pkgver=0.5.0
-pkgrel=2
-pkgdesc="Apertium language data for the Swedish-Danish translator."
-url="http://apertium.org"
-license=('GPL')
-makedepends=('pkgconfig' 'autoconf')
-depends=('lttoolbox>=3.0' 'apertium>=3.0')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/apertium/${pkgname}-${pkgver}.tar.gz"
-        "Makefile.am.patch"
-        "configure.ac.patch")
-md5sums=('23d4247a7eb4835a096737a20251bc78'
-         '276a049384b15d77c6b5164315b593e4'
-         'ba12ab1b519a4853478cf27104639e23')
-
-build() {
-  patch -p0 < Makefile.am.patch
-  patch -p0 < configure.ac.patch
-
-  mkdir -p "$pkgdir/usr/share/apertium/modes"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  autoreconf -i
-
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="$pkgdir/" install || return 1
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
\ No newline at end of file
diff --git a/pcr/apertium/apertium-sv-da/configure.ac.patch b/pcr/apertium/apertium-sv-da/configure.ac.patch
deleted file mode 100644
index e986d2c9b..000000000
--- a/pcr/apertium/apertium-sv-da/configure.ac.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../apertium-sv-da-0.5.0/configure.ac	2009-09-22 14:47:25.000000000 +0200
-+++ apertium-sv-da-0.5.0/configure.ac	2010-09-21 16:39:20.487405444 +0200
-@@ -19,8 +19,14 @@
-     APERTIUM_VER=30
-   ],
-   [
--    PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0)
--    APERTIUM_VER=31
-+    PKG_CHECK_MODULES(APERTIUM, apertium-3.1 >= 3.1.0,
-+    [
-+      APERTIUM_VER=31
-+    ],
-+    [
-+      PKG_CHECK_MODULES(APERTIUM, apertium-3.2 >= 3.2.0)
-+      APERTIUM_VER=32
-+    ])
-   ])
-   AC_SUBST(APERTIUM_VER)
- ])