header fix; whitespace cleanup

7 files changed, 91 insertions, 98 deletions

diff --git a/net-mail/cyrus-imap-admin/Manifest b/net-mail/cyrus-imap-admin/Manifest
index 57cd8b8f4db6..901f99e28d96 100644
--- a/net-mail/cyrus-imap-admin/Manifest
+++ b/net-mail/cyrus-imap-admin/Manifest
@@ -1,21 +1,21 @@
-MD5 a53e9ed71d9f196b12018cf9b43352e6 cyrus-imap-admin-2.1.12.ebuild 2810
-MD5 e0742157c1e1a3131a990c64c09cd9ff cyrus-imap-admin-2.1.9.ebuild 2170
-MD5 4d11b1a3e17d728a4bc55e44810a7918 cyrus-imap-admin-2.1.11-r1.ebuild 2248
-MD5 6692ea253cca4bd4234ea94132bf1ac7 cyrus-imap-admin-2.1.14.ebuild 3396
-MD5 dea52407dd1128b672afbf246c57c5a2 cyrus-imap-admin-2.1.11.ebuild 2216
-MD5 62a5f924c6051b17a04a351870a920e4 cyrus-imap-admin-2.1.13.ebuild 2830
 MD5 844433e492e9bc8f4d23df1dceb6d224 ChangeLog 2382
+MD5 715760ef428e2d19f878c6a21c83b738 cyrus-imap-admin-2.1.11-r1.ebuild 2147
+MD5 0492ec2599ab66f6db168787744f7cf5 cyrus-imap-admin-2.1.11.ebuild 2113
+MD5 d99b215b810c71687958639e25beca7b cyrus-imap-admin-2.1.12.ebuild 2715
+MD5 5f941cc65fb808bf7e48feb8f0b77dd3 cyrus-imap-admin-2.1.9.ebuild 2067
+MD5 417c1ef86efbc35fee776f42f649c863 cyrus-imap-admin-2.1.13.ebuild 2734
+MD5 d335c9f28fdfe58440b3ddd70e5e769b cyrus-imap-admin-2.1.14.ebuild 3258
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 86761cabdb2db244e47b2185c083acc9 files/config.diff 389
+MD5 e2c00049c69e3eca58d5a635dd3fd6dc files/configure.diff 6285
 MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imap-admin-2.1.12-libwrap.patch 494
-MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
+MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imap-admin-2.1.11 71
 MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imap-admin-2.1.11-r1 71
-MD5 e2c00049c69e3eca58d5a635dd3fd6dc files/configure.diff 6285
-MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
+MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imap-admin-2.1.12 71
 MD5 cb725a049e69aaf090ea308ecf7b41ab files/digest-cyrus-imap-admin-2.1.9 70
 MD5 a26c1601811d0fd0cc3da0bae6d76693 files/imap-overflow.diff 871
-MD5 86761cabdb2db244e47b2185c083acc9 files/config.diff 389
-MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
-MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imap-admin-2.1.11 71
-MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imap-admin-2.1.12 71
+MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
 MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imap-admin-2.1.13 71
+MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
+MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
 MD5 aa678d0f596367397edeea90763ab29e files/digest-cyrus-imap-admin-2.1.14 155
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11-r1.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11-r1.ebuild
index 514f38c9e464..f971e1a0e610 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11-r1.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11-r1.ebuild,v 1.4 2003/06/06 23:58:22 rphillips Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11-r1.ebuild,v 1.5 2003/09/05 08:43:07 msterret Exp $
 
 inherit perl-module
 
@@ -19,7 +19,7 @@ DEPEND="virtual/glibc
 	afs? ( >=net-fs/openafs-1.2.2 )
 	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-    	>=dev-lang/perl-5.6.1
+	>=dev-lang/perl-5.6.1
 	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
 	>=sys-libs/db-3.2
 	>=sys-libs/pam-0.75
