[arch-commits] Commit in keychain/repos (3 files)

[Eric Bélanger]

    Date: Sunday, February 15, 2009 @ 23:12:42
  Author: eric
Revision: 27074

fixed svn conflict

Added:
  keychain/repos/extra-i686/ChangeLog
    (from rev 27072, keychain/trunk/ChangeLog)
Modified:
  keychain/repos/extra-i686/	(properties)
  keychain/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    7 +++++++
 PKGBUILD  |   30 ++++++++----------------------
 2 files changed, 15 insertions(+), 22 deletions(-)


Property changes on: keychain/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /keychain/trunk:1
   + /keychain/trunk:1-27073

Copied: keychain/repos/extra-i686/ChangeLog (from rev 27072, keychain/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2009-02-16 04:12:42 UTC (rev 27074)
@@ -0,0 +1,7 @@
+2009-02-15  Eric Belanger  <eric at archlinux.org>
+
+	* keychain 2.6.8-3
+	* Updated source url
+	* FHS man pages
+	* Added license
+	* Added ChangeLog

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-16 04:00:50 UTC (rev 27073)
+++ extra-i686/PKGBUILD	2009-02-16 04:12:42 UTC (rev 27074)
@@ -1,35 +1,21 @@
 # $Id$
-# Maintainer: Travis Willard <travisw at wmpub.ca>
-# Maintainer: Tom Killian <tom at archlinux.org>
-# Contributer: Benjamin Andresen <benny at klapmuetz.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: Benjamin Andresen <benny at klapmuetz.org>
 
 pkgname=keychain
 pkgver=2.6.8
-pkgrel=2
+pkgrel=3
 pkgdesc="A front-end to ssh-agent, allowing one long-running ssh-agent process per system, rather than per login."
 arch=('i686' 'x86_64')
 url="http://www.gentoo.org/proj/en/keychain/"
 license=('GPL')
 depends=('bash')
-
-# Source is mirrored across all gentoo mirrors.  Some selections are:
-# USA
-#source=(http://osmirrors.cerias.purdue.edu/pub/gentoo/distfiles/$pkgname-$pkgver.tar.bz2)
-
-# Carribean
-#source=(http://www.securehost.com/mirror/gentoo/distfiles/$pkgname-$pkgver.tar.bz2)
-
-# Singapore
-#source=(http://mirror.averse.net/pub/gentoo/distfiles/$pkgname-$pkgver.tar.bz2)
-
-# Canada
-source=(http://cdot.senecac.on.ca/software/gentoo/distfiles/$pkgname-$pkgver.tar.bz2)
-
+source=(http://agriffis.n01se.net/keychain/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('2a23b311e438ecebed5639b568738d28')
+sha1sums=('0c1b645b68b9fe23bfe217963df45a033d84fe9c')
 
 build() {
-  cd $startdir/src/keychain-$pkgver
-  install -Dm0755 keychain $startdir/pkg/usr/bin/keychain
-  install -Dm0644 keychain.1 $startdir/pkg/usr/man/man1/keychain.1
+  cd ${srcdir}/${pkgname}-${pkgver}
+  install -D -m755 keychain ${pkgdir}/usr/bin/keychain
+  install -D -m644 keychain.1 ${pkgdir}/usr/share/man/man1/keychain.1
 }
-