4 files changed, 52 insertions, 54 deletions
diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
deleted file mode 100644
index 3cf76f09a..000000000
--- a/libre/atool-libre/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 115146 2014-07-05 17:57:54Z jlichtblau $
-# Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor (Arch): leif_thande <leif.thande@gmail.com>
-# Contributor (Arch): tranquility <trankas@gmail.com>
-# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-# Contributor: André Silva <emulatorman@parabola.nu>
-
-_pkgname=atool
-pkgname=atool-libre
-pkgver=0.39.0
-pkgrel=3
-pkgdesc="A script for managing file archives of various types, without nonfree unace and unrar support"
-arch=('any')
-url="http://www.nongnu.org/atool/"
-license=('GPL3')
-depends=('file' 'perl')
-provides=("$_pkgname=$pkgver")
-replaces=("$_pkgname")
-conflicts=("$_pkgname")
-optdepends=('bzip2: for using atool with bzip2 compressed archives'
-            'cpio: for using atool with cpio archives'
-            'gzip: for using atool with gzip compressed archives'
-            'lha: for using atool with lha, lharc and similar archives'
-            'xz: for using atool with lzma compressed archives'
-            'lzop: for using atool with lzop compressed archives'
-            'p7zip: for using atool with 7z archives'
-            'tar: for using atool with tar archives'
-            'zip: for using atool for creating zip archives'
-            'unzip: for using atool for unpacking archives')
-changelog=$_pkgname.changelog
-source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz
-        libre.patch)
-sha256sums=('aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b'
-            'c9aa3c72e4c979d236dd659f16cc1eb6841f0860e6ef4d2c90f021d6e5aca578')
-
-prepare() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  # remove nonfree unace and unrar support
-  patch -Np1 -i ../libre.patch
-}
-
-build() {
-  cd "${srcdir}"/${_pkgname}-${pkgver}
-
-  ./configure --prefix=/usr
-}
-
-package() {
-  cd "${srcdir}"/${_pkgname}-${pkgver}
-
-  make prefix="${pkgdir}"/usr install
-}
diff --git a/libre/atool/PKGBUILD b/libre/atool/PKGBUILD
new file mode 100644
index 000000000..dca366b88
--- /dev/null
+++ b/libre/atool/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 115146 2014-07-05 17:57:54Z jlichtblau $
+# Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor (Arch): leif_thande <leif.thande@gmail.com>
+# Contributor (Arch): tranquility <trankas@gmail.com>
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+# Contributor: André Silva <emulatorman@parabola.nu>
+
+pkgname=atool
+pkgver=0.39.0
+pkgrel=3.parabola1
+pkgdesc="A script for managing file archives of various types, without nonfree unace and unrar support"
+arch=('any')
+url="http://www.nongnu.org/$pkgname/"
+license=('GPL3')
+depends=('file' 'perl')
+replaces=("$pkgname-libre")
+conflicts=("$pkgname-libre")
+optdepends=("bzip2: for using $pkgname with bzip2 compressed archives"
+            "cpio: for using $pkgname with cpio archives"
+            "gzip: for using $pkgname with gzip compressed archives"
+            "lha: for using $pkgname with lha, lharc and similar archives"
+            "xz: for using $pkgname with lzma compressed archives"
+            "lzop: for using $pkgname with lzop compressed archives"
+            "p7zip: for using $pkgname with 7z archives"
+            "tar: for using $pkgname with tar archives"
+            "zip: for using $pkgname for creating zip archives"
+            "unzip: for using $pkgname for unpacking archives")
+changelog=$pkgname.changelog
+source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz
+        libre.patch)
+sha256sums=('aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b'
+            'c9aa3c72e4c979d236dd659f16cc1eb6841f0860e6ef4d2c90f021d6e5aca578')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # remove nonfree unace and unrar support
+  patch -Np1 -i ../libre.patch
+}
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  make prefix="${pkgdir}"/usr install
+}
diff --git a/libre/atool-libre/atool.changelog b/libre/atool/atool.changelog
index c61925fb0..c61925fb0 100644
--- a/libre/atool-libre/atool.changelog
+++ b/libre/atool/atool.changelog
diff --git a/libre/atool-libre/libre.patch b/libre/atool/libre.patch
index 11f3b3cb8..11f3b3cb8 100644
--- a/libre/atool-libre/libre.patch
+++ b/libre/atool/libre.patch