whitespace cleanup

author: Michael Sterrett <msterret@gentoo.org> 2003-09-06 01:54:14 +0000
committer: Michael Sterrett <msterret@gentoo.org> 2003-09-06 01:54:14 +0000
commit: 2fd2f631d89f219ec232de6edf22129a4a1e7309 (patch)
tree: 7784ecd3779bf27d955c9733f40999958b7d25f8 /net-www
parent: header fix (diff)
download: gentoo-2-2fd2f631d89f219ec232de6edf22129a4a1e7309.tar.gz
gentoo-2-2fd2f631d89f219ec232de6edf22129a4a1e7309.tar.bz2
gentoo-2-2fd2f631d89f219ec232de6edf22129a4a1e7309.zip
196 files changed, 1449 insertions, 1505 deletions
diff --git a/net-www/amaya/Manifest b/net-www/amaya/Manifest
index 79f244bc3eea..2c63360b582f 100644
--- a/net-www/amaya/Manifest
+++ b/net-www/amaya/Manifest
@@ -1,11 +1,11 @@
 MD5 2841cd8ccdbe5a99155f39af2bbe96d2 ChangeLog 2053
-MD5 6607e73d125e2f1da8012d279472b29f amaya-6.1.ebuild 878
+MD5 0fae3b4ea64c8075649794bb4b2961fd amaya-6.1.ebuild 878
 MD5 f27af9fbb9ea94096ab02895a097e531 amaya-7.1.ebuild 896
-MD5 8ea868c4cc804714d076b3be7490f9b9 amaya-7.2.ebuild 1094
-MD5 d8e0256ff4dc771779f2d128a8d595c1 amaya-8.0.ebuild 1097
-MD5 8e5ca6e9e5a2e4a1e2247e2f5b7189a8 amaya-8.1a.ebuild 1102
-MD5 11b38151f5999852f7a8464584ac5c71 files/digest-amaya-7.1 63
-MD5 7a19c33d4760bf30e9618b8eb83078d6 files/digest-amaya-8.0 63
+MD5 cb785d5b1a1dfe1d7826ef01398a99ca amaya-7.2.ebuild 1094
+MD5 9fd15624c79637da6f449bc2a5ac1d57 amaya-8.0.ebuild 1097
+MD5 5495b0016cd7b8ede8e42243897815a7 amaya-8.1a.ebuild 1099
 MD5 215d7cb127e55154da64d6095454f996 files/digest-amaya-6.1 63
+MD5 11b38151f5999852f7a8464584ac5c71 files/digest-amaya-7.1 63
 MD5 52a934a60b4b55a0381aa7006fd375a3 files/digest-amaya-7.2 63
+MD5 7a19c33d4760bf30e9618b8eb83078d6 files/digest-amaya-8.0 63
 MD5 353beae5d0ef0a78307400c82175a6cd files/digest-amaya-8.1a 64
diff --git a/net-www/amaya/amaya-6.1.ebuild b/net-www/amaya/amaya-6.1.ebuild
index 22a3056a3015..9d708c4d12c2 100644
--- a/net-www/amaya/amaya-6.1.ebuild
+++ b/net-www/amaya/amaya-6.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-www/amaya/amaya-6.1.ebuild,v 1.12 2003/03/30 01:06:17 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-6.1.ebuild,v 1.13 2003/09/06 01:54:08 msterret Exp $
 
 S=${WORKDIR}/Amaya/LINUX-ELF
 DESCRIPTION="The W3C Web-Browser"
@@ -34,6 +34,6 @@ src_install () {
 	rm ${D}/usr/bin/print
 	dosym /usr/Amaya/applis/bin/amaya /usr/bin/amaya
 	dosym /usr/Amaya/applis/bin/print /usr/bin/print
-	
+
 }
 
diff --git a/net-www/amaya/amaya-7.2.ebuild b/net-www/amaya/amaya-7.2.ebuild
index cf92c02c668d..2a4eb1079083 100644
--- a/net-www/amaya/amaya-7.2.ebuild
+++ b/net-www/amaya/amaya-7.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-www/amaya/amaya-7.2.ebuild,v 1.6 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-7.2.ebuild,v 1.7 2003/09/06 01:54:08 msterret Exp $
 
 inherit libtool
 
@@ -27,11 +27,11 @@ src_compile() {
 	local myconf=""
 	mkdir ${S}
 	cd ${S}
-	if [ -n "`use gtk`" ] 
-	then 
+	if [ -n "`use gtk`" ]
+	then
 	    myconf="${myconf} --with-gtk"
-	
-	else 
+
+	else
 	    myconf="${myconf} --without-gtk"
 	fi
 	../configure \
diff --git a/net-www/amaya/amaya-8.0.ebuild b/net-www/amaya/amaya-8.0.ebuild
index 463a8d4f9726..0d12a6097b66 100644
--- a/net-www/amaya/amaya-8.0.ebuild
+++ b/net-www/amaya/amaya-8.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-www/amaya/amaya-8.0.ebuild,v 1.2 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-8.0.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
 
 inherit libtool
 
@@ -27,11 +27,11 @@ src_compile() {
 	local myconf=""
 	mkdir ${S}
 	cd ${S}
-	if [ -n "`use gtk`" ] 
-	then 
+	if [ -n "`use gtk`" ]
+	then
 	    myconf="${myconf} --with-gtk"
-	
-	else 
+
+	else
 	    myconf="${myconf} --without-gtk"
 	fi
 	../configure \
diff --git a/net-www/amaya/amaya-8.1a.ebuild b/net-www/amaya/amaya-8.1a.ebuild
index 3c42c03acb4f..f22ac9972863 100644
--- a/net-www/amaya/amaya-8.1a.ebuild
+++ b/net-www/amaya/amaya-8.1a.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-www/amaya/amaya-8.1a.ebuild,v 1.1 2003/07/28 01:10:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/amaya/amaya-8.1a.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
 
 inherit libtool
 
@@ -27,11 +27,11 @@ src_compile() {
 	local myconf=""
 	mkdir ${S}
 	cd ${S}
-	if [ -n "`use gtk`" ] 
-	then 
+	if [ -n "`use gtk`" ]
+	then
 	    myconf="${myconf} --with-gtk"
-	
-	else 
+
+	else
 	    myconf="${myconf} --without-gtk"
 	fi
 	../configure \
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 0252fd9c2e94..ac9ff9e49112 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,14 +1,11 @@
 MD5 4ae22b17d15b2875b593e660b938f4ab ChangeLog 12945
-MD5 85bf196b2f8f56f3719d6bfb33cf5824 apache-1.3.27-r3.ebuild 7957
-MD5 e336220612be98e8f5a45890cf89ae33 apache-1.3.27-r4.ebuild 8720
-MD5 19e4f731c957155e698f06b0470414fe apache-1.3.28.ebuild 8892
-MD5 9fc6f21b176feeea4b7d29abdf641605 apache-2.0.46.ebuild 10750
-MD5 2a601e3e6540e7d8ab1238cb6af8e912 apache-2.0.47.ebuild 11175
-MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
-MD5 3f87dcb9d5abca78bc68a3825f331087 files/apache-1.3.27_db4_gentoo.patch 812
+MD5 016d59b4fcdb7ff06c19cd0b496011b5 apache-2.0.47.ebuild 11107
+MD5 246f3d374581e892615e2e5c8cb59e2a apache-1.3.27-r3.ebuild 7884
+MD5 d059ab302d0e6b1b96070adc4458ae08 apache-1.3.27-r4.ebuild 8653
+MD5 a9d070561f89df4b231e17ce84564e92 apache-1.3.28.ebuild 8873
+MD5 13eef3200abf41ea1ae8bb18ab40e481 apache-2.0.46.ebuild 10682
 MD5 f2c60b199c12729b25716ed451a24e38 files/apache-2.0.44-gentoo.diff 4895
 MD5 9dc40e1918a2d30a578ebf1653f7182c files/apache-2.0.45-gentoo.diff 5448
-MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
 MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465
 MD5 df1290566bb25603dbe5a649daec5185 files/apache.confd 1012
 MD5 b521110a970b3b41c1499596a59713fb files/apache.rc6 1020
@@ -16,14 +13,17 @@ MD5 02db12f0d91e1f89e0b173fea6c5151d files/apacheaddmod 5977
 MD5 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185
 MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763
 MD5 a90bef6fb0fb6d05f74c36eaf26285d6 files/apachesplitlogfile 4959
+MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47 65
+MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 10be9409287dd5848fd675c1d96d0f7c files/digest-apache-1.3.27-r3 211
 MD5 21c6ed7e53ea9fc80f4634cbf37b2bc6 files/digest-apache-1.3.27-r4 303
 MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28 211
-MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
-MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47 65
 MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340
 MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
+MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963
+MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65
+MD5 3f87dcb9d5abca78bc68a3825f331087 files/apache-1.3.27_db4_gentoo.patch 812
 MD5 14aebf386646fe7ab2623dad993a32fa files/2.0.40/40_mod_ssl.conf 3420
 MD5 8ce666f3b8ad3ed00c081dc29e19fe90 files/2.0.40/41_mod_ssl.default-vhost.conf 8039
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.40/45_mod_dav.conf 583
diff --git a/net-www/apache/apache-1.3.27-r3.ebuild b/net-www/apache/apache-1.3.27-r3.ebuild
index ae3586ca26bd..86038931a03d 100644
--- a/net-www/apache/apache-1.3.27-r3.ebuild
+++ b/net-www/apache/apache-1.3.27-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-www/apache/apache-1.3.27-r3.ebuild,v 1.5 2003/08/25 19:16:35 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27-r3.ebuild,v 1.6 2003/09/06 01:54:08 msterret Exp $
 
 mod_ssl_ver=2.8.14-${PV}
 
@@ -172,16 +172,15 @@ src_install() {
 	insinto /etc/apache/conf
 	doins ${FILESDIR}/conf/commonapache.conf
 	doins ${FILESDIR}/conf/apache.conf
-	
-        # Added by Jason Wever <weeve@gentoo.org>
-        # A little sedfu to fix bug #7172 for sparc64s
-        if [ ${ARCH} = "sparc" ]
-        then
-                sed -i -e '15a\AcceptMutex fcntl' \
-                        ${D}/etc/apache/conf/apache.conf
-        fi
-	
-			
+
+	# Added by Jason Wever <weeve@gentoo.org>
+	# A little sedfu to fix bug #7172 for sparc64s
+	if [ ${ARCH} = "sparc" ]
+	then
+		sed -i -e '15a\AcceptMutex fcntl' \
+			${D}/etc/apache/conf/apache.conf
+	fi
+
 	insinto /etc/apache/conf/vhosts
 	doins ${FILESDIR}/conf/VirtualHomePages.conf
 	doins ${FILESDIR}/conf/DynamicVhosts.conf
diff --git a/net-www/apache/apache-1.3.27-r4.ebuild b/net-www/apache/apache-1.3.27-r4.ebuild
index 804943194c5b..4c6c06b9b695 100644
--- a/net-www/apache/apache-1.3.27-r4.ebuild
+++ b/net-www/apache/apache-1.3.27-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-www/apache/apache-1.3.27-r4.ebuild,v 1.10 2003/08/25 19:16:35 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.27-r4.ebuild,v 1.11 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="ipv6 pam"
 
@@ -190,13 +190,13 @@ src_install() {
 	doins ${FILESDIR}/conf/commonapache.conf
 	doins ${FILESDIR}/conf/apache.conf
 
-        # Added by Jason Wever <weeve@gentoo.org>
-        # A little sedfu to fix bug #7172 for sparc64s
-        if [ ${ARCH} = "sparc" ]
-        then
-                sed -i -e '15a\AcceptMutex fcntl' \
-                        ${D}/etc/apache/conf/apache.conf
-        fi
+	# Added by Jason Wever <weeve@gentoo.org>
+	# A little sedfu to fix bug #7172 for sparc64s
+	if [ ${ARCH} = "sparc" ]
+	then
+		sed -i -e '15a\AcceptMutex fcntl' \
+			${D}/etc/apache/conf/apache.conf
+	fi
 
 	insinto /etc/apache/conf/vhosts
 	doins ${FILESDIR}/conf/VirtualHomePages.conf
diff --git a/net-www/apache/apache-1.3.28.ebuild b/net-www/apache/apache-1.3.28.ebuild
index 9a92767097b7..67482036e56e 100644
--- a/net-www/apache/apache-1.3.28.ebuild
+++ b/net-www/apache/apache-1.3.28.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-www/apache/apache-1.3.28.ebuild,v 1.4 2003/08/25 19:16:35 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.28.ebuild,v 1.5 2003/09/06 01:54:08 msterret Exp $
 
 #IUSE="ipv6 pam"
 IUSE="pam"
@@ -197,12 +197,12 @@ src_install() {
 	doins ${FILESDIR}/conf/commonapache.conf
 	doins ${FILESDIR}/conf/apache.conf
 
-        # Added by Jason Wever <weeve@gentoo.org>
-        # A little sedfu to fix bug #7172 for sparc64s
+	# Added by Jason Wever <weeve@gentoo.org>
+	# A little sedfu to fix bug #7172 for sparc64s
 	if [ ${ARCH} = "sparc" ]
 	then
-        	sed -i -e '15a\AcceptMutex fcntl' \
-			${D}/etc/apache/conf/apache.conf
+		sed -i -e '15a\AcceptMutex fcntl' \
+		${D}/etc/apache/conf/apache.conf
 	fi
 
 
diff --git a/net-www/apache/apache-2.0.46.ebuild b/net-www/apache/apache-2.0.46.ebuild
index 1c94951f65d7..bec5f597f9fb 100644
--- a/net-www/apache/apache-2.0.46.ebuild
+++ b/net-www/apache/apache-2.0.46.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-www/apache/apache-2.0.46.ebuild,v 1.5 2003/08/25 19:16:35 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.46.ebuild,v 1.6 2003/09/06 01:54:08 msterret Exp $
 
 inherit eutils
 
@@ -281,14 +281,13 @@ src_install () {
 	doins ${FILESDIR}/2.0.40/dynamic-vhosts.conf
 	doins ${FILESDIR}/2.0.40/vhosts.conf
 
-        # Added by Jason Wever <weeve@gentoo.org>
-        # A little sedfu to fix bug #7172 for sparc64s
-        if [ ${ARCH} = "sparc" ]
-        then
-                sed -i -e '13a\AcceptMutex fcntl' \
-                        ${D}/etc/apache2/conf/apache2.conf
-        fi
-
+	# Added by Jason Wever <weeve@gentoo.org>
+	# A little sedfu to fix bug #7172 for sparc64s
+	if [ ${ARCH} = "sparc" ]
+	then
+		sed -i -e '13a\AcceptMutex fcntl' \
+			${D}/etc/apache2/conf/apache2.conf
+	fi
 }
 
 parse_modules_config() {
diff --git a/net-www/apache/apache-2.0.47.ebuild b/net-www/apache/apache-2.0.47.ebuild
index 2cb725d19d99..fe86297dcd55 100644
--- a/net-www/apache/apache-2.0.47.ebuild
+++ b/net-www/apache/apache-2.0.47.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-www/apache/apache-2.0.47.ebuild,v 1.7 2003/08/25 19:16:35 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.47.ebuild,v 1.8 2003/09/06 01:54:08 msterret Exp $
 
 inherit flag-o-matic
 has_version =sys-libs/glibc-2.2* && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
@@ -282,14 +282,13 @@ src_install () {
 	doins ${FILESDIR}/2.0.40/dynamic-vhosts.conf
 	doins ${FILESDIR}/2.0.40/vhosts.conf
 
-        # Added by Jason Wever <weeve@gentoo.org>
-        # A little sedfu to fix bug #7172 for sparc64s
-        if [ ${ARCH} = "sparc" ]
-        then
-                sed -i -e '13a\AcceptMutex fcntl' \
-                        ${D}/etc/apache2/conf/apache2.conf
-        fi
-
+	# Added by Jason Wever <weeve@gentoo.org>
+	# A little sedfu to fix bug #7172 for sparc64s
+	if [ ${ARCH} = "sparc" ]
+	then
+		sed -i -e '13a\AcceptMutex fcntl' \
+			${D}/etc/apache2/conf/apache2.conf
+	fi
 }
 
 parse_modules_config() {
diff --git a/net-www/cocoon/Manifest b/net-www/cocoon/Manifest
index b68237f3f9dd..738395430018 100644
--- a/net-www/cocoon/Manifest
+++ b/net-www/cocoon/Manifest
@@ -1,6 +1,6 @@
+MD5 28371e596309d30bf4111b36e5809399 ChangeLog 1472
+MD5 72c86086d3aad113c02e84f62d55c75c cocoon-2.0.2.ebuild 2177
 MD5 bdc0e4cb4618c54ec5d1d80b90938832 files/cocoon-2.0.2.patch 804
 MD5 4d2b324e1a75765047279e1f1ab664d0 files/cocoon.properties 15046
 MD5 2866a11bf629c74f1758a1ee091c44e5 files/digest-cocoon-2.0.2 70
 MD5 54c9c8347c6bf0f8d996be4c4a6144bf files/web.xml 826
-MD5 d183cf1d02cf4dc21c86cd0b73fa5ca1 cocoon-2.0.2.ebuild 2191
-MD5 28371e596309d30bf4111b36e5809399 ChangeLog 1472
diff --git a/net-www/cocoon/cocoon-2.0.2.ebuild b/net-www/cocoon/cocoon-2.0.2.ebuild
index 27c3af0b3103..2f00b6193333 100644
--- a/net-www/cocoon/cocoon-2.0.2.ebuild
+++ b/net-www/cocoon/cocoon-2.0.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-www/cocoon/cocoon-2.0.2.ebuild,v 1.10 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/cocoon/cocoon-2.0.2.ebuild,v 1.11 2003/09/06 01:54:08 msterret Exp $
 
 A=cocoon-${PV}-src.tar.gz
 S=${WORKDIR}/${P}
@@ -64,7 +64,7 @@ src_compile() {
 		|| die
 }
 
-src_install() {                  
+src_install() {
 	dodir ${CATALINA_HOME}/webapps
 	insinto ${CATALINA_HOME}/webapps
 	doins ${S}/build/cocoon/cocoon.war
diff --git a/net-www/curator/Manifest b/net-www/curator/Manifest
index 7d0b45b3d91e..97e53ed3251c 100644
--- a/net-www/curator/Manifest
+++ b/net-www/curator/Manifest
@@ -1,3 +1,3 @@
-MD5 c238a1f3d057b653febb27ec81e375ef files/digest-curator-2.0 62
-MD5 4523c657e3be7ac8bbe377823a78eb8b curator-2.0.ebuild 663
 MD5 d21a8eabb7e12a62c605155670adca3c ChangeLog 338
+MD5 802baad4c06619248820e7904f64f34e curator-2.0.ebuild 664
+MD5 c238a1f3d057b653febb27ec81e375ef files/digest-curator-2.0 62
diff --git a/net-www/curator/curator-2.0.ebuild b/net-www/curator/curator-2.0.ebuild
index dbf4188a996a..9bff6a8dc27f 100644
--- a/net-www/curator/curator-2.0.ebuild
+++ b/net-www/curator/curator-2.0.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-www/curator/curator-2.0.ebuild,v 1.4 2003/07/13 21:44:10 aliz Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/curator/curator-2.0.ebuild,v 1.5 2003/09/06 01:54:08 msterret Exp $
 
 MY_P=curator-2.0
 S=${WORKDIR}/curator
@@ -10,7 +10,7 @@ SRC_URI="http://twtelecom.dl.sourceforge.net/sourceforge/curator/${MY_P}.tar.gz"
 HOMEPAGE="http://curator.sourceforge.net/"
 KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips"
 LICENSE="GPL-2"
-DEPEND=">=dev-lang/python-2.2.1 
+DEPEND=">=dev-lang/python-2.2.1
 		>=media-gfx/imagemagick-5.4.9"
 
 src_install() {
diff --git a/net-www/cvsweb/Manifest b/net-www/cvsweb/Manifest
index d50c73bc7e63..4b81dada5440 100644
--- a/net-www/cvsweb/Manifest
+++ b/net-www/cvsweb/Manifest
@@ -1,5 +1,5 @@
+MD5 ff36d99d501aedd2d880a6f84ee7726e ChangeLog 1132
+MD5 a5e293654b0170cc543b0a7c64476d3b cvsweb-1.112.ebuild 870
+MD5 a4d570bb87bf0291c2aa16083c4c0be9 cvsweb-1.93-r1.ebuild 860
 MD5 1f9930e7dc9c78f027d027ea8e8ca952 files/digest-cvsweb-1.112 63
 MD5 947f34c2c4de11e6d9ebbd7a5129afa9 files/digest-cvsweb-1.93-r1 62
-MD5 3069d8b7517904bb4fc046be519cc61a cvsweb-1.112.ebuild 890
-MD5 e37b4bf446777f4d99b037958aa5032e cvsweb-1.93-r1.ebuild 882
-MD5 ff36d99d501aedd2d880a6f84ee7726e ChangeLog 1132
diff --git a/net-www/cvsweb/cvsweb-1.112.ebuild b/net-www/cvsweb/cvsweb-1.112.ebuild
index f22d6862751b..ea4d8f3771c7 100644
--- a/net-www/cvsweb/cvsweb-1.112.ebuild
+++ b/net-www/cvsweb/cvsweb-1.112.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-www/cvsweb/cvsweb-1.112.ebuild,v 1.9 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/cvsweb/cvsweb-1.112.ebuild,v 1.10 2003/09/06 01:54:08 msterret Exp $
 
 SLOT="0"
 KEYWORDS="x86 sparc ~ppc"
@@ -24,12 +24,11 @@ src_unpack() {
 }
 
 src_install() {
-    cd ${S}
-    insinto /etc/apache/conf
-    doins cvsweb.conf
-    insinto /home/httpd/cgi-bin
-    insopts -m755
-    doins cvsweb.cgi
-    dodoc README TODO
+	cd ${S}
+	insinto /etc/apache/conf
+	doins cvsweb.conf
+	insinto /home/httpd/cgi-bin
+	insopts -m755
+	doins cvsweb.cgi
+	dodoc README TODO
 }
-
diff --git a/net-www/cvsweb/cvsweb-1.93-r1.ebuild b/net-www/cvsweb/cvsweb-1.93-r1.ebuild
index f7404151b099..3771434dad6a 100644
--- a/net-www/cvsweb/cvsweb-1.93-r1.ebuild
+++ b/net-www/cvsweb/cvsweb-1.93-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-www/cvsweb/cvsweb-1.93-r1.ebuild,v 1.10 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/cvsweb/cvsweb-1.93-r1.ebuild,v 1.11 2003/09/06 01:54:08 msterret Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/cvsweb
@@ -25,13 +25,11 @@ src_unpack () {
 }
 
 src_install () {
-    cd ${S}
-    insinto /etc/httpd
-    doins cvsweb.conf
-    insinto /usr/local/httpd/cgi-bin
-    insopts -m755
-    doins cvsweb.cgi
-    dodoc README TODO
+	cd ${S}
+	insinto /etc/httpd
+	doins cvsweb.conf
+	insinto /usr/local/httpd/cgi-bin
+	insopts -m755
+	doins cvsweb.cgi
+	dodoc README TODO
 }
-
-
diff --git a/net-www/dillo/Manifest b/net-www/dillo/Manifest
index a6b38bc064c9..0b5b983bd7f1 100644
--- a/net-www/dillo/Manifest
+++ b/net-www/dillo/Manifest
@@ -1,13 +1,13 @@
-MD5 8bcbeb7159eece4089d8ee32ff7e9f13 dillo-0.7.1.2.ebuild 2626
-MD5 bc617827cd8905f25370512ef9820a17 dillo-0.6.6-r3.ebuild 1825
-MD5 3ae0b6d31b4688bcd206854bb7115a2a dillo-0.7.3.ebuild 2589
-MD5 c16761beed57dcf79ee9788e94d8ddfa dillo-0.7.2.ebuild 2617
 MD5 0b312b0eb4189f9471a41d7b04ab9100 ChangeLog 3445
-MD5 bb024c046663310fea23f507727ceb3e dillo-0.6.6-r1.ebuild 1752
-MD5 ac23223bf52a421407977104e34cafcc dillo-0.7.3-r1.ebuild 2689
-MD5 8ef69023a009d501ca2eeb936019c3b7 files/digest-dillo-0.7.2 141
-MD5 984074748b7502f94e80310c5cc609e6 files/digest-dillo-0.7.3 141
-MD5 5decce9a16842c213d1ca6790768de4e files/digest-dillo-0.7.1.2 142
+MD5 769892852fbd0785e4cb143cc37d3fdc dillo-0.6.6-r1.ebuild 1752
+MD5 ab6982ca55ab3fbfbd774cd47d435c66 dillo-0.6.6-r3.ebuild 1823
+MD5 9f92d73f08e4d1292d6f6f535844ac09 dillo-0.7.1.2.ebuild 2626
+MD5 b8e73839e0192b0301b52e471bdcb448 dillo-0.7.2.ebuild 2618
+MD5 7e7d5b8e3baa638846425f9306596ff8 dillo-0.7.3.ebuild 2590
+MD5 faaa7225889f035d67b778e608e506a3 dillo-0.7.3-r1.ebuild 2688
 MD5 7195171b7f074adc1f5f496fceaa8919 files/digest-dillo-0.6.6-r1 133
 MD5 87c4d5f926ddf281a2470cb024eb11b9 files/digest-dillo-0.6.6-r3 140
+MD5 5decce9a16842c213d1ca6790768de4e files/digest-dillo-0.7.1.2 142
+MD5 8ef69023a009d501ca2eeb936019c3b7 files/digest-dillo-0.7.2 141
+MD5 984074748b7502f94e80310c5cc609e6 files/digest-dillo-0.7.3 141
 MD5 228c86b4db650b4d95d9ccbe853cecce files/digest-dillo-0.7.3-r1 142
diff --git a/net-www/dillo/dillo-0.6.6-r1.ebuild b/net-www/dillo/dillo-0.6.6-r1.ebuild
index a2c7ed4d102d..801b3ef8ec5c 100644
--- a/net-www/dillo/dillo-0.6.6-r1.ebuild
+++ b/net-www/dillo/dillo-0.6.6-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-www/dillo/dillo-0.6.6-r1.ebuild,v 1.4 2003/02/13 15:32:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.6.6-r1.ebuild,v 1.5 2003/09/06 01:54:08 msterret Exp $
 
 S=${WORKDIR}/${P}
 S2=${WORKDIR}/${PN}-gentoo-extra
@@ -34,7 +34,7 @@ src_unpack() {
 	then
 		cp ${S2}/pixmaps.ximian.h ${S}/src/pixmaps.h
 	fi
-	
+
 }
 
 src_compile() {
@@ -58,7 +58,7 @@ src_install () {
 }
 
 pkg_postinst() {
-	
+
 	einfo "This ebuild for dillo comes with different toolbar icons"
 	einfo "If you want mozilla style icons then try"
 	einfo "	USE=\"-kde -gnome mozilla\" emerge dillo"
diff --git a/net-www/dillo/dillo-0.6.6-r3.ebuild b/net-www/dillo/dillo-0.6.6-r3.ebuild
index cb4ac9cbd374..a40fba4e3aff 100644
--- a/net-www/dillo/dillo-0.6.6-r3.ebuild
+++ b/net-www/dillo/dillo-0.6.6-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-www/dillo/dillo-0.6.6-r3.ebuild,v 1.4 2003/02/18 07:16:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.6.6-r3.ebuild,v 1.5 2003/09/06 01:54:08 msterret Exp $
 
 inherit eutils
 S2=${WORKDIR}/gentoo-dillo-extras-patch
@@ -24,14 +24,14 @@ DEPEND="=x11-libs/gtk+-1.2*
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	
+
 	if use libwww
 	    then
 		epatch
-		export WANT_AUTOMAKE_1_4=1 
+		export WANT_AUTOMAKE_1_4=1
 		automake
 	fi
-	
+
 	if use mozilla
 	then
 		cp ${S2}/pixmaps.netscape.h ${S}/src/pixmaps.h
diff --git a/net-www/dillo/dillo-0.7.1.2.ebuild b/net-www/dillo/dillo-0.7.1.2.ebuild
index 9a3f57230d9c..986f60904cfd 100644
--- a/net-www/dillo/dillo-0.7.1.2.ebuild
+++ b/net-www/dillo/dillo-0.7.1.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-www/dillo/dillo-0.7.1.2.ebuild,v 1.3 2003/03/14 11:18:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.7.1.2.ebuild,v 1.4 2003/09/06 01:54:08 msterret Exp $
 
 inherit flag-o-matic
 
@@ -28,7 +28,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	
+
 	if [ "${DILLO_ICONSET}" = "kde" ]
 	then
 		ebegin "Using Konqueror style icon set"
diff --git a/net-www/dillo/dillo-0.7.2.ebuild b/net-www/dillo/dillo-0.7.2.ebuild
index 46207e10c31f..7343d3e28935 100644
--- a/net-www/dillo/dillo-0.7.2.ebuild
+++ b/net-www/dillo/dillo-0.7.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-www/dillo/dillo-0.7.2.ebuild,v 1.3 2003/05/16 19:36:05 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.7.2.ebuild,v 1.4 2003/09/06 01:54:08 msterret Exp $
 
 inherit flag-o-matic
 
@@ -28,7 +28,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	
+
 	if [ "${DILLO_ICONSET}" = "kde" ]
 	then
 		ebegin "Using Konqueror style icon set"
diff --git a/net-www/dillo/dillo-0.7.3-r1.ebuild b/net-www/dillo/dillo-0.7.3-r1.ebuild
index 6c9394d8d713..d6311a191132 100644
--- a/net-www/dillo/dillo-0.7.3-r1.ebuild
+++ b/net-www/dillo/dillo-0.7.3-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-www/dillo/dillo-0.7.3-r1.ebuild,v 1.1 2003/08/08 01:32:34 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.7.3-r1.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
 
 inherit flag-o-matic
 
@@ -28,7 +28,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	
+
 	if [ "${DILLO_ICONSET}" = "kde" ]
 	then
 		ebegin "Using Konqueror style icon set"
@@ -68,11 +68,11 @@ src_compile() {
 src_install() {
 	dodir /etc  /usr/share/icons/${PN}
 	einstall
-	
+
 	dodoc AUTHORS COPYING ChangeLog* INSTALL README NEWS
 	docinto doc
 	dodoc doc/*.txt doc/README
-	
+
 	cp ${S2}/icons/*.png ${D}/usr/share/icons/${PN}
 }
 
diff --git a/net-www/dillo/dillo-0.7.3.ebuild b/net-www/dillo/dillo-0.7.3.ebuild
index 18c2ee0b0d42..128559054d34 100644
--- a/net-www/dillo/dillo-0.7.3.ebuild
+++ b/net-www/dillo/dillo-0.7.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-www/dillo/dillo-0.7.3.ebuild,v 1.2 2003/08/08 01:32:34 bcowan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dillo/dillo-0.7.3.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
 
 inherit flag-o-matic
 
@@ -28,7 +28,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	
+
 	if [ "${DILLO_ICONSET}" = "kde" ]
 	then
 		ebegin "Using Konqueror style icon set"
diff --git a/net-www/elinks/Manifest b/net-www/elinks/Manifest
index 635d75d25b1a..7a08b88cf639 100644
--- a/net-www/elinks/Manifest
+++ b/net-www/elinks/Manifest
@@ -1,5 +1,5 @@
+MD5 6c604f6e7d887016d032c7990828824c ChangeLog 1206
+MD5 8d65e9a4067f9d18afa2b66b8066f406 elinks-0.4.1.ebuild 2654
+MD5 98db7e43fe2937771b0942a215e4aa59 elinks-0.4.2.ebuild 2774
 MD5 9297ee25a7411630b8d6299afde4b077 files/digest-elinks-0.4.1 123
 MD5 197f5b6299b8a88d767c58726add73a9 files/digest-elinks-0.4.2 129
-MD5 32183984ff524530855ed51a0ad4a7c9 elinks-0.4.1.ebuild 2653
-MD5 6c604f6e7d887016d032c7990828824c ChangeLog 1206
-MD5 a701f94c10fc63e7a066636a2b6dc8e8 elinks-0.4.2.ebuild 2775
diff --git a/net-www/elinks/elinks-0.4.1.ebuild b/net-www/elinks/elinks-0.4.1.ebuild
index d14296c5d7b4..7a33c016dc0e 100644
--- a/net-www/elinks/elinks-0.4.1.ebuild
+++ b/net-www/elinks/elinks-0.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-www/elinks/elinks-0.4.1.ebuild,v 1.6 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/elinks/elinks-0.4.1.ebuild,v 1.7 2003/09/06 01:54:08 msterret Exp $
 
 DESCRIPTION="Advanced and well-established text-mode web browser"
 HOMEPAGE="http://elinks.or.cz"
@@ -51,7 +51,7 @@ src_compile() {
 		`use_enable ipv6` \
 		`use_with lua` \
 		--enable-leds || die "configure problem"
-		
+
 	emake || die "compile problem"
 }
 
@@ -63,7 +63,7 @@ src_install() {
 	doins ${WORKDIR}/elinks.conf
 	newins contrib/keybind-full.conf keybind-full.sample
 	newins contrib/keybind.conf keybind.conf.sample
-	
+
 	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
 	docinto contrib ; dodoc contrib/{README,completion.tcsh,colws.diff,elinks[-.]vim*}
 	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
diff --git a/net-www/elinks/elinks-0.4.2.ebuild b/net-www/elinks/elinks-0.4.2.ebuild
index cfabe6fcd7b6..ed6bc2a716e2 100644
--- a/net-www/elinks/elinks-0.4.2.ebuild
+++ b/net-www/elinks/elinks-0.4.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-www/elinks/elinks-0.4.2.ebuild,v 1.3 2003/06/27 21:36:19 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/elinks/elinks-0.4.2.ebuild,v 1.4 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="gpm zlib ssl ipv6 X nls lua"
 
@@ -36,7 +36,7 @@ RDEPEND="virtual/glibc
 src_unpack() {
 	unpack ${A}
 	cd ${WORKDIR}
-	
+
 	mv ${P}.conf ${PN}.conf
 	if ! use nls; then
 		# Build with only english support
@@ -58,7 +58,7 @@ src_compile() {
 		`use_with X x` \
 		`use_enable ipv6` \
 		`use_with lua`
-		
+
 	emake || die "compile problem"
 }
 
@@ -70,7 +70,7 @@ src_install() {
 	doins ${WORKDIR}/elinks.conf
 	newins contrib/keybind-full.conf keybind-full.sample
 	newins contrib/keybind.conf keybind.conf.sample
-	
+
 	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
 	docinto contrib ; dodoc contrib/{README,completion.tcsh,colws.diff,elinks[-.]vim*}
 	docinto contrib/lua ; dodoc contrib/lua/{*.lua,elinks-remote}
diff --git a/net-www/galeon/Manifest b/net-www/galeon/Manifest
index 86be7aabb92f..372ed7552ba6 100644
--- a/net-www/galeon/Manifest
+++ b/net-www/galeon/Manifest
@@ -1,12 +1,12 @@
 MD5 861a0f2394ddacea90c16516cc1982d7 ChangeLog 8632
-MD5 703b18a2c4995530918b68748cfe78d2 galeon-1.2.11.ebuild 3229
-MD5 73d0f23d2829366e90befbf230f7c493 galeon-1.3.7.ebuild 1645
-MD5 97168137db627f922a90bfc86721efe7 galeon-1.3.6.ebuild 1636
+MD5 9984dc8c40f962b8112262cbfaec1c46 galeon-1.3.6.ebuild 1572
+MD5 f651aea985507fae9f834dd8200bdecc galeon-1.2.11.ebuild 3228
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 075fe65978afdfd25487ebafc1316268 galeon-1.2.10a.ebuild 3278
-MD5 ac03f7ff1c8c933092c3ff11d59e998c files/digest-galeon-1.2.11 66
-MD5 cac60ede25616b6306b53a878da624eb files/digest-galeon-1.3.7 66
+MD5 604e6ea33c253db613d9550cbb8c8296 galeon-1.3.7.ebuild 1586
+MD5 c8fce5a93c5b8578a81a9f62ed5eb4bc galeon-1.2.10a.ebuild 3277
 MD5 4b04a9c0dc0217c87db1aa94efea4747 files/digest-galeon-1.3.6 66
+MD5 cac60ede25616b6306b53a878da624eb files/digest-galeon-1.3.7 66
+MD5 ac03f7ff1c8c933092c3ff11d59e998c files/digest-galeon-1.2.11 66
 MD5 d7f05d8c910cd3bc11b799ef300ae13f files/galeon-1.2.6-to-printpreview.patch 448
 MD5 c72506690307bdae2ceec562ac7fdbd9 files/galeon-1.2.7-google-UTF8.patch 1594
 MD5 8a4f5575c0225821b55e84ba7e75ae05 files/digest-galeon-1.2.10a 67
diff --git a/net-www/galeon/galeon-1.2.10a.ebuild b/net-www/galeon/galeon-1.2.10a.ebuild
index 0cbfee8c1860..4e15472fff9b 100644
--- a/net-www/galeon/galeon-1.2.10a.ebuild
+++ b/net-www/galeon/galeon-1.2.10a.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-www/galeon/galeon-1.2.10a.ebuild,v 1.4 2003/07/19 21:02:19 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.10a.ebuild,v 1.5 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="nls"
 
@@ -110,7 +110,7 @@ pkg_postinst() {
 	galeon-config-tool --fix-gconf-permissions
 	galeon-config-tool --pkg-install-schemas
 	scrollkeeper-update
-	
+
 	if [ -z "`use gnome`" ]
 	then
 		einfo "Please make sure libglade was built with gnome support, or"
diff --git a/net-www/galeon/galeon-1.2.11.ebuild b/net-www/galeon/galeon-1.2.11.ebuild
index a29fc7aecebc..b133218c447c 100644
--- a/net-www/galeon/galeon-1.2.11.ebuild
+++ b/net-www/galeon/galeon-1.2.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-www/galeon/galeon-1.2.11.ebuild,v 1.3 2003/08/22 14:57:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.11.ebuild,v 1.4 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="nls"
 
@@ -107,7 +107,7 @@ pkg_postinst() {
 	galeon-config-tool --fix-gconf-permissions
 	galeon-config-tool --pkg-install-schemas
 	scrollkeeper-update
-	
+
 	if [ -z "`use gnome`" ]
 	then
 		einfo "Please make sure libglade was built with gnome support, or"
diff --git a/net-www/galeon/galeon-1.3.6.ebuild b/net-www/galeon/galeon-1.3.6.ebuild
index df792c742484..3fd97d9c22cd 100644
--- a/net-www/galeon/galeon-1.3.6.ebuild
+++ b/net-www/galeon/galeon-1.3.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-www/galeon/galeon-1.3.6.ebuild,v 1.1 2003/07/21 21:50:49 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.6.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
 
 inherit gnome2 libtool
 
@@ -28,30 +28,29 @@ RDEPEND="virtual/x11
 	>=gnome-base/libgnomeui-2.0
 	>=gnome-base/gnome-vfs-2.0
 	>=gnome-base/libglade-2.0"
-        
+
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-    >=sys-devel/gettext-0.11"
+	>=sys-devel/gettext-0.11"
 
 pkg_setup () {
-   if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
-   then
-      eerror "you need mozilla-1.3+ compiled against gtk+-2"
-      eerror "export USE=\"gtk2\" ;emerge mozilla -p "
-      die "Need Mozilla compiled with gtk+-2.0!!"
-   fi
-         
+	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
+	then
+		eerror "you need mozilla-1.3+ compiled against gtk+-2"
+		eerror "export USE=\"gtk2\" ;emerge mozilla -p "
+		die "Need Mozilla compiled with gtk+-2.0!!"
+	fi
 }
 
 src_compile() {
-    elibtoolize
-    local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
-    local myconf="--disable-werror"
-    
-    myconf="${myconf} --with-mozilla-snapshot=${moz_ver}"
-    
-    econf ${myconf} || die "configure failed"
-    make || die "compile failed"
+	elibtoolize
+	local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
+	local myconf="--disable-werror"
+
+	myconf="${myconf} --with-mozilla-snapshot=${moz_ver}"
+
+	econf ${myconf} || die "configure failed"
+	make || die "compile failed"
 }
 
 DOCS="AUTHORS COPYING COPYING.README ChangeLog FAQ INSTALL README README.ExtraPrefs THANKS TODO NEWS"
diff --git a/net-www/galeon/galeon-1.3.7.ebuild b/net-www/galeon/galeon-1.3.7.ebuild
index c504702eb024..d747c936f8ec 100644
--- a/net-www/galeon/galeon-1.3.7.ebuild
+++ b/net-www/galeon/galeon-1.3.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-www/galeon/galeon-1.3.7.ebuild,v 1.1 2003/07/25 20:52:01 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.3.7.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
 
 inherit gnome2 debug libtool
 
@@ -28,31 +28,30 @@ RDEPEND="virtual/x11
 	>=gnome-base/gnome-vfs-2
 	>=gnome-base/libglade-2
 	app-text/scrollkeeper"
-        
+
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	dev-util/intltool
 	>=sys-devel/gettext-0.11"
 
 pkg_setup () {
-   if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
-   then
-      eerror "you need mozilla-1.3+ compiled against gtk+-2"
-      eerror "export USE=\"gtk2\" ;emerge mozilla -p "
-      die "Need Mozilla compiled with gtk+-2.0!!"
-   fi
-         
+	if [ ! -f ${ROOT}/usr/lib/mozilla/components/libwidget_gtk2.so ]
+	then
+		eerror "you need mozilla-1.3+ compiled against gtk+-2"
+		eerror "export USE=\"gtk2\" ;emerge mozilla -p "
+		die "Need Mozilla compiled with gtk+-2.0!!"
+	fi
 }
 
 src_compile() {
-    elibtoolize
-    local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
-    local myconf="--disable-werror"
-    
-    myconf="${myconf} --with-mozilla-snapshot=${moz_ver}"
-    
-    econf ${myconf} || die "configure failed"
-    make || die "compile failed"
+	elibtoolize
+	local moz_ver="`pkg-config --modversion mozilla-xpcom | cut -d. -f1,2 2>/dev/null`"
+	local myconf="--disable-werror"
+
+	myconf="${myconf} --with-mozilla-snapshot=${moz_ver}"
+
+	econf ${myconf} || die "configure failed"
+	make || die "compile failed"
 }
 
 DOCS="AUTHORS COPYING COPYING.README ChangeLog FAQ INSTALL README README.ExtraPrefs THANKS TODO NEWS"
diff --git a/net-www/gplflash/Manifest b/net-www/gplflash/Manifest
index c6f4d5e79a10..e17c13c2972d 100644
--- a/net-www/gplflash/Manifest
+++ b/net-www/gplflash/Manifest
@@ -1,10 +1,10 @@
+MD5 bfa44b8c249a881372ad6e7dfdd8af6d ChangeLog 1499
+MD5 5286e41a3f5ac2d34eea225074627bc5 gplflash-0.4.10-r1.ebuild 916
+MD5 02cc3406127f4d08d3687ae5831eec66 gplflash-0.4.10-r2.ebuild 989
+MD5 45f77edffc7c12dd09b7869ae5f6dd6a gplflash-0.4.10.ebuild 927
 MD5 37d2d7738b1e06fcb5c161ffce30f238 files/digest-gplflash-0.4.10 61
 MD5 37d2d7738b1e06fcb5c161ffce30f238 files/digest-gplflash-0.4.10-r1 61
+MD5 37d2d7738b1e06fcb5c161ffce30f238 files/digest-gplflash-0.4.10-r2 61
 MD5 9df49fc7e8cbac455465270a0ecead2f files/gentoo.diff 247
 MD5 4e51ed812f940be98742997fee035846 files/gplflash-0.4.10-gcc3-gentoo.diff 1060
-MD5 37d2d7738b1e06fcb5c161ffce30f238 files/digest-gplflash-0.4.10-r2 61
 MD5 1560bb78cb5b479b310c1604fb1b46da files/gplflash-0.4.10-ppc.diff 2018
-MD5 a5b002c535f511dba918a7a64e85325c gplflash-0.4.10-r1.ebuild 934
-MD5 7be5704ab7cd22e8a27b341158f26d2b gplflash-0.4.10.ebuild 945
-MD5 bfa44b8c249a881372ad6e7dfdd8af6d ChangeLog 1499
-MD5 8c9daf3a271a6407895e918a508a5ab2 gplflash-0.4.10-r2.ebuild 1007
diff --git a/net-www/gplflash/gplflash-0.4.10-r1.ebuild b/net-www/gplflash/gplflash-0.4.10-r1.ebuild
index ac8e86773bcd..a16a1076af42 100644
--- a/net-www/gplflash/gplflash-0.4.10-r1.ebuild
+++ b/net-www/gplflash/gplflash-0.4.10-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-www/gplflash/gplflash-0.4.10-r1.ebuild,v 1.12 2003/06/12 22:07:00 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/gplflash-0.4.10-r1.ebuild,v 1.13 2003/09/06 01:54:08 msterret Exp $
 
 S=${WORKDIR}/flash-0.4.10
 DESCRIPTION="GPL Shockwave Flash Player/Plugin"
@@ -24,16 +24,16 @@ src_compile() {
 	emake || die
 }
 
-src_install() {															 
+src_install() {
 	cd ${S}/Plugin
 	insinto /opt/netscape/plugins
 	doins npflash.so
 	cd ${S}
 	dodoc README COPYING
-	
+
 	if [ "`use mozilla`" ] ; then
 		dodir /usr/lib/mozilla/plugins
 		dosym /opt/netscape/plugins/npflash.so \
-			/usr/lib/mozilla/plugins/npflash.so 
+			/usr/lib/mozilla/plugins/npflash.so
 	fi
 }
diff --git a/net-www/gplflash/gplflash-0.4.10-r2.ebuild b/net-www/gplflash/gplflash-0.4.10-r2.ebuild
index 7718f8eece1f..c15ca3ec70b7 100644
--- a/net-www/gplflash/gplflash-0.4.10-r2.ebuild
+++ b/net-www/gplflash/gplflash-0.4.10-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-www/gplflash/gplflash-0.4.10-r2.ebuild,v 1.2 2003/06/12 22:07:00 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/gplflash-0.4.10-r2.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
 
 S=${WORKDIR}/flash-0.4.10
 DESCRIPTION="GPL Shockwave Flash Player/Plugin"
@@ -28,16 +28,16 @@ src_compile() {
 	emake || die
 }
 
-src_install() {															 
+src_install() {
 	cd ${S}/Plugin
 	insinto /opt/netscape/plugins
 	doins npflash.so
 	cd ${S}
 	dodoc README COPYING
-	
+
 	if [ "`use mozilla`" ] ; then
 		dodir /usr/lib/mozilla/plugins
 		dosym /opt/netscape/plugins/npflash.so \
-			/usr/lib/mozilla/plugins/npflash.so 
+			/usr/lib/mozilla/plugins/npflash.so
 	fi
 }
diff --git a/net-www/gplflash/gplflash-0.4.10.ebuild b/net-www/gplflash/gplflash-0.4.10.ebuild
index 82a7e2736273..f132753bfbb8 100644
--- a/net-www/gplflash/gplflash-0.4.10.ebuild
+++ b/net-www/gplflash/gplflash-0.4.10.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-www/gplflash/gplflash-0.4.10.ebuild,v 1.11 2003/06/12 22:07:00 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/gplflash/gplflash-0.4.10.ebuild,v 1.12 2003/09/06 01:54:08 msterret Exp $
 
 S=${WORKDIR}/flash-0.4.10
 DESCRIPTION="GPL Shockwave Flash Player/Plugin"
@@ -26,16 +26,16 @@ src_compile() {
 	emake || die
 }
 
-src_install() {															 
+src_install() {
 	cd ${S}/Plugin
 	insinto /opt/netscape/plugins
 	doins npflash.so
 	cd ${S}
 	dodoc README ReadMe.htm
-	
+
 	if [ "`use mozilla`" ] ; then
 		dodir /usr/lib/mozilla/plugins
 		dosym /opt/netscape/plugins/npflash.so \
-			/usr/lib/mozilla/plugins/npflash.so 
+			/usr/lib/mozilla/plugins/npflash.so
 	fi
 }
diff --git a/net-www/horde-chora/Manifest b/net-www/horde-chora/Manifest
index b43bed22cc5c..e067ddb02a75 100644
--- a/net-www/horde-chora/Manifest
+++ b/net-www/horde-chora/Manifest
@@ -1,7 +1,7 @@
 MD5 a2eff0db5d46843f1d3098de3efe3eeb ChangeLog 824
-MD5 7819b49e8f552ab5daf4ec42a1463e06 horde-chora-1.1.ebuild 2060
-MD5 538f574bb6e280e2ba227567d4ef42a6 horde-chora-1.2-r1.ebuild 1564
-MD5 7106c5539dad095f55428d64e34be4e6 horde-chora-1.2.ebuild 2066
+MD5 91e66afd9f9bb2d2b8d7e09551056c89 horde-chora-1.1.ebuild 2046
+MD5 3794eda10b0639ca255194d728deefb6 horde-chora-1.2-r1.ebuild 1551
+MD5 aed17ff2f17460c97c26208da46e5cb2 horde-chora-1.2.ebuild 2052
 MD5 033bd6c3aab6f738bb6b542b65c86133 files/digest-horde-chora-1.1 62
 MD5 4e7d3aeb55f6a66a360f0c4571a7804b files/digest-horde-chora-1.2 61
 MD5 4e7d3aeb55f6a66a360f0c4571a7804b files/digest-horde-chora-1.2-r1 61
diff --git a/net-www/horde-chora/horde-chora-1.1.ebuild b/net-www/horde-chora/horde-chora-1.1.ebuild
index 748f10c0c563..32afeea0f718 100644
--- a/net-www/horde-chora/horde-chora-1.1.ebuild
+++ b/net-www/horde-chora/horde-chora-1.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-www/horde-chora/horde-chora-1.1.ebuild,v 1.4 2003/02/13 15:34:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-chora/horde-chora-1.1.ebuild,v 1.5 2003/09/06 01:54:08 msterret Exp $
 
 DESCRIPTION="Chora is the Horde CVS viewer."
 HOMEPAGE="http://www.horde.org"
@@ -11,8 +11,8 @@ SLOT="1"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 DEPEND=""
 RDEPEND=">=net-www/horde-2.1
-         >=app-text/rcs-5.7-r1
-         >=dev-util/cvs-1.11.2"
+	>=app-text/rcs-5.7-r1
+	>=dev-util/cvs-1.11.2"
 IUSE=""
 
 find_http_root() {
diff --git a/net-www/horde-chora/horde-chora-1.2-r1.ebuild b/net-www/horde-chora/horde-chora-1.2-r1.ebuild
index 6b6c70cde4bb..a3bf6469aa6b 100644
--- a/net-www/horde-chora/horde-chora-1.2-r1.ebuild
+++ b/net-www/horde-chora/horde-chora-1.2-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-www/horde-chora/horde-chora-1.2-r1.ebuild,v 1.1 2003/04/08 21:50:17 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-chora/horde-chora-1.2-r1.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
 
 DESCRIPTION="Chora ${PV} is the Horde CVS viewer."
 HOMEPAGE="http://www.horde.org"
@@ -11,8 +11,8 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2.1
-         >=app-text/rcs-5.7-r1
-         >=dev-util/cvs-1.11.2"
+	>=app-text/rcs-5.7-r1
+	>=dev-util/cvs-1.11.2"
 IUSE=""
 
 find_http_root() {
diff --git a/net-www/horde-chora/horde-chora-1.2.ebuild b/net-www/horde-chora/horde-chora-1.2.ebuild
index 2fb4d1cd60dd..65443ae76edc 100644
--- a/net-www/horde-chora/horde-chora-1.2.ebuild
+++ b/net-www/horde-chora/horde-chora-1.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-www/horde-chora/horde-chora-1.2.ebuild,v 1.2 2003/02/13 15:34:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-chora/horde-chora-1.2.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
 
 DESCRIPTION="Chora ${PV} is the Horde CVS viewer."
 HOMEPAGE="http://www.horde.org"
@@ -11,8 +11,8 @@ SLOT="1"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 DEPEND=""
 RDEPEND=">=net-www/horde-2.2
-         >=app-text/rcs-5.7-r1
-         >=dev-util/cvs-1.11.2"
+	>=app-text/rcs-5.7-r1
+	>=dev-util/cvs-1.11.2"
 IUSE=""
 
 find_http_root() {
diff --git a/net-www/horde-imp/Manifest b/net-www/horde-imp/Manifest
index c798e795435d..8a93f2fa246f 100644
--- a/net-www/horde-imp/Manifest
+++ b/net-www/horde-imp/Manifest
@@ -1,7 +1,7 @@
 MD5 a37ef09aeada32607dbea0902d9f3de3 ChangeLog 1522
-MD5 d749c98e6baf918e336ad9023a445e63 horde-imp-3.1.ebuild 2343
-MD5 1b07ea9b3422cb59638d79d7d902641f horde-imp-3.2.1.ebuild 1850
-MD5 96b98cc47268d4f658dcd9defd340093 horde-imp-3.2.ebuild 2509
+MD5 77c6a0580383618cb98464fbf8e93cb4 horde-imp-3.1.ebuild 2344
+MD5 949728c046b3d61d5f16817293d3454b horde-imp-3.2.1.ebuild 1852
+MD5 fb4c036934347a18a37c5f31430e95e0 horde-imp-3.2.ebuild 2511
 MD5 c8ab3c1c4b8c9634461c7b418bf33c76 files/digest-horde-imp-3.1 61
 MD5 fbcc7aba9696f0f62a57c1da73ed2adf files/digest-horde-imp-3.2 60
 MD5 ed9183a28cb927048e4638b39f7b4718 files/digest-horde-imp-3.2.1 62
diff --git a/net-www/horde-imp/horde-imp-3.1.ebuild b/net-www/horde-imp/horde-imp-3.1.ebuild
index 113e2287f916..8ece88cbdeaf 100644
--- a/net-www/horde-imp/horde-imp-3.1.ebuild
+++ b/net-www/horde-imp/horde-imp-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-www/horde-imp/horde-imp-3.1.ebuild,v 1.4 2003/02/13 15:34:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-imp/horde-imp-3.1.ebuild,v 1.5 2003/09/06 01:54:08 msterret Exp $
 
 DESCRIPTION="IMP provides webmail access"
 HOMEPAGE="http://www.horde.org"
@@ -43,7 +43,7 @@ src_compile() {
 }
 
 src_install () {
-	
+
 	# detecting apache usergroup
 	# FIXME: With time, apache's GID should be static
 	GID=`grep apache /etc/group |cut -d: -f3`
diff --git a/net-www/horde-imp/horde-imp-3.2.1.ebuild b/net-www/horde-imp/horde-imp-3.2.1.ebuild
index 883e1ba58c6a..e793946d98d7 100644
--- a/net-www/horde-imp/horde-imp-3.2.1.ebuild
+++ b/net-www/horde-imp/horde-imp-3.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-www/horde-imp/horde-imp-3.2.1.ebuild,v 1.1 2003/04/08 21:43:01 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-imp/horde-imp-3.2.1.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
 
 DESCRIPTION="IMP ${PV} provides webmail access"
 HOMEPAGE="http://www.horde.org"
@@ -43,7 +43,7 @@ src_compile() {
 }
 
 src_install () {
-	
+
 	# detecting apache usergroup
 	# FIXME: With time, apache's GID should be static
 	GID=`grep apache /etc/group |cut -d: -f3`
diff --git a/net-www/horde-imp/horde-imp-3.2.ebuild b/net-www/horde-imp/horde-imp-3.2.ebuild
index 149a50780d79..e0e114e33dc1 100644
--- a/net-www/horde-imp/horde-imp-3.2.ebuild
+++ b/net-www/horde-imp/horde-imp-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-www/horde-imp/horde-imp-3.2.ebuild,v 1.1 2003/02/24 20:27:08 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-imp/horde-imp-3.2.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
 
 DESCRIPTION="IMP ${PV} provides webmail access"
 HOMEPAGE="http://www.horde.org"
@@ -43,7 +43,7 @@ src_compile() {
 }
 
 src_install () {
-	
+
 	# detecting apache usergroup
 	# FIXME: With time, apache's GID should be static
 	GID=`grep apache /etc/group |cut -d: -f3`
diff --git a/net-www/horde-pear/Manifest b/net-www/horde-pear/Manifest
index 5e9d28517b98..cd665e0b6466 100644
--- a/net-www/horde-pear/Manifest
+++ b/net-www/horde-pear/Manifest
@@ -1,5 +1,5 @@
-MD5 172ba5f8b373db3dd7996dcebc6ef7bf horde-pear-1.0.1.1.ebuild 750
-MD5 befb709ec2bd8514258ab092466251ea horde-pear-1.0.1.ebuild 746
 MD5 dff6e674b11beebd4f77479de8213141 ChangeLog 688
-MD5 dda19fa30bd9d6f2eef96ebb4635c920 files/digest-horde-pear-1.0.1.1 64
+MD5 942ed6ce5c4cf3fc3647f7980ca8874b horde-pear-1.0.1.ebuild 730
+MD5 616846c95de87ae85670847104484880 horde-pear-1.0.1.1.ebuild 734
 MD5 4cecaef6815291c5e605f98d4bc59dda files/digest-horde-pear-1.0.1 62
+MD5 dda19fa30bd9d6f2eef96ebb4635c920 files/digest-horde-pear-1.0.1.1 64
diff --git a/net-www/horde-pear/horde-pear-1.0.1.1.ebuild b/net-www/horde-pear/horde-pear-1.0.1.1.ebuild
index 975b5d062ba5..4ebc722700b2 100644
--- a/net-www/horde-pear/horde-pear-1.0.1.1.ebuild
+++ b/net-www/horde-pear/horde-pear-1.0.1.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-www/horde-pear/horde-pear-1.0.1.1.ebuild,v 1.2 2003/07/07 08:48:33 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-pear/horde-pear-1.0.1.1.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
 
 DESCRIPTION="Horde Application Framework PHP PEAR files ${PV}"
 HOMEPAGE="http://www.horde.org"
@@ -11,8 +11,8 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 DEPEND=""
 RDEPEND=">=dev-php/mod_php-4.1.0
-         >=sys-devel/gettext-0.10.40
-         >=dev-libs/libxml2-2.4.21-r1"
+	>=sys-devel/gettext-0.10.40
+	>=dev-libs/libxml2-2.4.21-r1"
 IUSE=""
 S="${WORKDIR}/pear"
 src_compile() {
diff --git a/net-www/horde-pear/horde-pear-1.0.1.ebuild b/net-www/horde-pear/horde-pear-1.0.1.ebuild
index 5f64a8fa5785..926dbffe61d1 100644
--- a/net-www/horde-pear/horde-pear-1.0.1.ebuild
+++ b/net-www/horde-pear/horde-pear-1.0.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-www/horde-pear/horde-pear-1.0.1.ebuild,v 1.2 2003/07/07 08:48:33 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/horde-pear/horde-pear-1.0.1.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
 
 DESCRIPTION="Horde Application Framework PHP PEAR files ${PV}"
 HOMEPAGE="http://www.horde.org"
@@ -11,8 +11,8 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 DEPEND=""
 RDEPEND=">=dev-php/mod_php-4.1.0
-         >=sys-devel/gettext-0.10.40
-         >=dev-libs/libxml2-2.4.21-r1"
+	>=sys-devel/gettext-0.10.40
+	>=dev-libs/libxml2-2.4.21-r1"
 IUSE=""
 S="${WORKDIR}/pear"
 src_compile() {
diff --git a/net-www/htdig/Manifest b/net-www/htdig/Manifest
index 3f56f9c82682..11c60835624b 100644
--- a/net-www/htdig/Manifest
+++ b/net-www/htdig/Manifest
@@ -1,8 +1,8 @@
 MD5 fb5a91182cf6106d42236e8c8563251a ChangeLog 3394
-MD5 5a6c56f9e20551a60c9165a59b85c3fb htdig-3.1.6-r1.ebuild 1609
-MD5 1034b2e778dd97ae4814be55b23457b6 htdig-3.1.6-r2.ebuild 1398
-MD5 e6872e23f2cdc43f62e03f15599bc79a htdig-3.1.6-r3.ebuild 1550
-MD5 345a77120ce7b8745b2e87aceceb405f htdig-3.1.6-r4.ebuild 1472
+MD5 1b9debad5819e6f7b1be409113a21691 htdig-3.1.6-r1.ebuild 1608
+MD5 7f7103c9c9e2ec0635bf29bb7179757b htdig-3.1.6-r2.ebuild 1397
+MD5 303d08363913e638ec7c373aa6f6a807 htdig-3.1.6-r3.ebuild 1547
+MD5 144c661141e50d86d35e1b270bad5c72 htdig-3.1.6-r4.ebuild 1471
 MD5 8863dac1d260decb47f31d1a3fe422e2 files/CONFIG.in 2012
 MD5 10558a7c02e5ea20fdfe325e6186fc9d files/digest-htdig-3.1.6-r1 64
 MD5 10558a7c02e5ea20fdfe325e6186fc9d files/digest-htdig-3.1.6-r2 64
diff --git a/net-www/htdig/htdig-3.1.6-r1.ebuild b/net-www/htdig/htdig-3.1.6-r1.ebuild
index 89286d218509..b4ede278cb90 100644
--- a/net-www/htdig/htdig-3.1.6-r1.ebuild
+++ b/net-www/htdig/htdig-3.1.6-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-www/htdig/htdig-3.1.6-r1.ebuild,v 1.7 2003/02/13 15:35:11 vapier Exp ${PN}/${PN}-3.1.5-r2.ebuild,v 1.2 2002/03/15 12:10:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/htdig/htdig-3.1.6-r1.ebuild,v 1.8 2003/09/06 01:54:08 msterret Exp ${PN}/${PN}-3.1.5-r2.ebuild,v 1.2 2002/03/15 12:10:18 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="HTTP/HTML indexing and searching system"
@@ -48,13 +48,13 @@ src_install () {
 		DEFAULT_CONFIG_FILE=${D}/etc/${PN}/${PN}.conf \
 		exec_prefix=${D}/usr \
 		install || die
-	
+
 	dodoc ChangeLog COPYING README
 	dohtml -r htdoc
-	
+
 	insinto /etc/conf.d
 	doins installdir/htdig.conf
-	
+
 	dosed /etc/httpd/htdig.conf
 	dosed /usr/bin/rundig
 }
diff --git a/net-www/htdig/htdig-3.1.6-r2.ebuild b/net-www/htdig/htdig-3.1.6-r2.ebuild
index 4be0a55f9163..2fbdd135f0f3 100644
--- a/net-www/htdig/htdig-3.1.6-r2.ebuild
+++ b/net-www/htdig/htdig-3.1.6-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-www/htdig/htdig-3.1.6-r2.ebuild,v 1.7 2003/02/13 15:35:17 vapier Exp ${PN}/${PN}-3.1.5-r2.ebuild,v 1.2 2002/03/15 12:10:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/htdig/htdig-3.1.6-r2.ebuild,v 1.8 2003/09/06 01:54:08 msterret Exp ${PN}/${PN}-3.1.5-r2.ebuild,v 1.2 2002/03/15 12:10:18 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="HTTP/HTML indexing and searching system"
@@ -43,13 +43,13 @@ src_install () {
 		DEFAULT_CONFIG_FILE=${D}/etc/${PN}/${PN}.conf \
 		exec_prefix=${D}/usr \
 		install || die
-	
+
 	dodoc ChangeLog COPYING README
 	dohtml -r htdoc
-	
+
 	insinto /etc/conf.d
 	doins installdir/htdig.conf
-	
+
 	dosed /etc/htdig/htdig.conf
 	dosed /usr/bin/rundig
 }
diff --git a/net-www/htdig/htdig-3.1.6-r3.ebuild b/net-www/htdig/htdig-3.1.6-r3.ebuild
index bc206386607a..d241b8dcea15 100644
--- a/net-www/htdig/htdig-3.1.6-r3.ebuild
+++ b/net-www/htdig/htdig-3.1.6-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-www/htdig/htdig-3.1.6-r3.ebuild,v 1.7 2003/02/13 15:35:22 vapier Exp ${PN}/${PN}-3.1.5-r2.ebuild,v 1.2 2002/03/15 12:10:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/htdig/htdig-3.1.6-r3.ebuild,v 1.8 2003/09/06 01:54:08 msterret Exp ${PN}/${PN}-3.1.5-r2.ebuild,v 1.2 2002/03/15 12:10:18 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="HTTP/HTML indexing and searching system"
@@ -43,23 +43,23 @@ src_install () {
 		DEFAULT_CONFIG_FILE=${D}/etc/${PN}/${PN}.conf \
 		exec_prefix=${D}/usr \
 		install || die
-	
+
 	dodoc ChangeLog COPYING README
 	dohtml -r htdoc
-	
+
 	insinto /etc/conf.d
 	doins installdir/htdig.conf
-	
+
 	dosed /etc/htdig/htdig.conf
 	dosed /usr/bin/rundig
 
-	touch ${D}/var/htdig/db/word2root.db 
+	touch ${D}/var/htdig/db/word2root.db
 	touch ${D}/var/htdig/db/root2word.db
 
 }
 
 pkg_postinst() {
-	
+
 	einfo "Generating initial database"
 	rundig
 
diff --git a/net-www/htdig/htdig-3.1.6-r4.ebuild b/net-www/htdig/htdig-3.1.6-r4.ebuild
index ebdcdcc0f770..63c24a050d74 100644
--- a/net-www/htdig/htdig-3.1.6-r4.ebuild
+++ b/net-www/htdig/htdig-3.1.6-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-www/htdig/htdig-3.1.6-r4.ebuild,v 1.10 2003/03/29 19:36:41 tuxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/htdig/htdig-3.1.6-r4.ebuild,v 1.11 2003/09/06 01:54:08 msterret Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="HTTP/HTML indexing and searching system"
@@ -45,17 +45,17 @@ src_install () {
 		DEFAULT_CONFIG_FILE=${D}/etc/${PN}/${PN}.conf \
 		exec_prefix=${D}/usr \
 		install || die
-	
+
 	dodoc ChangeLog COPYING README
 	dohtml -r htdoc
-	
+
 	insinto /etc/conf.d
 	doins installdir/htdig.conf
-	
+
 	dosed /etc/htdig/htdig.conf
 	dosed /usr/bin/rundig
 
-	touch ${D}/var/htdig/db/word2root.db 
+	touch ${D}/var/htdig/db/word2root.db
 	touch ${D}/var/htdig/db/root2word.db
 
 }
diff --git a/net-www/httrack/Manifest b/net-www/httrack/Manifest
index 90d252adba6c..21c76d5586f5 100644
--- a/net-www/httrack/Manifest
+++ b/net-www/httrack/Manifest
@@ -1,3 +1,3 @@
-MD5 2d1981778d937bdda235adb91f403901 files/digest-httrack-3.23 64
-MD5 ff1df9a1c4549b55c587c03014d6d78d httrack-3.23.ebuild 1161
 MD5 8dffc958b568e65891b9a192d38e320d ChangeLog 692
+MD5 72b0eeb0d100f27febd79b70ad73fe5d httrack-3.23.ebuild 1164
+MD5 2d1981778d937bdda235adb91f403901 files/digest-httrack-3.23 64
diff --git a/net-www/httrack/httrack-3.23.ebuild b/net-www/httrack/httrack-3.23.ebuild
index 1da0406b37a7..e359afb44ff5 100644
--- a/net-www/httrack/httrack-3.23.ebuild
+++ b/net-www/httrack/httrack-3.23.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-www/httrack/httrack-3.23.ebuild,v 1.2 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/httrack/httrack-3.23.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
 
 DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
 HOMEPAGE="http://www.httrack.com/"
@@ -39,7 +39,7 @@ src_install() {
 	cd ${D}/usr/share/doc/
 	mv httrack ${P}
 	cd ${S}
-	dodoc AUTHORS COPYING INSTALL NEWS README ChangeLog 
+	dodoc AUTHORS COPYING INSTALL NEWS README ChangeLog
 	dodoc greetings.txt history.txt
 	dohtml httrack-doc.html
 }
diff --git a/net-www/jboss/Manifest b/net-www/jboss/Manifest
index fc0f655a50ba..d7b81901f423 100644
--- a/net-www/jboss/Manifest
+++ b/net-www/jboss/Manifest
@@ -1,18 +1,18 @@
-MD5 48e1267c9670d6bfd78655833bd9b3aa jboss-3.0.6.ebuild 2665
 MD5 16a56d9d71071d25203e1ad3257c17b6 ChangeLog 1726
-MD5 385353f6bbc7ac519c75d1c14501a33c jboss-3.0.1_rc1.ebuild 2589
+MD5 1dd1c1cd3a632aaa9bedd01f97a45b13 jboss-3.0.1_rc1.ebuild 2583
+MD5 1856d05f47943cadadf46edb3c7042b3 jboss-3.0.6.ebuild 2657
 MD5 04e3a3d3f02c0d9acca7eee4c0837537 jboss-3.2.1.ebuild 3103
-MD5 140380e2f35d6b9c2b509e51037f73ad jboss-3.2.1-r1.ebuild 3101
-MD5 ee6dd298b26237545eb64c6fa1f576b5 files/digest-jboss-3.0.6 66
+MD5 3815d850f49c05538c11cf8e1261e306 jboss-3.2.1-r1.ebuild 3096
+MD5 83b6857488b5fca7fbe0b9f5cc841237 files/README.gentoo 1319
 MD5 9ed2cbd53ccd4ad24130fa8a0bd44fab files/digest-jboss-3.0.1_rc1 69
+MD5 ee6dd298b26237545eb64c6fa1f576b5 files/digest-jboss-3.0.6 66
+MD5 e7f2e7b69b77430017fe58448ca68772 files/jboss-3.0.6-connector.patch 549
 MD5 b6da382577bcc6d139c83cb0e11bc466 files/log4j.xml 5632
 MD5 18692f3609e3c62b4505a3f41d7d1fca files/digest-jboss-3.2.1 66
-MD5 83b6857488b5fca7fbe0b9f5cc841237 files/README.gentoo 1319
-MD5 e7f2e7b69b77430017fe58448ca68772 files/jboss-3.0.6-connector.patch 549
 MD5 18692f3609e3c62b4505a3f41d7d1fca files/digest-jboss-3.2.1-r1 66
 MD5 e282e72230397784cfd6a0d6c4e794ed files/conf.d/jboss 988
 MD5 a466b250acce9ac6953fc85577ca6bf6 files/init.d/jboss 478
 MD5 4662db6a030cb02f46ed3bfe486b90c6 files/3.2.1/log4j.xml 5632
 MD5 bdbc8a52eecf0d7fae7afb228cc85e86 files/3.2.1/conf.d/jboss 1270
-MD5 c9118ad8271f3bae533403478bbd8484 files/3.2.1/init.d/jboss 765
 MD5 8be6a5609fb1d490b808a3124052e0ba files/3.2.1/env.d/50jboss 27
+MD5 c9118ad8271f3bae533403478bbd8484 files/3.2.1/init.d/jboss 765
diff --git a/net-www/jboss/jboss-3.0.1_rc1.ebuild b/net-www/jboss/jboss-3.0.1_rc1.ebuild
index fecb88ec7e5d..62ada7992188 100644
--- a/net-www/jboss/jboss-3.0.1_rc1.ebuild
+++ b/net-www/jboss/jboss-3.0.1_rc1.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-www/jboss/jboss-3.0.1_rc1.ebuild,v 1.5 2003/02/28 16:55:00 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/jboss/jboss-3.0.1_rc1.ebuild,v 1.6 2003/09/06 01:54:08 msterret Exp $
 
 MY_P="jboss-3.0.1RC1-src"
 S=${WORKDIR}/${MY_P}
@@ -55,7 +55,7 @@ src_install() {
 	local dirs="build/output/jboss-3.0.1RC1/server build/output/jboss-3.0.1RC1/lib"
 	for i in $dirs ; do
 	 	cp -a $i ${D}/${INSTALL_DIR}/
-        done
+	done
 	cp ${FILESDIR}/log4j.xml ${D}/${INSTALL_DIR}/server/all/conf
 	cp ${FILESDIR}/log4j.xml ${D}/${INSTALL_DIR}/server/default/conf
 	cp ${FILESDIR}/log4j.xml ${D}/${INSTALL_DIR}/server/minimal/conf
diff --git a/net-www/jboss/jboss-3.0.6.ebuild b/net-www/jboss/jboss-3.0.6.ebuild
index b33266f3d85f..60eb9f4711e9 100644
--- a/net-www/jboss/jboss-3.0.6.ebuild
+++ b/net-www/jboss/jboss-3.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-www/jboss/jboss-3.0.6.ebuild,v 1.2 2003/03/26 12:24:10 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/jboss/jboss-3.0.6.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
 
 MY_P="jboss-3.0.6-src"
 S=${WORKDIR}/${MY_P}
@@ -62,7 +62,7 @@ src_install() {
 	local dirs="build/output/${PN}-${PV}/server build/output/${PN}-${PV}/lib"
 	for i in $dirs ; do
 	 	cp -a $i ${D}/${INSTALL_DIR}/
-        done
+	done
 	cp ${FILESDIR}/log4j.xml ${D}/${INSTALL_DIR}/server/all/conf
 	cp ${FILESDIR}/log4j.xml ${D}/${INSTALL_DIR}/server/default/conf
 	cp ${FILESDIR}/log4j.xml ${D}/${INSTALL_DIR}/server/minimal/conf
@@ -75,7 +75,7 @@ src_install() {
 
 	einfo ">>> Setting up documentation..."
 	dodoc build/output/${PN}-${PV}/docs/LICENSE.txt ${FILESDIR}/README.gentoo
-	if [ -n "`use doc`" ] ; then	
+	if [ -n "`use doc`" ] ; then
 		dohtml -a html,htm,png,gif,css,java -r build/output/${PN}-${PV}/docs/
 	fi
 
diff --git a/net-www/jboss/jboss-3.2.1-r1.ebuild b/net-www/jboss/jboss-3.2.1-r1.ebuild
index 38caf05645b6..7c782d85a53b 100644
--- a/net-www/jboss/jboss-3.2.1-r1.ebuild
+++ b/net-www/jboss/jboss-3.2.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-www/jboss/jboss-3.2.1-r1.ebuild,v 1.1 2003/07/11 04:25:37 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/jboss/jboss-3.2.1-r1.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
 
 MY_P="${P}-src"
 
@@ -58,11 +58,11 @@ src_install() {
 	# We probably should not do this, because a wide variety of tools
 	# assume everything under a common JBoss file system.
 
- 	einfo ">>> Installing client libraries..."
- 	local dirs="build/output/${PN}-${PV}/client/*"
- 	for i in $dirs ; do
- 		dojar $i
- 	done
+	einfo ">>> Installing client libraries..."
+	local dirs="build/output/${PN}-${PV}/client/*"
+	for i in $dirs ; do
+		dojar $i
+	done
 
 	einfo ">>> Setting up documentation..."
 	dodoc server/src/docs/LICENSE.txt ${FILESDIR}/README.gentoo
diff --git a/net-www/junkbuster/Manifest b/net-www/junkbuster/Manifest
index 834fac09d741..2d946c6c13d1 100644
--- a/net-www/junkbuster/Manifest
+++ b/net-www/junkbuster/Manifest
@@ -1,4 +1,4 @@
 MD5 1ff3172585603afda49e630e23da0339 ChangeLog 871
-MD5 e8c1ba54e016b118eec390d071a94672 junkbuster-2.0.2.ebuild 925
+MD5 1fc1f1ed35dcf38f22c49ed3b6e01490 junkbuster-2.0.2.ebuild 925
 MD5 144473c056c1fe200cf39e691a8417ba files/digest-junkbuster-2.0.2 70
 MD5 9222ea9033d36b9353116bb46d1dbd3c files/junkbuster.rc6 600
diff --git a/net-www/junkbuster/junkbuster-2.0.2.ebuild b/net-www/junkbuster/junkbuster-2.0.2.ebuild
index afd7507dd2dc..718ea26a730a 100644
--- a/net-www/junkbuster/junkbuster-2.0.2.ebuild
+++ b/net-www/junkbuster/junkbuster-2.0.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-www/junkbuster/junkbuster-2.0.2.ebuild,v 1.9 2003/02/13 15:35:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/junkbuster/junkbuster-2.0.2.ebuild,v 1.10 2003/09/06 01:54:08 msterret Exp $
 
 S=${WORKDIR}/ijb20
 DESCRIPTION="Filtering HTTP proxy"
@@ -29,11 +29,11 @@ src_install () {
 	dodir /etc/junkbuster
 	insinto /etc/junkbuster
 	doins blocklist config cookiefile forward imagelist
-	
+
 	dohtml gpl.html ijbman.html ijbfaq.html
 	dodoc README README.TOO README.WIN squid.txt
-	
+
 	doman junkbuster.1
-	
+
 	dodir /var/log/junkbuster
 }
diff --git a/net-www/khttrack/khttrack-0.10.ebuild b/net-www/khttrack/khttrack-0.10.ebuild
index 3ce65cec46de..e24c04cfb90b 100644
--- a/net-www/khttrack/khttrack-0.10.ebuild
+++ b/net-www/khttrack/khttrack-0.10.ebuild
@@ -14,7 +14,6 @@ IUSE=""
 need-kde 3
 
 DEPEND=">=kde-base/kdelibs-3
-        net-www/httrack"
+	net-www/httrack"
 RDEPEND=">=kde-base/kdelibs-3
-         net-www/httrack"
-
+		net-www/httrack"
diff --git a/net-www/konqueror-embedded/Manifest b/net-www/konqueror-embedded/Manifest
index cbe3eccde38b..41cac226deb6 100644
--- a/net-www/konqueror-embedded/Manifest
+++ b/net-www/konqueror-embedded/Manifest
@@ -1,3 +1,3 @@
 MD5 f3276ee4857e4c3562d4182886c53aee ChangeLog 448
-MD5 503408b898577c892d333921cd1745d0 konqueror-embedded-20010207-r1.ebuild 1511
+MD5 ed1306f3babf89b8835d49ad660febbb konqueror-embedded-20010207-r1.ebuild 1429
 MD5 38bb385635570bad4ba592a38e9908e4 files/digest-konqueror-embedded-20010207-r1 80
diff --git a/net-www/konqueror-embedded/konqueror-embedded-20010207-r1.ebuild b/net-www/konqueror-embedded/konqueror-embedded-20010207-r1.ebuild
index 03147440631b..205a99a70fec 100644
--- a/net-www/konqueror-embedded/konqueror-embedded-20010207-r1.ebuild
+++ b/net-www/konqueror-embedded/konqueror-embedded-20010207-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-www/konqueror-embedded/konqueror-embedded-20010207-r1.ebuild,v 1.10 2003/02/13 15:36:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/konqueror-embedded/konqueror-embedded-20010207-r1.ebuild,v 1.11 2003/09/06 01:54:08 msterret Exp $
 
 A=${PN}-snapshot.tar.gz
 S=${WORKDIR}/${PN}-snapshot
@@ -13,36 +13,32 @@ KEYWORDS="x86 sparc "
 LICENSE="GPL-2"
 
 src_compile() {
-
-    local myconf
-    if [ "`use qt-embedded`" ]
-    then
-      export QTDIR=/opt/qt-embedded
-      export PATH=$QTDIR/bin:$PATH
-      export LDFLAGS="-L/usr/lib -lmng -ljpeg"
-      myconf="--with-qt-dir=$QTDIR --enable-qt-embedded --enable-static --disable-shared --prefix=/usr/embedded"
-    else
-      myconf="--prefix=/usr"
-    fi
-    try ./configure ${myconf} --host=${CHOST} \
+	local myconf
+	if [ "`use qt-embedded`" ]
+	then
+		export QTDIR=/opt/qt-embedded
+		export PATH=$QTDIR/bin:$PATH
+		export LDFLAGS="-L/usr/lib -lmng -ljpeg"
+		myconf="--with-qt-dir=$QTDIR --enable-qt-embedded --enable-static --disable-shared --prefix=/usr/embedded"
+	else
+		myconf="--prefix=/usr"
+	fi
+	try ./configure ${myconf} --host=${CHOST} \
 	--with-ssl-dir=/usr
-    try make
-
+	try make
 }
 
 src_install () {
-
-    try make DESTDIR=${D} install
-    if [ "`use qt-embedded`" ]
-    then
-      dodir /usr/embedded/bin
-      mv ${D}/usr/embedded/konq* ${D}/usr/embedded/bin
-    else
-      dodir /usr/bin
-      # i don't know what an embedded konq loks like, bt it had better not
-      # conflict with the main konqueror of kde! - danarmak
-      mv ${D}/usr/konq* ${D}/usr/bin
-    fi
-
+	try make DESTDIR=${D} install
+	if [ "`use qt-embedded`" ]
+	then
+		dodir /usr/embedded/bin
+		mv ${D}/usr/embedded/konq* ${D}/usr/embedded/bin
+	else
+		dodir /usr/bin
+		# i don't know what an embedded konq loks like, bt it had better not
+		# conflict with the main konqueror of kde! - danarmak
+		mv ${D}/usr/konq* ${D}/usr/bin
+	fi
 }
 
diff --git a/net-www/links/Manifest b/net-www/links/Manifest
index f532a64a046d..4666e2c93d42 100644
--- a/net-www/links/Manifest
+++ b/net-www/links/Manifest
@@ -1,8 +1,8 @@
-MD5 9bb3f208f5fd02bb5992913f271c4887 links-0.96-r2.ebuild 1200
-MD5 fab9fad53120a3ce0c9302c32b64fefd links-2.1_pre9.ebuild 2902
-MD5 a3d1d27b0ad4f3ae9f8401a2f4d77d09 links-2.1_pre11.ebuild 2909
 MD5 305366f98433e21f55d82a5e5c9ad417 ChangeLog 5734
-MD5 52bed2c64a669feed86577cb52f8cbb5 files/links-0.96-r2-gentoo.patch 1400
+MD5 62c2cb8d4841bab0f3b7bb9d0d5f270f links-0.96-r2.ebuild 1200
+MD5 6814c67ac71b29fce03b92beb1f7006b links-2.1_pre9.ebuild 2902
+MD5 60b01ddf5503cdf12d9233cde37f49d4 links-2.1_pre11.ebuild 2909
+MD5 eceb1d1aff64bd73e335f5dad2a71f42 files/digest-links-0.96-r2 62
 MD5 e8eedeca8d9b94ce7cc0e5f919500740 files/digest-links-2.1_pre9 67
+MD5 52bed2c64a669feed86577cb52f8cbb5 files/links-0.96-r2-gentoo.patch 1400
 MD5 71861032c7ce183e3427e4e205748323 files/digest-links-2.1_pre11 68
-MD5 eceb1d1aff64bd73e335f5dad2a71f42 files/digest-links-0.96-r2 62
diff --git a/net-www/links/links-0.96-r2.ebuild b/net-www/links/links-0.96-r2.ebuild
index bfdcf6520d57..a504c3475f8b 100644
--- a/net-www/links/links-0.96-r2.ebuild
+++ b/net-www/links/links-0.96-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-www/links/links-0.96-r2.ebuild,v 1.9 2003/02/13 15:36:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/links/links-0.96-r2.ebuild,v 1.10 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="gpm ssl"
 
@@ -50,6 +50,6 @@ src_compile() {
 
 
 src_install() {
-    einstall
+	einstall
 	dodoc README SITES NEWS AUTHORS COPYING BUGS TODO Changelog
 }
diff --git a/net-www/links/links-2.1_pre11.ebuild b/net-www/links/links-2.1_pre11.ebuild
index 36903dcc9ada..5f2f56bbc47e 100644
--- a/net-www/links/links-2.1_pre11.ebuild
+++ b/net-www/links/links-2.1_pre11.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-www/links/links-2.1_pre11.ebuild,v 1.2 2003/07/18 21:04:19 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/links/links-2.1_pre11.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="ssl java png X gpm tiff fbcon svga jpeg"
 
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64"
 
 # Note: if X or fbcon usegflag are enabled, links will be built in graphic
-# mode. libpng is required to compile links in graphic mode 
+# mode. libpng is required to compile links in graphic mode
 # (not required in text mode), so let's add libpng for X? and fbcon?
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
@@ -89,7 +89,7 @@ src_install (){
 
 	# Only install links icon if X driver was compiled in ...
 	use X && { insinto /usr/share/pixmaps ;	doins graphics/links.xpm ; }
-	
+
 	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES TODO
 	dohtml doc/links_cal/*
 }
diff --git a/net-www/links/links-2.1_pre9.ebuild b/net-www/links/links-2.1_pre9.ebuild
index 382e71b399a4..6e878a5305c0 100644
--- a/net-www/links/links-2.1_pre9.ebuild
+++ b/net-www/links/links-2.1_pre9.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-www/links/links-2.1_pre9.ebuild,v 1.4 2003/07/18 21:04:19 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/links/links-2.1_pre9.ebuild,v 1.5 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="ssl java png X gpm tiff fbcon svga jpeg"
 
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc alpha ~mips hppa amd64"
 
 # Note: if X or fbcon usegflag are enabled, links will be built in graphic
-# mode. libpng is required to compile links in graphic mode 
+# mode. libpng is required to compile links in graphic mode
 # (not required in text mode), so let's add libpng for X? and fbcon?
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
@@ -89,7 +89,7 @@ src_install (){
 
 	# Only install links icon if X driver was compiled in ...
 	use X && { insinto /usr/share/pixmaps ;	doins graphics/links.xpm ; }
-	
+
 	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES TODO
 	dohtml doc/links_cal/*
 }
diff --git a/net-www/lynx/Manifest b/net-www/lynx/Manifest
index 8f36c934a2d9..0999a7c0a222 100644
--- a/net-www/lynx/Manifest
+++ b/net-www/lynx/Manifest
@@ -1,13 +1,13 @@
 MD5 3124dd3a2ee37dbc844088b4c56d3533 ChangeLog 3543
-MD5 7ccd1755fb2562eced8b4f8e1df8e849 lynx-2.8.4.1c.ebuild 2177
-MD5 a4e516e09920619912389181474747b5 lynx-2.8.4.1d-r1.ebuild 2447
-MD5 8475e3f63a09e3ab3a23c2eac5c90432 lynx-2.8.4.1d.ebuild 2315
-MD5 35acba752736cfd23164a446b9fc122d lynx-2.8.4a-r4.ebuild 1865
+MD5 aa24bbcd7208dd5230d19a3d87da86c1 lynx-2.8.4.1c.ebuild 2179
+MD5 0ba0120e505da4b342f9cbba6916fbd8 lynx-2.8.4.1d.ebuild 2314
+MD5 1c4cc69cc542edc048035f896b28e590 lynx-2.8.4a-r4.ebuild 1866
+MD5 969a887d5b47321a8788da8feafff1f1 lynx-2.8.4.1d-r1.ebuild 2446
 MD5 a5a3cf665f0451dfebbbdc90b2d23a89 files/digest-lynx-2.8.4.1c 260
 MD5 a48ecda8afc164dc0252e8d0ed579d49 files/digest-lynx-2.8.4.1d 324
-MD5 a48ecda8afc164dc0252e8d0ed579d49 files/digest-lynx-2.8.4.1d-r1 324
 MD5 8fbea1f98a60cb262e0a8f1b891af1c3 files/digest-lynx-2.8.4a-r4 63
 MD5 2290b4fe7526899243941069f01d01eb files/lynx-2.8.4.1c-gentoo.patch 196
 MD5 2290b4fe7526899243941069f01d01eb files/lynx-2.8.4.1d-gentoo.patch 196
 MD5 0dacb03b3e82b0069b0b2d8e9706f234 files/lynx-2.8.4a-LYStrings.c-gentoo.patch 188
 MD5 b0b269efc9ff697e40a10f99919599ea files/lynx2.8.4rel.1a.patch 7515
+MD5 a48ecda8afc164dc0252e8d0ed579d49 files/digest-lynx-2.8.4.1d-r1 324
diff --git a/net-www/lynx/lynx-2.8.4.1c.ebuild b/net-www/lynx/lynx-2.8.4.1c.ebuild
index e74abec07e27..53e27d8c1523 100644
--- a/net-www/lynx/lynx-2.8.4.1c.ebuild
+++ b/net-www/lynx/lynx-2.8.4.1c.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-www/lynx/lynx-2.8.4.1c.ebuild,v 1.9 2003/02/13 15:36:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/lynx/lynx-2.8.4.1c.ebuild,v 1.10 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="ssl nls ipv6"
 
@@ -72,7 +72,7 @@ src_install() {
 	docinto lynx_help
 	dodoc lynx_help/*.txt
 	dohtml -r lynx_help
-	
+
 	# small little manpage glitch
 	rm ${D}/usr/share/man/lynx.1
 	newman lynx.man lynx.1
diff --git a/net-www/lynx/lynx-2.8.4.1d-r1.ebuild b/net-www/lynx/lynx-2.8.4.1d-r1.ebuild
index 2eca60ef19da..efded8d6fb86 100644
--- a/net-www/lynx/lynx-2.8.4.1d-r1.ebuild
+++ b/net-www/lynx/lynx-2.8.4.1d-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-www/lynx/lynx-2.8.4.1d-r1.ebuild,v 1.2 2003/07/19 20:00:50 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/lynx/lynx-2.8.4.1d-r1.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="ssl nls ipv6"
 
@@ -76,7 +76,7 @@ src_install() {
 	docinto lynx_help
 	dodoc lynx_help/*.txt
 	dohtml -r lynx_help
-	
+
 	# small little manpage glitch
 	rm ${D}/usr/share/man/lynx.1
 	newman lynx.man lynx.1
diff --git a/net-www/lynx/lynx-2.8.4.1d.ebuild b/net-www/lynx/lynx-2.8.4.1d.ebuild
index ed02a7a87210..b0d1b61d5f5f 100644
--- a/net-www/lynx/lynx-2.8.4.1d.ebuild
+++ b/net-www/lynx/lynx-2.8.4.1d.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-www/lynx/lynx-2.8.4.1d.ebuild,v 1.11 2003/07/19 20:00:50 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/lynx/lynx-2.8.4.1d.ebuild,v 1.12 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="ssl nls ipv6"
 
@@ -74,7 +74,7 @@ src_install() {
 	docinto lynx_help
 	dodoc lynx_help/*.txt
 	dohtml -r lynx_help
-	
+
 	# small little manpage glitch
 	rm ${D}/usr/share/man/lynx.1
 	newman lynx.man lynx.1
diff --git a/net-www/lynx/lynx-2.8.4a-r4.ebuild b/net-www/lynx/lynx-2.8.4a-r4.ebuild
index 58b28cdbe0ea..14239eaf9162 100644
--- a/net-www/lynx/lynx-2.8.4a-r4.ebuild
+++ b/net-www/lynx/lynx-2.8.4a-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-www/lynx/lynx-2.8.4a-r4.ebuild,v 1.11 2003/02/13 15:36:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/lynx/lynx-2.8.4a-r4.ebuild,v 1.12 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="ssl nls ipv6"
 
@@ -67,7 +67,7 @@ src_install() {
 	docinto lynx_help
 	dodoc lynx_help/*.txt
 	dohtml -r lynx_help
-	
+
 	# small little manpage glitch
 	rm ${D}/usr/share/man/lynx.1
 	newman lynx.man lynx.1
diff --git a/net-www/memcached/Manifest b/net-www/memcached/Manifest
index 5e244c016f66..e8b99d0a6da0 100644
--- a/net-www/memcached/Manifest
+++ b/net-www/memcached/Manifest
@@ -1,6 +1,6 @@
-MD5 3c9c5e4121d5c133b57c9d9745bc4712 memcached-1.1.6.ebuild 1588
-MD5 5d1c24b6cde23b5d8962d7a33062212d memcached-1.1.8.ebuild 1392
 MD5 08b79f54d404cd3a3b0dd1f83d347bc5 ChangeLog 822
+MD5 5fb2d8f7515a27c8a070998da2654646 memcached-1.1.6.ebuild 1563
+MD5 04404ee5d4cd9d9658c73187ae6bc821 memcached-1.1.8.ebuild 1367
 MD5 a3c31338ecf5e0cfaba8d2d1c86562b3 files/conf 495
 MD5 770ac0b54ecd8bc46e637cd1fd9adf88 files/init 510
 MD5 167f7184d41c13a713a3210c0a99447a files/digest-memcached-1.1.6 66
diff --git a/net-www/memcached/memcached-1.1.6.ebuild b/net-www/memcached/memcached-1.1.6.ebuild
index ad10b74e8c96..2e6e43d1e729 100644
--- a/net-www/memcached/memcached-1.1.6.ebuild
+++ b/net-www/memcached/memcached-1.1.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-www/memcached/memcached-1.1.6.ebuild,v 1.1 2003/07/26 22:52:16 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/memcached/memcached-1.1.6.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
 
 DESCRIPTION="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load."
 
@@ -45,11 +45,11 @@ src_install() {
 		doins ${S}/api/perl/MemCachedClient.pm
 	fi
 
-        insinto /etc/conf.d
-        newins "${FILESDIR}/conf" memcached
- 
-        exeinto /etc/init.d
-        newexe "${FILESDIR}/init" memcached
+	insinto /etc/conf.d
+	newins "${FILESDIR}/conf" memcached
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/init" memcached
 }
 
 
diff --git a/net-www/memcached/memcached-1.1.8.ebuild b/net-www/memcached/memcached-1.1.8.ebuild
index c6dd37415499..8d34eb4197d0 100644
--- a/net-www/memcached/memcached-1.1.8.ebuild
+++ b/net-www/memcached/memcached-1.1.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-www/memcached/memcached-1.1.8.ebuild,v 1.1 2003/07/30 12:45:34 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/memcached/memcached-1.1.8.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
 
 DESCRIPTION="memcached is a high-performance, distributed memory object caching system, generic in nature, but intended for use in speeding up dynamic web applications by alleviating database load."
 
@@ -36,11 +36,11 @@ src_install() {
 	dobin ${S}/memcached
 	dodoc ${S}/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README}
 
-        insinto /etc/conf.d
-        newins "${FILESDIR}/conf" memcached
- 
-        exeinto /etc/init.d
-        newexe "${FILESDIR}/init" memcached
+	insinto /etc/conf.d
+	newins "${FILESDIR}/conf" memcached
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/init" memcached
 }
 
 
diff --git a/net-www/middleman/Manifest b/net-www/middleman/Manifest
index 90939bc68cca..4cf0bc3c48f1 100644
--- a/net-www/middleman/Manifest
+++ b/net-www/middleman/Manifest
@@ -1,7 +1,7 @@
 MD5 d087484e7aafbdef0cd006e1b34848e9 ChangeLog 675
 MD5 b3089a22f33a39676bb267f8d3d59c07 metadata.xml 1012
-MD5 657ccc7549f417d41d360182fa6d80c5 middleman-1.8.1.ebuild 1647
-MD5 5e5d7deae43e0c5925faba90320f0d1a middleman-1.8.2.ebuild 1647
+MD5 dd7e12e9d59a0ac5bb04773c3ccefe45 middleman-1.8.1.ebuild 1646
+MD5 d63dbeb786cd6bde6e01db58bfb71776 middleman-1.8.2.ebuild 1646
 MD5 f310f39bd53b2a586b1f6ae1755dd09c files/digest-middleman-1.8.1 67
 MD5 118e1d1a342e3e7faeb0cf43391f6aea files/digest-middleman-1.8.2 67
 MD5 5cca318658e1fe03d10adece2c8e4d42 files/conf.d/mman 108
diff --git a/net-www/middleman/middleman-1.8.1.ebuild b/net-www/middleman/middleman-1.8.1.ebuild
index 99ed2062924a..6fd520fab248 100644
--- a/net-www/middleman/middleman-1.8.1.ebuild
+++ b/net-www/middleman/middleman-1.8.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-www/middleman/middleman-1.8.1.ebuild,v 1.2 2003/07/26 05:28:17 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/middleman/middleman-1.8.1.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
 
 inherit eutils
 
@@ -30,10 +30,10 @@ src_compile() {
 	local myconf=""
 	MAKEOPTS="-j1"
 
-	cd ${S}	
+	cd ${S}
 	for opt in ${IUSE}; do
-		use ${opt} && 
-			myconf="${myconf} --enable-${opt}" || 
+		use ${opt} &&
+			myconf="${myconf} --enable-${opt}" ||
 			myconf="$myconf --disable-${opt}"
 	done
 
@@ -60,7 +60,7 @@ src_install() {
 #	enewuser mman 8080
 #}
 
-pkg_postinst() { 
+pkg_postinst() {
 	#einfo "A mman user has been added to your system if one did not already exist"
 	einfo "-"
 	einfo "Note: init/conf scripts and a sample config has been provided for you."
diff --git a/net-www/middleman/middleman-1.8.2.ebuild b/net-www/middleman/middleman-1.8.2.ebuild
index cb343d0b317c..82c0f064ae87 100644
--- a/net-www/middleman/middleman-1.8.2.ebuild
+++ b/net-www/middleman/middleman-1.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-www/middleman/middleman-1.8.2.ebuild,v 1.1 2003/08/11 23:06:48 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/middleman/middleman-1.8.2.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
 
 inherit eutils
 
@@ -30,10 +30,10 @@ src_compile() {
 	local myconf=""
 	MAKEOPTS="-j1"
 
-	cd ${S}	
+	cd ${S}
 	for opt in ${IUSE}; do
-		use ${opt} && 
-			myconf="${myconf} --enable-${opt}" || 
+		use ${opt} &&
+			myconf="${myconf} --enable-${opt}" ||
 			myconf="$myconf --disable-${opt}"
 	done
 
@@ -60,7 +60,7 @@ src_install() {
 #	enewuser mman 8080
 #}
 
-pkg_postinst() { 
+pkg_postinst() {
 	#einfo "A mman user has been added to your system if one did not already exist"
 	einfo "-"
 	einfo "Note: init/conf scripts and a sample config has been provided for you."
diff --git a/net-www/mod_lisp/Manifest b/net-www/mod_lisp/Manifest
index 0f983164db1f..66c21152be70 100644
--- a/net-www/mod_lisp/Manifest
+++ b/net-www/mod_lisp/Manifest
@@ -1,3 +1,3 @@
-MD5 848495fae43277daf91aee9c8e502437 files/digest-mod_lisp-2.32 59
 MD5 9a27e13f2f13c3dc7467a3d8bc22f3ff ChangeLog 431
-MD5 1fe7cd8bcd340a452e848a741907f50b mod_lisp-2.32.ebuild 741
+MD5 29837a03e1c0972a501156faf96500e5 mod_lisp-2.32.ebuild 740
+MD5 848495fae43277daf91aee9c8e502437 files/digest-mod_lisp-2.32 59
diff --git a/net-www/mod_lisp/mod_lisp-2.32.ebuild b/net-www/mod_lisp/mod_lisp-2.32.ebuild
index 318b32c0fba0..02b9c52d3bf0 100644
--- a/net-www/mod_lisp/mod_lisp-2.32.ebuild
+++ b/net-www/mod_lisp/mod_lisp-2.32.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-www/mod_lisp/mod_lisp-2.32.ebuild,v 1.1 2003/06/19 07:04:22 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_lisp/mod_lisp-2.32.ebuild,v 1.2 2003/09/06 01:54:08 msterret Exp $
 
 DESCRIPTION="mod_lisp is an Apache module to easily write web applications in Common Lisp"
 HOMEPAGE="http://www.fractalconcept.com/asp/sdataQIceRsMvtN9fDM==/sdataQuvY9x3g$ecX"
@@ -17,7 +17,7 @@ src_unpack() {
 	mkdir ${S}
 	cp ${DISTDIR}/${P}.c ${S}/${PN}.c
 }
-	
+
 src_compile() {
 	apxs -c ${PN}.c || die
 }
diff --git a/net-www/mod_mp3/Manifest b/net-www/mod_mp3/Manifest
index 20f56a21c28a..d16490d2fc22 100644
--- a/net-www/mod_mp3/Manifest
+++ b/net-www/mod_mp3/Manifest
@@ -1,8 +1,8 @@
+MD5 9e019a245af854de3442034df9023180 ChangeLog 841
+MD5 868fadb6e81877bff42a1cf44866ffd0 mod_mp3-0.35-r1.ebuild 1366
+MD5 b787e891b84eba1487d069b083442dec mod_mp3-0.35-r2.ebuild 1479
+MD5 cb45423460e7f829cc006596f5af2fc7 mod_mp3-0.39.ebuild 1573
 MD5 8a7822e7dc0ef7f482a9eea2f2dc7f99 files/digest-mod_mp3-0.35-r1 63
 MD5 8a7822e7dc0ef7f482a9eea2f2dc7f99 files/digest-mod_mp3-0.35-r2 63
 MD5 eed7a5bfc98ac86ce87a0e8acc8cc63d files/digest-mod_mp3-0.39 63
 MD5 e00c3a323638f519dda1003c198d0c0f files/mod_mp3.conf 314
-MD5 868fadb6e81877bff42a1cf44866ffd0 mod_mp3-0.35-r1.ebuild 1366
-MD5 b787e891b84eba1487d069b083442dec mod_mp3-0.35-r2.ebuild 1479
-MD5 dc3b151b7a007cfe6f757e720d1deb95 mod_mp3-0.39.ebuild 1570
-MD5 9e019a245af854de3442034df9023180 ChangeLog 841
diff --git a/net-www/mod_mp3/mod_mp3-0.39.ebuild b/net-www/mod_mp3/mod_mp3-0.39.ebuild
index b05192ad4506..35e7e16beb78 100644
--- a/net-www/mod_mp3/mod_mp3-0.39.ebuild
+++ b/net-www/mod_mp3/mod_mp3-0.39.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-www/mod_mp3/mod_mp3-0.39.ebuild,v 1.5 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.39.ebuild,v 1.6 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="mysql postgres"
 
@@ -11,7 +11,7 @@ KEYWORDS="x86"
 S=${WORKDIR}/${P}
 SRC_URI="http://software.tangent.org/download/${P}.tar.gz"
 
-DEPEND="virtual/glibc 
+DEPEND="virtual/glibc
 	=net-www/apache-1*
 	dev-lang/perl
 	mysql? ( >=dev-db/mysql-3.23.26 )
diff --git a/net-www/mod_pcgi2/Manifest b/net-www/mod_pcgi2/Manifest
index 8696f5440816..f750d7b35529 100644
--- a/net-www/mod_pcgi2/Manifest
+++ b/net-www/mod_pcgi2/Manifest
@@ -1,5 +1,5 @@
-MD5 1c7ef801fc579e656a632a1d874c31d1 files/20_mod_pcgi.conf 274
-MD5 40eeec73ead705f5c91d71cd1a79681a files/digest-mod_pcgi2-2.0.1 70
 MD5 47730d6481d31ecf867a6117742b61cc ChangeLog 488
 MD5 60e3a7ee1268e32bce296a6076f736c6 metadata.xml 252
-MD5 390898eba2c749b4115fc6025efca89c mod_pcgi2-2.0.1.ebuild 1189
+MD5 cc714238cda1085884889749915fad78 mod_pcgi2-2.0.1.ebuild 1188
+MD5 1c7ef801fc579e656a632a1d874c31d1 files/20_mod_pcgi.conf 274
+MD5 40eeec73ead705f5c91d71cd1a79681a files/digest-mod_pcgi2-2.0.1 70
diff --git a/net-www/mod_pcgi2/mod_pcgi2-2.0.1.ebuild b/net-www/mod_pcgi2/mod_pcgi2-2.0.1.ebuild
index 66899af5ebdb..54a1322d0910 100644
--- a/net-www/mod_pcgi2/mod_pcgi2-2.0.1.ebuild
+++ b/net-www/mod_pcgi2/mod_pcgi2-2.0.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-www/mod_pcgi2/mod_pcgi2-2.0.1.ebuild,v 1.2 2003/08/15 06:25:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_pcgi2/mod_pcgi2-2.0.1.ebuild,v 1.3 2003/09/06 01:54:08 msterret Exp $
 
 apachedir='1'
 apache=''
@@ -26,7 +26,7 @@ src_compile() {
 		apxs2 \
 		-n pcgi2  \
 		-DUNIX -DAPACHE2 -DMOD_PCGI2 \
-		-c mod_pcgi2.c pcgi-wrapper.c parseinfo.c 
+		-c mod_pcgi2.c pcgi-wrapper.c parseinfo.c
 		#-o mod_pcgi.so \
 	else
 		apxs \
@@ -35,7 +35,7 @@ src_compile() {
 		-Wc,-DHAVE_UNION_SEMUN  \
 		-I./  \
 		-o mod_pcgi2.so \
-		-c mod_pcgi2.c parseinfo.c pcgi-wrapper.c 
+		-c mod_pcgi2.c parseinfo.c pcgi-wrapper.c
 	fi
 }
 
diff --git a/net-www/mod_scgi/Manifest b/net-www/mod_scgi/Manifest
index 665527c4d2ee..5d9018da6fdc 100644
--- a/net-www/mod_scgi/Manifest
+++ b/net-www/mod_scgi/Manifest
@@ -1,5 +1,5 @@
-MD5 6400dda828054b9c08a35eb703878f50 files/20_mod_scgi.conf 1246
-MD5 fe6e3027503038b59f1e9b4ee2cb3baa files/digest-mod_scgi-1.2_alpha1 61
 MD5 ee101d18cbb35733c5698abedd4f4fe0 ChangeLog 663
+MD5 38a813bcc97f0df0ee19ce308acff3fd mod_scgi-1.2_alpha1.ebuild 1132
 MD5 60e3a7ee1268e32bce296a6076f736c6 metadata.xml 252
-MD5 4b9cae794f17f0f504727ba9bceab0de mod_scgi-1.2_alpha1.ebuild 1132
+MD5 6400dda828054b9c08a35eb703878f50 files/20_mod_scgi.conf 1246
+MD5 fe6e3027503038b59f1e9b4ee2cb3baa files/digest-mod_scgi-1.2_alpha1 61
diff --git a/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild b/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild
index 228ac8676c9a..1ffade292b67 100644
--- a/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild
+++ b/net-www/mod_scgi/mod_scgi-1.2_alpha1.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-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild,v 1.3 2003/08/15 04:34:35 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild,v 1.4 2003/09/06 01:54:08 msterret Exp $
 
 apachedir='1'
 apache=''
@@ -16,7 +16,7 @@ LICENSE="CNRI"
 SLOT="${apachedir}"
 KEYWORDS="~x86"
 IUSE="apache2"
-DEPEND="${DEPEND} 
+DEPEND="${DEPEND}
 		net-www/scgi
 		net-www/apache
 		apache2? ( >=net-www/apache-2 )"
diff --git a/net-www/mozilla-firebird-bin/Manifest b/net-www/mozilla-firebird-bin/Manifest
index c240e81d1646..a7ca04d73979 100644
--- a/net-www/mozilla-firebird-bin/Manifest
+++ b/net-www/mozilla-firebird-bin/Manifest
@@ -1,10 +1,10 @@
 MD5 634f933db11c7c879c7a5937332cc047 ChangeLog 6429
+MD5 7874b84b39c9c16ddf20f4385799e794 mozilla-firebird-bin-0.6-r1.ebuild 1915
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 9f5b1bcbd7b7b57004b677e01eab3f44 mozilla-firebird-bin-0.6-r1.ebuild 1914
-MD5 b3df1f974731a972bda3789c12c713c2 mozilla-firebird-bin-0.6.1.ebuild 1831
+MD5 089b0293b8834a50293d050833159883 mozilla-firebird-bin-0.6.1.ebuild 1832
+MD5 c501c68e4360b764f8c530365038ba21 files/MozillaFirebird 749
 MD5 48924e6ea5eeccdde41276f2231a8630 files/firebird-0.6-antialiasing-patch 1253
 MD5 ea09be23f658d94f6c53fff532784906 files/digest-mozilla-firebird-bin-0.6-r1 90
-MD5 c501c68e4360b764f8c530365038ba21 files/MozillaFirebird 749
 MD5 862673f29b574433073fe9bf698141cd files/digest-mozilla-firebird-bin-0.6.1 92
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
 MD5 512f9ec22888c199091234f3d43cc103 files/icon/mozillafirebird.desktop 138
diff --git a/net-www/mozilla-firebird-bin/mozilla-firebird-bin-0.6-r1.ebuild b/net-www/mozilla-firebird-bin/mozilla-firebird-bin-0.6-r1.ebuild
index 67e840ea656c..c363cd6c43ce 100644
--- a/net-www/mozilla-firebird-bin/mozilla-firebird-bin-0.6-r1.ebuild
+++ b/net-www/mozilla-firebird-bin/mozilla-firebird-bin-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird-bin/mozilla-firebird-bin-0.6-r1.ebuild,v 1.4 2003/08/13 13:20:14 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird-bin/mozilla-firebird-bin-0.6-r1.ebuild,v 1.5 2003/09/06 01:54:09 msterret Exp $
 
 inherit nsplugins eutils
 
@@ -19,7 +19,7 @@ LICENSE="MPL-1.1 NPL-1.1"
 
 DEPEND="virtual/glibc"
 RDEPEND=">=sys-libs/lib-compat-1.0-r2
-	=x11-libs/gtk+-1.2* 
+	=x11-libs/gtk+-1.2*
 	virtual/x11
 	!net-www/mozilla-firebird
 	!net-www/mozilla-firebird-cvs"
@@ -52,7 +52,7 @@ src_install() {
 	then
 		insinto /usr/share/pixmaps
 		doins ${FILESDIR}/icon/mozilla-icon.png
-		
+
 		insinto /usr/share/gnome/apps/Internet
 		doins ${FILESDIR}/icon/mozillafirebird.desktop
 	fi
diff --git a/net-www/mozilla-firebird-bin/mozilla-firebird-bin-0.6.1.ebuild b/net-www/mozilla-firebird-bin/mozilla-firebird-bin-0.6.1.ebuild
index d1edc0d9b759..8c093a7d3e42 100644
--- a/net-www/mozilla-firebird-bin/mozilla-firebird-bin-0.6.1.ebuild
+++ b/net-www/mozilla-firebird-bin/mozilla-firebird-bin-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird-bin/mozilla-firebird-bin-0.6.1.ebuild,v 1.4 2003/08/13 13:20:14 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird-bin/mozilla-firebird-bin-0.6.1.ebuild,v 1.5 2003/09/06 01:54:09 msterret Exp $
 
 inherit nsplugins eutils
 
@@ -19,7 +19,7 @@ LICENSE="MPL-1.1 NPL-1.1"
 
 DEPEND="virtual/glibc"
 RDEPEND=">=sys-libs/lib-compat-1.0-r2
-	=x11-libs/gtk+-1.2* 
+	=x11-libs/gtk+-1.2*
 	virtual/x11
 	!net-www/mozilla-firebird
 	!net-www/mozilla-firebird-cvs"
@@ -52,7 +52,7 @@ src_install() {
 	then
 		insinto /usr/share/pixmaps
 		doins ${FILESDIR}/icon/mozilla-icon.png
-		
+
 		insinto /usr/share/gnome/apps/Internet
 		doins ${FILESDIR}/icon/mozillafirebird.desktop
 	fi
diff --git a/net-www/mozilla-firebird-cvs/Manifest b/net-www/mozilla-firebird-cvs/Manifest
index a8ad038f4e39..d759df528e85 100644
--- a/net-www/mozilla-firebird-cvs/Manifest
+++ b/net-www/mozilla-firebird-cvs/Manifest
@@ -1,5 +1,5 @@
-MD5 8c4939880225843b71f61395fc754e14 files/MozillaFirebird 757
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mozilla-firebird-cvs-0.6-r2 0
 MD5 ad0d04ca81dc52eeb46f32121b0c6b5c ChangeLog 2234
-MD5 ae8297a2b2b917d666d259b189584a49 mozilla-firebird-cvs-0.6-r2.ebuild 5358
+MD5 6990c0d9162cf7ec17eaaeff604b425a mozilla-firebird-cvs-0.6-r2.ebuild 4966
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 8c4939880225843b71f61395fc754e14 files/MozillaFirebird 757
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mozilla-firebird-cvs-0.6-r2 0
diff --git a/net-www/mozilla-firebird-cvs/mozilla-firebird-cvs-0.6-r2.ebuild b/net-www/mozilla-firebird-cvs/mozilla-firebird-cvs-0.6-r2.ebuild
index 1ae446e28c86..8eef29365fa8 100644
--- a/net-www/mozilla-firebird-cvs/mozilla-firebird-cvs-0.6-r2.ebuild
+++ b/net-www/mozilla-firebird-cvs/mozilla-firebird-cvs-0.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird-cvs/mozilla-firebird-cvs-0.6-r2.ebuild,v 1.3 2003/08/01 04:42:31 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird-cvs/mozilla-firebird-cvs-0.6-r2.ebuild,v 1.4 2003/09/06 01:54:09 msterret Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins
 
@@ -20,144 +20,144 @@ LICENSE="MPL-1.1 | NPL-1.1"
 IUSE="java gtk2 ipv6"
 
 RDEPEND="virtual/x11
-   >=dev-libs/libIDL-0.8.0
-   >=gnome-base/ORBit-0.5.10-r1
-   virtual/xft
-   >=sys-libs/zlib-1.1.4
-   >=media-libs/jpeg-6b
-   >=media-libs/libmng-1.0.0
-   >=media-libs/libpng-1.2.1
-   >=sys-apps/portage-2.0.36
-   dev-libs/expat
-   app-arch/zip
-   app-arch/unzip
-   ( gtk2? >=x11-libs/gtk+-2.1.1 :
-     =x11-libs/gtk+-1.2* )
-   java?  ( virtual/jre )
-	!net-www/mozilla-firebird
-	!net-www/mozilla-firebird-bin"
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	virtual/xft
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	( gtk2? >=x11-libs/gtk+-2.1.1 :
+		=x11-libs/gtk+-1.2* )
+	java?  ( virtual/jre )
+		!net-www/mozilla-firebird
+		!net-www/mozilla-firebird-bin"
 
 DEPEND="${RDEPEND}
-   virtual/glibc
-   dev-lang/perl
-   dev-util/cvs
-   java? ( >=dev-java/java-config-0.2.0 )"
-   
+	virtual/glibc
+	dev-lang/perl
+	dev-util/cvs
+	java? ( >=dev-java/java-config-0.2.0 )"
+
 # needed by src_compile() and src_install()
 export MOZ_PHOENIX=1
 export MOZ_CALENDAR=0
 export MOZ_ENABLE_XFT=1
 
 src_unpack() {
-   # This is hackish, but it works.
-   addwrite ${DISTDIR}/cvs-src
-   mkdir -p ${DISTDIR}/cvs-src/
-   cd ${DISTDIR}/cvs-src/
-   echo ":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot A" > "${T}/cvspass"
-   export CVS_PASSFILE="${T}/cvspass"
-   einfo "Checking out latest Mozilla from CVS..."
-   einfo "[ mozilla/browser & mozilla/toolkit ]"
-   cvs -z3 -d:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot checkout mozilla/browser mozilla/toolkit mozilla/client.mk
-   make -f mozilla/client.mk checkout
-   cp -a mozilla ${S}
-   # Fix an ownership porblem
-   chown -R root.root ${S}
+	# This is hackish, but it works.
+	addwrite ${DISTDIR}/cvs-src
+	mkdir -p ${DISTDIR}/cvs-src/
+	cd ${DISTDIR}/cvs-src/
+	echo ":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot A" > "${T}/cvspass"
+	export CVS_PASSFILE="${T}/cvspass"
+	einfo "Checking out latest Mozilla from CVS..."
+	einfo "[ mozilla/browser & mozilla/toolkit ]"
+	cvs -z3 -d:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot checkout mozilla/browser mozilla/toolkit mozilla/client.mk
+	make -f mozilla/client.mk checkout
+	cp -a mozilla ${S}
+	# Fix an ownership porblem
+	chown -R root.root ${S}
 }
 
 src_compile() {
-   local myconf="--disable-composer \
-      --with-x \
-      --with-system-jpeg \
-      --with-system-zlib \
-      --with-system-png \
-      --with-system-mng \
-      --disable-mailnews \
-      --disable-calendar \
-      --enable-xft \
-      --disable-pedantic \
-      --disable-svg \
-      --enable-mathml \
-      --without-system-nspr \
-      --enable-nspr-autoconf \
-      --enable-xsl \
-      --enable-crypto \
-      --enable-xinerama=no \
-      --with-java-supplement \
-      --with-pthreads \
-      --with-default-mozilla-five-home=/usr/lib/MozillaFirebird \
-      --with-user-appdir=.phoenix \
-      --disable-jsd \
-      --disable-accessibility \
-      --disable-tests \
-      --disable-debug \
-      --disable-dtd-debug \
-      --disable-logging \
-      --enable-reorder \
-      --enable-strip \
-      --enable-strip-libs \
-      --enable-cpp-rtti \
-      --enable-xterm-updates \
-      --disable-ldap \
-      --disable-toolkit-qt \
-      --disable-toolkit-xlib \
-      --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help"
-
-
-    if [ -n "`use gtk2`" ] ; then
-        myconf="${myconf} --enable-toolkit-gtk2 \
-                          --enable-default-toolkit=gtk2 \
-                          --disable-toolkit-gtk"
-    else
-        myconf="${myconf} --enable-toolkit-gtk \
-                          --enable-default-toolkit=gtk \
-                          --disable-toolkit-gtk2"
-    fi
-
-    if [ -n "`use ipv6`" ] ; then
-        myconf="${myconf} --enable-ipv6"
-    fi
-
-   # Crashes on start when compiled with -fomit-frame-pointer
-   filter-flags -fomit-frame-pointer
-   filter-flags -ffast-math
-   append-flags -s -fforce-addr
-
-   if [ "$(gcc-major-version)" -eq "3" ]; then
-      # Currently gcc-3.2 or older do not work well if we specify "-march"
-      # and other optimizations for pentium4.
-	  if [ "$(gcc-minor-version)" -lt "3" ]; then
-	      replace-flags -march=pentium4 -march=pentium3
-		  filter-flags -msse2
-	  fi
-
-      # Enable us to use flash, etc plugins compiled with gcc-2.95.3
-      if [ "${ARCH}" = "x86" ]; then
-          myconf="${myconf} --enable-old-abi-compat-wrappers"
-      fi
-   fi
-
-   econf ${myconf} || die
-
-   edit_makefiles
-   emake MOZ_PHOENIX=1 || die
+	local myconf="--disable-composer \
+		--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-mailnews \
+		--disable-calendar \
+		--enable-xft \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-xinerama=no \
+		--with-java-supplement \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaFirebird \
+		--with-user-appdir=.phoenix \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--disable-ldap \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help"
+
+
+	if [ -n "`use gtk2`" ] ; then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+							--enable-default-toolkit=gtk2 \
+							--disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+							--enable-default-toolkit=gtk \
+							--disable-toolkit-gtk2"
+	fi
+
+	if [ -n "`use ipv6`" ] ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	if [ "$(gcc-major-version)" -eq "3" ]; then
+		# Currently gcc-3.2 or older do not work well if we specify "-march"
+		# and other optimizations for pentium4.
+		if [ "$(gcc-minor-version)" -lt "3" ]; then
+			replace-flags -march=pentium4 -march=pentium3
+			filter-flags -msse2
+		fi
+
+		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
+		if [ "${ARCH}" = "x86" ]; then
+			myconf="${myconf} --enable-old-abi-compat-wrappers"
+		fi
+	fi
+
+	econf ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_PHOENIX=1 || die
 }
 
 src_install() {
-   # Plugin path creation
-   PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
-   dodir /${PLUGIN_DIR}
+	# Plugin path creation
+	PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
+	dodir /${PLUGIN_DIR}
+
+	dodir /usr/lib
+	dodir /usr/lib/MozillaFirebird
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirebird
 
-   dodir /usr/lib
-   dodir /usr/lib/MozillaFirebird
-   cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirebird
+	#fix permissions
+	chown -R root.root ${D}/usr/lib/MozillaFirebird
 
-   #fix permissions
-   chown -R root.root ${D}/usr/lib/MozillaFirebird
-   
-   # Plugin path setup (rescuing the existent plugins)
-   src_mv_plugins /usr/lib/MozillaFirebird/plugins
+	# Plugin path setup (rescuing the existent plugins)
+	src_mv_plugins /usr/lib/MozillaFirebird/plugins
 
-   dobin ${FILESDIR}/MozillaFirebird
+	dobin ${FILESDIR}/MozillaFirebird
 
 	# Install icon and .desktop for menu entry
 	if [ "`use gnome`" ]
@@ -179,6 +179,6 @@ src_install() {
 }
 
 pkg_preinst() {
-   # Remove the old plugins dir
-   pkg_mv_plugins /usr/lib/MozillaFirebird/plugins
+	# Remove the old plugins dir
+	pkg_mv_plugins /usr/lib/MozillaFirebird/plugins
 }
diff --git a/net-www/mozilla-firebird/Manifest b/net-www/mozilla-firebird/Manifest
index c64f2924a7ef..892270142908 100644
--- a/net-www/mozilla-firebird/Manifest
+++ b/net-www/mozilla-firebird/Manifest
@@ -1,8 +1,8 @@
 MD5 e2a992aa6bff999594fa909c74885c6d ChangeLog 3324
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 f1b37ba67dc57de30b846370b9039d95 mozilla-firebird-0.6-r7.ebuild 7143
-MD5 b7dfb00fe5a53f59fbfb5748196e2634 mozilla-firebird-0.6.1.ebuild 7140
+MD5 efb7e088af0ef2a2a0819ce0f6cc8a3b mozilla-firebird-0.6-r7.ebuild 6768
+MD5 dcc8fc011ef3d1e7a93a89b5a0eaa7c6 mozilla-firebird-0.6.1.ebuild 6761
 MD5 6e4352482ed149b3b9aca78d83de1124 files/MozillaFirebird 753
-MD5 78b9eef353e1aff29cef379e4de6b9fa files/digest-mozilla-firebird-0.6-r7 81
 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
+MD5 78b9eef353e1aff29cef379e4de6b9fa files/digest-mozilla-firebird-0.6-r7 81
 MD5 49802181a2284102bb2ed6daab129bb5 files/digest-mozilla-firebird-0.6.1 83
diff --git a/net-www/mozilla-firebird/mozilla-firebird-0.6-r7.ebuild b/net-www/mozilla-firebird/mozilla-firebird-0.6-r7.ebuild
index 03bdf5e803ac..4ccd076e1a6d 100644
--- a/net-www/mozilla-firebird/mozilla-firebird-0.6-r7.ebuild
+++ b/net-www/mozilla-firebird/mozilla-firebird-0.6-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/mozilla-firebird-0.6-r7.ebuild,v 1.8 2003/08/03 09:09:07 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/mozilla-firebird-0.6-r7.ebuild,v 1.9 2003/09/06 01:54:09 msterret Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins eutils
 
@@ -19,28 +19,28 @@ LICENSE="MPL-1.1 | NPL-1.1"
 IUSE="java gtk2 ipv6 gnome moznoxft"
 
 RDEPEND="virtual/x11
-   >=dev-libs/libIDL-0.8.0
-   >=gnome-base/ORBit-0.5.10-r1
-   virtual/xft
-   >=sys-libs/zlib-1.1.4
-   >=media-libs/jpeg-6b
-   >=media-libs/libmng-1.0.0
-   >=media-libs/libpng-1.2.1
-   >=sys-apps/portage-2.0.36
-   dev-libs/expat
-   app-arch/zip
-   app-arch/unzip
-   ( gtk2? >=x11-libs/gtk+-2.1.1 :
-     =x11-libs/gtk+-1.2* )
-   java?  ( virtual/jre )
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	virtual/xft
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	( gtk2? >=x11-libs/gtk+-2.1.1 :
+		=x11-libs/gtk+-1.2* )
+	java?  ( virtual/jre )
 	!net-www/mozilla-firebird-bin
 	!net-www/mozilla-firebird-cvs"
 
 DEPEND="${RDEPEND}
-   virtual/glibc
-   dev-lang/perl
-   java? ( >=dev-java/java-config-0.2.0 )"
-   
+	virtual/glibc
+	dev-lang/perl
+	java? ( >=dev-java/java-config-0.2.0 )"
+
 # needed by src_compile() and src_install()
 export MOZ_PHOENIX=1
 export MOZ_CALENDAR=0
@@ -48,63 +48,63 @@ export MOZ_ENABLE_XFT=1
 
 src_unpack() {
 	unpack MozillaFirebird-${PV}-source.tar.bz2
-	
+
 	# alpha stubs patch from lfs project.
 	# <taviso@gentoo.org> (26 Jun 2003)
 	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
 
 	# Fix build with Linux 2.6
 	cp ${S}/security/coreconf/Linux2.5.mk ${S}/security/coreconf/Linux2.6.mk
-	
+
 }
 
 src_compile() {
-   local myconf="--disable-composer \
-      --with-x \
-      --with-system-jpeg \
-      --with-system-zlib \
-      --with-system-png \
-      --with-system-mng \
-      --disable-mailnews \
-      --disable-calendar \
-      --disable-pedantic \
-      --disable-svg \
-      --enable-mathml \
-      --without-system-nspr \
-      --enable-nspr-autoconf \
-      --enable-xsl \
-      --enable-crypto \
-      --enable-xinerama=no \
-      --with-java-supplement \
-      --with-pthreads \
-      --with-default-mozilla-five-home=/usr/lib/MozillaFirebird \
-      --with-user-appdir=.phoenix \
-      --disable-jsd \
-      --disable-accessibility \
-      --disable-tests \
-      --disable-debug \
-      --disable-dtd-debug \
-      --disable-logging \
-      --enable-reorder \
-      --enable-strip \
-      --enable-strip-libs \
-      --enable-cpp-rtti \
-      --enable-xterm-updates \
-      --enable-optimize=-O2 \
-      --disable-ldap \
-      --disable-toolkit-qt \
-      --disable-toolkit-xlib \
-      --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help"
-
-    if [ -n "`use gtk2`" ] ; then
-        myconf="${myconf} --enable-toolkit-gtk2 \
-                          --enable-default-toolkit=gtk2 \
-                          --disable-toolkit-gtk"
-    else
-        myconf="${myconf} --enable-toolkit-gtk \
-                          --enable-default-toolkit=gtk \
-                          --disable-toolkit-gtk2"
-    fi
+	local myconf="--disable-composer \
+		--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-mailnews \
+		--disable-calendar \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-xinerama=no \
+		--with-java-supplement \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaFirebird \
+		--with-user-appdir=.phoenix \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--enable-optimize=-O2 \
+		--disable-ldap \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help"
+
+	if [ -n "`use gtk2`" ] ; then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+							--enable-default-toolkit=gtk2 \
+							--disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+							--enable-default-toolkit=gtk \
+							--disable-toolkit-gtk2"
+	fi
 
 	if [ -z "`use moznoxft`" ]
 	then
@@ -142,51 +142,51 @@ src_compile() {
 		myconf="${myconf} --disable-xft `use_enable truetype freetype2`"
 	fi
 
-    if [ -n "`use ipv6`" ] ; then
-        myconf="${myconf} --enable-ipv6"
-    fi
-
-   # Crashes on start when compiled with -fomit-frame-pointer
-   filter-flags -fomit-frame-pointer
-   filter-flags -ffast-math
-   append-flags -s -fforce-addr
-
-   if [ "$(gcc-major-version)" -eq "3" ]; then
-      # Currently gcc-3.2 or older do not work well if we specify "-march"
-      # and other optimizations for pentium4.
-      if [ "$(gcc-minor-version)" -lt "3" ]; then
-          replace-flags -march=pentium4 -march=pentium3
-		  filter-flags -msse2
-      fi
-
-	  # Enable us to use flash, etc plugins compiled with gcc-2.95.3
-      if [ "${ARCH}" = "x86" ]; then
-          myconf="${myconf} --enable-old-abi-compat-wrappers"
-      fi
-   fi
-
-   econf ${myconf} || die
-
-   edit_makefiles
-   emake MOZ_PHOENIX=1 || die
+	if [ -n "`use ipv6`" ] ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	if [ "$(gcc-major-version)" -eq "3" ]; then
+		# Currently gcc-3.2 or older do not work well if we specify "-march"
+		# and other optimizations for pentium4.
+		if [ "$(gcc-minor-version)" -lt "3" ]; then
+			replace-flags -march=pentium4 -march=pentium3
+			filter-flags -msse2
+		fi
+
+		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
+		if [ "${ARCH}" = "x86" ]; then
+			myconf="${myconf} --enable-old-abi-compat-wrappers"
+		fi
+	fi
+
+	econf ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_PHOENIX=1 || die
 }
 
 src_install() {
-   # Plugin path creation
-   PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
-   dodir ${PLUGIN_DIR}
+	# Plugin path creation
+	PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
+	dodir ${PLUGIN_DIR}
+
+	dodir /usr/lib
+	dodir /usr/lib/MozillaFirebird
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirebird
 
-   dodir /usr/lib
-   dodir /usr/lib/MozillaFirebird
-   cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirebird
+	#fix permissions
+	chown -R root.root ${D}/usr/lib/MozillaFirebird
 
-   #fix permissions
-   chown -R root.root ${D}/usr/lib/MozillaFirebird
-   
-   # Plugin path setup (rescuing the existent plugins)
-   src_mv_plugins /usr/lib/MozillaFirebird/plugins
+	# Plugin path setup (rescuing the existent plugins)
+	src_mv_plugins /usr/lib/MozillaFirebird/plugins
 
-   dobin ${FILESDIR}/MozillaFirebird
+	dobin ${FILESDIR}/MozillaFirebird
 
 	# Fix icons to look the same everywhere
 	insinto /usr/lib/MozillaFirebird/icons
@@ -213,15 +213,15 @@ src_install() {
 }
 
 pkg_preinst() {
-   # Remove the old plugins dir
-   pkg_mv_plugins /usr/lib/MozillaFirebird/plugins
+	# Remove the old plugins dir
+	pkg_mv_plugins /usr/lib/MozillaFirebird/plugins
 }
 
 pkg_postinst() {
 
 	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaFirebird"
 
-	# Needed to update the run time bindings for REGXPCOM 
+	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
 	env-update
 	# Register Components and Chrome
diff --git a/net-www/mozilla-firebird/mozilla-firebird-0.6.1.ebuild b/net-www/mozilla-firebird/mozilla-firebird-0.6.1.ebuild
index 661f05bfe18d..a47af3f15966 100644
--- a/net-www/mozilla-firebird/mozilla-firebird-0.6.1.ebuild
+++ b/net-www/mozilla-firebird/mozilla-firebird-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/mozilla-firebird-0.6.1.ebuild,v 1.11 2003/08/27 13:29:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firebird/mozilla-firebird-0.6.1.ebuild,v 1.12 2003/09/06 01:54:09 msterret Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins eutils
 
@@ -19,28 +19,28 @@ LICENSE="MPL-1.1 | NPL-1.1"
 IUSE="java gtk2 ipv6 gnome moznoxft"
 
 RDEPEND="virtual/x11
-   >=dev-libs/libIDL-0.8.0
-   >=gnome-base/ORBit-0.5.10-r1
-   virtual/xft
-   >=sys-libs/zlib-1.1.4
-   >=media-libs/jpeg-6b
-   >=media-libs/libmng-1.0.0
-   >=media-libs/libpng-1.2.1
-   >=sys-apps/portage-2.0.36
-   dev-libs/expat
-   app-arch/zip
-   app-arch/unzip
-   ( gtk2? >=x11-libs/gtk+-2.1.1 :
-     =x11-libs/gtk+-1.2* )
-   java?  ( virtual/jre )
+	>=dev-libs/libIDL-0.8.0
+	>=gnome-base/ORBit-0.5.10-r1
+	virtual/xft
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	>=sys-apps/portage-2.0.36
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	( gtk2? >=x11-libs/gtk+-2.1.1 :
+		=x11-libs/gtk+-1.2* )
+	java?  ( virtual/jre )
 	!net-www/mozilla-firebird-bin
 	!net-www/mozilla-firebird-cvs"
 
 DEPEND="${RDEPEND}
-   virtual/glibc
-   dev-lang/perl
-   java? ( >=dev-java/java-config-0.2.0 )"
-   
+	virtual/glibc
+	dev-lang/perl
+	java? ( >=dev-java/java-config-0.2.0 )"
+
 # needed by src_compile() and src_install()
 export MOZ_PHOENIX=1
 export MOZ_CALENDAR=0
@@ -48,63 +48,63 @@ export MOZ_ENABLE_XFT=1
 
 src_unpack() {
 	unpack MozillaFirebird-source-${PV}.tar.bz2
-	
+
 	# alpha stubs patch from lfs project.
 	# <taviso@gentoo.org> (26 Jun 2003)
 	use alpha && epatch ${FILESDIR}/mozilla-1.3-alpha-stubs.patch
 
 	# Fix build with Linux 2.6
 	cp ${S}/security/coreconf/Linux2.5.mk ${S}/security/coreconf/Linux2.6.mk
-	
+
 }
 
 src_compile() {
-   local myconf="--disable-composer \
-      --with-x \
-      --with-system-jpeg \
-      --with-system-zlib \
-      --with-system-png \
-      --with-system-mng \
-      --disable-mailnews \
-      --disable-calendar \
-      --disable-pedantic \
-      --disable-svg \
-      --enable-mathml \
-      --without-system-nspr \
-      --enable-nspr-autoconf \
-      --enable-xsl \
-      --enable-crypto \
-      --enable-xinerama=no \
-      --with-java-supplement \
-      --with-pthreads \
-      --with-default-mozilla-five-home=/usr/lib/MozillaFirebird \
-      --with-user-appdir=.phoenix \
-      --disable-jsd \
-      --disable-accessibility \
-      --disable-tests \
-      --disable-debug \
-      --disable-dtd-debug \
-      --disable-logging \
-      --enable-reorder \
-      --enable-strip \
-      --enable-strip-libs \
-      --enable-cpp-rtti \
-      --enable-xterm-updates \
-      --enable-optimize=-O2 \
-      --disable-ldap \
-      --disable-toolkit-qt \
-      --disable-toolkit-xlib \
-      --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help"
-
-    if [ -n "`use gtk2`" ] ; then
-        myconf="${myconf} --enable-toolkit-gtk2 \
-                          --enable-default-toolkit=gtk2 \
-                          --disable-toolkit-gtk"
-    else
-        myconf="${myconf} --enable-toolkit-gtk \
-                          --enable-default-toolkit=gtk \
-                          --disable-toolkit-gtk2"
-    fi
+	local myconf="--disable-composer \
+		--with-x \
+		--with-system-jpeg \
+		--with-system-zlib \
+		--with-system-png \
+		--with-system-mng \
+		--disable-mailnews \
+		--disable-calendar \
+		--disable-pedantic \
+		--disable-svg \
+		--enable-mathml \
+		--without-system-nspr \
+		--enable-nspr-autoconf \
+		--enable-xsl \
+		--enable-crypto \
+		--enable-xinerama=no \
+		--with-java-supplement \
+		--with-pthreads \
+		--with-default-mozilla-five-home=/usr/lib/MozillaFirebird \
+		--with-user-appdir=.phoenix \
+		--disable-jsd \
+		--disable-accessibility \
+		--disable-tests \
+		--disable-debug \
+		--disable-dtd-debug \
+		--disable-logging \
+		--enable-reorder \
+		--enable-strip \
+		--enable-strip-libs \
+		--enable-cpp-rtti \
+		--enable-xterm-updates \
+		--enable-optimize=-O2 \
+		--disable-ldap \
+		--disable-toolkit-qt \
+		--disable-toolkit-xlib \
+		--enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help"
+
+	if [ -n "`use gtk2`" ] ; then
+		myconf="${myconf} --enable-toolkit-gtk2 \
+							--enable-default-toolkit=gtk2 \
+							--disable-toolkit-gtk"
+	else
+		myconf="${myconf} --enable-toolkit-gtk \
+							--enable-default-toolkit=gtk \
+							--disable-toolkit-gtk2"
+	fi
 
 	if [ -z "`use moznoxft`" ]
 	then
@@ -142,51 +142,51 @@ src_compile() {
 		myconf="${myconf} --disable-xft `use_enable truetype freetype2`"
 	fi
 
-    if [ -n "`use ipv6`" ] ; then
-        myconf="${myconf} --enable-ipv6"
-    fi
-
-   # Crashes on start when compiled with -fomit-frame-pointer
-   filter-flags -fomit-frame-pointer
-   filter-flags -ffast-math
-   append-flags -s -fforce-addr
-
-   if [ "$(gcc-major-version)" -eq "3" ]; then
-      # Currently gcc-3.2 or older do not work well if we specify "-march"
-      # and other optimizations for pentium4.
-      if [ "$(gcc-minor-version)" -lt "3" ]; then
-          replace-flags -march=pentium4 -march=pentium3
-		  filter-flags -msse2
-      fi
-
-	  # Enable us to use flash, etc plugins compiled with gcc-2.95.3
-      if [ "${ARCH}" = "x86" ]; then
-          myconf="${myconf} --enable-old-abi-compat-wrappers"
-      fi
-   fi
-
-   econf ${myconf} || die
-
-   edit_makefiles
-   emake MOZ_PHOENIX=1 || die
+	if [ -n "`use ipv6`" ] ; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	# Crashes on start when compiled with -fomit-frame-pointer
+	filter-flags -fomit-frame-pointer
+	filter-flags -ffast-math
+	append-flags -s -fforce-addr
+
+	if [ "$(gcc-major-version)" -eq "3" ]; then
+		# Currently gcc-3.2 or older do not work well if we specify "-march"
+		# and other optimizations for pentium4.
+		if [ "$(gcc-minor-version)" -lt "3" ]; then
+			replace-flags -march=pentium4 -march=pentium3
+			filter-flags -msse2
+		fi
+
+		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
+		if [ "${ARCH}" = "x86" ]; then
+			myconf="${myconf} --enable-old-abi-compat-wrappers"
+		fi
+	fi
+
+	econf ${myconf} || die
+
+	edit_makefiles
+	emake MOZ_PHOENIX=1 || die
 }
 
 src_install() {
-   # Plugin path creation
-   PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
-   dodir ${PLUGIN_DIR}
+	# Plugin path creation
+	PLUGIN_DIR="/usr/lib/nsbrowser/plugins"
+	dodir ${PLUGIN_DIR}
+
+	dodir /usr/lib
+	dodir /usr/lib/MozillaFirebird
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirebird
 
-   dodir /usr/lib
-   dodir /usr/lib/MozillaFirebird
-   cp -RL --no-preserve=links ${S}/dist/bin/* ${D}/usr/lib/MozillaFirebird
+	#fix permissions
+	chown -R root.root ${D}/usr/lib/MozillaFirebird
 
-   #fix permissions
-   chown -R root.root ${D}/usr/lib/MozillaFirebird
-   
-   # Plugin path setup (rescuing the existent plugins)
-   src_mv_plugins /usr/lib/MozillaFirebird/plugins
+	# Plugin path setup (rescuing the existent plugins)
+	src_mv_plugins /usr/lib/MozillaFirebird/plugins
 
-   dobin ${FILESDIR}/MozillaFirebird
+	dobin ${FILESDIR}/MozillaFirebird
 
 	# Fix icons to look the same everywhere
 	insinto /usr/lib/MozillaFirebird/icons
@@ -212,15 +212,15 @@ src_install() {
 }
 
 pkg_preinst() {
-   # Remove the old plugins dir
-   pkg_mv_plugins /usr/lib/MozillaFirebird/plugins
+	# Remove the old plugins dir
+	pkg_mv_plugins /usr/lib/MozillaFirebird/plugins
 }
 
 pkg_postinst() {
 
 	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/MozillaFirebird"
 
-	# Needed to update the run time bindings for REGXPCOM 
+	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
 	env-update
 	# Register Components and Chrome
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index caf46166fd39..e11bd4b81c6a 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,17 +1,16 @@
 MD5 6c771580f1afeb44bb0bc0ec1630f3a0 ChangeLog 20270
-MD5 f21e5d7440df9aa6d5eadd9c903b55d6 mozilla-1.0.1-r3.ebuild 15220
-MD5 9cb579130025dcf3417870e42043f36e mozilla-1.1-r1.ebuild 14830
-MD5 d26e8c79afec2f2c6be552bc3908ec12 mozilla-1.2.1-r5.ebuild 20931
-MD5 3b3c8aa06f0a06521cef5fcaa675bec1 mozilla-1.3-r2.ebuild 16659
+MD5 154ebaf2e6acafdea4cff284f437e64a mozilla-1.0.1-r3.ebuild 15204
+MD5 6f2e3b3b3f671e0ab6da6e4faa842b6b mozilla-1.1-r1.ebuild 14814
+MD5 92cb7ee0c212272c0ec9567badb5a6d4 mozilla-1.2.1-r5.ebuild 20909
+MD5 9bf38d69ffd4cd72543913f1387a4e3a mozilla-1.3-r2.ebuild 16638
+MD5 f810ca6b8ba1a1d856f76d32ba9df998 mozilla-1.4-r1.ebuild 16431
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 3b027afd5b99aa0fdd382fa1f36717bd mozilla-1.4-r1.ebuild 16452
-MD5 988bdfa0ba4ed1d6863108f1e9f95024 mozilla-1.4-r2.ebuild 16512
-MD5 55c6b7563b29f35f3d03fa3cdae47cc2 mozilla-1.4-r3.ebuild 16564
+MD5 8c9f6940b7b2bc8a53c454070311e57a mozilla-1.4-r2.ebuild 16491
+MD5 2d75841e1441683da4e6a2bdf630a8f7 mozilla-1.4-r3.ebuild 16542
 MD5 2245cc4f37902e2c6dd188f72874fbb3 files/10mozilla 60
 MD5 cf872ecce56e05c488ae7f41b50dec31 files/digest-mozilla-1.0.1-r3 281
 MD5 eccaf421f7e91faad5f835cadca4263e files/digest-mozilla-1.1-r1 202
 MD5 08ca97500d420d77f99f60d5eeb54c1f files/digest-mozilla-1.2.1-r5 268
-MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r2 201
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
 MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
@@ -25,13 +24,15 @@ MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
 MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
 MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
 MD5 5b01d0425f9ef7bbe0765985e6041c6b files/mozilla.sh 6684
-MD5 22abc05aa3adaba490148f6040e0500a files/digest-mozilla-1.4-r1 201
-MD5 22abc05aa3adaba490148f6040e0500a files/digest-mozilla-1.4-r2 201
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
+MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r2 201
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
+MD5 22abc05aa3adaba490148f6040e0500a files/digest-mozilla-1.4-r1 201
+MD5 22abc05aa3adaba490148f6040e0500a files/digest-mozilla-1.4-r2 201
 MD5 965c8430aca20b99db6430555624b4d2 files/digest-mozilla-1.4-r3 201
 MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
+MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
 MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
 MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
 MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
@@ -39,8 +40,7 @@ MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 8
 MD5 696d4810f2ccb8f2bcb0275fa13c67b9 files/1.2/mozilla-1.2b-gtk2.patch.bz2 6091
 MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
 MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
-MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
-MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
 MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
+MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
diff --git a/net-www/mozilla/mozilla-1.0.1-r3.ebuild b/net-www/mozilla/mozilla-1.0.1-r3.ebuild
index 1c61592d14f7..2f288d10c66b 100644
--- a/net-www/mozilla/mozilla-1.0.1-r3.ebuild
+++ b/net-www/mozilla/mozilla-1.0.1-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-www/mozilla/mozilla-1.0.1-r3.ebuild,v 1.9 2003/08/03 04:23:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.0.1-r3.ebuild,v 1.10 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="mozxmlterm moznomail java mozp3p crypt ipv6 gtk2 mozinterfaceinfo ssl ldap mozaccess mozctl gnome mozsvg debug"
 
@@ -88,7 +88,7 @@ export BUILD_OFFICIAL=1
 
 
 src_unpack() {
-	
+
 	unpack ${A}
 
 	if [ "$(gcc-version)" != "2.95" ] ; then
@@ -130,8 +130,8 @@ src_unpack() {
 	# can break compiles (has done for ).  See:
 	# http://bugzilla.mozilla.org/show_bug.cgi?id=174143
 	cd ${S}; epatch ${FILESDIR}/${P}-platform.patch
-	
-	# Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2 
+
+	# Do bulk patches included in ${P}-patches-${PATCH_VER}.tar.bz2
 	cd ${S}; epatch ${WORKDIR}/patch
 
 	# Unpack the enigmail plugin
@@ -192,7 +192,7 @@ src_compile() {
 
 	# NB!!:  Due to the fact that the non default extensions do not always
 	#        compile properly, using them is considered unsupported, and
-	#        is just here for completeness.  Please do not use if you 
+	#        is just here for completeness.  Please do not use if you
 	#        do not know what you are doing!
 	#
 	# The defaults are (as of 1.0rc1, according to configure (line ~10799)):
@@ -222,13 +222,13 @@ src_compile() {
 	else
 		myconf="${myconf} --disable-svg"
 	fi
-	
+
 	if [ -n "`use moznomail`" ] || \
 	   [ "${NO_MAIL}" = "YES" -o "${NO_MAIL}" = "yes" ]
 	then
 		myconf="${myconf} --disable-mailnews"
 	fi
-	
+
 	export BUILD_MODULES=all
 	export BUILD_OPT=1
 
@@ -246,10 +246,10 @@ src_compile() {
 
 	export WANT_AUTOCONF_2_1=1
 	autoconf
-	
+
 	#This should enable parallel builds, I hope
 	export MAKE="emake"
-	
+
 	# Get it to work without warnings on gcc3
 	CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
 
@@ -277,7 +277,7 @@ src_compile() {
 	# Build the NSS/SSL support
 	if [ "`use ssl`" ] ; then
 		cd ${S}/security/coreconf
-		
+
 		# Fix #include problem
 		cp headers.mk headers.mk.orig
 		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
@@ -287,7 +287,7 @@ src_compile() {
 		make MAKE="make" || die
 
 		cd ${S}/security/nss
-		
+
 		# Disable jobserver here ...
 		make MAKE="make" moz_import || die
 		make MAKE="make" || die
@@ -417,7 +417,7 @@ pkg_preinst() {
 	fi
 
 	# Remove stale component registry.
-    if [ -e ${ROOT}/usr/lib/component.reg ] ; then
+	if [ -e ${ROOT}/usr/lib/component.reg ] ; then
 		rm -f ${ROOT}/usr/lib/component.reg
 	fi
 
@@ -436,7 +436,7 @@ pkg_postinst() {
 		if [ -e `java-config --full-browser-plugin-path=mozilla` ]
 		then
 			ln -snf `java-config --full-browser-plugin-path=mozilla` \
-				${MOZILLA_FIVE_HOME}/plugins/`java-config --browser-plugin=mozilla` 
+				${MOZILLA_FIVE_HOME}/plugins/`java-config --browser-plugin=mozilla`
 		fi
 	fi
 
@@ -462,7 +462,7 @@ pkg_postinst() {
 		rm -f ${MOZILLA_FIVE_HOME}/components/libtimer_gtk.so
 	fi
 
-	# Needed to update the run time bindings for REGXPCOM 
+	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
 	env-update
 	# Register components, setup Chrome .rdf files and fix file permissions
@@ -493,9 +493,9 @@ pkg_postrm() {
 
 	# Regenerate component.reg in case some things changed
 	if [ -e ${ROOT}/usr/lib/mozilla/regxpcom ] ; then
-	
+
 		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
-	
+
 		if [ -e ${MOZILLA_FIVE_HOME}/component.reg ] ; then
 			rm -f ${MOZILLA_FIVE_HOME}/component.reg
 		fi
diff --git a/net-www/mozilla/mozilla-1.1-r1.ebuild b/net-www/mozilla/mozilla-1.1-r1.ebuild
index 3b40d2d32c68..e930488c0309 100644
--- a/net-www/mozilla/mozilla-1.1-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.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-www/mozilla/mozilla-1.1-r1.ebuild,v 1.18 2003/08/03 04:23:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.1-r1.ebuild,v 1.19 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="moznomail java mozp3p crypt ldap gtk2 mozinterfaceinfo ssl mozaccess mozxmlterm mozctl gnome mozsvg debug"
 
@@ -83,7 +83,7 @@ export BUILD_OFFICIAL=1
 
 
 src_unpack() {
-	
+
 	unpack ${A}
 
 	cd ${S}
@@ -163,7 +163,7 @@ src_compile() {
 
 	# NB!!:  Due to the fact that the non default extensions do not always
 	#        compile properly, using them is considered unsupported, and
-	#        is just here for completeness.  Please do not use if you 
+	#        is just here for completeness.  Please do not use if you
 	#        do not know what you are doing!
 	#
 	# The defaults are (as of 1.0rc1, according to configure (line ~10799)):
@@ -193,13 +193,13 @@ src_compile() {
 	else
 		myconf="${myconf} --disable-svg"
 	fi
-	
+
 	if [ -n "`use moznomail`" ] || \
 	   [ "${NO_MAIL}" = "YES" ] || [ "${NO_MAIL}" = "yes" ]
 	then
 		myconf="${myconf} --disable-mailnews"
 	fi
-	
+
 	export BUILD_MODULES=all
 	export BUILD_OPT=1
 
@@ -213,10 +213,10 @@ src_compile() {
 		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
 		myconf="${myconf} --enable-old-abi-compat-wrappers"
 	fi
-	
+
 	#This should enable parallel builds, I hope
 	export MAKE="emake"
-		
+
 	# Crashes on start when compiled with -fomit-frame-pointer
 	CFLAGS="${CFLAGS/-fomit-frame-pointer}"
 	CXXFLAGS="${CXXFLAGS/-fomit-frame-pointer} -Wno-deprecated"
@@ -245,7 +245,7 @@ src_compile() {
 	# Build the NSS/SSL support
 	if [ "`use ssl`" ] ; then
 		cd ${S}/security/coreconf
-		
+
 		# Fix #include problem
 		cp headers.mk headers.mk.orig
 		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
@@ -254,7 +254,7 @@ src_compile() {
 		make || die
 
 		cd ${S}/security/nss
-		
+
 		make moz_import || die
 		make || die
 		cd ${S}
@@ -388,7 +388,7 @@ pkg_preinst() {
 	fi
 
 	# Remove stale component registry.
-    if [ -e ${ROOT}/usr/lib/component.reg ] ; then
+	if [ -e ${ROOT}/usr/lib/component.reg ] ; then
 		rm -f ${ROOT}/usr/lib/component.reg
 	fi
 
@@ -414,7 +414,7 @@ pkg_postinst() {
 		if [ -e `java-config --full-browser-plugin-path=mozilla` ]
 		then
 			ln -sf `java-config --full-browser-plugin-path=mozilla` \
-				${MOZILLA_FIVE_HOME}/plugins/`java-config --browser-plugin=mozilla` 
+				${MOZILLA_FIVE_HOME}/plugins/`java-config --browser-plugin=mozilla`
 		fi
 	fi
 
@@ -441,7 +441,7 @@ pkg_postinst() {
 		rm -f ${MOZILLA_FIVE_HOME}/components/libtimer_gtk.so
 	fi
 
-	# Needed to update the run time bindings for REGXPCOM 
+	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
 	env-update
 	# Register components, setup Chrome .rdf files and fix file permissions
@@ -476,9 +476,9 @@ pkg_postrm() {
 
 	# Regenerate component.reg in case some things changed
 	if [ -e ${ROOT}/usr/lib/mozilla/regxpcom ] ; then
-	
+
 		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
-	
+
 		if [ -e ${MOZILLA_FIVE_HOME}/component.reg ] ; then
 			rm -f ${MOZILLA_FIVE_HOME}/component.reg
 		fi
diff --git a/net-www/mozilla/mozilla-1.2.1-r5.ebuild b/net-www/mozilla/mozilla-1.2.1-r5.ebuild
index 75a9cd7432a4..1d2b02c77a2c 100644
--- a/net-www/mozilla/mozilla-1.2.1-r5.ebuild
+++ b/net-www/mozilla/mozilla-1.2.1-r5.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-www/mozilla/mozilla-1.2.1-r5.ebuild,v 1.10 2003/08/03 04:23:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.2.1-r5.ebuild,v 1.11 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
@@ -157,7 +157,7 @@ moz_setup() {
 src_unpack() {
 
 	moz_setup
-	
+
 	unpack ${A}
 
 	if [ "$(gcc-major-version)" -eq "3" ]
@@ -203,7 +203,7 @@ src_unpack() {
 			# Get mozilla to link to Xft2.0 that we install in tmp directory
 			# <azarah@gentoo.org> (18 Nov 2002)
 			epatch ${FILESDIR}/${PV%\.*}/${P%\.*}b-Xft-includes.patch.bz2
-			
+
 			# Fix include problem in Xrender if the updated one is not installed
 			# system wide ... bug #12223.
 			cd ${FC_S}/../Xrender
@@ -214,7 +214,7 @@ src_unpack() {
 		# Update Gtk+2 bits from CVS
 		epatch ${FILESDIR}/${PV%\.*}/${P%\.*}b-gtk2.patch.bz2
 	fi
-	
+
 	cd ${S}
 	export WANT_AUTOCONF_2_1=1
 	autoconf &> /dev/null
@@ -327,7 +327,7 @@ src_compile() {
 
 	# NB!!:  Due to the fact that the non default extensions do not always
 	#        compile properly, using them is considered unsupported, and
-	#        is just here for completeness.  Please do not use if you 
+	#        is just here for completeness.  Please do not use if you
 	#        do not know what you are doing!
 	#
 	# The defaults are (as of 1.2, according to configure (line ~11445)):
@@ -370,7 +370,7 @@ src_compile() {
 #	then
 #		myconf="${myconf} --enable-calendar"
 #	fi
-	
+
 	if [ -n "`use moznomail`" ]
 	then
 		myconf="${myconf} --disable-mailnews"
@@ -379,7 +379,7 @@ src_compile() {
 	then
 		myconf="${myconf} --disable-composer"
 	fi
-	
+
 	if [ "$(gcc-major-version)" -eq "3" ]
 	then
 		# Currently gcc-3.2 or older do not work well if we specify "-march"
@@ -418,19 +418,19 @@ src_compile() {
 		# Create the libXrender.so to our _moz version so that Xft will
 		# link to the correct library ...
 		ln -snf libXrender_moz.so.? libXrender.so
-		
+
 		einfo "Configuring Xft2.0..."
 		cd ${FC_S}
 		./configure --prefix=${WORKDIR}/Xft \
 			--sysconfdir=/etc \
 			--x-includes=${WORKDIR}/Xft/include \
 			--x-libraries=${WORKDIR}/Xft/lib || die
-	
+
 		einfo "Building Xft2.0..."
 		# Use install as libXft_moz.so so that it do not conflict with
 		# system wide libs ...
 		emake LIBBASE="libXft_moz.so" || die
-	
+
 		einfo "Installing Xft2.0 in temp directory..."
 		make prefix=${WORKDIR}/Xft \
 			confdir=${WORKDIR}/Xft/etc/fonts \
@@ -451,10 +451,10 @@ src_compile() {
 	#  Configure and build Mozilla
 	#
 	# *********************************************************************
-	
+
 	export BUILD_MODULES=all
 	export BUILD_OPT=1
-	
+
 	# Get it to work without warnings on gcc3
 	export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
 
@@ -493,7 +493,7 @@ src_compile() {
 	then
 		einfo "Building Mozilla NSS..."
 		cd ${S}/security/coreconf
-		
+
 		# Fix #include problem
 		cp headers.mk headers.mk.orig
 		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
@@ -503,7 +503,7 @@ src_compile() {
 		make MAKE="make" || die
 
 		cd ${S}/security/nss
-		
+
 		# Disable jobserver here ...
 		make MAKE="make" moz_import || die
 		make MAKE="make" || die
@@ -658,7 +658,7 @@ pkg_preinst() {
 	fi
 
 	# Remove stale component registry.
-    if [ -e ${ROOT}/usr/lib/component.reg ]
+	if [ -e ${ROOT}/usr/lib/component.reg ]
 	then
 		rm -f ${ROOT}/usr/lib/component.reg
 	fi
@@ -683,7 +683,7 @@ pkg_postinst() {
 			if [ -e "`java-config --full-browser-plugin-path=mozilla`" ]
 			then
 				ln -snf `java-config --full-browser-plugin-path=mozilla` \
-					${MOZILLA_FIVE_HOME}/plugins/`java-config --browser-plugin=mozilla` 
+					${MOZILLA_FIVE_HOME}/plugins/`java-config --browser-plugin=mozilla`
 			fi
 		fi
 	fi
@@ -698,7 +698,7 @@ pkg_postinst() {
 
 	umask 022
 
-	# Needed to update the run time bindings for REGXPCOM 
+	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
 	env-update
 	# Register components, setup Chrome .rdf files and fix file permissions
@@ -732,7 +732,7 @@ pkg_postrm() {
 	if [ -e ${ROOT}/usr/lib/mozilla/regxpcom ]
 	then
 		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
-	
+
 		if [ -e ${MOZILLA_FIVE_HOME}/component.reg ]
 		then
 			rm -f ${MOZILLA_FIVE_HOME}/component.reg
diff --git a/net-www/mozilla/mozilla-1.3-r2.ebuild b/net-www/mozilla/mozilla-1.3-r2.ebuild
index 8eb071ff56b4..a974bb1e75a2 100644
--- a/net-www/mozilla/mozilla-1.3-r2.ebuild
+++ b/net-www/mozilla/mozilla-1.3-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-www/mozilla/mozilla-1.3-r2.ebuild,v 1.7 2003/08/03 04:23:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.3-r2.ebuild,v 1.8 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
@@ -131,7 +131,7 @@ moz_setup() {
 src_unpack() {
 
 	moz_setup
-	
+
 	unpack ${A}
 
 	cd ${S}
@@ -261,7 +261,7 @@ src_compile() {
 
 	# NB!!:  Due to the fact that the non default extensions do not always
 	#        compile properly, using them is considered unsupported, and
-	#        is just here for completeness.  Please do not use if you 
+	#        is just here for completeness.  Please do not use if you
 	#        do not know what you are doing!
 	#
 	# The defaults are (as of 1.2, according to configure (line ~11445)):
@@ -304,7 +304,7 @@ src_compile() {
 #	then
 #		myconf="${myconf} --enable-calendar"
 #	fi
-	
+
 	if [ -n "`use moznomail`" ]
 	then
 		myconf="${myconf} --disable-mailnews"
@@ -313,7 +313,7 @@ src_compile() {
 	then
 		myconf="${myconf} --disable-composer"
 	fi
-	
+
 	if [ "$(gcc-major-version)" -eq "3" ]
 	then
 		# Currently gcc-3.2 or older do not work well if we specify "-march"
@@ -322,7 +322,7 @@ src_compile() {
 			replace-flags -march=pentium4 -march=pentium3
 			filter-flags -msse2
 		fi
-								
+
 		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
 		if [ "${ARCH}" = "x86" ]
 		then
@@ -335,10 +335,10 @@ src_compile() {
 	#  Configure and build Mozilla
 	#
 	# *********************************************************************
-	
+
 	export BUILD_MODULES=all
 	export BUILD_OPT=1
-	
+
 	# Get it to work without warnings on gcc3
 	export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
 
@@ -373,7 +373,7 @@ src_compile() {
 	then
 		einfo "Building Mozilla NSS..."
 		cd ${S}/security/coreconf
-		
+
 		# Fix #include problem
 		cp headers.mk headers.mk.orig
 		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
@@ -383,7 +383,7 @@ src_compile() {
 		make MAKE="make" || die
 
 		cd ${S}/security/nss
-		
+
 		# Disable jobserver here ...
 		make MAKE="make" moz_import || die
 		make MAKE="make" || die
@@ -545,7 +545,7 @@ pkg_preinst() {
 	fi
 
 	# Remove stale component registry.
-    if [ -e ${ROOT}/usr/lib/mozilla/component.reg ]
+	if [ -e ${ROOT}/usr/lib/mozilla/component.reg ]
 	then
 		rm -f ${ROOT}/usr/lib/mozilla/component.reg
 	fi
@@ -565,7 +565,7 @@ pkg_postinst() {
 
 	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
 
-	# Needed to update the run time bindings for REGXPCOM 
+	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
 	env-update
 	# Register Components and Chrome
@@ -592,7 +592,7 @@ pkg_postrm() {
 	if [ -e ${ROOT}/usr/lib/mozilla/regxpcom ]
 	then
 		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
-	
+
 		if [ -x "${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl" ]
 		then
 			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
diff --git a/net-www/mozilla/mozilla-1.4-r1.ebuild b/net-www/mozilla/mozilla-1.4-r1.ebuild
index 9a776c731d00..3a1a53ebbcf7 100644
--- a/net-www/mozilla/mozilla-1.4-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.4-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-www/mozilla/mozilla-1.4-r1.ebuild,v 1.4 2003/08/03 04:23:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4-r1.ebuild,v 1.5 2003/09/06 01:54:08 msterret Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
@@ -117,7 +117,7 @@ moz_setup() {
 src_unpack() {
 
 	moz_setup
-	
+
 	unpack ${A}
 
 	cd ${S}
@@ -244,7 +244,7 @@ src_compile() {
 
 	# NB!!:  Due to the fact that the non default extensions do not always
 	#        compile properly, using them is considered unsupported, and
-	#        is just here for completeness.  Please do not use if you 
+	#        is just here for completeness.  Please do not use if you
 	#        do not know what you are doing!
 	#
 	# The defaults are (as of 1.2, according to configure (line ~11445)):
@@ -282,7 +282,7 @@ src_compile() {
 	then
 		myconf="${myconf} --enable-calendar"
 	fi
-	
+
 	if [ -n "`use moznomail`" ]
 	then
 		myconf="${myconf} --disable-mailnews"
@@ -291,7 +291,7 @@ src_compile() {
 	then
 		myconf="${myconf} --disable-composer"
 	fi
-	
+
 	if [ "$(gcc-major-version)" -eq "3" ]
 	then
 		# Currently gcc-3.2 or older do not work well if we specify "-march"
@@ -300,7 +300,7 @@ src_compile() {
 			replace-flags -march=pentium4 -march=pentium3
 			filter-flags -msse2
 		fi
-								
+
 		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
 		if [ "${ARCH}" = "x86" ]
 		then
@@ -320,10 +320,10 @@ src_compile() {
 	#  Configure and build Mozilla
 	#
 	# *********************************************************************
-	
+
 	export BUILD_MODULES=all
 	export BUILD_OPT=1
-	
+
 	# Get it to work without warnings on gcc3
 	export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
 
@@ -358,7 +358,7 @@ src_compile() {
 	then
 		einfo "Building Mozilla NSS..."
 		cd ${S}/security/coreconf
-		
+
 		# Fix #include problem
 		cp headers.mk headers.mk.orig
 		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
@@ -368,7 +368,7 @@ src_compile() {
 		make MAKE="make" || die
 
 		cd ${S}/security/nss
-		
+
 		# Disable jobserver here ...
 		make MAKE="make" moz_import || die
 		make MAKE="make" || die
@@ -530,7 +530,7 @@ pkg_preinst() {
 	fi
 
 	# Remove stale component registry.
-    if [ -e ${ROOT}/usr/lib/mozilla/component.reg ]
+	if [ -e ${ROOT}/usr/lib/mozilla/component.reg ]
 	then
 		rm -f ${ROOT}/usr/lib/mozilla/component.reg
 	fi
@@ -550,7 +550,7 @@ pkg_postinst() {
 
 	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
 
-	# Needed to update the run time bindings for REGXPCOM 
+	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
 	env-update
 	# Register Components and Chrome
@@ -577,7 +577,7 @@ pkg_postrm() {
 	if [ -e ${ROOT}/usr/lib/mozilla/regxpcom ]
 	then
 		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
-	
+
 		if [ -x "${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl" ]
 		then
 			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
diff --git a/net-www/mozilla/mozilla-1.4-r2.ebuild b/net-www/mozilla/mozilla-1.4-r2.ebuild
index 5460cbc882c9..adde1cdcf6bb 100644
--- a/net-www/mozilla/mozilla-1.4-r2.ebuild
+++ b/net-www/mozilla/mozilla-1.4-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-www/mozilla/mozilla-1.4-r2.ebuild,v 1.5 2003/08/03 04:23:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4-r2.ebuild,v 1.6 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
@@ -117,7 +117,7 @@ moz_setup() {
 src_unpack() {
 
 	moz_setup
-	
+
 	unpack ${A}
 
 	cd ${S}
@@ -245,7 +245,7 @@ src_compile() {
 
 	# NB!!:  Due to the fact that the non default extensions do not always
 	#        compile properly, using them is considered unsupported, and
-	#        is just here for completeness.  Please do not use if you 
+	#        is just here for completeness.  Please do not use if you
 	#        do not know what you are doing!
 	#
 	# The defaults are (as of 1.2, according to configure (line ~11445)):
@@ -283,7 +283,7 @@ src_compile() {
 	then
 		myconf="${myconf} --enable-calendar"
 	fi
-	
+
 	if [ -n "`use moznomail`" ]
 	then
 		myconf="${myconf} --disable-mailnews"
@@ -292,7 +292,7 @@ src_compile() {
 	then
 		myconf="${myconf} --disable-composer"
 	fi
-	
+
 	if [ "$(gcc-major-version)" -eq "3" ]
 	then
 		# Currently gcc-3.2 or older do not work well if we specify "-march"
@@ -301,7 +301,7 @@ src_compile() {
 			replace-flags -march=pentium4 -march=pentium3
 			filter-flags -msse2
 		fi
-								
+
 		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
 		if [ "${ARCH}" = "x86" ]
 		then
@@ -321,10 +321,10 @@ src_compile() {
 	#  Configure and build Mozilla
 	#
 	# *********************************************************************
-	
+
 	export BUILD_MODULES=all
 	export BUILD_OPT=1
-	
+
 	# Get it to work without warnings on gcc3
 	export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
 
@@ -359,7 +359,7 @@ src_compile() {
 	then
 		einfo "Building Mozilla NSS..."
 		cd ${S}/security/coreconf
-		
+
 		# Fix #include problem
 		cp headers.mk headers.mk.orig
 		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
@@ -369,7 +369,7 @@ src_compile() {
 		make MAKE="make" || die
 
 		cd ${S}/security/nss
-		
+
 		# Disable jobserver here ...
 		make MAKE="make" moz_import || die
 		make MAKE="make" || die
@@ -531,7 +531,7 @@ pkg_preinst() {
 	fi
 
 	# Remove stale component registry.
-    if [ -e ${ROOT}/usr/lib/mozilla/component.reg ]
+	if [ -e ${ROOT}/usr/lib/mozilla/component.reg ]
 	then
 		rm -f ${ROOT}/usr/lib/mozilla/component.reg
 	fi
@@ -551,7 +551,7 @@ pkg_postinst() {
 
 	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
 
-	# Needed to update the run time bindings for REGXPCOM 
+	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
 	env-update
 	# Register Components and Chrome
@@ -578,7 +578,7 @@ pkg_postrm() {
 	if [ -e ${ROOT}/usr/lib/mozilla/regxpcom ]
 	then
 		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
-	
+
 		if [ -x "${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl" ]
 		then
 			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
diff --git a/net-www/mozilla/mozilla-1.4-r3.ebuild b/net-www/mozilla/mozilla-1.4-r3.ebuild
index 1b88db234b2a..b4c4a0676064 100644
--- a/net-www/mozilla/mozilla-1.4-r3.ebuild
+++ b/net-www/mozilla/mozilla-1.4-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-www/mozilla/mozilla-1.4-r3.ebuild,v 1.7 2003/08/20 04:01:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4-r3.ebuild,v 1.8 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
@@ -119,7 +119,7 @@ moz_setup() {
 src_unpack() {
 
 	moz_setup
-	
+
 	unpack ${A}
 
 	cd ${S}
@@ -247,7 +247,7 @@ src_compile() {
 
 	# NB!!:  Due to the fact that the non default extensions do not always
 	#        compile properly, using them is considered unsupported, and
-	#        is just here for completeness.  Please do not use if you 
+	#        is just here for completeness.  Please do not use if you
 	#        do not know what you are doing!
 	#
 	# The defaults are (as of 1.2, according to configure (line ~11445)):
@@ -285,7 +285,7 @@ src_compile() {
 	then
 		myconf="${myconf} --enable-calendar"
 	fi
-	
+
 	if [ -n "`use moznomail`" ]
 	then
 		myconf="${myconf} --disable-mailnews"
@@ -294,7 +294,7 @@ src_compile() {
 	then
 		myconf="${myconf} --disable-composer"
 	fi
-	
+
 	if [ "$(gcc-major-version)" -eq "3" ]
 	then
 		# Currently gcc-3.2 or older do not work well if we specify "-march"
@@ -303,7 +303,7 @@ src_compile() {
 			replace-flags -march=pentium4 -march=pentium3
 			filter-flags -msse2
 		fi
-								
+
 		# Enable us to use flash, etc plugins compiled with gcc-2.95.3
 		if [ "${ARCH}" = "x86" ]
 		then
@@ -323,10 +323,10 @@ src_compile() {
 	#  Configure and build Mozilla
 	#
 	# *********************************************************************
-	
+
 	export BUILD_MODULES=all
 	export BUILD_OPT=1
-	
+
 	# Get it to work without warnings on gcc3
 	export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
 
@@ -361,7 +361,7 @@ src_compile() {
 	then
 		einfo "Building Mozilla NSS..."
 		cd ${S}/security/coreconf
-		
+
 		# Fix #include problem
 		cp headers.mk headers.mk.orig
 		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
@@ -371,7 +371,7 @@ src_compile() {
 		make MAKE="make" || die
 
 		cd ${S}/security/nss
-		
+
 		# Disable jobserver here ...
 		make MAKE="make" moz_import || die
 		make MAKE="make" || die
@@ -533,7 +533,7 @@ pkg_preinst() {
 	fi
 
 	# Remove stale component registry.
-    if [ -e ${ROOT}/usr/lib/mozilla/component.reg ]
+	if [ -e ${ROOT}/usr/lib/mozilla/component.reg ]
 	then
 		rm -f ${ROOT}/usr/lib/mozilla/component.reg
 	fi
@@ -553,7 +553,7 @@ pkg_postinst() {
 
 	export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
 
-	# Needed to update the run time bindings for REGXPCOM 
+	# Needed to update the run time bindings for REGXPCOM
 	# (do not remove next line!)
 	env-update
 	# Register Components and Chrome
@@ -580,7 +580,7 @@ pkg_postrm() {
 	if [ -e ${ROOT}/usr/lib/mozilla/regxpcom ]
 	then
 		export MOZILLA_FIVE_HOME="${ROOT}/usr/lib/mozilla"
-	
+
 		if [ -x "${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl" ]
 		then
 			${MOZILLA_FIVE_HOME}/mozilla-rebuild-databases.pl
diff --git a/net-www/mplayerplug-in/Manifest b/net-www/mplayerplug-in/Manifest
index b73730854208..5118ad634ee9 100644
--- a/net-www/mplayerplug-in/Manifest
+++ b/net-www/mplayerplug-in/Manifest
@@ -1,5 +1,5 @@
 MD5 3360b628dd5e886363c9b827fe2c4bfc ChangeLog 1377
-MD5 28b7dbf1e2066a7ceddb1a00251c1799 mplayerplug-in-0.71.ebuild 1296
-MD5 5989865ae360e28f3a28ad68ada89a9e mplayerplug-in-0.80.ebuild 1285
-MD5 fc695a5198414c46fde959e5747ba75f files/digest-mplayerplug-in-0.71 126
+MD5 7aca57f106ccebb174879cdbb43fdf6f mplayerplug-in-0.80.ebuild 1288
+MD5 e98afd8b53e4141fe693e7b23cb50a16 mplayerplug-in-0.71.ebuild 1296
 MD5 f67d7196e95ae6840ddd5117dd249afb files/digest-mplayerplug-in-0.80 125
+MD5 fc695a5198414c46fde959e5747ba75f files/digest-mplayerplug-in-0.71 126
diff --git a/net-www/mplayerplug-in/mplayerplug-in-0.71.ebuild b/net-www/mplayerplug-in/mplayerplug-in-0.71.ebuild
index f42e2b0b6516..0061c0935f48 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-0.71.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-0.71.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-0.71.ebuild,v 1.2 2003/06/05 05:11:28 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-0.71.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
 
 IUSE=""
 
@@ -26,7 +26,7 @@ src_compile() {
 src_install() {
 	exeinto /opt/netscape/plugins
 	doexe mplayerplug-in.so
-	
+
 	inst_plugin /opt/netscape/plugins/mplayerplug-in.so
 
 	insinto /usr/share/mplayer/Skin/mini
diff --git a/net-www/mplayerplug-in/mplayerplug-in-0.80.ebuild b/net-www/mplayerplug-in/mplayerplug-in-0.80.ebuild
index d049e78e1a3b..10b3400c47cb 100644
--- a/net-www/mplayerplug-in/mplayerplug-in-0.80.ebuild
+++ b/net-www/mplayerplug-in/mplayerplug-in-0.80.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-0.80.ebuild,v 1.2 2003/06/29 12:11:15 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-0.80.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
 
 IUSE=""
 
@@ -26,7 +26,7 @@ src_compile() {
 src_install() {
 	exeinto /opt/netscape/plugins
 	doexe mplayerplug-in.so
-	
+
 	inst_plugin /opt/netscape/plugins/mplayerplug-in.so
 
 	insinto /usr/share/mplayer/Skin/mini
diff --git a/net-www/mythweb/Manifest b/net-www/mythweb/Manifest
index 3c8d5e1cfc3a..2f110ee286d5 100644
--- a/net-www/mythweb/Manifest
+++ b/net-www/mythweb/Manifest
@@ -1,3 +1,3 @@
-MD5 beb64214ee91877520e63a5c3cb2229b mythweb-0.10.ebuild 1210
 MD5 8580c6402f9b974024443198301f1ec4 ChangeLog 757
+MD5 f3a81b2c4ae4dfb6b9db04da15a90bea mythweb-0.10.ebuild 1206
 MD5 b1a45ca76e1e2679253eecca7a21a726 files/digest-mythweb-0.10 64
diff --git a/net-www/mythweb/mythweb-0.10.ebuild b/net-www/mythweb/mythweb-0.10.ebuild
index 4d4d25b24321..4d31a7ca35bd 100644
--- a/net-www/mythweb/mythweb-0.10.ebuild
+++ b/net-www/mythweb/mythweb-0.10.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-www/mythweb/mythweb-0.10.ebuild,v 1.1 2003/07/09 00:10:36 johnm Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/net-www/mythweb/mythweb-0.10.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="apache2"
 DESCRIPTION="PHP scripts intended to manage MythTV from a web browser."
@@ -26,7 +26,7 @@ src_install() {
 	elif [ -e "/etc/apache/conf/apache.conf" ] ; then
 		HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d' ' -f2`"
 	else
-        HTTPD_ROOT="/home/httpd/htdocs"
+		HTTPD_ROOT="/home/httpd/htdocs"
 		ewarn
 		ewarn "No apache config file found in /etc, assuming DocumentRoot /home/httpd/htdocs"
 		ewarn
diff --git a/net-www/netrik/netrik-1.10.2.ebuild b/net-www/netrik/netrik-1.10.2.ebuild
index b5f3f37cc890..e9ccba042ba1 100644
--- a/net-www/netrik/netrik-1.10.2.ebuild
+++ b/net-www/netrik/netrik-1.10.2.ebuild
@@ -12,18 +12,17 @@ DEPENDS=">=sys-libs/ncurses-5.1
 		 nls? ( sys-devel/gettext )"
 
 src_unpack() {
- unpack ${A} || die
- }
+	unpack ${A} || die
+}
 
 src_compile() {
- local myconf
- econf \
- 	--prefix=/usr || die "Configure failed"
-	emake || die "Compile problem"
+	local myconf
+	econf \
+		--prefix=/usr || die "Configure failed"
+		emake || die "Compile problem"
 }
 
 src_install() {
 	make prefix=${D}/usr datadir=${D}/usr/share mandir=${D}/usr/share/man libdir=${D} install \
 	|| die "Unablr to do install"
 }
-	
diff --git a/net-www/netrik/netrik-1.6.0.ebuild b/net-www/netrik/netrik-1.6.0.ebuild
index b5f3f37cc890..e9ccba042ba1 100644
--- a/net-www/netrik/netrik-1.6.0.ebuild
+++ b/net-www/netrik/netrik-1.6.0.ebuild
@@ -12,18 +12,17 @@ DEPENDS=">=sys-libs/ncurses-5.1
 		 nls? ( sys-devel/gettext )"
 
 src_unpack() {
- unpack ${A} || die
- }
+	unpack ${A} || die
+}
 
 src_compile() {
- local myconf
- econf \
- 	--prefix=/usr || die "Configure failed"
-	emake || die "Compile problem"
+	local myconf
+	econf \
+		--prefix=/usr || die "Configure failed"
+		emake || die "Compile problem"
 }
 
 src_install() {
 	make prefix=${D}/usr datadir=${D}/usr/share mandir=${D}/usr/share/man libdir=${D} install \
 	|| die "Unablr to do install"
 }
-	
diff --git a/net-www/netscape-communicator/Manifest b/net-www/netscape-communicator/Manifest
index 9a18c153c684..6d8a56193334 100644
--- a/net-www/netscape-communicator/Manifest
+++ b/net-www/netscape-communicator/Manifest
@@ -1,4 +1,4 @@
 MD5 04bb9c593424e19414ccfa8c09aec80f ChangeLog 1462
-MD5 8d94eb3b965af0ff1fe14a1f47cf57a9 netscape-communicator-4.79-r1.ebuild 1322
+MD5 33967090cc8a5faefc42f4933edf23d0 netscape-communicator-4.79-r1.ebuild 1321
 MD5 306a2c62f63b10e5d45f3db4e079ad23 files/digest-netscape-communicator-4.79-r1 95
 MD5 b8f2d72edbf20d06b58a2c52e1c5ac52 files/netscape 116
diff --git a/net-www/netscape-communicator/netscape-communicator-4.79-r1.ebuild b/net-www/netscape-communicator/netscape-communicator-4.79-r1.ebuild
index aa64a2b53877..4db7dab26b95 100644
--- a/net-www/netscape-communicator/netscape-communicator-4.79-r1.ebuild
+++ b/net-www/netscape-communicator/netscape-communicator-4.79-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-www/netscape-communicator/netscape-communicator-4.79-r1.ebuild,v 1.10 2003/03/02 04:33:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-communicator/netscape-communicator-4.79-r1.ebuild,v 1.11 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/communicator-v479.x86-unknown-linux2.2
 DESCRIPTION="Netscape Communicator 4.79"
@@ -21,17 +21,17 @@ src_install() {
 	dodir /usr/X11R6/bin
 	dodoc README.install
 	cd ${D}/opt/netscape
-	
+
 	tar xz --no-same-owner -f ${S}/netscape-v479.nif
 	tar xz --no-same-owner -f ${S}/nethelp-v479.nif
 	tar xz --no-same-owner -f ${S}/spellchk-v479.nif
-	
+
 	cp ${S}/*.jar ${D}/opt/netscape/java/classes
 	cp ${FILESDIR}/netscape ${D}/usr/X11R6/bin/netscape
 	rm ${D}/opt/netscape/netscape-dynMotif
 	rm ${D}/opt/netscape/libnullplugin-dynMotif.so
 	rm ${D}/opt/netscape/plugins/libflashplayer.so
 	insinto /usr/X11R6/bin
-	doins ${FILESDIR}/netscape 
+	doins ${FILESDIR}/netscape
 	chmod +x ${D}/usr/X11R6/bin/netscape
 }
diff --git a/net-www/netscape-navigator/Manifest b/net-www/netscape-navigator/Manifest
index 816dc0933efb..66f91857cfb6 100644
--- a/net-www/netscape-navigator/Manifest
+++ b/net-www/netscape-navigator/Manifest
@@ -1,4 +1,4 @@
 MD5 7b8503ddb2cd581120594f41389fa6c5 ChangeLog 1150
-MD5 1bafb506e3d28a08cb16efbdb7caf3d5 netscape-navigator-4.79-r1.ebuild 1371
+MD5 5f9528a59978d24ad1b9f93e8d2622e3 netscape-navigator-4.79-r1.ebuild 1363
 MD5 33670fc2f3f050e1bcf0700d5d7d1267 files/digest-netscape-navigator-4.79-r1 92
 MD5 b8f2d72edbf20d06b58a2c52e1c5ac52 files/netscape 116
diff --git a/net-www/netscape-navigator/netscape-navigator-4.79-r1.ebuild b/net-www/netscape-navigator/netscape-navigator-4.79-r1.ebuild
index 1d31b38846a5..af7961890df9 100644
--- a/net-www/netscape-navigator/netscape-navigator-4.79-r1.ebuild
+++ b/net-www/netscape-navigator/netscape-navigator-4.79-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-www/netscape-navigator/netscape-navigator-4.79-r1.ebuild,v 1.9 2003/03/02 04:34:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-navigator/netscape-navigator-4.79-r1.ebuild,v 1.10 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/navigator-v479.x86-unknown-linux2.2
 DESCRIPTION="Netscape Navigator 4.79"
@@ -20,7 +20,7 @@ src_unpack() {
 #	chown -R root:root ${S}
 }
 
-src_install() {								  
+src_install() {
 	dodir /opt/netscape
 	dodir /opt/netscape/java/classes
 	dodir /usr/X11R6/bin
@@ -35,6 +35,6 @@ src_install() {
 	rm ${D}/opt/netscape/libnullplugin-dynMotif.so
 	rm ${D}/opt/netscape/plugins/libflashplayer.so
 	insinto /usr/X11R6/bin
-	doins ${FILESDIR}/netscape 
+	doins ${FILESDIR}/netscape
 	chmod +x ${D}/usr/X11R6/bin/netscape
 }
diff --git a/net-www/netscape-plugger/Manifest b/net-www/netscape-plugger/Manifest
index 489d1727ddbc..57414bb29926 100644
--- a/net-www/netscape-plugger/Manifest
+++ b/net-www/netscape-plugger/Manifest
@@ -1,5 +1,5 @@
+MD5 c62673a31ec12185f39e106c3cc4fa55 ChangeLog 1560
+MD5 672d6574e1fb7ff3758a923947a97209 netscape-plugger-4.0-r1.ebuild 927
+MD5 29b142ccfb8d1cdd2c73b09dd14c5bb7 netscape-plugger-4.0-r2.ebuild 883
 MD5 9e9681a21cd0675ba0df953f1abdb0c6 files/digest-netscape-plugger-4.0-r1 78
 MD5 9e9681a21cd0675ba0df953f1abdb0c6 files/digest-netscape-plugger-4.0-r2 78
-MD5 13f75a20000687513aa249808133a66f netscape-plugger-4.0-r1.ebuild 958
-MD5 1cfa1b22d027d70afe46b9d7655ce8b9 netscape-plugger-4.0-r2.ebuild 912
-MD5 c62673a31ec12185f39e106c3cc4fa55 ChangeLog 1560
diff --git a/net-www/netscape-plugger/netscape-plugger-4.0-r1.ebuild b/net-www/netscape-plugger/netscape-plugger-4.0-r1.ebuild
index 4d51a50916c4..d5d84d5ee5ff 100644
--- a/net-www/netscape-plugger/netscape-plugger-4.0-r1.ebuild
+++ b/net-www/netscape-plugger/netscape-plugger-4.0-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-www/netscape-plugger/netscape-plugger-4.0-r1.ebuild,v 1.11 2003/02/13 15:40:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-plugger/netscape-plugger-4.0-r1.ebuild,v 1.12 2003/09/06 01:54:09 msterret Exp $
 
 MYP=${P#netscape-}-linux-x86-glibc
 S=${WORKDIR}/plugger-4.0
@@ -11,7 +11,7 @@ SLOT="0"
 KEYWORDS="x86 -ppc sparc "
 LICENSE="GPL-2"
 
-src_install() {                               
+src_install() {
 	cd ${S}
 	dodir /opt/netscape/plugins /etc
 	insinto /opt/netscape/plugins
@@ -29,6 +29,6 @@ src_install() {
 		dosym /opt/netscape/plugins/plugger.so \
 			/usr/lib/mozilla/plugins/plugger.so
 	fi
- 	
+
 	dodoc README
 }
diff --git a/net-www/netscape-plugger/netscape-plugger-4.0-r2.ebuild b/net-www/netscape-plugger/netscape-plugger-4.0-r2.ebuild
index 4fd93342f9dc..668a603a5558 100644
--- a/net-www/netscape-plugger/netscape-plugger-4.0-r2.ebuild
+++ b/net-www/netscape-plugger/netscape-plugger-4.0-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-www/netscape-plugger/netscape-plugger-4.0-r2.ebuild,v 1.4 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-plugger/netscape-plugger-4.0-r2.ebuild,v 1.5 2003/09/06 01:54:09 msterret Exp $
 
 inherit nsplugins
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 DEPEND="virtual/glibc"
 IUSE=""
 
-src_install() {                               
+src_install() {
 	cd ${S}
 	dodir /opt/netscape/plugins /etc
 	insinto /opt/netscape/plugins
@@ -29,6 +29,6 @@ src_install() {
 	dosym plugger-4.0 /usr/bin/plugger
 
 	inst_plugin /opt/netscape/plugins/plugger.so
- 	
+
 	dodoc README
 }
diff --git a/net-www/oops/Manifest b/net-www/oops/Manifest
index dd46a86fc49b..4a0c0d66101c 100644
--- a/net-www/oops/Manifest
+++ b/net-www/oops/Manifest
@@ -1,6 +1,6 @@
 MD5 9cfb3d559d1739d14b34484d485a2d31 ChangeLog 961
 MD5 050f78218b3ebb9f4a82c8fcbb214c2f oops-1.5.22.ebuild 2686
-MD5 eb3fad07bc1c61e8b0f3a7711df40cd8 oops-1.5.6.ebuild 2341
+MD5 bd7f76c5f7cbd8137a429d93007928dc oops-1.5.6.ebuild 2321
 MD5 a9957cc3d73892c636b0c45ed7b84ee2 files/digest-oops-1.5.22 63
 MD5 261405b1b49b3bded20e300755773d8b files/digest-oops-1.5.6 62
 MD5 6f1e80af4f1280cfb10b31ab9d2ab820 files/oops.cfg 17896
diff --git a/net-www/oops/oops-1.5.6.ebuild b/net-www/oops/oops-1.5.6.ebuild
index b16b1abd2e2f..49e0fd51c7d7 100644
--- a/net-www/oops/oops-1.5.6.ebuild
+++ b/net-www/oops/oops-1.5.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-www/oops/oops-1.5.6.ebuild,v 1.13 2003/02/13 15:40:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/oops/oops-1.5.6.ebuild,v 1.14 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${P}
 SRC_URI="http://zipper.paco.net/~igor/oops/oops-1.5.6.tar.gz"
@@ -11,8 +11,8 @@ LICENSE="GPL-2"
 DESCRIPTION="An advanced multithreaded caching web proxy"
 
 DEPEND="virtual/glibc sys-devel/gcc
-        dev-libs/libpcre
-        sys-devel/flex"
+	dev-libs/libpcre
+	sys-devel/flex"
 
 RDEPEND="virtual/glibc sys-devel/gcc"
 
@@ -25,8 +25,8 @@ src_unpack() {
 }
 
 src_compile() {
-    try ./configure --prefix=/usr --libdir=/usr/lib/oops --enable-oops-user=squid \
-    --sysconfdir=/etc/oops --sbindir=/usr/sbin --with-regexp=pcre --localstatedir=/var/run/oops
+	try ./configure --prefix=/usr --libdir=/usr/lib/oops --enable-oops-user=squid \
+		--sysconfdir=/etc/oops --sbindir=/usr/sbin --with-regexp=pcre --localstatedir=/var/run/oops
 	cd src
 	cp config.h.in config.h.in.orig
 	sed -e '/STRERROR_R/d' config.h.in.orig > config.h.in
@@ -37,7 +37,7 @@ src_compile() {
 }
 
 src_install() {
-    dodir /usr/sbin
+	dodir /usr/sbin
 	chown squid.squid ${D}
 	try make DESTDIR=${D} install
 	chmod -R g+srw ${D}/etc/oops
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index cb5e0f096c31..6f26dbd22b35 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,9 +1,9 @@
-MD5 94eb9b180337dadfa9cde6ef3791aac8 opera-6.12.ebuild 3289
-MD5 ab2f350d77a1b062f053734086ceb4a3 opera-7.20_beta7.ebuild 2800
-MD5 b060229a0600c022164b782118244875 opera-7.11-r2.ebuild 3715
 MD5 d896aec4e385770cbf2d4b104037d4e9 ChangeLog 6004
-MD5 7bae5c1115cbae449099217feafc29f4 opera-6.12_beta1.ebuild 2448
-MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
+MD5 54efeb3848e20eaf47ec5edc90994796 opera-7.11-r2.ebuild 3718
+MD5 02f0ce8aa0a3eb1543ef947b276497ee opera-6.12.ebuild 3289
+MD5 c6e64334cd29288faa166e1d44a4db7c opera-7.20_beta7.ebuild 2801
+MD5 6a4b2402e4bb9f82a99ba80b11a4a7fa opera-6.12_beta1.ebuild 2450
 MD5 abbb8a4512000d2cc8b8b8fbda3ff1cd files/digest-opera-7.20_beta7 270
-MD5 fd6b6eba741abd18ba590e9a5c0f225f files/digest-opera-7.11-r2 177
+MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
 MD5 060858a4f81b92854de461ed0e1f955b files/digest-opera-6.12_beta1 90
+MD5 fd6b6eba741abd18ba590e9a5c0f225f files/digest-opera-7.11-r2 177
diff --git a/net-www/opera/opera-6.12.ebuild b/net-www/opera/opera-6.12.ebuild
index e14423a641bb..19b071db8300 100644
--- a/net-www/opera/opera-6.12.ebuild
+++ b/net-www/opera/opera-6.12.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-www/opera/opera-6.12.ebuild,v 1.2 2003/06/08 05:21:23 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-6.12.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
 #
 # 1. static       # Statically linked libraries, default.
 # 2. shared-2.95  # Dynamically linked libaries, compiled with gcc 2.95.
@@ -97,7 +97,7 @@ src_install() {
 	insinto /usr/share/icons /etc/X11/wmconfig /etc/X11/applnk/Internet \
 		/usr/share/pixmaps
 	doins images/opera.xpm
-	
+
 	# Install a symlink /usr/bin/opera
 	dodir /usr/bin
 	dosym /opt/opera/bin/opera /usr/bin/opera
diff --git a/net-www/opera/opera-6.12_beta1.ebuild b/net-www/opera/opera-6.12_beta1.ebuild
index b7770f50263a..e7a137e5f8cb 100644
--- a/net-www/opera/opera-6.12_beta1.ebuild
+++ b/net-www/opera/opera-6.12_beta1.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-www/opera/opera-6.12_beta1.ebuild,v 1.3 2003/08/24 16:21:28 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-6.12_beta1.ebuild,v 1.4 2003/09/06 01:54:09 msterret Exp $
 
 # Based on original Gentoo Techonologies opera ebuild
 # Modified by Gustavo Zacarias <gustavo at zacarias.com.ar> for sparc
@@ -73,7 +73,7 @@ src_install() {
 	insinto /usr/share/icons /etc/X11/wmconfig /etc/X11/applnk/Internet \
 		/usr/share/pixmaps
 	doins images/opera.xpm
-	
+
 	# Install a symlink /usr/bin/opera
 	dodir /usr/bin
 	dosym /opt/opera/bin/opera /usr/bin/opera
diff --git a/net-www/opera/opera-7.11-r2.ebuild b/net-www/opera/opera-7.11-r2.ebuild
index ccf4f8e6c4a1..9eb2905910d9 100644
--- a/net-www/opera/opera-7.11-r2.ebuild
+++ b/net-www/opera/opera-7.11-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-www/opera/opera-7.11-r2.ebuild,v 1.1 2003/08/06 14:25:12 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.11-r2.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 #
 # 1. static       # Statically linked libraries, default.
 # 2. shared-2.95  # Dynamically linked libaries, compiled with gcc 2.95.
@@ -115,7 +115,7 @@ src_install() {
 	insinto /usr/share/icons /etc/X11/wmconfig /etc/X11/applnk/Internet \
 		/usr/share/pixmaps
 	doins images/opera.xpm
-	
+
 	# Install a symlink /usr/bin/opera
 	dodir /usr/bin
 	dosym /opt/opera/bin/opera /usr/bin/opera
diff --git a/net-www/opera/opera-7.20_beta7.ebuild b/net-www/opera/opera-7.20_beta7.ebuild
index a0a2aafcc561..097b13006b17 100644
--- a/net-www/opera/opera-7.20_beta7.ebuild
+++ b/net-www/opera/opera-7.20_beta7.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-www/opera/opera-7.20_beta7.ebuild,v 1.1 2003/08/29 09:52:13 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.20_beta7.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 # Here, like in the other .ebuilds, the static version is
 # forced for simplicity's sake
@@ -90,7 +90,7 @@ src_install() {
 	insinto /usr/share/icons /etc/X11/wmconfig /etc/X11/applnk/Internet \
 		/usr/share/pixmaps
 	doins images/opera.xpm
-	
+
 	# Install a symlink /usr/bin/opera
 	dodir /usr/bin
 	dosym /opt/opera/bin/opera /usr/bin/opera
diff --git a/net-www/orion/Manifest b/net-www/orion/Manifest
index 80da5a391df4..3a0277c47206 100644
--- a/net-www/orion/Manifest
+++ b/net-www/orion/Manifest
@@ -1,15 +1,15 @@
-MD5 4f67d43e14e62b04c8b0565c92e2af45 orion-2.0.1.ebuild 3896
-MD5 a2f1c431bf2d20c8e5325ca2445132f8 orion-2.0.ebuild 4144
 MD5 5092780034a7bab1762eb07cd27670c9 ChangeLog 2139
+MD5 3b2701c1e7572875fb23cacc7855a9c4 orion-2.0.ebuild 4130
+MD5 6bd2bf0d4c447714186073e7d6d853c1 orion-2.0.1.ebuild 3882
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-orion-2.0 0
 MD5 5e78308ed1712b24bcced31b5097e7fc files/digest-orion-2.0.1 60
-MD5 99d60b743c40fea4429471c5a1b502c6 files/2.0/stop_orion.sh 198
+MD5 abd7c855a9b9601253916624d6f0e782 files/2.0/2.0-gentoo.patch 5301
 MD5 264ac50f5d433ec313d863caa12a4eef files/2.0/orion.conf 1487
 MD5 05683dc1a919c1b2bca1360075aaff0b files/2.0/orion.init 647
 MD5 597b32b44de6344c7e927531076c46c8 files/2.0/start_orion.sh 326
-MD5 abd7c855a9b9601253916624d6f0e782 files/2.0/2.0-gentoo.patch 5301
-MD5 d33133d6fb85ba4a025a6af3112aa29d files/2.0.1/stop_orion.sh 200
+MD5 99d60b743c40fea4429471c5a1b502c6 files/2.0/stop_orion.sh 198
 MD5 abd7c855a9b9601253916624d6f0e782 files/2.0.1/2.0.1-gentoo.patch 5301
 MD5 c714591e181f4eb185d46b6a601b15aa files/2.0.1/orion.conf 1489
 MD5 e8dbc8a78d28d140755498fbda9144eb files/2.0.1/orion.init 649
 MD5 5448a49bf848d0341fef868afcdf9717 files/2.0.1/start_orion.sh 328
+MD5 d33133d6fb85ba4a025a6af3112aa29d files/2.0.1/stop_orion.sh 200
diff --git a/net-www/orion/orion-2.0.1.ebuild b/net-www/orion/orion-2.0.1.ebuild
index f31751313ba9..66d880a06495 100644
--- a/net-www/orion/orion-2.0.1.ebuild
+++ b/net-www/orion/orion-2.0.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-www/orion/orion-2.0.1.ebuild,v 1.1 2003/05/01 17:50:29 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/orion-2.0.1.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${PN}
 
@@ -32,7 +32,7 @@ pkg_setup() {
 }
 
 src_install() {
-	
+
 	# CREATE DIRECTORIES
 	DIROPTIONS="--mode=0775 --owner=orion --group=orion"
 	dodir /opt/${PN}
@@ -47,7 +47,7 @@ src_install() {
 	insopts -o orion -g orion -m0750
 	doins ${FILESDIR}/${PV}/start_orion.sh
 	doins ${FILESDIR}/${PV}/stop_orion.sh
-	
+
 	cp -a ${FILESDIR}/${PV}/orion.init ${S}/orion
 	insinto /etc/init.d
 	insopts -m0750
@@ -72,7 +72,7 @@ src_install() {
 		cp -a ${i} ${D}/opt/${PN}/
 		chown -R orion.orion ${D}/opt/${PN}/${i}
 	done
-	
+
 	# INSTALL APP CONFIG
 	cd ${S}/config
 	local dirs="application.xml data-sources.xml database-schemas default-web-site.xml global-web-application.xml jms.xml mime.types principals.xml rmi.xml server.xml"
@@ -80,16 +80,16 @@ src_install() {
 		cp -a ${i} ${D}/opt/${PN}/config
 		chown -R orion.orion ${D}/opt/${PN}/config/${i}
 	done
-	
+
 	# INSTALL JARS
 	cd ${S}
 	for i in `ls *.jar` ; do
 		dojar $i
 	done
-	
+
 	# LINK IN SDK TOOLS.JAR
 	ln -s ${JAVA_HOME}/lib/tools.jar ${D}/usr/share/${PN}/lib/tools.jar
-	
+
 	# INSTALL DOCS
 	dodoc Readme.txt changes.txt
 }
@@ -136,6 +136,5 @@ pkg_postinst() {
 	einfo " may not get seen.  Thank you."
 	einfo " "
 	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-        sleep 10
-
+	sleep 10
 }
diff --git a/net-www/orion/orion-2.0.ebuild b/net-www/orion/orion-2.0.ebuild
index 9c5a1a4fcf26..2d30f48e576d 100644
--- a/net-www/orion/orion-2.0.ebuild
+++ b/net-www/orion/orion-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-www/orion/orion-2.0.ebuild,v 1.8 2003/04/06 08:52:22 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/orion/orion-2.0.ebuild,v 1.9 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${PN}
 
@@ -40,7 +40,7 @@ pkg_setup() {
 }
 
 src_install() {
-	
+
 	# CREATE DIRECTORIES
 	DIROPTIONS="--mode=0775 --owner=orion --group=orion"
 	dodir /opt/${PN}
@@ -55,7 +55,7 @@ src_install() {
 	insopts -o orion -g orion -m0750
 	doins ${FILESDIR}/${PV}/start_orion.sh
 	doins ${FILESDIR}/${PV}/stop_orion.sh
-	
+
 	cp -a ${FILESDIR}/${PV}/orion.init ${S}/orion
 	insinto /etc/init.d
 	insopts -m0750
@@ -80,7 +80,7 @@ src_install() {
 		cp -a ${i} ${D}/opt/${PN}/
 		chown -R orion.orion ${D}/opt/${PN}/${i}
 	done
-	
+
 	# INSTALL APP CONFIG
 	cd ${S}/config
 	local dirs="application.xml data-sources.xml database-schemas default-web-site.xml global-web-application.xml jms.xml mime.types principals.xml rmi.xml server.xml"
@@ -88,16 +88,16 @@ src_install() {
 		cp -a ${i} ${D}/opt/${PN}/config
 		chown -R orion.orion ${D}/opt/${PN}/config/${i}
 	done
-	
+
 	# INSTALL JARS
 	cd ${S}
 	for i in `ls *.jar` ; do
 		dojar $i
 	done
-	
+
 	# LINK IN SDK TOOLS.JAR
 	ln -s ${JAVA_HOME}/lib/tools.jar ${D}/usr/share/${PN}/lib/tools.jar
-	
+
 	# INSTALL DOCS
 	dodoc Readme.txt changes.txt
 }
@@ -144,6 +144,5 @@ pkg_postinst() {
 	einfo " may not get seen.  Thank you."
 	einfo " "
 	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-        sleep 10
-
+	sleep 10
 }
diff --git a/net-www/pcgi/Manifest b/net-www/pcgi/Manifest
index 35f4300d1f43..ae2e075b9726 100644
--- a/net-www/pcgi/Manifest
+++ b/net-www/pcgi/Manifest
@@ -1,4 +1,4 @@
-MD5 6cdcecf891e772282d2a8a46abcfb09b files/digest-pcgi-2.0_alpha5 137
 MD5 a9a81b1238fe4f4b931b16267ae2a5e2 ChangeLog 350
 MD5 60e3a7ee1268e32bce296a6076f736c6 metadata.xml 252
-MD5 dc13a37e12840bf2843959a16a5b50b5 pcgi-2.0_alpha5.ebuild 1607
+MD5 af216e4a02a49929bb4a46fa16f440fc pcgi-2.0_alpha5.ebuild 1600
+MD5 6cdcecf891e772282d2a8a46abcfb09b files/digest-pcgi-2.0_alpha5 137
diff --git a/net-www/pcgi/pcgi-2.0_alpha5.ebuild b/net-www/pcgi/pcgi-2.0_alpha5.ebuild
index 9c7f425a65d6..b35c2d119c69 100644
--- a/net-www/pcgi/pcgi-2.0_alpha5.ebuild
+++ b/net-www/pcgi/pcgi-2.0_alpha5.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-www/pcgi/pcgi-2.0_alpha5.ebuild,v 1.1 2003/08/15 06:13:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/pcgi/pcgi-2.0_alpha5.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 # this package is ONLY available inside the Zope tarball!!!
 ZOPE_PV=2.6.1
@@ -26,8 +26,8 @@ IUSE=""
 DEPEND="${DEPEND}
 		virtual/glibc"
 RDEPEND="${RDEPEND}
-		 virtual/glibc
-  		 virtual/python"
+	virtual/glibc
+	virtual/python"
 
 src_compile() {
 	econf || die "econf failed"
@@ -42,8 +42,8 @@ src_install() {
 	dosym /usr/bin/pcgi-wrapper${MY_PV} /usr/bin/pcgi-wrapper
 	dodoc MrCreosote/README.MrCreosote README Test/README.parseinfo
 	newdoc Util/README README.Util
-	dobin MrCreosote/pcgi-creosote MrCreosote/creosote.py 
-	dobin Util/killpcgi.py Util/pcgifile.py 
+	dobin MrCreosote/pcgi-creosote MrCreosote/creosote.py
+	dobin Util/killpcgi.py Util/pcgifile.py
 	dobin pcgi_publisher.py
 	newbin Test/parseinfo pcgi-parseinfo
 	cp -ra Example ${D}/usr/share/doc/${PF}/
diff --git a/net-www/phpBB/Manifest b/net-www/phpBB/Manifest
index 52889c08c24a..c5f5cda20ab0 100644
--- a/net-www/phpBB/Manifest
+++ b/net-www/phpBB/Manifest
@@ -1,7 +1,7 @@
+MD5 17ee618bb24b1c8d2838fe24bb17c3e6 ChangeLog 645
+MD5 367de159512ff7ee9576c4ffc5e7f4a7 phpBB-2.0.4.ebuild 1378
+MD5 e4ddb659d21c2306e4fd554e7df5be8e phpBB-2.0.5.ebuild 1343
+MD5 2d905c47d21cb4e527373be6485fbcfd phpBB-2.0.6.ebuild 1343
 MD5 1c9cf1de5be80b37285838551452ebf4 files/digest-phpBB-2.0.4 63
 MD5 b0e9ee3a18db6416eedbe05a7c409b36 files/digest-phpBB-2.0.5 63
 MD5 d8c04c96ab7db9b65effac516a92b8ae files/digest-phpBB-2.0.6 63
-MD5 bbb0796aef054fc603d2cf84cbd70a6c phpBB-2.0.4.ebuild 1389
-MD5 17ee618bb24b1c8d2838fe24bb17c3e6 ChangeLog 645
-MD5 0beb2c1a6742eda122ccea572bd91afb phpBB-2.0.5.ebuild 1354
-MD5 451bdb4047009eea20c1b9db4ccc4c7b phpBB-2.0.6.ebuild 1355
diff --git a/net-www/phpBB/phpBB-2.0.4.ebuild b/net-www/phpBB/phpBB-2.0.4.ebuild
index a674c478f77a..a83c20fdb457 100644
--- a/net-www/phpBB/phpBB-2.0.4.ebuild
+++ b/net-www/phpBB/phpBB-2.0.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tim Raedisch <tim.raedisch@udo.edu>
-# $Header: /var/cvsroot/gentoo-x86/net-www/phpBB/phpBB-2.0.4.ebuild,v 1.4 2003/08/04 01:11:40 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phpBB/phpBB-2.0.4.ebuild,v 1.5 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${PN}2
 DESCRIPTION="phpBB is a high powered, fully scalable, and highly customisable open-source bulletin board package."
@@ -32,9 +32,9 @@ pkg_setup() {
 	einfo "Installing for ${WEBAPP_SERVER}"
 }
 
-src_compile() {            
+src_compile() {
 	#we need to have this empty function ... default compile hangs
-	echo "Nothing to compile" 
+	echo "Nothing to compile"
 }
 
 src_install() {
diff --git a/net-www/phpBB/phpBB-2.0.5.ebuild b/net-www/phpBB/phpBB-2.0.5.ebuild
index e4351031f374..f418a366f8d9 100644
--- a/net-www/phpBB/phpBB-2.0.5.ebuild
+++ b/net-www/phpBB/phpBB-2.0.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tim Raedisch <tim.raedisch@udo.edu>
-# $Header: /var/cvsroot/gentoo-x86/net-www/phpBB/phpBB-2.0.5.ebuild,v 1.3 2003/08/04 01:11:40 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phpBB/phpBB-2.0.5.ebuild,v 1.4 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${PN}2
 DESCRIPTION="phpBB is a high powered, fully scalable, and highly customisable open-source bulletin board package."
@@ -30,9 +30,9 @@ pkg_setup() {
 	einfo "Installing for ${WEBAPP_SERVER}"
 }
 
-src_compile() {            
+src_compile() {
 	#we need to have this empty function ... default compile hangs
-	echo "Nothing to compile" 
+	echo "Nothing to compile"
 }
 
 src_install() {
diff --git a/net-www/phpBB/phpBB-2.0.6.ebuild b/net-www/phpBB/phpBB-2.0.6.ebuild
index ea1b63f1af6a..4c0bb6734d06 100644
--- a/net-www/phpBB/phpBB-2.0.6.ebuild
+++ b/net-www/phpBB/phpBB-2.0.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tim Raedisch <tim.raedisch@udo.edu>
-# $Header: /var/cvsroot/gentoo-x86/net-www/phpBB/phpBB-2.0.6.ebuild,v 1.1 2003/08/11 17:04:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phpBB/phpBB-2.0.6.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${PN}2
 DESCRIPTION="phpBB is a high powered, fully scalable, and highly customisable open-source bulletin board package."
@@ -30,9 +30,9 @@ pkg_setup() {
 	einfo "Installing for ${WEBAPP_SERVER}"
 }
 
-src_compile() {            
+src_compile() {
 	#we need to have this empty function ... default compile hangs
-	echo "Nothing to compile" 
+	echo "Nothing to compile"
 }
 
 src_install() {
diff --git a/net-www/phpwebsite/Manifest b/net-www/phpwebsite/Manifest
index 12a864c02d70..06588f266caf 100644
--- a/net-www/phpwebsite/Manifest
+++ b/net-www/phpwebsite/Manifest
@@ -1,6 +1,6 @@
 MD5 d61ae05e30538eafe2cb75e404378af7 ChangeLog 723
-MD5 d6224574a4b4b23d9b826bc54ca43050 phpwebsite-0.9.2_p1.ebuild 1587
-MD5 f78ce500c486eddf324b46c9c6f02aa1 phpwebsite-0.9.3.ebuild 1720
+MD5 4aa83925cba13dba201a9c13a6877655 phpwebsite-0.9.2_p1.ebuild 1574
+MD5 d8e5366325f56f083b2e2286b15ab322 phpwebsite-0.9.3.ebuild 1710
 MD5 fde7b154e72c957aa19f194caf666668 phpwebsite-0.9.3_p1.ebuild 1743
 MD5 f0ab7279c69a8f1522e8a4eb3ac7cc18 files/digest-phpwebsite-0.9.2_p1 76
 MD5 48b9aff37ab682ee582b5bc49d0f8af3 files/digest-phpwebsite-0.9.3 74
diff --git a/net-www/phpwebsite/phpwebsite-0.9.2_p1.ebuild b/net-www/phpwebsite/phpwebsite-0.9.2_p1.ebuild
index fc1a6896e32f..6a1ff6ae14d5 100644
--- a/net-www/phpwebsite/phpwebsite-0.9.2_p1.ebuild
+++ b/net-www/phpwebsite/phpwebsite-0.9.2_p1.ebuild
@@ -24,8 +24,8 @@ HTTPD_USER="apache"
 HTTPD_GROUP="apache"
 
 
-src_compile() {            
-	echo "Nothing to compile" 
+src_compile() {
+	echo "Nothing to compile"
 }
 
 src_install() {
diff --git a/net-www/phpwebsite/phpwebsite-0.9.3.ebuild b/net-www/phpwebsite/phpwebsite-0.9.3.ebuild
index 28de39348013..1bb84ab544fe 100644
--- a/net-www/phpwebsite/phpwebsite-0.9.3.ebuild
+++ b/net-www/phpwebsite/phpwebsite-0.9.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Don Seiler <rizzo@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/phpwebsite-0.9.3.ebuild,v 1.2 2003/07/18 17:15:50 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/phpwebsite-0.9.3.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
 
 
 HOSTNAME=`hostname`
@@ -24,8 +24,8 @@ HTTPD_USER="apache"
 HTTPD_GROUP="apache"
 
 
-src_compile() {            
-	echo "Nothing to compile" 
+src_compile() {
+	echo "Nothing to compile"
 }
 
 src_install() {
diff --git a/net-www/plb/Manifest b/net-www/plb/Manifest
index ef2f0337c3a9..a66685612528 100644
--- a/net-www/plb/Manifest
+++ b/net-www/plb/Manifest
@@ -1,5 +1,5 @@
 MD5 12dc6c5912233973f91469878f10eeb1 ChangeLog 353
+MD5 e7300a135bc6332d963fd4d1bde7af57 plb-0.3.ebuild 984
+MD5 e9b720f638fa4922636a7b21acd816c3 files/digest-plb-0.3 59
 MD5 55e53cfddf06cc8f514a175581cc09bd files/plb.conf 2428
 MD5 7967e63147b9c188dc548f976dc3bb9e files/plb.rc6 400
-MD5 e9b720f638fa4922636a7b21acd816c3 files/digest-plb-0.3 59
-MD5 1b417aaa7b6a79a508078ad38cfb3986 plb-0.3.ebuild 982
diff --git a/net-www/plb/plb-0.3.ebuild b/net-www/plb/plb-0.3.ebuild
index 8bfbed4f5a04..3bced74957d4 100644
--- a/net-www/plb/plb-0.3.ebuild
+++ b/net-www/plb/plb-0.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-www/plb/plb-0.3.ebuild,v 1.2 2003/07/13 21:44:10 aliz Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/plb/plb-0.3.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
 
 DESCRIPTION="A free high-performance HTTP load balancer"
 SRC_URI="http://plb.sunsite.dk/files/${P}.tar.gz"
@@ -14,7 +14,7 @@ IUSE=""
 DEPEND="virtual/glibc
 	>=dev-libs/libevent-0.6"
 
-src_compile() {	
+src_compile() {
 	econf || die
 	emake || die "compile problem"
 }
diff --git a/net-www/prozilla/Manifest b/net-www/prozilla/Manifest
index c4dd6249f1c5..b93ab1361c3f 100644
--- a/net-www/prozilla/Manifest
+++ b/net-www/prozilla/Manifest
@@ -1,11 +1,11 @@
+MD5 cca4f6909c34fd9bb6bd9031c416ceba ChangeLog 2302
+MD5 35ce46899c27d4bb684899f1598f1703 prozilla-1.3.5.1.ebuild 744
+MD5 9933c99d528a249be0bf087ed96c8410 prozilla-1.3.5.2.ebuild 744
+MD5 ace1b23ff4bd34dfe6776a41228fd0a4 prozilla-1.3.5.ebuild 742
+MD5 d707e9dc43c848bf9664d6a8a6b6390f prozilla-1.3.6-r1.ebuild 820
+MD5 96931ef3e7796ae3da7f3e74c224f0a7 prozilla-1.3.6.ebuild 821
 MD5 d66873d266624dc9df21271f2b2cd682 files/digest-prozilla-1.3.5 66
 MD5 eabe8d579081ee747279784241dffb8c files/digest-prozilla-1.3.5.1 68
 MD5 9fcec72d2be10b8d8a5a989e78123c28 files/digest-prozilla-1.3.5.2 68
 MD5 c8bbedfd3f66bb40148bd98b012db53f files/digest-prozilla-1.3.6 66
 MD5 c8bbedfd3f66bb40148bd98b012db53f files/digest-prozilla-1.3.6-r1 66
-MD5 9d84ffb60cbe2788fab6a75754e368eb prozilla-1.3.5.1.ebuild 754
-MD5 772394008d4e67d452c03d0c0bf453a5 prozilla-1.3.5.2.ebuild 754
-MD5 03f19bbae7ed3c109a9e3ae16acf0937 prozilla-1.3.5.ebuild 752
-MD5 c45fd847369407e253bdfb3211a25f8f prozilla-1.3.6-r1.ebuild 820
-MD5 02ad493b49cc4f6ffa3332cc92cdfff7 prozilla-1.3.6.ebuild 822
-MD5 cca4f6909c34fd9bb6bd9031c416ceba ChangeLog 2302
diff --git a/net-www/prozilla/prozilla-1.3.5.1.ebuild b/net-www/prozilla/prozilla-1.3.5.1.ebuild
index 888e872c9798..bb5636ed5132 100644
--- a/net-www/prozilla/prozilla-1.3.5.1.ebuild
+++ b/net-www/prozilla/prozilla-1.3.5.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-www/prozilla/prozilla-1.3.5.1.ebuild,v 1.13 2003/02/13 15:42:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/prozilla/prozilla-1.3.5.1.ebuild,v 1.14 2003/09/06 01:54:09 msterret Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A download manager"
@@ -14,12 +14,12 @@ DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.2"
 
 src_compile() {
-    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} --sysconfdir=/etc
-    try make
+	try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} --sysconfdir=/etc
+	try make
 }
 
 src_install () {
-    try make DESTDIR=${D} install
+	try make DESTDIR=${D} install
 
-    dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO
+	dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO
 }
diff --git a/net-www/prozilla/prozilla-1.3.5.2.ebuild b/net-www/prozilla/prozilla-1.3.5.2.ebuild
index f1eb22a66d3d..36349c7e2a47 100644
--- a/net-www/prozilla/prozilla-1.3.5.2.ebuild
+++ b/net-www/prozilla/prozilla-1.3.5.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-www/prozilla/prozilla-1.3.5.2.ebuild,v 1.13 2003/02/13 15:42:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/prozilla/prozilla-1.3.5.2.ebuild,v 1.14 2003/09/06 01:54:09 msterret Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A download manager"
@@ -14,12 +14,12 @@ DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.2"
 
 src_compile() {
-    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} --sysconfdir=/etc
-    try make
+	try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} --sysconfdir=/etc
+	try make
 }
 
 src_install () {
-    try make DESTDIR=${D} install
+	try make DESTDIR=${D} install
 
-    dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO
+	dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO
 }
diff --git a/net-www/prozilla/prozilla-1.3.5.ebuild b/net-www/prozilla/prozilla-1.3.5.ebuild
index 704d959b4895..ab33f1bf2e55 100644
--- a/net-www/prozilla/prozilla-1.3.5.ebuild
+++ b/net-www/prozilla/prozilla-1.3.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-www/prozilla/prozilla-1.3.5.ebuild,v 1.13 2003/02/13 15:42:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/prozilla/prozilla-1.3.5.ebuild,v 1.14 2003/09/06 01:54:09 msterret Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A download manager"
@@ -14,12 +14,12 @@ DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.2"
 
 src_compile() {
-    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} --sysconfdir=/etc
-    try make
+	try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} --sysconfdir=/etc
+	try make
 }
 
 src_install () {
-    try make DESTDIR=${D} install
+	try make DESTDIR=${D} install
 
-    dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO
+	dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO
 }
diff --git a/net-www/prozilla/prozilla-1.3.6-r1.ebuild b/net-www/prozilla/prozilla-1.3.6-r1.ebuild
index 62492c861e10..ad9bc41911d5 100644
--- a/net-www/prozilla/prozilla-1.3.6-r1.ebuild
+++ b/net-www/prozilla/prozilla-1.3.6-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-www/prozilla/prozilla-1.3.6-r1.ebuild,v 1.9 2003/02/13 15:42:57 vapier Exp $
+#$Header: /var/cvsroot/gentoo-x86/net-www/prozilla/prozilla-1.3.6-r1.ebuild,v 1.10 2003/09/06 01:54:09 msterret Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A download manager"
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 DEPEND="virtual/glibc >=sys-libs/ncurses-5.2"
 
 src_compile() {
-    ./configure --prefix=/usr \
+	./configure --prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		--host=${CHOST} \
diff --git a/net-www/prozilla/prozilla-1.3.6.ebuild b/net-www/prozilla/prozilla-1.3.6.ebuild
index 78dc2cda622e..2d3293083996 100644
--- a/net-www/prozilla/prozilla-1.3.6.ebuild
+++ b/net-www/prozilla/prozilla-1.3.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-www/prozilla/prozilla-1.3.6.ebuild,v 1.12 2003/02/13 15:43:03 vapier Exp $
+#$Header: /var/cvsroot/gentoo-x86/net-www/prozilla/prozilla-1.3.6.ebuild,v 1.13 2003/09/06 01:54:09 msterret Exp $
 
 S="${WORKDIR}/${P}"
 DESCRIPTION="A download manager"
@@ -14,7 +14,7 @@ DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.2"
 
 src_compile() {
-    ./configure --prefix=/usr \
+	./configure --prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		--host=${CHOST} \
diff --git a/net-www/publicfile/Manifest b/net-www/publicfile/Manifest
index f99dcff2d38b..ee70c44458e8 100644
--- a/net-www/publicfile/Manifest
+++ b/net-www/publicfile/Manifest
@@ -1,3 +1,3 @@
 MD5 da8d99bda02b7af73e24a387a8e18a77 ChangeLog 922
-MD5 c9717845327ac1871a6277c36b987338 publicfile-0.52.ebuild 1433
+MD5 f51b74cdfd1e7285b5f29fed6ff66b48 publicfile-0.52.ebuild 1416
 MD5 47e5a95f216722242ffb60588a0a821e files/digest-publicfile-0.52 66
diff --git a/net-www/publicfile/publicfile-0.52.ebuild b/net-www/publicfile/publicfile-0.52.ebuild
index c09031a29b97..87cc41834194 100644
--- a/net-www/publicfile/publicfile-0.52.ebuild
+++ b/net-www/publicfile/publicfile-0.52.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-www/publicfile/publicfile-0.52.ebuild,v 1.11 2003/03/25 15:08:47 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/publicfile/publicfile-0.52.ebuild,v 1.12 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="publish files through FTP and HTTP"
@@ -18,11 +18,11 @@ src_compile() {
 	echo "gcc ${CFLAGS}" > conf-cc
 	echo "gcc" > conf-ld
 	echo "/usr" > conf-home
-    
-    # fix for glibc-2.3.2 errno issue
+
+	# fix for glibc-2.3.2 errno issue
 	mv error.h error.h.orig
 	sed -e 's|extern int errno;|#include <errno.h>|' <error.h.orig >error.h
-    
+
 	emake || die "emake failed"
 }
 
@@ -49,5 +49,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-        userdel ftplog
+	userdel ftplog
 }
diff --git a/net-www/resin-ee/Manifest b/net-www/resin-ee/Manifest
index a949bfe362b9..c8370881ff1c 100644
--- a/net-www/resin-ee/Manifest
+++ b/net-www/resin-ee/Manifest
@@ -1,7 +1,7 @@
+MD5 83cb5791ec4d26d0c18f16ff348935e8 ChangeLog 957
+MD5 b416773a6633b42bc18d75d9c33f88c5 resin-ee-2.1.9.ebuild 3607
+MD5 36fc2b396b7ee1ff19c9c65c296cf9e4 files/digest-resin-ee-2.1.9 67
 MD5 1c1140a92a4daa0feef70b2b91618670 files/2.1.9/resin.conf 1246
 MD5 a810be4b68e920ebc5d2cf8160a5642a files/2.1.9/21resin 53
 MD5 cc895b3b901369aa2c6d80fb88369113 files/2.1.9/resin-ee.diff 504
 MD5 8c9c3995f7845529f6f12365f9644263 files/2.1.9/resin.init 809
-MD5 36fc2b396b7ee1ff19c9c65c296cf9e4 files/digest-resin-ee-2.1.9 67
-MD5 83cb5791ec4d26d0c18f16ff348935e8 ChangeLog 957
-MD5 9ad143de80aa889896c0a0f1b22dbcb7 resin-ee-2.1.9.ebuild 3623
diff --git a/net-www/resin-ee/resin-ee-2.1.9.ebuild b/net-www/resin-ee/resin-ee-2.1.9.ebuild
index 5e2c334766df..a7b5e822e04c 100644
--- a/net-www/resin-ee/resin-ee-2.1.9.ebuild
+++ b/net-www/resin-ee/resin-ee-2.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/resin-ee/resin-ee-2.1.9.ebuild,v 1.2 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/resin-ee/resin-ee-2.1.9.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
 
 inherit java-pkg
 
@@ -25,44 +25,44 @@ pkg_setup() {
 
 src_compile() {
 	epatch ${FILESDIR}/${PV}/${PN}.diff
-} 
+}
 
 src_install() {
 	cd ${S}
 	RESIN_HOME="/opt/resin"
 	INSTALLING="yes"
 	DIROPTIONS="--mode=0775 --owner=resin --group=resin"
-	
+
 	# Create directories
 	dodir ${RESIN_HOME}
 	dodir /var/log/resin
 	dosym /var/log/resin ${RESIN_HOME}/logs
 	touch ${D}/var/log/resin/.keep
-	
+
 	# INIT SCRIPTS AND ENV
-	
+
 	cp -a ${FILESDIR}/${PV}/resin.init ${S}/resin
 	insinto /etc/init.d
 	insopts -m0750
 	doins ${S}/resin
-	
+
 	cp -a ${FILESDIR}/${PV}/resin.conf ${S}/resin
 	insinto /etc/conf.d
 	insopts -m0755
 	doins ${S}/resin
-	
+
 	cp -a ${FILESDIR}/${PV}/21resin ${S}/21resin
 	insinto /etc/env.d
 	insopts -m0755
 	doins ${S}/21resin
-	
+
 	chown -R resin.resin ${S}
-	
+
 	dodir /opt/resin || die
 	dodoc LICENSE readme.txt
-	
+
 	java-pkg_dojar lib/*.jar
-	
+
 	cp -Rdp \
 		bin \
 		doc \
@@ -70,9 +70,9 @@ src_install() {
 		contrib \
 		webapps \
 		xsl \
-	${D}${RESIN_HOME} || die  
+	${D}${RESIN_HOME} || die
 	dosym /usr/share/${PN}/lib ${RESIN_HOME}/lib
-	
+
 	dodir /etc/env.d
 	insinto /etc/env.d
 	doins ${FILESDIR}/${PV}/21resin
@@ -119,7 +119,7 @@ pkg_postinst() {
 	einfo " may not get seen.  Thank you."
 	einfo " "
 	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-        sleep 10
+	sleep 10
 
 }
 
diff --git a/net-www/resin/Manifest b/net-www/resin/Manifest
index f457a595512d..e08f4b9e1df6 100644
--- a/net-www/resin/Manifest
+++ b/net-www/resin/Manifest
@@ -1,7 +1,7 @@
+MD5 42b2aaf3c596fcdc3b1b353874ad1f9a ChangeLog 758
+MD5 46dfd467ac9de5b2fa09eb251167b2ec resin-2.1.9.ebuild 3537
+MD5 5837c42d665786c9555b544428725ff6 files/digest-resin-2.1.9 64
 MD5 61545d3923eb43c48bd061ab224875d3 files/2.1.9/resin.conf 1237
 MD5 a810be4b68e920ebc5d2cf8160a5642a files/2.1.9/21resin 53
 MD5 cc895b3b901369aa2c6d80fb88369113 files/2.1.9/resin.diff 504
 MD5 c8ceba3ae7f7021c9357703d4e0605e7 files/2.1.9/resin.init 773
-MD5 5837c42d665786c9555b544428725ff6 files/digest-resin-2.1.9 64
-MD5 42b2aaf3c596fcdc3b1b353874ad1f9a ChangeLog 758
-MD5 68e05e2e009d41e983fe1a8bfa633bd1 resin-2.1.9.ebuild 3554
diff --git a/net-www/resin/resin-2.1.9.ebuild b/net-www/resin/resin-2.1.9.ebuild
index af7e431feb94..8990a4fd57de 100644
--- a/net-www/resin/resin-2.1.9.ebuild
+++ b/net-www/resin/resin-2.1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/resin/resin-2.1.9.ebuild,v 1.4 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/resin/resin-2.1.9.ebuild,v 1.5 2003/09/06 01:54:09 msterret Exp $
 
 inherit java-pkg
 
@@ -25,44 +25,44 @@ pkg_setup() {
 
 src_compile() {
 	epatch ${FILESDIR}/${PV}/${PN}.diff
-} 
+}
 
 src_install() {
 	cd ${S}
 	RESIN_HOME="/opt/resin"
 	INSTALLING="yes"
 	DIROPTIONS="--mode=0775 --owner=resin --group=resin"
-	
+
 	# Create directories
 	dodir ${RESIN_HOME}
 	dodir /var/log/${PN}
 	dosym /var/log/${PN} ${RESIN_HOME}/logs
 	touch ${D}/var/log/${PN}/.keep
-	
+
 	# INIT SCRIPTS AND ENV
-	
+
 	cp -a ${FILESDIR}/${PV}/resin.init ${S}/resin
 	insinto /etc/init.d
 	insopts -m0750
 	doins ${S}/resin
-	
+
 	cp -a ${FILESDIR}/${PV}/resin.conf ${S}/resin
 	insinto /etc/conf.d
 	insopts -m0755
 	doins ${S}/resin
-	
+
 	cp -a ${FILESDIR}/${PV}/21resin ${S}/21resin
 	insinto /etc/env.d
 	insopts -m0755
 	doins ${S}/21resin
-	
+
 	chown -R resin.resin ${S}
-	
+
 	dodir /opt/resin || die
 	dodoc LICENSE readme.txt
-	
+
 	java-pkg_dojar lib/*.jar
-	
+
 	cp -Rdp \
 		bin \
 		doc \
@@ -70,9 +70,9 @@ src_install() {
 		contrib \
 		webapps \
 		xsl \
-	${D}${RESIN_HOME} || die  
+	${D}${RESIN_HOME} || die
 	dosym /usr/share/${PN}/lib ${RESIN_HOME}/lib
-	
+
 	dodir /etc/env.d
 	insinto /etc/env.d
 	doins ${FILESDIR}/${PV}/21resin
@@ -116,8 +116,7 @@ pkg_postinst() {
 	einfo " may not get seen.  Thank you."
 	einfo " "
 	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-        sleep 10
-
+	sleep 10
 }
 
 pkg_postrm() {
diff --git a/net-www/screem/Manifest b/net-www/screem/Manifest
index d2af012a9af1..3e57d0231b54 100644
--- a/net-www/screem/Manifest
+++ b/net-www/screem/Manifest
@@ -1,8 +1,8 @@
+MD5 4cdcd931b4f3c9fc3313cd899dddd3d6 ChangeLog 2082
+MD5 c05146c6402070fd7c300184b83a84c8 screem-0.4.1-r2.ebuild 1973
+MD5 b8efc1e1bacc56754bcc0c356cb6f32c screem-0.6.0.ebuild 1445
+MD5 e29d449a1af72110058f08442939f248 screem-0.6.2.ebuild 1560
 MD5 910ae14270c4e3e0629cda3cbf869405 files/Makefile.in 6577
 MD5 c0014bc2b1634015fdf4186f2d5311f2 files/digest-screem-0.4.1-r2 65
 MD5 d3ccd218010b7dbf41ca451d32bba29c files/digest-screem-0.6.0 65
 MD5 3beed928c0c988ad2b67a66d15754376 files/digest-screem-0.6.2 65
-MD5 c05146c6402070fd7c300184b83a84c8 screem-0.4.1-r2.ebuild 1973
-MD5 4cdcd931b4f3c9fc3313cd899dddd3d6 ChangeLog 2082
-MD5 56325a32ff95efee6605ae5ea21cc679 screem-0.6.0.ebuild 1446
-MD5 6091ad50ac50e7fb3970d60682f32f86 screem-0.6.2.ebuild 1565
diff --git a/net-www/screem/screem-0.6.0.ebuild b/net-www/screem/screem-0.6.0.ebuild
index d73a978f65d8..d8092d0415a1 100644
--- a/net-www/screem/screem-0.6.0.ebuild
+++ b/net-www/screem/screem-0.6.0.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-www/screem/screem-0.6.0.ebuild,v 1.5 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/screem/screem-0.6.0.ebuild,v 1.6 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="ssl zlib"
 
@@ -37,14 +37,14 @@ DEPEND="${RDEPEND}
 src_compile() {
 
 	local myconf=""
-	
-	
+
+
 	use ssl && myconf="$myconf --with-ssl"
-	
+
 	use zlib || myconf="$myconf --without-zlib"
 
 	econf ${myconf} || die "Configuration Failure"
-	
+
 	emake || die "Compilation Failure"
 }
 
@@ -53,6 +53,6 @@ src_install () {
 	make DESTDIR=${D} install
 
 #	einstall || die "Installation Failure"
-	
+
 	dodoc ABOUT-NLS AUTHORS BUGS ChangeLog INSTALL NEWS README TODO
 }
diff --git a/net-www/screem/screem-0.6.2.ebuild b/net-www/screem/screem-0.6.2.ebuild
index 39e29a9bc735..51315bd842c9 100644
--- a/net-www/screem/screem-0.6.2.ebuild
+++ b/net-www/screem/screem-0.6.2.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-www/screem/screem-0.6.2.ebuild,v 1.5 2003/07/09 17:40:59 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/screem/screem-0.6.2.ebuild,v 1.6 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="ssl zlib"
 
@@ -30,21 +30,21 @@ RDEPEND=">=gnome-base/libgnome-2.0.2
 	app-text/scrollkeeper
 	ssl? ( dev-libs/openssl )
 	zlib? ( sys-libs/zlib )"
-	
+
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_compile() {
 
 	local myconf=""
-	
-	
+
+
 	use ssl && myconf="$myconf --with-ssl"
-	
+
 	use zlib || myconf="$myconf --without-zlib"
 
 	econf ${myconf} || die "Configuration Failure"
-	
+
 	emake || die "Compilation Failure"
 }
 
@@ -53,7 +53,7 @@ src_install () {
 	make DESTDIR=${D} install
 
 #	einstall || die "Installation Failure"
-	
+
 	dodoc ABOUT-NLS AUTHORS BUGS ChangeLog INSTALL NEWS README TODO
 
 	einfo "If you want to have http and WebDAV support you should"
diff --git a/net-www/squid/Manifest b/net-www/squid/Manifest
index 77c39b4f4d32..da19245ab76e 100644
--- a/net-www/squid/Manifest
+++ b/net-www/squid/Manifest
@@ -1,3 +1,6 @@
+MD5 021a84d4179b2f5b7e81d26905562162 ChangeLog 3911
+MD5 23e3312058fbdd7661ff20bb234dedcd squid-2.4.7.ebuild 3503
+MD5 4c07223b8c83f25398383f3757db0411 squid-2.5.3.ebuild 4921
 MD5 bb029026a8d6bd24efd9086a2f3e959e files/digest-squid-2.4.7 74
 MD5 626914d5b07105602773bf8a1534a3ae files/squid-2.4.7-debian.diff 12078
 MD5 60b9ab4d53c4485a214baa7c8f9a2cc0 files/squid-2.4.7-gentoo.diff 1828
@@ -7,6 +10,3 @@ MD5 c91a09e06237e673a07ec28364f3e0e1 files/squid.pam 506
 MD5 cdb6c071e42e7f98cc28972c9629b83f files/squid.rc6 1868
 MD5 6658bb10c03cd2940380d3358c2d8eef files/digest-squid-2.5.3 71
 MD5 0c7867dce4b8bef078a93bf717196b0e files/squid-2.5.3-gentoo.diff 11534
-MD5 23e3312058fbdd7661ff20bb234dedcd squid-2.4.7.ebuild 3503
-MD5 021a84d4179b2f5b7e81d26905562162 ChangeLog 3911
-MD5 2ef424001cce3bc792a2ee733096ca6d squid-2.5.3.ebuild 4920
diff --git a/net-www/squid/squid-2.5.3.ebuild b/net-www/squid/squid-2.5.3.ebuild
index 2008abd6a721..2ccf62f0e71c 100644
--- a/net-www/squid/squid-2.5.3.ebuild
+++ b/net-www/squid/squid-2.5.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-www/squid/squid-2.5.3.ebuild,v 1.6 2003/08/03 04:26:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.5.3.ebuild,v 1.7 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="pam ldap ssl sasl snmp debug"
 
@@ -113,7 +113,7 @@ src_compile() {
 	mv include/autoconf.h include/autoconf.h.orig
 	sed -e "s:^#define SQUID_MAXFD.*:#define SQUID_MAXFD 4096:" \
 		include/autoconf.h.orig > include/autoconf.h
-	
+
 	if [ "${ARCH}" = "hppa" ]
 	then
 		mv include/autoconf.h include/autoconf.h.orig
diff --git a/net-www/squidalyser/Manifest b/net-www/squidalyser/Manifest
index 04e240786f0d..fdc990b8654a 100644
--- a/net-www/squidalyser/Manifest
+++ b/net-www/squidalyser/Manifest
@@ -1,3 +1,3 @@
-MD5 4f1639f87240e891fee9650bce40b831 files/digest-squidalyser-0.2.55 145
-MD5 ed4acde89a199c0044c1ba04863507a1 squidalyser-0.2.55.ebuild 2746
 MD5 8ab371fbcf98e9f658d45ce687f4d546 ChangeLog 641
+MD5 cd21c53079a05e7803efab53b11175c2 squidalyser-0.2.55.ebuild 2735
+MD5 4f1639f87240e891fee9650bce40b831 files/digest-squidalyser-0.2.55 145
diff --git a/net-www/squidalyser/squidalyser-0.2.55.ebuild b/net-www/squidalyser/squidalyser-0.2.55.ebuild
index e41c5dadba21..0ae99c666870 100644
--- a/net-www/squidalyser/squidalyser-0.2.55.ebuild
+++ b/net-www/squidalyser/squidalyser-0.2.55.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-www/squidalyser/squidalyser-0.2.55.ebuild,v 1.5 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/squidalyser/squidalyser-0.2.55.ebuild,v 1.6 2003/09/06 01:54:09 msterret Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ RDEPEND="net-www/squid
 	dev-db/mysql
 	net-www/apache
 	net-www/squid"
-	
+
 DEPEND="${RDEPEND}"
 
 src_unpack() {
@@ -40,26 +40,26 @@ src_unpack() {
 }
 
 src_install() {
-	
+
 	# Create a user directory for squidalyser. Put the squidparse and sql scripts into it
 	dodir /usr/share/squidalyser/squidparse
 	cp ${S}/squidparse/squidparse.pl ${D}/usr/share/squidalyser/squidparse/squidparse.pl
 	dodir /etc/squidalyser
 	cp ${S}/squidparse/squidalyser.conf ${D}/etc/squidalyser/squidalyser.conf
-	
+
 	dodir /usr/share/squidalyser/sql
 	cp ${S}/sql/* ${D}/usr/share/squidalyser/sql
 	dodir /usr/share/squidalyser/docs
 	cp ${S}/docs/* ${D}/usr/share/squidalyser/docs
-	
+
 	# Put the apache scripts under the apache directory
 	chown apache ${S}/cgi-bin/*
 	chmod 755 ${S}/cgi-bin/*
-	
+
 	dodir /home/httpd/cgi-bin
 	cp ${S}/cgi-bin/* ${D}/home/httpd/cgi-bin
 	dodir /home/httpd/icons
-	cp ${S}/icons/* ${D}/home/httpd/icons 	
+	cp ${S}/icons/* ${D}/home/httpd/icons
 }
 
 pkg_preinst() {
@@ -79,23 +79,23 @@ pkg_postinst() {
 	ewarn "configure mysql"
 	mysql --execute="drop database squid"
 	mysql --execute="create database squid"
-	mysql --execute="grant all privileges on squid.* to squidalyser@localhost identified by 'tr!red$';" 
+	mysql --execute="grant all privileges on squid.* to squidalyser@localhost identified by 'tr!red$';"
 	mysql squid < /usr/share/squidalyser/sql/squidalyser.sql
 	mysql squid --execute="delete from logfile"
-				
+
 	ewarn "update crontab"
 	# Update the crontab for the squidparse routine
 	spcount=`grep -c squidparse.pl /etc/crontab`
-	if [ ${spcount} -gt 1 ] 
+	if [ ${spcount} -gt 1 ]
 	then
 		ewarn "More than one entry in /etc/crontab. Please check."
-	elif [ ${spcount} -eq 1 ] 
+	elif [ ${spcount} -eq 1 ]
 	then
 		ewarn "squidparse.pl entry already in /etc/crontab, leaving alone"
 	else
 		echo "0 3  * * *      root    /usr/share/squidalyser/squidparse/squidparse.pl" >> /etc/crontab
 	fi
-	
+
 	ewarn "Running squidparse for first time, this may take several minutes"
 	/usr/share/squidalyser/squidparse/squidparse.pl
 }
diff --git a/net-www/surfraw/Manifest b/net-www/surfraw/Manifest
index c3ce91ac925d..f547ae6bd2b1 100644
--- a/net-www/surfraw/Manifest
+++ b/net-www/surfraw/Manifest
@@ -1,3 +1,3 @@
 MD5 90232bdf6291a6247d7f64ba376dd814 ChangeLog 554
-MD5 d43bb700a2a78176f99c6a499045476b surfraw-1.0.7.ebuild 1542
+MD5 090025bfca1e5f1e3b5c443566b29b11 surfraw-1.0.7.ebuild 1325
 MD5 0c4863c95791bde92743f7f48a1eaef8 files/digest-surfraw-1.0.7 64
diff --git a/net-www/surfraw/surfraw-1.0.7.ebuild b/net-www/surfraw/surfraw-1.0.7.ebuild
index e54acdd0e338..ac4ee67c9f6e 100644
--- a/net-www/surfraw/surfraw-1.0.7.ebuild
+++ b/net-www/surfraw/surfraw-1.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-www/surfraw/surfraw-1.0.7.ebuild,v 1.5 2003/02/13 15:44:33 vapier Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/net-www/surfraw/surfraw-1.0.7.ebuild,v 1.6 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A fast unix command line interface to WWW"
@@ -12,34 +12,34 @@ KEYWORDS="x86 sparc "
 
 
 src_compile() {
-        ./configure \
-                --prefix=/usr \
-                --sysconfdir=/etc \
-                --host=${CHOST} || die "./configure failed"                     
-              emake || die "make failed"
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--host=${CHOST} || die "./configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
-        einstall || die "make install failed"
-        dodoc README HACKING COPYING
+	einstall || die "make install failed"
+	dodoc README HACKING COPYING
 }
 
 pkg_postinst() {
-        einfo 
-        einfo "You can get a list of installed elvi by just typing 'surfraw' "
-        einfo
-        einfo "You can try some searches, for example:"
-        einfo "$ ask why is jeeves gay? "
-        einfo "$ google -results=100 RMS, GNU, which is sinner, which is sin?"
-        einfo "$ rhyme -method=perfect Julian"
-        einfo
-        einfo "The system configuration file is /etc/surfraw.conf"
-        einfo
-        einfo "Users can specify preferences in '~/.surfraw.conf'  e.g."
-        einfo "SURFRAW_graphical_broswer=mozilla"
-        einfo "SURFRAW_text_browser=w3m"
-        einfo "SURFRAW_graphical=no"
-        einfo
-        einfo "surfraw works with any graphical and/or text WWW browser" 
-        einfo
+	einfo
+	einfo "You can get a list of installed elvi by just typing 'surfraw' "
+	einfo
+	einfo "You can try some searches, for example:"
+	einfo "$ ask why is jeeves gay? "
+	einfo "$ google -results=100 RMS, GNU, which is sinner, which is sin?"
+	einfo "$ rhyme -method=perfect Julian"
+	einfo
+	einfo "The system configuration file is /etc/surfraw.conf"
+	einfo
+	einfo "Users can specify preferences in '~/.surfraw.conf'  e.g."
+	einfo "SURFRAW_graphical_broswer=mozilla"
+	einfo "SURFRAW_text_browser=w3m"
+	einfo "SURFRAW_graphical=no"
+	einfo
+	einfo "surfraw works with any graphical and/or text WWW browser"
+	einfo
 }
diff --git a/net-www/swish-e/Manifest b/net-www/swish-e/Manifest
index 1f49f26273cb..e958e011015f 100644
--- a/net-www/swish-e/Manifest
+++ b/net-www/swish-e/Manifest
@@ -1,5 +1,5 @@
 MD5 763f3cd4e8edaee4b1e68790a1d6adca ChangeLog 554
-MD5 98036eccb4bba38d69498d0df839c8cc swish-e-2.2.2.ebuild 629
-MD5 4c99cbff0dc4ae490180ed0a6ff95e66 swish-e-2.2.2-r1.ebuild 931
+MD5 c9780428d50ea0f23f06f89057d3ae3c swish-e-2.2.2.ebuild 625
+MD5 7d729e53ff7302ca508604a9e78cf81c swish-e-2.2.2-r1.ebuild 928
 MD5 fc5a8d65b3761bfbd7f7744fda4c324e files/digest-swish-e-2.2.2 65
 MD5 fc5a8d65b3761bfbd7f7744fda4c324e files/digest-swish-e-2.2.2-r1 65
diff --git a/net-www/swish-e/swish-e-2.2.2-r1.ebuild b/net-www/swish-e/swish-e-2.2.2-r1.ebuild
index 5817d9ac07f1..7bf1b9726b3e 100644
--- a/net-www/swish-e/swish-e-2.2.2-r1.ebuild
+++ b/net-www/swish-e/swish-e-2.2.2-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-www/swish-e/swish-e-2.2.2-r1.ebuild,v 1.1 2003/07/20 14:13:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/swish-e/swish-e-2.2.2-r1.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 use perl && inherit perl-module
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 DEPEND=">=sys-libs/zlib-1.1.3
 	 dev-libs/libxml2
 	dev-perl/libwww-perl"
-	
+
 src_compile() {
 
 	econf || die "configuration failed"
@@ -32,7 +32,7 @@ src_compile() {
 
 src_install () {
 
-	dobin  src/swish-e	
+	dobin  src/swish-e
 	dodoc INSTALL README
 	use perl && cd perl \
 		&& perl-module_src_install
diff --git a/net-www/swish-e/swish-e-2.2.2.ebuild b/net-www/swish-e/swish-e-2.2.2.ebuild
index d634f1e5ed5c..bf2b9fad401c 100644
--- a/net-www/swish-e/swish-e-2.2.2.ebuild
+++ b/net-www/swish-e/swish-e-2.2.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-www/swish-e/swish-e-2.2.2.ebuild,v 1.3 2003/07/20 14:13:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/swish-e/swish-e-2.2.2.ebuild,v 1.4 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Simple Web Indexing System for Humans - Enhanced"
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 DEPEND=">=sys-libs/zlib-1.1.3
 	 dev-libs/libxml2
 	dev-perl/libwww-perl"
-	
+
 src_compile() {
 
 	econf || die
@@ -24,6 +24,6 @@ src_compile() {
 
 src_install () {
 	dobin  src/swish-e
-	
-	dodoc INSTALL README 
+
+	dodoc INSTALL README
 }
diff --git a/net-www/tomcat/Manifest b/net-www/tomcat/Manifest
index 4c40d84f9954..a0aa43bfc793 100644
--- a/net-www/tomcat/Manifest
+++ b/net-www/tomcat/Manifest
@@ -1,7 +1,7 @@
-MD5 75d0a267728d8772dc41c3a7bddc31b3 tomcat-4.1.24-r1.ebuild 3835
 MD5 e714c8795ea79c9ee06fa92dff2ced33 ChangeLog 5078
+MD5 58d7a486a74f98ae141a7a8a4bdc5b8e tomcat-4.1.24-r1.ebuild 3820
 MD5 f3d7f1cc3b7b8a69342e6bede7395f58 files/digest-tomcat-4.1.24-r1 74
+MD5 53b2c10f99d7d2c05a69fc49b7acda8b files/4.1.24/21tomcat 58
 MD5 bf1c6e3b412968c9a06aeb15f21355e9 files/4.1.24/gentoo.diff 4002
 MD5 12a2562eeb8ec6dc5ef8b2172a5f29c4 files/4.1.24/tomcat.conf 2710
 MD5 da7e3d883b224f013f546d2a087099e8 files/4.1.24/tomcat.init 817
-MD5 53b2c10f99d7d2c05a69fc49b7acda8b files/4.1.24/21tomcat 58
diff --git a/net-www/tomcat/tomcat-4.1.24-r1.ebuild b/net-www/tomcat/tomcat-4.1.24-r1.ebuild
index f83c812de2b5..ee5d4d616649 100644
--- a/net-www/tomcat/tomcat-4.1.24-r1.ebuild
+++ b/net-www/tomcat/tomcat-4.1.24-r1.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-www/tomcat/tomcat-4.1.24-r1.ebuild,v 1.1 2003/05/27 04:36:16 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/tomcat/tomcat-4.1.24-r1.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/jakarta-${P}
 At="jakarta-tomcat-${PV}.tar.gz"
@@ -33,7 +33,7 @@ src_install() {
 	TOMCAT_HOME="/opt/tomcat"
 	INSTALLING="yes"
 	DIROPTIONS="--mode=0750 --owner=tomcat --group=tomcat"
-	
+
 	# Create directories
 	dodir ${TOMCAT_HOME}
 	dodir /var/log/${PN}
@@ -48,7 +48,7 @@ src_install() {
 	cd ${S}
 
 	# INIT SCRIPTS AND ENV
-	
+
 	cp -a ${FILESDIR}/${PV}/tomcat.init ${S}/tomcat
 	insinto /etc/init.d
 	insopts -m0750
@@ -58,7 +58,7 @@ src_install() {
 	insinto /etc/conf.d
 	insopts -m0750
 	doins ${S}/tomcat
-	
+
 	cp -a ${FILESDIR}/${PV}/21tomcat ${S}/21tomcat
 	insinto /etc/env.d
 	insopts -m0750
@@ -74,13 +74,13 @@ src_install() {
 	done
 
 	dodoc RELEASE-NOTES-* README.txt RUNNING.txt LICENSE RELEASE-PLAN-4.1.txt
-	
+
 	chown -R tomcat.tomcat ${S}
 	DIROPTIONS="--mode=0750 --owner=tomcat --group=tomcat"
 	dodir ${TOMCAT_HOME}/common
 	dodir ${TOMCAT_HOME}/common/classes
 	dodir ${TOMCAT_HOME}/webapps
-	
+
 	cp -Rdp \
 		bin \
 		conf \
@@ -89,11 +89,11 @@ src_install() {
 		webapps \
 		work \
 		${D}${TOMCAT_HOME}
-	
+
 	dosym /usr/share/tomcat/package.env ${TOMCAT_HOME}/common/package.env
 	dosym /usr/share/tomcat/lib ${TOMCAT_HOME}/common/endorsed
 	dosym /usr/share/tomcat/lib ${TOMCAT_HOME}/common/lib
-	
+
 }
 
 pkg_postinst() {
@@ -129,8 +129,7 @@ pkg_postinst() {
 	einfo " may not get seen.  Thank you."
 	einfo " "
 	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-        sleep 10
-
+	sleep 10
 }
 
 pkg_postrm() {
diff --git a/net-www/viewcvs/Manifest b/net-www/viewcvs/Manifest
index 67f9f45db60c..fadda352f9fc 100644
--- a/net-www/viewcvs/Manifest
+++ b/net-www/viewcvs/Manifest
@@ -1,6 +1,6 @@
 MD5 414fb6fa716da5559aa845dcc834b863 ChangeLog 1503
-MD5 0e9c745209df53465fab90183587c6c9 viewcvs-0.9.2.ebuild 2357
-MD5 31b0922216251068fc9961a217a61ce5 viewcvs-0.9.2_p20030430.ebuild 2356
+MD5 514522160f173ea9b344675441ac0039 viewcvs-0.9.2.ebuild 2350
+MD5 5c6abf7938e460724ecb241a93605865 viewcvs-0.9.2_p20030430.ebuild 2351
 MD5 ebe00711ec2eb5bf78951944bf075432 viewcvs-0.9.2-r1.ebuild 2422
 MD5 f080d22ab0053078246d09fee00cac17 viewcvs-0.9.2-r2.ebuild 2819
 MD5 07a07f1a89e77c9f093ade7e395ffe3b files/digest-viewcvs-0.9.2 65
diff --git a/net-www/viewcvs/viewcvs-0.9.2.ebuild b/net-www/viewcvs/viewcvs-0.9.2.ebuild
index 7332a31a7982..207ca70b6549 100644
--- a/net-www/viewcvs/viewcvs-0.9.2.ebuild
+++ b/net-www/viewcvs/viewcvs-0.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-www/viewcvs/viewcvs-0.9.2.ebuild,v 1.3 2003/07/10 18:20:35 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/viewcvs/viewcvs-0.9.2.ebuild,v 1.4 2003/09/06 01:54:09 msterret Exp $
 
 SLOT="0"
 KEYWORDS="x86"
@@ -36,14 +36,14 @@ doinstall() {
 		s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${WWW},; \
 		s,\(^LIBRARY_DIR\)\(.*\$\),\1 = \"${WWW}/lib\",; \
 		s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${CONFFILE}\",}" ${1} >${1}.cpy
-	
+
 		install -o root -m $3 ${1}.cpy ${D}/$2
 		rm ${1}.cpy
 	fi
-}	
+}
 
 src_install() {
-        cd ${S}
+	cd ${S}
 	install -o root -d ${D}/${WWW}/cgi
 
 	doinstall cgi/viewcvs.cgi ${WWW}/cgi/viewcvs.cgi 755
diff --git a/net-www/viewcvs/viewcvs-0.9.2_p20030430.ebuild b/net-www/viewcvs/viewcvs-0.9.2_p20030430.ebuild
index 49b0d766f795..71a2ff19cbde 100644
--- a/net-www/viewcvs/viewcvs-0.9.2_p20030430.ebuild
+++ b/net-www/viewcvs/viewcvs-0.9.2_p20030430.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-www/viewcvs/viewcvs-0.9.2_p20030430.ebuild,v 1.3 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/viewcvs/viewcvs-0.9.2_p20030430.ebuild,v 1.4 2003/09/06 01:54:09 msterret Exp $
 
 SLOT="0"
 KEYWORDS="x86"
@@ -36,14 +36,14 @@ doinstall() {
 		s,\(<VIEWCVS_INSTALL_DIRECTORY>\),${WWW},; \
 		s,\(^LIBRARY_DIR\)\(.*\$\),\1 = \"${WWW}/lib\",; \
 		s,\(^CONF_PATHNAME\)\(.*\$\),\1 = \"${CONFFILE}\",}" ${1} >${1}.cpy
-	
+
 		install -o root -m $3 ${1}.cpy ${D}/$2
 		rm ${1}.cpy
 	fi
-}	
+}
 
 src_install() {
-        cd ${S}
+	cd ${S}
 	install -o root -d ${D}/${WWW}/cgi
 
 	doinstall cgi/viewcvs.cgi ${WWW}/cgi/viewcvs.cgi 755
diff --git a/net-www/w3m-m17n/Manifest b/net-www/w3m-m17n/Manifest
index d7050ced7cf0..621ec9df33fd 100644
--- a/net-www/w3m-m17n/Manifest
+++ b/net-www/w3m-m17n/Manifest
@@ -1,14 +1,14 @@
 MD5 da2b5c2090d02edd5097ed3d6ef09844 ChangeLog 1385
+MD5 f009aa4395e47aa9e4d90a9a8a7d544e w3m-m17n-20030308.ebuild 2246
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 25a5de1a42450fcd7fe47924f83104eb w3m-m17n-0.4.1.20030308.ebuild 2231
-MD5 5469657b2023ed07f021b9d2b38fc62b w3m-m17n-20030308.ebuild 2244
-MD5 bc34ff3aedfc9250e01cc9dc5630e293 w3m-m17n-20030308-r1.ebuild 2524
-MD5 3e1c47fe4a27929732f9fa3d71b4c110 w3m-m17n-0.4.1.20030308-r1.ebuild 2523
-MD5 661d0f7d08715364832ed28212b98d53 w3m-m17n-20030308-r2.ebuild 2551
-MD5 abf3d706cddb94fb64689ad77cc06d82 w3m-m17n-0.4.1.20030308-r2.ebuild 2550
+MD5 01f54e4d61e2a9e4832cdc4b7612b6cd w3m-m17n-0.4.1.20030308.ebuild 2233
+MD5 0c6edb2ab326fee131964fb38787e3fa w3m-m17n-20030308-r1.ebuild 2526
+MD5 65fba3e5d3732c492a075f4002353935 w3m-m17n-0.4.1.20030308-r1.ebuild 2525
+MD5 bd0374e5ac7083123ac43229042a5bc9 w3m-m17n-0.4.1.20030308-r2.ebuild 2552
+MD5 7a54c12151342ad1c49df7127b09a438 w3m-m17n-20030308-r2.ebuild 2553
 MD5 af84e354d29ae8659a9e25888b8461a3 files/digest-w3m-m17n-20030308 139
 MD5 1be9f4e35558ba722185319b64c707d8 files/digest-w3m-m17n-0.4.1.20030308 146
 MD5 af84e354d29ae8659a9e25888b8461a3 files/digest-w3m-m17n-20030308-r1 139
 MD5 1be9f4e35558ba722185319b64c707d8 files/digest-w3m-m17n-0.4.1.20030308-r1 146
-MD5 af84e354d29ae8659a9e25888b8461a3 files/digest-w3m-m17n-20030308-r2 139
 MD5 1be9f4e35558ba722185319b64c707d8 files/digest-w3m-m17n-0.4.1.20030308-r2 146
+MD5 af84e354d29ae8659a9e25888b8461a3 files/digest-w3m-m17n-20030308-r2 139
diff --git a/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r1.ebuild b/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r1.ebuild
index 2215e68b9ac3..2a03cbeb1da2 100644
--- a/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r1.ebuild
+++ b/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-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-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r1.ebuild,v 1.1 2003/08/21 14:27:44 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r1.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="gpm imlib ssl"
 
@@ -55,7 +55,7 @@ src_compile() {
 	else
 		myuse="${myuse} use_ssl=no"
 	fi
-	
+
 	if [ -n "`use gpm`" ] ; then
 		myuse="${myuse} use_mouse=y"
 	else
diff --git a/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r2.ebuild b/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r2.ebuild
index 3f4546cbb9b4..6f86a49d4847 100644
--- a/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r2.ebuild
+++ b/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-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-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r2.ebuild,v 1.1 2003/08/21 17:56:47 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r2.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="gpm imlib ssl"
 
@@ -55,7 +55,7 @@ src_compile() {
 	else
 		myuse="${myuse} use_ssl=no"
 	fi
-	
+
 	if [ -n "`use gpm`" ] ; then
 		myuse="${myuse} use_mouse=y"
 	else
diff --git a/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308.ebuild b/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308.ebuild
index af27e88e7175..7dfcb440dd53 100644
--- a/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308.ebuild
+++ b/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308.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-www/w3m-m17n/w3m-m17n-0.4.1.20030308.ebuild,v 1.1 2003/08/12 16:38:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="gpm imlib ssl"
 
@@ -55,7 +55,7 @@ src_compile() {
 	else
 		myuse="${myuse} use_ssl=no"
 	fi
-	
+
 	if [ -n "`use gpm`" ] ; then
 		myuse="${myuse} use_mouse=y"
 	else
diff --git a/net-www/w3m-m17n/w3m-m17n-20030308-r1.ebuild b/net-www/w3m-m17n/w3m-m17n-20030308-r1.ebuild
index 2f12e4d5a23d..5a5f94f27715 100644
--- a/net-www/w3m-m17n/w3m-m17n-20030308-r1.ebuild
+++ b/net-www/w3m-m17n/w3m-m17n-20030308-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-www/w3m-m17n/w3m-m17n-20030308-r1.ebuild,v 1.1 2003/08/16 20:49:44 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-20030308-r1.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="gpm imlib ssl"
 
@@ -56,7 +56,7 @@ src_compile() {
 	else
 		myuse="${myuse} use_ssl=no"
 	fi
-	
+
 	if [ -n "`use gpm`" ] ; then
 		myuse="${myuse} use_mouse=y"
 	else
diff --git a/net-www/w3m-m17n/w3m-m17n-20030308-r2.ebuild b/net-www/w3m-m17n/w3m-m17n-20030308-r2.ebuild
index 515eef7c736f..cf9b2badc8bd 100644
--- a/net-www/w3m-m17n/w3m-m17n-20030308-r2.ebuild
+++ b/net-www/w3m-m17n/w3m-m17n-20030308-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-www/w3m-m17n/w3m-m17n-20030308-r2.ebuild,v 1.1 2003/08/21 17:56:47 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-20030308-r2.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="gpm imlib ssl"
 
@@ -56,7 +56,7 @@ src_compile() {
 	else
 		myuse="${myuse} use_ssl=no"
 	fi
-	
+
 	if [ -n "`use gpm`" ] ; then
 		myuse="${myuse} use_mouse=y"
 	else
diff --git a/net-www/w3m-m17n/w3m-m17n-20030308.ebuild b/net-www/w3m-m17n/w3m-m17n-20030308.ebuild
index b0b9e7181bd2..8dbb3c681a4b 100644
--- a/net-www/w3m-m17n/w3m-m17n-20030308.ebuild
+++ b/net-www/w3m-m17n/w3m-m17n-20030308.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-www/w3m-m17n/w3m-m17n-20030308.ebuild,v 1.3 2003/08/12 16:38:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-20030308.ebuild,v 1.4 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="gpm imlib ssl"
 
@@ -56,7 +56,7 @@ src_compile() {
 	else
 		myuse="${myuse} use_ssl=no"
 	fi
-	
+
 	if [ -n "`use gpm`" ] ; then
 		myuse="${myuse} use_mouse=y"
 	else
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index 6fa8491c1292..d2492ab46b3b 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,14 +1,14 @@
 MD5 b781f8bbdc1db2921c2f7118d7c4a96f ChangeLog 5166
 MD5 e91abafb626e658ddead4da60c447213 w3m-0.2.2-r1.ebuild 2997
-MD5 66a4ea15846539603899abfe5b51fa45 w3m-0.3-r2.ebuild 3515
-MD5 4c00a62192cd6ff57204232f94c36d1d w3m-0.3-r6.ebuild 3652
-MD5 beec690e6fc0809d0adf85474e7c7ed5 w3m-0.3.2.1.ebuild 3746
-MD5 57de042f5be62c9d29955986adfc4f71 w3m-0.3.2.2.ebuild 3746
-MD5 d1011aa4522d035a089d31e8769b834c w3m-0.4.1-r1.ebuild 2153
-MD5 50f0bd059654f877883b3b9b8c70174d w3m-0.4.1-r2.ebuild 2153
-MD5 5b2df0d2cd06837dbb8ccda4ff8749a0 w3m-0.4.1.ebuild 2142
-MD5 a85fdacc6ccf12a40c63b76f46ab98e7 w3m-0.4.ebuild 4454
-MD5 73ae21ca99d354fc18e1f51cc5d78f37 w3m-0.4.1-r3.ebuild 2211
+MD5 b8bcaa49829635f94fb6e7c879e1045b w3m-0.3-r2.ebuild 3503
+MD5 821ce7a4eecf2bbfbf8e49af063a7d7b w3m-0.3-r6.ebuild 3636
+MD5 9fe9cd8f1a746e5598cfdbae12104f8b w3m-0.3.2.1.ebuild 3732
+MD5 1f7b8fffb13d61fe43a3294dcf037926 w3m-0.3.2.2.ebuild 3732
+MD5 003ecc09459bb3933a50d51c2b757630 w3m-0.4.ebuild 4437
+MD5 3078ac582f35e72b43ee1369a534d3d9 w3m-0.4.1.ebuild 2143
+MD5 f91a81f2482305bc8f3af2e3cb0dbd88 w3m-0.4.1-r1.ebuild 2150
+MD5 e1bb4db5cf3c78477b1b5c44953be99c w3m-0.4.1-r2.ebuild 2150
+MD5 2cc7f122679cd4492d5da2a1f84bc972 w3m-0.4.1-r3.ebuild 2212
 MD5 feec9d97e61a095d33af68a5b301372f files/config.param 404
 MD5 7d3cca8a96c2485f12ee3c65fb4b3195 files/digest-w3m-0.2.2-r1 62
 MD5 ea9ffc3e59251a86366bc9f0899df712 files/digest-w3m-0.3-r2 60
@@ -16,9 +16,9 @@ MD5 ea9ffc3e59251a86366bc9f0899df712 files/digest-w3m-0.3-r6 60
 MD5 3b89845b1813e2abecb76bf4954444ef files/digest-w3m-0.3.2.1 64
 MD5 df74b28e72e6c2140a1dd6e4ea042e58 files/digest-w3m-0.3.2.2 64
 MD5 b289d2ea47e3369102b13b53f2bc47ac files/digest-w3m-0.4 60
+MD5 8317b9a2ace48dc6562a52d7bf21abc6 files/w3m-0.1.10.diff.gz 562
+MD5 00a360d12cc07d61c5fd5df08a53d261 files/w3m-0.4-alpha.patch 930
 MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1 62
 MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1-r1 62
 MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1-r2 62
-MD5 8317b9a2ace48dc6562a52d7bf21abc6 files/w3m-0.1.10.diff.gz 562
-MD5 00a360d12cc07d61c5fd5df08a53d261 files/w3m-0.4-alpha.patch 930
 MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1-r3 62
diff --git a/net-www/w3m/w3m-0.3-r2.ebuild b/net-www/w3m/w3m-0.3-r2.ebuild
index 1c0ab3db1694..bc176c4dc4f3 100644
--- a/net-www/w3m/w3m-0.3-r2.ebuild
+++ b/net-www/w3m/w3m-0.3-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-www/w3m/w3m-0.3-r2.ebuild,v 1.9 2003/02/13 15:45:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3-r2.ebuild,v 1.10 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="gpm imlib ssl"
 
@@ -41,7 +41,7 @@ src_compile() {
 		# Do you want to use Lynx-like key binding?
 		echo n
 		# Let's do some configurations. Choose config option among the list.
-		# 
+		#
 		# 1 - Baby model    (no color, no menu, no mouse, no cookie, no SSL)
 		# 2 - Little model  (color, menu, no mouse, no cookie, no SSL)
 		# 3 - Mouse model   (color, menu, mouse, no cookie, no SSL)
@@ -49,7 +49,7 @@ src_compile() {
 		# 5 - Monster model (with everything; you need openSSL library)
 		# 6 - Customize
 		# Ok this was 5 but there is no option to disable gpm which not all
-		# people want, so I'm switching this to 6 instead. 
+		# people want, so I'm switching this to 6 instead.
 		# Which?
 		echo 6
 		# Do you want color ESC sequence for kterm/pxvt?
@@ -63,26 +63,26 @@ src_compile() {
 		# Do you want SSL verification support?
 		# (Your SSL library must be version 0.8 or later)
 		use ssl &>/dev/null && echo y || echo n
-		# Digest Auth support [y]? 
+		# Digest Auth support [y]?
 		echo y
-		# Inline image support (you need Imlib library) [n]? 
+		# Inline image support (you need Imlib library) [n]?
 		use imlib &>/dev/null && echo y || echo n
-		# ANSI color escape sequences support [n]? 
+		# ANSI color escape sequences support [n]?
 		echo y
 		# Use Migemo (Roma-ji search; Please see
-		# http://migemo.namazu.org/) [n]? 
+		# http://migemo.namazu.org/) [n]?
 		echo n
-		# External URI loader support [y]? 
+		# External URI loader support [y]?
 		echo y
-		# Use w3mmail.cgi [y]? 
+		# Use w3mmail.cgi [y]?
 		echo y
-		# NNTP support [y]? 
+		# NNTP support [y]?
 		echo n
-		# Gopher support [y]? 
+		# Gopher support [y]?
 		echo n
-		# Use alarm support code [y]? 
+		# Use alarm support code [y]?
 		echo y
-		# Use mark operation [y]? 
+		# Use mark operation [y]?
 		echo y
 		# Input your favorite editor program.
 		echo /usr/bin/vi
@@ -96,17 +96,17 @@ src_compile() {
 		# do not need one)
 		printf "%s\n" "-lncurses"
 		# Input additional LD flags other than listed above, if any:
-		# (default: -lncurses) : 
+		# (default: -lncurses) :
 		echo
 	) | ./configure || die "configure failed"
 
-	# binary executables come prebuilt for 80386! 
+	# binary executables come prebuilt for 80386!
 	# clean it up and be sure to remake for ANY arch
 
 	cd ${S}/gc
 	make clean
 	cd -
-	
+
 	emake || die "emake failed"
 }
 
diff --git a/net-www/w3m/w3m-0.3-r6.ebuild b/net-www/w3m/w3m-0.3-r6.ebuild
index 215fe315c2dc..6397acaa01cc 100644
--- a/net-www/w3m/w3m-0.3-r6.ebuild
+++ b/net-www/w3m/w3m-0.3-r6.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-www/w3m/w3m-0.3-r6.ebuild,v 1.8 2003/02/13 15:45:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3-r6.ebuild,v 1.9 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="gpm cjk imlib ssl"
 
@@ -45,24 +45,24 @@ src_compile() {
 		# Do you want to use Lynx-like key binding?
 		echo n
 		# Let's do some configurations. Choose config option among the list.
-		# 
+		#
 		# 1 - Baby model    (no color, no menu, no mouse, no cookie, no SSL)
 		# 2 - Little model  (color, menu, no mouse, no cookie, no SSL)
 		# 3 - Mouse model   (color, menu, mouse, no cookie, no SSL)
 		# 4 - Cookie model  (color, menu, mouse, cookie, no SSL)
 		# 5 - Monster model (with everything; you need openSSL library)
 		# 6 - Customize
-		# 
+		#
 		# Which?
 		echo 6
 		# Do you want color ESC sequence for Kterm/pxvt
 		echo y
-		# Use mouse (requires xterm/kterm/gpm/sysmouse) 
+		# Use mouse (requires xterm/kterm/gpm/sysmouse)
 		echo y
 		# Use popup menu
 		echo y
-		# Use cookie 
-		echo y		
+		# Use cookie
+		echo y
 		# Do you want SSL verification support?
 		# (Your SSL library must be version 0.8 or later)
 		use ssl &>/dev/null && echo y || echo n
@@ -70,24 +70,24 @@ src_compile() {
 		use ssl &>/dev/null && echo n
 		# (ssl) Digest Auth support [y]?
 		use ssl &>/dev/null && echo y
-		# Inline image support (you need Imlib library) [n]? 
+		# Inline image support (you need Imlib library) [n]?
 		use imlib &>/dev/null && echo y || echo n
-		# ANSI color escape sequences support [n]? 
+		# ANSI color escape sequences support [n]?
 		echo y
 		# Use Migemo (Roma-ji search; Please see
-		# http://migemo.namazu.org/) [n]? 
+		# http://migemo.namazu.org/) [n]?
 		echo n
-		# External URI loader support [y]? 
+		# External URI loader support [y]?
 		echo y
-		# Use w3mmail.cgi [y]? 
+		# Use w3mmail.cgi [y]?
 		echo y
-		# NNTP support [y]? 
+		# NNTP support [y]?
 		echo n
-		# Gopher support [y]? 
+		# Gopher support [y]?
 		echo n
-		# Use alarm support code [y]? 
+		# Use alarm support code [y]?
 		echo y
-		# Use mark operation [y]? 
+		# Use mark operation [y]?
 		echo y
 		# Input your favorite editor program.
 		echo /usr/bin/vi
@@ -102,17 +102,17 @@ src_compile() {
 		echo
 		#printf "%s\n" "-lncurses"
 		# Input additional LD flags other than listed above, if any:
-		# (default: -lncurses) : 
+		# (default: -lncurses) :
 		echo
 	) | ./configure || die "configure failed"
 
-	# binary executables come prebuilt for 80386! 
+	# binary executables come prebuilt for 80386!
 	# clean it up and be sure to remake for ANY arch
 
 	cd ${S}/gc
 	make clean
 	cd -
-	
+
 	emake || die "emake failed"
 }
 
diff --git a/net-www/w3m/w3m-0.3.2.1.ebuild b/net-www/w3m/w3m-0.3.2.1.ebuild
index 8c24e7fa25b6..7e0efa861a29 100644
--- a/net-www/w3m/w3m-0.3.2.1.ebuild
+++ b/net-www/w3m/w3m-0.3.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-www/w3m/w3m-0.3.2.1.ebuild,v 1.5 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3.2.1.ebuild,v 1.6 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="gpm cjk imlib ssl"
 
@@ -47,24 +47,24 @@ src_compile() {
 		# Do you want to use Lynx-like key binding?
 		echo n
 		# Let's do some configurations. Choose config option among the list.
-		# 
+		#
 		# 1 - Baby model    (no color, no menu, no mouse, no cookie, no SSL)
 		# 2 - Little model  (color, menu, no mouse, no cookie, no SSL)
 		# 3 - Mouse model   (color, menu, mouse, no cookie, no SSL)
 		# 4 - Cookie model  (color, menu, mouse, cookie, no SSL)
 		# 5 - Monster model (with everything; you need openSSL library)
 		# 6 - Customize
-		# 
+		#
 		# Which?
 		echo 6
 		# Do you want color ESC sequence for Kterm/pxvt
 		echo y
-		# Use mouse (requires xterm/kterm/gpm/sysmouse) 
+		# Use mouse (requires xterm/kterm/gpm/sysmouse)
 		use gpm &>/dev/null && echo y
 		# Use popup menu
 		echo y
-		# Use cookie 
-		echo y		
+		# Use cookie
+		echo y
 		# Do you want SSL verification support?
 		# (Your SSL library must be version 0.8 or later)
 		use ssl &>/dev/null && echo y || echo n
@@ -72,24 +72,24 @@ src_compile() {
 		use ssl &>/dev/null && echo n
 		# (ssl) Digest Auth support [y]?
 		use ssl &>/dev/null && echo y
-		# Inline image support (you need Imlib library) [n]? 
+		# Inline image support (you need Imlib library) [n]?
 		use imlib &>/dev/null && echo y || echo n
-		# ANSI color escape sequences support [n]? 
+		# ANSI color escape sequences support [n]?
 		echo y
 		# Use Migemo (Roma-ji search; Please see
-		# http://migemo.namazu.org/) [n]? 
+		# http://migemo.namazu.org/) [n]?
 		echo n
-		# External URI loader support [y]? 
+		# External URI loader support [y]?
 		echo y
-		# Use w3mmail.cgi [y]? 
+		# Use w3mmail.cgi [y]?
 		echo y
-		# NNTP support [y]? 
+		# NNTP support [y]?
 		echo n
-		# Gopher support [y]? 
+		# Gopher support [y]?
 		echo n
-		# Use alarm support code [y]? 
+		# Use alarm support code [y]?
 		echo y
-		# Use mark operation [y]? 
+		# Use mark operation [y]?
 		echo y
 		# Input your favorite editor program.
 		echo /usr/bin/nano
@@ -104,17 +104,17 @@ src_compile() {
 		echo
 		#printf "%s\n" "-lncurses"
 		# Input additional LD flags other than listed above, if any:
-		# (default: -lncurses) : 
+		# (default: -lncurses) :
 		echo
 	) | ./configure || die "configure failed"
 
-	# binary executables come prebuilt for 80386! 
+	# binary executables come prebuilt for 80386!
 	# clean it up and be sure to remake for ANY arch
 
 	cd ${S}/gc
 	make clean
 	cd -
-	
+
 	emake || die "emake failed"
 }
 
diff --git a/net-www/w3m/w3m-0.3.2.2.ebuild b/net-www/w3m/w3m-0.3.2.2.ebuild
index c20eacac1a0d..d5da535aec3d 100644
--- a/net-www/w3m/w3m-0.3.2.2.ebuild
+++ b/net-www/w3m/w3m-0.3.2.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-www/w3m/w3m-0.3.2.2.ebuild,v 1.2 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3.2.2.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
 
 IUSE="gpm cjk imlib ssl"
 
@@ -47,24 +47,24 @@ src_compile() {
 		# Do you want to use Lynx-like key binding?
 		echo n
 		# Let's do some configurations. Choose config option among the list.
-		# 
+		#
 		# 1 - Baby model    (no color, no menu, no mouse, no cookie, no SSL)
 		# 2 - Little model  (color, menu, no mouse, no cookie, no SSL)
 		# 3 - Mouse model   (color, menu, mouse, no cookie, no SSL)
 		# 4 - Cookie model  (color, menu, mouse, cookie, no SSL)
 		# 5 - Monster model (with everything; you need openSSL library)
 		# 6 - Customize
-		# 
+		#
 		# Which?
 		echo 6
 		# Do you want color ESC sequence for Kterm/pxvt
 		echo y
-		# Use mouse (requires xterm/kterm/gpm/sysmouse) 
+		# Use mouse (requires xterm/kterm/gpm/sysmouse)
 		use gpm &>/dev/null && echo y
 		# Use popup menu
 		echo y
-		# Use cookie 
-		echo y		
+		# Use cookie
+		echo y
 		# Do you want SSL verification support?
 		# (Your SSL library must be version 0.8 or later)
 		use ssl &>/dev/null && echo y || echo n
@@ -72,24 +72,24 @@ src_compile() {
 		use ssl &>/dev/null && echo n
 		# (ssl) Digest Auth support [y]?
 		use ssl &>/dev/null && echo y
-		# Inline image support (you need Imlib library) [n]? 
+		# Inline image support (you need Imlib library) [n]?
 		use imlib &>/dev/null && echo y || echo n
-		# ANSI color escape sequences support [n]? 
+		# ANSI color escape sequences support [n]?
 		echo y
 		# Use Migemo (Roma-ji search; Please see
-		# http://migemo.namazu.org/) [n]? 
+		# http://migemo.namazu.org/) [n]?
 		echo n
-		# External URI loader support [y]? 
+		# External URI loader support [y]?
 		echo y
-		# Use w3mmail.cgi [y]? 
+		# Use w3mmail.cgi [y]?
 		echo y
-		# NNTP support [y]? 
+		# NNTP support [y]?
 		echo n
-		# Gopher support [y]? 
+		# Gopher support [y]?
 		echo n
-		# Use alarm support code [y]? 
+		# Use alarm support code [y]?
 		echo y
-		# Use mark operation [y]? 
+		# Use mark operation [y]?
 		echo y
 		# Input your favorite editor program.
 		echo /usr/bin/nano
@@ -104,17 +104,17 @@ src_compile() {
 		echo
 		#printf "%s\n" "-lncurses"
 		# Input additional LD flags other than listed above, if any:
-		# (default: -lncurses) : 
+		# (default: -lncurses) :
 		echo
 	) | ./configure || die "configure failed"
 
-	# binary executables come prebuilt for 80386! 
+	# binary executables come prebuilt for 80386!
 	# clean it up and be sure to remake for ANY arch
 
 	cd ${S}/gc
 	make clean
 	cd -
-	
+
 	emake || die "emake failed"
 }
 
diff --git a/net-www/w3m/w3m-0.4.1-r1.ebuild b/net-www/w3m/w3m-0.4.1-r1.ebuild
index 818f6827ebcd..b757779da2e2 100644
--- a/net-www/w3m/w3m-0.4.1-r1.ebuild
+++ b/net-www/w3m/w3m-0.4.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-www/w3m/w3m-0.4.1-r1.ebuild,v 1.2 2003/06/24 08:24:12 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.1-r1.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
 
 inherit eutils
 
@@ -51,7 +51,7 @@ src_compile() {
 	else
 		myuse="${myuse} use_ssl=n"
 	fi
-	
+
 	if use gpm &>/dev/null; then
 		myuse="${myuse} use_mouse=y"
 	else
@@ -70,12 +70,12 @@ src_compile() {
 	grep -q "dcc='gcc'" config.param || \
 		die "configure out of sync; ebuild needs an update"
 
-	# binary executables come prebuilt for 80386! 
+	# binary executables come prebuilt for 80386!
 	# clean it up and be sure to remake for ANY arch
 	cd ${S}/gc
 	make clean
 	cd -
-	
+
 	emake || die "emake failed"
 }
 
diff --git a/net-www/w3m/w3m-0.4.1-r2.ebuild b/net-www/w3m/w3m-0.4.1-r2.ebuild
index a444ef63c372..b06a3f70d9be 100644
--- a/net-www/w3m/w3m-0.4.1-r2.ebuild
+++ b/net-www/w3m/w3m-0.4.1-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-www/w3m/w3m-0.4.1-r2.ebuild,v 1.1 2003/06/29 21:26:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.1-r2.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 inherit eutils
 
@@ -51,7 +51,7 @@ src_compile() {
 	else
 		myuse="${myuse} use_ssl=n"
 	fi
-	
+
 	if use gpm &>/dev/null; then
 		myuse="${myuse} use_mouse=y"
 	else
@@ -70,12 +70,12 @@ src_compile() {
 	grep -q "dcc='gcc'" config.param || \
 		die "configure out of sync; ebuild needs an update"
 
-	# binary executables come prebuilt for 80386! 
+	# binary executables come prebuilt for 80386!
 	# clean it up and be sure to remake for ANY arch
 	cd ${S}/gc
 	make clean
 	cd -
-	
+
 	emake || die "emake failed"
 }
 
diff --git a/net-www/w3m/w3m-0.4.1-r3.ebuild b/net-www/w3m/w3m-0.4.1-r3.ebuild
index 8e0a40d03cb6..839f6c9e6b30 100644
--- a/net-www/w3m/w3m-0.4.1-r3.ebuild
+++ b/net-www/w3m/w3m-0.4.1-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-www/w3m/w3m-0.4.1-r3.ebuild,v 1.1 2003/08/21 18:35:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.1-r3.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 inherit eutils
 
@@ -53,7 +53,7 @@ src_compile() {
 	else
 		myuse="${myuse} use_ssl=n"
 	fi
-	
+
 	if use gpm &>/dev/null; then
 		myuse="${myuse} use_mouse=y"
 	else
@@ -72,7 +72,7 @@ src_compile() {
 	grep -q "dcc='gcc'" config.param || \
 		die "configure out of sync; ebuild needs an update"
 
-	# binary executables come prebuilt for 80386! 
+	# binary executables come prebuilt for 80386!
 	# clean it up and be sure to remake for ANY arch
 	cd ${S}/gc
 	make clean
diff --git a/net-www/w3m/w3m-0.4.1.ebuild b/net-www/w3m/w3m-0.4.1.ebuild
index c136296d93e4..364c8843714f 100644
--- a/net-www/w3m/w3m-0.4.1.ebuild
+++ b/net-www/w3m/w3m-0.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-www/w3m/w3m-0.4.1.ebuild,v 1.2 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.1.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
 
 inherit eutils
 
@@ -51,7 +51,7 @@ src_compile() {
 	else
 		myuse="${myuse} use_ssl=no"
 	fi
-	
+
 	if use gpm &>/dev/null; then
 		myuse="${myuse} use_mouse=y"
 	else
@@ -70,12 +70,12 @@ src_compile() {
 	grep -q "dcc='gcc'" config.param || \
 		die "configure out of sync; ebuild needs an update"
 
-	# binary executables come prebuilt for 80386! 
+	# binary executables come prebuilt for 80386!
 	# clean it up and be sure to remake for ANY arch
 	cd ${S}/gc
 	make clean
 	cd -
-	
+
 	emake || die "emake failed"
 }
 
diff --git a/net-www/w3m/w3m-0.4.ebuild b/net-www/w3m/w3m-0.4.ebuild
index c235707d243b..c42829854b93 100644
--- a/net-www/w3m/w3m-0.4.ebuild
+++ b/net-www/w3m/w3m-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-www/w3m/w3m-0.4.ebuild,v 1.5 2003/03/30 21:53:11 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.ebuild,v 1.6 2003/09/06 01:54:09 msterret Exp $
 
 inherit eutils
 
@@ -63,24 +63,24 @@ src_compile() {
 		# Use Lynx-like key binding as default [n]?
 		echo n
 		# Let's do some configurations. Choose config option among the list.
-		# 
+		#
 		# 1 - Baby model    (no color, no menu, no mouse, no cookie, no SSL)
 		# 2 - Little model  (color, menu, no mouse, no cookie, no SSL)
 		# 3 - Mouse model   (color, menu, mouse, no cookie, no SSL)
 		# 4 - Cookie model  (color, menu, mouse, cookie, no SSL)
 		# 5 - Monster model (with everything; you need openSSL library)
 		# 6 - Customize
-		# 
+		#
 		# Which?
 		echo 6
 		# Do you want color ESC sequence for Kterm/pxvt
 		echo y
-		# Use mouse (requires xterm/kterm/gpm/sysmouse) 
+		# Use mouse (requires xterm/kterm/gpm/sysmouse)
 		use gpm &>/dev/null && echo y || echo n
 		# Use popup menu
 		echo y
-		# Use cookie 
-		echo y		
+		# Use cookie
+		echo y
 		# Do you want SSL verification support?
 		# (Your SSL library must be version 0.8 or later)
 		if use ssl &>/dev/null; then
@@ -96,32 +96,32 @@ src_compile() {
 		if use imlib &>/dev/null; then
 			echo y
 			# X11 inline image support (you need Imlib, Imlib2 or
-			# GdkPixbuf library) [y]? 
+			# GdkPixbuf library) [y]?
 			echo y
 			# Linux Framebuffer inline image support (you need Imlib2
-			# or GdkPixbuf) [n]? 
+			# or GdkPixbuf) [n]?
 			echo y
-			# setuid w3mimgdisplay to open /dev/fb0? [y]? 
+			# setuid w3mimgdisplay to open /dev/fb0? [y]?
 			echo n
 		else
 			echo n
 		fi
-		# ANSI color escape sequences support [n]? 
+		# ANSI color escape sequences support [n]?
 		echo y
 		# Use Migemo (Roma-ji search; Please see
-		# http://migemo.namazu.org/) [n]? 
+		# http://migemo.namazu.org/) [n]?
 		echo n
-		# External URI loader support [y]? 
+		# External URI loader support [y]?
 		echo y
-		# Use w3mmail.cgi [y]? 
+		# Use w3mmail.cgi [y]?
 		echo y
-		# NNTP support [y]? 
+		# NNTP support [y]?
 		echo n
-		# Gopher support [y]? 
+		# Gopher support [y]?
 		echo n
-		# Use alarm support code [y]? 
+		# Use alarm support code [y]?
 		echo y
-		# Use mark operation [y]? 
+		# Use mark operation [y]?
 		echo y
 		if use imlib &>/dev/null; then
 			# X-Face support (you need uncompface) [n]?
@@ -140,7 +140,7 @@ src_compile() {
 		echo
 		#printf "%s\n" "-lncurses"
 		# Input additional LD flags other than listed above, if any:
-		# (default: -lncurses) : 
+		# (default: -lncurses) :
 		echo
 	) | ./configure || die "configure failed"
 
@@ -148,12 +148,12 @@ src_compile() {
 	grep -q "dcc='gcc'" config.param || \
 		die "configure out of sync; ebuild needs an update"
 
-	# binary executables come prebuilt for 80386! 
+	# binary executables come prebuilt for 80386!
 	# clean it up and be sure to remake for ANY arch
 	cd ${S}/gc
 	make clean
 	cd -
-	
+
 	emake || die "emake failed"
 }
 
diff --git a/net-www/w3mir/Manifest b/net-www/w3mir/Manifest
index 155cdcf39501..f9e6a1ffd92a 100644
--- a/net-www/w3mir/Manifest
+++ b/net-www/w3mir/Manifest
@@ -1,3 +1,3 @@
-MD5 53d0463cf57f91017c262b35c525d597 files/digest-w3mir-1.0.10 63
 MD5 537dbc2ca3dd7a3c7a665515a3d8ac40 ChangeLog 365
-MD5 3b7ea60663b64aefb22d3df9f6216d93 w3mir-1.0.10.ebuild 608
+MD5 9175ea221cd98ad2b639e0e333febb55 w3mir-1.0.10.ebuild 589
+MD5 53d0463cf57f91017c262b35c525d597 files/digest-w3mir-1.0.10 63
diff --git a/net-www/w3mir/w3mir-1.0.10.ebuild b/net-www/w3mir/w3mir-1.0.10.ebuild
index a42210731c53..a5fe9628a550 100644
--- a/net-www/w3mir/w3mir-1.0.10.ebuild
+++ b/net-www/w3mir/w3mir-1.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3mir/w3mir-1.0.10.ebuild,v 1.2 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3mir/w3mir-1.0.10.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
 
 inherit perl-module
 
@@ -14,8 +14,6 @@ LICENSE="Artistic"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND="${DEPEND}
-        >=dev-perl/URI-1.0.9
-        >=dev-perl/libwww-perl-5.64-r1
-        >=dev-perl/MIME-Base64-2.12"
-
-
+	>=dev-perl/URI-1.0.9
+	>=dev-perl/libwww-perl-5.64-r1
+	>=dev-perl/MIME-Base64-2.12"
diff --git a/net-www/wsmake/Manifest b/net-www/wsmake/Manifest
index 731b6d2b8310..5bf3cb1efa0d 100644
--- a/net-www/wsmake/Manifest
+++ b/net-www/wsmake/Manifest
@@ -1,4 +1,4 @@
+MD5 245449e29775aa09f18750c586881bfb ChangeLog 374
+MD5 99af81ea74561fca4b173cc9519455d1 wsmake-0.6.4.ebuild 1107
 MD5 6d15df4a1798e50da3dd30c5bff389e0 files/digest-wsmake-0.6.4 251
 MD5 7cc535ed0163eab82da703f14632a0dd files/wsmake-0.6.4-bv.diff 308
-MD5 f1882250ed5a8a48c2b1a7d3d8ad601d wsmake-0.6.4.ebuild 1123
-MD5 245449e29775aa09f18750c586881bfb ChangeLog 374
diff --git a/net-www/wsmake/wsmake-0.6.4.ebuild b/net-www/wsmake/wsmake-0.6.4.ebuild
index c2362731578f..1e4eff43ea41 100644
--- a/net-www/wsmake/wsmake-0.6.4.ebuild
+++ b/net-www/wsmake/wsmake-0.6.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/wsmake/wsmake-0.6.4.ebuild,v 1.2 2003/07/13 21:44:10 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wsmake/wsmake-0.6.4.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Website Pre-processor"
 HOMEPAGE="http://www.wsmake.org/"
-SRC_URI="http://ftp.wsmake.org/pub/wsmake6/stable/wsmake-0.6.4.tar.bz2 
-http://ftp.wsmake.org/pub/wsmake6/docs/user-manual.pdf 
-http://ftp.wsmake.org/pub/wsmake6/docs/user-manual.ps 
+SRC_URI="http://ftp.wsmake.org/pub/wsmake6/stable/wsmake-0.6.4.tar.bz2
+http://ftp.wsmake.org/pub/wsmake6/docs/user-manual.pdf
+http://ftp.wsmake.org/pub/wsmake6/docs/user-manual.ps
 http://ftp.wsmake.org/pub/wsmake6/docs/user-manual-html.tar.gz"
 
 KEYWORDS="x86"
@@ -19,22 +19,22 @@ src_unpack () {
 	cd ${S}
 	#Apply patch to allow compiling
 	patch -p0 < ${FILESDIR}/${P}-bv.diff || die
-        unpack user-manual-html.tar.gz
+	unpack user-manual-html.tar.gz
 }
 
 src_compile () {
 	./configure --prefix=/usr  || die
-	emake || die 
+	emake || die
 	cd doc
 	tar -cf examples.tar examples || die
 }
 
 src_install () {
-	make DESTDIR=${D} install || die	
-        dodoc AUTHORS Artistic COPYING ChangeLog* DEVELOPERS LICENSE NEWS README TODO
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS Artistic COPYING ChangeLog* DEVELOPERS LICENSE NEWS README TODO
 	cd user-manual
 	dohtml * stylesheet-images/*
 	cd ../doc
-	dodoc manual.txt examples.tar 
+	dodoc manual.txt examples.tar
 }
 
diff --git a/net-www/wwwoffle/Manifest b/net-www/wwwoffle/Manifest
index 564a8e23798d..66817cb5555e 100644
--- a/net-www/wwwoffle/Manifest
+++ b/net-www/wwwoffle/Manifest
@@ -1,3 +1,9 @@
+MD5 3de87e148bbb4596fcd36ad33d83182b ChangeLog 1879
+MD5 c65db05432d2964ea596e1788b5dbde9 wwwoffle-2.7-r1.ebuild 1757
+MD5 94236c0a8600e2cd780db538b1aca0f1 wwwoffle-2.7b.ebuild 1756
+MD5 62af39b9dbcfcc97f7beac5d64ba5a53 wwwoffle-2.7d.ebuild 1754
+MD5 881202dc41df94892486c87571089633 wwwoffle-2.7g.ebuild 1755
+MD5 5169361164607090922a50d2b04ead6f wwwoffle-2.7h.ebuild 1759
 MD5 04a667ee3d3a9db3acdf2520caa04607 files/digest-wwwoffle-2.7-r1 61
 MD5 5d781f01cfb8e22c546204eb727e2359 files/digest-wwwoffle-2.7b 62
 MD5 bad5d87e3c16f9435729e04b5c2e67f5 files/digest-wwwoffle-2.7d 62
@@ -5,9 +11,3 @@ MD5 1eb7e26a722b119b2750376f065f5403 files/digest-wwwoffle-2.7g 62
 MD5 a6914435a2f1de064fcdc7c784a2b85f files/digest-wwwoffle-2.7h 62
 MD5 0fda4b2f3c2886b0d1ce7f420b636f65 files/wwwoffled 531
 MD5 748f38cd421e274c14f4ebd214d2e1b6 files/wwwoffled-online 554
-MD5 5c11b4715de2acc9f5697e976ae4ffe5 wwwoffle-2.7-r1.ebuild 1854
-MD5 f6729a1b7f9878397e7d2ce8c7f394bc wwwoffle-2.7b.ebuild 1851
-MD5 3edd7bb10c57ea2c6cdde06b9715f01a wwwoffle-2.7d.ebuild 1851
-MD5 21c172d723732f07a1b03e63e388c983 wwwoffle-2.7g.ebuild 1852
-MD5 6c4f68bcbc33a926a3db47f67199b466 wwwoffle-2.7h.ebuild 1859
-MD5 3de87e148bbb4596fcd36ad33d83182b ChangeLog 1879
diff --git a/net-www/wwwoffle/wwwoffle-2.7-r1.ebuild b/net-www/wwwoffle/wwwoffle-2.7-r1.ebuild
index 410835d5f36f..5cf773489b8a 100644
--- a/net-www/wwwoffle/wwwoffle-2.7-r1.ebuild
+++ b/net-www/wwwoffle/wwwoffle-2.7-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-www/wwwoffle/wwwoffle-2.7-r1.ebuild,v 1.10 2003/02/13 15:45:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7-r1.ebuild,v 1.11 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${P}
 
@@ -14,59 +14,52 @@ KEYWORDS="x86 sparc "
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="sys-devel/flex 
+DEPEND="sys-devel/flex
 	sys-libs/zlib
 	sys-devel/gcc
 	virtual/glibc"
 
 
 src_compile() {
-    
-    local myconf
-    use ipv6	&& myconf="$myconf --with-ipv6" 	|| myconf="$myconf --without-ipv6"
-    ./configure $myconf --prefix=/usr --with-confdir=/etc	|| die
-    
-    emake || die
-    
+	local myconf
+	use ipv6	&& myconf="$myconf --with-ipv6" 	|| myconf="$myconf --without-ipv6"
+	./configure $myconf --prefix=/usr --with-confdir=/etc	|| die
+
+	emake || die
 }
 
 src_install () {
-    
-    # Install the files
-    make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
-    
-    cd ${D}/etc
-    mv wwwoffle.conf 1
-    sed -e "s:${D}::" 1 > wwwoffle.conf
-    rm 1
-    
-    # Install the wwwoffled init script
-    exeinto /etc/init.d
-    doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
-    
-    # someday i'll make it use the file in /etc. for now we at least get
-    # config file protection this way.
-    dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
-    
-}
+	# Install the files
+	make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
 
-pkg_preinst() {
+	cd ${D}/etc
+	mv wwwoffle.conf 1
+	sed -e "s:${D}::" 1 > wwwoffle.conf
+	rm 1
 
-    source /etc/init.d/functions.sh
-    if [ -L ${svcdir}/started/wwwoffled ]; then
-	einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
-restart the script."
-	/etc/init.d/wwwoffled stop
-	touch ${T}/restart
-    fi
+	# Install the wwwoffled init script
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
 
+	# someday i'll make it use the file in /etc. for now we at least get
+	# config file protection this way.
+	dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
+}
+
+pkg_preinst() {
+	source /etc/init.d/functions.sh
+	if [ -L ${svcdir}/started/wwwoffled ]; then
+		einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
+		restart the script."
+		/etc/init.d/wwwoffled stop
+		touch ${T}/restart
+	fi
 }
 
 pkg_postinst() {
-    
-    if [ -f "${T}/restart" ]; then
-	einfo "Starting the wwwoffled initscript again..."
-	/etc/init.d/wwwoffled start
-	rm ${T}/restart
-    fi
+	if [ -f "${T}/restart" ]; then
+		einfo "Starting the wwwoffled initscript again..."
+		/etc/init.d/wwwoffled start
+		rm ${T}/restart
+	fi
 }
diff --git a/net-www/wwwoffle/wwwoffle-2.7b.ebuild b/net-www/wwwoffle/wwwoffle-2.7b.ebuild
index e32945ba59ea..e27a07ae9bff 100644
--- a/net-www/wwwoffle/wwwoffle-2.7b.ebuild
+++ b/net-www/wwwoffle/wwwoffle-2.7b.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-www/wwwoffle/wwwoffle-2.7b.ebuild,v 1.9 2003/02/13 15:45:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7b.ebuild,v 1.10 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${P}
 
@@ -14,59 +14,52 @@ KEYWORDS="x86 sparc "
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="sys-devel/flex 
+DEPEND="sys-devel/flex
 	sys-libs/zlib
 	sys-devel/gcc
 	virtual/glibc"
 
 
 src_compile() {
-    
-    local myconf
-    use ipv6	&& myconf="$myconf --with-ipv6" 	|| myconf="$myconf --without-ipv6"
-    ./configure $myconf --prefix=/usr --with-confdir=/etc	|| die
-    
-    emake || die
-    
+	local myconf
+	use ipv6	&& myconf="$myconf --with-ipv6" 	|| myconf="$myconf --without-ipv6"
+	./configure $myconf --prefix=/usr --with-confdir=/etc	|| die
+
+	emake || die
 }
 
 src_install () {
-    
-    # Install the files
-    make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
-    
-    cd ${D}/etc
-    mv wwwoffle.conf 1
-    sed -e "s:${D}::" 1 > wwwoffle.conf
-    rm 1
-    
-    # Install the wwwoffled init script
-    exeinto /etc/init.d
-    doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
-    
-    # someday i'll make it use the file in /etc. for now we at least get
-    # config file protection this way.
-    dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
-    
-}
+	# Install the files
+	make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
 
-pkg_preinst() {
+	cd ${D}/etc
+	mv wwwoffle.conf 1
+	sed -e "s:${D}::" 1 > wwwoffle.conf
+	rm 1
 
-    source /etc/init.d/functions.sh
-    if [ -L ${svcdir}/started/wwwoffled ]; then
-	einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
-restart the script."
-	/etc/init.d/wwwoffled stop
-	touch ${T}/restart
-    fi
+	# Install the wwwoffled init script
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
 
+	# someday i'll make it use the file in /etc. for now we at least get
+	# config file protection this way.
+	dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
+}
+
+pkg_preinst() {
+	source /etc/init.d/functions.sh
+		if [ -L ${svcdir}/started/wwwoffled ]; then
+		einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
+		restart the script."
+		/etc/init.d/wwwoffled stop
+		touch ${T}/restart
+	fi
 }
 
 pkg_postinst() {
-    
-    if [ -f "${T}/restart" ]; then
-	einfo "Starting the wwwoffled initscript again..."
-	/etc/init.d/wwwoffled start
-	rm ${T}/restart
-    fi
+	if [ -f "${T}/restart" ]; then
+		einfo "Starting the wwwoffled initscript again..."
+		/etc/init.d/wwwoffled start
+		rm ${T}/restart
+	fi
 }
diff --git a/net-www/wwwoffle/wwwoffle-2.7d.ebuild b/net-www/wwwoffle/wwwoffle-2.7d.ebuild
index ad824ee77f1a..7812ad49491c 100644
--- a/net-www/wwwoffle/wwwoffle-2.7d.ebuild
+++ b/net-www/wwwoffle/wwwoffle-2.7d.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-www/wwwoffle/wwwoffle-2.7d.ebuild,v 1.7 2003/02/13 15:45:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7d.ebuild,v 1.8 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${P}
 
@@ -14,59 +14,52 @@ KEYWORDS="x86 sparc "
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="sys-devel/flex 
+DEPEND="sys-devel/flex
 	sys-libs/zlib
 	sys-devel/gcc
 	virtual/glibc"
 
 
 src_compile() {
-    
-    local myconf
-    use ipv6	&& myconf="$myconf --with-ipv6" 	|| myconf="$myconf --without-ipv6"
-    ./configure $myconf --prefix=/usr --with-confdir=/etc	|| die
-    
-    emake || die
-    
+	local myconf
+	use ipv6	&& myconf="$myconf --with-ipv6" 	|| myconf="$myconf --without-ipv6"
+	./configure $myconf --prefix=/usr --with-confdir=/etc	|| die
+
+	emake || die
 }
 
 src_install () {
-    
-    # Install the files
-    make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
-    
-    cd ${D}/etc
-    mv wwwoffle.conf 1
-    sed -e "s:${D}::" 1 > wwwoffle.conf
-    rm 1
-    
-    # Install the wwwoffled init script
-    exeinto /etc/init.d
-    doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
-    
-    # someday i'll make it use the file in /etc. for now we at least get
-    # config file protection this way.
-    dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
-    
-}
+	# Install the files
+	make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
 
-pkg_preinst() {
+	cd ${D}/etc
+	mv wwwoffle.conf 1
+	sed -e "s:${D}::" 1 > wwwoffle.conf
+	rm 1
 
-    source /etc/init.d/functions.sh
-    if [ -L ${svcdir}/started/wwwoffled ]; then
-	einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
-restart the script."
-	/etc/init.d/wwwoffled stop
-	touch ${T}/restart
-    fi
+	# Install the wwwoffled init script
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
 
+	# someday i'll make it use the file in /etc. for now we at least get
+	# config file protection this way.
+	dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
+}
+
+pkg_preinst() {
+	source /etc/init.d/functions.sh
+	if [ -L ${svcdir}/started/wwwoffled ]; then
+		einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
+		restart the script."
+		/etc/init.d/wwwoffled stop
+		touch ${T}/restart
+	fi
 }
 
 pkg_postinst() {
-    
-    if [ -f "${T}/restart" ]; then
-	einfo "Starting the wwwoffled initscript again..."
-	/etc/init.d/wwwoffled start
-	rm ${T}/restart
-    fi
+	if [ -f "${T}/restart" ]; then
+		einfo "Starting the wwwoffled initscript again..."
+		/etc/init.d/wwwoffled start
+		rm ${T}/restart
+	fi
 }
diff --git a/net-www/wwwoffle/wwwoffle-2.7g.ebuild b/net-www/wwwoffle/wwwoffle-2.7g.ebuild
index 8296c16e5b28..3084c149c410 100644
--- a/net-www/wwwoffle/wwwoffle-2.7g.ebuild
+++ b/net-www/wwwoffle/wwwoffle-2.7g.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-www/wwwoffle/wwwoffle-2.7g.ebuild,v 1.2 2003/02/13 15:45:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7g.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${P}
 
@@ -14,59 +14,52 @@ KEYWORDS="x86 ~sparc "
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="sys-devel/flex 
+DEPEND="sys-devel/flex
 	sys-libs/zlib
 	sys-devel/gcc
 	virtual/glibc"
 
 
 src_compile() {
-    
-    local myconf
-    use ipv6	&& myconf="$myconf --with-ipv6" 	|| myconf="$myconf --without-ipv6"
-    ./configure $myconf --prefix=/usr --with-confdir=/etc	|| die
-    
-    emake || die
-    
+	local myconf
+	use ipv6	&& myconf="$myconf --with-ipv6" 	|| myconf="$myconf --without-ipv6"
+	./configure $myconf --prefix=/usr --with-confdir=/etc	|| die
+
+	emake || die
 }
 
 src_install () {
-    
-    # Install the files
-    make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
-    
-    cd ${D}/etc
-    mv wwwoffle.conf 1
-    sed -e "s:${D}::" 1 > wwwoffle.conf
-    rm 1
-    
-    # Install the wwwoffled init script
-    exeinto /etc/init.d
-    doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
-    
-    # someday i'll make it use the file in /etc. for now we at least get
-    # config file protection this way.
-    dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
-    
-}
+	# Install the files
+	make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
 
-pkg_preinst() {
+	cd ${D}/etc
+	mv wwwoffle.conf 1
+	sed -e "s:${D}::" 1 > wwwoffle.conf
+	rm 1
 
-    source /etc/init.d/functions.sh
-    if [ -L ${svcdir}/started/wwwoffled ]; then
-	einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
-restart the script."
-	/etc/init.d/wwwoffled stop
-	touch ${T}/restart
-    fi
+	# Install the wwwoffled init script
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
 
+	# someday i'll make it use the file in /etc. for now we at least get
+	# config file protection this way.
+	dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
+}
+
+pkg_preinst() {
+	source /etc/init.d/functions.sh
+	if [ -L ${svcdir}/started/wwwoffled ]; then
+		einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
+		restart the script."
+		/etc/init.d/wwwoffled stop
+		touch ${T}/restart
+	fi
 }
 
 pkg_postinst() {
-    
-    if [ -f "${T}/restart" ]; then
-	einfo "Starting the wwwoffled initscript again..."
-	/etc/init.d/wwwoffled start
-	rm ${T}/restart
-    fi
+	if [ -f "${T}/restart" ]; then
+		einfo "Starting the wwwoffled initscript again..."
+		/etc/init.d/wwwoffled start
+		rm ${T}/restart
+	fi
 }
diff --git a/net-www/wwwoffle/wwwoffle-2.7h.ebuild b/net-www/wwwoffle/wwwoffle-2.7h.ebuild
index dc0864cfbc63..3382bc05697b 100644
--- a/net-www/wwwoffle/wwwoffle-2.7h.ebuild
+++ b/net-www/wwwoffle/wwwoffle-2.7h.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-www/wwwoffle/wwwoffle-2.7h.ebuild,v 1.3 2003/07/16 14:33:00 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/wwwoffle-2.7h.ebuild,v 1.4 2003/09/06 01:54:09 msterret Exp $
 
 S=${WORKDIR}/${P}
 
@@ -14,59 +14,52 @@ KEYWORDS="~x86 ~sparc ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="sys-devel/flex 
+DEPEND="sys-devel/flex
 	sys-libs/zlib
 	sys-devel/gcc
 	virtual/glibc"
 
 
 src_compile() {
-    
-    local myconf
-    use ipv6	&& myconf="$myconf --with-ipv6" 	|| myconf="$myconf --without-ipv6"
-    ./configure $myconf --prefix=/usr --with-confdir=/etc	|| die
-    
-    emake || die
-    
-}
+	local myconf
+	use ipv6	&& myconf="$myconf --with-ipv6" 	|| myconf="$myconf --without-ipv6"
+	./configure $myconf --prefix=/usr --with-confdir=/etc	|| die
 
-src_install () {
-    
-    # Install the files
-    make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
-    
-    cd ${D}/etc
-    mv wwwoffle.conf 1
-    sed -e "s:${D}::" 1 > wwwoffle.conf
-    rm 1
-    
-    # Install the wwwoffled init script
-    exeinto /etc/init.d
-    doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
-    
-    # someday i'll make it use the file in /etc. for now we at least get
-    # config file protection this way.
-    dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
-    
+	emake || die
 }
 
-pkg_preinst() {
+src_install() {
+	# Install the files
+	make prefix=${D}/usr SPOOLDIR=${D}/var/spool/wwwoffle CONFDIR=${D}/etc install || die
+
+	cd ${D}/etc
+	mv wwwoffle.conf 1
+	sed -e "s:${D}::" 1 > wwwoffle.conf
+	rm 1
 
-    source /etc/init.d/functions.sh
-    if [ -L ${svcdir}/started/wwwoffled ]; then
-	einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
-restart the script."
-	/etc/init.d/wwwoffled stop
-	touch ${T}/restart
-    fi
+	# Install the wwwoffled init script
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/{wwwoffled-online,wwwoffled}
 
+	# someday i'll make it use the file in /etc. for now we at least get
+	# config file protection this way.
+	dosym /etc/wwwoffle.conf /var/spool/wwwoffle/wwwoffle.conf
+}
+
+pkg_preinst() {
+	source /etc/init.d/functions.sh
+	if [ -L ${svcdir}/started/wwwoffled ]; then
+		einfo "The wwwoffled init script is running. I'll stop it, merge the new files and
+		restart the script."
+		/etc/init.d/wwwoffled stop
+		touch ${T}/restart
+	fi
 }
 
 pkg_postinst() {
-    
-    if [ -f "${T}/restart" ]; then
-	einfo "Starting the wwwoffled initscript again..."
-	/etc/init.d/wwwoffled start
-	rm ${T}/restart
-    fi
+	if [ -f "${T}/restart" ]; then
+		einfo "Starting the wwwoffled initscript again..."
+		/etc/init.d/wwwoffled start
+		rm ${T}/restart
+	fi
 }
diff --git a/net-www/zoneminder/Manifest b/net-www/zoneminder/Manifest
index 50fc9316c467..5e17378b6cba 100644
--- a/net-www/zoneminder/Manifest
+++ b/net-www/zoneminder/Manifest
@@ -1,3 +1,3 @@
-MD5 f2489a585f7e4cb6d2981e46019edc9a zoneminder-0.9.12.ebuild 1991
 MD5 d38cdf9f93233ca75dbe1ff1b550d575 ChangeLog 770
+MD5 2fd9b8e280427da9c4ee6187a4378418 zoneminder-0.9.12.ebuild 1991
 MD5 cf91c423242d440d538cec3f4cd0940b files/digest-zoneminder-0.9.12 129
diff --git a/net-www/zoneminder/zoneminder-0.9.12.ebuild b/net-www/zoneminder/zoneminder-0.9.12.ebuild
index 6e9c309c1d52..e0b63e256f25 100644
--- a/net-www/zoneminder/zoneminder-0.9.12.ebuild
+++ b/net-www/zoneminder/zoneminder-0.9.12.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-www/zoneminder/zoneminder-0.9.12.ebuild,v 1.1 2003/06/20 20:14:08 mkeadle Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/zoneminder/zoneminder-0.9.12.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
 
 DESCRIPTION="ZoneMinder allows you to capture, analyse, record and monitor any cameras attached to your system."
 HOMEPAGE="http://www.zoneminder.com/"
@@ -30,7 +30,7 @@ src_compile() {
 
 	# Apache is flexible, so we should follow suit
 	local datadir=`grep ^apache: /etc/passwd | cut -d: -f6`
-	if [ -z "$datadir" ] 
+	if [ -z "$datadir" ]
 	then
 		datadir="/home/httpd"
 		eerror ":: Cannot find the apache user on your system! ::"
author	Michael Sterrett <msterret@gentoo.org>	2003-09-06 01:54:14 +0000
committer	Michael Sterrett <msterret@gentoo.org>	2003-09-06 01:54:14 +0000
commit	2fd2f631d89f219ec232de6edf22129a4a1e7309 (patch)
tree	7784ecd3779bf27d955c9733f40999958b7d25f8 /net-www
parent	header fix (diff)
download	gentoo-2-2fd2f631d89f219ec232de6edf22129a4a1e7309.tar.gz gentoo-2-2fd2f631d89f219ec232de6edf22129a4a1e7309.tar.bz2 gentoo-2-2fd2f631d89f219ec232de6edf22129a4a1e7309.zip