4 files changed, 36 insertions, 28 deletions
diff --git a/misc/keychain/README b/misc/keychain/README
index 4480035fcf61..fbf30f366e3b 100644
--- a/misc/keychain/README
+++ b/misc/keychain/README
@@ -1,7 +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 
-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.
diff --git a/misc/keychain/keychain.SlackBuild b/misc/keychain/keychain.SlackBuild
index 82708ed536d2..a6f32c20cf7c 100644
--- a/misc/keychain/keychain.SlackBuild
+++ b/misc/keychain/keychain.SlackBuild
@@ -1,24 +1,36 @@
 #!/bin/sh
+# Slackware build script for keychain
 
-# Slackware build script for Keychain
-
-# 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.
+# Copyright 2010 Grigorios Bouzakis <grbzks@xsmail.com>
+# All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software for any purpose
+# with or without fee is hereby granted, provided that the above copyright
+# notice and this permission notice appear in all copies.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=keychain
 VERSION=${VERSION:-2.7.1}
-ARCH=noarch
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
+ARCH=noarch
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+DOCS="COPYING.txt ChangeLog README.rst"
+
 set -e
 
 rm -rf $PKG
@@ -34,24 +46,20 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-make all
-
-install -D -m 0755 keychain $PKG/usr/bin/keychain
-install -D -m 0644 keychain.1 $PKG/usr/man/man1/keychain.1
+make
 
-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/bin
+cat keychain > $PKG/usr/bin/keychain
+chmod 755 $PKG/usr/bin/keychain
+mkdir -p $PKG/usr/man/man1
+cat keychain.1 > $PKG/usr/man/man1/keychain.1
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING.txt ChangeLog README.rst keychain.txt VERSION \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $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$TAG
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/misc/keychain/keychain.info b/misc/keychain/keychain.info
index 778ab8a2c158..e5682eea1515 100644
--- a/misc/keychain/keychain.info
+++ b/misc/keychain/keychain.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://www.funtoo.org/archive/keychain/keychain-2.7.1.tar.bz2"
 MD5SUM="07c622833192189f483cbaec287f9704"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Menno Duursma"
-EMAIL="druiloor@zonnet.nl"
+MAINTAINER="Grigorios Bouzakis"
+EMAIL="grbzks@xsmail.com"
 APPROVED="Erik Hanson"
diff --git a/misc/keychain/slack-desc b/misc/keychain/slack-desc
index 38e73590c2ee..4ca4af44eff7 100644
--- a/misc/keychain/slack-desc
+++ b/misc/keychain/slack-desc
@@ -5,7 +5,7 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-        |-----handy-ruler----------------------------------------------------|
+        |-----handy-ruler-----------------------------------------------------|
 keychain: Keychain (front-end to SSH and GnuPG agents)
 keychain:
 keychain: It acts as a front-end to SSH and GnuPG agents, allowing