whitespace cleanup

100 files changed, 490 insertions, 500 deletions

diff --git a/net-im/amsn/Manifest b/net-im/amsn/Manifest
index d44c0cab5fe2..0cdb41c3dbdf 100644
--- a/net-im/amsn/Manifest
+++ b/net-im/amsn/Manifest
@@ -1,8 +1,8 @@
-MD5 1bcec22ec0eb7c069b6942cfc24c9bc4 amsn-0.81.ebuild 1678
 MD5 5d0b7faca4a683a782055ea061793a83 ChangeLog 1561
-MD5 302879fab759e5173d8b9e5f4e330129 amsn-0.71.ebuild 874
-MD5 267449b8c8cef13c5d0c688a3285c87c amsn-0.80.ebuild 1674
-MD5 ea3df95e2bc1dda6cab9f4d32893c019 files/digest-amsn-0.81 61
+MD5 99724c78d4b22113e9fb9cf693217428 amsn-0.71.ebuild 875
+MD5 cac99b652c44a6fa07324b62c912d905 amsn-0.80.ebuild 1668
+MD5 e181f443aedf14001fb21cc56ed05980 amsn-0.81.ebuild 1672
+MD5 be7a6c9b1dd56238462cf9cc81e37f24 files/digest-amsn-0.71 61
 MD5 209f5b66fbad9efa4c87594ee9b24262 files/amsn.desktop 236
 MD5 beefc599eae966bbb7d7bdc89906ec0f files/digest-amsn-0.80 61
-MD5 be7a6c9b1dd56238462cf9cc81e37f24 files/digest-amsn-0.71 61
+MD5 ea3df95e2bc1dda6cab9f4d32893c019 files/digest-amsn-0.81 61
diff --git a/net-im/amsn/amsn-0.71.ebuild b/net-im/amsn/amsn-0.71.ebuild
index 148110725e40..eb6e50bbdcba 100644
--- a/net-im/amsn/amsn-0.71.ebuild
+++ b/net-im/amsn/amsn-0.71.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.71.ebuild,v 1.4 2003/04/15 17:48:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.71.ebuild,v 1.5 2003/09/05 23:58:57 msterret Exp $
 
 S="${WORKDIR}/msn"
 DESCRIPTION="Alvarro's Messenger client for MSN"
