gnupg2 renamed gnupg

gnupg/PKGBUILD

@@ -0,0 +1,57 @@
+#
+# Platform Packages for Chakra, part of chakra-project.org
+#
+
+pkgname=gnupg
+pkgver=2.0.21
+pkgrel=1
+pkgdesc="Complete and free implementation of the OpenPGP standard"
+arch=('x86_64')
+optdepends=('curl: gpg2keys_curl'
+            'libldap: gpg2keys_ldap'
+            'libusb-compat: scdaemon')
+makedepends=('curl' 'libldap' 'libusb-compat')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr')
+license=('GPL')
+url="http://www.gnupg.org/"
+install=${pkgname}.install
+source=("ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2"
+        'protect-tool-env.patch')
+md5sums=('48c05f5dfe97cf21ae0ced811aaad750'
+         '7e5167aa042dbe18ab79d8b0df3f3cab')
+conflicts=('gnupg2')
+provides=('gnupg2')
+replaces=('gnupg2')
+         
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i ${srcdir}/protect-tool-env.patch 
+
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+	
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+	      --libexecdir=/usr/lib/gnupg \
+	      --enable-maintainer-mode \
+	      --enable-symcryptrun \
+	      --enable-gpgtar 
+  make
+}
+
+check() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR=${pkgdir} install
+  ln -s gpg2 "${pkgdir}"/usr/bin/gpg
+  ln -s gpgv2 "${pkgdir}"/usr/bin/gpgv
+  ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+  rm "${pkgdir}/usr/share/gnupg/com-certs.pem"
+}
+

gnupg2/PKGBUILD

@@ -1,44 +0,0 @@
-# Maintainer: abveritas[at]chakra-project[dot]org>
-
-pkgname=gnupg2
-pkgver=2.0.21
-pkgrel=1
-pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool"
-arch=('x86_64')
-depends=('libldap' 'curl' 'bzip2' 'zlib' 'libksba' 'libgcrypt'
-	'pth' 'libusb-compat' 'libassuan' 'texinfo' 'readline' 'pinentry' 'dirmngr')
-license=('GPL')
-url="http://www.gnupg.org/"
-install=${pkgname}.install
-source=("ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2"
-        'protect-tool-env.patch')
-md5sums=('48c05f5dfe97cf21ae0ced811aaad750'
-         '7e5167aa042dbe18ab79d8b0df3f3cab')
-
-build() {
-  cd ${srcdir}/gnupg-$pkgver
-  patch -p1 -i ${srcdir}/protect-tool-env.patch 
-	
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-	      --libexecdir=/usr/lib/gnupg \
-	      --enable-maintainer-mode \
-	      --enable-symcryptrun \
-	      --enable-gpgtar 
-  make
-}
-
-check() {
-	cd "${srcdir}/gnupg-${pkgver}"
-	make check
-}
-
-package() {
-  cd ${srcdir}/gnupg-$pkgver
-  make DESTDIR=${pkgdir} install
-  # move conflicting files
-  mv ${pkgdir}/usr/share/gnupg{,2}
-  rm -f ${pkgdir}/usr/share/info/dir
-  rm "${pkgdir}/usr/share/gnupg2/com-certs.pem"
-}
-