Minor facelift. No user-visible changes (except that .html doc is not

gzipped any more).

1 files changed, 27 insertions, 28 deletions

diff --git a/app-crypt/gnupg/gnupg-1.0.6.ebuild b/app-crypt/gnupg/gnupg-1.0.6.ebuild
index 271143ad5202..db49eca450ca 100644
--- a/app-crypt/gnupg/gnupg-1.0.6.ebuild
+++ b/app-crypt/gnupg/gnupg-1.0.6.ebuild
@@ -4,40 +4,41 @@
 # $Header: /home/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.0.4.ebuild,v 1.0
 # 2001/04/21 12:45 CST blutgens  Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
-SRC_URI="ftp://ftp.gnupg.org/pub/gcrypt/gnupg/${P}.tar.gz"
 HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="ftp://ftp.gnupg.org/pub/gcrypt/gnupg/${P}.tar.gz"
+S="${WORKDIR}/${P}"
 
 DEPEND="virtual/glibc
         nls? ( >=sys-devel/gettext-0.10.35 )
 	>=sys-libs/zlib-1.1.3"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-# Fix those $&*%^$%%$ info files
-	patch -p1 < ${FILESDIR}/gnupg-1.0.6.diff
+    unpack "${A}"
+    cd "${S}"
+    # Fix those $&*%^$%%$ info files
+    patch -p1 < "${FILESDIR}/gnupg-1.0.6.diff"
 }
-src_compile() {
-
-# Check to see if we're using nls
-   local myconf
-   if [ -z "`use nls`" ]; then
-	myconf="--disable-nls"
-   fi
-
-    try ./configure --prefix=/usr --mandir=/usr/share/man \
-	 --infodir=/usr/share/info --enable-static-rnd=linux \
-		--enable-m-guard --host=${CHOST}\
-	${myconf}
-    try emake
 
+src_compile() {
+    # Check to see if we're using nls
+    local myconf
+    if [ -z "`use nls`" ]; then
+        myconf="--disable-nls"
+    fi
+
+    ./configure                            \
+        --prefix=/usr                      \
+        --mandir=/usr/share/man            \
+        --infodir=/usr/share/info          \
+        --enable-static-rnd=linux          \
+        --enable-m-guard --host="${CHOST}" \
+	${myconf} || die
+    emake || die
 }
 
 src_install () {
-
-    try make DESTDIR=${D} install
+    make DESTDIR="${D}" install || die
     dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROJECTS
     dodoc README TODO VERSION
     docinto doc
@@ -45,16 +46,14 @@ src_install () {
     dodoc  FAQ HACKING DETAILS ChangeLog
     docinto sgml
     dodoc gpg.sgml gpgv.sgml
-    docinto html
-    dodoc faq.html
+    dohtml faq.html
     docinto txt
     dodoc faq.raw
-    chmod +s ${D}/usr/bin/gpg
+    chmod +s "${D}/usr/bin/gpg"
 }
 
 pkg_postinst() {
-	einfo "gpg is installed SUID root to make use of protected memory space"
-   einfo "This is needed in order to have a secure place"
-	einfo " to store yourpassphrases etc during runtime"
-   einfo "but may make some sysadmins nervous"
+    einfo "gpg is installed SUID root to make use of protected memory space"
+    einfo "This is needed in order to have a secure place to store your passphrases,"
+    einfo "etc. at runtime but may make some sysadmins nervous"
 }