@@ -15,7 +15,7 @@ DEPEND=">=dev-lang/tcl-8.3.3
 	>=dev-lang/tk-8.3.3"
 
 src_compile() {
-	
+
 	make \
 		prefix=${D}/usr \
 		gnomelinks=${D}/etc/X11/applnk/Internet \
@@ -31,7 +31,7 @@ src_install() {
 		install || die
 
 	rm -f ${D}/usr/bin/amsn
-	ln -s /usr/share/amsn/amsn ${D}/usr/bin/amsn	
+	ln -s /usr/share/amsn/amsn ${D}/usr/bin/amsn
 
 	dodoc LEEME TODO README GNUGPL
 
diff --git a/net-im/amsn/amsn-0.80.ebuild b/net-im/amsn/amsn-0.80.ebuild
index 1a7e36df8f55..ed04250670c3 100644
--- a/net-im/amsn/amsn-0.80.ebuild
+++ b/net-im/amsn/amsn-0.80.ebuild
@@ -16,10 +16,10 @@ KEYWORDS="~x86 ~amd64"
 
 DEPEND=">=dev-lang/tcl-8.3.3
 	>=dev-lang/tk-8.3.3
-    imlib? ( media-libs/imlib )"
+	imlib? ( media-libs/imlib )"
 
 src_compile() {
-	
+
 	if [ -n "`use imlib`" ]
 	then
 		einfo "Compiling the freedesktop notification plugin"
@@ -40,14 +40,14 @@ src_install() {
 		mkdir -p ${D}/usr/share/pixmaps
 		cp -a ${S}/icons/32x32/* ${D}/usr/share/pixmaps/
 	fi
-	
+
 
 	if [ -n "`use kde`" ]
 	then
 		dodir ${D}/usr/share/applnk
 		cp ${FILESDIR}/amsn.desktop ${D}/usr/share/applnk/
 		einfo "Installing KDE Icons in default theme"
-		mkdir -p ${D}/${KDEDIR}/share/icons/default.kde 
+		mkdir -p ${D}/${KDEDIR}/share/icons/default.kde
 		cp -a ${S}/icons/* ${D}/${KDEDIR}/share/icons/default.kde
 	fi
 
diff --git a/net-im/amsn/amsn-0.81.ebuild b/net-im/amsn/amsn-0.81.ebuild
index 0782f1ed0e2f..0cf8170c4403 100644
--- a/net-im/amsn/amsn-0.81.ebuild
+++ b/net-im/amsn/amsn-0.81.ebuild
@@ -16,10 +16,10 @@ KEYWORDS="~x86 ~amd64"
 
 DEPEND=">=dev-lang/tcl-8.3.3
 	>=dev-lang/tk-8.3.3
-    imlib? ( media-libs/imlib )"
+	imlib? ( media-libs/imlib )"
 
 src_compile() {
-	
+
 	if [ -n "`use imlib`" ]
 	then
 		einfo "Compiling the freedesktop notification plugin"
@@ -40,14 +40,14 @@ src_install() {
 		mkdir -p ${D}/usr/share/pixmaps
 		cp -a ${S}/icons/32x32/* ${D}/usr/share/pixmaps/
 	fi
-	
+
 
 	if [ -n "`use kde`" ]
 	then
 		dodir ${D}/usr/share/applnk
 		cp ${FILESDIR}/amsn.desktop ${D}/usr/share/applnk/
 		einfo "Installing KDE Icons in default theme"
-		mkdir -p ${D}/${KDEDIR}/share/icons/default.kde 
+		mkdir -p ${D}/${KDEDIR}/share/icons/default.kde
 		cp -a ${S}/icons/* ${D}/${KDEDIR}/share/icons/default.kde
 	fi
 
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index adef79d714e0..718b49a1be42 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,14 +1,14 @@
 MD5 6b26899d44c13c10f6f82a8420ecc4ac ChangeLog 1957
-MD5 5ddd25d1f9cfca864e996a33b33f689c bitlbee-0.72.ebuild 1086
-MD5 48b2e96e3c845b3738df54343962263d bitlbee-0.73-r1.ebuild 1339
-MD5 ccb646f0c93ee87282b8221f5beb9878 bitlbee-0.73.ebuild 1086
-MD5 b04eb5b0f0d0b5dcec6409efddd98b91 bitlbee-0.74a.ebuild 1338
-MD5 b379d38869d88b76ee6599113d68c293 bitlbee-0.80.ebuild 1316
+MD5 b870fd31387b2c349eca82cb901b870e bitlbee-0.72.ebuild 1089
+MD5 494046f3b577301770f06c6e4bc06c5d bitlbee-0.73-r1.ebuild 1329
+MD5 2436faed029fde54669d7c71fda8dd4d bitlbee-0.73.ebuild 1089
+MD5 c5dcd7f7f902927880a7e10011bc8f66 bitlbee-0.74a.ebuild 1327
+MD5 0395435f5921975e399b54e471ea6541 bitlbee-0.80.ebuild 1305
 MD5 fc51bd6f3a89c98a4a447e9b1725e488 metadata.xml 465
-MD5 348ecbcec9cf34e7164b0f0189ea5963 files/bitlbee-0.80-xinetd.patch 730
 MD5 144e462c0af1d82a3412a237519b32ca files/bitlbee-xinetd.patch 519
 MD5 4b739ca4a0982ccfda988bb664db9b55 files/digest-bitlbee-0.72 201
 MD5 208f8bc3e515b98d70467d031d9d9fc0 files/digest-bitlbee-0.73 64
 MD5 208f8bc3e515b98d70467d031d9d9fc0 files/digest-bitlbee-0.73-r1 64
 MD5 8de9879ddbed4e2fbba0fd6b3e2e898a files/digest-bitlbee-0.74a 65
+MD5 348ecbcec9cf34e7164b0f0189ea5963 files/bitlbee-0.80-xinetd.patch 730
 MD5 e20daee3dcba62b15424f0f72838bf64 files/digest-bitlbee-0.80 64
diff --git a/net-im/bitlbee/bitlbee-0.72.ebuild b/net-im/bitlbee/bitlbee-0.72.ebuild
index f55f678bf3d7..aac9d75549df 100644
--- a/net-im/bitlbee/bitlbee-0.72.ebuild
+++ b/net-im/bitlbee/bitlbee-0.72.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.72.ebuild,v 1.3 2003/07/13 12:44:49 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.72.ebuild,v 1.4 2003/09/05 23:58:57 msterret Exp $
 
 inherit eutils
 
@@ -36,7 +36,7 @@ src_install() {
 	dodoc COPYING
 	dodoc doc/{AUTHORS,CHANGES,CREDITS,Installation.sgml,README,Support.sgml,TODO,Usage.sgml,user-guide.sgml}
 	doman doc/bitlbee.8
-	
+
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
 }
diff --git a/net-im/bitlbee/bitlbee-0.73-r1.ebuild b/net-im/bitlbee/bitlbee-0.73-r1.ebuild
index 32bf6b1a7600..a86200d2bcb0 100644
--- a/net-im/bitlbee/bitlbee-0.73-r1.ebuild
+++ b/net-im/bitlbee/bitlbee-0.73-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.73-r1.ebuild,v 1.3 2003/07/13 12:44:49 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.73-r1.ebuild,v 1.4 2003/09/05 23:58:57 msterret Exp $
 
 inherit eutils
 
@@ -32,7 +32,7 @@ src_compile() {
 	[ -n "${CC}" ] \
 		&& ${CC} ${CFLAGS} bitlbeed.c -o bitlbeed \
 		|| gcc ${CFLAGS} bitlbeed.c -o bitlbeed
-												
+
 }
 
 src_install() {
@@ -42,9 +42,9 @@ src_install() {
 	dodoc COPYING
 	dodoc doc/{AUTHORS,CHANGES,CREDITS,Installation.sgml,README,Support.sgml,TODO,Usage.sgml,user-guide.sgml}
 	doman doc/bitlbee.8
-	
+
 	dobin utils/bitlbeed
-	
+
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
 }
diff --git a/net-im/bitlbee/bitlbee-0.73.ebuild b/net-im/bitlbee/bitlbee-0.73.ebuild
index 2f14604006ee..c7566f6fd319 100644
--- a/net-im/bitlbee/bitlbee-0.73.ebuild
+++ b/net-im/bitlbee/bitlbee-0.73.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.73.ebuild,v 1.2 2003/07/13 12:44:49 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.73.ebuild,v 1.3 2003/09/05 23:58:57 msterret Exp $
 
 inherit eutils
 
@@ -36,7 +36,7 @@ src_install() {
 	dodoc COPYING
 	dodoc doc/{AUTHORS,CHANGES,CREDITS,Installation.sgml,README,Support.sgml,TODO,Usage.sgml,user-guide.sgml}
 	doman doc/bitlbee.8
-	
+
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
 }
diff --git a/net-im/bitlbee/bitlbee-0.74a.ebuild b/net-im/bitlbee/bitlbee-0.74a.ebuild
index 18a165adc8c4..6bd3bdb51393 100644
--- a/net-im/bitlbee/bitlbee-0.74a.ebuild
+++ b/net-im/bitlbee/bitlbee-0.74a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.74a.ebuild,v 1.1 2003/06/14 13:41:50 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.74a.ebuild,v 1.2 2003/09/05 23:58:57 msterret Exp $
 
 inherit eutils
 
@@ -32,7 +32,7 @@ src_compile() {
 	[ -n "${CC}" ] \
 		&& ${CC} ${CFLAGS} bitlbeed.c -o bitlbeed \
 		|| gcc ${CFLAGS} bitlbeed.c -o bitlbeed
-												
+
 }
 
 src_install() {
@@ -42,9 +42,9 @@ src_install() {
 	dodoc COPYING
 	dodoc doc/{AUTHORS,CHANGES,CREDITS,Installation.sgml,README,Support.sgml,TODO,Usage.sgml,user-guide.sgml}
 	doman doc/bitlbee.8
-	
+
 	dobin utils/bitlbeed
-	
+
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
 }
diff --git a/net-im/bitlbee/bitlbee-0.80.ebuild b/net-im/bitlbee/bitlbee-0.80.ebuild
index bc9601c1c74d..7ee778c32b9f 100644
--- a/net-im/bitlbee/bitlbee-0.80.ebuild
+++ b/net-im/bitlbee/bitlbee-0.80.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.80.ebuild,v 1.4 2003/08/16 14:32:37 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.80.ebuild,v 1.5 2003/09/05 23:58:57 msterret Exp $
 
 inherit eutils
 
@@ -32,7 +32,7 @@ src_compile() {
 	[ -n "${CC}" ] \
 		&& ${CC} ${CFLAGS} bitlbeed.c -o bitlbeed \
 		|| gcc ${CFLAGS} bitlbeed.c -o bitlbeed
-												
+
 }
 
 src_install() {
@@ -43,9 +43,9 @@ src_install() {
 	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README,TODO}
 	dohtml -A sgml doc/*.sgml
 	doman doc/bitlbee.8
-	
+
 	dobin utils/bitlbeed
-	
+
 	insinto /etc/xinetd.d
 	newins doc/bitlbee.xinetd bitlbee
 }
diff --git a/net-im/caim/Manifest b/net-im/caim/Manifest
index 7223fc73aeed..156f1dcde843 100644
--- a/net-im/caim/Manifest
+++ b/net-im/caim/Manifest
@@ -1,4 +1,4 @@
 MD5 057b8b7e665152edecfebda7764239d9 ChangeLog 661
-MD5 e6c76db7515846949277a2804f9b5303 caim-0.03.ebuild 805
+MD5 717fbb1bde076623943b671d200ff45f caim-0.03.ebuild 770
 MD5 9413df2b83144cec61ebbb92c8aacc13 files/caim-0.03-gentoo.diff 277
 MD5 e38be9247ac04179275dd1c0096afeb0 files/digest-caim-0.03 60
diff --git a/net-im/caim/caim-0.03.ebuild b/net-im/caim/caim-0.03.ebuild
index 3b878a241e1e..2d4a2e8cc142 100644
--- a/net-im/caim/caim-0.03.ebuild
+++ b/net-im/caim/caim-0.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/caim/caim-0.03.ebuild,v 1.6 2003/02/13 14:07:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/caim/caim-0.03.ebuild,v 1.7 2003/09/05 23:58:57 msterret Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A Console AIM Client"
@@ -14,26 +14,20 @@ LICENSE="LGPL-2.1 | GPL-2"
 KEYWORDS="x86"
 
 src_unpack() {
-
-    unpack ${P}.tar.gz
-    patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-    cd ${S}
-    echo "CFLAGS += ${CFLAGS}" >> Makefile.rules
-
+	unpack ${P}.tar.gz
+	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
+	cd ${S}
+	echo "CFLAGS += ${CFLAGS}" >> Makefile.rules
 }
 
 src_compile() {
-
-    emake || die
-
+	emake || die
 }
 
 src_install () {
-
-    dobin client/caim
-    dolib libfaim.so
-    dodoc README Changes
-    docinto libfaim
-    dodoc faimdocs/BUGS faimdocs/CHANGES faimdocs/README
- 
+	dobin client/caim
+	dolib libfaim.so
+	dodoc README Changes
+	docinto libfaim
+	dodoc faimdocs/BUGS faimdocs/CHANGES faimdocs/README
 }
diff --git a/net-im/centericq/Manifest b/net-im/centericq/Manifest
index 99a29f4f0a5b..7f98e815b91f 100644
--- a/net-im/centericq/Manifest
+++ b/net-im/centericq/Manifest
@@ -1,12 +1,12 @@
-MD5 a647326544cbcbff451928d34d839762 centericq-4.9.5.ebuild 1481
-MD5 53c1e711c5751f999a092ad3e0ea25d1 centericq-4.9.2.ebuild 900
-MD5 35c5266702ac6df51be0a53f67cc615e centericq-4.9.5-r1.ebuild 1563
-MD5 1df689d403dd6bd34be444f9cf625f98 centericq-4.9.4.ebuild 898
 MD5 1eaf14639374c443c9806ace5d7d5413 ChangeLog 3969
-MD5 f0ac8e0071f5bfe092561b2759726d47 centericq-4.9.6.ebuild 1559
-MD5 c1ac500e020c9d6a530191e1187bcca6 files/digest-centericq-4.9.2 68
+MD5 d0561182dd4cf73eb084b9035b2f4ca8 centericq-4.9.4.ebuild 901
+MD5 8e54f867570ea402686aac94046b2249 centericq-4.9.2.ebuild 901
+MD5 2d5984237d73eccffdd2931d90efbbe4 centericq-4.9.5.ebuild 1481
+MD5 8586ae5e2bfbe422a44975e667161191 centericq-4.9.5-r1.ebuild 1558
+MD5 aebaa6caa5ee3ea7a96bec64095b06ac centericq-4.9.6.ebuild 1554
 MD5 a5a5c7ea33197ccca36feee6b923b504 files/digest-centericq-4.9.4 68
 MD5 6086e6257164cf0ad32293134961cdba files/digest-centericq-4.9.5 68
-MD5 6716cb789e1646828b3b37149ef6b380 files/digest-centericq-4.9.6 68
 MD5 e645af5e8774c5cf9be9396564e75850 files/missing_namespace.patch 432
+MD5 c1ac500e020c9d6a530191e1187bcca6 files/digest-centericq-4.9.2 68
 MD5 6086e6257164cf0ad32293134961cdba files/digest-centericq-4.9.5-r1 68
+MD5 6716cb789e1646828b3b37149ef6b380 files/digest-centericq-4.9.6 68
diff --git a/net-im/centericq/centericq-4.9.2.ebuild b/net-im/centericq/centericq-4.9.2.ebuild
index 4345497c18b0..8cd19dd549e4 100644
--- a/net-im/centericq/centericq-4.9.2.ebuild
+++ b/net-im/centericq/centericq-4.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.9.2.ebuild,v 1.2 2003/02/13 14:07:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.9.2.ebuild,v 1.3 2003/09/05 23:58:57 msterret Exp $
 
 inherit eutils
 
@@ -25,7 +25,7 @@ src_compile() {
 	local myopts=""
 
 	use nls || myopts="--disable-nls"
-	
+
 	econf ${myopts} || die "Configure failed"
 	emake || die "Compilation failed"
 }
diff --git a/net-im/centericq/centericq-4.9.4.ebuild b/net-im/centericq/centericq-4.9.4.ebuild
index 7f48c25c1c6a..d0012a6e7013 100644
--- a/net-im/centericq/centericq-4.9.4.ebuild
+++ b/net-im/centericq/centericq-4.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.9.4.ebuild,v 1.2 2003/07/13 12:44:49 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.9.4.ebuild,v 1.3 2003/09/05 23:58:57 msterret Exp $
 
 inherit eutils
 
@@ -25,7 +25,7 @@ src_compile() {
 	local myopts=""
 
 	use nls || myopts="--disable-nls"
-	
+
 	econf ${myopts} || die "Configure failed"
 	emake || die "Compilation failed"
 }
diff --git a/net-im/centericq/centericq-4.9.5-r1.ebuild b/net-im/centericq/centericq-4.9.5-r1.ebuild
index 3df06e182857..e7337399494b 100644
--- a/net-im/centericq/centericq-4.9.5-r1.ebuild
+++ b/net-im/centericq/centericq-4.9.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.9.5-r1.ebuild,v 1.1 2003/07/25 17:47:39 coronalvr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.9.5-r1.ebuild,v 1.2 2003/09/05 23:58:57 msterret Exp $
 
 inherit eutils
 
@@ -36,17 +36,17 @@ src_compile() {
 	# --disable-aim      Build without AIM
 	# --disable-irc      Build without IRC
 	# --disable-jabber   Build without Jabber
- 	# --disable-rss      Build without RSS reader
-	# --no-konst         Don't add contact list items 
+	# --disable-rss      Build without RSS reader
+	# --no-konst         Don't add contact list items
 	#                    supplied by author by default
 	local myopts="--with-gnu-ld"
 
 	use nls || myopts="${myopts} --disable-nls"
 
 	use nls && myopts="${myopts} --with-fribidi"
-	
+
 	use ssl && myopts="${myopts} --with-ssl"
-	
+
 	econf ${myopts} || die "Configure failed"
 	emake || die "Compilation failed"
 }
diff --git a/net-im/centericq/centericq-4.9.5.ebuild b/net-im/centericq/centericq-4.9.5.ebuild
index 3f46c124b504..2844a5f8321e 100644
--- a/net-im/centericq/centericq-4.9.5.ebuild
+++ b/net-im/centericq/centericq-4.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.9.5.ebuild,v 1.1 2003/07/16 06:01:06 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.9.5.ebuild,v 1.2 2003/09/05 23:58:57 msterret Exp $
 
 inherit eutils
 
@@ -35,15 +35,15 @@ src_compile() {
 	# --disable-aim      Build without AIM
 	# --disable-irc      Build without IRC
 	# --disable-jabber   Build without Jabber
- 	# --disable-rss      Build without RSS reader
-	# --no-konst         Don't add contact list items 
+	# --disable-rss      Build without RSS reader
+	# --no-konst         Don't add contact list items
 	#                    supplied by author by default
 	local myopts="--with-gnu-ld"
 
 	use nls || myopts="${myopts} --disable-nls"
 
 	use ssl && myopts="${myopts} --with-ssl"
-	
+
 	econf ${myopts} || die "Configure failed"
 	emake || die "Compilation failed"
 }
diff --git a/net-im/centericq/centericq-4.9.6.ebuild b/net-im/centericq/centericq-4.9.6.ebuild
index 27953ee8d16d..51493e3a6117 100644
--- a/net-im/centericq/centericq-4.9.6.ebuild
+++ b/net-im/centericq/centericq-4.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.9.6.ebuild,v 1.2 2003/08/27 09:58:40 coronalvr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.9.6.ebuild,v 1.3 2003/09/05 23:58:57 msterret Exp $
 
 inherit eutils
 
@@ -36,17 +36,17 @@ src_compile() {
 	# --disable-aim      Build without AIM
 	# --disable-irc      Build without IRC
 	# --disable-jabber   Build without Jabber
- 	# --disable-rss      Build without RSS reader
-	# --no-konst         Don't add contact list items 
+	# --disable-rss      Build without RSS reader
+	# --no-konst         Don't add contact list items
 	#                    supplied by author by default
 	local myopts="--with-gnu-ld"
 
 	use nls || myopts="${myopts} --disable-nls"
 
 	use nls && myopts="${myopts} --with-fribidi"
-	
+
 	use ssl && myopts="${myopts} --with-ssl"
-	
+
 	econf ${myopts} || die "Configure failed"
 	emake || die "Compilation failed"
 }
diff --git a/net-im/everybuddy/Manifest b/net-im/everybuddy/Manifest
index bcbc5cf4e086..145b1ad7bdb0 100644
--- a/net-im/everybuddy/Manifest
+++ b/net-im/everybuddy/Manifest
@@ -1,5 +1,5 @@
 MD5 a9569f0e24e94f746085031abde1b806 ChangeLog 1578
-MD5 a167b61dc90209110ead7a331c6fc18d everybuddy-0.4.0.ebuild 1161
-MD5 df9b060edf51ac03622a8fcbb43be0c3 everybuddy-0.4.3.ebuild 1298
+MD5 341b76049afd49be131e9ee5a6e60adc everybuddy-0.4.0.ebuild 1144
+MD5 07dc0bc7727e140b9db9fdcfb8aaa3a4 everybuddy-0.4.3.ebuild 1298
 MD5 ac71ae7bed13954f8a1621eed1d1d9fb files/digest-everybuddy-0.4.0 68
 MD5 adcf5d4bb03b5444e41de216f1fc0d60 files/digest-everybuddy-0.4.3 69
diff --git a/net-im/everybuddy/everybuddy-0.4.0.ebuild b/net-im/everybuddy/everybuddy-0.4.0.ebuild
index da8577f19fab..c5f4ce48d816 100644
--- a/net-im/everybuddy/everybuddy-0.4.0.ebuild
+++ b/net-im/everybuddy/everybuddy-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/net-im/everybuddy/everybuddy-0.4.0.ebuild,v 1.7 2003/02/13 14:07:42 vapier Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/everybuddy/everybuddy-0.4.0.ebuild,v 1.8 2003/09/05 23:58:57 msterret Exp $
 
 IUSE="arts esd gnome"
 
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
 src_compile() {
-    local myconf
+	local myconf
 	use arts	\
 		&& myconf="--enable-arts"	\
 		|| myconf="--disable-arts"
@@ -31,23 +31,21 @@ src_compile() {
 		&& myconf="${myconf} --with-gnome"	\
 		|| myconf="${myconf} --without-gnome"
 
-	echo ${myconf} 
+	echo ${myconf}
 
-    ./configure 	\
+	./configure 	\
 		--prefix=/usr 	\
 		--mandir=/usr/share/man 	\
 		--host=${CHOST} 	\
 		${myconf} || die
-    make || die
+	make || die
 
 }
 
 src_install () {
-
-    make 	\
+	make 	\
 		DESTDIR=${D}	\
 		install || die
 
-    dodoc AUTHORS NEWS README TODO COPYING ChangeLog
-
+	dodoc AUTHORS NEWS README TODO COPYING ChangeLog
 }
diff --git a/net-im/everybuddy/everybuddy-0.4.3.ebuild b/net-im/everybuddy/everybuddy-0.4.3.ebuild
index 39d2c35ec65b..c94e683a88f4 100644
--- a/net-im/everybuddy/everybuddy-0.4.3.ebuild
+++ b/net-im/everybuddy/everybuddy-0.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/net-im/everybuddy/everybuddy-0.4.3.ebuild,v 1.6 2003/02/13 14:07:48 vapier Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/everybuddy/everybuddy-0.4.3.ebuild,v 1.7 2003/09/05 23:58:57 msterret Exp $
 
 IUSE="arts esd gnome nls"
 
@@ -33,7 +33,7 @@ src_compile() {
 		&& myconf="${myconf} --with-gnome" \
 		|| myconf="${myconf} --without-gnome"
 
-	
+
 	use nls \
 		&& myconf="${myconf} --enable-nls" \
 		|| myconf="${myconf} --disable-nls"
diff --git a/net-im/gabber/Manifest b/net-im/gabber/Manifest
index 071044b5e7dc..b363af4b5550 100644
--- a/net-im/gabber/Manifest
+++ b/net-im/gabber/Manifest
@@ -1,7 +1,7 @@
 MD5 132ccd5352e23d1b6943ede4e0b8eb98 ChangeLog 3017
-MD5 3e45d5f90cf9c3913a5a3bfa691e1580 gabber-0.8.7-r3.ebuild 1516
-MD5 0b43562d9da797d4cc352b2bfa081056 gabber-0.8.7.12.ebuild 1456
-MD5 7f4248e59263d8c6bb5d5f37b34c13ba gabber-0.8.8.ebuild 1523
+MD5 76087b8d4373f1744a272b85e6f7f965 gabber-0.8.7-r3.ebuild 1515
+MD5 a9e82857a502587eff242f796d814563 gabber-0.8.7.12.ebuild 1456
+MD5 8039ded48ed39de69e637a8996709595 gabber-0.8.8.ebuild 1519
 MD5 3c26fdd6bd493036699f43145aad0613 files/TCPtransmitter.cc-gcc3-gentoo.patch 584
 MD5 13fd2ef7cc09c0d0e358f639c31f687e files/digest-gabber-0.8.7-r3 65
 MD5 2305451d3c724090f81f2cf91551a581 files/digest-gabber-0.8.7.12 68
diff --git a/net-im/gabber/gabber-0.8.7-r3.ebuild b/net-im/gabber/gabber-0.8.7-r3.ebuild
index 2c5aa50b1edb..f37000536da0 100644
--- a/net-im/gabber/gabber-0.8.7-r3.ebuild
+++ b/net-im/gabber/gabber-0.8.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.7-r3.ebuild,v 1.10 2003/07/19 20:58:36 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.7-r3.ebuild,v 1.11 2003/09/05 23:58:57 msterret Exp $
 
 IUSE="xmms ssl nls crypt"
 
@@ -15,7 +15,7 @@ KEYWORDS="x86 ~alpha ppc"
 
 DEPEND=">=gnome-base/gnome-libs-1.4.1.7
 	>=gnome-base/libglade-0.17-r1
-	<gnome-base/libglade-2.0.0 
+	<gnome-base/libglade-2.0.0
 	<gnome-extra/gal-1.99
 	>=dev-cpp/gnomemm-1.2.2
 	>=dev-cpp/gtkmm-1.2.5
diff --git a/net-im/gabber/gabber-0.8.7.12.ebuild b/net-im/gabber/gabber-0.8.7.12.ebuild
index 96d609ed41c7..31d0efd101bb 100644
--- a/net-im/gabber/gabber-0.8.7.12.ebuild
+++ b/net-im/gabber/gabber-0.8.7.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.7.12.ebuild,v 1.9 2003/07/19 20:58:36 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.7.12.ebuild,v 1.10 2003/09/05 23:58:57 msterret Exp $
 
 inherit flag-o-matic
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 
 RDEPEND=">=gnome-base/gnome-libs-1.4.1.7
-	<gnome-base/libglade-2.0.0 
+	<gnome-base/libglade-2.0.0
 	<gnome-extra/gal-1.99
 	>=dev-cpp/gnomemm-1.2.2
 	<dev-cpp/gtkmm-1.3.0
diff --git a/net-im/gabber/gabber-0.8.8.ebuild b/net-im/gabber/gabber-0.8.8.ebuild
index c3cfdd0c56d2..08cfa4412e58 100644
--- a/net-im/gabber/gabber-0.8.8.ebuild
+++ b/net-im/gabber/gabber-0.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.8.ebuild,v 1.8 2003/07/19 20:58:36 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gabber/gabber-0.8.8.ebuild,v 1.9 2003/09/05 23:58:57 msterret Exp $
 
 inherit flag-o-matic gcc
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 
 RDEPEND=">=gnome-base/gnome-libs-1.4.1.7
-	<gnome-base/libglade-2.0.0 
+	<gnome-base/libglade-2.0.0
 	<gnome-extra/gal-1.99
 	>=dev-cpp/gnomemm-1.2.2
 	<dev-cpp/gtkmm-1.3.0
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	
+
 	cd ${S}/omf-install
 	sed -i -e "s/-scrollkeeper-update.*//" Makefile.in
 
@@ -55,7 +55,7 @@ src_compile() {
 	econf ${myconf} \
 		`use_enable xmms` \
 		`use_enable nls` || die "configure failed"
-		
+
 	emake || die "make failed"
 }
 
diff --git a/net-im/gaim-cvs/Manifest b/net-im/gaim-cvs/Manifest
index 730b48762390..d74be14b77d7 100644
--- a/net-im/gaim-cvs/Manifest
+++ b/net-im/gaim-cvs/Manifest
@@ -1,5 +1,5 @@
+MD5 1f1a33096bb644d74c96cec1d7daf2fd ChangeLog 2298
+MD5 9566472f1bd9fa99ada5eb62fbe46cb7 gaim-cvs-0.60-r3.ebuild 1145
+MD5 5a1e3da9011e211756a8e09efa9f4f4c gaim-cvs-0.60-r4.ebuild 740
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gaim-cvs-0.60-r3 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gaim-cvs-0.60-r4 0
-MD5 9566472f1bd9fa99ada5eb62fbe46cb7 gaim-cvs-0.60-r3.ebuild 1145
-MD5 1f1a33096bb644d74c96cec1d7daf2fd ChangeLog 2298
-MD5 e768d6b5018a34b04d82d10e1fcbe38c gaim-cvs-0.60-r4.ebuild 739
diff --git a/net-im/gaim-cvs/gaim-cvs-0.60-r4.ebuild b/net-im/gaim-cvs/gaim-cvs-0.60-r4.ebuild
index 09447909f5fd..a7ad111169ec 100644
--- a/net-im/gaim-cvs/gaim-cvs-0.60-r4.ebuild
+++ b/net-im/gaim-cvs/gaim-cvs-0.60-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-cvs/gaim-cvs-0.60-r4.ebuild,v 1.3 2003/04/06 14:10:13 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-cvs/gaim-cvs-0.60-r4.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
 
 IUSE="nls perl spell"
 
@@ -15,7 +15,7 @@ DEPEND="!net-im/gaim"
 
 src_unpack() {
 	eerror "Gaim-cvs has been depreciated at the request of the gaim developers"
-	eerror "and the system administrators at sourceforge."	
+	eerror "and the system administrators at sourceforge."
 	echo
 	eerror "GAIM is back on a regular release schedule, so please"
 	eerror "emerge unmerge gaim-cvs; emerge gaim"
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index e74fe501b7a7..a14815436ea9 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,19 +1,19 @@
 MD5 a6e33ee1297e8c38fd6eec1add385c51 ChangeLog 12549
-MD5 63f5d5add45a34870e61e2e39d70b919 gaim-0.63-r1.ebuild 1835
+MD5 ee85fc80d1fff82c4685bec57769b9fe gaim-0.67.ebuild 2166
 MD5 91f54778609b147c372351022d0e884d gaim-0.68.ebuild 2335
 MD5 0b185f663a67d39645e0916cddcba37e gaim-0.68-r1.ebuild 2418
-MD5 952fa517ecd51b7b6211ad7c75d5a968 gaim-0.66-r3.ebuild 1993
+MD5 3871c1360a32f544c1c5ee62a6be2e58 gaim-0.63-r1.ebuild 1809
+MD5 b2ac9eb41db9100a22760f81282f388b gaim-0.66-r3.ebuild 1968
 MD5 dc9ef26d3efea7cbe38cbe534cdeaa53 metadata.xml 510
-MD5 b7dbbfc3c88f5a2f775f6eaf0a7e5f90 gaim-0.66-r4.ebuild 1996
-MD5 2644363a2af5679ca70cb373699454f9 gaim-0.67.ebuild 2191
-MD5 5a98382c9f7676cd002eddf283172085 gaim-0.67-r1.ebuild 2181
+MD5 732ec4a141392279f7984b5e2dc73fc3 gaim-0.66-r4.ebuild 1971
+MD5 818cef960e0b788579222e2552cd9451 gaim-0.67-r1.ebuild 2156
 MD5 a2573960c3aaad5d08dddcc3ad9b5f23 files/digest-gaim-0.68 135
+MD5 97fa7a76f6bc96c363844ccc57b2bec4 files/gaim_gtkimcontext_patch.diff 1106
 MD5 908f7feabba8c8b1d74510f1f2b7706d files/digest-gaim-0.63-r1 126
 MD5 a2573960c3aaad5d08dddcc3ad9b5f23 files/digest-gaim-0.68-r1 135
 MD5 8a38e88937de7dd9b0bd1cd18afd8164 files/gaim-encryption-2.10-keys.patch 476
 MD5 ac8c28584ee56def0cea65e38e235f0b files/digest-gaim-0.66-r3 126
 MD5 eaec78ac2e19b5e10a20a2c86bf65a34 files/gaim-0.66-prefs.c.diff 598
-MD5 97fa7a76f6bc96c363844ccc57b2bec4 files/gaim_gtkimcontext_patch.diff 1106
 MD5 33402ae3eb7e61ffae5ab976f90121b2 files/digest-gaim-0.66-r4 126
 MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
 MD5 6850f68d67c0633c22c07fb1ecf8ed07 files/digest-gaim-0.67-r1 135
diff --git a/net-im/gaim/gaim-0.63-r1.ebuild b/net-im/gaim/gaim-0.63-r1.ebuild
index 40e25fad1393..c0ee5d653178 100644
--- a/net-im/gaim/gaim-0.63-r1.ebuild
+++ b/net-im/gaim/gaim-0.63-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.63-r1.ebuild,v 1.4 2003/07/01 14:38:38 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.63-r1.ebuild,v 1.5 2003/09/05 23:58:57 msterret Exp $
 
 IUSE="nls perl spell ssl nas"
 
@@ -8,7 +8,7 @@ DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://gaim.sourceforge.net/"
 EV=1.20
 SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
-        ssl? ( mirror://sourceforge/gaim-encryption/encrypt-${EV}.tar.gz )"
+	ssl? ( mirror://sourceforge/gaim-encryption/encrypt-${EV}.tar.gz )"
 
 
 SLOT="0"
@@ -37,11 +37,10 @@ src_unpack() {
 }
 
 src_compile() {
-
 	local myconf
-        use perl || myconf="${myconf} --disable-perl"
-        use spell || myconf="${myconf} --disable-gtkspell"
-        use nls  || myconf="${myconf} --disable-nls"
+	use perl || myconf="${myconf} --disable-perl"
+	use spell || myconf="${myconf} --disable-gtkspell"
+	use nls  || myconf="${myconf} --disable-nls"
 	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
 
 	econf ${myconf} || die "Configuration failed"
diff --git a/net-im/gaim/gaim-0.66-r3.ebuild b/net-im/gaim/gaim-0.66-r3.ebuild
index 6f4e988a976e..a4e1cf2e9d48 100644
--- a/net-im/gaim/gaim-0.66-r3.ebuild
+++ b/net-im/gaim/gaim-0.66-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.66-r3.ebuild,v 1.3 2003/09/05 11:22:37 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.66-r3.ebuild,v 1.4 2003/09/05 23:58:57 msterret Exp $
 
 IUSE="nls perl spell nas ssl cjk"
 
@@ -8,7 +8,7 @@ DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://gaim.sourceforge.net/"
 EV=2.02
 SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
-        ssl? ( mirror://sourceforge/gaim-encryption/encrypt-${EV}.tar.gz )"
+	ssl? ( mirror://sourceforge/gaim-encryption/encrypt-${EV}.tar.gz )"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -44,9 +44,9 @@ src_unpack() {
 src_compile() {
 
 	local myconf
-        use perl || myconf="${myconf} --disable-perl"
-        use spell || myconf="${myconf} --disable-gtkspell"
-        use nls  || myconf="${myconf} --disable-nls"
+	use perl || myconf="${myconf} --disable-perl"
+	use spell || myconf="${myconf} --disable-gtkspell"
+	use nls  || myconf="${myconf} --disable-nls"
 	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
 
 	econf ${myconf} || die "Configuration failed"
diff --git a/net-im/gaim/gaim-0.66-r4.ebuild b/net-im/gaim/gaim-0.66-r4.ebuild
index f4677c83923e..766dfa693369 100644
--- a/net-im/gaim/gaim-0.66-r4.ebuild
+++ b/net-im/gaim/gaim-0.66-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.66-r4.ebuild,v 1.1 2003/08/18 14:24:50 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.66-r4.ebuild,v 1.2 2003/09/05 23:58:57 msterret Exp $
 
 IUSE="nls perl spell nas ssl cjk"
 
@@ -8,7 +8,7 @@ DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://gaim.sourceforge.net/"
 EV=2.04
 SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
-        ssl? ( mirror://sourceforge/gaim-encryption/encrypt-${EV}.tar.gz )"
+	ssl? ( mirror://sourceforge/gaim-encryption/encrypt-${EV}.tar.gz )"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -44,9 +44,9 @@ src_unpack() {
 src_compile() {
 
 	local myconf
-        use perl || myconf="${myconf} --disable-perl"
-        use spell || myconf="${myconf} --disable-gtkspell"
-        use nls  || myconf="${myconf} --disable-nls"
+	use perl || myconf="${myconf} --disable-perl"
+	use spell || myconf="${myconf} --disable-gtkspell"
+	use nls  || myconf="${myconf} --disable-nls"
 	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
 
 	econf ${myconf} || die "Configuration failed"
diff --git a/net-im/gaim/gaim-0.67-r1.ebuild b/net-im/gaim/gaim-0.67-r1.ebuild
index 458474d6872f..3323c053f069 100644
--- a/net-im/gaim/gaim-0.67-r1.ebuild
+++ b/net-im/gaim/gaim-0.67-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.67-r1.ebuild,v 1.1 2003/08/25 14:56:15 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.67-r1.ebuild,v 1.2 2003/09/05 23:58:57 msterret Exp $
 
 IUSE="nls perl spell nas ssl"
 
@@ -8,7 +8,7 @@ DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://gaim.sourceforge.net/"
 EV=2.08
 SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
-        ssl? ( mirror://sourceforge/gaim-encryption/gaim-encryption-${EV}.tar.gz )"
+	ssl? ( mirror://sourceforge/gaim-encryption/gaim-encryption-${EV}.tar.gz )"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -40,9 +40,9 @@ src_unpack() {
 src_compile() {
 
 	local myconf
-        use perl || myconf="${myconf} --disable-perl"
-        use spell || myconf="${myconf} --disable-gtkspell"
-        use nls  || myconf="${myconf} --disable-nls"
+	use perl || myconf="${myconf} --disable-perl"
+	use spell || myconf="${myconf} --disable-gtkspell"
+	use nls  || myconf="${myconf} --disable-nls"
 	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
 
 	econf ${myconf} || die "Configuration failed"
diff --git a/net-im/gaim/gaim-0.67.ebuild b/net-im/gaim/gaim-0.67.ebuild
index 5f0928c7339a..73971ef8ab3f 100644
--- a/net-im/gaim/gaim-0.67.ebuild
+++ b/net-im/gaim/gaim-0.67.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.67.ebuild,v 1.1 2003/08/19 17:54:46 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.67.ebuild,v 1.2 2003/09/05 23:58:57 msterret Exp $
 
 IUSE="nls perl spell nas ssl"
 
@@ -8,7 +8,7 @@ DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://gaim.sourceforge.net/"
 EV=2.06
 SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
-        ssl? ( mirror://sourceforge/gaim-encryption/gaim-encryption-${EV}.tar.gz )"
+	ssl? ( mirror://sourceforge/gaim-encryption/gaim-encryption-${EV}.tar.gz )"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -40,9 +40,9 @@ src_unpack() {
 src_compile() {
 
 	local myconf
-        use perl || myconf="${myconf} --disable-perl"
-        use spell || myconf="${myconf} --disable-gtkspell"
-        use nls  || myconf="${myconf} --disable-nls"
+	use perl || myconf="${myconf} --disable-perl"
+	use spell || myconf="${myconf} --disable-gtkspell"
+	use nls  || myconf="${myconf} --disable-nls"
 	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
 
 	econf ${myconf} || die "Configuration failed"
diff --git a/net-im/gnome-jabber/Manifest b/net-im/gnome-jabber/Manifest
index 6622841a4683..f13e1d9cbb55 100644
--- a/net-im/gnome-jabber/Manifest
+++ b/net-im/gnome-jabber/Manifest
@@ -1,4 +1,4 @@
-MD5 96e6f07573f13b0878a3b859c29c9859 gnome-jabber-0.3.ebuild 751
 MD5 4c106a5b68b64825b3d6fe0ae940057e ChangeLog 376
+MD5 af498c451b099d6601882252ed09361f gnome-jabber-0.3.ebuild 750
 MD5 73ff32361db766e3faa475a7b5d7b3ae metadata.xml 306
 MD5 e6887fa446d55a750641b0cf76eee609 files/digest-gnome-jabber-0.3 69
diff --git a/net-im/gnome-jabber/gnome-jabber-0.3.ebuild b/net-im/gnome-jabber/gnome-jabber-0.3.ebuild
index f4eb48ccf67f..72a9d2c495ee 100644
--- a/net-im/gnome-jabber/gnome-jabber-0.3.ebuild
+++ b/net-im/gnome-jabber/gnome-jabber-0.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnome-jabber/gnome-jabber-0.3.ebuild,v 1.1 2003/09/03 16:54:28 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnome-jabber/gnome-jabber-0.3.ebuild,v 1.2 2003/09/05 23:58:58 msterret Exp $
 
-inherit gnome2 
+inherit gnome2
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gnome Jabber Client"
@@ -11,11 +11,11 @@ HOMEPAGE="http://gnome-jabber.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64" 
+KEYWORDS="~x86 ~amd64"
 
 DEPEND=">=x11-libs/gtk+-2.0.4
 	>=gnome-base/libgnomeui-2.0.0
-	>=gnome-base/libglade-2.0.0	
+	>=gnome-base/libglade-2.0.0
 	>net-libs/gnet-2
 	>=gnome-base/gconf-2.0
 	>=dev-libs/libxml2-2.4.23
diff --git a/net-im/gnomeicu/Manifest b/net-im/gnomeicu/Manifest
index fa9994df5c2a..1ee14abf684f 100644
--- a/net-im/gnomeicu/Manifest
+++ b/net-im/gnomeicu/Manifest
@@ -1,8 +1,8 @@
-MD5 79892f20a43da5b86b58a1de0472c629 gnomeicu-0.98.3.ebuild 1630
-MD5 6c0e0f23b9c201dafaefdf7d42ad51ef gnomeicu-0.99-r1.ebuild 986
 MD5 35b8341cb4b3d47cadf38c3aad254aab ChangeLog 4240
+MD5 0ffe367ba94361b32cd600c72cce0faa gnomeicu-0.98.111-r1.ebuild 1149
+MD5 f0d300298194bfcc49edab8f3812351d gnomeicu-0.98.3.ebuild 1597
+MD5 28d1d3452030a926d97b72fe1c28bc5a gnomeicu-0.99-r1.ebuild 986
 MD5 e7dda4f8de303304f5abca08974eacfb metadata.xml 380
-MD5 2bcc5010672333534f69649ee9730451 gnomeicu-0.98.111-r1.ebuild 1176
-MD5 705333559eedf05e858bc1e0232cca5f files/digest-gnomeicu-0.99-r1 67
-MD5 c50cc84b05665c2903e41b3b206ed4be files/digest-gnomeicu-0.98.3 68
 MD5 8eb07033b5df670698aa800e66b5b803 files/digest-gnomeicu-0.98.111-r1 71
+MD5 c50cc84b05665c2903e41b3b206ed4be files/digest-gnomeicu-0.98.3 68
+MD5 705333559eedf05e858bc1e0232cca5f files/digest-gnomeicu-0.99-r1 67
diff --git a/net-im/gnomeicu/gnomeicu-0.98.111-r1.ebuild b/net-im/gnomeicu/gnomeicu-0.98.111-r1.ebuild
index 2a83200d16f0..ec529bb32e1c 100644
--- a/net-im/gnomeicu/gnomeicu-0.98.111-r1.ebuild
+++ b/net-im/gnomeicu/gnomeicu-0.98.111-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.98.111-r1.ebuild,v 1.6 2003/05/09 22:52:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.98.111-r1.ebuild,v 1.7 2003/09/05 23:58:58 msterret Exp $
 
 
 inherit debug
@@ -19,13 +19,13 @@ DEPEND=">=x11-libs/gtk+-2.0.5
 	>=gnome-base/libgnome-2.0.0
 	>=gnome-base/libgnomeui-2.0.0
 	>=sys-libs/gdbm-1.8.0
-	>=gnome-base/libglade-2.0.0	
+	>=gnome-base/libglade-2.0.0
 	<net-libs/gnet-2
 	>=gnome-base/gnome-panel-2.0.0"
 RDEPEND="sys-devel/gettext"
 
 
-src_compile() {                           
+src_compile() {
 	local myconf
 
 	myconf="--prefix=/usr --with-debug"
diff --git a/net-im/gnomeicu/gnomeicu-0.98.3.ebuild b/net-im/gnomeicu/gnomeicu-0.98.3.ebuild
index b276d8b9e83c..a9d78c7aba96 100644
--- a/net-im/gnomeicu/gnomeicu-0.98.3.ebuild
+++ b/net-im/gnomeicu/gnomeicu-0.98.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.98.3.ebuild,v 1.8 2003/05/09 22:52:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.98.3.ebuild,v 1.9 2003/09/05 23:58:58 msterret Exp $
 
 IUSE="nls esd gnome"
 
-inherit debug 
+inherit debug
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gnome ICQ Client"
@@ -14,7 +14,7 @@ HOMEPAGE="http://gnomeicu.sourceforge.net/"
 DEPEND=">=gnome-base/gnome-libs-1.4.1.2-r2
 	>=sys-libs/gdbm-1.8.0
 	=gnome-base/libglade-0.17*
-	>=media-libs/gdk-pixbuf-0.9.0	
+	>=media-libs/gdk-pixbuf-0.9.0
 	>=net-libs/gnet-1.1.0
 	gnome? ( =gnome-base/gnome-panel-1.4* )
 	esd? ( >=media-sound/esound-0.2.23 )"
@@ -27,18 +27,18 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
-src_compile() {                           
+src_compile() {
 	local myconf
 
 	myconf="--prefix=/usr"
 
 	use esd || myconf="${myconf} --disable-esd-test"
-	
+
 	# Disabling socks5 support. if socks5 is present
 	# in USE, gnomeicu buid will fail. Check ChangeLog
-	# for more info about this issue. stroke@gentoo.org 
+	# for more info about this issue. stroke@gentoo.org
 	# use socks5 && myconf="${myconf} --enable-socks5"
-	
+
 	use nls || ( \
 		myconf="${myconf} --disable-nls"
 		mkdir ./intl
@@ -48,7 +48,7 @@ src_compile() {
 	# remove the panel applet if you dont use gnome,
 	# nice hack for gnome2 compability
 
-	use gnome || myconf="${myconf} --disable-applet" 	
+	use gnome || myconf="${myconf} --disable-applet"
 
 	econf \
 		${myconf} --enable-debug || die
diff --git a/net-im/gnomeicu/gnomeicu-0.99-r1.ebuild b/net-im/gnomeicu/gnomeicu-0.99-r1.ebuild
index 60e179c42ec2..22f988e0003b 100644
--- a/net-im/gnomeicu/gnomeicu-0.99-r1.ebuild
+++ b/net-im/gnomeicu/gnomeicu-0.99-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.99-r1.ebuild,v 1.7 2003/08/13 23:36:31 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomeicu/gnomeicu-0.99-r1.ebuild,v 1.8 2003/09/05 23:58:58 msterret Exp $
 
-inherit gnome2 
+inherit gnome2
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gnome ICQ Client"
@@ -11,14 +11,14 @@ HOMEPAGE="http://gnomeicu.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~ppc ~alpha amd64" 
+KEYWORDS="x86 sparc ~ppc ~alpha amd64"
 
 DEPEND=">=x11-libs/gtk+-2.0.5
 	>=dev-libs/libxml2-2.4.23
 	>=gnome-base/libgnome-2.0.0
 	>=gnome-base/libgnomeui-2.0.0
 	>=sys-libs/gdbm-1.8.0
-	>=gnome-base/libglade-2.0.0	
+	>=gnome-base/libglade-2.0.0
 	<net-libs/gnet-2
 	>=app-text/scrollkeeper-0.3.5
 	>=dev-util/pkgconfig-0.12.0
diff --git a/net-im/gnomemeeting/Manifest b/net-im/gnomemeeting/Manifest
index f0b42545f6e8..4480a0ede129 100644
--- a/net-im/gnomemeeting/Manifest
+++ b/net-im/gnomemeeting/Manifest
@@ -1,12 +1,12 @@
 MD5 54b853dba74e5ac71eda252db8590aa1 ChangeLog 4844
-MD5 9125b0114ab29f20517e4d0a4159b464 gnomemeeting-0.94.1.ebuild 2054
-MD5 1fdaf524c2f0b4538ade1339b56f5c5e gnomemeeting-0.96.1-r1.ebuild 2237
-MD5 722a2ed52de70ffc3eb61c981826fdf9 gnomemeeting-0.98.0.ebuild 1831
-MD5 e9743675671b433c48a35369bd66f1d1 gnomemeeting-0.98.4.ebuild 1856
+MD5 d8322bd3f7f177c740529bc08b2a5b47 gnomemeeting-0.94.1.ebuild 2038
+MD5 9cd6fcb42c3ff1dee5b697ee11c1dd62 gnomemeeting-0.96.1-r1.ebuild 2146
+MD5 e1741db608f6288a99783c6c1c57dd38 gnomemeeting-0.98.4.ebuild 1802
+MD5 9347f82f9f4f91d6a76e63ecaf178b2e gnomemeeting-0.98.0.ebuild 1777
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
 MD5 458cb44a30e47a07c5116219068ab5a3 files/digest-gnomemeeting-0.94.1 72
-MD5 abb5207ac1546a0bb5e8bdefb8755631 files/digest-gnomemeeting-0.96.1-r1 72
-MD5 d7f5c8ebbb84deee9a443e843b2633a2 files/digest-gnomemeeting-0.98.0 72
 MD5 4a3686c5f4a07cfe93d2025668e96498 files/digest-gnomemeeting-0.98.4 73
+MD5 abb5207ac1546a0bb5e8bdefb8755631 files/digest-gnomemeeting-0.96.1-r1 72
 MD5 4ee8954cda5e11a1c1a5345408df45ba files/gnomemeeting-0.96.1-pwcworkaround.patch 612
 MD5 978186afd59d560ab2bba226c2742451 files/ifarts.diff 42145
+MD5 d7f5c8ebbb84deee9a443e843b2633a2 files/digest-gnomemeeting-0.98.0 72
diff --git a/net-im/gnomemeeting/gnomemeeting-0.94.1.ebuild b/net-im/gnomemeeting/gnomemeeting-0.94.1.ebuild
index dbc2cf635ae5..6058a9707c4d 100644
--- a/net-im/gnomemeeting/gnomemeeting-0.94.1.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-0.94.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.94.1.ebuild,v 1.8 2003/02/13 14:09:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.94.1.ebuild,v 1.9 2003/09/05 23:58:58 msterret Exp $
 
 IUSE="sdl ssl"
 
@@ -58,7 +58,7 @@ src_compile() {
 
 	use sdl && myconf="${myconf} --with-sdl-prefix=/usr" \
 		|| myconf="${myconf} --disable-sdltest"
-		
+
 	export PWLIBDIR=/usr/share/pwlib
 	export OPENH323DIR=/usr/share/openh323
 
@@ -78,5 +78,5 @@ src_compile() {
 DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS FAQ TODO"
 G2CONF="${G2CONF} --enable-platform-gnome-2"
 SCHEMAS="gnomemeeting.schema"
-	
-															
+
+
diff --git a/net-im/gnomemeeting/gnomemeeting-0.96.1-r1.ebuild b/net-im/gnomemeeting/gnomemeeting-0.96.1-r1.ebuild
index c571bad2e3e4..06618e1bc0d1 100644
--- a/net-im/gnomemeeting/gnomemeeting-0.96.1-r1.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-0.96.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.96.1-r1.ebuild,v 1.2 2003/05/16 23:33:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.96.1-r1.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
 
 IUSE="sdl ssl ipv6 gnome"
 inherit gnome2
@@ -17,17 +17,17 @@ DEPEND=">=dev-libs/pwlib-1.4.11
 	>=net-nds/openldap-2.0.25
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	sdl? ( >=media-libs/libsdl-1.2.4 )
-    gnome? ( >=gnome-base/libbonoboui-2.0
-    	>=gnome-base/libbonobo-2.0
-    	>=gnome-base/libgnomeui-2.0
-        >=gnome-base/libgnome-2.0
+	gnome? ( >=gnome-base/libbonoboui-2.0
+		>=gnome-base/libbonobo-2.0
+		>=gnome-base/libgnomeui-2.0
+		>=gnome-base/libgnome-2.0
 		>=net-libs/linc-0.5.0 )
 	>=x11-libs/gtk+-2.0.0
-	>=dev-libs/glib-2.0.0    
+	>=dev-libs/glib-2.0.0
 	>=gnome-base/gconf-2.0
 	>=dev-libs/libxml2-2.4.23
-	>=media-sound/esound-0.2.28 
-    >=gnome-base/ORBit2-2.5.0"
+	>=media-sound/esound-0.2.28
+	>=gnome-base/ORBit2-2.5.0"
 
 RDEPEND="${DEPEND}
 	>=dev-util/pkgconfig-0.12.0
@@ -36,8 +36,8 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-    # backported patch from CVS. remove this in next release.
-    epatch ${FILESDIR}/${P}-pwcworkaround.patch || die "patch failed"
+	# backported patch from CVS. remove this in next release.
+	epatch ${FILESDIR}/${P}-pwcworkaround.patch || die "patch failed"
 }
 
 src_compile() {
@@ -45,29 +45,29 @@ src_compile() {
 	local myconf
 	export PWLIBDIR=/usr/share/pwlib
 	export OPENH323DIR=/usr/share/openh323
-    
-    myconf="${myconf} --with-ptlib-includes=${PWLIBDIR}/include/ptlib"
-    myconf="${myconf} --with-ptlib-libs=/usr/lib"
-    myconf="${myconf} --with-openh323-includes=${OPENH323DIR}/include"
-    myconf="${myconf} --with-openh323-libs=/usr/lib"
-    
-    if [ -n "`use ssl`" ]; then
+
+	myconf="${myconf} --with-ptlib-includes=${PWLIBDIR}/include/ptlib"
+	myconf="${myconf} --with-ptlib-libs=/usr/lib"
+	myconf="${myconf} --with-openh323-includes=${OPENH323DIR}/include"
+	myconf="${myconf} --with-openh323-libs=/usr/lib"
+
+	if [ -n "`use ssl`" ]; then
 		myconf="${myconf} --with-openssl-libs=/usr/lib"
 		myconf="${myconf} --with-openssl-includes=/usr/include/openssl"
-    fi
-    
+	fi
+
 	use sdl && myconf="${myconf} --with-sdl-prefix=/usr" \
 		|| myconf="${myconf} --disable-sdltest"
 	use ipv6 && myconf="${myconf} --enable-ipv6" \
-    	|| myconf="${myconf} --disable-ipv6"
+		|| myconf="${myconf} --disable-ipv6"
 	use gnome || myconf="${myconf} --disable-gnome"
-        
-    econf ${myconf} || die "configure failed"
-    make || die
+
+	econf ${myconf} || die "configure failed"
+	make || die
 }
 
 DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS FAQ TODO"
 G2CONF="${G2CONF} --enable-platform-gnome-2"
 SCHEMAS="gnomemeeting.schema"
-	
-															
+
+
diff --git a/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild b/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild
index 3132f18b8297..860b7bd17382 100644
--- a/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild,v 1.3 2003/09/03 13:27:08 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
 
 IUSE="sdl ssl ipv6"
 
@@ -20,16 +20,16 @@ DEPEND=">=dev-libs/pwlib-1.5.0
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	sdl? ( >=media-libs/libsdl-1.2.4 )
 	>=gnome-base/libbonoboui-2.0
-    >=gnome-base/libbonobo-2.0
-    >=gnome-base/libgnomeui-2.0
-    >=gnome-base/libgnome-2.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/libgnomeui-2.0
+	>=gnome-base/libgnome-2.0
 	>=net-libs/linc-0.5.0
 	>=x11-libs/gtk+-2.0.0
-	>=dev-libs/glib-2.0.0    
+	>=dev-libs/glib-2.0.0
 	>=gnome-base/gconf-2.0
 	>=dev-libs/libxml2-2.4.23
-	>=media-sound/esound-0.2.28 
-    >=gnome-base/ORBit2-2.5.0"
+	>=media-sound/esound-0.2.28
+	>=gnome-base/ORBit2-2.5.0"
 
 RDEPEND="${DEPEND}
 	>=dev-util/pkgconfig-0.12.0
@@ -41,26 +41,26 @@ MAKEOPTS="${MAKEOPTS} -j1"
 src_compile() {
 
 	local myconf
-    
-    myconf="${myconf} --with-ptlib-includes=/usr/include/ptlib"
-    myconf="${myconf} --with-ptlib-libs=/usr/lib"
-    myconf="${myconf} --with-openh323-includes=/usr/include/openh323"
-    myconf="${myconf} --with-openh323-libs=/usr/lib"
-    
-    if [ -n "`use ssl`" ]; then
+
+	myconf="${myconf} --with-ptlib-includes=/usr/include/ptlib"
+	myconf="${myconf} --with-ptlib-libs=/usr/lib"
+	myconf="${myconf} --with-openh323-includes=/usr/include/openh323"
+	myconf="${myconf} --with-openh323-libs=/usr/lib"
+
+	if [ -n "`use ssl`" ]; then
 		myconf="${myconf} --with-openssl-libs=/usr/lib"
 		myconf="${myconf} --with-openssl-includes=/usr/include/openssl"
-    fi
-    
+	fi
+
 	use sdl \
 		&& myconf="${myconf} --with-sdl-prefix=/usr" \
 		|| myconf="${myconf} --disable-sdltest"
-		
+
 	use ipv6 \
 		&& myconf="${myconf} --enable-ipv6" \
-    	|| myconf="${myconf} --disable-ipv6"
+		|| myconf="${myconf} --disable-ipv6"
 
-    econf ${myconf} || die "configure failed"
+	econf ${myconf} || die "configure failed"
 	emake || die
 }
 
diff --git a/net-im/gnomemeeting/gnomemeeting-0.98.4.ebuild b/net-im/gnomemeeting/gnomemeeting-0.98.4.ebuild
index 164950b8d7ce..3d300f312722 100644
--- a/net-im/gnomemeeting/gnomemeeting-0.98.4.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-0.98.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.4.ebuild,v 1.1 2003/09/03 13:27:08 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.4.ebuild,v 1.2 2003/09/05 23:58:58 msterret Exp $
 
 inherit gnome2
 
@@ -20,16 +20,16 @@ DEPEND=">=dev-libs/pwlib-1.5.0
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	sdl? ( >=media-libs/libsdl-1.2.4 )
 	>=gnome-base/libbonoboui-2.0
-    >=gnome-base/libbonobo-2.0
-    >=gnome-base/libgnomeui-2.0
-    >=gnome-base/libgnome-2.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/libgnomeui-2.0
+	>=gnome-base/libgnome-2.0
 	>=net-libs/linc-0.5.0
 	>=x11-libs/gtk+-2.0.0
-	>=dev-libs/glib-2.0.0    
+	>=dev-libs/glib-2.0.0
 	>=gnome-base/gconf-2.0
 	>=dev-libs/libxml2-2.4.23
-	>=media-sound/esound-0.2.28 
-    >=gnome-base/ORBit2-2.5.0"
+	>=media-sound/esound-0.2.28
+	>=gnome-base/ORBit2-2.5.0"
 
 RDEPEND="${DEPEND}
 	>=dev-util/pkgconfig-0.12.0
@@ -41,26 +41,26 @@ MAKEOPTS="${MAKEOPTS} -j1"
 src_compile() {
 
 	local myconf
-    
-    myconf="${myconf} --with-ptlib-includes=/usr/include/ptlib"
-    myconf="${myconf} --with-ptlib-libs=/usr/lib"
-    myconf="${myconf} --with-openh323-includes=/usr/include/openh323"
-    myconf="${myconf} --with-openh323-libs=/usr/lib"
-    
-    if [ -n "`use ssl`" ]; then
+
+	myconf="${myconf} --with-ptlib-includes=/usr/include/ptlib"
+	myconf="${myconf} --with-ptlib-libs=/usr/lib"
+	myconf="${myconf} --with-openh323-includes=/usr/include/openh323"
+	myconf="${myconf} --with-openh323-libs=/usr/lib"
+
+	if [ -n "`use ssl`" ]; then
 		myconf="${myconf} --with-openssl-libs=/usr/lib"
 		myconf="${myconf} --with-openssl-includes=/usr/include/openssl"
-    fi
-    
+	fi
+
 	use sdl \
 		&& myconf="${myconf} --with-sdl-prefix=/usr" \
 		|| myconf="${myconf} --disable-sdltest"
-		
+
 	use ipv6 \
 		&& myconf="${myconf} --enable-ipv6" \
-    	|| myconf="${myconf} --disable-ipv6"
+		|| myconf="${myconf} --disable-ipv6"
 
-    econf ${myconf} || die "configure failed"
+	econf ${myconf} || die "configure failed"
 	emake || die
 }
 
diff --git a/net-im/gnophone/Manifest b/net-im/gnophone/Manifest
index 0a7a415dd693..7e134c0daca7 100644
--- a/net-im/gnophone/Manifest
+++ b/net-im/gnophone/Manifest
@@ -1,3 +1,3 @@
 MD5 7ccc41f9d92d1c162d92033671c451f5 ChangeLog 522
-MD5 b6af37cfca5a2fbecb2f1b4a60612ff8 gnophone-0.2.4.ebuild 1476
+MD5 df618f77b50c1901925980c5477b9175 gnophone-0.2.4.ebuild 1461
 MD5 caf70915f318d848269f9905180332bb files/digest-gnophone-0.2.4 66
diff --git a/net-im/gnophone/gnophone-0.2.4.ebuild b/net-im/gnophone/gnophone-0.2.4.ebuild
index 6d7bf33487b9..30f374e32b92 100644
--- a/net-im/gnophone/gnophone-0.2.4.ebuild
+++ b/net-im/gnophone/gnophone-0.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnophone/gnophone-0.2.4.ebuild,v 1.3 2003/04/16 17:52:58 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnophone/gnophone-0.2.4.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
 
 IUSE=""
 
@@ -42,9 +42,9 @@ src_compile() {
 	local myconf
 
 	use mozilla \
-                && myconf="${myconf} 
-			--with-mozilla-home=/usr/lib/mozilla 
-			--with-mozilla-lib=/usr/lib/mozilla 
+		&& myconf="${myconf}
+			--with-mozilla-home=/usr/lib/mozilla
+			--with-mozilla-lib=/usr/lib/mozilla
 			--with-mozilla-include=/usr/lib/mozilla/include" \
 		|| myconf="${myconf} --disable-mozilla"
 	use esd \
diff --git a/net-im/ickle/Manifest b/net-im/ickle/Manifest
index d04c4239f43c..8471229fd9c5 100644
--- a/net-im/ickle/Manifest
+++ b/net-im/ickle/Manifest
@@ -1,5 +1,5 @@
 MD5 16d4b8be2d067d9f0d8b729678fa4a08 ChangeLog 1671
-MD5 fc7b3f610384499f40183e7b50bb3c48 ickle-0.3.1.ebuild 1016
-MD5 a50a9683e26c3bf1e4106655d764a0eb ickle-0.3.2.ebuild 1053
+MD5 169bf3e88bbf8e83d8ec9c8459601eeb ickle-0.3.1.ebuild 1017
+MD5 d19a5d5bd3a85774e3b101742f099fb2 ickle-0.3.2.ebuild 1053
 MD5 1420c7048dda323dacbe155c0b330cf0 files/digest-ickle-0.3.1 63
 MD5 4f183c043e775a0e9f7d932d32319016 files/digest-ickle-0.3.2 63
diff --git a/net-im/ickle/ickle-0.3.1.ebuild b/net-im/ickle/ickle-0.3.1.ebuild
index 0ab7c8dd2674..5fe72bf8a5a3 100644
--- a/net-im/ickle/ickle-0.3.1.ebuild
+++ b/net-im/ickle/ickle-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ickle/ickle-0.3.1.ebuild,v 1.9 2003/07/13 12:38:31 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ickle/ickle-0.3.1.ebuild,v 1.10 2003/09/05 23:58:58 msterret Exp $
 
 IUSE="spell gnome"
 
@@ -40,5 +40,5 @@ src_compile() {
 
 src_install () {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS  COPYING ChangeLog  INSTALL NEWS README THANKS TODO 
+	dodoc AUTHORS  COPYING ChangeLog  INSTALL NEWS README THANKS TODO
 }
diff --git a/net-im/ickle/ickle-0.3.2.ebuild b/net-im/ickle/ickle-0.3.2.ebuild
index 0803c92353dc..d674654a8ee1 100644
--- a/net-im/ickle/ickle-0.3.2.ebuild
+++ b/net-im/ickle/ickle-0.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ickle/ickle-0.3.2.ebuild,v 1.4 2003/07/13 12:38:31 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ickle/ickle-0.3.2.ebuild,v 1.5 2003/09/05 23:58:58 msterret Exp $
 
 IUSE="spell gnome"
 
@@ -40,5 +40,5 @@ src_compile() {
 
 src_install () {
 	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS  COPYING ChangeLog  INSTALL NEWS README THANKS TODO 
+	dodoc AUTHORS  COPYING ChangeLog  INSTALL NEWS README THANKS TODO
 }
diff --git a/net-im/imcom/Manifest b/net-im/imcom/Manifest
index c3ba5baf6596..49c2f321c351 100644
--- a/net-im/imcom/Manifest
+++ b/net-im/imcom/Manifest
@@ -1,7 +1,7 @@
 MD5 728ddda51ab924bb64c91ecd07500502 ChangeLog 1717
-MD5 273ba6d5821139136be1ae791a2e2f32 imcom-0.95.ebuild 784
-MD5 11623475a50b0f4ae30c84892738b04d imcom-1.31.ebuild 942
+MD5 23302197bd0e0c3901dd1ceedaa4dfe7 imcom-1.31.ebuild 925
+MD5 485d094514364b73f811c24a830c1fda imcom-0.95.ebuild 783
 MD5 1cba1b4de0a2f189931b618d764daa74 metadata.xml 404
-MD5 3034003b5e28e3d66787f708dbc8dec6 files/Makefile-1.31 1308
-MD5 4bdbd49a06fb47cdf5e0b4a5de74da91 files/digest-imcom-0.95 62
 MD5 2728c9cb165a176d49822b58ddd6825b files/digest-imcom-1.31 62
+MD5 4bdbd49a06fb47cdf5e0b4a5de74da91 files/digest-imcom-0.95 62
+MD5 3034003b5e28e3d66787f708dbc8dec6 files/Makefile-1.31 1308
diff --git a/net-im/imcom/imcom-0.95.ebuild b/net-im/imcom/imcom-0.95.ebuild
index 90233d486535..84b5bac443df 100644
--- a/net-im/imcom/imcom-0.95.ebuild
+++ b/net-im/imcom/imcom-0.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/imcom/imcom-0.95.ebuild,v 1.3 2003/08/29 20:31:51 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/imcom/imcom-0.95.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
 
 S=${WORKDIR}/${P}
 SRC_URI="http://imcom.floobin.cx/files/${P}.tar.gz"
@@ -17,7 +17,7 @@ KEYWORDS="x86 ppc"
 IUSE=""
 
 src_install() {
-	
+
 	dodir /usr/bin
 	dodir /usr/share/imcom
 	dodoc AutoStatus.API CONTRIBUTORS LICENSE README* TODO WHATSNEW
@@ -25,7 +25,7 @@ src_install() {
 	cp *.py ${D}/usr/share/imcom
 	mv imcom imcom.orig
 	sed -e 's:/usr/local/share:/usr/share:' imcom.orig | cat > imcom
-	chmod 755 imcom 
+	chmod 755 imcom
 	dobin imcom
 
 }
diff --git a/net-im/imcom/imcom-1.31.ebuild b/net-im/imcom/imcom-1.31.ebuild
index e8f60e9d9aa7..678d739b1a02 100644
--- a/net-im/imcom/imcom-1.31.ebuild
+++ b/net-im/imcom/imcom-1.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/imcom/imcom-1.31.ebuild,v 1.2 2003/08/29 20:31:51 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/imcom/imcom-1.31.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
 
 MYVER=${PV}
 S=${WORKDIR}/${PN}-${MYVER}
@@ -24,12 +24,12 @@ src_unpack() {
 }
 
 src_compile() {
-    ./configure --prefix=/usr || die "configure failed"
-    #make
-    # fixing it ..
-    cp ${FILESDIR}/Makefile-1.31 ${S}/Makefile
-    pwd
-    make
+	./configure --prefix=/usr || die "configure failed"
+	#make
+	# fixing it ..
+	cp ${FILESDIR}/Makefile-1.31 ${S}/Makefile
+	pwd
+	make
 }
 
 src_install() {
diff --git a/net-im/jabber-server/Manifest b/net-im/jabber-server/Manifest
index cdce542535bb..30bde70fb7b5 100644
--- a/net-im/jabber-server/Manifest
+++ b/net-im/jabber-server/Manifest
@@ -1,8 +1,7 @@
 MD5 a9213d2a897ec283c394cf2bdd5786d5 ChangeLog 1810
-MD5 ad1c92493e7d65a46207d8720f94ac22 jabber-server-1.4.2-r2.ebuild 3968
+MD5 b4f693604b2b6a39d6759ce5e89e4db3 jabber-server-1.4.2-r2.ebuild 3881
+MD5 8e3f2c9def6ac70299c29c1f25ed90ef jabber-server-1.4.2-r3.ebuild 7175
 MD5 294f8b0ea0f44ada8012c8dcbc085830 metadata.xml 492
-MD5 fb76b56216f18a8065b9f561bf1e3ce0 jabber-server-1.4.2-r3.ebuild 7247
-MD5 cdd557874bd23433279e577b7e7a511d files/jabber.rc6-r3 904
 MD5 56c6d30985fe5f4ce2ecbc717f2b0f11 files/config-1.4.2-r1.tbz2 3202
 MD5 9729606a22930fc068220751ef1a6f89 files/digest-jabber-server-1.4.2-r2 426
 MD5 3f7e7d44eb27017153b85a4e51857d2b files/hash_map_gcc32.patch 328
@@ -10,3 +9,4 @@ MD5 411dedb4aa875912c371c2e0c5997d82 files/jabber.rc6-r1 739
 MD5 bc605a772d428ee0977b948ecdae26d3 files/mio_ssl.c.patch 874
 MD5 b9aed79237eda16bfed03ecd55ab1d84 files/config-1.4.2-r3.tbz2 3341
 MD5 abc7119a63c93e36d8107dd5c42bf16b files/digest-jabber-server-1.4.2-r3 541
+MD5 cdd557874bd23433279e577b7e7a511d files/jabber.rc6-r3 904
diff --git a/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild b/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild
index e8ace10f409a..c817557cd8da 100644
--- a/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild
+++ b/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild,v 1.24 2003/04/25 20:56:36 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r2.ebuild,v 1.25 2003/09/05 23:58:58 msterret Exp $
 
 S="${WORKDIR}/jabber-${PV}"
 DESCRIPTION="Open Source Jabber Server & MUC,AIM,MSN,ICQ and Yahoo transports"
@@ -43,30 +43,29 @@ src_compile() {
 	mv jabberd/jabberd.c jabberd/jabberd.c.orig
 	sed 's:pstrdup(jabberd__runtime,HOME):"/var/spool/jabber":' jabberd/jabberd.c.orig > jabberd/jabberd.c
 	rm -f jabberd/jabberd.c.orig
-	./configure ${myconf} || die 
+	./configure ${myconf} || die
 	make || die
 
-        cd ${S}/aim-transport
-	./configure || die 
-        make || die
+	cd ${S}/aim-transport
+	./configure || die
+	make || die
 	make install
 
-        cd ${S}/msn-transport
+	cd ${S}/msn-transport
 	./bootstrap || die
-        ./configure || die
-        make || die
+	./configure || die
+	make || die
 
 	cd ${S}/mu-conference
-	make || die 
-
-        cd ${S}/yahoo-transport-2
-        make || die
+	make || die
 
+	cd ${S}/yahoo-transport-2
+	make || die
 }
 
 src_install() {
-        exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r1 jabber
-        dodir /usr/sbin /etc/jabber /usr/lib/jabber /var/log/jabber
+	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r1 jabber
+	dodir /usr/sbin /etc/jabber /usr/lib/jabber /var/log/jabber
 	touch ${D}/var/log/jabber/error.log
 	touch ${D}/var/log/jabber/record.log
 	dodir /var/spool/jabber
@@ -91,36 +90,36 @@ src_install() {
 
 pkg_postinst() {
 	local test_group=`grep ^jabber: /etc/group | cut -d: -f1`
-        if [ -z $test_group ]
-        then
+	if [ -z $test_group ]
+	then
 		groupadd jabber
 	fi
 
 	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
 	if [ -z $test_user ]
-	then 
+	then
 		useradd jabber -s /bin/false -d /var/spool/jabber -g jabber -m
 	fi
-	
-	chown jabber.jabber /etc/jabber 
+
+	chown jabber.jabber /etc/jabber
 	chown jabber.jabber /usr/sbin/jabberd
 	chown jabber.jabber /var/log/jabber -R
 	chown jabber.jabber /var/spool/jabber -R
-	chmod o-rwx /etc/jabber 
+	chmod o-rwx /etc/jabber
 	chmod o-rwx /usr/sbin/jabberd
 	chmod o-rwx /var/log/jabber -R
 	chmod o-rwx /var/spool/jabber -R
 	chmod u+rwx /usr/sbin/jabberd
-	chmod g-x /etc/jabber 
+	chmod g-x /etc/jabber
 	chmod g-x /usr/sbin/jabberd
 	chmod g-x /var/log/jabber -R
 	chmod g-x /var/spool/jabber -R
-	chmod g+rw /etc/jabber 
+	chmod g+rw /etc/jabber
 	chmod g+rw /usr/sbin/jabberd
 	chmod g+rw /var/spool/jabber -R
 	chmod g+rw /var/log/jabber -R
 	chmod u+xs /usr/sbin/jabberd
-	
+
 	einfo "Change 'localhost' to your server's domainname in the /etc/jabber/*.xml configs first"
 	einfo "To enable SSL connections, execute /etc/jabber/self-cert.sh"
 	einfo "(Only if compiled with SSL support (ssl in USE)"
diff --git a/net-im/jabber-server/jabber-server-1.4.2-r3.ebuild b/net-im/jabber-server/jabber-server-1.4.2-r3.ebuild
index 669d3587346b..7e5128c3fc3d 100644
--- a/net-im/jabber-server/jabber-server-1.4.2-r3.ebuild
+++ b/net-im/jabber-server/jabber-server-1.4.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r3.ebuild,v 1.2 2003/08/12 00:58:00 luke-jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabber-server/jabber-server-1.4.2-r3.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
 
 S="${WORKDIR}/jabber-${PV}"
 DESCRIPTION="Open Source Jabber Server & JUD,MUC,AIM,MSN,ICQ and Yahoo transports"
@@ -67,26 +67,26 @@ src_compile() {
 	mv jabberd/jabberd.c jabberd/jabberd.c.orig
 	sed 's:pstrdup(jabberd__runtime,HOME):"/var/spool/jabber":' jabberd/jabberd.c.orig > jabberd/jabberd.c
 	rm -f jabberd/jabberd.c.orig
-	./configure ${myconf} || die 
+	./configure ${myconf} || die
 	make || die
 
 	if ! use j-noaim; then
 	        cd ${S}/aim-transport
-		./configure || die 
+		./configure || die
 	        make || die
 		make install
 	fi
 
 	if ! use j-nomsn; then
-	        cd ${S}/msn-transport
+		cd ${S}/msn-transport
 		./bootstrap || die
-	        ./configure || die
-        	make || die
+		./configure || die
+		make || die
 	fi
 
 	if ! use j-nomuconf; then
 		cd ${S}/mu-conference
-		make || die 
+		make || die
 	fi
 
 	if ! use j-nojud; then
@@ -95,8 +95,8 @@ src_compile() {
 	fi
 
 	if ! use j-noyahoo; then
-	        cd ${S}/yahoo-transport-2
-        	make || die
+		cd ${S}/yahoo-transport-2
+		make || die
 	fi
 
 	if use ldap; then
@@ -106,8 +106,8 @@ src_compile() {
 }
 
 src_install() {
-        exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r3 jabber
-        dodir /usr/sbin /etc/jabber /usr/lib/jabber /var/log/jabber
+	exeinto /etc/init.d ; newexe ${FILESDIR}/jabber.rc6-r3 jabber
+	dodir /usr/sbin /etc/jabber /usr/lib/jabber /var/log/jabber
 	touch ${D}/var/log/jabber/error.log
 	touch ${D}/var/log/jabber/record.log
 	dodir /var/spool/jabber
@@ -173,36 +173,36 @@ src_install() {
 
 pkg_postinst() {
 	local test_group=`grep ^jabber: /etc/group | cut -d: -f1`
-        if [ -z $test_group ]
-        then
+	if [ -z $test_group ]
+	then
 		groupadd jabber
 	fi
 
 	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
 	if [ -z $test_user ]
-	then 
+	then
 		useradd jabber -s /bin/false -d /var/spool/jabber -g jabber -m
 	fi
-	
-	chown jabber.jabber /etc/jabber 
+
+	chown jabber.jabber /etc/jabber
 	chown jabber.jabber /usr/sbin/jabberd
 	chown jabber.jabber /var/log/jabber -R
 	chown jabber.jabber /var/spool/jabber -R
-	chmod o-rwx /etc/jabber 
+	chmod o-rwx /etc/jabber
 	chmod o-rwx /usr/sbin/jabberd
 	chmod o-rwx /var/log/jabber -R
 	chmod o-rwx /var/spool/jabber -R
 	chmod u+rwx /usr/sbin/jabberd
-	chmod g-x /etc/jabber 
+	chmod g-x /etc/jabber
 	chmod g-x /usr/sbin/jabberd
 	chmod g-x /var/log/jabber -R
 	chmod g-x /var/spool/jabber -R
-	chmod g+rw /etc/jabber 
+	chmod g+rw /etc/jabber
 	chmod g+rw /usr/sbin/jabberd
 	chmod g+rw /var/spool/jabber -R
 	chmod g+rw /var/log/jabber -R
 	chmod u+xs /usr/sbin/jabberd
-	
+
 	einfo "Change 'localhost' to your server's domainname in the"
 	einfo "/etc/jabber/*.xml configs first"
 	einfo "To enable SSL connections, execute /etc/jabber/self-cert.sh"
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 1155befa59c8..5aeb9fc9fd70 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,12 +1,12 @@
-MD5 9621bb0991005c190d71639170ef121c licq-1.2.6-r1.ebuild 3486
-MD5 ff6c77697baaf183ce2743b5c6e1ad5e licq-1.2.6.ebuild 4015
 MD5 d3d82f99c44134e66186106027bd844b ChangeLog 4934
-MD5 8aefae72a96771e97c6fd421447c5986 licq-1.2.7.ebuild 3491
+MD5 7d7f44364eef0bcb47bf21dc8770649f licq-1.2.6.ebuild 4008
+MD5 d256bc31fd85d1c82db81b8aae130db8 licq-1.2.6-r1.ebuild 3478
+MD5 f36c3d669381e669e5ff433448def1a3 licq-1.2.7.ebuild 3488
 MD5 6d0aca705b508a2fef7714d742683001 files/1.2.0a-config.patch 996
 MD5 3b10872fafb342e13b1b81dacae7d68e files/1.2.0a-gcc3-gentoo.patch 1996
 MD5 ea0b7f8aa5cf8b175753ede6025f06ce files/1.2.0a-qt31.patch 1306
-MD5 1ac1dc493a89a6338d9e432e072e73a4 files/1.2.6-debugflag.patch 382
-MD5 c18e90be9c36c7efb06211733ad765ff files/1.2.7-debugflag.patch 396
 MD5 361d20e528b72b61170b815694ebe1c7 files/digest-licq-1.2.6 64
 MD5 361d20e528b72b61170b815694ebe1c7 files/digest-licq-1.2.6-r1 64
+MD5 1ac1dc493a89a6338d9e432e072e73a4 files/1.2.6-debugflag.patch 382
+MD5 c18e90be9c36c7efb06211733ad765ff files/1.2.7-debugflag.patch 396
 MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64
diff --git a/net-im/licq/licq-1.2.6-r1.ebuild b/net-im/licq/licq-1.2.6-r1.ebuild
index 2d10e8d2584e..499d8fee9584 100644
--- a/net-im/licq/licq-1.2.6-r1.ebuild
+++ b/net-im/licq/licq-1.2.6-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.6-r1.ebuild,v 1.3 2003/06/20 09:49:53 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.6-r1.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
 
 inherit kde-base
 need-kde 3.0
 
-DESCRIPTION="ICQ Client with v8 support" 
+DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
 SRC_URI="http://download.sourceforge.net/licq/${P}.tar.bz2"
 
@@ -14,7 +14,7 @@ SLOT="2"
 KEYWORDS="x86"
 IUSE="ssl socks5 qt kde ncurses"
 
-# we can't have conditional dependencies so "use kde && inherit kde-base" 
+# we can't have conditional dependencies so "use kde && inherit kde-base"
 # won't work -- messes up dep caching.
 
 # need-kde and their eclass friends inject things into DEPEND. But we only
@@ -58,11 +58,11 @@ src_compile() {
 
 	econf ${myconf} || die
 	emake || die
-	
+
 	# Create the various plug-ins
 
 	# First, the Qt plug-in
-	if [ "`use qt`" ] 
+	if [ "`use qt`" ]
 	then
 		# A hack to build against the latest QT:
 		local v
@@ -112,13 +112,13 @@ src_install() {
 	dodoc ChangeLog INSTALL README*
 
 	# Install the plug-ins
-	if [ "`use qt`" ] 
+	if [ "`use qt`" ]
 	then
 		cd ${S}/plugins/qt-gui
-		make DESTDIR=${D} install || die	
+		make DESTDIR=${D} install || die
 		docinto plugins/qt-gui
 		dodoc README*
-		
+
 		# fix bug #12436, see my comment there
 ##		if [ "`use kde`" ]; then
 ##			cd $D/usr/lib/licq
diff --git a/net-im/licq/licq-1.2.6.ebuild b/net-im/licq/licq-1.2.6.ebuild
index d62d1dc66339..d53e7a25c984 100644
--- a/net-im/licq/licq-1.2.6.ebuild
+++ b/net-im/licq/licq-1.2.6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.6.ebuild,v 1.2 2003/04/25 16:02:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.6.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
 
 inherit kde-base
 need-kde 3.0
 
-DESCRIPTION="ICQ Client with v8 support" 
+DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
 SRC_URI="http://download.sourceforge.net/licq/${P}.tar.bz2"
 
@@ -14,7 +14,7 @@ SLOT="2"
 KEYWORDS="x86"
 IUSE="ssl socks5 qt kde gtk ncurses"
 
-# we can't have conditional dependencies so "use kde && inherit kde-base" 
+# we can't have conditional dependencies so "use kde && inherit kde-base"
 # won't work -- messes up dep caching.
 
 # need-kde and their eclass friends inject things into DEPEND. But we only
@@ -29,7 +29,7 @@ DEPEND="kde? ( ${DEPEND} )
 
 src_unpack() {
 	unpack ${A}
-	
+
 	if [ "`use kde`" ]
 	then
 		# fix for #12436
@@ -66,11 +66,11 @@ src_compile() {
 
 	econf ${first_conf} || die
 	emake || die
-	
+
 	# Create the various plug-ins
 
 	# First, the Qt plug-in
-	if [ "`use qt`" ] 
+	if [ "`use qt`" ]
 	then
 		# A hack to build against the latest QT:
 		local v
@@ -129,13 +129,13 @@ src_install() {
 	dodoc ChangeLog INSTALL README*
 
 	# Install the plug-ins
-	if [ "`use qt`" ] 
+	if [ "`use qt`" ]
 	then
 		cd ${S}/plugins/qt-gui
-		make DESTDIR=${D} install || die	
+		make DESTDIR=${D} install || die
 		docinto plugins/qt-gui
 		dodoc README*
-		
+
 		# fix bug #12436, see my comment there
 ##		if [ "`use kde`" ]; then
 ##			cd $D/usr/lib/licq
diff --git a/net-im/licq/licq-1.2.7.ebuild b/net-im/licq/licq-1.2.7.ebuild
index 8c4b68e9e8df..e8a3e990fc01 100644
--- a/net-im/licq/licq-1.2.7.ebuild
+++ b/net-im/licq/licq-1.2.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.7.ebuild,v 1.6 2003/08/29 22:59:27 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.7.ebuild,v 1.7 2003/09/05 23:58:58 msterret Exp $
 
-DESCRIPTION="ICQ Client with v8 support" 
+DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
 SRC_URI="http://download.sourceforge.net/licq/${P}.tar.bz2"
 
@@ -11,7 +11,7 @@ SLOT="2"
 KEYWORDS="x86 ~ppc ~sparc"
 IUSE="ssl socks5 qt kde ncurses"
 
-# we can't have conditional dependencies so "use kde && inherit kde-base" 
+# we can't have conditional dependencies so "use kde && inherit kde-base"
 # won't work -- messes up dep caching.
 
 # need-kde and their eclass friends inject things into DEPEND. But we only
@@ -55,11 +55,11 @@ src_compile() {
 
 	econf ${myconf} || die
 	emake || die
-	
+
 	# Create the various plug-ins
 
 	# First, the Qt plug-in
-	if [ "`use qt`" ] 
+	if [ "`use qt`" ]
 	then
 		# A hack to build against the latest QT:
 		local v
@@ -109,13 +109,13 @@ src_install() {
 	dodoc ChangeLog INSTALL README* doc/*
 
 	# Install the plug-ins
-	if [ "`use qt`" ] 
+	if [ "`use qt`" ]
 	then
 		cd ${S}/plugins/qt-gui
-		make DESTDIR=${D} install || die	
+		make DESTDIR=${D} install || die
 		docinto plugins/qt-gui
 		dodoc README*
-		
+
 		# fix bug #12436, see my comment there
 ##		if [ "`use kde`" ]; then
 ##			cd $D/usr/lib/licq
diff --git a/net-im/linphone/Manifest b/net-im/linphone/Manifest
index 2050e0b7496b..4bf63b7f3672 100644
--- a/net-im/linphone/Manifest
+++ b/net-im/linphone/Manifest
@@ -1,5 +1,5 @@
-MD5 a0232ab5ebf0e61290df410da9561c26 files/digest-linphone-0.9.0-r1 67
-MD5 29e56d450d4aa47d230872e2b18eae40 files/digest-linphone-0.10.2 68
 MD5 1a7193dbe4bcf6fb4d8e00477691f856 ChangeLog 873
 MD5 c59b6d0f0d832aefbce563233b014d54 linphone-0.9.0-r1.ebuild 1376
-MD5 3f32b6eb5c55bf2bd910c0306926308f linphone-0.10.2.ebuild 1675
+MD5 07c0fd856087edd7053ee1c1e41fafb2 linphone-0.10.2.ebuild 1678
+MD5 a0232ab5ebf0e61290df410da9561c26 files/digest-linphone-0.9.0-r1 67
+MD5 29e56d450d4aa47d230872e2b18eae40 files/digest-linphone-0.10.2 68
diff --git a/net-im/linphone/linphone-0.10.2.ebuild b/net-im/linphone/linphone-0.10.2.ebuild
index 88b544de4aaa..782c601eff69 100644
--- a/net-im/linphone/linphone-0.10.2.ebuild
+++ b/net-im/linphone/linphone-0.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/linphone-0.10.2.ebuild,v 1.3 2003/07/13 12:44:50 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linphone/linphone-0.10.2.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
 
 IUSE="doc gtk nls xv alsa"
 
@@ -19,7 +19,7 @@ DEPEND="dev-libs/glib
 	gtk? ( =x11-libs/gtk+-1.2* )
 	gtk2? ( >=x11-libs/gtk+-2 )
 	gnome? ( gnome-base/gnome-panel
-	gnome-base/libgnome 
+	gnome-base/libgnome
 	gnome-base/libgnomeui )
 	alsa? ( >media-sound/alsa-driver-0.5 )
 	doc? ( dev-util/gtk-doc )"
diff --git a/net-im/linpopup/Manifest b/net-im/linpopup/Manifest
index a46b692b141d..6aae428cd500 100644
--- a/net-im/linpopup/Manifest
+++ b/net-im/linpopup/Manifest
@@ -1,3 +1,3 @@
 MD5 a9aaf7fe7f3c990f6d6b6abbab826ca9 ChangeLog 420
-MD5 c73d9b4705976c2713644ad3b390b902 linpopup-1.2.0.ebuild 1815
+MD5 f43d01c82f73619d1e883759dcb40bab linpopup-1.2.0.ebuild 1809
 MD5 535a60b1905be6c3c0349c488220e30c files/digest-linpopup-1.2.0 70
diff --git a/net-im/linpopup/linpopup-1.2.0.ebuild b/net-im/linpopup/linpopup-1.2.0.ebuild
index 25743f984f91..850fc4573f5a 100644
--- a/net-im/linpopup/linpopup-1.2.0.ebuild
+++ b/net-im/linpopup/linpopup-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-1.2.0.ebuild,v 1.2 2003/02/13 14:11:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-1.2.0.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
 
 MY_P=LinPopUp-${PV}
 DESCRIPTION="LinPopUp, for sending/receiving WinPopup messages via Samba"
@@ -14,7 +14,7 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=">=net-fs/samba-2.2.7
-        =x11-libs/gtk+-1.2*"
+	=x11-libs/gtk+-1.2*"
 
 S=${WORKDIR}/${MY_P}/src
 
@@ -30,7 +30,7 @@ src_install() {
 	doins ../extra/gtkrc
 	insinto /usr/share/${P}/pixmaps
 	doins ../pixmaps/little_igloo.xpm
-	
+
 	# Install messages.dat if not already present
 	if [ ! -f /var/lib/linpopup/messages.dat ]
 	then
diff --git a/net-im/micq/Manifest b/net-im/micq/Manifest
index d038910ae3a3..863c1557d43d 100644
--- a/net-im/micq/Manifest
+++ b/net-im/micq/Manifest
@@ -1,7 +1,7 @@
+MD5 98b3bdda75cf021c9d49e29511daf77b ChangeLog 1255
+MD5 2424e4fa88595205705b08dba5863be6 micq-0.4.10.1.ebuild 548
+MD5 ea8fb27e2bbede63cdc96beff4f0e08a micq-0.4.10.2.ebuild 548
+MD5 ab8cd3d852c6e2c953fa0be403aed87d micq-0.4.9.4.ebuild 518
 MD5 2b2a5c4a5704f7286fd044272b45d265 files/digest-micq-0.4.10.1 62
-MD5 82dbf8f6ec723eff4d37d7f0c19bc6c0 files/digest-micq-0.4.9.4 61
 MD5 f533c4ed6d83ef2f9a113a88d970cb9a files/digest-micq-0.4.10.2 62
-MD5 4541248f4712143c1d18e9d78b457221 micq-0.4.10.1.ebuild 558
-MD5 248d21befa49d79df3d1db042494127c micq-0.4.9.4.ebuild 533
-MD5 98b3bdda75cf021c9d49e29511daf77b ChangeLog 1255
-MD5 309fb696865b5003198159e01911c88c micq-0.4.10.2.ebuild 555
+MD5 82dbf8f6ec723eff4d37d7f0c19bc6c0 files/digest-micq-0.4.9.4 61
diff --git a/net-im/micq/micq-0.4.10.1.ebuild b/net-im/micq/micq-0.4.10.1.ebuild
index abd3f3d34e64..9770eb46802d 100644
--- a/net-im/micq/micq-0.4.10.1.ebuild
+++ b/net-im/micq/micq-0.4.10.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/micq/micq-0.4.10.1.ebuild,v 1.2 2003/02/28 06:41:46 kutsuya Exp $
- 
+# $Header: /var/cvsroot/gentoo-x86/net-im/micq/micq-0.4.10.1.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
+
 SRC_URI="ftp://www.micq.org/pub/micq/source/${P}.tgz
 	http://www.micq.org/source/${P}.tgz"
 DESCRIPTION="ICQ text-mode client with many features"
@@ -13,7 +13,7 @@ KEYWORDS="x86"
 IUSE=""
 DEPEND="virtual/glibc"
 RDEPEND="${DEPEND}"
-       
+
 src_install() {
-    make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die
 }
diff --git a/net-im/micq/micq-0.4.10.2.ebuild b/net-im/micq/micq-0.4.10.2.ebuild
index 3a4d2680b11b..766464b16d4f 100644
--- a/net-im/micq/micq-0.4.10.2.ebuild
+++ b/net-im/micq/micq-0.4.10.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/micq/micq-0.4.10.2.ebuild,v 1.2 2003/07/13 12:44:50 aliz Exp $
- 
+# $Header: /var/cvsroot/gentoo-x86/net-im/micq/micq-0.4.10.2.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
+
 SRC_URI="ftp://www.micq.org/pub/micq/source/${P}.tgz
 	http://www.micq.org/source/${P}.tgz"
 DESCRIPTION="ICQ text-mode client with many features"
@@ -13,7 +13,7 @@ KEYWORDS="x86"
 IUSE=""
 DEPEND="virtual/glibc"
 RDEPEND="${DEPEND}"
-       
+
 src_install() {
-    make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die
 }
diff --git a/net-im/micq/micq-0.4.9.4.ebuild b/net-im/micq/micq-0.4.9.4.ebuild
index 079917ea6c73..2168266c01f0 100644
--- a/net-im/micq/micq-0.4.9.4.ebuild
+++ b/net-im/micq/micq-0.4.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/micq/micq-0.4.9.4.ebuild,v 1.3 2003/02/13 14:11:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/micq/micq-0.4.9.4.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
 
 SRC_URI="http://www.micq.org/source/${P}.tgz"
 DESCRIPTION="text based ICQ client with many features"
@@ -9,14 +9,14 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="x86"
-       
+
 S=${WORKDIR}/${P}
 
 src_compile() {
-    econf || die
-    emake || die
-}	
+	econf || die
+	emake || die
+}
 
 src_install() {
-    make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die
 }
diff --git a/net-im/msn4lin/Manifest b/net-im/msn4lin/Manifest
index 6961c34e8829..d62135987619 100644
--- a/net-im/msn4lin/Manifest
+++ b/net-im/msn4lin/Manifest
@@ -1,8 +1,8 @@
+MD5 bb3cfdf28680fa044880d0a535dd622a ChangeLog 637
+MD5 a3e6ff34c3ae39c11dacc69cedcfe774 msn4lin-0.4.ebuild 973
+MD5 c3bc6afcfbc4bdefacf1fa4d896e521c msn4lin-0.4f.ebuild 959
 MD5 1435087fbeace895c35c16d9fef667f5 files/digest-msn4lin-0.4 63
 MD5 ef255dbcfda35ca390b1fd1937345c34 files/languages-0.4 214
 MD5 3576fb2193fe4f4cf586916f03f5b058 files/msn4lin-0.4-gentoo.diff 2257
 MD5 3533cc8c9dea5cf84d655dae08fda597 files/digest-msn4lin-0.4f 68
 MD5 1b93ea9d9c9f0be77644637d910eef6f files/msn4lin-0.4f-gentoo.diff 1817
-MD5 4433dac1c5433f456bced83a55424992 msn4lin-0.4.ebuild 982
-MD5 bb3cfdf28680fa044880d0a535dd622a ChangeLog 637
-MD5 1ef488519b74916eb66d3cc50a4e64bf msn4lin-0.4f.ebuild 966
diff --git a/net-im/msn4lin/msn4lin-0.4.ebuild b/net-im/msn4lin/msn4lin-0.4.ebuild
index 3e9b239f273b..7a0cdea86107 100644
--- a/net-im/msn4lin/msn4lin-0.4.ebuild
+++ b/net-im/msn4lin/msn4lin-0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/msn4lin/msn4lin-0.4.ebuild,v 1.4 2003/02/13 14:12:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/msn4lin/msn4lin-0.4.ebuild,v 1.5 2003/09/05 23:58:58 msterret Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Tcl/tk MSN Messenger client for linux"
@@ -9,15 +9,15 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.borsanza.com/"
 DEPEND=">=dev-lang/tcl-8.3.3
 	>=dev-lang/tk-8.3.3"
-	
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
 
 src_unpack() {
-    unpack ${P}.tar.gz
-    cd ${S}
-    patch -p0 < ${FILESDIR}/${P}-gentoo.diff
+	unpack ${P}.tar.gz
+	cd ${S}
+	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
 }
 
 src_install() {
@@ -34,5 +34,5 @@ src_install() {
 	echo "#!/bin/sh" > comprobar
 	echo "#!/bin/sh" > actualizar
 	ln -sf /usr/share/msn4lin/msn4lin ${D}/usr/bin/msn4lin
-	
+
 }
diff --git a/net-im/msn4lin/msn4lin-0.4f.ebuild b/net-im/msn4lin/msn4lin-0.4f.ebuild
index 5331fb55a3f2..4bcfd95067f9 100644
--- a/net-im/msn4lin/msn4lin-0.4f.ebuild
+++ b/net-im/msn4lin/msn4lin-0.4f.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/msn4lin/msn4lin-0.4f.ebuild,v 1.2 2003/07/13 12:44:50 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/msn4lin/msn4lin-0.4f.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
 
 S=${WORKDIR}/${MY_P}
 MY_P=${PN}-tcl
@@ -10,15 +10,15 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-${PV}.tar.gz"
 HOMEPAGE="http://msn4lin.sourceforge.net/"
 DEPEND=">=dev-lang/tcl-8.3.3
 	>=dev-lang/tk-8.3.3"
-	
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86"
 
 src_unpack() {
-    unpack ${A}
-    cd ${S}
-    patch -p0 < ${FILESDIR}/${P}-gentoo.diff
+	unpack ${A}
+	cd ${S}
+	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
 }
 
 src_install() {
@@ -33,5 +33,5 @@ src_install() {
 	echo "#!/bin/sh" > comprobar
 	echo "#!/bin/sh" > actualizar
 	ln -sf /usr/share/msn4lin-tcl/msn4lin ${D}/usr/bin/msn4lin
-	
+
 }
diff --git a/net-im/msnlib/Manifest b/net-im/msnlib/Manifest
index 4f6a6ba46f77..35a5f0db2473 100644
--- a/net-im/msnlib/Manifest
+++ b/net-im/msnlib/Manifest
@@ -1,5 +1,5 @@
 MD5 393d46b798ad3fc9f60836f89d45286a ChangeLog 801
-MD5 962a97984f31cbbef3b8b8ecef499517 msnlib-2.0.ebuild 678
-MD5 ebbc33890ab1a8861adaccfbb59334a4 msnlib-2.1.ebuild 679
+MD5 4bb592711bfe4fb670f076f618222170 msnlib-2.0.ebuild 678
+MD5 67dbe21aec3b46bb6d4043b2ff7da74b msnlib-2.1.ebuild 679
 MD5 914483f7561d2323256bb9517cdbd9e7 files/digest-msnlib-2.0 62
 MD5 b7daef7a9d94187128ac1e107b64485e files/digest-msnlib-2.1 62
diff --git a/net-im/msnlib/msnlib-2.0.ebuild b/net-im/msnlib/msnlib-2.0.ebuild
index 25e0e7735b81..cf48db4e0d43 100644
--- a/net-im/msnlib/msnlib-2.0.ebuild
+++ b/net-im/msnlib/msnlib-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/msnlib/msnlib-2.0.ebuild,v 1.2 2003/08/28 13:35:47 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/msnlib/msnlib-2.0.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
 
 inherit distutils
 
@@ -22,7 +22,7 @@ src_install() {
 	cd ${S}
 	dobin msn
 	dobin msnsetup
-	
+
 	insinto /usr/share/doc/${PF}
 	doins msnrc.sample
 }
diff --git a/net-im/msnlib/msnlib-2.1.ebuild b/net-im/msnlib/msnlib-2.1.ebuild
index 7eac2081e399..58f3d0854adb 100644
--- a/net-im/msnlib/msnlib-2.1.ebuild
+++ b/net-im/msnlib/msnlib-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/msnlib/msnlib-2.1.ebuild,v 1.1 2003/08/28 13:35:47 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/msnlib/msnlib-2.1.ebuild,v 1.2 2003/09/05 23:58:58 msterret Exp $
 
 inherit distutils
 
@@ -22,7 +22,7 @@ src_install() {
 	cd ${S}
 	dobin msn
 	dobin msnsetup
-	
+
 	insinto /usr/share/doc/${PF}
 	doins msnrc.sample
 }
diff --git a/net-im/naim/Manifest b/net-im/naim/Manifest
index fffad7d1326b..85e4f2daa23e 100644
--- a/net-im/naim/Manifest
+++ b/net-im/naim/Manifest
@@ -1,9 +1,9 @@
-MD5 4ddc978fd411df14abd68b59119a15cb naim-0.11.5.9.ebuild 1654
-MD5 3b64e7c64b5779d5d5ed7c79f26d03d9 naim-0.11.6-r1.ebuild 990
-MD5 958009311da2343c57e72faea25830f4 naim-0.11.5.1.ebuild 1502
 MD5 251d16309ff319f04143f2474e5835d9 ChangeLog 5359
-MD5 81d9bdb81123639f690d50bbd6367c5e naim-0.11.6.ebuild 1674
+MD5 958009311da2343c57e72faea25830f4 naim-0.11.5.1.ebuild 1502
+MD5 cd72f38b7f6497fdb9739a4de063bf00 naim-0.11.6.ebuild 1670
+MD5 3b64e7c64b5779d5d5ed7c79f26d03d9 naim-0.11.6-r1.ebuild 990
+MD5 eafb32bae84a596405d76f580b0202cf naim-0.11.5.9.ebuild 1654
 MD5 23216ff5f63546b3610e43eb95f69def files/digest-naim-0.11.5.1 65
-MD5 300fc32cbc7fc1a9d7c2a672af99eb87 files/digest-naim-0.11.5.9 65
-MD5 bd73cd0db61625de885599c78d3e1c07 files/digest-naim-0.11.6-r1 63
 MD5 bd73cd0db61625de885599c78d3e1c07 files/digest-naim-0.11.6 63
+MD5 bd73cd0db61625de885599c78d3e1c07 files/digest-naim-0.11.6-r1 63
+MD5 300fc32cbc7fc1a9d7c2a672af99eb87 files/digest-naim-0.11.5.9 65
diff --git a/net-im/naim/naim-0.11.5.9.ebuild b/net-im/naim/naim-0.11.5.9.ebuild
index a6c773d89664..3cf5fcdc1495 100644
--- a/net-im/naim/naim-0.11.5.9.ebuild
+++ b/net-im/naim/naim-0.11.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.5.9.ebuild,v 1.4 2003/06/09 17:36:25 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.5.9.ebuild,v 1.5 2003/09/05 23:58:58 msterret Exp $
 
 FOLDER="${P}"
 SNAP=""
@@ -8,7 +8,7 @@ SNAP=""
 MY_P="${P/_/}"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="An ncurses AOL Instant Messenger."
-# This source might change... 
+# This source might change...
 #SRC_URI="http://site.n.ml.org/download/20030607190139/${PN}/${P}.tar.gz"
 SRC_URI="http://shell.n.ml.org/n/naim/${P}.tar.gz"
 HOMEPAGE="http://naim.n.ml.org/"
@@ -32,7 +32,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin src/naim		
+	dobin src/naim
 	dosym /usr/bin/naim /usr/bin/nicq
 	dosym /usr/bin/naim /usr/bin/nirc
 	dosym /usr/bin/naim /usr/bin/nlily
diff --git a/net-im/naim/naim-0.11.6.ebuild b/net-im/naim/naim-0.11.6.ebuild
index 7fd4ceb495b4..092b8458b5ec 100644
--- a/net-im/naim/naim-0.11.6.ebuild
+++ b/net-im/naim/naim-0.11.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.6.ebuild,v 1.1 2003/07/24 22:06:30 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.6.ebuild,v 1.2 2003/09/05 23:58:58 msterret Exp $
 
 FOLDER="${P}"
 SNAP=""
@@ -8,7 +8,7 @@ SNAP=""
 MY_P="${P/_/}"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="An ncurses AOL Instant Messenger."
-# This source might change... 
+# This source might change...
 #SRC_URI="http://site.n.ml.org/download/20030607190139/${PN}/${P}.tar.gz"
 SRC_URI="http://shell.n.ml.org/n/naim/${P}.tar.gz"
 HOMEPAGE="http://naim.n.ml.org/"
@@ -32,7 +32,7 @@ src_compile() {
 }
 
 src_install() {
-	dobin src/naim		
+	dobin src/naim
 	dosym /usr/bin/naim /usr/bin/nicq
 	dosym /usr/bin/naim /usr/bin/nirc
 	dosym /usr/bin/naim /usr/bin/nlily
diff --git a/net-im/ntame/Manifest b/net-im/ntame/Manifest
index edce0444a21a..b6e24e841c3d 100644
--- a/net-im/ntame/Manifest
+++ b/net-im/ntame/Manifest
@@ -1,3 +1,3 @@
 MD5 d5940706f74cff3fcf432f6f1b07c113 ChangeLog 680
-MD5 b7df692653d3bebd9d7291d8fbff06cf ntame-998020954.ebuild 726
+MD5 df4e9756993a41a1cf44d0d1cb8f43dc ntame-998020954.ebuild 725
 MD5 0a9c6317b11a4f88bc512413db7be184 files/digest-ntame-998020954 67
diff --git a/net-im/ntame/ntame-998020954.ebuild b/net-im/ntame/ntame-998020954.ebuild
index 22ed9576b8b2..202686d30c48 100644
--- a/net-im/ntame/ntame-998020954.ebuild
+++ b/net-im/ntame/ntame-998020954.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ntame/ntame-998020954.ebuild,v 1.4 2003/02/13 14:12:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ntame/ntame-998020954.ebuild,v 1.5 2003/09/05 23:58:58 msterret Exp $
 
 S=${WORKDIR}/ntaim
 DESCRIPTION="Ncurses based AOL Instant Messenger"
@@ -13,17 +13,17 @@ LICENSE="GPL-2"
 KEYWORDS="x86"
 
 src_compile () {
-	
+
 	./configure --prefix=/usr --host=${CHOST} || die
 	emake || die
 
 }
 
 src_install () {
-	
+
 	dodir /usr/bin
 	make DESTDIR=${D} install || die
-	
+
 	dodoc AUTHORS BUGS NEWS README TODO
 }
 
diff --git a/net-im/ohphone/Manifest b/net-im/ohphone/Manifest
index bdcbf03ce30b..d6f5dcd65211 100644
--- a/net-im/ohphone/Manifest
+++ b/net-im/ohphone/Manifest
@@ -1,4 +1,4 @@
 MD5 7ac6272351608f61ad615ed889b4a2ad ChangeLog 377
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 f17447491934c080279f50c41e3fd673 ohphone-1.4.1.ebuild 821
+MD5 8b50877e6e0496c9635e449b3cbc5ee6 ohphone-1.4.1.ebuild 821
 MD5 eb00a184805b4c495b46976ce6ccfbbf files/digest-ohphone-1.4.1 64
diff --git a/net-im/ohphone/ohphone-1.4.1.ebuild b/net-im/ohphone/ohphone-1.4.1.ebuild
index 5fda2b27719c..bbe19316c0ef 100644
--- a/net-im/ohphone/ohphone-1.4.1.ebuild
+++ b/net-im/ohphone/ohphone-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ohphone/ohphone-1.4.1.ebuild,v 1.1 2003/09/03 10:35:59 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ohphone/ohphone-1.4.1.ebuild,v 1.2 2003/09/05 23:58:58 msterret Exp $
 
 DESCRIPTION="Command line H.323 client"
 HOMEPAGE="http://www.openh323.org/"
@@ -28,7 +28,7 @@ src_compile() {
 src_install() {
 	cd ${WORKDIR}/${PN}
 	doman ohphone.1
-	
+
 	# fill in for other archs
 	if [ ${ARCH} = "x86" ]; then
 		dobin obj_linux_x86_r/ohphone
diff --git a/net-im/openmcu/Manifest b/net-im/openmcu/Manifest
index 450b0b522165..addd33a2145f 100644
--- a/net-im/openmcu/Manifest
+++ b/net-im/openmcu/Manifest
@@ -1,2 +1,2 @@
-MD5 757ac578e19d14d4df0644c0fe555647 openmcu-1.1.7.ebuild 604
+MD5 f4dea6132c5a711254eb2be13a5683f7 openmcu-1.1.7.ebuild 596
 MD5 48d2727ed476eea13c2bcd912dbdf6e2 files/digest-openmcu-1.1.7 64
diff --git a/net-im/openmcu/openmcu-1.1.7.ebuild b/net-im/openmcu/openmcu-1.1.7.ebuild
index 124eb0373bdb..58856499cd70 100644
--- a/net-im/openmcu/openmcu-1.1.7.ebuild
+++ b/net-im/openmcu/openmcu-1.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openmcu/openmcu-1.1.7.ebuild,v 1.1 2003/08/11 00:32:01 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openmcu/openmcu-1.1.7.ebuild,v 1.2 2003/09/05 23:58:58 msterret Exp $
 
 SRC_URI="http://www.openh323.org/bin/openmcu_${PV}.tar.gz"
 HOMEPAGE="http://www.openh323.org"
@@ -17,9 +17,9 @@ RDEPEND="${DEPEND}"
 
 
 src_compile() {
-    cd work/openmcu
-    OPENH323DIR="/usr/share/openh323" make all || die
+	cd work/openmcu
+	OPENH323DIR="/usr/share/openh323" make all || die
 }
 
-#src_install() {    
-#}
\ No newline at end of file
+#src_install() {
+#}
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 800b858878ff..6fe6e25e9dc4 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,4 +1,4 @@
 MD5 befec3097f16fb908198d95f0f4b52be ChangeLog 2542
-MD5 5f15f6163a8806b8cd5b1ed789e08661 psi-0.9.ebuild 1475
-MD5 e4acc00d7ae1d10a2788e5db6ba73dbc files/digest-psi-0.9 119
+MD5 fa36de9624df4fe7cc935aea33713107 psi-0.9.ebuild 1413
 MD5 83db3cef4d81d6fa30bc81db011776de files/gen2-branding-0.9.patch 407
+MD5 e4acc00d7ae1d10a2788e5db6ba73dbc files/digest-psi-0.9 119
diff --git a/net-im/psi/psi-0.9.ebuild b/net-im/psi/psi-0.9.ebuild
index f95f48ae1270..e0d25b4aaa9e 100644
--- a/net-im/psi/psi-0.9.ebuild
+++ b/net-im/psi/psi-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.ebuild,v 1.4 2003/06/30 17:09:35 scandium Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.9.ebuild,v 1.5 2003/09/05 23:58:58 msterret Exp $
 inherit kde-functions
 
 IUSE="ssl crypt"
@@ -30,18 +30,15 @@ src_unpack() {
 }
 
 src_compile() {
-	
 	./configure --prefix=/usr || die
 	make || die
 	mv src/psi psi
 
-        if [ "`use ssl`" ]; then
-                cd ${WORKDIR}/qssl-${QV}
-                qmake qssl.pro
-                make
-        fi	
-
-
+	if [ "`use ssl`" ]; then
+		cd ${WORKDIR}/qssl-${QV}
+		qmake qssl.pro
+		make
+	fi
 }
 
 src_install() {
@@ -65,7 +62,7 @@ src_install() {
 	cp -r ./sound $LIBDIR
 	cp -r ./certs $LIBDIR
 
-	dodoc README COPYING 
+	dodoc README COPYING
 
 
 
diff --git a/net-im/silc-client/Manifest b/net-im/silc-client/Manifest
index 0a40622d6661..7c974dba9002 100644
--- a/net-im/silc-client/Manifest
+++ b/net-im/silc-client/Manifest
@@ -1,5 +1,5 @@
 MD5 c259b5f4e6699ee586918456564676b8 ChangeLog 1917
-MD5 3667e0bb6580d3472fbbd7bca5e47382 silc-client-0.9.11.ebuild 1631
-MD5 ffd815344055683d7f615d181b0201a7 silc-client-0.9.12.1.ebuild 1844
+MD5 4d738728fbbf7b8da871ff66282f3d8d silc-client-0.9.11.ebuild 1630
+MD5 f37bfb3e4f8f386be42a33df38e46448 silc-client-0.9.12.1.ebuild 1843
 MD5 fb190d39f5c608735fb3650027e4499f files/digest-silc-client-0.9.11 72
 MD5 c0de3b6dda921ad76210c11a653f40ee files/digest-silc-client-0.9.12.1 74
diff --git a/net-im/silc-client/silc-client-0.9.11.ebuild b/net-im/silc-client/silc-client-0.9.11.ebuild
index 0fe94d12e0d4..74aa42f5467a 100644
--- a/net-im/silc-client/silc-client-0.9.11.ebuild
+++ b/net-im/silc-client/silc-client-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.11.ebuild,v 1.6 2003/04/24 22:31:18 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.11.ebuild,v 1.7 2003/09/05 23:58:58 msterret Exp $
 
 inherit libtool
 
@@ -38,7 +38,7 @@ src_compile() {
 
 src_install() {
 	local myflags
-	
+
 	if [ "`use perl`" ]
 	then
 		R1="s/installsitearch='//"
@@ -49,7 +49,7 @@ src_install() {
 		myflags="${myflags} INSTALLSITELIB=${D}/${perl_sitearch}"
 		myflags="${myflags} INSTALLSITEARCH=${D}/${perl_sitearch}"
 	fi
-	
+
 	myflags="${myflags} mandir=${D}/usr/share/man"
 
 	make DESTDIR=${D} ${myflags} install || die "make install failed"
diff --git a/net-im/silc-client/silc-client-0.9.12.1.ebuild b/net-im/silc-client/silc-client-0.9.12.1.ebuild
index 89805419dd6f..0a8eaaf5b6b7 100644
--- a/net-im/silc-client/silc-client-0.9.12.1.ebuild
+++ b/net-im/silc-client/silc-client-0.9.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.12.1.ebuild,v 1.3 2003/04/24 22:31:18 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-0.9.12.1.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
 
 DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
 SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
@@ -20,7 +20,7 @@ src_compile() {
 	local myconf
 	use ipv6 && myconf="${myconf} --enable-ipv6"
 	use socks5 && myconf="${myconf} --with-socks5"
-	
+
 	econf \
 		--prefix=/usr \
 		--datadir=/usr/share/${PN} \
@@ -58,7 +58,7 @@ src_install() {
 	mv ${D}/usr/libsilc.la ${D}/usr/lib/
 	rmdir ${D}/usr/share/silc/
 	rmdir ${D}/usr/include
-	
+
 	dodir /usr/share/man
 	mv ${D}/man1 ${D}/usr/share/man
 }
diff --git a/net-im/sim/Manifest b/net-im/sim/Manifest
index 9beb2ed21daf..5abb8ba7d5db 100644
--- a/net-im/sim/Manifest
+++ b/net-im/sim/Manifest
@@ -1,19 +1,29 @@
 MD5 092eab5767e249ecd2fa56d9a1b6c172 ChangeLog 2226
-MD5 74241b37cf657161fef9bcc5082ba561 sim-0.6.ebuild 706
-MD5 53217e45091b828cdef52bdcd4c1a82a sim-0.7.ebuild 989
+MD5 0ace8650f366c7c63f305efa81cf577d sim-0.6.ebuild 705
+MD5 003defc6b16e88f4fbe91fc15787413c sim-0.7.ebuild 952
 MD5 2137c77593a8928734d0e2f3ce92d8ba sim-0.8.1.ebuild 1127
-MD5 96fd57c86859b7b6f053350397994251 sim-0.8.ebuild 1168
-MD5 17817362c3b58c990230560866b85f08 sim-0.8.2.ebuild 1253
-MD5 7e30460b57004c255eb008e543087c57 sim-0.8.2-r2.ebuild 1358
-MD5 7a38748fa1fbfa3090c6eb194aeccf99 sim-0.8.3.ebuild 1321
-MD5 70f338fa515789e891aee9725c524201 files/digest-sim-0.8.2 62
+MD5 dda5a646edf49b2e43100f5d52176056 sim-0.8.ebuild 1121
+MD5 ed35ac8c5b198a7d5a063c589552ae1e sim-0.8.2.ebuild 1256
+MD5 7b7a835120984646d6f257b9fb323a78 sim-0.8.2-r2.ebuild 1361
+MD5 9b3282050fffb3ed5b4ed06ecb1f3b05 sim-0.8.3.ebuild 1324
 MD5 b48c0b16be6c9e590da0440cc946e90d files/digest-sim-0.6 60
 MD5 224e22f4b01fda60c071163ea009d91d files/digest-sim-0.7 60
 MD5 5119360311ee2e0d4deb5980ee5d7cda files/digest-sim-0.8 60
 MD5 e39c7c8c9d2fe41315e3aeb07d586631 files/digest-sim-0.8.1 62
 MD5 aa747a199a1399a0948ece6df1836e44 files/sim-0.8-nostl.diff 1311
 MD5 0f0af3c4d6d9ba7bba0e22fa6a5278b9 files/sim-0.8.1-nostl.diff 863
+MD5 70f338fa515789e891aee9725c524201 files/digest-sim-0.8.2 62
 MD5 0f0af3c4d6d9ba7bba0e22fa6a5278b9 files/sim-0.8.2-nostl.diff 863
 MD5 70f338fa515789e891aee9725c524201 files/digest-sim-0.8.2-r2 62
 MD5 ee5f989cba64648aa222ad7061f5e03c files/digest-sim-0.8.3 62
 MD5 0f0af3c4d6d9ba7bba0e22fa6a5278b9 files/sim-0.8.3-nostl.diff 863
+MD5 5ce4135f4fcea0c9c21ba7c24a713c52 files/0.8.2-patches/01_all_focus-on-sent.patch.bz2 330
+MD5 1b20b2acc5b59c939447d10df84a12d9 files/0.8.2-patches/02_all_login-dlg.patch.bz2 588
+MD5 ef8efa3cadbc09aec7a15207f8917234 files/0.8.2-patches/03_all_send-to-ICQ-away.patch.bz2 463
+MD5 da8c0f34a2c7586803652577ac261c13 files/0.8.2-patches/04_all_sound-on-away-NA.patch.bz2 345
+MD5 e301309991e320839eec48d2b7817000 files/0.8.2-patches/05_all_undread-messages.patch.bz2 617
+MD5 aae51140277191824b16071fb8dbf017 files/0.8.2-patches/06_all_win-icon-click.patch.bz2 421
+MD5 9e8c9ffa22e05b97c83165e772ebd162 files/0.8.2-patches/07_all_yy-buffer-state.patch.bz2 643
+MD5 649b0ae5cd7d3a20bdbd28fe9c88e6de files/0.8.2-patches/08_all_french.patch.bz2 542
+MD5 bc442c0532d819cd9bc9a8e7f727dbfa files/0.8.2-patches/09_all_typos.patch.bz2 706
+MD5 f152e6bc91ae7b0bfa82d775ab6bc25a files/0.8.2-patches/10_all_qt31x.patch.bz2 310
diff --git a/net-im/sim/sim-0.6.ebuild b/net-im/sim/sim-0.6.ebuild
index 38ef42ac0304..9d0416eaed37 100644
--- a/net-im/sim/sim-0.6.ebuild
+++ b/net-im/sim/sim-0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.6.ebuild,v 1.2 2003/02/13 14:12:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.6.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
 inherit kde-base
 
 LICENSE="GPL-2"
@@ -13,7 +13,7 @@ KEYWORDS="x86"
 #    need-qt 3
 #    myconf="$myconf --enable-kde"
 #else
-    need-kde 3
+	need-kde 3
 #    myconf="$myconf --disable-kde"
 #fi
 #
diff --git a/net-im/sim/sim-0.7.ebuild b/net-im/sim/sim-0.7.ebuild
index 6d79be36fce2..df6ace1d9084 100644
--- a/net-im/sim/sim-0.7.ebuild
+++ b/net-im/sim/sim-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.7.ebuild,v 1.3 2003/02/13 14:13:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.7.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
 
 IUSE="ssl kde"
 [ -n "`use kde`" ] && inherit kde-base
@@ -16,26 +16,24 @@ SLOT="0"
 newdepend "ssl? ( dev-libs/openssl )"
 
 if [ -n "`use ssl`" ]; then
-    myconf="$myconf --enable-openssl"
+	myconf="$myconf --enable-openssl"
 else
-    myconf="$myconf --disable-openssl"
+	myconf="$myconf --disable-openssl"
 fi
 
 if [ -n "`use kde`" ]; then
-    need-kde 3
-    myconf="$myconf --enable-kde"
+	need-kde 3
+	myconf="$myconf --enable-kde"
 else
-    need-qt 3
-    myconf="$myconf --disable-kde"
+	need-qt 3
+	myconf="$myconf --disable-kde"
 fi
 
 src_compile() {
+	[ -n "`use kde`" ] && kde_src_compile myconf
+	myconf="$myconf --prefix=/usr"
 
-    [ -n "`use kde`" ] && kde_src_compile myconf
-    myconf="$myconf --prefix=/usr"
-    
-    cd $S
-    ./configure $myconf || die
-    emake || die
-
+	cd $S
+	./configure $myconf || die
+	emake || die
 }
diff --git a/net-im/sim/sim-0.8.2-r2.ebuild b/net-im/sim/sim-0.8.2-r2.ebuild
index df96d4bd2824..297fee22dcf7 100644
--- a/net-im/sim/sim-0.8.2-r2.ebuild
+++ b/net-im/sim/sim-0.8.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.8.2-r2.ebuild,v 1.1 2003/06/30 11:07:37 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.8.2-r2.ebuild,v 1.2 2003/09/05 23:58:58 msterret Exp $
 
 IUSE="ssl kde"
 [ -n "`use kde`" ] && inherit kde-base eutils
@@ -44,7 +44,7 @@ src_compile() {
 	make -f admin/Makefile.common
 
 	myconf="$myconf --without-gkrellm_plugin"
-	[ -n "`use kde`" ] && kde_src_compile myconf 
+	[ -n "`use kde`" ] && kde_src_compile myconf
 	myconf="$myconf --prefix=/usr"
 
 	econf $myconf --without-gkrellm || die
diff --git a/net-im/sim/sim-0.8.2.ebuild b/net-im/sim/sim-0.8.2.ebuild
index 9a6237abca70..32fdcbcd956c 100644
--- a/net-im/sim/sim-0.8.2.ebuild
+++ b/net-im/sim/sim-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.8.2.ebuild,v 1.3 2003/07/13 12:44:50 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.8.2.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
 
 IUSE="ssl kde"
 [ -n "`use kde`" ] && inherit kde-base
@@ -39,7 +39,7 @@ src_compile() {
 	make -f admin/Makefile.common
 
 	myconf="$myconf --without-gkrellm_plugin"
-	[ -n "`use kde`" ] && kde_src_compile myconf 
+	[ -n "`use kde`" ] && kde_src_compile myconf
 	myconf="$myconf --prefix=/usr"
 
 	econf $myconf --without-gkrellm || die
diff --git a/net-im/sim/sim-0.8.3.ebuild b/net-im/sim/sim-0.8.3.ebuild
index 15e9d7b38229..0cfaeed7862a 100644
--- a/net-im/sim/sim-0.8.3.ebuild
+++ b/net-im/sim/sim-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.8.3.ebuild,v 1.1 2003/08/13 14:49:28 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.8.3.ebuild,v 1.2 2003/09/05 23:58:58 msterret Exp $
 
 IUSE="ssl kde"
 [ -n "`use kde`" ] && inherit kde-base eutils
@@ -43,7 +43,7 @@ src_compile() {
 	make -f admin/Makefile.common
 
 	myconf="$myconf --without-gkrellm_plugin"
-	[ -n "`use kde`" ] && kde_src_compile myconf 
+	[ -n "`use kde`" ] && kde_src_compile myconf
 	myconf="$myconf --prefix=/usr"
 
 	econf $myconf --without-gkrellm || die
diff --git a/net-im/sim/sim-0.8.ebuild b/net-im/sim/sim-0.8.ebuild
index 29e6a5b417cd..9287f37aefcf 100644
--- a/net-im/sim/sim-0.8.ebuild
+++ b/net-im/sim/sim-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.8.ebuild,v 1.3 2003/02/13 14:13:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/sim/sim-0.8.ebuild,v 1.4 2003/09/05 23:58:58 msterret Exp $
 
 IUSE="ssl kde"
 [ -n "`use kde`" ] && inherit kde-base
@@ -17,36 +17,33 @@ newdepend "ssl? ( dev-libs/openssl )"
 DEPEND="$DEPEND sys-devel/flex"
 
 if [ -n "`use ssl`" ]; then
-    myconf="$myconf --enable-openssl"
+	myconf="$myconf --enable-openssl"
 else
-    myconf="$myconf --disable-openssl"
+	myconf="$myconf --disable-openssl"
 fi
 
 if [ -n "`use kde`" ]; then
-    need-kde 3
-    myconf="$myconf --enable-kde"
+	need-kde 3
+	myconf="$myconf --enable-kde"
 else
-    need-qt 3
-    myconf="$myconf --disable-kde"
+	need-qt 3
+	myconf="$myconf --disable-kde"
 fi
 
 PATCHES="$FILESDIR/$P-nostl.diff"
 
 src_compile() {
 
-    [ -n "`use kde`" ] && kde_src_compile myconf
-    myconf="$myconf --prefix=/usr"
-    
-    cd $S
-    ./configure $myconf || die
-    emake || die
+	[ -n "`use kde`" ] && kde_src_compile myconf
+	myconf="$myconf --prefix=/usr"
 
+	cd $S
+	./configure $myconf || die
+	emake || die
 }
 
 src_install() {
-
-    cd $S
-    make DESTDIR=$D install
-    dodoc TODO README ChangeLog COPYING AUTHORS
-
+	cd $S
+	make DESTDIR=$D install
+	dodoc TODO README ChangeLog COPYING AUTHORS
 }
diff --git a/net-im/tkabber/Manifest b/net-im/tkabber/Manifest
index 637b0194f8f2..e7902ee0d54c 100644
--- a/net-im/tkabber/Manifest
+++ b/net-im/tkabber/Manifest
@@ -1,7 +1,7 @@
-MD5 268fdd76850413005f9073bb20e48187 tkabber-0.9.5b.ebuild 941
-MD5 00a56878441c93fbf551dbc28d9c5eab tkabber-0.9.4b.ebuild 971
 MD5 f0972dcddc0cc4039de79f4685880a89 ChangeLog 1459
-MD5 7bcca67e3963d996d5bf9709d91c7eab tkabber-0.9.3b-r1.ebuild 974
+MD5 8be368bc00a5c1dee7228343f557cf95 tkabber-0.9.3b-r1.ebuild 978
+MD5 70c4583e1d6407abaa78870fc0438236 tkabber-0.9.4b.ebuild 975
+MD5 406991c86c3c8f6879e90fed09b3eafa tkabber-0.9.5b.ebuild 941
 MD5 a5bfd86cd0c8ead9467cf5f893511aba files/digest-tkabber-0.9.3b-r1 69
 MD5 2de4b5cb9d0e786da7346ec6b85e4ba0 files/digest-tkabber-0.9.4b 69
 MD5 7602cd4d7daafafe0bf585fa67b29bed files/digest-tkabber-0.9.5b 69
diff --git a/net-im/tkabber/tkabber-0.9.3b-r1.ebuild b/net-im/tkabber/tkabber-0.9.3b-r1.ebuild
index 0aea8e911c44..3a7d9786529e 100644
--- a/net-im/tkabber/tkabber-0.9.3b-r1.ebuild
+++ b/net-im/tkabber/tkabber-0.9.3b-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2003 Arcady Genkin <agenkin@gentoo.org>.
 # Distributed under the terms of the GNU General Public License v2.
-# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.3b-r1.ebuild,v 1.4 2003/04/23 17:02:47 utx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.3b-r1.ebuild,v 1.5 2003/09/05 23:58:58 msterret Exp $
 
 DESCRIPTION="Featurefull Jabber client for tcl/tk."
 HOMEPAGE="http://www.jabber.ru/projects/tkabber/index_en.html"
@@ -35,7 +35,7 @@ src_compile() {
 src_install() {
 
 	make DESTDIR=${D} PREFIX=/usr install || die
-	
+
 	dodoc AUTHORS COPYING ChangeLog INSTALL README
 	dohtml README.html
 
diff --git a/net-im/tkabber/tkabber-0.9.4b.ebuild b/net-im/tkabber/tkabber-0.9.4b.ebuild
index c9172724e7d4..fb0bf5ebce0d 100644
--- a/net-im/tkabber/tkabber-0.9.4b.ebuild
+++ b/net-im/tkabber/tkabber-0.9.4b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2003 Arcady Genkin <agenkin@gentoo.org>.
 # Distributed under the terms of the GNU General Public License v2.
-# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.4b.ebuild,v 1.2 2003/04/23 17:02:47 utx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.4b.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
 
 DESCRIPTION="Featurefull Jabber client for tcl/tk."
 HOMEPAGE="http://www.jabber.ru/projects/tkabber/index_en.html"
@@ -35,7 +35,7 @@ src_compile() {
 src_install() {
 
 	make DESTDIR=${D} PREFIX=/usr install || die
-	
+
 	dodoc AUTHORS COPYING ChangeLog INSTALL README
 	dohtml README.html
 
diff --git a/net-im/tkabber/tkabber-0.9.5b.ebuild b/net-im/tkabber/tkabber-0.9.5b.ebuild
index 07fd6c42c2ac..e89717c5ebc6 100644
--- a/net-im/tkabber/tkabber-0.9.5b.ebuild
+++ b/net-im/tkabber/tkabber-0.9.5b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2003 Arcady Genkin <agenkin@gentoo.org>.
 # Distributed under the terms of the GNU General Public License v2.
-# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.5b.ebuild,v 1.2 2003/07/09 14:38:08 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.9.5b.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
 
 DESCRIPTION="Featurefull Jabber client for tcl/tk."
 HOMEPAGE="http://tkabber.jabber.ru/en/"
@@ -35,7 +35,7 @@ src_compile() {
 src_install() {
 
 	make DESTDIR=${D} PREFIX=/usr install || die
-	
+
 	dodoc AUTHORS COPYING ChangeLog INSTALL README
 	dohtml README.html
 
diff --git a/net-im/ymessenger/Manifest b/net-im/ymessenger/Manifest
index 998c1c8744b0..00fb615fc6f6 100644
--- a/net-im/ymessenger/Manifest
+++ b/net-im/ymessenger/Manifest
@@ -1,4 +1,4 @@
 MD5 f8296f3ee25c8ec74afe32e655fdf9f3 ChangeLog 2615
-MD5 50bd4ba99858a25afbb617405a0bf6f1 ymessenger-0.99.19.1-r1.ebuild 1474
+MD5 46149f36d719877135e8815157ad9b7f ymessenger-0.99.19.1-r1.ebuild 1464
 MD5 d416ac8894dad827f0118284570e6c8a files/97ymessenger 16
 MD5 327cea07fd850a0ca8b1e310f82108c2 files/digest-ymessenger-0.99.19.1-r1 206
diff --git a/net-im/ymessenger/ymessenger-0.99.19.1-r1.ebuild b/net-im/ymessenger/ymessenger-0.99.19.1-r1.ebuild
index c68fbb8f9356..f1c7937b9beb 100644
--- a/net-im/ymessenger/ymessenger-0.99.19.1-r1.ebuild
+++ b/net-im/ymessenger/ymessenger-0.99.19.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ymessenger/ymessenger-0.99.19.1-r1.ebuild,v 1.2 2003/04/04 06:06:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ymessenger/ymessenger-0.99.19.1-r1.ebuild,v 1.3 2003/09/05 23:58:58 msterret Exp $
 
 inherit kde
 
@@ -29,12 +29,10 @@ pkg_setup() {
 }
 
 src_compile() {
-
-        cd ${S}
+	cd ${S}
 }
 
 src_install () {
-	
 	cd ${S}
 
 	into /opt/ymessenger
@@ -51,7 +49,7 @@ src_install () {
 		insinto /usr/share/gnome/apps/Internet
 		doins ymessenger.desktop
 	fi
-	
+
 	if use kde
 	then
 		insinto ${KDEDIR}/share/applnk/Internet