dont install stupid COPYING file

33 files changed, 186 insertions, 232 deletions

diff --git a/app-crypt/calcchecksum/calcchecksum-1.6_pre1.ebuild b/app-crypt/calcchecksum/calcchecksum-1.6_pre1.ebuild
index aa3672926a26..41aa8be6413a 100644
--- a/app-crypt/calcchecksum/calcchecksum-1.6_pre1.ebuild
+++ b/app-crypt/calcchecksum/calcchecksum-1.6_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/calcchecksum/calcchecksum-1.6_pre1.ebuild,v 1.2 2004/05/16 21:22:09 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/calcchecksum/calcchecksum-1.6_pre1.ebuild,v 1.3 2004/05/31 20:34:33 vapier Exp $
 
 inherit kde-base
 need-kde 3.1
@@ -12,18 +12,15 @@ HOMEPAGE="http://calcchecksum.sourceforge.net/"
 SRC_URI="mirror://sourceforge/calcchecksum/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
-
 IUSE=""
-SLOT="0"
 
 DEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
-
 src_install() {
 	einstall || die
-	dodoc AUTHORS BUGS ChangeLog COPYING COPYING.LIB INSTALL README TODO VERSION
+	dodoc AUTHORS BUGS ChangeLog INSTALL README TODO VERSION
 }
-
diff --git a/app-crypt/cryptoapi/cryptoapi-2.4.7.0.ebuild b/app-crypt/cryptoapi/cryptoapi-2.4.7.0.ebuild
index b3fd1101de32..ec01dc1f3e68 100644
--- a/app-crypt/cryptoapi/cryptoapi-2.4.7.0.ebuild
+++ b/app-crypt/cryptoapi/cryptoapi-2.4.7.0.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/cryptoapi/cryptoapi-2.4.7.0.ebuild,v 1.20 2004/04/25 21:53:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/cryptoapi/cryptoapi-2.4.7.0.ebuild,v 1.21 2004/05/31 20:34:33 vapier Exp $
 
 inherit check-kernel
 
 DESCRIPTION="Modules that add encryption ability at the kernel level."
-SRC_URI="mirror://sourceforge/cryptoapi/${P}.tar.gz"
 HOMEPAGE="http://www.sourceforge.net/projects/cryptoapi"
+SRC_URI="mirror://sourceforge/cryptoapi/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 -ppc"
+IUSE=""
 
 DEPEND=">=sys-apps/util-linux-2.11o-r2
 	virtual/linux-sources