@@ -39,7 +39,7 @@ src_unpack() {
 src_compile() {
 
 	local myconf
-	
+
 	use afs && myconf="--with-afs" \
 		|| myconf="--without-afs"
 
@@ -77,13 +77,12 @@ src_install () {
 	echo "Installation of perl-modules"
 	export DESTDIR=${D}
 	cd ${S}/perl/imap
-		perl-module_src_prep
-                perl-module_src_compile
-                perl-module_src_install
-        cd ${S}/perl/sieve
-		perl-module_src_prep
-                perl-module_src_compile
-                perl-module_src_test
-                perl-module_src_install
-
+	perl-module_src_prep
+	perl-module_src_compile
+	perl-module_src_install
+	cd ${S}/perl/sieve
+	perl-module_src_prep
+	perl-module_src_compile
+	perl-module_src_test
+	perl-module_src_install
 }
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11.ebuild
index aa54587c88bc..2d2a029eda9b 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11.ebuild,v 1.6 2003/06/06 23:58:22 rphillips Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.11.ebuild,v 1.7 2003/09/05 08:43:07 msterret Exp $
 
 inherit perl-module
 
@@ -19,7 +19,7 @@ DEPEND="virtual/glibc
 	afs? ( >=net-fs/openafs-1.2.2 )
 	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-    	>=dev-lang/perl-5.6.1
+	>=dev-lang/perl-5.6.1
 	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
 	>=sys-libs/db-3.2
 	>=sys-libs/pam-0.75
@@ -38,7 +38,7 @@ src_unpack() {
 src_compile() {
 
 	local myconf
-	
+
 	use afs && myconf="--with-afs" \
 		|| myconf="--without-afs"
 
@@ -68,21 +68,18 @@ src_compile() {
 	make || die "compile problem"
 	cd ${S}/perl
 	make || die "compile problem"
-
 }
 
 src_install () {
-
 	echo "Installation of perl-modules"
 	export DESTDIR=${D}
 	cd ${S}/perl/imap
-		perl-module_src_prep
-                perl-module_src_compile
-                perl-module_src_install
-        cd ${S}/perl/sieve
-		perl-module_src_prep
-                perl-module_src_compile
-                perl-module_src_test
-                perl-module_src_install
-
+	perl-module_src_prep
+	perl-module_src_compile
+	perl-module_src_install
+	cd ${S}/perl/sieve
+	perl-module_src_prep
+	perl-module_src_compile
+	perl-module_src_test
+	perl-module_src_install
 }
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.12.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.12.ebuild
index a695d2a3af39..7705bbcbb387 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.12.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.12.ebuild,v 1.7 2003/07/13 13:32:32 aliz Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.12.ebuild,v 1.8 2003/09/05 08:43:07 msterret Exp $
 
 inherit perl-module eutils
 
@@ -19,7 +19,7 @@ DEPEND="virtual/glibc
 	afs? ( >=net-fs/openafs-1.2.2 )
 	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-    	>=dev-lang/perl-5.6.1
+	>=dev-lang/perl-5.6.1
 	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
 	>=sys-libs/db-3.2
 	>=sys-libs/pam-0.75
@@ -43,7 +43,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	
+
 	use afs && myconf="--with-afs" \
 		|| myconf="--without-afs"
 
@@ -83,12 +83,12 @@ src_install () {
 	echo "Installation of perl-modules"
 	export DESTDIR=${D}
 	cd ${S}/perl/imap
-		perl-module_src_prep
-                perl-module_src_compile
-                perl-module_src_install
-        cd ${S}/perl/sieve
-		perl-module_src_prep
-                perl-module_src_compile
-                perl-module_src_test
-                perl-module_src_install
+	perl-module_src_prep
+	perl-module_src_compile
+	perl-module_src_install
+	cd ${S}/perl/sieve
+	perl-module_src_prep
+	perl-module_src_compile
+	perl-module_src_test
+	perl-module_src_install
 }
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.13.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.13.ebuild
index 28b94cbbceae..32ce381850d9 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.13.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.13.ebuild,v 1.2 2003/06/10 17:05:32 raker Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.13.ebuild,v 1.3 2003/09/05 08:43:07 msterret Exp $
 
 inherit perl-module eutils
 
@@ -19,7 +19,7 @@ DEPEND="virtual/glibc
 	afs? ( >=net-fs/openafs-1.2.2 )
 	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-    	>=dev-lang/perl-5.6.1
+	>=dev-lang/perl-5.6.1
 	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
 	>=sys-libs/db-3.2
 	>=sys-libs/pam-0.75
@@ -43,7 +43,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	
+
 	use afs && myconf="--with-afs" \
 		|| myconf="--without-afs"
 
@@ -83,12 +83,12 @@ src_install () {
 	echo "Installation of perl-modules"
 	export DESTDIR=${D}
 	cd ${S}/perl/imap
-		perl-module_src_prep
-                perl-module_src_compile
-                perl-module_src_install
-        cd ${S}/perl/sieve
-		perl-module_src_prep
-                perl-module_src_compile
-                perl-module_src_test
-                perl-module_src_install
+	perl-module_src_prep
+	perl-module_src_compile
+	perl-module_src_install
+	cd ${S}/perl/sieve
+	perl-module_src_prep
+	perl-module_src_compile
+	perl-module_src_test
+	perl-module_src_install
 }
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild
index 380c9c48e479..f22cd6e40ba9 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild,v 1.2 2003/07/13 20:29:41 raker Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.14.ebuild,v 1.3 2003/09/05 08:43:07 msterret Exp $
 
 inherit perl-module eutils
 
@@ -24,7 +24,7 @@ DEPEND="virtual/glibc
 	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	kerberos? ( >=app-crypt/mit-krb5-1.2.6 )
-    	>=dev-lang/perl-5.6.1
+	>=dev-lang/perl-5.6.1
 	>=sys-libs/db-3.2
 	>=sys-libs/pam-0.75
 	>=dev-libs/cyrus-sasl-2.1.14
@@ -39,21 +39,21 @@ src_unpack() {
 	cd ${S}
 
 	# patch for db4 detection and their respective versioned symbols
-        epatch ${FILESDIR}/2.1.14-db4.patch
+	epatch ${FILESDIR}/2.1.14-db4.patch
 
 	# add libwrap defines as we don't have a dynamicly linked library.
 	epatch ${FILESDIR}/cyrus-imap-admin-2.1.12-libwrap.patch
 
 	# Does running autoconf squash any of this?
-        use ipv6 && epatch ${WORKDIR}/${IPV6_P}.diff
+	use ipv6 && epatch ${WORKDIR}/${IPV6_P}.diff
 
 	libtoolize --copy --force
-        aclocal -I cmulocal || die
-        autoheader || die
-        autoconf || die
+	aclocal -I cmulocal || die
+	autoheader || die
+	autoconf || die
 
 	# remove spurious -I/usr/includes which make configure tests fail
-        epatch ${FILESDIR}/cyrus-imapd-2.1.12-includepath.patch
+	epatch ${FILESDIR}/cyrus-imapd-2.1.12-includepath.patch
 
 	# when linking with rpm, you need to link with more libraries.
 	cp configure configure.orig
@@ -63,7 +63,7 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	
+
 	use afs && myconf="--with-afs" \
 		|| myconf="--without-afs"
 
@@ -103,12 +103,12 @@ src_install () {
 	echo "Installation of perl-modules"
 	export DESTDIR=${D}
 	cd ${S}/perl/imap
-		perl-module_src_prep
-                perl-module_src_compile
-                perl-module_src_install
-        cd ${S}/perl/sieve
-		perl-module_src_prep
-                perl-module_src_compile
-                perl-module_src_test
-                perl-module_src_install
+	perl-module_src_prep
+	perl-module_src_compile
+	perl-module_src_install
+	cd ${S}/perl/sieve
+	perl-module_src_prep
+	perl-module_src_compile
+	perl-module_src_test
+	perl-module_src_install
 }
diff --git a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.9.ebuild b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.9.ebuild
index 54f58b5e3c15..b58a319c92cf 100644
--- a/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.9.ebuild
+++ b/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.9.ebuild,v 1.8 2003/06/06 23:58:22 rphillips Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imap-admin/cyrus-imap-admin-2.1.9.ebuild,v 1.9 2003/09/05 08:43:07 msterret Exp $
 
 inherit perl-module
 
@@ -19,7 +19,7 @@ DEPEND="virtual/glibc
 	afs? ( >=net-fs/openafs-1.2.2 )
 	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-    	>=dev-lang/perl-5.6.1
+	>=dev-lang/perl-5.6.1
 	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
 	>=sys-libs/db-3.2
 	>=sys-libs/pam-0.75
@@ -38,7 +38,7 @@ src_unpack() {
 src_compile() {
 
 	local myconf
-	
+
 	use afs && myconf="--with-afs" \
 		|| myconf="--without-afs"
 
@@ -67,21 +67,18 @@ src_compile() {
 	make || die "compile problem"
 	cd ${S}/perl
 	make || die "compile problem"
-
 }
 
 src_install () {
-
 	echo "Installation of perl-modules"
 	export DESTDIR=${D}
 	cd ${S}/perl/imap
-		perl-module_src_prep
-                perl-module_src_compile
-                perl-module_src_install
-        cd ${S}/perl/sieve
-		perl-module_src_prep
-                perl-module_src_compile
-                perl-module_src_test
-                perl-module_src_install
-
+	perl-module_src_prep
+	perl-module_src_compile
+	perl-module_src_install
+	cd ${S}/perl/sieve
+	perl-module_src_prep
+	perl-module_src_compile
+	perl-module_src_test
+	perl-module_src_install
 }