4 files changed, 35 insertions, 37 deletions
diff --git a/misc/keychain/README b/misc/keychain/README
index 7e4977d8e5..4480035fcf 100644
--- a/misc/keychain/README
+++ b/misc/keychain/README
@@ -1,9 +1,7 @@
-Keychain is a manager for OpenSSH, ssh.com, Sun SSH and GnuPG agents.
-It acts as a front-end to the agents, allowing you to easily have one
-long-running agent process per system, rather than per login session.
-This dramatically reduces the number of times you need to enter your
-passphrase from once per new login session to once every time your
-local machine is rebooted.
+Keychain is a manager for OpenSSH, ssh.com, Sun SSH and GnuPG agents.  It 
+acts as a front-end to the agents, allowing you to easily have one long
+running agent process per system, rather than per login session.  This 
+reduces the number of times you need to enter your passphrase from once 
+per new login session to once every time your local machine is rebooted.
 
-This allows 'cron' jobs to use 'ssh' scripts in a friendly
-(yet secure) manner.
+This allows 'cron' jobs to use 'ssh' scripts in a friendly yet secure manner.
diff --git a/misc/keychain/keychain.SlackBuild b/misc/keychain/keychain.SlackBuild
index 1d9551f3f3..b455f16bd6 100644
--- a/misc/keychain/keychain.SlackBuild
+++ b/misc/keychain/keychain.SlackBuild
@@ -1,11 +1,16 @@
 #!/bin/sh
 
 # Slackware build script for Keychain
-# Written by Menno E. Duursma
+
+# Written by Menno Duursma <druiloor@zonnet.nl>
+
+# This program is free software. It comes without any warranty.
+# Granted WTFPL, Version 2, as published by Sam Hocevar. See
+# http://sam.zoy.org/wtfpl/COPYING for more details.
 
 PRGNAM=keychain
-VERSION=2.6.8
-ARCH=${ARCH:-noarch}
+VERSION=2.7.0
+ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -14,19 +19,13 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-fi
-
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.*z*
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -35,24 +34,23 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-mkdir -p $PKG/usr/bin
-install -m0755 keychain $PKG/usr/bin/keychain
+make all
 
-mkdir -p $PKG/usr/man/man1
-install -m0644 keychain.1 $PKG/usr/man/man1/keychain.1
+install -D -m 0755 keychain $PKG/usr/bin/keychain
+install -D -m 0644 keychain.1.gz $PKG/usr/man/man1/keychain.1.gz
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+install -D -m 0644 img/keychain-1.png $PKG/usr/share/pixmaps/keychain-1.png
+install -D -m 0644 img/keychain-2.png $PKG/usr/share/pixmaps/keychain-2.png
+# For creating a KDE desktop-entry maybe read this post:
+# http://linux.derkeiler.com/Mailing-Lists/SuSE/2008-12/msg02640.html
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a [A-Z][A-Z]* ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING.txt ChangeLog README.rst keychain.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README  > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/misc/keychain/keychain.info b/misc/keychain/keychain.info
index 6e867021c1..4b9afc722f 100644
--- a/misc/keychain/keychain.info
+++ b/misc/keychain/keychain.info
@@ -1,8 +1,10 @@
 PRGNAM="keychain"
-VERSION="2.6.8"
-HOMEPAGE="http://agriffis.n01se.net/keychain"
-DOWNLOAD="http://agriffis.n01se.net/keychain/keychain-2.6.8.tar.bz2"
-MD5SUM="2a23b311e438ecebed5639b568738d28"
-MAINTAINER="Menno E. Duursma"
+VERSION="2.7.0"
+HOMEPAGE="http://www.funtoo.org/en/security/keychain/intro/"
+DOWNLOAD="http://www.funtoo.org/archive/keychain/keychain-2.7.0.tar.bz2"
+MD5SUM="c5eecd36130d9e8617a77f96b746982d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Menno Duursma"
 EMAIL="druiloor@zonnet.nl"
-APPROVED="David Somero"
+APPROVED="dsomero"
diff --git a/misc/keychain/slack-desc b/misc/keychain/slack-desc
index 7e2cb122c2..38e73590c2 100644
--- a/misc/keychain/slack-desc
+++ b/misc/keychain/slack-desc
@@ -15,5 +15,5 @@ keychain:
 keychain: This allows 'cron' jobs to use 'ssh' scripts in a friendly
 keychain: (yet secure) manner.
 keychain:
-keychain:
+keychain: Keychain was created and is currently maintained by Daniel Robbins
 keychain: