repoman: trim trailing whitespace

108 files changed, 413 insertions, 413 deletions

diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index b3bb197dd1c5..529aef089fa8 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,11 +1,11 @@
-MD5 325d1deb6afb67a19869b8151337d65d ant-1.5.3-r5.ebuild 2722
-MD5 37ea49c933f6ce5796efc1f13447fd86 ant-1.5.3-r4.ebuild 2348
-MD5 f33f280117cdd28e922dacd3ecf1511f ant-1.5.3-r3.ebuild 2244
 MD5 cd73af9a888e25af45cbf9f11080b727 ChangeLog 7082
+MD5 07817088d12c2579bd57a9598980ad39 ant-1.5.3-r5.ebuild 2716
+MD5 1e22b07ff4f5f54e5196e7d4ed90a022 ant-1.5.3-r3.ebuild 2243
+MD5 f55f46431cdb5a25bb09c99178bf2474 ant-1.5.3-r4.ebuild 2343
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 f3735fcade77d65a1c47338fe8662b43 files/build.sh-exit-fix.patch.gz 269
+MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r5 76
 MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r3 76
 MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r4 76
-MD5 0bf5f1d0dfa292c160318e00bb085a3e files/digest-ant-1.5.3-r5 76
+MD5 f3735fcade77d65a1c47338fe8662b43 files/build.sh-exit-fix.patch.gz 269
 MD5 6e22e7d1b121a847e107b6498f48e0a4 files/1.5.3/ant 2207
 MD5 4807f353ae3c243717ccd5bcdc8ee3cf files/1.5.3/1_6_backport-jdk142.patch.gz 940
