From eac23547da0bbfc69c824d21730a8a414e7e0309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Mon, 2 Feb 2015 05:15:53 -0200
Subject: remove custom gpg.conf, dirmngr.conf and sks-keyservers.netCA.pem
 from pacman and remove modified arch-install-scripts package for
 compatibility

---
 libre/pacman/PKGBUILD | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'libre/pacman/PKGBUILD')

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index f846fcf09..8e4bc6740 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=pacman
 pkgver=4.2.0
-pkgrel=6.parabola4
+pkgrel=6.parabola5
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -23,17 +23,13 @@ checkdepends=('python2' 'fakechroot')
 provides=("$pkgname-contrib")
 conflicts=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org')
 replaces=("$pkgname-contrib" "$pkgname-parabola" 'cacert-dot-org')
-backup=('etc/pacman.conf' 'etc/makepkg.conf' 'etc/pacman.d/gnupg/gpg.conf'
-        'etc/pacman.d/gnupg/dirmngr.conf')
+backup=('etc/pacman.conf' 'etc/makepkg.conf')
 options=('strip' 'debug')
 source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
         "$pkgname.conf."{i686,x86_64,mips64el}
         "makepkg.conf"
         "pacman-4.2.0-roundup.patch"
-        "gpg.conf"
-        "dirmngr.conf"
         "refresh-$pkgname-keys"
-        "sks-keyservers.netCA.pem"
         "makepkg-pkgrel-4.patch")
 md5sums=('184ce14f1f326fede72012cca51bba51'
          'SKIP'
@@ -42,10 +38,7 @@ md5sums=('184ce14f1f326fede72012cca51bba51'
          'a12b1a4533c170aecc8b9b8561048248'
          'ce525a9af50f1d9b824806d2e5a4f0c8'
          'abe3baaf610d9cc42b4e3748c936bbce'
-         '65da808317595b310e59f2f395f787a9'
-         'e1174020d2edf2e770857d005b7af0b9'
          '093f0779ac55ae781ba028ad74b95f84'
-         '3cfc5d2867a6672f4f629220632948f4'
          '0ee98dc38ff80ba127772f5104e18e46')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae <allan@archlinux.org>
 
@@ -125,11 +118,5 @@ package() {
 
   install -Dm644 contrib/PKGBUILD.vim "$pkgdir/usr/share/vim/vimfiles/syntax/PKGBUILD.vim"
 
-  install -Dm644 "$srcdir/gpg.conf" "$pkgdir/etc/pacman.d/gnupg/gpg.conf"
-
-  install -Dm644 "$srcdir/dirmngr.conf" "$pkgdir/etc/pacman.d/gnupg/dirmngr.conf"
-
   install -Dm755 "$srcdir/refresh-pacman-keys" "$pkgdir/etc/cron.weekly/refresh-pacman-keys"
-
-  install -Dm644 "$srcdir/sks-keyservers.netCA.pem" "$pkgdir/etc/pacman.d/gnupg/sks-keyservers.netCA.pem"
 }
-- 
cgit v1.2.3-2-g168b