@@ -40,7 +41,7 @@ src_install() {
 	dodir ${D}/lib/modules/${KV}/misc
 	make MODLIB=${D}/lib/modules/${KV}/misc install || die
 
-	dodoc AUTHORS COPYING ChangeLog INSTALL LICENSE.crypto
+	dodoc AUTHORS ChangeLog INSTALL LICENSE.crypto
 	dodoc NEWS README* TODO doc/* doc/utils/*
 }
 
diff --git a/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild b/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild
index 124c8abf2a83..470273002e21 100644
--- a/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild,v 1.11 2004/04/25 21:55:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r2.ebuild,v 1.12 2004/05/31 20:34:33 vapier Exp $
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 alpha ~sparc hppa ia64"
+SLOT="0"
+KEYWORDS="x86 ~sparc alpha hppa ia64"
 IUSE="X zlib ldap nls"
 
 DEPEND="dev-lang/perl
@@ -32,7 +32,7 @@ src_compile() {
 	fi
 
 	econf ${myconf} --libexecdir=/usr/lib || die "econf failed"
-	emake
+	emake || die
 }
 
 src_install() {
@@ -40,8 +40,8 @@ src_install() {
 
 	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
 
-	dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROJECTS \
-	README THANKS TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS PROJECTS README THANKS \
+		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
 
 	docinto sgml
 	dodoc doc/*.sgml
diff --git a/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild b/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild
index ba8da13294a5..56ef54dd2c47 100644
--- a/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild,v 1.8 2004/03/13 12:37:49 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.3-r5.ebuild,v 1.9 2004/05/31 20:34:33 vapier Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64"
 IUSE="X ldap nls static caps"
 
@@ -20,7 +21,6 @@ RDEPEND="!static? ( ldap? ( net-nds/openldap )
 	virtual/glibc
 	dev-lang/perl
 	virtual/mta"
-
 # XXX: libpcap earlier than 1.10-r3 did not provide libcap.a
 #	DEPEND="caps? ( static? ( >=sys-libs/libcap-1.10-r3 )
 #				!static? ( sys-libs/libcap ) )
@@ -31,14 +31,6 @@ DEPEND="caps? ( sys-libs/libcap )
 	virtual/glibc
 	dev-lang/perl"
 
-# Certain sparc32 machines seem to have trouble building correctly with 
-# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-# fix until the gcc problem can be tracked down.
-
-if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-	filter-flags "-mcpu=supersparc -mcpu=v8 -mcpu=v7"
-fi
-
 src_unpack() {
 	unpack ${A}
 
@@ -57,6 +49,13 @@ src_unpack() {
 }
 
 src_compile() {
+	# Certain sparc32 machines seem to have trouble building correctly with 
+	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
+	# fix until the gcc problem can be tracked down.
+	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
+		filter-flags "-mcpu=supersparc -mcpu=v8 -mcpu=v7"
+	fi
+
 	# support for external HKP keyservers requested in #16457.
 	# gpg faq entry 3.3 reccommends using --enable-static-rnd=linux 
 	# whenever possible.
@@ -106,8 +105,8 @@ src_install() {
 	# keep the documentation in /usr/share/doc/...
 	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
 
-	dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROJECTS \
-	README THANKS TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS PROJECTS README THANKS \
+		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
 
 	newdoc ${FILESDIR}/${P}-disable-elgamal.diff README.elgamal
 
diff --git a/app-crypt/gnupg/gnupg-1.2.4.ebuild b/app-crypt/gnupg/gnupg-1.2.4.ebuild
index ef3dc89cfa18..1921fe61349c 100644
--- a/app-crypt/gnupg/gnupg-1.2.4.ebuild
+++ b/app-crypt/gnupg/gnupg-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.17 2004/04/28 22:05:18 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.2.4.ebuild,v 1.18 2004/05/31 20:34:33 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -8,11 +8,10 @@ DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/gnupg/${P}.tar.bz2
 	idea? ( ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz )"
-SLOT="0"
 
 LICENSE="GPL-2 | IDEA GPL-2"
-
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ~mips"
+SLOT="0"
+KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ia64"
 IUSE="X ldap nls static caps idea"
 
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
@@ -23,7 +22,6 @@ RDEPEND="!static? ( ldap? ( net-nds/openldap )
 	nls? ( sys-devel/gettext )
 	virtual/glibc
 	dev-lang/perl"
-
 # XXX: libpcap earlier than 1.10-r3 did not provide libcap.a
 #	DEPEND="caps? ( static? ( >=sys-libs/libcap-1.10-r3 )
 #				!static? ( sys-libs/libcap ) )
@@ -35,14 +33,6 @@ DEPEND="caps? ( sys-libs/libcap )
 	virtual/glibc
 	dev-lang/perl"
 
-# Certain sparc32 machines seem to have trouble building correctly with 
-# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
-# fix until the gcc problem can be tracked down.
-
-if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
-	filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
-fi
-
 src_unpack() {
 	unpack ${A}
 
@@ -59,6 +49,13 @@ src_unpack() {
 }
 
 src_compile() {
+	# Certain sparc32 machines seem to have trouble building correctly with 
+	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
+	# fix until the gcc problem can be tracked down.
+	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
+		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
+	fi
+
 	# support for external HKP keyservers requested in #16457.
 	local myconf="--enable-external-hkp --enable-static-rnd=linux --libexecdir=/usr/lib --enable-sha512"
 
@@ -106,8 +103,8 @@ src_install() {
 	# keep the documentation in /usr/share/doc/...
 	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
 
-	dodoc ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROJECTS \
-	README THANKS TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS PROJECTS README THANKS \
+		TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
 
 	use idea && dodoc ${S}/cipher/idea.c
 
diff --git a/app-crypt/gnupg/gnupg-1.9.0.ebuild b/app-crypt/gnupg/gnupg-1.9.0.ebuild
index 17b304e8782c..f0c55c34e084 100644
--- a/app-crypt/gnupg/gnupg-1.9.0.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.0.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.0.ebuild,v 1.4 2004/04/25 03:40:11 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.0.ebuild,v 1.5 2004/05/31 20:34:33 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2 | GPL-2 IDEA"
 
-KEYWORDS="~x86 ~alpha ~mips"
+LICENSE="GPL-2 | GPL-2 IDEA"
+SLOT="0"
+KEYWORDS="~x86 ~mips ~alpha"
 IUSE="X ldap nls caps"
 
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
@@ -24,7 +24,6 @@ RDEPEND="!static? ( ldap? ( net-nds/openldap )
 	dev-lang/perl
 	dev-libs/pth
 	virtual/mta"
-
 DEPEND="caps? ( sys-libs/libcap )
 	ldap? ( net-nds/openldap )
 	nls? ( sys-devel/gettext )
@@ -75,8 +74,8 @@ src_install() {
 	# keep the documentation in /usr/share/doc/...
 	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
 
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS \
-	README THANKS TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
+	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO VERSION \
+		doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
 
 	if ! use caps; then
 		chmod u+s "${D}/usr/bin/gpg"
diff --git a/app-crypt/gnupg/gnupg-1.9.8.ebuild b/app-crypt/gnupg/gnupg-1.9.8.ebuild
index 4ca1cacb14eb..a9721967d7f5 100644
--- a/app-crypt/gnupg/gnupg-1.9.8.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.8.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.8.ebuild,v 1.2 2004/05/05 17:43:05 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.8.ebuild,v 1.3 2004/05/31 20:34:33 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2 | GPL-2 IDEA"
 
-KEYWORDS="~x86 ~alpha ~mips"
+LICENSE="GPL-2 | GPL-2 IDEA"
+SLOT="0"
+KEYWORDS="~x86 ~mips ~alpha"
 IUSE="X ldap nls caps"
 
 RDEPEND="!static? ( ldap? ( net-nds/openldap )
@@ -24,7 +24,6 @@ RDEPEND="!static? ( ldap? ( net-nds/openldap )
 	dev-lang/perl
 	dev-libs/pth
 	virtual/mta"
-
 DEPEND="caps? ( sys-libs/libcap )
 	ldap? ( net-nds/openldap )
 	nls? ( sys-devel/gettext )
@@ -75,8 +74,8 @@ src_install() {
 	# keep the documentation in /usr/share/doc/...
 	rm -rf "${D}/usr/share/gnupg/FAQ" "${D}/usr/share/gnupg/faq.html"
 
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS \
-	README THANKS TODO VERSION doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
+	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO VERSION \
+		doc/{FAQ,HACKING,DETAILS,ChangeLog,OpenPGP,faq.raw}
 
 	if ! use caps; then
 		chmod u+s "${D}/usr/bin/gpg"
diff --git a/app-crypt/gpa/gpa-0.6.1.ebuild b/app-crypt/gpa/gpa-0.6.1.ebuild
index 01f0f9e0ed7e..6c03b4f38aa2 100644
--- a/app-crypt/gpa/gpa-0.6.1.ebuild
+++ b/app-crypt/gpa/gpa-0.6.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpa/gpa-0.6.1.ebuild,v 1.8 2004/04/25 21:57:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpa/gpa-0.6.1.ebuild,v 1.9 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="Standard GUI for GnuPG"
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gpa/${P}.tar.gz"
 HOMEPAGE="http://www.gnupg.org/(en)/related_software/gpa/index.html"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gpa/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc"
 IUSE="nls"
 
@@ -16,15 +16,12 @@ DEPEND=">=x11-libs/gtk+-2.0*
 	>=app-crypt/gpgme-0.4*
 	nls? ( sys-devel/gettext )"
 
-
 src_compile() {
 	GPGME_CONFIG=/usr/bin/gpgme4-config econf `use_enable nls` || die "econf failed"
-
 	emake || die
 }
 
 src_install() {
-	einstall
-	dodoc AUTHORS COPYING ChangeLog README NEWS TODO
+	einstall || die
+	dodoc AUTHORS ChangeLog README NEWS TODO
 }
-
diff --git a/app-crypt/gpgme/gpgme-0.3.14.ebuild b/app-crypt/gpgme/gpgme-0.3.14.ebuild
index 2f1d0332a89a..b56f42151aaa 100644
--- a/app-crypt/gpgme/gpgme-0.3.14.ebuild
+++ b/app-crypt/gpgme/gpgme-0.3.14.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.14.ebuild,v 1.13 2004/04/25 21:59:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.3.14.ebuild,v 1.14 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications."
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/gpgme/${P}.tar.gz"
 HOMEPAGE="http://www.gnupg.org/gpgme.html"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/gpgme/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc hppa alpha amd64 ia64"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
+IUSE="nls crypt doc"
 
 DEPEND=">=sys-libs/zlib-1.1.3
 	>=app-crypt/gnupg-1.0.7
 	sys-apps/gawk
 	sys-devel/libtool
 	sys-devel/gcc"
-
 #	crypt? ( app-crypt/gpgsm )"
 RDEPEND="nls? ( sys-devel/gettext )"
-IUSE="nls crypt doc"
 
 src_compile() {
 	local myconf
@@ -35,5 +34,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README README-alpha THANKS TODO VERSION
+	dodoc AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS TODO VERSION
 }
diff --git a/app-crypt/gpgme/gpgme-0.4.0.ebuild b/app-crypt/gpgme/gpgme-0.4.0.ebuild
index a7f5b348ce26..5863668abf18 100644
--- a/app-crypt/gpgme/gpgme-0.4.0.ebuild
+++ b/app-crypt/gpgme/gpgme-0.4.0.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.4.0.ebuild,v 1.15 2004/04/25 21:59:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-0.4.0.ebuild,v 1.16 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications."
-SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/${P}.tar.gz"
 HOMEPAGE="http://www.gnupg.org/(en)/related_software/gpgme/index.html"
+SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc hppa alpha sparc amd64 ia64"
+SLOT="0.4"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
+IUSE="nls crypt doc"
 
 DEPEND=">=sys-libs/zlib-1.1.3
 	>=app-crypt/gnupg-1.2*
 	sys-apps/gawk
 	sys-devel/libtool
 	sys-devel/gcc"
-
 RDEPEND="nls? ( sys-devel/gettext )"
-SLOT="0.4"
-IUSE="nls crypt doc"
 
 src_unpack() {
 	unpack ${A}
@@ -38,7 +37,8 @@ src_unpack() {
 }
 
 src_compile() {
-	econf	$(use_enable nls) \
+	econf\
+		$(use_enable nls) \
 		$(use_enable crypt gpgmeplug) \
 		$(use_enable doc maintainer-mode) || die "econf failed"
 	emake || die
@@ -46,7 +46,7 @@ src_compile() {
 
 src_install() {
 	make includedir="/usr/include/gpgme4" DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README README-alpha THANKS TODO VERSION
+	dodoc AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS TODO VERSION
 
 	mv ${D}/usr/bin/gpgme-config ${D}/usr/bin/gpgme4-config
 	for x in $(find ${D}/usr/share/info -name gpgme.\*)
diff --git a/app-crypt/gringotts/gringotts-0.6.2.ebuild b/app-crypt/gringotts/gringotts-0.6.2.ebuild
index 2819973e2eb2..fc151259ee98 100644
--- a/app-crypt/gringotts/gringotts-0.6.2.ebuild
+++ b/app-crypt/gringotts/gringotts-0.6.2.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/gringotts-0.6.2.ebuild,v 1.7 2004/04/26 15:42:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/gringotts-0.6.2.ebuild,v 1.8 2004/05/31 20:34:34 vapier Exp $
 
-DESCRIPTION="Gringotts is a utility that allows you to jot down sensitive data"
-SRC_URI="http://devel.pluto.linux.it/projects/Gringotts/current/${P}.tar.bz2"
+DESCRIPTION="utility that allows you to jot down sensitive data"
 HOMEPAGE="http://devel.pluto.linux.it/projects/Gringotts/"
+SRC_URI="http://devel.pluto.linux.it/projects/Gringotts/current/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.0.6-r1
 	>=x11-libs/gtk+-2.0.6-r1
@@ -18,12 +19,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.17
 	>=dev-util/pkgconfig-0.12.0"
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die
-}
-
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc COPYING ChangeLog README AUTHORS
+	dodoc ChangeLog README AUTHORS
 }
diff --git a/app-crypt/gringotts/gringotts-1.2.7.ebuild b/app-crypt/gringotts/gringotts-1.2.7.ebuild
index 2f158a8a6e95..0613ce7447ab 100644
--- a/app-crypt/gringotts/gringotts-1.2.7.ebuild
+++ b/app-crypt/gringotts/gringotts-1.2.7.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/gringotts-1.2.7.ebuild,v 1.3 2004/01/25 12:30:28 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/gringotts-1.2.7.ebuild,v 1.4 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="Utility that allows you to jot down sensitive data"
-SRC_URI="http://devel.pluto.linux.it/projects/Gringotts/current/${P}.tar.bz2"
 HOMEPAGE="http://devel.pluto.linux.it/projects/Gringotts/"
+SRC_URI="http://devel.pluto.linux.it/projects/Gringotts/current/${P}.tar.bz2"
 
-IUSE=""
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc"
+IUSE=""
 
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	>=dev-libs/libgringotts-1.2.0
@@ -18,11 +18,11 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 	sys-apps/textutils"
 
 src_install() {
-	einstall
+	einstall || die
 
 	# The FAQ and README documents shouldn't be gzip'd, as they need to be
 	# available in plain format when they are called from the `Help' menu.
 	#
 	# dodoc FAQ README
-	dodoc AUTHORS BUGS ChangeLog COPYING TODO
+	dodoc AUTHORS BUGS ChangeLog TODO
 }
diff --git a/app-crypt/gringotts/gringotts-1.2.8.ebuild b/app-crypt/gringotts/gringotts-1.2.8.ebuild
index 1b4d9e902346..a036672990ae 100644
--- a/app-crypt/gringotts/gringotts-1.2.8.ebuild
+++ b/app-crypt/gringotts/gringotts-1.2.8.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/gringotts-1.2.8.ebuild,v 1.3 2004/05/27 14:52:44 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/gringotts-1.2.8.ebuild,v 1.4 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="Utility that allows you to jot down sensitive data"
-SRC_URI="http://devel.pluto.linux.it/projects/Gringotts/current/${P}.tar.bz2"
 HOMEPAGE="http://devel.pluto.linux.it/projects/Gringotts/"
-LICENSE="GPL-2"
+SRC_URI="http://devel.pluto.linux.it/projects/Gringotts/current/${P}.tar.bz2"
 
-IUSE=""
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
+IUSE=""
 
 RDEPEND=">=dev-libs/libgringotts-1.2
 	>=x11-libs/gtk+-2
 	dev-libs/popt"
-
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	dev-util/pkgconfig"
@@ -28,11 +27,11 @@ src_unpack() {
 }
 
 src_install() {
-	einstall
+	einstall || die
 
 	# The FAQ and README documents shouldn't be gzip'd, as they need to be
 	# available in plain format when they are called from the `Help' menu.
 	#
 	# dodoc FAQ README
-	dodoc AUTHORS BUGS ChangeLog COPYING TODO
+	dodoc AUTHORS BUGS ChangeLog TODO
 }
diff --git a/app-crypt/keylookup/keylookup-2.2.ebuild b/app-crypt/keylookup/keylookup-2.2.ebuild
index c3029da1cbb7..59fa41e203ec 100644
--- a/app-crypt/keylookup/keylookup-2.2.ebuild
+++ b/app-crypt/keylookup/keylookup-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/keylookup/keylookup-2.2.ebuild,v 1.6 2004/03/13 21:50:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/keylookup/keylookup-2.2.ebuild,v 1.7 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="A tool to fetch PGP keys from keyservers"
 HOMEPAGE="http://www.palfrader.org/keylookup/"
@@ -9,12 +9,13 @@ SRC_URI="http://www.palfrader.org/keylookup/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
+IUSE=""
 
 RDEPEND="dev-lang/perl
 	app-crypt/gnupg"
 
 src_install() {
-	dobin keylookup
+	dobin keylookup || die
 	doman keylookup.1
-	dodoc COPYING ChangeLog NEWS TODO
+	dodoc ChangeLog NEWS TODO
 }
diff --git a/app-crypt/mcrypt/mcrypt-2.6.2.ebuild b/app-crypt/mcrypt/mcrypt-2.6.2.ebuild
index 56fb9bca18ca..c19e713c6632 100644
--- a/app-crypt/mcrypt/mcrypt-2.6.2.ebuild
+++ b/app-crypt/mcrypt/mcrypt-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/mcrypt-2.6.2.ebuild,v 1.9 2004/01/24 08:22:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/mcrypt-2.6.2.ebuild,v 1.10 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="replacement of the old unix crypt(1)"
 HOMEPAGE="http://mcrypt.sourceforge.net/"
@@ -23,5 +23,5 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc README NEWS AUTHORS COPYING THANKS TODO
+	dodoc README NEWS AUTHORS THANKS TODO
 }
diff --git a/app-crypt/mcrypt/mcrypt-2.6.4.ebuild b/app-crypt/mcrypt/mcrypt-2.6.4.ebuild
index 37f389022731..844db8cad8ba 100644
--- a/app-crypt/mcrypt/mcrypt-2.6.4.ebuild
+++ b/app-crypt/mcrypt/mcrypt-2.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/mcrypt-2.6.4.ebuild,v 1.5 2004/01/24 08:22:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/mcrypt-2.6.4.ebuild,v 1.6 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="replacement of the old unix crypt(1)"
 HOMEPAGE="http://mcrypt.sourceforge.net/"
@@ -23,5 +23,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "install error"
-	dodoc README NEWS AUTHORS COPYING THANKS TODO
+	dodoc README NEWS AUTHORS THANKS TODO
 }
diff --git a/app-crypt/md5deep/md5deep-0.16.ebuild b/app-crypt/md5deep/md5deep-0.16.ebuild
index 47202b7913ac..79f5e085a52b 100644
--- a/app-crypt/md5deep/md5deep-0.16.ebuild
+++ b/app-crypt/md5deep/md5deep-0.16.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/md5deep/md5deep-0.16.ebuild,v 1.4 2003/09/07 22:26:20 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/md5deep/md5deep-0.16.ebuild,v 1.5 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="Expanded md5sum program that has recursive and comparison options"
 HOMEPAGE="http://md5deep.sourceforge.net"
 SRC_URI="http://md5deep.sourceforge.net/${P}.tar.gz"
+
 LICENSE="freedist"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc"
 IUSE=""
+
 DEPEND=""
-S=${WORKDIR}/${P}
 
 src_unpack () {
 	unpack ${A} ; cd ${S}
@@ -22,7 +23,7 @@ src_compile () {
 }
 
 src_install() {
-	dobin md5deep
+	dobin md5deep || die
 	dodoc README CHANGES TODO
 	doman md5deep.1
 }
diff --git a/app-crypt/mhash/mhash-0.8.18-r1.ebuild b/app-crypt/mhash/mhash-0.8.18-r1.ebuild
index e458e7e8e53a..b80fcbeed993 100644
--- a/app-crypt/mhash/mhash-0.8.18-r1.ebuild
+++ b/app-crypt/mhash/mhash-0.8.18-r1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mhash/mhash-0.8.18-r1.ebuild,v 1.8 2004/04/01 19:15:46 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mhash/mhash-0.8.18-r1.ebuild,v 1.9 2004/05/31 20:34:34 vapier Exp $
 
-DESCRIPTION="mhash is a library providing a uniform interface to a large number of hash algorithms."
-SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
+DESCRIPTION="library providing a uniform interface to a large number of hash algorithms"
 HOMEPAGE="http://mhash.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 s390"
+IUSE=""
 
 DEPEND="virtual/glibc"
 RDEPEND=""
@@ -24,7 +25,7 @@ src_install() {
 	dodir /usr/{bin,include,lib}
 	einstall || die "install failure"
 
-	dodoc AUTHORS COPYING INSTALL NEWS README TODO THANKS ChangeLog
+	dodoc AUTHORS INSTALL NEWS README TODO THANKS ChangeLog
 	dodoc doc/*.txt doc/skid*
 	prepalldocs
 	cd doc && dohtml mhash.html || die "dohtml failed"
diff --git a/app-crypt/mhash/mhash-0.9.1.ebuild b/app-crypt/mhash/mhash-0.9.1.ebuild
index d86e27324814..571a67897609 100644
--- a/app-crypt/mhash/mhash-0.9.1.ebuild
+++ b/app-crypt/mhash/mhash-0.9.1.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mhash/mhash-0.9.1.ebuild,v 1.1 2004/05/24 06:38:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mhash/mhash-0.9.1.ebuild,v 1.2 2004/05/31 20:34:34 vapier Exp $
 
-DESCRIPTION="mhash is a library providing a uniform interface to a large number of hash algorithms."
-SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
+DESCRIPTION="library providing a uniform interface to a large number of hash algorithms"
 HOMEPAGE="http://mhash.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 s390"
+IUSE=""
 
 DEPEND="virtual/glibc"
 RDEPEND=""
@@ -24,7 +25,7 @@ src_install() {
 	dodir /usr/{bin,include,lib}
 	einstall || die "install failure"
 
-	dodoc AUTHORS COPYING INSTALL NEWS README TODO THANKS ChangeLog
+	dodoc AUTHORS INSTALL NEWS README TODO THANKS ChangeLog
 	dodoc doc/*.txt doc/skid*
 	prepalldocs
 	cd doc && dohtml mhash.html || die "dohtml failed"
diff --git a/app-crypt/newpg/newpg-0.9.4-r1.ebuild b/app-crypt/newpg/newpg-0.9.4-r1.ebuild
index 413155da8bef..4433353dc632 100644
--- a/app-crypt/newpg/newpg-0.9.4-r1.ebuild
+++ b/app-crypt/newpg/newpg-0.9.4-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/newpg/newpg-0.9.4-r1.ebuild,v 1.7 2004/04/25 22:01:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/newpg/newpg-0.9.4-r1.ebuild,v 1.8 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="NewPG is the S/MIME variant of GnuPG which does also include the gpg-agent, useful even for GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/aegypten/${P}.tar.gz"
+HOMEPAGE="http://www.gnupg.org/"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE="nls"
 
@@ -39,7 +39,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO VERSION
+	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO VERSION
 
 	chmod +s "${D}/usr/bin/gpgsm"
 }
diff --git a/app-crypt/newpg/newpg-0.9.4.ebuild b/app-crypt/newpg/newpg-0.9.4.ebuild
index 1e5b293869f0..e07880a1272b 100644
--- a/app-crypt/newpg/newpg-0.9.4.ebuild
+++ b/app-crypt/newpg/newpg-0.9.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/newpg/newpg-0.9.4.ebuild,v 1.6 2004/04/25 22:01:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/newpg/newpg-0.9.4.ebuild,v 1.7 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="NewPG is the S/MIME variant of GnuPG which does also include the gpg-agent, useful even for GnuPG"
 HOMEPAGE="http://www.gnupg.org/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/aegypten/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE="nls"
 
@@ -27,7 +27,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO VERSION
+	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO VERSION
 
 	chmod +s "${D}/usr/bin/gpgsm"
 }
diff --git a/app-crypt/opencdk/opencdk-0.4.5.ebuild b/app-crypt/opencdk/opencdk-0.4.5.ebuild
index 8f11aab096f8..f65cbe5977c2 100644
--- a/app-crypt/opencdk/opencdk-0.4.5.ebuild
+++ b/app-crypt/opencdk/opencdk-0.4.5.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/opencdk/opencdk-0.4.5.ebuild,v 1.9 2004/04/26 15:49:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/opencdk/opencdk-0.4.5.ebuild,v 1.10 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="Open Crypto Development Kit for basic OpenPGP message manipulation"
 HOMEPAGE="http://www.gnutls.org/"
 SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/opencdk/${P}.tar.gz"
 
-IUSE="doc"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 alpha sparc hppa"
+KEYWORDS="x86 sparc alpha hppa"
+IUSE="doc"
 
 RDEPEND=">=dev-libs/libgcrypt-1.1.12"
-
 DEPEND="${RDEPEND}
-		>=dev-lang/perl-5.6"
-
-src_compile() {
-	econf || die "configure failed"
-	emake || die "make failed"
-}
+	>=dev-lang/perl-5.6"
 
 src_install() {
 	einstall || die "installed failed"
 
-	dodoc AUTHORS COPYING ChangeLog NEWS README \
-		README-alpha THANKS TODO
-	[ "`use doc`" ] && dohtml doc/opencdk-api.html
+	dodoc AUTHORS ChangeLog NEWS README README-alpha THANKS TODO
+	use doc && dohtml doc/opencdk-api.html
 }
diff --git a/app-crypt/opencdk/opencdk-0.5.1.ebuild b/app-crypt/opencdk/opencdk-0.5.1.ebuild
index e19ebae77ea3..2c533dbc359a 100644
--- a/app-crypt/opencdk/opencdk-0.5.1.ebuild
+++ b/app-crypt/opencdk/opencdk-0.5.1.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/opencdk/opencdk-0.5.1.ebuild,v 1.11 2004/05/12 17:51:04 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/opencdk/opencdk-0.5.1.ebuild,v 1.12 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="Open Crypto Development Kit for basic OpenPGP message manipulation"
 HOMEPAGE="http://www.gnutls.org/"
 SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/opencdk/${P}.tar.bz2"
 
-IUSE="doc"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 alpha ~sparc ia64 amd64 ppc"
+KEYWORDS="~x86 ppc ~sparc alpha amd64 ia64"
+IUSE="doc"
 
 RDEPEND=">=dev-libs/libgcrypt-1.1.12"
-
 DEPEND="${RDEPEND}
-		>=dev-lang/perl-5.6"
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "make failed"
-}
+	>=dev-lang/perl-5.6"
 
 src_install() {
 	einstall || die "installed failed"
 
-	dodoc AUTHORS COPYING ChangeLog NEWS README \
-		README-alpha THANKS TODO
-	[ "`use doc`" ] && dohtml doc/opencdk-api.html
+	dodoc AUTHORS ChangeLog NEWS README README-alpha THANKS TODO
+	use doc && dohtml doc/opencdk-api.html
 }
diff --git a/app-crypt/opencdk/opencdk-0.5.3.ebuild b/app-crypt/opencdk/opencdk-0.5.3.ebuild
index 78dff8961cba..8b5fce4da138 100644
--- a/app-crypt/opencdk/opencdk-0.5.3.ebuild
+++ b/app-crypt/opencdk/opencdk-0.5.3.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/opencdk/opencdk-0.5.3.ebuild,v 1.7 2004/05/12 17:51:04 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/opencdk/opencdk-0.5.3.ebuild,v 1.8 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="Open Crypto Development Kit for basic OpenPGP message manipulation"
 HOMEPAGE="http://www.gnutls.org/"
 SRC_URI="ftp://ftp.gnutls.org/pub/gnutls/opencdk/${P}.tar.gz"
 
-IUSE="doc"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 amd64 ~sparc ~ppc ~mips ~alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha amd64"
+IUSE="doc"
 
 RDEPEND=">=dev-libs/libgcrypt-1.1.91"
-
 DEPEND="${RDEPEND}
-		>=dev-lang/perl-5.6"
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "make failed"
-}
+	>=dev-lang/perl-5.6"
 
 src_install() {
 	einstall || die "installed failed"
 
-	dodoc AUTHORS COPYING ChangeLog NEWS README \
-		README-alpha THANKS TODO
-	[ "`use doc`" ] && dohtml doc/opencdk-api.html
+	dodoc AUTHORS ChangeLog NEWS README README-alpha THANKS TODO
+	use doc && dohtml doc/opencdk-api.html
 }
diff --git a/app-crypt/pgpdump/pgpdump-0.19.ebuild b/app-crypt/pgpdump/pgpdump-0.19.ebuild
index b88fbd73a5f8..4ef390a2e753 100644
--- a/app-crypt/pgpdump/pgpdump-0.19.ebuild
+++ b/app-crypt/pgpdump/pgpdump-0.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pgpdump/pgpdump-0.19.ebuild,v 1.3 2003/10/27 11:05:36 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pgpdump/pgpdump-0.19.ebuild,v 1.4 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="A PGP packet visualizer"
 HOMEPAGE="http://pgp.iijlab.net/pgpdump.html"
@@ -9,6 +9,7 @@ SRC_URI="ftp://pgp.iijlab.net/pub/pgp/tools/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND="virtual/glibc"
 
diff --git a/app-crypt/pgpdump/pgpdump-0.20.ebuild b/app-crypt/pgpdump/pgpdump-0.20.ebuild
index a08c04637491..b95a92108d86 100644
--- a/app-crypt/pgpdump/pgpdump-0.20.ebuild
+++ b/app-crypt/pgpdump/pgpdump-0.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pgpdump/pgpdump-0.20.ebuild,v 1.1 2003/12/08 23:47:00 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pgpdump/pgpdump-0.20.ebuild,v 1.2 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="A PGP packet visualizer"
 HOMEPAGE="http://pgp.iijlab.net/pgpdump.html"
@@ -9,6 +9,7 @@ SRC_URI="ftp://pgp.iijlab.net/pub/pgp/tools/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
+IUSE=""
 
 DEPEND="virtual/glibc
 	app-arch/bzip2"
diff --git a/app-crypt/pinentry/pinentry-0.6.9.ebuild b/app-crypt/pinentry/pinentry-0.6.9.ebuild
index f2aed699cb1e..6be750735b35 100644
--- a/app-crypt/pinentry/pinentry-0.6.9.ebuild
+++ b/app-crypt/pinentry/pinentry-0.6.9.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.6.9.ebuild,v 1.3 2004/04/26 15:51:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.6.9.ebuild,v 1.4 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
 HOMEPAGE="http://www.gnupg.org/aegypten/"
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/pinentry/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE="qt gtk ncurses"
 
@@ -20,17 +20,19 @@ pkg_setup() {
 }
 
 src_compile() {
-	econf	$(use_enable qt pinentry-qt) \
-			$(use_enable gtk pinentry-gtk) \
-			$(use_enable ncurses pinentry-curses) \
-			$(use_enable ncurses fallback-curses) \
-			--disable-dependency-tracking || die "econf failed"
+	econf \
+		$(use_enable qt pinentry-qt) \
+		$(use_enable gtk pinentry-gtk) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		--disable-dependency-tracking \
+		|| die "econf failed"
 	make || die
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
 
 	# The other two pinentries don't spit out an insecure memory warning when
 	# not suid root, and gtk refuses to start if pinentry-gtk is suid root.
diff --git a/app-crypt/rotix/rotix-0.83.ebuild b/app-crypt/rotix/rotix-0.83.ebuild
index 6fa84bc4d3a1..d97c4fc57003 100644
--- a/app-crypt/rotix/rotix-0.83.ebuild
+++ b/app-crypt/rotix/rotix-0.83.ebuild
@@ -1,27 +1,22 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/rotix/rotix-0.83.ebuild,v 1.7 2003/12/10 22:35:28 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/rotix/rotix-0.83.ebuild,v 1.8 2004/05/31 20:34:34 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Rotix allows you to generate rotational obfuscations."
 HOMEPAGE="http://elektron.its.tudelft.nl/~hemmin98/rotix.html"
 SRC_URI="http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ia64 amd64"
-
+KEYWORDS="x86 ~ppc amd64 ia64"
 IUSE="nls"
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
 	local myconf
-
 	use nls && myconf="--i18n=1"
-
 	econf ${myconf} || die
-
 	emake || die
 }
 
diff --git a/app-crypt/seahorse/seahorse-0.5.0.ebuild b/app-crypt/seahorse/seahorse-0.5.0.ebuild
index dcdd1e40dcc3..e6895a69251a 100644
--- a/app-crypt/seahorse/seahorse-0.5.0.ebuild
+++ b/app-crypt/seahorse/seahorse-0.5.0.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.5.0.ebuild,v 1.22 2004/04/26 15:52:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.5.0.ebuild,v 1.23 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="gnome front end to gnupg"
-SRC_URI="mirror://sourceforge/seahorse/${P}.tar.gz"
 HOMEPAGE="http://seahorse.sourceforge.net/"
+SRC_URI="mirror://sourceforge/seahorse/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc"
+IUSE=""
 
 DEPEND="virtual/x11
 	>=app-crypt/gnupg-1.0.4
 	>=gnome-base/gnome-libs-1.4.1.2-r1"
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die
-}
-
 src_install() {
 	make DESTDIR=${D} \
 	     localedir=${D}/usr/share/locale \
 	     gnulocaledir=${D}/usr/share/locale install || die
 
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/app-crypt/seahorse/seahorse-0.6.2.ebuild b/app-crypt/seahorse/seahorse-0.6.2.ebuild
index 8fb5b2433563..e7773f6d66d1 100644
--- a/app-crypt/seahorse/seahorse-0.6.2.ebuild
+++ b/app-crypt/seahorse/seahorse-0.6.2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.6.2.ebuild,v 1.8 2004/04/26 15:52:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.6.2.ebuild,v 1.9 2004/05/31 20:34:34 vapier Exp $
 
-IUSE=""
 DESCRIPTION="gnome front end to gnupg"
-SRC_URI="mirror://sourceforge/seahorse/${P}.tar.gz"
 HOMEPAGE="http://seahorse.sourceforge.net/"
+SRC_URI="mirror://sourceforge/seahorse/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~ppc"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc"
+IUSE=""
 
 RDEPEND="virtual/x11
 	>=app-crypt/gnupg-1.2.0
@@ -17,16 +17,10 @@ RDEPEND="virtual/x11
 	>=x11-libs/gtk+-2*
 	>=gnome-base/libgnome-2*
 	>=app-text/scrollkeeper-0.3*"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_compile() {
-	econf || die "econf failed"
-	emake || die "parallel make failed"
-}
-
 src_install() {
-	einstall
-	dodoc AUTHORS COPYING* ChangeLog NEWS README TODO THANKS
+	einstall || die
+	dodoc AUTHORS ChangeLog NEWS README TODO THANKS
 }
diff --git a/app-crypt/seahorse/seahorse-0.6.3.ebuild b/app-crypt/seahorse/seahorse-0.6.3.ebuild
index 41da5a060eaa..e9e0295d5268 100644
--- a/app-crypt/seahorse/seahorse-0.6.3.ebuild
+++ b/app-crypt/seahorse/seahorse-0.6.3.ebuild
@@ -1,26 +1,25 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.6.3.ebuild,v 1.6 2004/05/26 21:53:48 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.6.3.ebuild,v 1.7 2004/05/31 20:34:34 vapier Exp $
 
 inherit gnome2
 
-IUSE=""
 DESCRIPTION="gnome front end to gnupg"
-SRC_URI="mirror://sourceforge/seahorse/${P}.tar.gz"
 HOMEPAGE="http://seahorse.sourceforge.net/"
+SRC_URI="mirror://sourceforge/seahorse/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~ppc ~amd64"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc ~amd64"
+IUSE=""
 
 RDEPEND="virtual/x11
 	>=app-crypt/gnupg-1.2.0
 	=app-crypt/gpgme-0.3.14
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2"
-
 DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.3
 	dev-util/pkgconfig"
 
-DOCS="AUTHORS COPYING* ChangeLog NEWS README TODO THANKS"
+DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
diff --git a/app-crypt/shash/shash-0.2.6.ebuild b/app-crypt/shash/shash-0.2.6.ebuild
index 1446337ed514..4189f65bd0b8 100644
--- a/app-crypt/shash/shash-0.2.6.ebuild
+++ b/app-crypt/shash/shash-0.2.6.ebuild
@@ -1,22 +1,25 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/shash-0.2.6.ebuild,v 1.1 2004/01/21 06:45:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/shash/shash-0.2.6.ebuild,v 1.2 2004/05/31 20:34:34 vapier Exp $
 
 DESCRIPTION="Generate or check digests or MACs of files"
 HOMEPAGE="http://mcrypt.hellug.gr/${PN}/"
 SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="static"
+
 DEPEND="virtual/glibc
-		>=app-crypt/mhash-0.8.18-r1"
+	>=app-crypt/mhash-0.8.18-r1"
 
 src_compile() {
 	econf `use_enable static static-link` || die "econf failed"
 	emake || die "emake failed"
 }
+
 src_install() {
 	make install DESTDIR=${D} || die "install failed"
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS doc/sample.shashrc doc/FORMAT
+	dodoc AUTHORS ChangeLog INSTALL NEWS doc/sample.shashrc doc/FORMAT
 }
diff --git a/app-crypt/ssh-multiadd/ssh-multiadd-1.3.1.ebuild b/app-crypt/ssh-multiadd/ssh-multiadd-1.3.1.ebuild
index 763f223c8260..9a4f7a74b4b5 100644
--- a/app-crypt/ssh-multiadd/ssh-multiadd-1.3.1.ebuild
+++ b/app-crypt/ssh-multiadd/ssh-multiadd-1.3.1.ebuild
@@ -1,31 +1,28 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ssh-multiadd/ssh-multiadd-1.3.1.ebuild,v 1.20 2004/03/30 00:58:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ssh-multiadd/ssh-multiadd-1.3.1.ebuild,v 1.21 2004/05/31 20:34:34 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="adds multiple ssh keys to the ssh authentication agent. These may use the same passphrase. Unlike ssh-add, if any of the keys use the same passphrase, you will only need to enter each unique passphrase once, and keys that are already added will not be prompted for again."
-SRC_URI="http://www.azstarnet.com/~donut/programs/ssh-multiadd/${P}.tar.gz"
 HOMEPAGE="http://www.azstarnet.com/~donut/programs/index_s.html#ssh-multiadd"
+SRC_URI="http://www.azstarnet.com/~donut/programs/ssh-multiadd/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc"
+SLOT="0"
+KEYWORDS="x86 ppc sparc"
 IUSE="X"
 
 DEPEND=">=dev-lang/python-2.0-r3
 	X? ( >=net-misc/x11-ssh-askpass-1.2.2 )"
 
-#lamer: pulling x11-ssh-askpass in pulls in X, which is bad for servers
-#so I added the X? ( ) -- drobbins
-
 src_unpack() {
 	 unpack ${A} ; cd ${S}
 	 epatch ${FILESDIR}/${P}.diff
 }
 
 src_install() {
-	dobin ssh-multiadd
+	dobin ssh-multiadd || die
 	doman ssh-multiadd.1
-	dodoc COPYING ChangeLog README todo
+	dodoc ChangeLog README todo
 }