diff --git a/dev-java/ant/ant-1.5.3-r3.ebuild b/dev-java/ant/ant-1.5.3-r3.ebuild
index 28209286793a..25f06301e3c5 100644
--- a/dev-java/ant/ant-1.5.3-r3.ebuild
+++ b/dev-java/ant/ant-1.5.3-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/dev-java/ant/ant-1.5.3-r3.ebuild,v 1.2 2003/07/11 21:41:46 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.3-r3.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -31,7 +31,7 @@ src_compile() {
 			export DEP_APPEND="${DEP_APPEND} xalan"
 		fi
 	fi
-	
+
 	# Add Xerces in if we have it
 	if [ -f "/usr/share/xerces/lib/xercesImpl.jar" ] ; then
 		export CLASSPATH="${CLASSPATH}:/usr/share/xerces/lib/xercesImpl.jar:/usr/share/xerces/lib/xml-apis.jar"
@@ -43,7 +43,7 @@ src_compile() {
 		export CLASSPATH="${CLASSPATH}:/usr/share/oro/lib/oro.jar"
 		export DEP_APPEND="${DEP_APPEND} oro"
 	fi
-	
+
 	# Add beanutils if we have it
 	if [ -f "/usr/share/commons-beanutils/lib/commons-beanutils.jar" ] ; then
 		export CLASSPATH="${CLASSPATH}:/usr/share/commons-beanutils/lib/commons-beanutils.jar"
@@ -55,18 +55,18 @@ src_compile() {
 		export CLASSPATH="${CLASSPATH}:/usr/share/antlr/lib/antlr.jar"
 		export DEP_APPEND="${DEP_APPEND} antlr"
 	fi
-	
+
 	./build.sh -Ddist.dir=${D}/usr/share/ant || die
 }
 
 src_install() {
 	cp ${FILESDIR}/${PV}/ant ${S}/src/ant
-	
+
 	exeinto /usr/bin
 	doexe src/ant
 
 	java-pkg_dojar build/lib/*.jar
-	
+
 	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
 	use doc && dohtml welcome.html
 	use doc && dohtml -r docs/*
diff --git a/dev-java/ant/ant-1.5.3-r4.ebuild b/dev-java/ant/ant-1.5.3-r4.ebuild
index f4a35e71bf42..86d69b6e786f 100644
--- a/dev-java/ant/ant-1.5.3-r4.ebuild
+++ b/dev-java/ant/ant-1.5.3-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/dev-java/ant/ant-1.5.3-r4.ebuild,v 1.1 2003/05/26 11:05:17 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.3-r4.ebuild,v 1.2 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -31,7 +31,7 @@ src_compile() {
 			export DEP_APPEND="${DEP_APPEND} xalan"
 		fi
 	fi
-	
+
 	# Add Xerces in if we have it
 	if [ -f "/usr/share/xerces/lib/xercesImpl.jar" ] ; then
 		export CLASSPATH="${CLASSPATH}:/usr/share/xerces/lib/xercesImpl.jar:/usr/share/xerces/lib/xml-apis.jar"
@@ -43,7 +43,7 @@ src_compile() {
 		export CLASSPATH="${CLASSPATH}:/usr/share/oro/lib/oro.jar"
 		export DEP_APPEND="${DEP_APPEND} oro"
 	fi
-	
+
 	# Add beanutils if we have it
 	if [ -f "/usr/share/commons-beanutils/lib/commons-beanutils.jar" ] ; then
 		export CLASSPATH="${CLASSPATH}:/usr/share/commons-beanutils/lib/commons-beanutils.jar"
@@ -55,13 +55,13 @@ src_compile() {
 		export CLASSPATH="${CLASSPATH}:/usr/share/antlr/lib/antlr.jar"
 		export DEP_APPEND="${DEP_APPEND} antlr"
 	fi
-	
+
 	./build.sh -Ddist.dir=${D}/usr/share/ant || die
 }
 
 src_install() {
 	cp ${FILESDIR}/${PV}/ant ${S}/src/ant
-	
+
 	exeinto /usr/bin
 	doexe src/ant
 	for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do
@@ -69,7 +69,7 @@ src_install() {
 	done
 
 	java-pkg_dojar build/lib/*.jar
-	
+
 	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
 	use doc && dohtml welcome.html
 	use doc && dohtml -r docs/*
diff --git a/dev-java/ant/ant-1.5.3-r5.ebuild b/dev-java/ant/ant-1.5.3-r5.ebuild
index 082d863daf95..1a84dc9c97df 100644
--- a/dev-java/ant/ant-1.5.3-r5.ebuild
+++ b/dev-java/ant/ant-1.5.3-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/dev-java/ant/ant-1.5.3-r5.ebuild,v 1.2 2003/08/11 16:14:11 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.5.3-r5.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -22,8 +22,8 @@ src_unpack() {
 	# Patch build.sh to die with non-zero exit code in case of errors.
 	# This patch may be useful for all ant versions.
 	epatch ${FILESDIR}/build.sh-exit-fix.patch.gz
-	
-	# Incorporate changes from upcoming ant-1.6 into 1.5.3 to 
+
+	# Incorporate changes from upcoming ant-1.6 into 1.5.3 to
 	# enable building ant with java >=sun-jdk-1.4.2
 	epatch ${FILESDIR}/${PV}/1_6_backport-jdk142.patch.gz
 }
@@ -44,7 +44,7 @@ src_compile() {
 			export DEP_APPEND="${DEP_APPEND} xalan"
 		fi
 	fi
-	
+
 	# Add Xerces in if we have it
 	if [ -f "/usr/share/xerces/lib/xercesImpl.jar" ] ; then
 		export CLASSPATH="${CLASSPATH}:/usr/share/xerces/lib/xercesImpl.jar:/usr/share/xerces/lib/xml-apis.jar"
@@ -56,7 +56,7 @@ src_compile() {
 		export CLASSPATH="${CLASSPATH}:/usr/share/oro/lib/oro.jar"
 		export DEP_APPEND="${DEP_APPEND} oro"
 	fi
-	
+
 	# Add beanutils if we have it
 	if [ -f "/usr/share/commons-beanutils/lib/commons-beanutils.jar" ] ; then
 		export CLASSPATH="${CLASSPATH}:/usr/share/commons-beanutils/lib/commons-beanutils.jar"
@@ -68,13 +68,13 @@ src_compile() {
 		export CLASSPATH="${CLASSPATH}:/usr/share/antlr/lib/antlr.jar"
 		export DEP_APPEND="${DEP_APPEND} antlr"
 	fi
-	
+
 	./build.sh -Ddist.dir=${D}/usr/share/ant || die
 }
 
 src_install() {
 	cp ${FILESDIR}/${PV}/ant ${S}/src/ant
-	
+
 	exeinto /usr/bin
 	doexe src/ant
 	for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do
@@ -82,7 +82,7 @@ src_install() {
 	done
 
 	java-pkg_dojar build/lib/*.jar
-	
+
 	dodoc LICENSE LICENSE.* README WHATSNEW KEYS
 	use doc && dohtml welcome.html
 	use doc && dohtml -r docs/*
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 28a9b6bb72df..3cbcbe2cbe49 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -1,8 +1,8 @@
-MD5 8efd9e1c9f6d4878b94ecb0eb816c117 antlr-2.7.1-r3.ebuild 950
-MD5 95f8efe0a281db216ad081d53e95a2c6 antlr-2.7.2.ebuild 999
 MD5 2f2dc23f5b6f3c9750f320402201b844 ChangeLog 2479
+MD5 8efd9e1c9f6d4878b94ecb0eb816c117 antlr-2.7.1-r3.ebuild 950
+MD5 7fc26c22a828a0469026c3b6c4595857 antlr-2.7.2.ebuild 999
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 abd32014c7d5dc82f792f5e290b4527a files/antlr-2.7.2-gcc3-gentoo.patch 433
+MD5 abd32014c7d5dc82f792f5e290b4527a files/antlr-2.7.2_alpha2-gcc3-gentoo.patch 433
 MD5 5eb1d6f0cdc3ffa1c2adbb6013b07f45 files/digest-antlr-2.7.1-r3 64
 MD5 aab6733e0c585de1db478492c41e94b9 files/digest-antlr-2.7.2 64
-MD5 abd32014c7d5dc82f792f5e290b4527a files/antlr-2.7.2_alpha2-gcc3-gentoo.patch 433
diff --git a/dev-java/antlr/antlr-2.7.2.ebuild b/dev-java/antlr/antlr-2.7.2.ebuild
index 947ff668840d..dceaa479f746 100644
--- a/dev-java/antlr/antlr-2.7.2.ebuild
+++ b/dev-java/antlr/antlr-2.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/dev-java/antlr/antlr-2.7.2.ebuild,v 1.4 2003/08/15 06:00:29 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.2.ebuild,v 1.5 2003/09/06 22:26:46 msterret Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A parser generator for Java and C++, written in Java"
@@ -23,7 +23,7 @@ src_compile() {
 		export JAVAC=jikes
 	fi
 	echo $CLASSPATH
-	econf || die	
+	econf || die
 	make antlr.jar antlr.debug.jar antlrall.jar all || die
 }
 
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 99f7273bec1a..9750b01625da 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,4 +1,4 @@
-MD5 a66edbf8b317086eaa2a1784b42c4a80 batik-1.1.1.ebuild 919
 MD5 c71c9d5feba821198bb212d1f3c923f1 ChangeLog 468
+MD5 cf9dfa6333f26ec9fad2e71b3f7e0a53 batik-1.1.1.ebuild 922
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 685865b8912d441af280a79904e061c8 files/digest-batik-1.1.1 65
diff --git a/dev-java/batik/batik-1.1.1.ebuild b/dev-java/batik/batik-1.1.1.ebuild
index 67bf8442d557..de4117306804 100644
--- a/dev-java/batik/batik-1.1.1.ebuild
+++ b/dev-java/batik/batik-1.1.1.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/dev-java/batik/batik-1.1.1.ebuild,v 1.3 2003/07/11 21:41:47 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.1.1.ebuild,v 1.4 2003/09/06 22:26:46 msterret Exp $
 
 S=${WORKDIR}/xml-batik
 DESCRIPTION="Batik is a Java(tm) technology based toolkit for applications or applets that want to use images in the Scalable Vector Graphics (SVG) format for various purposes, such as viewing, generation or manipulation."
@@ -26,7 +26,7 @@ src_install () {
 
 	dojar ${P}/batik*.jar
 	dojar ${P}/lib/*.jar
-	
+
 	dodoc README LICENSE LICENSE.rhino
 	dohtml -r ${P}/docs/
 }
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index 443acac8cde0..9843fec0d7b2 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,5 +1,5 @@
-MD5 88f16b1c12a8814d078c5eb3906d2218 files/bcel-5.1-gentoo.diff 457
-MD5 4259eb38f8431da842c2b40c302d0ebb files/digest-bcel-5.1 64
 MD5 f18850f07b51e1680522ece2b90c2b88 ChangeLog 352
-MD5 2a9ddc3366ed964eeb974b339f60a4d3 bcel-5.1.ebuild 1126
+MD5 70818f56cdb5b53ad18bbe49a26b1c12 bcel-5.1.ebuild 1126
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 88f16b1c12a8814d078c5eb3906d2218 files/bcel-5.1-gentoo.diff 457
+MD5 4259eb38f8431da842c2b40c302d0ebb files/digest-bcel-5.1 64
diff --git a/dev-java/bcel/bcel-5.1.ebuild b/dev-java/bcel/bcel-5.1.ebuild
index d63e50a8e200..e1241f21a052 100644
--- a/dev-java/bcel/bcel-5.1.ebuild
+++ b/dev-java/bcel/bcel-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/dev-java/bcel/bcel-5.1.ebuild,v 1.2 2003/08/05 16:08:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcel/bcel-5.1.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg eutils
 
@@ -23,7 +23,7 @@ src_compile() {
 	ANT_OPTS="${myc}"
 	CLASSPATH="${CLASSPATH}:`/usr/bin/java-config --classpath=regexp`"
 	epatch ${FILESDIR}/${P}-gentoo.diff
-	
+
 	use jikes && export ANT_OPTS="${ANT_OPTS} -Dbuild.compiler=jikes"
 	ant jar || die "Compile failed during jar target."
 	if [ -n "`use doc`" ] ; then
@@ -34,6 +34,6 @@ src_compile() {
 
 src_install() {
 	use doc && dohtml -r docs/
-	dodoc LICENSE.txt 
+	dodoc LICENSE.txt
 	java-pkg_dojar bin/bcel.jar
 }
diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
index 5f895eef3f55..a55acab0dfcb 100644
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -1,9 +1,9 @@
 MD5 72c8445b4d328605f2f05a145798c23a ChangeLog 7087
-MD5 2df37f260177dc9f759a30f2fa4ca7f5 blackdown-jdk-1.3.1-r10.ebuild 2367
-MD5 05b007e32660db1fd667fb4327aa44d4 blackdown-jdk-1.3.1-r7.ebuild 2425
-MD5 0648ff3b7d90ae24de07528804a10b22 blackdown-jdk-1.3.1-r8.ebuild 2248
-MD5 ec7dfdc5e8b85ec2cdbeac84c0715aed blackdown-jdk-1.3.1-r9.ebuild 2262
-MD5 501cc4674d4c772828d40c2b9ca3687b blackdown-jdk-1.4.1.ebuild 2554
+MD5 2459e761bbaa35f89908cba1c7250012 blackdown-jdk-1.3.1-r10.ebuild 2362
+MD5 51981cb15ac3751113094987cfd3ec55 blackdown-jdk-1.3.1-r7.ebuild 2422
+MD5 2b7f2bae0a4d951ec7bcacb2ca57398a blackdown-jdk-1.3.1-r8.ebuild 2245
+MD5 d520f66daca12f546ff47287f5fc18ea blackdown-jdk-1.3.1-r9.ebuild 2259
+MD5 5d1c2eebb1acdf30c718253316a8574e blackdown-jdk-1.4.1.ebuild 2530
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 ac654d06ac05f2084d3eba1fdd187133 files/blackdown-jdk-1.3.1 727
 MD5 e60282859f42c5eee8df3dc1fed160a0 files/blackdown-jdk-1.4.1 727
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild
index 8db0373d3a3d..e7d2b900b80f 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.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/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v 1.2 2003/05/24 06:35:35 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r10.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 IUSE="doc"
 
@@ -51,7 +51,7 @@ src_install () {
 
 	dodir /opt/${P}/share/java
 	cp -R ${S}/{demo,src.jar} ${D}/opt/${P}/share
-	
+
 	dodoc COPYRIGHT LICENSE README INSTALL
 	dohtml README.html
 
@@ -64,7 +64,7 @@ src_install () {
 		PLATFORM="sparc"
 	fi
 
-	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so 
+	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
@@ -73,10 +73,10 @@ src_install () {
 		< ${D}/opt/${P}/jre/lib/font.properties.orig \
 		> ${D}/opt/${P}/jre/lib/font.properties
 	rm ${D}/opt/${P}/jre/lib/font.properties.orig
-	
+
 	dosym /opt/blackdown-jdk-1.3.1/include/linux/jni_md.h \
-		/opt/blackdown-jdk-1.3.1/include/jni_md.h 
-	
+		/opt/blackdown-jdk-1.3.1/include/jni_md.h
+
 	# install env into /etc/env.d
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild
index cb8f53dbe0a0..6ab41a3103a0 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.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/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild,v 1.19 2003/05/24 06:35:35 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r7.ebuild,v 1.20 2003/09/06 22:26:46 msterret Exp $
 
 IUSE="doc"
 
@@ -46,7 +46,7 @@ src_install () {
 
 	dodir /opt/${P}/share/java
 	cp -R ${S}/{demo,src.jar} ${D}/opt/${P}/share
-	
+
 	dodoc COPYRIGHT LICENSE README INSTALL
 	dohtml README.html
 
@@ -59,7 +59,7 @@ src_install () {
 		PLATFORM="sparc"
 	fi
 
-	install_mozilla_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so 
+	install_mozilla_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
@@ -68,7 +68,7 @@ src_install () {
 		< ${D}/opt/${P}/jre/lib/font.properties.orig \
 		> ${D}/opt/${P}/jre/lib/font.properties
 	rm ${D}/opt/${P}/jre/lib/font.properties.orig
-	
+
 	# install env into /etc/env.d
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild
index 3ff6b7f6064a..59f5ce7b1b5c 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.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/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.5 2003/05/24 06:35:35 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r8.ebuild,v 1.6 2003/09/06 22:26:46 msterret Exp $
 
 IUSE="doc"
 
@@ -46,7 +46,7 @@ src_install () {
 
 	dodir /opt/${P}/share/java
 	cp -R ${S}/{demo,src.jar} ${D}/opt/${P}/share
-	
+
 	dodoc COPYRIGHT LICENSE README INSTALL
 	dohtml README.html
 
@@ -59,7 +59,7 @@ src_install () {
 		PLATFORM="sparc"
 	fi
 
-	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so 
+	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
@@ -68,7 +68,7 @@ src_install () {
 		< ${D}/opt/${P}/jre/lib/font.properties.orig \
 		> ${D}/opt/${P}/jre/lib/font.properties
 	rm ${D}/opt/${P}/jre/lib/font.properties.orig
-	
+
 	# install env into /etc/env.d
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild
index 2a987198999f..abbd0467dd36 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.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/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild,v 1.3 2003/05/24 06:35:35 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r9.ebuild,v 1.4 2003/09/06 22:26:46 msterret Exp $
 
 IUSE="doc"
 
@@ -51,7 +51,7 @@ src_install () {
 
 	dodir /opt/${P}/share/java
 	cp -R ${S}/{demo,src.jar} ${D}/opt/${P}/share
-	
+
 	dodoc COPYRIGHT LICENSE README INSTALL
 	dohtml README.html
 
@@ -64,7 +64,7 @@ src_install () {
 		PLATFORM="sparc"
 	fi
 
-	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so 
+	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
@@ -73,7 +73,7 @@ src_install () {
 		< ${D}/opt/${P}/jre/lib/font.properties.orig \
 		> ${D}/opt/${P}/jre/lib/font.properties
 	rm ${D}/opt/${P}/jre/lib/font.properties.orig
-	
+
 	# install env into /etc/env.d
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
index 480f41fa1865..eed3131adecf 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild,v 1.7 2003/09/01 11:29:06 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1.ebuild,v 1.8 2003/09/06 22:26:46 msterret Exp $
 
 IUSE="doc"
 
@@ -35,14 +35,14 @@ PROVIDE="virtual/jdk-1.4.1
 # Extract the 'skip' value (offset of tarball) we should pass to tail
 get_offset() {
 	[ ! -f "$1" ] && return
-        
+
 	local offset="`gawk '
 		/^[[:space:]]*skip[[:space:]]*=/ {
 
 			sub(/^[[:space:]]*skip[[:space:]]*=/, "")
 			SKIP = $0
 		}
-                
+
 		END { print SKIP }
 	' $1`"
 
@@ -71,7 +71,7 @@ src_install () {
 
 	dodir /opt/${P}/share/java
 	cp -a ${S}/{demo,src.zip} ${D}/opt/${P}/share
-	
+
 	dodoc COPYRIGHT LICENSE README INSTALL
 	dohtml README.html
 
@@ -84,13 +84,13 @@ src_install () {
 		PLATFORM="sparc"
 	fi
 
-	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so 
+	inst_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
 
 	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
 
 	dosed "s/standard symbols l/symbol/g" \
 		/opt/${P}/jre/lib/font.properties
-	
+
 	# install env into /etc/env.d
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 
diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest
index 01ee403c9050..606adcf2005b 100644
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -1,7 +1,7 @@
 MD5 2ed4570019b3eee59e0d5a36795fe536 ChangeLog 3780
-MD5 71ad2f6ff19f26e91a066fd285c0057d blackdown-jre-1.3.1-r7.ebuild 2163
-MD5 3a5e1c96c20f7d602dfa348e4031f0cc blackdown-jre-1.3.1-r8.ebuild 1992
-MD5 22ae7ff3e5dc596afadf17ab4d8db0e3 blackdown-jre-1.3.1-r9.ebuild 2168
+MD5 8ea8dc2a7554020ee94b4b236000c48a blackdown-jre-1.3.1-r7.ebuild 2165
+MD5 527d446b49718467cc9db35a135108e8 blackdown-jre-1.3.1-r8.ebuild 1994
+MD5 0ac6aac6d73be78c670cca0cde0a32a1 blackdown-jre-1.3.1-r9.ebuild 2170
 MD5 dacfe22dd5d3140712b2246563585d8d blackdown-jre-1.4.1.ebuild 2212
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 60f9af5767a218c44dd128c4f4d4b0ab files/blackdown-jre-1.3.1 562
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
index 0f8cd9eb0702..f1936e4115d2 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.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/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild,v 1.24 2003/09/06 12:13:12 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r7.ebuild,v 1.25 2003/09/06 22:26:46 msterret Exp $
 
 inherit java
 
@@ -20,7 +20,7 @@ LICENSE="sun-bcla-java-vm"
 KEYWORDS="x86 ppc sparc"
 
 src_unpack () {
-	if (use ppc) || (use sparc) ; then 
+	if (use ppc) || (use sparc) ; then
 		tail -n +422 ${DISTDIR}/${A} | tar xjf -
 	else
 		unpack ${A}
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.ebuild
index 2af2cffcaf32..5bb98edc729d 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.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/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.ebuild,v 1.7 2003/09/06 12:13:12 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r8.ebuild,v 1.8 2003/09/06 22:26:46 msterret Exp $
 
 inherit java nsplugins
 
@@ -20,7 +20,7 @@ LICENSE="sun-bcla-java-vm"
 KEYWORDS="~x86 ~ppc ~sparc"
 
 src_unpack () {
-	if (use ppc) || (use sparc) ; then 
+	if (use ppc) || (use sparc) ; then
 		tail -n +422 ${DISTDIR}/${A} | tar xjf -
 	else
 		unpack ${A}
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild
index f3021b2e8bd7..522d55c23ed6 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.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/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.4 2003/09/06 12:13:12 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r9.ebuild,v 1.5 2003/09/06 22:26:46 msterret Exp $
 
 IUSE=""
 
@@ -24,7 +24,7 @@ LICENSE="sun-bcla-java-vm"
 KEYWORDS="ppc"
 
 src_unpack () {
-	if (use ppc) || (use sparc) || (use sparc64) ; then 
+	if (use ppc) || (use sparc) || (use sparc64) ; then
                 # this is built on gcc 3.2 so only update if gcc 3.x is present
                 [ -z "${CC}" ] && CC=gcc
                 if [ "`${CC} -dumpversion | cut -d. -f1,2`" = "2.95" ] ; then
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index d05fc783e93f..df9656e07e8e 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,5 +1,5 @@
-MD5 cf3c72796fa6c5cb9fb97dfe3e8e2434 commons-cli-1.0-r2.ebuild 909
 MD5 3039f38455c43dff738c3383626d83e8 ChangeLog 1568
+MD5 e0845ce51dd3407e71373f1a98a659a4 commons-cli-1.0-r2.ebuild 909
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 ff275165684fda9ed2a9d819df2399e1 files/commons-cli-1.0-gentoo.diff 538
 MD5 8e1e3125e998bf49313b7e5ac3a5b1a0 files/digest-commons-cli-1.0-r2 62
diff --git a/dev-java/commons-cli/commons-cli-1.0-r2.ebuild b/dev-java/commons-cli/commons-cli-1.0-r2.ebuild
index a1fcfbd7c263..6ac1d3eccec3 100644
--- a/dev-java/commons-cli/commons-cli-1.0-r2.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.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/dev-java/commons-cli/commons-cli-1.0-r2.ebuild,v 1.4 2003/04/26 05:36:58 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.0-r2.ebuild,v 1.5 2003/09/06 22:26:46 msterret Exp $
 
 inherit jakarta-commons
 
@@ -18,7 +18,7 @@ IUSE="doc jikes junit"
 
 src_compile() {
 	patch -d ${S} -p0 < ${FILESDIR}/${PN}-${PV}-gentoo.diff || die "Could not correct version in build.xml"
-	jakarta-commons_src_compile myconf make 
+	jakarta-commons_src_compile myconf make
 	use doc && jakarta-commons_src_compile makedoc
 }
 
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index af9712cd2c99..769c74d99ac3 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,4 +1,4 @@
-MD5 96cac9f95e9a5355df488d03a5a67824 commons-collections-2.1-r3.ebuild 837
 MD5 a85d96eb992d041e0371a4d740260ef0 ChangeLog 2350
+MD5 da8a7e11489c01776848b4e7754cb6cd commons-collections-2.1-r3.ebuild 837
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 a7f25fdfedae6ea7bacf4df7c4961691 files/digest-commons-collections-2.1-r3 71
diff --git a/dev-java/commons-collections/commons-collections-2.1-r3.ebuild b/dev-java/commons-collections/commons-collections-2.1-r3.ebuild
index dde84f7c654b..2fd72ab31c31 100644
--- a/dev-java/commons-collections/commons-collections-2.1-r3.ebuild
+++ b/dev-java/commons-collections/commons-collections-2.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/dev-java/commons-collections/commons-collections-2.1-r3.ebuild,v 1.5 2003/04/26 05:36:58 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/commons-collections-2.1-r3.ebuild,v 1.6 2003/09/06 22:26:46 msterret Exp $
 
 inherit jakarta-commons
 
@@ -19,7 +19,7 @@ KEYWORDS="x86 ppc sparc"
 IUSE="doc jikes junit"
 
 src_compile() {
-	jakarta-commons_src_compile myconf make 
+	jakarta-commons_src_compile myconf make
 	use doc && jakarta-commons_src_compile makedoc
 }
 
diff --git a/dev-java/commons-discovery/Manifest b/dev-java/commons-discovery/Manifest
index d524971af01b..fdb5676a8a27 100644
--- a/dev-java/commons-discovery/Manifest
+++ b/dev-java/commons-discovery/Manifest
@@ -1,6 +1,6 @@
-MD5 8eb7d488dd25e91a8ba0559e32be143d commons-discovery-0.2.ebuild 1127
 MD5 560eddc995286254cabe443751eaff7a ChangeLog 766
+MD5 72277eb63b3d6bd5c84aa96cc79691bf commons-discovery-0.1.ebuild 1143
+MD5 99c574223a07914a8759ad414250f971 commons-discovery-0.2.ebuild 1130
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 442d15ad15a75df4b80001d212014037 commons-discovery-0.1.ebuild 1144
 MD5 971e794584138fdf2937ca0d7f0c28a4 files/digest-commons-discovery-0.1 140
 MD5 c986a5b1efe7715c57da38bb9423ef86 files/digest-commons-discovery-0.2 76
diff --git a/dev-java/commons-discovery/commons-discovery-0.1.ebuild b/dev-java/commons-discovery/commons-discovery-0.1.ebuild
index dd5772a5aac9..48f6f5f74a3e 100644
--- a/dev-java/commons-discovery/commons-discovery-0.1.ebuild
+++ b/dev-java/commons-discovery/commons-discovery-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/dev-java/commons-discovery/commons-discovery-0.1.ebuild,v 1.2 2003/04/06 07:46:36 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/commons-discovery-0.1.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit jakarta-commons
 
@@ -22,7 +22,7 @@ src_compile() {
 	echo "logger.jar=`java-config --classpath=commons-logging`" | sed s/\=.*:/\=/ >> build.properties
 	jakarta-commons_src_compile myconf make
 	use doc && jakarta-commons_src_compile makedoc
-	
+
 	# UGLY HACK
 	mv ${S}/target/conf/MANIFEST.MF ${S}/target/classes/
 	cd ${S}/target/classes
diff --git a/dev-java/commons-discovery/commons-discovery-0.2.ebuild b/dev-java/commons-discovery/commons-discovery-0.2.ebuild
index 6f2c5290e547..effcf21996e6 100644
--- a/dev-java/commons-discovery/commons-discovery-0.2.ebuild
+++ b/dev-java/commons-discovery/commons-discovery-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/dev-java/commons-discovery/commons-discovery-0.2.ebuild,v 1.3 2003/07/11 21:41:47 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-discovery/commons-discovery-0.2.ebuild,v 1.4 2003/09/06 22:26:46 msterret Exp $
 
 inherit jakarta-commons
 
@@ -22,7 +22,7 @@ src_compile() {
 	echo "logger.jar=`java-config --classpath=commons-logging`" | sed s/\=.*:/\=/ >> build.properties
 	jakarta-commons_src_compile myconf make
 	use doc && jakarta-commons_src_compile makedoc
-	
+
 	# UGLY HACK
 	mv ${S}/target/conf/MANIFEST.MF ${S}/target/classes/
 	cd ${S}/target/classes
diff --git a/dev-java/compaq-jdk/Manifest b/dev-java/compaq-jdk/Manifest
index c6a783643c7c..84390eaa59ee 100644
--- a/dev-java/compaq-jdk/Manifest
+++ b/dev-java/compaq-jdk/Manifest
@@ -1,5 +1,5 @@
-MD5 1ff9052c6614e643ed3b90bc3bea2d0d compaq-jdk-1.3.1.ebuild 1690
 MD5 8db6b3ecb2bc6770eac5fa65512ade33 ChangeLog 554
+MD5 ffba63cb3a88bd7f42b65c659ff0d7f4 compaq-jdk-1.3.1.ebuild 1471
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-compaq-jdk-1.3.1 0
 MD5 59269f84d1bfe8cc6ae68e5685327f33 files/compaq-jdk-1.3.1 588
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-compaq-jdk-1.3.1 0
diff --git a/dev-java/compaq-jdk/compaq-jdk-1.3.1.ebuild b/dev-java/compaq-jdk/compaq-jdk-1.3.1.ebuild
index 77cbe2b1c821..5e84e8587602 100644
--- a/dev-java/compaq-jdk/compaq-jdk-1.3.1.ebuild
+++ b/dev-java/compaq-jdk/compaq-jdk-1.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1.ebuild,v 1.6 2003/05/09 19:54:41 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jdk/compaq-jdk-1.3.1.ebuild,v 1.7 2003/09/06 22:26:46 msterret Exp $
 
 IUSE="doc"
 
-inherit java 
+inherit java
 
 At="jdk-1.3.1-1-linux-alpha.tgz"
 S=${WORKDIR}/jdk1.3.1
@@ -25,7 +25,7 @@ PROVIDE="virtual/jre-1.3.1
 LICENSE="compaq-sdla"
 SLOT="1.3"
 KEYWORDS="-x86 -ppc -sparc alpha"
-	
+
 src_unpack() {
 	if [ ! -f ${DISTDIR}/${At} ] ; then
 		die "Please download ${At} from ${HOMEPAGE}"
@@ -33,14 +33,14 @@ src_unpack() {
 	tar zxf ${DISTDIR}/${At}
 	rpm2targz jdk-1.3.1-1-linux-alpha.rpm
 	tar zxf jdk-1.3.1-1-linux-alpha.tar.gz >& /dev/null
-	mv usr/java/jdk1.3.1 . 
+	mv usr/java/jdk1.3.1 .
 }
 
 src_install () {
 	local dirs="bin include include-old jre lib"
 	dodir /opt/${P}
-	
-	
+
+
 	for i in $dirs ; do
 		cp -a $i ${D}/opt/${P}/
 	done
@@ -56,8 +56,8 @@ src_install () {
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
 
-pkg_postinst () {                                                               
+pkg_postinst () {
 	# Set as default VM if none exists
 	java_pkg_postinst
-}                                                                             
-                                                                            
+}
+
diff --git a/dev-java/compaq-jre/Manifest b/dev-java/compaq-jre/Manifest
index 8a6848684b27..9fb4c5f1243e 100644
--- a/dev-java/compaq-jre/Manifest
+++ b/dev-java/compaq-jre/Manifest
@@ -1,5 +1,5 @@
-MD5 f18d5242eb2374dde537a7b52ed63478 compaq-jre-1.3.1.ebuild 1589
 MD5 36f913d195ba852eb5f4d5233438c2c9 ChangeLog 555
+MD5 446d8254d56a5e590ed78ab4a97a4948 compaq-jre-1.3.1.ebuild 1370
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 f9a24914c5318149c7f5e68437137447 files/compaq-jre-1.3.1 548
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-compaq-jre-1.3.1 0
diff --git a/dev-java/compaq-jre/compaq-jre-1.3.1.ebuild b/dev-java/compaq-jre/compaq-jre-1.3.1.ebuild
index 88d5b306c569..50361a434622 100644
--- a/dev-java/compaq-jre/compaq-jre-1.3.1.ebuild
+++ b/dev-java/compaq-jre/compaq-jre-1.3.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/compaq-jre-1.3.1.ebuild,v 1.4 2003/05/09 19:54:41 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/compaq-jre/compaq-jre-1.3.1.ebuild,v 1.5 2003/09/06 22:26:46 msterret Exp $
 
 IUSE="doc"
 
-inherit java 
+inherit java
 
 At="jre-1.3.1-1-linux-alpha.tgz"
 S=${WORKDIR}/jre1.3.1
@@ -24,7 +24,7 @@ PROVIDE="virtual/jre-1.3.1
 LICENSE="compaq-sdla"
 SLOT="1.3"
 KEYWORDS="-x86 -ppc -sparc alpha"
-	
+
 src_unpack() {
 	if [ ! -f ${DISTDIR}/${At} ] ; then
 		die "Please download ${At} from ${HOMEPAGE}"
@@ -32,14 +32,14 @@ src_unpack() {
 	tar zxf ${DISTDIR}/${At}
 	rpm2targz jre-1.3.1-1-linux-alpha.rpm
 	tar zxf jre-1.3.1-1-linux-alpha.tar.gz >& /dev/null
-	mv usr/java/jre1.3.1 . 
+	mv usr/java/jre1.3.1 .
 }
 
 src_install () {
 	local dirs="bin lib"
 	dodir /opt/${P}
-	
-	
+
+
 	for i in $dirs ; do
 		cp -a $i ${D}/opt/${P}/
 	done
@@ -52,8 +52,8 @@ src_install () {
 	set_java_env ${FILESDIR}/${VMHANDLE} || die
 }
 
-pkg_postinst () {                                                               
+pkg_postinst () {
 	# Set as default VM if none exists
 	java_pkg_postinst
-}                                                                             
-                                                                            
+}
+
diff --git a/dev-java/fesi/Manifest b/dev-java/fesi/Manifest
index 9e42cf9dacc6..b620b9b83cfd 100644
--- a/dev-java/fesi/Manifest
+++ b/dev-java/fesi/Manifest
@@ -1,4 +1,4 @@
-MD5 b5b9bbe1a82ea7a675bf043b12009599 fesi-1.ebuild 659
 MD5 164e50f783897c8be1b4d0b91b2035f2 ChangeLog 921
+MD5 fd86a591d029cd1cb9b8bb671d521ca5 fesi-1.ebuild 629
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 c26417cf7f016e3d6ab7b1a8f5981b08 files/digest-fesi-1 56
diff --git a/dev-java/fesi/fesi-1.ebuild b/dev-java/fesi/fesi-1.ebuild
index f7b8aac0611a..687c8e101917 100644
--- a/dev-java/fesi/fesi-1.ebuild
+++ b/dev-java/fesi/fesi-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/dev-java/fesi/fesi-1.ebuild,v 1.11 2003/02/13 10:09:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fesi/fesi-1.ebuild,v 1.12 2003/09/06 22:26:46 msterret Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="JavaScript Interpreter written in Java"
@@ -15,11 +15,11 @@ src_unpack() {
 	jar -xf ${DISTDIR}/fesikit.zip
 }
 
-src_install() {                               
+src_install() {
 
 	dojar fesi.jar
 
 	into /usr
-	dodoc COPYRIGHT.TXT Readme.txt 
+	dodoc COPYRIGHT.TXT Readme.txt
 	dohtml -r doc/html/*
 }
diff --git a/dev-java/ibm-jdk/Manifest b/dev-java/ibm-jdk/Manifest
index 93f59c32d5bd..7726404f5c55 100644
--- a/dev-java/ibm-jdk/Manifest
+++ b/dev-java/ibm-jdk/Manifest
@@ -1,21 +1,21 @@
+MD5 3c48e4b6c7a8158382fa074311de7b96 ChangeLog 5807
+MD5 8cbe5468165d37bdfe35aa0f7456e577 ibm-jdk-1.3.0-r4.ebuild 1273
+MD5 0e49c103ca84f2e2d2166f5a8ab652cd ibm-jdk-1.3.1-r1.ebuild 1332
+MD5 07b2728373dff64e3b4665c1085b8875 ibm-jdk-1.3.1-r2.ebuild 1251
+MD5 51c6ec409a7dd8e0a6465dbb56bb07fd ibm-jdk-1.3.1-r3.ebuild 1776
 MD5 8c9632e28d597200d5176e56b5326755 ibm-jdk-1.4.0-r1.ebuild 1226
-MD5 0cb3be2ef871340b8f75ecddb45fc5b0 ibm-jdk-1.3.1-r2.ebuild 1251
-MD5 49303711c9d852850c4849675741a12a ibm-jdk-1.3.1-r1.ebuild 1332
-MD5 d63492e0540b1ff60f03a74c8a4a2677 ibm-jdk-1.3.0-r4.ebuild 1273
 MD5 96866baefcdee0f34b345bcfccc0fe20 ibm-jdk-1.4.0-r2.ebuild 1132
-MD5 14166b6f155d7a783f4e964a843e2d1d ibm-jdk-1.3.1-r3.ebuild 1774
-MD5 3c48e4b6c7a8158382fa074311de7b96 ChangeLog 5807
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 1b27d916d9f2b67ce92ea58933857cd4 ibm-jdk-1.4.1.ebuild 1912
-MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.3.0-r4 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.3.1-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.3.1-r2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.3.1-r3 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.4.0-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.4.0-r2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.4.1 0
 MD5 75736c3713a763a0f9a45efd9e1da3a4 files/ibm-jdk-1.3.0 580
 MD5 9ae91d234d420cc6d86162f6baee6909 files/ibm-jdk-1.3.1 580
 MD5 676087c42e5c3d2cb63de0199ad6fb75 files/ibm-jdk-1.4.0 726
+MD5 971e2c067f8f28bd0f7c882607650469 files/cpuinfo 12
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jdk-1.4.1 0
 MD5 c2a3afcbcfa06a46b04f5f93adf0c0c2 files/ibm-jdk-1.4.1 581
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild
index 1d1b55cb8d12..e8fb7b97a48b 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.3.0-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/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild,v 1.14 2003/02/13 10:09:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.0-r4.ebuild,v 1.15 2003/09/06 22:26:46 msterret Exp $
 
 IUSE="doc"
 
@@ -42,11 +42,11 @@ src_install () {
 	for i in demo javasrc.jar ; do
 		cp -dpR $i ${D}/opt/${P}/share/
 	done
-	
+
 	dohtml -a html,htm,HTML -r docs
 	dodoc docs/COPYRIGHT
 
-	# Plugin is disabled as it crashes all the time	
+	# Plugin is disabled as it crashes all the time
 #	if [ "`use mozilla`" ] ; then
 #		dodir /usr/lib/mozilla/plugins
 #		dosym /opt/${P}/jre/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild
index 95fe3c21fff3..5e4de568320a 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.3.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/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild,v 1.15 2003/02/13 10:09:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.1-r1.ebuild,v 1.16 2003/09/06 22:26:46 msterret Exp $
 
 IUSE="doc"
 
@@ -42,11 +42,11 @@ src_install () {
 	for i in demo src.jar ; do
 		cp -dpR $i ${D}/opt/${P}/share/
 	done
-	
+
 	dohtml -a html,htm,HTML -r docs
 	dodoc docs/COPYRIGHT
 
-	# Plugin is disabled as it crashes all the time	
+	# Plugin is disabled as it crashes all the time
 #	if [ "`use mozilla`" ] ; then
 #		dodir /usr/lib/mozilla/plugins
 #		dosym /opt/${P}/jre/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r2.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r2.ebuild
index 6b667c78d9c0..f4422c9af0b3 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r2.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.3.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/dev-java/ibm-jdk/ibm-jdk-1.3.1-r2.ebuild,v 1.5 2003/02/13 10:09:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.1-r2.ebuild,v 1.6 2003/09/06 22:26:46 msterret Exp $
 
 IUSE="doc"
 
@@ -42,11 +42,11 @@ src_install () {
 	for i in demo src.jar ; do
 		cp -dpR $i ${D}/opt/${P}/share/
 	done
-	
+
 	dohtml -a html,htm,HTML -r docs
 	dodoc docs/COPYRIGHT
 
-	# Plugin is disabled as it crashes all the time	
+	# Plugin is disabled as it crashes all the time
 	## inst_plugin /opt/${P}/jre/bin/libjavaplugin_oji.so
 
 	set_java_env ${FILESDIR}/${VMHANDLE}
diff --git a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r3.ebuild b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r3.ebuild
index 6d6a503d509d..494e95acdebc 100644
--- a/dev-java/ibm-jdk/ibm-jdk-1.3.1-r3.ebuild
+++ b/dev-java/ibm-jdk/ibm-jdk-1.3.1-r3.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/dev-java/ibm-jdk/ibm-jdk-1.3.1-r3.ebuild,v 1.1 2003/02/18 20:02:33 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk/ibm-jdk-1.3.1-r3.ebuild,v 1.2 2003/09/06 22:26:46 msterret Exp $
 
 IUSE="doc"
 
@@ -54,11 +54,11 @@ src_install () {
 	for i in demo src.jar ; do
 		cp -dpR $i ${D}/opt/${P}/share/
 	done
-	
+
 	dohtml -a html,htm,HTML -r docs
 	dodoc COPYRIGHT
 
-	# Plugin is disabled as it crashes all the time	
+	# Plugin is disabled as it crashes all the time
 	## inst_plugin /opt/${P}/jre/bin/libjavaplugin_oji.so
 
 	set_java_env ${FILESDIR}/${VMHANDLE}
diff --git a/dev-java/ibm-jre/Manifest b/dev-java/ibm-jre/Manifest
index 1a52cc71c6a4..339b5c538a68 100644
--- a/dev-java/ibm-jre/Manifest
+++ b/dev-java/ibm-jre/Manifest
@@ -1,15 +1,15 @@
-MD5 4f09013dc5ff33b3cdc46431d7c81195 ibm-jre-1.4.0-r2.ebuild 1085
-MD5 d5df88eb4674054a15f4e8b97f8055de ibm-jre-1.3.0-r3.ebuild 1680
-MD5 652e76f73a1c3591cddd82162656bb84 ibm-jre-1.4.0-r1.ebuild 1317
-MD5 c937d18c5faa2e6eed7fd8874a4ed46c ibm-jre-1.3.1-r2.ebuild 1111
 MD5 755c57b3d3044635dd9fd6a1634580e3 ChangeLog 3641
-MD5 3979cb14415e1346e35c8d6c6d7f1448 ibm-jre-1.3.1-r1.ebuild 1690
+MD5 1fff1680f8255c28f0a81a5717724f4e ibm-jre-1.3.0-r3.ebuild 1682
+MD5 53c05925a23e333c7817e85e2e4fa06f ibm-jre-1.3.1-r1.ebuild 1691
+MD5 c937d18c5faa2e6eed7fd8874a4ed46c ibm-jre-1.3.1-r2.ebuild 1111
+MD5 652e76f73a1c3591cddd82162656bb84 ibm-jre-1.4.0-r1.ebuild 1317
+MD5 4f09013dc5ff33b3cdc46431d7c81195 ibm-jre-1.4.0-r2.ebuild 1085
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 a73a7fe7c8d1fdc4b889de313c038fa5 files/ibm-jre-1.3.0 524
-MD5 9d2bb8d0966243d813fa88c5d0563a6c files/ibm-jre-1.3.1 524
-MD5 37b5c01aa155b0159af97cb802ea6167 files/ibm-jre-1.4.0 771
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.3.0-r3 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.3.1-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.3.1-r2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.4.0-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ibm-jre-1.4.0-r2 0
+MD5 a73a7fe7c8d1fdc4b889de313c038fa5 files/ibm-jre-1.3.0 524
+MD5 9d2bb8d0966243d813fa88c5d0563a6c files/ibm-jre-1.3.1 524
+MD5 37b5c01aa155b0159af97cb802ea6167 files/ibm-jre-1.4.0 771
diff --git a/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild b/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild
index 15efc23a4b95..66e68f22d094 100644
--- a/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild
+++ b/dev-java/ibm-jre/ibm-jre-1.3.0-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/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild,v 1.9 2003/02/13 10:09:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ibm-jre-1.3.0-r3.ebuild,v 1.10 2003/09/06 22:26:46 msterret Exp $
 
 At=IBMJava2-JRE-13.tgz
 S=${WORKDIR}/IBMJava2-13
@@ -38,7 +38,7 @@ src_install () {
 #		dodir /usr/lib/mozilla/plugins
 #		dosym /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
 #	fi
-	
+
 	dodir /etc/env.d/java
 	sed \
 		-e "s/@P@/${P}/g" \
diff --git a/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild b/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild
index eca2bc50cb8f..601befefb117 100644
--- a/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild
+++ b/dev-java/ibm-jre/ibm-jre-1.3.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/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild,v 1.10 2003/02/13 10:09:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre/ibm-jre-1.3.1-r1.ebuild,v 1.11 2003/09/06 22:26:46 msterret Exp $
 
 At=IBMJava2-JRE-131.tgz
 S=${WORKDIR}/IBMJava2-131
@@ -38,7 +38,7 @@ src_install () {
 #		dodir /usr/lib/mozilla/plugins
 #		dosym /opt/${P}/bin/libjavaplugin_oji.so /usr/lib/mozilla/plugins/
 #	fi
-	
+
 	dodir /etc/env.d/java
 	sed \
 		-e "s/@P@/${P}/g" \
diff --git a/dev-java/infobus/Manifest b/dev-java/infobus/Manifest
index cb8c063bd2d0..babda6f6d092 100644
--- a/dev-java/infobus/Manifest
+++ b/dev-java/infobus/Manifest
@@ -1,4 +1,4 @@
-MD5 8b472f2d4c30324089c4ee073a0db314 infobus-1.2.ebuild 1238
 MD5 c131e12d28854afb74397a34873bc160 ChangeLog 421
+MD5 e26265126a5177c9a7b712f405e05a15 infobus-1.2.ebuild 1237
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-infobus-1.2 0
diff --git a/dev-java/infobus/infobus-1.2.ebuild b/dev-java/infobus/infobus-1.2.ebuild
index 70c4a4d5a99c..d036967c25d4 100644
--- a/dev-java/infobus/infobus-1.2.ebuild
+++ b/dev-java/infobus/infobus-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/dev-java/infobus/infobus-1.2.ebuild,v 1.4 2003/08/24 03:00:38 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/infobus/infobus-1.2.ebuild,v 1.5 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -22,7 +22,7 @@ src_unpack() {
 		echo  "!!! Missing ${DISTDIR}/${At}"
 		echo  " "
 		einfo " "
-		einfo " Due to license restrictions, we cannot fetch the" 
+		einfo " Due to license restrictions, we cannot fetch the"
 		einfo " distributables automagically."
 		einfo " "
 		einfo " 1. Visit ${HOMEPAGE}"
@@ -33,7 +33,7 @@ src_unpack() {
 		die "User must manually download distfile"
 	fi
 	unzip -qq ${DISTDIR}/${At}
-}	
+}
 
 src_compile() {
 	einfo " This is a binary-only ebuild."
diff --git a/dev-java/jaf/Manifest b/dev-java/jaf/Manifest
index 7d5a4b41d249..4dc527663689 100644
--- a/dev-java/jaf/Manifest
+++ b/dev-java/jaf/Manifest
@@ -1,4 +1,4 @@
-MD5 e9567f8720cf3819a4ee118598049533 jaf-1.0.2.ebuild 1239
 MD5 c37c3055e2a381ae657b299b15f9a487 ChangeLog 407
+MD5 dab2109e4e556af0d188081dc2db4524 jaf-1.0.2.ebuild 1238
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jaf-1.0.2 0
diff --git a/dev-java/jaf/jaf-1.0.2.ebuild b/dev-java/jaf/jaf-1.0.2.ebuild
index 711d06a070c8..70701b0fe1a3 100644
--- a/dev-java/jaf/jaf-1.0.2.ebuild
+++ b/dev-java/jaf/jaf-1.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/dev-java/jaf/jaf-1.0.2.ebuild,v 1.4 2003/08/24 03:00:38 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaf/jaf-1.0.2.ebuild,v 1.5 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -22,7 +22,7 @@ src_unpack() {
 		echo  "!!! Missing ${DISTDIR}/${At}"
 		echo  " "
 		einfo " "
-		einfo " Due to license restrictions, we cannot fetch the" 
+		einfo " Due to license restrictions, we cannot fetch the"
 		einfo " distributables automagically."
 		einfo " "
 		einfo " 1. Visit ${HOMEPAGE}"
@@ -33,7 +33,7 @@ src_unpack() {
 		die "User must manually download distfile"
 	fi
 	unzip -qq ${DISTDIR}/${At}
-}	
+}
 
 src_compile() {
 	einfo " This is a binary-only ebuild."
diff --git a/dev-java/java-gnome/Manifest b/dev-java/java-gnome/Manifest
index 398f4e8f087e..d27c25f4d0e7 100644
--- a/dev-java/java-gnome/Manifest
+++ b/dev-java/java-gnome/Manifest
@@ -1,4 +1,4 @@
-MD5 ac8255d0df5145d4288d5dcb9cd84545 java-gnome-0.7.1.ebuild 2069
 MD5 2dbe0934f181f9f78708696e4c8b9b15 ChangeLog 1147
+MD5 f0ec50221b6fed0a65b74bd5c8fff3d9 java-gnome-0.7.1.ebuild 2065
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 8001e68db9d8cadec9c636eb16c40a23 files/digest-java-gnome-0.7.1 68
diff --git a/dev-java/java-gnome/java-gnome-0.7.1.ebuild b/dev-java/java-gnome/java-gnome-0.7.1.ebuild
index 53440af6f81f..1a21713fed00 100644
--- a/dev-java/java-gnome/java-gnome-0.7.1.ebuild
+++ b/dev-java/java-gnome/java-gnome-0.7.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/dev-java/java-gnome/java-gnome-0.7.1.ebuild,v 1.13 2003/07/11 21:41:53 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-0.7.1.ebuild,v 1.14 2003/09/06 22:26:46 msterret Exp $
 
 IUSE="gnome"
 
@@ -20,7 +20,7 @@ KEYWORDS="x86 ~ppc ~sparc"
 
 src_compile() {
 	local myconf
-	
+
 	#JAVAC="`which jikes` -classpath $CLASSPATH:." \
 		./configure \
 		--host=${CHOST} \
@@ -39,7 +39,7 @@ src_compile() {
 	cp src/tools/Makefile src/tools/Makefile.orig
 	sed -e "s|CLASSPATH = .|CLASSPATH = ${myclasspath}\:.|" \
 		< src/tools/Makefile.orig > src/tools/Makefile
-	
+
 	cp test/Makefile test/Makefile.orig
 	sed -e "s|CLASSPATH = ../lib/gtk.jar\:../lib/gnome.jar|CLASSPATH = ${myclasspath}\:.\:../lib/gtk.jar\:../lib/gnome.jar|" \
 		< test/Makefile.orig > test/Makefile
@@ -51,9 +51,9 @@ src_compile() {
 
 src_install () {
 	make prefix=${D}/usr install || die
-	
+
 	mv ${D}/usr/doc ${D}/usr/share/
-	
+
 	rm ${D}/usr/share/java-gtk/gtk.jar
 	rm ${D}/usr/share/java-gtk/gnome.jar
 
@@ -63,8 +63,8 @@ src_install () {
 	dosym /usr/lib/libGNOMEJava.so.${PV} /usr/lib/libGNOMEJava.so
 
 	rm ${D}/usr/share/java-gnome/gtk*.jar
-		
+
 	echo "/usr/share/java-gnome/gnome-${PV}.jar:" \
 		> ${D}/usr/share/java-gnome/classpath.env
-		
+
 }
diff --git a/dev-java/java-gtk/Manifest b/dev-java/java-gtk/Manifest
index ec2687ee9d7e..21dc20c57043 100644
--- a/dev-java/java-gtk/Manifest
+++ b/dev-java/java-gtk/Manifest
@@ -1,4 +1,4 @@
-MD5 222b070fa3ba7226a4c37897032761a6 java-gtk-0.7.1.ebuild 1674
 MD5 593ca50d9534b383683ac722b0989d95 ChangeLog 1108
+MD5 f3b4ea33f665104f6ef49ee25791e96b java-gtk-0.7.1.ebuild 1668
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 8001e68db9d8cadec9c636eb16c40a23 files/digest-java-gtk-0.7.1 68
diff --git a/dev-java/java-gtk/java-gtk-0.7.1.ebuild b/dev-java/java-gtk/java-gtk-0.7.1.ebuild
index a06c5b1e2ebb..fa4eae18c27b 100644
--- a/dev-java/java-gtk/java-gtk-0.7.1.ebuild
+++ b/dev-java/java-gtk/java-gtk-0.7.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/dev-java/java-gtk/java-gtk-0.7.1.ebuild,v 1.12 2003/07/11 21:41:53 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gtk/java-gtk-0.7.1.ebuild,v 1.13 2003/09/06 22:26:46 msterret Exp $
 
 S=${WORKDIR}/java-gnome-${PV}
 DESCRIPTION="GTK+ bindings for Java"
@@ -20,7 +20,7 @@ src_compile() {
 	local myconf
 
 	myconf="--with-gtk-only"
-		
+
 	#JAVAC="`which jikes` -classpath $CLASSPATH:." \
 		./configure \
 		--host=${CHOST} \
@@ -37,25 +37,25 @@ src_compile() {
 	cp src/tools/Makefile src/tools/Makefile.orig
 	sed -e "s|CLASSPATH = .|CLASSPATH = ${CLASSPATH}\:.|" \
 		< src/tools/Makefile.orig > src/tools/Makefile
-	
+
 	cp test/Makefile test/Makefile.orig
 	sed -e "s|CLASSPATH = ../lib/gtk.jar\:../lib/gnome.jar|CLASSPATH = ${CLASSPATH}\:.\:../lib/gtk.jar\:../lib/gnome.jar|" \
 		< test/Makefile.orig > test/Makefile
-	
+
 	make || die
 }
 
 src_install () {
 	make prefix=${D}/usr install || die
-	
+
 	mv ${D}/usr/doc ${D}/usr/share/
-	
+
 	rm ${D}/usr/share/java-gtk/gtk.jar
 
 	rm ${D}/usr/lib/libGTKJava.so
 	dosym /usr/lib/libGTKJava.so.${PV} /usr/lib/libGTKJava.so
-		
+
 	echo "/usr/share/java-gtk/gtk-${PV}.jar:" \
 		> ${D}/usr/share/java-gtk/classpath.env
-		
+
 }
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index 9015c8d9db0a..00dd18cfd3ea 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,8 +1,8 @@
-MD5 fc81d3f6c3c5ad9310ca96bc65df3d2a java-sdk-docs-1.4.2.ebuild 848
-MD5 72a92f4f60ca5a95b25eb649073e460d java-sdk-docs-1.3.1.ebuild 819
-MD5 eba1fd7e4bea3b461d475ddee486a980 java-sdk-docs-1.4.1.ebuild 829
 MD5 005544182018e872a0ce01e9838ed52f ChangeLog 2503
+MD5 d892c16837498e3af4cff24c2abc987a java-sdk-docs-1.3.1.ebuild 818
+MD5 7733ec771277f5bcf4601ee6d96e3a14 java-sdk-docs-1.4.1.ebuild 829
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 61a7e7969b74727017faf74c9de0f1c0 java-sdk-docs-1.4.2.ebuild 847
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-java-sdk-docs-1.3.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-java-sdk-docs-1.4.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-java-sdk-docs-1.4.2 0
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild
index 1cd7e5901f6f..f1af72a82f6e 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.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/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild,v 1.8 2003/08/24 03:00:38 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.3.1.ebuild,v 1.9 2003/09/06 22:26:46 msterret Exp $
 
 At="j2sdk-1_3_1-doc.zip"
 S="${WORKDIR}/docs"
@@ -24,8 +24,8 @@ src_install(){
 	dohtml index.html
 
 	local dirs="api guide images relnotes tooldocs"
-	
+
 	for i in $dirs ; do
 		cp -a $i ${D}/usr/share/doc/${P}/html
-	done	
+	done
 }
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild
index c9a38f3be174..9a7973f59943 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild,v 1.9 2003/08/24 03:00:39 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.4.1.ebuild,v 1.10 2003/09/06 22:26:46 msterret Exp $
 
 At="j2sdk-1_4_1-doc.zip"
 S="${WORKDIR}/docs"
@@ -24,8 +24,8 @@ src_install(){
 	dohtml index.html
 
 	local dirs="api guide images relnotes tooldocs"
-	
+
 	for i in $dirs ; do
 		cp -a $i ${D}/usr/share/doc/${P}/html
-	done	
+	done
 }
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
index ef27ff952540..2eb3d61e0a64 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.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/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild,v 1.5 2003/08/24 03:00:39 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.4.2.ebuild,v 1.6 2003/09/06 22:26:46 msterret Exp $
 
 At="j2sdk-1_4_2-doc.zip"
 S="${WORKDIR}/docs"
@@ -24,9 +24,9 @@ src_install(){
 	dohtml index.html
 
 	local dirs="api guide images relnotes tooldocs"
-	
+
 	for i in $dirs ; do
 		cp -a $i ${D}/usr/share/doc/${P}/html
-	done	
+	done
 }
 
diff --git a/dev-java/javamail/Manifest b/dev-java/javamail/Manifest
index 9e066b7f601a..e62ad1fb9cf3 100644
--- a/dev-java/javamail/Manifest
+++ b/dev-java/javamail/Manifest
@@ -1,6 +1,6 @@
-MD5 678dcd068baab4ba534d48da6e8b8ec9 javamail-1.3.ebuild 1354
-MD5 252f1ceac2192222d2f56105d9635358 javamail-1.3.1.ebuild 1357
 MD5 cca49320e6b1783103bd8ed222fad553 ChangeLog 606
+MD5 7f91b59fe76a4d685d782bacf9c48251 javamail-1.3.ebuild 1353
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-javamail-1.3.1 0
+MD5 434fb023de54f36079896a539ca89b49 javamail-1.3.1.ebuild 1356
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-javamail-1.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-javamail-1.3.1 0
diff --git a/dev-java/javamail/javamail-1.3.1.ebuild b/dev-java/javamail/javamail-1.3.1.ebuild
index 01dc510018bc..2b1fc7ec12af 100644
--- a/dev-java/javamail/javamail-1.3.1.ebuild
+++ b/dev-java/javamail/javamail-1.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/dev-java/javamail/javamail-1.3.1.ebuild,v 1.2 2003/08/24 03:00:40 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javamail/javamail-1.3.1.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -25,7 +25,7 @@ src_unpack() {
 		echo  "!!! Missing ${DISTDIR}/${At}"
 		echo  " "
 		einfo " "
-		einfo " Due to license restrictions, we cannot fetch the" 
+		einfo " Due to license restrictions, we cannot fetch the"
 		einfo " distributables automagically."
 		einfo " "
 		einfo " 1. Visit ${HOMEPAGE}"
@@ -36,7 +36,7 @@ src_unpack() {
 		die "User must manually download distfile"
 	fi
 	unzip -qq ${DISTDIR}/${At}
-}	
+}
 
 src_compile() {
 	einfo " This is a binary-only ebuild."
diff --git a/dev-java/javamail/javamail-1.3.ebuild b/dev-java/javamail/javamail-1.3.ebuild
index 6a8bc4cf3f15..04cf492c46c7 100644
--- a/dev-java/javamail/javamail-1.3.ebuild
+++ b/dev-java/javamail/javamail-1.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/dev-java/javamail/javamail-1.3.ebuild,v 1.4 2003/08/24 03:00:41 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javamail/javamail-1.3.ebuild,v 1.5 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -25,7 +25,7 @@ src_unpack() {
 		echo  "!!! Missing ${DISTDIR}/${At}"
 		echo  " "
 		einfo " "
-		einfo " Due to license restrictions, we cannot fetch the" 
+		einfo " Due to license restrictions, we cannot fetch the"
 		einfo " distributables automagically."
 		einfo " "
 		einfo " 1. Visit ${HOMEPAGE}"
@@ -36,7 +36,7 @@ src_unpack() {
 		die "User must manually download distfile"
 	fi
 	unzip -qq ${DISTDIR}/${At}
-}	
+}
 
 src_compile() {
 	einfo " This is a binary-only ebuild."
diff --git a/dev-java/jdbc-mssqlserver/Manifest b/dev-java/jdbc-mssqlserver/Manifest
index 1d1ed0da7909..b7f1545ad9c6 100644
--- a/dev-java/jdbc-mssqlserver/Manifest
+++ b/dev-java/jdbc-mssqlserver/Manifest
@@ -1,4 +1,4 @@
 MD5 1044a56257a97dddee91a66e1262dc8d ChangeLog 382
+MD5 08e0a27322a17af229f7b29202dcb76f jdbc-mssqlserver-2.2.0029.ebuild 1068
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 34cd33627e1c9cddf27ae26b0942f2e2 jdbc-mssqlserver-2.2.0029.ebuild 1070
 MD5 e5f43f0911295336d8eac64f32dcb1be files/digest-jdbc-mssqlserver-2.2.0029 61
diff --git a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-2.2.0029.ebuild b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-2.2.0029.ebuild
index 2635f0c912a0..abb3a0550c11 100644
--- a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-2.2.0029.ebuild
+++ b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-2.2.0029.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/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-2.2.0029.ebuild,v 1.1 2003/05/14 18:08:53 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-2.2.0029.ebuild,v 1.2 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -24,10 +24,10 @@ src_unpack() {
 
 src_compile() {
 	einfo "This is a binary-only ebuild."
-} 
+}
 
 src_install() {
-	dodoc read.me EULA.txt MSfixes.txt 
+	dodoc read.me EULA.txt MSfixes.txt
 	use doc && dohtml -r Help/*
 	use doc && dodoc \
 			books/books.pdf
diff --git a/dev-java/jdbc2-oracle/Manifest b/dev-java/jdbc2-oracle/Manifest
index 5fc379aa939a..7e2e39f31a82 100644
--- a/dev-java/jdbc2-oracle/Manifest
+++ b/dev-java/jdbc2-oracle/Manifest
@@ -1,9 +1,9 @@
-MD5 f005e7056708847487607700deaba2b0 jdbc2-oracle-9.0.1.4.ebuild 2417
-MD5 4d344ff08dbe02d35bfba9979bd78f20 jdbc2-oracle-9.2.0.1.ebuild 2418
-MD5 2e7ff44c8bf5968360d849db804d3224 jdbc2-oracle-8.1.7.ebuild 2207
-MD5 d859c8a6405dd14bfb53d204ac7aac2e jdbc2-oracle-9.2.0.3.ebuild 2419
-MD5 6cb2aca7bcd55689ff085d54db2b0c3c jdbc2-oracle-9.0.1.ebuild 2370
 MD5 ff09fdf17385a35c7975298ac8b9d2d5 ChangeLog 838
+MD5 852d53429dd59a2bef1fad5553831e97 jdbc2-oracle-8.1.7.ebuild 2202
+MD5 7fd3c7c538d445c97a1c706b416b94f4 jdbc2-oracle-9.0.1.4.ebuild 2412
+MD5 105609a847a99a56479548607730cf05 jdbc2-oracle-9.0.1.ebuild 2365
+MD5 f7be4479302b7ae6dc297e6a659dbedf jdbc2-oracle-9.2.0.1.ebuild 2413
+MD5 c9130797daaeb84515e857eb618c5d2b jdbc2-oracle-9.2.0.3.ebuild 2414
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jdbc2-oracle-8.1.7 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jdbc2-oracle-9.0.1 0
diff --git a/dev-java/jdbc2-oracle/jdbc2-oracle-8.1.7.ebuild b/dev-java/jdbc2-oracle/jdbc2-oracle-8.1.7.ebuild
index 05180062004d..ff9fb8f41b73 100644
--- a/dev-java/jdbc2-oracle/jdbc2-oracle-8.1.7.ebuild
+++ b/dev-java/jdbc2-oracle/jdbc2-oracle-8.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/jdbc2-oracle-8.1.7.ebuild,v 1.2 2003/08/24 03:00:42 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/jdbc2-oracle-8.1.7.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -25,8 +25,8 @@ FILE3=${P}-javadoc.tar
 src_unpack() {
 	# Build File List
 	FILELIST="${FILE1} ${FILE2}"
-	use doc > /dev/null && FILELIST="${FILELIST} ${FILE3}" 
-	
+	use doc > /dev/null && FILELIST="${FILELIST} ${FILE3}"
+
 	# Check for distributables
 	echo " "
 	for i in ${FILELIST} ; do
@@ -38,8 +38,8 @@ src_unpack() {
 		fi
 	done
 	echo " "
-	
-	
+
+
 	if [ "${MISSING_FILES}" == "true" ] ; then
 		einfo " "
 		einfo " Because of license terms and file name conventions, please:"
@@ -59,7 +59,7 @@ src_unpack() {
 		einfo " "
 		die "User must manually fetch/rename files"
 	fi
-	
+
 	# Move files back to their original filenames
 	mv ${S}/${FILE1} ${S}/${DISTFILE1}
 	mv ${S}/${FILE2} ${S}/${DISTFILE2}
@@ -68,7 +68,7 @@ src_unpack() {
 
 src_compile() {
 	einfo " This is a binary-only (bytecode) ebuild."
-} 
+}
 
 src_install() {
 	if [ -n "`use doc`" ] ; then
diff --git a/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.4.ebuild b/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.4.ebuild
index 88198fe8e13c..7363b83d351e 100644
--- a/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.4.ebuild
+++ b/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.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/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.4.ebuild,v 1.2 2003/08/24 03:00:42 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.4.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -27,8 +27,8 @@ FILE4=${P}-${DISTFILE4}
 src_unpack() {
 	# Build File List
 	FILELIST="${FILE1} ${FILE2} ${FILE3}"
-	use doc > /dev/null && FILELIST="${FILELIST} ${FILE4}" 
-	
+	use doc > /dev/null && FILELIST="${FILELIST} ${FILE4}"
+
 	# Check for distributables
 	echo " "
 	for i in ${FILELIST} ; do
@@ -40,8 +40,8 @@ src_unpack() {
 		fi
 	done
 	echo " "
-	
-	
+
+
 	if [ "${MISSING_FILES}" == "true" ] ; then
 		einfo " "
 		einfo " Because of license terms and file name conventions, please:"
@@ -63,7 +63,7 @@ src_unpack() {
 		einfo " "
 		die "User must manually fetch/rename files"
 	fi
-	
+
 	# Move files back to their original filenames
 	mv ${S}/${FILE1} ${S}/${DISTFILE1}
 	mv ${S}/${FILE2} ${S}/${DISTFILE2}
@@ -73,7 +73,7 @@ src_unpack() {
 
 src_compile() {
 	einfo " This is a binary-only (bytecode) ebuild."
-} 
+}
 
 src_install() {
 	if [ -n "`use doc`" ] ; then
diff --git a/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.ebuild b/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.ebuild
index f8d9eb5bbad6..f36cbf1ce2c3 100644
--- a/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.ebuild
+++ b/dev-java/jdbc2-oracle/jdbc2-oracle-9.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/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.ebuild,v 1.2 2003/08/24 03:00:42 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/jdbc2-oracle-9.0.1.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -27,8 +27,8 @@ FILE4=${P}-javadoc.zip
 src_unpack() {
 	# Build File List
 	FILELIST="${FILE1} ${FILE2} ${FILE3}"
-	use doc > /dev/null && FILELIST="${FILELIST} ${FILE4}" 
-	
+	use doc > /dev/null && FILELIST="${FILELIST} ${FILE4}"
+
 	# Check for distributables
 	echo " "
 	for i in ${FILELIST} ; do
@@ -40,8 +40,8 @@ src_unpack() {
 		fi
 	done
 	echo " "
-	
-	
+
+
 	if [ "${MISSING_FILES}" == "true" ] ; then
 		einfo " "
 		einfo " Because of license terms and file name conventions, please:"
@@ -63,7 +63,7 @@ src_unpack() {
 		einfo " "
 		die "User must manually fetch/rename files"
 	fi
-	
+
 	# Move files back to their original filenames
 	mv ${S}/${FILE1} ${S}/${DISTFILE1}
 	mv ${S}/${FILE2} ${S}/${DISTFILE2}
@@ -73,7 +73,7 @@ src_unpack() {
 
 src_compile() {
 	einfo " This is a binary-only (bytecode) ebuild."
-} 
+}
 
 src_install() {
 	if [ -n "`use doc`" ] ; then
diff --git a/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.1.ebuild b/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.1.ebuild
index 0e69e0cf8af1..6ac51e637fc1 100644
--- a/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.1.ebuild
+++ b/dev-java/jdbc2-oracle/jdbc2-oracle-9.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/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.1.ebuild,v 1.2 2003/08/24 03:00:42 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.1.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -27,8 +27,8 @@ FILE4=${P}-${DISTFILE4}
 src_unpack() {
 	# Build File List
 	FILELIST="${FILE1} ${FILE2} ${FILE3}"
-	use doc > /dev/null && FILELIST="${FILELIST} ${FILE4}" 
-	
+	use doc > /dev/null && FILELIST="${FILELIST} ${FILE4}"
+
 	# Check for distributables
 	echo " "
 	for i in ${FILELIST} ; do
@@ -40,8 +40,8 @@ src_unpack() {
 		fi
 	done
 	echo " "
-	
-	
+
+
 	if [ "${MISSING_FILES}" == "true" ] ; then
 		einfo " "
 		einfo " Because of license terms and file name conventions, please:"
@@ -63,7 +63,7 @@ src_unpack() {
 		einfo " "
 		die "User must manually fetch/rename files"
 	fi
-	
+
 	# Move files back to their original filenames
 	mv ${S}/${FILE1} ${S}/${DISTFILE1}
 	mv ${S}/${FILE2} ${S}/${DISTFILE2}
@@ -73,7 +73,7 @@ src_unpack() {
 
 src_compile() {
 	einfo " This is a binary-only (bytecode) ebuild."
-} 
+}
 
 src_install() {
 	if [ -n "`use doc`" ] ; then
diff --git a/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild b/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild
index a040c109e97b..f2a41f1bb5c4 100644
--- a/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild
+++ b/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.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/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild,v 1.2 2003/08/24 03:00:42 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-oracle/jdbc2-oracle-9.2.0.3.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -27,8 +27,8 @@ FILE4=${P}-${DISTFILE4}
 src_unpack() {
 	# Build File List
 	FILELIST="${FILE1} ${FILE2} ${FILE3}"
-	use doc > /dev/null && FILELIST="${FILELIST} ${FILE4}" 
-	
+	use doc > /dev/null && FILELIST="${FILELIST} ${FILE4}"
+
 	# Check for distributables
 	echo " "
 	for i in ${FILELIST} ; do
@@ -40,8 +40,8 @@ src_unpack() {
 		fi
 	done
 	echo " "
-	
-	
+
+
 	if [ "${MISSING_FILES}" == "true" ] ; then
 		einfo " "
 		einfo " Because of license terms and file name conventions, please:"
@@ -63,7 +63,7 @@ src_unpack() {
 		einfo " "
 		die "User must manually fetch/rename files"
 	fi
-	
+
 	# Move files back to their original filenames
 	mv ${S}/${FILE1} ${S}/${DISTFILE1}
 	mv ${S}/${FILE2} ${S}/${DISTFILE2}
@@ -73,7 +73,7 @@ src_unpack() {
 
 src_compile() {
 	einfo " This is a binary-only (bytecode) ebuild."
-} 
+}
 
 src_install() {
 	if [ -n "`use doc`" ] ; then
diff --git a/dev-java/jdbc2-postgresql/Manifest b/dev-java/jdbc2-postgresql/Manifest
index b4b71a210bb9..013f21846580 100644
--- a/dev-java/jdbc2-postgresql/Manifest
+++ b/dev-java/jdbc2-postgresql/Manifest
@@ -1,10 +1,10 @@
-MD5 1edfd5c51a1f5d697014254c8ceddee8 jdbc2-postgresql-7.2.ebuild 663
-MD5 ad41f8e945cb60750c3c124ddaceccd9 jdbc2-postgresql-7.1.ebuild 665
-MD5 ec77105dd9f0edac647b079f3151a00d jdbc2-postgresql-7.3.ebuild 663
-MD5 e4bf718bc3453e7983971649736a65e2 jdbc2-postgresql-6.5.2.ebuild 667
 MD5 fa4cf8baa59a3a3ff99b76ac3ac7c30e ChangeLog 980
+MD5 471498c6a42e1ff9a4c2814b143ddb09 jdbc2-postgresql-6.5.2.ebuild 666
+MD5 e861e8108d56a2227bfcd36f4d9296d4 jdbc2-postgresql-7.0.ebuild 664
+MD5 c1cbe04ccd7ff4f41248e8246af69295 jdbc2-postgresql-7.1.ebuild 664
+MD5 3f29ba2d85adaed98a884926690d9d7e jdbc2-postgresql-7.2.ebuild 662
+MD5 513d532eb4002c85246b1cac3206a5a0 jdbc2-postgresql-7.3.ebuild 662
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 b0fcd5f1eb0be06f7a9e5707941f316a jdbc2-postgresql-7.0.ebuild 665
 MD5 f0edb9fd7e6d3526f0b47c582b7f01ba files/digest-jdbc2-postgresql-6.5.2 60
 MD5 ef9c18bdca3a0348f26672d23911e401 files/digest-jdbc2-postgresql-7.0 60
 MD5 81e6098c7ca7ec885a6d18fc3f7ed2c6 files/digest-jdbc2-postgresql-7.1 59
diff --git a/dev-java/jdbc2-postgresql/jdbc2-postgresql-6.5.2.ebuild b/dev-java/jdbc2-postgresql/jdbc2-postgresql-6.5.2.ebuild
index dfc8af3278e1..f2246f5473c5 100644
--- a/dev-java/jdbc2-postgresql/jdbc2-postgresql-6.5.2.ebuild
+++ b/dev-java/jdbc2-postgresql/jdbc2-postgresql-6.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/dev-java/jdbc2-postgresql/jdbc2-postgresql-6.5.2.ebuild,v 1.2 2003/05/14 17:28:22 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-postgresql/jdbc2-postgresql-6.5.2.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -17,7 +17,7 @@ RDEPEND=">=virtual/jdk-1.2"
 
 src_compile() {
 	einfo "This is a binary-only ebuild (for now)."
-} 
+}
 
 src_install() {
 	java-pkg_dojar ${DISTDIR}/${At}
diff --git a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.0.ebuild b/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.0.ebuild
index 6563c31ecb87..8053f3367fb4 100644
--- a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.0.ebuild
+++ b/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.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/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.0.ebuild,v 1.2 2003/05/14 17:28:22 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.0.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -17,7 +17,7 @@ RDEPEND=">=virtual/jdk-1.2"
 
 src_compile() {
 	einfo "This is a binary-only ebuild (for now)."
-} 
+}
 
 src_install() {
 	java-pkg_dojar ${DISTDIR}/${At}
diff --git a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.1.ebuild b/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.1.ebuild
index 52012fcdc2da..9c69f6a89c87 100644
--- a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.1.ebuild
+++ b/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.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/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.1.ebuild,v 1.2 2003/05/14 17:28:22 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.1.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -17,7 +17,7 @@ RDEPEND=">=virtual/jdk-1.2"
 
 src_compile() {
 	einfo "This is a binary-only ebuild (for now)."
-} 
+}
 
 src_install() {
 	java-pkg_dojar ${DISTDIR}/${At}
diff --git a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.2.ebuild b/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.2.ebuild
index 084d6a12b53e..bae3d44595ba 100644
--- a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.2.ebuild
+++ b/dev-java/jdbc2-postgresql/jdbc2-postgresql-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/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.2.ebuild,v 1.2 2003/05/14 17:28:22 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.2.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -17,7 +17,7 @@ RDEPEND=">=virtual/jdk-1.2"
 
 src_compile() {
 	einfo "This is a binary-only ebuild (for now)."
-} 
+}
 
 src_install() {
 	java-pkg_dojar ${DISTDIR}/${At}
diff --git a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.3.ebuild b/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.3.ebuild
index d9ef965da814..cfbee4d05b45 100644
--- a/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.3.ebuild
+++ b/dev-java/jdbc2-postgresql/jdbc2-postgresql-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/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.3.ebuild,v 1.2 2003/05/14 17:28:22 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc2-postgresql/jdbc2-postgresql-7.3.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -17,7 +17,7 @@ RDEPEND=">=virtual/jdk-1.2"
 
 src_compile() {
 	einfo "This is a binary-only ebuild (for now)."
-} 
+}
 
 src_install() {
 	java-pkg_dojar ${DISTDIR}/${At}
diff --git a/dev-java/jdbc3-oracle/Manifest b/dev-java/jdbc3-oracle/Manifest
index bad0e43567f7..8ec05d7b047f 100644
--- a/dev-java/jdbc3-oracle/Manifest
+++ b/dev-java/jdbc3-oracle/Manifest
@@ -1,6 +1,6 @@
-MD5 1bf66f23224bffcd450663a7ff1a71f0 jdbc3-oracle-9.2.0.1.ebuild 2245
-MD5 d1e5fe9e294cf1fdbcf1def8a34dbf1a jdbc3-oracle-9.2.0.3.ebuild 2246
 MD5 61f95c0ed83b7375100102f318776a28 ChangeLog 590
+MD5 739591c7cc25b2a280b5ea2d4d147bd4 jdbc3-oracle-9.2.0.1.ebuild 2240
+MD5 6ab7414ed6f9386b152918e02c5217af jdbc3-oracle-9.2.0.3.ebuild 2241
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jdbc3-oracle-9.2.0.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jdbc3-oracle-9.2.0.3 0
diff --git a/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.1.ebuild b/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.1.ebuild
index f85769e818a1..76fe649efe6e 100644
--- a/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.1.ebuild
+++ b/dev-java/jdbc3-oracle/jdbc3-oracle-9.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/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.1.ebuild,v 1.2 2003/08/24 03:00:42 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.1.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -25,8 +25,8 @@ FILE3=${P}-${DISTFILE3}
 src_unpack() {
 	# Build File List
 	FILELIST="${FILE1} ${FILE2}"
-	use doc > /dev/null && FILELIST="${FILELIST} ${FILE3}" 
-	
+	use doc > /dev/null && FILELIST="${FILELIST} ${FILE3}"
+
 	# Check for distributables
 	echo " "
 	for i in ${FILELIST} ; do
@@ -38,8 +38,8 @@ src_unpack() {
 		fi
 	done
 	echo " "
-	
-	
+
+
 	if [ "${MISSING_FILES}" == "true" ] ; then
 		einfo " "
 		einfo " Because of license terms and file name conventions, please:"
@@ -59,7 +59,7 @@ src_unpack() {
 		einfo " "
 		die "User must manually fetch/rename files"
 	fi
-	
+
 	# Move files back to their original filenames
 	mv ${S}/${FILE1} ${S}/${DISTFILE1}
 	mv ${S}/${FILE2} ${S}/${DISTFILE2}
@@ -68,7 +68,7 @@ src_unpack() {
 
 src_compile() {
 	einfo " This is a binary-only (bytecode) ebuild."
-} 
+}
 
 src_install() {
 	if [ -n "`use doc`" ] ; then
diff --git a/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild b/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild
index 991b0aa4ee57..af3e61fdf376 100644
--- a/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild
+++ b/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.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/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild,v 1.2 2003/08/24 03:00:44 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc3-oracle/jdbc3-oracle-9.2.0.3.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -25,8 +25,8 @@ FILE3=${P}-${DISTFILE3}
 src_unpack() {
 	# Build File List
 	FILELIST="${FILE1} ${FILE2}"
-	use doc > /dev/null && FILELIST="${FILELIST} ${FILE3}" 
-	
+	use doc > /dev/null && FILELIST="${FILELIST} ${FILE3}"
+
 	# Check for distributables
 	echo " "
 	for i in ${FILELIST} ; do
@@ -38,8 +38,8 @@ src_unpack() {
 		fi
 	done
 	echo " "
-	
-	
+
+
 	if [ "${MISSING_FILES}" == "true" ] ; then
 		einfo " "
 		einfo " Because of license terms and file name conventions, please:"
@@ -59,7 +59,7 @@ src_unpack() {
 		einfo " "
 		die "User must manually fetch/rename files"
 	fi
-	
+
 	# Move files back to their original filenames
 	mv ${S}/${FILE1} ${S}/${DISTFILE1}
 	mv ${S}/${FILE2} ${S}/${DISTFILE2}
@@ -68,7 +68,7 @@ src_unpack() {
 
 src_compile() {
 	einfo " This is a binary-only (bytecode) ebuild."
-} 
+}
 
 src_install() {
 	if [ -n "`use doc`" ] ; then
diff --git a/dev-java/jdbc3-postgresql/Manifest b/dev-java/jdbc3-postgresql/Manifest
index 836ff5dba5d0..b1b36d18f062 100644
--- a/dev-java/jdbc3-postgresql/Manifest
+++ b/dev-java/jdbc3-postgresql/Manifest
@@ -1,4 +1,4 @@
-MD5 766aa7eb1992c1fde34a068f270b2419 jdbc3-postgresql-7.3.ebuild 664
 MD5 2b15309d650d118050b0774b804740eb ChangeLog 372
+MD5 e8bd419c591c48caa94595166505ff1c jdbc3-postgresql-7.3.ebuild 663
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 927470f50a83ea9bf353f3d3e8c68c4f files/digest-jdbc3-postgresql-7.3 58
diff --git a/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.3.ebuild b/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.3.ebuild
index 09b68a6aa735..e40b1b6b2f10 100644
--- a/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.3.ebuild
+++ b/dev-java/jdbc3-postgresql/jdbc3-postgresql-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/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.3.ebuild,v 1.2 2003/05/14 17:28:56 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc3-postgresql/jdbc3-postgresql-7.3.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -17,7 +17,7 @@ RDEPEND=">=virtual/jdk-1.4"
 
 src_compile() {
 	einfo "This is a binary-only ebuild (for now)."
-} 
+}
 
 src_install() {
 	java-pkg_dojar ${DISTDIR}/${At}
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index a1076d626b2c..e9ab1c2d01db 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,7 +1,7 @@
-MD5 e553a800c8c97afae688f0d396fe9cdb jdom-1.0_beta8-r3.ebuild 1112
 MD5 ec39cbfc4b50127085bbea33abecbbd1 ChangeLog 1589
-MD5 d9cadf6573a19fc634cd1b6c983d0648 jdom-1.0_beta8-r4.ebuild 1162
+MD5 e553a800c8c97afae688f0d396fe9cdb jdom-1.0_beta8-r3.ebuild 1112
+MD5 4c48f5368c0019f2a51d916bdbe12e85 jdom-1.0_beta8-r4.ebuild 1165
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 33c4f711c3cd26755c0226a88fddd422 files/jdom-1.0_beta8-nojdk1.1.patch 646
 MD5 03290a96b3c0f71a58db6620dd1b547f files/digest-jdom-1.0_beta8-r3 60
+MD5 33c4f711c3cd26755c0226a88fddd422 files/jdom-1.0_beta8-nojdk1.1.patch 646
 MD5 03290a96b3c0f71a58db6620dd1b547f files/digest-jdom-1.0_beta8-r4 60
diff --git a/dev-java/jdom/jdom-1.0_beta8-r4.ebuild b/dev-java/jdom/jdom-1.0_beta8-r4.ebuild
index 4ae1dbbd4ad8..6058a32799bc 100644
--- a/dev-java/jdom/jdom-1.0_beta8-r4.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta8-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/dev-java/jdom/jdom-1.0_beta8-r4.ebuild,v 1.2 2003/07/11 21:41:54 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta8-r4.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -41,7 +41,7 @@ src_install() {
 		build/jdom.jar \
 		lib/crimson.jar \
 		lib/jaxp.jar
-	
+
 	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
 	use doc && dohtml -r build/apidocs/*
 }
diff --git a/dev-java/jmf/Manifest b/dev-java/jmf/Manifest
index 7e6f0442eb88..4a7297b9f82b 100644
--- a/dev-java/jmf/Manifest
+++ b/dev-java/jmf/Manifest
@@ -1,8 +1,8 @@
-MD5 51bac48501b475ffd79e5f6a162443db jmf-2.1.1e.ebuild 1475
 MD5 900b3db91202119fe789bdf30e5aafd9 ChangeLog 483
+MD5 402692d7d6746433caa9ed9e40f3740c jmf-2.1.1e.ebuild 1474
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 cd84b12c8f5ba2e29627baea8699d4ba files/jmfinit 798
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jmf-2.1.1e 0
 MD5 aeb420c1999488e085022067dd93d655 files/jmfcustomizer 816
-MD5 b7bce5dad8530a3e4bb41b5aef2244f5 files/jmstudio 801
+MD5 cd84b12c8f5ba2e29627baea8699d4ba files/jmfinit 798
 MD5 4e74bc5d29b11c11a997a33ca9d42954 files/jmfregistry 810
+MD5 b7bce5dad8530a3e4bb41b5aef2244f5 files/jmstudio 801
diff --git a/dev-java/jmf/jmf-2.1.1e.ebuild b/dev-java/jmf/jmf-2.1.1e.ebuild
index 29c5243b8eed..01e127dc6d91 100644
--- a/dev-java/jmf/jmf-2.1.1e.ebuild
+++ b/dev-java/jmf/jmf-2.1.1e.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/dev-java/jmf/jmf-2.1.1e.ebuild,v 1.3 2003/08/24 03:00:44 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmf/jmf-2.1.1e.ebuild,v 1.4 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -21,7 +21,7 @@ src_unpack() {
 		echo  "!!! Missing ${DISTDIR}/${At}"
 		echo  " "
 		einfo " "
-		einfo " Due to license restrictions, we cannot fetch the" 
+		einfo " Due to license restrictions, we cannot fetch the"
 		einfo " distributables automagically."
 		einfo " "
 		einfo " 1. Visit ${HOMEPAGE} and select 'Cross Platform Java'"
@@ -32,7 +32,7 @@ src_unpack() {
 		die "User must manually download distfile"
 	fi
 	unzip -qq ${DISTDIR}/${At}
-}	
+}
 
 src_compile() {
 	einfo " This is a binary-only ebuild."
diff --git a/dev-java/jrockit/Manifest b/dev-java/jrockit/Manifest
index 02d97f5a3b11..7819d541d519 100644
--- a/dev-java/jrockit/Manifest
+++ b/dev-java/jrockit/Manifest
@@ -1,5 +1,5 @@
-MD5 58c4cd8a3ef3de7f04641eec9e9c5064 jrockit-8.1.ebuild 1662
 MD5 ab134c2afa2a7155653f167ad11a22b2 ChangeLog 415
+MD5 e36768a00df62b4e22e117302c41a900 jrockit-8.1.ebuild 1662
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-jrockit-8.1 0
 MD5 526353109877a591e6417c72c2aa6392 files/jrockit-8.1 293
diff --git a/dev-java/jrockit/jrockit-8.1.ebuild b/dev-java/jrockit/jrockit-8.1.ebuild
index 16df5f0e53a4..3ac54ffbb4bc 100644
--- a/dev-java/jrockit/jrockit-8.1.ebuild
+++ b/dev-java/jrockit/jrockit-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/dev-java/jrockit/jrockit-8.1.ebuild,v 1.3 2003/08/24 03:00:44 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit/jrockit-8.1.ebuild,v 1.4 2003/09/06 22:26:46 msterret Exp $
 
 IUSE=""
 
@@ -46,7 +46,7 @@ src_install () {
 		cp -dpR $i ${D}/opt/${P}/
 	done
 
-	newdoc README.TXT README 
+	newdoc README.TXT README
         newdoc "License Agreement.txt" LICENSE
 
 	set_java_env ${FILESDIR}/${VMHANDLE}
diff --git a/dev-java/jswat/Manifest b/dev-java/jswat/Manifest
index 583eea3125ee..925e4b69e373 100644
--- a/dev-java/jswat/Manifest
+++ b/dev-java/jswat/Manifest
@@ -1,8 +1,8 @@
-MD5 3dd0c04fad6f832997949ec70e4d1864 jswat-1.7.1.ebuild 862
-MD5 b1c8a15e1db16087ee58efa203d756c1 jswat-2.17-r1.ebuild 1400
 MD5 cfee037d09cf83c5a3ee000fefc31f32 ChangeLog 1770
+MD5 ced596ab01d923867ac220752ad1942e jswat-1.7.1.ebuild 860
+MD5 14b7046ef73ae1c5de73e1146e63ce43 jswat-2.17-r1.ebuild 1395
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 118ed7a87e5e670070676eaaa139f77a files/digest-jswat-2.17-r1 67
 MD5 cd73b809ca54bfad49d364a277bcf1ae files/jswat 1420
-MD5 c52b5e917a5ec237a0b62111506885ca files/jswat2 1258
 MD5 b7b3e490432793c593c9694f882a2163 files/digest-jswat-1.7.1 64
-MD5 118ed7a87e5e670070676eaaa139f77a files/digest-jswat-2.17-r1 67
+MD5 c52b5e917a5ec237a0b62111506885ca files/jswat2 1258
diff --git a/dev-java/jswat/jswat-1.7.1.ebuild b/dev-java/jswat/jswat-1.7.1.ebuild
index 66428b5456c3..11df7d8431a5 100644
--- a/dev-java/jswat/jswat-1.7.1.ebuild
+++ b/dev-java/jswat/jswat-1.7.1.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/dev-java/jswat/jswat-1.7.1.ebuild,v 1.2 2003/05/24 18:07:29 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-1.7.1.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -22,10 +22,10 @@ src_compile() {
 src_install () {
 	# install jswat classes
 	java-pkg_dojar jswat.jar parser.jar
-	
+
 	# prepare and install jswat script
 	dobin ${FILESDIR}/jswat
-	
+
 	# install documents
 	dodoc AUTHORS.txt BUGS.txt HISTORY.txt LICENSE.txt TODO.txt
 	dohtml README.html
diff --git a/dev-java/jswat/jswat-2.17-r1.ebuild b/dev-java/jswat/jswat-2.17-r1.ebuild
index 75799f014a76..84cbda1ae456 100644
--- a/dev-java/jswat/jswat-2.17-r1.ebuild
+++ b/dev-java/jswat/jswat-2.17-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/dev-java/jswat/jswat-2.17-r1.ebuild,v 1.3 2003/05/24 18:07:29 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jswat/jswat-2.17-r1.ebuild,v 1.4 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -19,18 +19,18 @@ src_compile() {
 	antopts="-Dversion=${PV}"
 	use jikes && antopts="${antopts} -Dbuild.compiler=jikes"
 	ant ${antopts} dist || die "Compile failed"
-	
+
 	# Make sure junit tasks get built if we have junit
 	if [ -f "/usr/share/junit/lib/junit.jar" ] ; then
 		export CLASSPATH="/usr/share/junit/lib/junit.jar"
 		export DEP_APPEND="junit"
-		if [ `use junit` ] 
+		if [ `use junit` ]
 			then
 				einfo "Running JUnit tests, this may take awhile ..."
 				ant ${antopts} test || die "Junit test failed"
 		fi
 	fi
-	
+
 }
 
 src_install () {
@@ -39,10 +39,10 @@ src_install () {
 		build/dist/${P}/*.jar \
 		classes/ext/parser.jar \
 		classes/ext/jclasslib.jar
-	
+
 	# prepare and install jswat script
 	dobin ${FILESDIR}/jswat2
-	
+
 	# install documents
 	dodoc AUTHORS.txt BUGS.txt HISTORY.txt LICENSE.txt OLD_HISTORY.txt TODO.txt
 	dohtml README.html
diff --git a/dev-java/jump/Manifest b/dev-java/jump/Manifest
index 0c38d4f5f97b..8d5783b76700 100644
--- a/dev-java/jump/Manifest
+++ b/dev-java/jump/Manifest
@@ -1,4 +1,4 @@
-MD5 aabe00955154bbb04ae85148f1cfb024 jump-0.4.1.ebuild 722
 MD5 826d464cd7e3b05a0bd30c26a544e889 ChangeLog 326
+MD5 efd5f5d6ac016428e1d8e1547c842505 jump-0.4.1.ebuild 725
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 7c6b7bea4d25f2f0eefe37ab3107b870 files/digest-jump-0.4.1 66
diff --git a/dev-java/jump/jump-0.4.1.ebuild b/dev-java/jump/jump-0.4.1.ebuild
index 3c2e02d89217..f9f01e67477c 100644
--- a/dev-java/jump/jump-0.4.1.ebuild
+++ b/dev-java/jump/jump-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/dev-java/jump/jump-0.4.1.ebuild,v 1.2 2003/07/11 21:41:54 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jump/jump-0.4.1.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -17,7 +17,7 @@ IUSE="doc"
 
 src_compile() {
 	einfo "This is a bin-only ebuild (for now)."
-} 
+}
 
 src_install() {
 	use doc && dohtml -r ${S}/build/apidocs/*
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 5a7c325a7fc8..c1e528f2e5a6 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,8 +1,8 @@
-MD5 1b3953010659dfd954537155ccb3897c jython-2.1-r1.ebuild 933
-MD5 f951f8672078d49eff69861a23cad3de jython-2.1.ebuild 751
 MD5 012d2fb8b3917ed717e572b763613aea ChangeLog 555
+MD5 9e8a9dadec50d443c25736682ea1f536 jython-2.1.ebuild 751
+MD5 daeb10f75706a35ea32bd00acdaac55b jython-2.1-r1.ebuild 935
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 735d15b2adcc2db8fdb6bac62fd847b7 files/jythonc 211
-MD5 bc766076fc74f87782c093215e1fe1af files/jython 296
-MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1-r1 61
 MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1 61
+MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1-r1 61
+MD5 bc766076fc74f87782c093215e1fe1af files/jython 296
+MD5 735d15b2adcc2db8fdb6bac62fd847b7 files/jythonc 211
diff --git a/dev-java/jython/jython-2.1-r1.ebuild b/dev-java/jython/jython-2.1-r1.ebuild
index e477e5ada982..acf9ac67902b 100644
--- a/dev-java/jython/jython-2.1-r1.ebuild
+++ b/dev-java/jython/jython-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/dev-java/jython/jython-2.1-r1.ebuild,v 1.2 2003/07/11 21:41:54 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r1.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 DESCRIPTION="Java Python implementation"
 
@@ -18,7 +18,7 @@ DEPEND=">=virtual/jdk-1.2"
 src_unpack() {
 	addwrite .hotspot
 	cd ${DISTDIR}
-	java ${PN}-${MY_PV} -o ${S}/ demo lib source 
+	java ${PN}-${MY_PV} -o ${S}/ demo lib source
 
 }
 
@@ -26,7 +26,7 @@ src_install() {
 	dojar jython.jar
 	dodoc README.txt NEWS ACKNOWLEDGMENTS LICENSE.txt
 	dohtml -A .css .jpg .gif -r Doc
-	dobin ${FILESDIR}/jython 
+	dobin ${FILESDIR}/jython
 	dobin ${FILESDIR}/jythonc
 	mkdir -p ${D}/var/jython/
 	chmod a+w ${D}/var/jython/
diff --git a/dev-java/jython/jython-2.1.ebuild b/dev-java/jython/jython-2.1.ebuild
index 74cbfe85790b..9f780325ffc4 100644
--- a/dev-java/jython/jython-2.1.ebuild
+++ b/dev-java/jython/jython-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/dev-java/jython/jython-2.1.ebuild,v 1.3 2003/08/24 03:00:44 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1.ebuild,v 1.4 2003/09/06 22:26:46 msterret Exp $
 
 DESCRIPTION="Java Python implementation"
 
@@ -18,7 +18,7 @@ DEPEND=">=virtual/jdk-1.2
 
 src_unpack() {
 
-	unzip ${DISTDIR}/${PN}-${MY_PV}.class -d ${S}/ 
+	unzip ${DISTDIR}/${PN}-${MY_PV}.class -d ${S}/
 
 }
 
diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest
index e814399fadfe..b608ac93619e 100644
--- a/dev-java/kaffe/Manifest
+++ b/dev-java/kaffe/Manifest
@@ -1,12 +1,12 @@
+MD5 fbb210d24458c8255102ca50e49aac30 ChangeLog 1745
+MD5 2a0aab9fab50156fa5228d8e6c384032 kaffe-1.0.6-r3.ebuild 916
 MD5 d2b90bb6ded52778ac7ba9acd8af3ed5 kaffe-1.0.7_rc1-r1.ebuild 852
 MD5 0bcda7fcd82b58c24ac74280f60a6c6d kaffe-1.1.0.ebuild 850
-MD5 9f3133def96638f3397f69cf1c7762b1 kaffe-1.0.6-r3.ebuild 915
-MD5 fbb210d24458c8255102ca50e49aac30 ChangeLog 1745
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 0a77b3e87d6be7b2253a581fedc865bf files/kaffe-1.1.0 550
 MD5 22d8f8b117ca1322d67d6343f07aca01 files/30kaffe 89
-MD5 e1e85617ddd8dde310270aca97602090 files/kaffe-1.0.6-r3-gentoo.diff 380
-MD5 ef9811f6125f5297bd5af820e74053c9 files/digest-kaffe-1.1.0 64
 MD5 9a19e608288e9877e97f98ca8de8ef9a files/digest-kaffe-1.0.6-r3 64
-MD5 e553b1020af1c1c8d98041dffca2f51b files/kaffe-1.0.7_rc1 603
 MD5 08588ae6ef3e4824baadb98e32d77267 files/digest-kaffe-1.0.7_rc1-r1 68
+MD5 e1e85617ddd8dde310270aca97602090 files/kaffe-1.0.6-r3-gentoo.diff 380
+MD5 e553b1020af1c1c8d98041dffca2f51b files/kaffe-1.0.7_rc1 603
+MD5 ef9811f6125f5297bd5af820e74053c9 files/digest-kaffe-1.1.0 64
diff --git a/dev-java/kaffe/kaffe-1.0.6-r3.ebuild b/dev-java/kaffe/kaffe-1.0.6-r3.ebuild
index d64e594ddaac..c25d5b9ad4ab 100644
--- a/dev-java/kaffe/kaffe-1.0.6-r3.ebuild
+++ b/dev-java/kaffe/kaffe-1.0.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/dev-java/kaffe/kaffe-1.0.6-r3.ebuild,v 1.6 2003/02/13 10:12:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.0.6-r3.ebuild,v 1.7 2003/09/06 22:26:46 msterret Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A cleanroom, open source Java VM and class libraries"
@@ -23,7 +23,7 @@ src_unpack() {
 
 src_compile() {
 	./configure --host=${CHOST}					\
-		    --prefix=/opt/kaffe 
+		    --prefix=/opt/kaffe
 	make || die
 }
 
diff --git a/dev-java/makeme/Manifest b/dev-java/makeme/Manifest
index dcb7ad96a6ee..92d09197f28b 100644
--- a/dev-java/makeme/Manifest
+++ b/dev-java/makeme/Manifest
@@ -1,6 +1,6 @@
-MD5 a26681dea1f22925a426af1b4a35e5dd makeme-0.02-r2.ebuild 1072
 MD5 e42972dbe9fa917b2d841f56e3b59292 ChangeLog 1336
+MD5 699f8d377eca2424a6405f2eba7fe030 makeme-0.02-r2.ebuild 1065
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 daf51d865c22c406d6069ca8980a42aa files/makeme.sh 830
 MD5 ca96d8806318e98767f9637b1720bb11 files/digest-makeme-0.02-r2 62
 MD5 a737fb4370c5313cf1e58c0a8ddd80c7 files/makeme-0.02-r2-gentoo.diff 899
+MD5 daf51d865c22c406d6069ca8980a42aa files/makeme.sh 830
diff --git a/dev-java/makeme/makeme-0.02-r2.ebuild b/dev-java/makeme/makeme-0.02-r2.ebuild
index 145df4cef266..53b59a047f21 100644
--- a/dev-java/makeme/makeme-0.02-r2.ebuild
+++ b/dev-java/makeme/makeme-0.02-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/dev-java/makeme/makeme-0.02-r2.ebuild,v 1.2 2003/08/15 06:19:30 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/makeme-0.02-r2.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg
 
@@ -22,7 +22,7 @@ src_unpack() {
 	cd ${S}
 	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
 }
-        
+
 src_compile() {
 	if [ -z "`use jikes`" ] ; then
 		cp Makefile Makefile.orig
diff --git a/dev-java/sun-j2ee/Manifest b/dev-java/sun-j2ee/Manifest
index 214642fa08df..7119eb2e6d3e 100644
--- a/dev-java/sun-j2ee/Manifest
+++ b/dev-java/sun-j2ee/Manifest
@@ -1,6 +1,6 @@
-MD5 d5a2a74fd5f6062e3f67bf3edbea91d7 sun-j2ee-1.3.1.ebuild 1122
-MD5 af72bce1838402fa4c8208aae645745c sun-j2ee-1.3.1-r1.ebuild 1190
 MD5 01ce69bbae5f223d26e9b3f0b0d1fe0a ChangeLog 1446
+MD5 6943f884ceb5fb78bdd89c6da9d90a90 sun-j2ee-1.3.1-r1.ebuild 1188
+MD5 3ca109063d944f2c8b4cbdb4157644fa sun-j2ee-1.3.1.ebuild 1121
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2ee-1.3.1-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2ee-1.3.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2ee-1.3.1-r1 0
diff --git a/dev-java/sun-j2ee/sun-j2ee-1.3.1-r1.ebuild b/dev-java/sun-j2ee/sun-j2ee-1.3.1-r1.ebuild
index 77e98e4ca050..b1c999c19c60 100644
--- a/dev-java/sun-j2ee/sun-j2ee-1.3.1-r1.ebuild
+++ b/dev-java/sun-j2ee/sun-j2ee-1.3.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/dev-java/sun-j2ee/sun-j2ee-1.3.1-r1.ebuild,v 1.3 2003/05/24 05:37:50 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/sun-j2ee-1.3.1-r1.ebuild,v 1.4 2003/09/06 22:26:46 msterret Exp $
 
 At=j2sdkee-1_3_1-linux.tar.gz
 S=${WORKDIR}/j2sdkee1.3.1
@@ -25,12 +25,12 @@ src_unpack() {
 
 src_install () {
 	local dirs="bin lib conf config cloudscape lib images nativelib repository public_html logs help images"
-	
+
 	dodir /opt/${P}
 	for i in $dirs ; do
 		cp -a $i ${D}/opt/${P}/
 	done
-	
+
 	dodoc LICENSE README
 	if [ -n "`use doc`" ] ; then
 		dohtml -r doc/*
diff --git a/dev-java/sun-j2ee/sun-j2ee-1.3.1.ebuild b/dev-java/sun-j2ee/sun-j2ee-1.3.1.ebuild
index 351f6c026183..43cde9a61844 100644
--- a/dev-java/sun-j2ee/sun-j2ee-1.3.1.ebuild
+++ b/dev-java/sun-j2ee/sun-j2ee-1.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/dev-java/sun-j2ee/sun-j2ee-1.3.1.ebuild,v 1.9 2003/05/24 05:37:50 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2ee/sun-j2ee-1.3.1.ebuild,v 1.10 2003/09/06 22:26:46 msterret Exp $
 
 At=j2sdkee-1_3_1-linux.tar.gz
 S=${WORKDIR}/j2sdkee1.3.1
@@ -23,12 +23,12 @@ src_unpack() {
 
 src_install () {
 	local dirs="bin lib conf config cloudscape lib images nativelib repository public_html logs help images"
-	
+
 	dodir /opt/${P}
 	for i in $dirs ; do
 		cp -a $i ${D}/opt/${P}/
 	done
-	
+
 	dodoc LICENSE README
 	dohtml -r doc/*
 }
diff --git a/dev-java/sun-j2sdk/Manifest b/dev-java/sun-j2sdk/Manifest
index abeb99b0edc4..aacca118ecc9 100644
--- a/dev-java/sun-j2sdk/Manifest
+++ b/dev-java/sun-j2sdk/Manifest
@@ -1,25 +1,25 @@
-MD5 f7ea51f952ed444a222284796f94409c sun-j2sdk-1.4.0-r3.ebuild 5195
-MD5 0d6088f030469750e29baab04245bd83 sun-j2sdk-1.4.1.ebuild 4530
 MD5 40b0812386437da871b8eece12f297b9 ChangeLog 2973
-MD5 ad20421ea76dbee927422e1983170a8b sun-j2sdk-1.4.1-r1.ebuild 4553
+MD5 dc56f66efdcaa9c4bd447dddf28eb382 sun-j2sdk-1.4.0-r3.ebuild 5111
+MD5 2051350a4292919f8d33c79046c2db15 sun-j2sdk-1.4.1.ebuild 4453
+MD5 dbf252880cb5295c720170cf24bdbdf1 sun-j2sdk-1.4.1-r1.ebuild 4474
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-sun-j2sdk-1.4.0-r3 63
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2sdk-1.4.1 0
 MD5 c147a3bf17e43d34055a763a266c2fe1 files/sun-j2sdk-1.4.0 603
 MD5 d689a6b6d3c969dfd49a1d39e47ff769 files/sun-j2sdk-1.4.1 603
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2sdk-1.4.1 0
-MD5 dd55b8f72a824c16a4d544b624c9eda1 files/digest-sun-j2sdk-1.4.0-r3 63
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-sun-j2sdk-1.4.1-r1 0
-MD5 1592f54543a5a9c5b9ddd873bc1d5449 files/1.4.1/j2sdk-1.4.1-pthread.patch 1724
 MD5 527f4756568740c19c32b1e5eb59ee20 files/1.4.1/j2sdk-1.4.1-disable-sanity-check.patch 650
-MD5 8913b0e78c82f5889ec854c7ade8857b files/1.4.1/j2sdk-1.4.1-remove-fixed-paths.patch 4874
-MD5 0a15b5d4154c7fc0a713970c4b1780f1 files/1.4.1/j2sdk-1.4.1-gcc3.3-fixes.patch 5398
+MD5 822826bf40a3f7f475946637acc61ec2 files/1.4.1/j2sdk-1.4.1-fix-intl-files.patch 2056
 MD5 7c7b6039ae92a59953775ddb8d8b93c8 files/1.4.1/j2sdk-1.4.1-force-motif.patch 3137
-MD5 9f4c7a21ea50890a893b9850bbfc3b67 files/1.4.1/j2sdk-1.4.1-glibc-2.3.1-fixes.patch 592
 MD5 9e80bf2ca2a4cbbd2570d00d1fc28143 files/1.4.1/j2sdk-1.4.1-gcc3-syntax.patch 2248
+MD5 9f4c7a21ea50890a893b9850bbfc3b67 files/1.4.1/j2sdk-1.4.1-glibc-2.3.1-fixes.patch 592
 MD5 95b8d1c6d35af8fd31117163ce56bfe7 files/1.4.1/j2sdk-1.4.1-link-jpda-2-libjvm.patch 486
-MD5 822826bf40a3f7f475946637acc61ec2 files/1.4.1/j2sdk-1.4.1-fix-intl-files.patch 2056
+MD5 1592f54543a5a9c5b9ddd873bc1d5449 files/1.4.1/j2sdk-1.4.1-pthread.patch 1724
+MD5 8913b0e78c82f5889ec854c7ade8857b files/1.4.1/j2sdk-1.4.1-remove-fixed-paths.patch 4874
+MD5 0a15b5d4154c7fc0a713970c4b1780f1 files/1.4.1/j2sdk-1.4.1-gcc3.3-fixes.patch 5398
+MD5 061f6c0bace8a70fb12b69a2e18ea1b1 files/patches/j2sdk-1.4.0-disable-sanity-check.patch.bz2 450
 MD5 cfe7807401a123893c6bc78aa3ffd170 files/patches/j2sdk-1.4.0-fix-intl-files.patch.bz2 826
-MD5 553a29526471461a8dd0b889ec0ee7d1 files/patches/j2sdk-1.4.0-remove-fixed-paths.patch.bz2 1455
 MD5 70c3f7f9a5a49d7d52283541da221e1f files/patches/j2sdk-1.4.0-gcc3-syntax.patch.bz2 1582
-MD5 2133d3d4a54ea1db1ce04d72beecb031 files/patches/j2sdk-1.4.0-link-jpda-2-libjvm.patch.bz2 337
 MD5 266d66824fd48d8590da4aaae84bcd60 files/patches/j2sdk-1.4.0-glibc-2.3.1-fixes.patch.bz2 863
-MD5 061f6c0bace8a70fb12b69a2e18ea1b1 files/patches/j2sdk-1.4.0-disable-sanity-check.patch.bz2 450
+MD5 2133d3d4a54ea1db1ce04d72beecb031 files/patches/j2sdk-1.4.0-link-jpda-2-libjvm.patch.bz2 337
+MD5 553a29526471461a8dd0b889ec0ee7d1 files/patches/j2sdk-1.4.0-remove-fixed-paths.patch.bz2 1455
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r3.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r3.ebuild
index c5743619f5f1..132f5752da2a 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r3.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-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/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r3.ebuild,v 1.6 2003/08/09 00:19:52 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.0-r3.ebuild,v 1.7 2003/09/06 22:26:46 msterret Exp $
 
 # Maintainer: Stefan Jones <cretin@gentoo.org>
 # Author: Stefan Jones <cretin@gentoo.org>
@@ -28,7 +28,7 @@ SRC_MOZHEADERS="j2sdk-1_4_0-mozilla_headers-unix.zip"
 SRC_SUNMOTIF="j2sdk-1_4_0-motif-linux-i386.zip"
 
 SRC_URI="http://www.gzip.org/zlib/zlib-${ZLIB_VERSION}.tar.bz2"
-		 
+
 DESCRIPTION="Sun's J2SE Development Kit, version 1.4.0 (From sources)"
 HOMEPAGE="http://wwws.sun.com/software/java2/download.html"
 
@@ -50,7 +50,7 @@ PROVIDE="virtual/jre-1.4.0
 	virtual/jdk-1.4.0
 	virtual/java-scheme-2"
 
-pkg_setup() {	
+pkg_setup() {
 	#Check if we have enough space
 	if [ `df ${PORTAGE_TMPDIR}/portage/ | tail -n 1 | awk '{ print $4 }'` -le 2097152 ] ; then
 		eerror "You need about 2G of disk space to compile this at ${PORTAGE_TMPDIR}/portage,"
@@ -61,15 +61,15 @@ pkg_setup() {
 	#Check the Current java-version ~ 1.4 and is jdk
 	JAVAC=`java-config --javac`
 	if [ -z $JAVAC ] ; then
-		eerror "Set java-config to use a jdk not a jre" 
+		eerror "Set java-config to use a jdk not a jre"
 		die "The version of java set by java-config doesn't contain javac"
 	fi
-	
+
 	if [ `java-config --java-version 2>&1 | grep "1\.4\."  | wc -l` -lt 1 ]  ; then
 		eerror "JDK is too old, >= 1.4 is required"
 		die "The version of jdk pointed to by java-config is not >=1.4"
 	fi
-	
+
 }
 
 src_unpack() {
@@ -78,7 +78,7 @@ src_unpack() {
       eerror "Please download ${SRC_MOZHEADERS} from ${HOMEPAGE} to ${DISTDIR}"
       die_flag=1
 	fi
-			
+
 	if [ ! -f ${DISTDIR}/${SRC_JAVA} ] ; then
       eerror "Please download ${SRC_JAVA} from ${HOMEPAGE} to ${DISTDIR}"
 	  die_flag=1
@@ -90,7 +90,7 @@ src_unpack() {
     fi
 
 	[ ! -z ${die_flag} ] && die "Some source files were not found"
-	
+
 	mkdir ${S}
 	cd ${S}
 	unpack ${SRC_JAVA}
@@ -115,7 +115,7 @@ src_unpack() {
 	cp Makefile Makefile.orig
 	chmod +w Makefile
 	sed -e "s:1.1.3:${ZLIB_VERSION}:" Makefile.orig > Makefile
-	
+
     mkdir -p ${S}/motif
     cd ${S}/motif
     unpack ${SRC_SUNMOTIF}
@@ -123,21 +123,21 @@ src_unpack() {
 
 src_compile () {
 	cd ${S}
-	unset CLASSPATH JAVA_HOME JAVAC 
+	unset CLASSPATH JAVA_HOME JAVAC
 
 	# Otherwise the command:
 	# (cd  /var/tmp/portage/sun-j2sdk-1.4.0-r1/work/j2sdk/control/build/linux-i386/j2re-image; tar cf - .) | \
 	#    (cd  /var/tmp/portage/sun-j2sdk-1.4.0-r1/work/j2sdk/control/build/linux-i386/j2sdk-image/jre; tar xf -)
 	# Will fail, you have been warned!!!! There are NO sandbox violations anyway
 	LD_PRELOAD_SAVE=$LD_PRELOAD
-	unset LD_PRELOAD	
+	unset LD_PRELOAD
 
-	# Any CFLAGS will cause the build to fail! 
+	# Any CFLAGS will cause the build to fail!
 	# If you don't believe me ...
 	#export OTHER_CFLAGS=${CFLAGS}
 	#export OTHER_CXXFLAGS=${CXXFLAGS}
 	unset CFLAGS CXXFLAGS
-	
+
 	export ALT_MOZILLA_PATH="${S}/mozilla"
 	export ALT_BOOTDIR=`java-config --jdk-home`
 	export ALT_MOTIF_DIR="${S}/motif"
@@ -147,7 +147,7 @@ src_compile () {
 	export INSANE=true
 	export MAKE_VERBOSE=true
 	export OTHER_LDFLAGS="-lpthread"
-	export DEV_ONLY=true 
+	export DEV_ONLY=true
 
 	cd ${S}/control/make
 	# MUST use make, we DONT want any -j options!
@@ -166,25 +166,25 @@ src_install () {
 	cd ${S}/control/build/linux-*/j2sdk-image
 	local dirs="bin include jre lib"
 	dodir /opt/${P}
-	
+
 	for i in $dirs ; do
 		cp -a $i ${D}/opt/${P}/
 	done
-	
+
 	dodoc COPYRIGHT README LICENSE
 	dohtml README.html
-	
+
 	doman man/man1/*.1
-	
+
 	dodir /opt/${P}/share/
 	cp -a demo src.zip ${D}/opt/${P}/share/
-	
+
 	inst_plugin /opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji140.so
 	set_java_env ${FILESDIR}/${VMHANDLE}
 
 }
 
-pkg_postinst () {                                                               
+pkg_postinst () {
 	# Set as default VM if none exists
 	java_pkg_postinst
 }
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild
index 3657e196b7a8..513257e123cd 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.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/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild,v 1.3 2003/08/09 00:19:52 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1-r1.ebuild,v 1.4 2003/09/06 22:26:46 msterret Exp $
 
 # Maintainer: Stefan Jones <cretin@gentoo.org>
 # Author: Stefan Jones <cretin@gentoo.org>
@@ -48,7 +48,7 @@ PROVIDE="virtual/jre-1.4.1
 	virtual/jdk-1.4.1
 	virtual/java-scheme-2"
 
-pkg_setup() {	
+pkg_setup() {
 	#Check if we have enough space
 	if [ `df -P ${PORTAGE_TMPDIR}/portage/ | tail -n 1 | awk '{ print $4 }'` -le 2597152 ] ; then
 		eerror "You need about 2.5G of disk space to compile this at ${PORTAGE_TMPDIR}/portage,"
@@ -59,10 +59,10 @@ pkg_setup() {
 	#Check the Current java-version ~ 1.4 and is jdk
 	JAVAC=`java-config --javac`
 	if [ -z $JAVAC ] ; then
-		eerror "Set java-config to use a jdk not a jre" 
+		eerror "Set java-config to use a jdk not a jre"
 		die "The version of java set by java-config doesn't contain javac"
 	fi
-	
+
 	if [ `java-config --java-version 2>&1 | grep "1\.4\."  | wc -l` -lt 1 ]  ; then
 		eerror "JDK is too old, >= 1.4 is required"
 		die "The version of jdk pointed to by java-config is not >=1.4"
@@ -75,14 +75,14 @@ src_unpack() {
 		eerror "Please download ${SRC_MOZHEADERS} from ${HOMEPAGE} to ${DISTDIR}"
 		die_flag=1
 	fi
-			
+
 	if [ ! -f ${DISTDIR}/${SRC_JAVA} ] ; then
 		eerror "Please download ${SRC_JAVA} from ${HOMEPAGE} to ${DISTDIR}"
 		die_flag=1
 	fi
 
 	[ ! -z ${die_flag} ] && die "Some source files were not found"
-	
+
 	mkdir ${S}
 	cd ${S}
 	unpack ${SRC_JAVA}
@@ -102,21 +102,21 @@ src_unpack() {
 
 src_compile () {
 	cd ${S}
-	unset CLASSPATH JAVA_HOME JAVAC 
+	unset CLASSPATH JAVA_HOME JAVAC
 
 	# Otherwise the command:
 	# (cd  /var/tmp/portage/sun-j2sdk-1.4.0-r1/work/j2sdk/control/build/linux-i386/j2re-image; tar cf - .) | \
 	#    (cd  /var/tmp/portage/sun-j2sdk-1.4.0-r1/work/j2sdk/control/build/linux-i386/j2sdk-image/jre; tar xf -)
 	# Will fail, you have been warned!!!! There are NO sandbox violations anyway
 	LD_PRELOAD_SAVE=$LD_PRELOAD
-	unset LD_PRELOAD	
+	unset LD_PRELOAD
 
-	# Any CFLAGS will cause the build to fail! 
+	# Any CFLAGS will cause the build to fail!
 	# If you don't believe me ...
 	export OTHER_CFLAGS=${CFLAGS}
 	export OTHER_CXXFLAGS=${CXXFLAGS}
 	unset CFLAGS CXXFLAGS LDFLAGS
-	
+
 	export ALT_MOZILLA_PATH="${S}/mozilla"
 	export ALT_BOOTDIR=`java-config --jdk-home`
 	export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts
@@ -128,7 +128,7 @@ src_compile () {
 	export OTHER_LDFLAGS="-lpthread"
 	export INSANE=true
 	export MAKE_VERBOSE=true
-	export DEV_ONLY=true 
+	export DEV_ONLY=true
 	export USRBIN_PATH=""
 
 	cd ${S}/control/make
@@ -143,22 +143,22 @@ src_compile () {
 }
 
 src_install () {
-	
+
 	dodir /opt/${P}
 
 	cd ${S}/control/build/linux-*/j2sdk-image
 	local dirs="bin include jre lib"
 	dodir /opt/${P}
-	
+
 	for i in $dirs ; do
 		cp -a $i ${D}/opt/${P}/
 	done
-	
+
 	dodoc COPYRIGHT README LICENSE
 	dohtml README.html
-	
+
 	doman man/man1/*.1
-	
+
 	dodir /opt/${P}/share/
 	cp -a demo src.zip ${D}/opt/${P}/share/
 
@@ -168,7 +168,7 @@ src_install () {
 	set_java_env ${FILESDIR}/${VMHANDLE}
 }
 
-pkg_postinst () {                                                               
+pkg_postinst () {
 	# Set as default VM if none exists
 	java_pkg_postinst
 }
diff --git a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild
index 7f2c7a608780..f29b87d12f9e 100644
--- a/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild
+++ b/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild,v 1.9 2003/08/09 00:19:52 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-j2sdk/sun-j2sdk-1.4.1.ebuild,v 1.10 2003/09/06 22:26:46 msterret Exp $
 
 # Maintainer: Stefan Jones <cretin@gentoo.org>
 # Author: Stefan Jones <cretin@gentoo.org>
@@ -47,7 +47,7 @@ PROVIDE="virtual/jre-1.4.1
 	virtual/jdk-1.4.1
 	virtual/java-scheme-2"
 
-pkg_setup() {	
+pkg_setup() {
 	#Check if we have enough space
 	if [ `df -P ${PORTAGE_TMPDIR}/portage/ | tail -n 1 | awk '{ print $4 }'` -le 2097152 ] ; then
 		eerror "You need about 2G of disk space to compile this at ${PORTAGE_TMPDIR}/portage,"
@@ -58,10 +58,10 @@ pkg_setup() {
 	#Check the Current java-version ~ 1.4 and is jdk
 	JAVAC=`java-config --javac`
 	if [ -z $JAVAC ] ; then
-		eerror "Set java-config to use a jdk not a jre" 
+		eerror "Set java-config to use a jdk not a jre"
 		die "The version of java set by java-config doesn't contain javac"
 	fi
-	
+
 	if [ `java-config --java-version 2>&1 | grep "1\.4\."  | wc -l` -lt 1 ]  ; then
 		eerror "JDK is too old, >= 1.4 is required"
 		die "The version of jdk pointed to by java-config is not >=1.4"
@@ -74,14 +74,14 @@ src_unpack() {
 		eerror "Please download ${SRC_MOZHEADERS} from ${HOMEPAGE} to ${DISTDIR}"
 		die_flag=1
 	fi
-			
+
 	if [ ! -f ${DISTDIR}/${SRC_JAVA} ] ; then
 		eerror "Please download ${SRC_JAVA} from ${HOMEPAGE} to ${DISTDIR}"
 		die_flag=1
 	fi
 
 	[ ! -z ${die_flag} ] && die "Some source files were not found"
-	
+
 	mkdir ${S}
 	cd ${S}
 	unpack ${SRC_JAVA}
@@ -101,21 +101,21 @@ src_unpack() {
 
 src_compile () {
 	cd ${S}
-	unset CLASSPATH JAVA_HOME JAVAC 
+	unset CLASSPATH JAVA_HOME JAVAC
 
 	# Otherwise the command:
 	# (cd  /var/tmp/portage/sun-j2sdk-1.4.0-r1/work/j2sdk/control/build/linux-i386/j2re-image; tar cf - .) | \
 	#    (cd  /var/tmp/portage/sun-j2sdk-1.4.0-r1/work/j2sdk/control/build/linux-i386/j2sdk-image/jre; tar xf -)
 	# Will fail, you have been warned!!!! There are NO sandbox violations anyway
 	LD_PRELOAD_SAVE=$LD_PRELOAD
-	unset LD_PRELOAD	
+	unset LD_PRELOAD
 
-	# Any CFLAGS will cause the build to fail! 
+	# Any CFLAGS will cause the build to fail!
 	# If you don't believe me ...
 	export OTHER_CFLAGS=${CFLAGS}
 	export OTHER_CXXFLAGS=${CXXFLAGS}
 	unset CFLAGS CXXFLAGS LDFLAGS
-	
+
 	export ALT_MOZILLA_PATH="${S}/mozilla"
 	export ALT_BOOTDIR=`java-config --jdk-home`
 	export ALT_CACERTS_FILE=${ALT_BOOTDIR}/jre/lib/security/cacerts
@@ -127,7 +127,7 @@ src_compile () {
 	export OTHER_LDFLAGS="-lpthread"
 	export INSANE=true
 	export MAKE_VERBOSE=true
-	export DEV_ONLY=true 
+	export DEV_ONLY=true
 	export USRBIN_PATH=""
 
 	cd ${S}/control/make
@@ -147,16 +147,16 @@ src_install () {
 	cd ${S}/control/build/linux-*/j2sdk-image
 	local dirs="bin include jre lib"
 	dodir /opt/${P}
-	
+
 	for i in $dirs ; do
 		cp -a $i ${D}/opt/${P}/
 	done
-	
+
 	dodoc COPYRIGHT README LICENSE
 	dohtml README.html
-	
+
 	doman man/man1/*.1
-	
+
 	dodir /opt/${P}/share/
 	cp -a demo src.zip ${D}/opt/${P}/share/
 
@@ -166,7 +166,7 @@ src_install () {
 	set_java_env ${FILESDIR}/${VMHANDLE}
 }
 
-pkg_postinst () {                                                               
+pkg_postinst () {
 	# Set as default VM if none exists
 	java_pkg_postinst
 }
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 11a9d38f9fce..3c72833c97c8 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,4 +1,4 @@
-MD5 5936432301a7d700f61a09c4d3a9fc88 velocity-1.3.ebuild 1384
 MD5 704bc55f6bf63d6251175282c55f5f5b ChangeLog 846
+MD5 e9f01b159a047c8edb1cc5569337820e velocity-1.3.ebuild 1382
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 c7bdf6df038fc9fcc34a772e5c5b1838 files/digest-velocity-1.3 128
diff --git a/dev-java/velocity/velocity-1.3.ebuild b/dev-java/velocity/velocity-1.3.ebuild
index b3c936e5f92d..6a68cdc4cef4 100644
--- a/dev-java/velocity/velocity-1.3.ebuild
+++ b/dev-java/velocity/velocity-1.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/dev-java/velocity/velocity-1.3.ebuild,v 1.2 2003/04/06 08:34:42 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.3.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 DESCRIPTION="A Java-based template engine that allows easy creation/rendering of documents that format and present data."
 HOMEPAGE="http://jakarta.apache.org/velocity/"
@@ -30,9 +30,9 @@ src_compile () {
 		cp /opt/sun-j2ee-1.3.1/lib/j2ee.jar ${S}/build/lib
 		ANT_OPTS=${myc} ant jar-J2EE || die "Java compile failed."
 	else
-		ANT_OPTS=${myc} ant jar || die "Java compile failed" 
+		ANT_OPTS=${myc} ant jar || die "Java compile failed"
 	fi
-	
+
 	if [ -n "`use doc`" ] ; then
 		ant javadocs || die "Document compile failed"
 	fi
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 60c8b9301817..37eeb313bee5 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,9 +1,9 @@
-MD5 96825c3cdb70ddbc61a28ada3f77ab01 xerces-2.3.0.ebuild 971
-MD5 98ed03864d2a8df86f893984d24ac93a xerces-2.3.0-r1.ebuild 1219
-MD5 2f8adc66bab83a2fb8d2e3837557f680 xerces-2.5.0.ebuild 1185
 MD5 50a0e0e6b1535f838c207676f87115f8 ChangeLog 2173
+MD5 a407698edfa931ead0cf80f71c88f598 xerces-2.3.0.ebuild 972
+MD5 65bf68c101541a325daee7b808c64b55 xerces-2.3.0-r1.ebuild 1220
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 8ccec19b1fa0bd6d44a2c3f0c4a1c70f xerces-2.5.0.ebuild 1185
+MD5 292bf76be10447bbda6f482a0b2101ea files/digest-xerces-2.3.0 206
 MD5 0ed5652de5f404a3fefb774b2b1a8538 files/digest-xerces-2.3.0-r1 144
 MD5 0aecf5f2232e04fb4067f5f67b41d810 files/xerces-2.3.0-gentoo.diff 1418
-MD5 292bf76be10447bbda6f482a0b2101ea files/digest-xerces-2.3.0 206
 MD5 4390c3834dfc898bef6d4d4cbc277fce files/digest-xerces-2.5.0 144
diff --git a/dev-java/xerces/xerces-2.3.0-r1.ebuild b/dev-java/xerces/xerces-2.3.0-r1.ebuild
index dcc16c4df2c8..6988bec0a6e4 100644
--- a/dev-java/xerces/xerces-2.3.0-r1.ebuild
+++ b/dev-java/xerces/xerces-2.3.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/dev-java/xerces/xerces-2.3.0-r1.ebuild,v 1.2 2003/08/05 16:08:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.3.0-r1.ebuild,v 1.3 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg eutils
 
@@ -34,7 +34,7 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar build/x*.jar
-	dodoc TODO STATUS README LICENSE ISSUES 
+	dodoc TODO STATUS README LICENSE ISSUES
 	dohtml Readme.html
 
 	if [ -n "`use doc`" ] ; then
diff --git a/dev-java/xerces/xerces-2.3.0.ebuild b/dev-java/xerces/xerces-2.3.0.ebuild
index 1f9ca02c7dd9..2663c16bc195 100644
--- a/dev-java/xerces/xerces-2.3.0.ebuild
+++ b/dev-java/xerces/xerces-2.3.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/dev-java/xerces/xerces-2.3.0.ebuild,v 1.4 2003/08/05 16:08:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.3.0.ebuild,v 1.5 2003/09/06 22:26:46 msterret Exp $
 
 S=${WORKDIR}/xerces-${PV//./_}
 DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
@@ -26,7 +26,7 @@ src_compile() {
 
 src_install () {
 	dojar build/x*.jar
-	dodoc TODO STATUS README LICENSE ISSUES 
+	dodoc TODO STATUS README LICENSE ISSUES
 	dohtml Readme.html
 
 	dodir /usr/share/doc/${P}
diff --git a/dev-java/xerces/xerces-2.5.0.ebuild b/dev-java/xerces/xerces-2.5.0.ebuild
index 385b37c86ce4..9fe9dbdbdf26 100644
--- a/dev-java/xerces/xerces-2.5.0.ebuild
+++ b/dev-java/xerces/xerces-2.5.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/dev-java/xerces/xerces-2.5.0.ebuild,v 1.1 2003/08/24 03:19:40 strider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.5.0.ebuild,v 1.2 2003/09/06 22:26:46 msterret Exp $
 
 inherit java-pkg eutils
 
@@ -33,7 +33,7 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar build/x*.jar
-	dodoc TODO STATUS README LICENSE ISSUES 
+	dodoc TODO STATUS README LICENSE ISSUES
 	dohtml Readme.html
 
 	if [ -n "`use doc`" ] ; then
diff --git a/dev-java/xt/Manifest b/dev-java/xt/Manifest
index 3fdc78c71c1d..044962a31794 100644
--- a/dev-java/xt/Manifest
+++ b/dev-java/xt/Manifest
@@ -1,4 +1,4 @@
-MD5 4343990f59c6c59ca3c01c0d9da79d3a xt-1.ebuild 620
 MD5 29142e43e89d30ec8c63768cf801240e ChangeLog 915
+MD5 7b63356f43ee4cc277967646bf1271ba xt-1.ebuild 608
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 f5317e436a2b4725ef8bfa8fc195b09e files/digest-xt-1 51
diff --git a/dev-java/xt/xt-1.ebuild b/dev-java/xt/xt-1.ebuild
index e2dce863b87a..e5c917699033 100644
--- a/dev-java/xt/xt-1.ebuild
+++ b/dev-java/xt/xt-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/dev-java/xt/xt-1.ebuild,v 1.11 2003/02/13 10:24:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/xt-1.ebuild,v 1.12 2003/09/06 22:26:46 msterret Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Java Implementation of XSL-Transformations"
@@ -17,7 +17,7 @@ src_unpack() {
 	jar -xf ${DISTDIR}/${PN}.zip
 }
 
-src_install() {              
+src_install() {
 	dojar xt.jar sax.jar
 	dohtml xt.html
 	docinto demo