[arch-commits] Commit in gnupg/repos (5 files)

[Gaetan Bisson]

    Date: Tuesday, March 27, 2012 @ 08:00:14
  Author: bisson
Revision: 154385

db-move: moved gnupg from [testing] to [core] (i686)

Added:
  gnupg/repos/core-i686/PKGBUILD
    (from rev 154384, gnupg/repos/testing-i686/PKGBUILD)
  gnupg/repos/core-i686/gnupg.install
    (from rev 154384, gnupg/repos/testing-i686/gnupg.install)
Deleted:
  gnupg/repos/core-i686/PKGBUILD
  gnupg/repos/core-i686/gnupg.install
  gnupg/repos/testing-i686/

---------------+
 PKGBUILD      |   80 ++++++++++++++++++++++++++++++--------------------------
 gnupg.install |   42 ++++++++++++++---------------
 2 files changed, 65 insertions(+), 57 deletions(-)

Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2012-03-27 11:56:28 UTC (rev 154384)
+++ core-i686/PKGBUILD	2012-03-27 12:00:14 UTC (rev 154385)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Committer: Judd Vinet <jvinet at zeroflux.org>
-pkgname=gnupg
-pkgver=1.4.12
-pkgrel=1
-pkgdesc="GNU Privacy Guard - a PGP replacement tool"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('zlib' 'bzip2' 'libldap>=2.4.18' 'libusb-compat' 'curl>=7.16.2' 'readline>=6.0.00')
-source=(ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg/$pkgname-$pkgver.tar.bz2)
-install=gnupg.install
-url="http://www.gnupg.org/"
-md5sums=('ce3742e5c7912559cab7894ad8ba7f6b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--libexecdir=/usr/lib \
-	--enable-noexecstack
-  make
-  #ln -s ${pkgname}-${pkgver}/scripts .. # seems obsolete now
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check #All 27 tests passed
-}
-
-package () {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  
-  # fix fileconflict with gnupg2 pkg
-  rm ${pkgdir}/usr/share/man/man1/gpg-zip.1
-}

Copied: gnupg/repos/core-i686/PKGBUILD (from rev 154384, gnupg/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD	                        (rev 0)
+++ core-i686/PKGBUILD	2012-03-27 12:00:14 UTC (rev 154385)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+
+pkgname=gnupg
+pkgver=2.0.18
+pkgrel=2
+pkgdesc='Complete and free implementation of the OpenPGP standard'
+url='http://www.gnupg.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('curl: gpg2keys_curl'
+            'libldap: gpg2keys_ldap'
+            'libusb-compat: scdaemon'
+            'texinfo: documentation')
+makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo')
+depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr')
+install=${pkgname}.install
+source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2{,.sig})
+sha1sums=('5ec2f718760cc3121970a140aeea004b64545c46'
+          'c1b15a6c204434081e2bd8249dde233b6c88c4d0')
+
+conflicts=('gnupg2')
+provides=("gnupg2=${pkgver}")
+replaces=('gnupg2')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg
+  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 gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz
+}

Deleted: core-i686/gnupg.install
===================================================================
--- core-i686/gnupg.install	2012-03-27 11:56:28 UTC (rev 154384)
+++ core-i686/gnupg.install	2012-03-27 12:00:14 UTC (rev 154385)
@@ -1,21 +0,0 @@
-info_dir=/usr/share/info
-info_files=(gnupg1.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-# vim:set ts=2 sw=2 et:

Copied: gnupg/repos/core-i686/gnupg.install (from rev 154384, gnupg/repos/testing-i686/gnupg.install)
===================================================================
--- core-i686/gnupg.install	                        (rev 0)
+++ core-i686/gnupg.install	2012-03-27 12:00:14 UTC (rev 154385)
@@ -0,0 +1,21 @@
+info_dir=/usr/share/info
+info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for f in ${info_files[@]}; do
+    usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null
+  done
+}
+# vim:set ts=2 sw=2 et: