9 files changed, 28 insertions, 31 deletions
diff --git a/libre/pacman-parabola/PKGBUILD b/libre/pacman/PKGBUILD
index 195250db0..2fd4986f7 100644
--- a/libre/pacman-parabola/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,12 +1,12 @@
-# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 211992 2014-05-04 02:54:25Z allan $
 # Maintainer (Arch): Dan McGee <dan@archlinux.org>
 # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 
-_pkgname=pacman
-pkgname=pacman-parabola
+pkgname=pacman
 pkgver=4.1.2
-pkgrel=6.2
+pkgrel=6.parabola1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -17,20 +17,18 @@ depends=('bash>=4.2.042-2' 'glibc>=2.17-2' 'libarchive>=3.1.2' 'curl>=7.19.4'
 makedepends=('asciidoc') # build man pages
 checkdepends=('python2' 'fakechroot')
 optdepends=('fakeroot: for makepkg usage as normal user')
-provides=('pacman-contrib' "$_pkgname=$pkgver")
-conflicts=('pacman-contrib' "$_pkgname")
-replaces=('pacman-contrib' "$_pkgname")
-backup=(etc/pacman.conf etc/makepkg.conf)
+provides=("$pkgname-contrib")
+conflicts=("$pkgname-contrib" "$pkgname-parabola")
+replaces=("$pkgname-contrib" "$pkgname-parabola")
+backup=('etc/pacman.conf' 'etc/makepkg.conf')
 options=('strip' 'debug')
-source=(ftp://ftp.archlinux.org/other/pacman/$_pkgname-$pkgver.tar.gz{,.sig}
-        pacman.conf.i686
-        pacman.conf.x86_64
-        pacman.conf.mips64el
-        makepkg.conf
-        gpg.conf
-        sks-keyservers.netCA.pem
-        makepkg-pkgrel-4.patch
-        refresh-pacman-keys)
+source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        "$pkgname.conf."{i686,x86_64,mips64el}
+        "makepkg.conf"
+        "gpg.conf"
+        "sks-keyservers.netCA.pem"
+        "makepkg-pkgrel-4.patch"
+        "refresh-$pkgname-keys")
 md5sums=('063c8b0ff6bdf903dc235445525627cd'
          'SKIP'
          '688feb0a552f42643a76f72e7198bfe4'
@@ -43,56 +41,53 @@ md5sums=('063c8b0ff6bdf903dc235445525627cd'
          '093f0779ac55ae781ba028ad74b95f84')
 
 prepare(){
-  cd "$_pkgname-$pkgver"
-  patch -Np1 -i $srcdir/makepkg-pkgrel-4.patch
+  cd "$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/makepkg-pkgrel-4.patch"
 }
 
 build() {
-  cd "$_pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var --enable-doc \
     --with-scriptlet-shell=/usr/bin/bash \
-    --with-ldconfig=/usr/bin/ldconfig # \
-  # --disable-doc # disable man pages, fix without asciidoc (a2x binary)
+    --with-ldconfig=/usr/bin/ldconfig
   make
   make -C contrib
 }
 
 #check() {
-#  make -C "$_pkgname-$pkgver" check
+#  make -C "$pkgname-$pkgver" check
 #}
 
 package() {
-  cd "$_pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir" -C contrib install
 
-  # install Arch specific stuff
+  # install Parabola specific stuff
   install -dm755 "$pkgdir/etc"
-  install -m644 "$srcdir/pacman.conf.$CARCH" "$pkgdir/etc/pacman.conf"
+  install -m644 "$srcdir/$pkgname.conf.$CARCH" "$pkgdir/etc/$pkgname.conf"
 
   case $CARCH in
     i686)
       mycarch="i686"
       mychost="i686-pc-linux-gnu"
       myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
-      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
       ;;
     x86_64)
       mycarch="x86_64"
       mychost="x86_64-unknown-linux-gnu"
       myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
-      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
       ;;
     mips64el)
       mycarch="mips64el"
       mychost="mips64el-unknown-linux-gnu"
-      myflags="-O2 -march=mips3 -mtune=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector-strong --param=ssp-buffer-size=4"
-      myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
+      myflags="-march=mips3 -mtune=loongson2f -mabi=n32 -mplt -O2 -pipe -fstack-protector-strong --param=ssp-buffer-size=4"
       ;;
   esac
+  myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
 
   # set things correctly in the default conf file
   install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
@@ -122,3 +117,5 @@ package() {
   install -Dm644 "${srcdir}/gpg.conf" \
                  "${pkgdir}/etc/pacman.d/gpg.conf"
 }
+
+# vim: set ts=2 sw=2 et:
diff --git a/libre/pacman-parabola/gpg.conf b/libre/pacman/gpg.conf
index 7fc6fc661..7fc6fc661 100644
--- a/libre/pacman-parabola/gpg.conf
+++ b/libre/pacman/gpg.conf
diff --git a/libre/pacman-parabola/makepkg-pkgrel-4.patch b/libre/pacman/makepkg-pkgrel-4.patch
index 4024b0ad6..4024b0ad6 100644
--- a/libre/pacman-parabola/makepkg-pkgrel-4.patch
+++ b/libre/pacman/makepkg-pkgrel-4.patch
diff --git a/libre/pacman-parabola/makepkg.conf b/libre/pacman/makepkg.conf
index 758d7d029..758d7d029 100644
--- a/libre/pacman-parabola/makepkg.conf
+++ b/libre/pacman/makepkg.conf
diff --git a/libre/pacman-parabola/pacman.conf.i686 b/libre/pacman/pacman.conf.i686
index 84cec630c..84cec630c 100644
--- a/libre/pacman-parabola/pacman.conf.i686
+++ b/libre/pacman/pacman.conf.i686
diff --git a/libre/pacman-parabola/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el
index 604040640..604040640 100644
--- a/libre/pacman-parabola/pacman.conf.mips64el
+++ b/libre/pacman/pacman.conf.mips64el
diff --git a/libre/pacman-parabola/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
index 03a8cf3a6..03a8cf3a6 100644
--- a/libre/pacman-parabola/pacman.conf.x86_64
+++ b/libre/pacman/pacman.conf.x86_64
diff --git a/libre/pacman-parabola/refresh-pacman-keys b/libre/pacman/refresh-pacman-keys
index e96dc34e5..e96dc34e5 100644
--- a/libre/pacman-parabola/refresh-pacman-keys
+++ b/libre/pacman/refresh-pacman-keys
diff --git a/libre/pacman-parabola/sks-keyservers.netCA.pem b/libre/pacman/sks-keyservers.netCA.pem
index 24a2ad2e8..24a2ad2e8 100644
--- a/libre/pacman-parabola/sks-keyservers.netCA.pem
+++ b/libre/pacman/sks-keyservers.netCA.pem