diff --git a/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/Manifest b/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/Manifest
index 8e20e296..330ac6bf 100644
--- a/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/Manifest
+++ b/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/Manifest
@@ -1,18 +1,18 @@
 DIST gw656up2clnxmulti.tar.gz 34924107 RMD160 b4a4ef06a1fce7a928dc15aa910cefe241a9b2f3 SHA1 8810f9bbb1c1ea7a3fb6385b3c6507838817629c SHA256 6c242b71756908076614f07f837bdcc3260a1bc423d8f4dd164778d7b7e65cb7
 DIST gw702HP1aclnxmulti.tar.gz 136232170 RMD160 4d9665e7507b628a919d8a779490dff5e2d2cc10 SHA1 667156526406a45622fb897877ae597dd7e52738 SHA256 4fb44d16a5dbbe47037fc46a8124a35175324cebb7f1c6c6cc11de375d15b5c9
 DIST gw702HP1clnxmulti.tar.gz 68138753 RMD160 42acc93e9d9b791e83027806df3c449b4502b09a SHA1 5edb8bff146f24587818bc17ab651ebededd24c0 SHA256 dd7cdbc57e65fb296791125fc83ddd3fd75b85f4acf17a2bd885c0c08930edbf
-EBUILD novell-groupwise-gwclient-6.5.7_p0522.ebuild 1166 RMD160 350fb0709ae0e6fcc938fcbf1a50095e7a5a3171 SHA1 b56460ebfdbd6fabaeaf12acb6ff84d098d7c0f7 SHA256 09f7c11b3eba7382ad08ffa76562b5270c72695164d0fec8c2b5ab5097af9854
-MD5 98d4257f1401f06e570616bc979a2d85 novell-groupwise-gwclient-6.5.7_p0522.ebuild 1166
-RMD160 350fb0709ae0e6fcc938fcbf1a50095e7a5a3171 novell-groupwise-gwclient-6.5.7_p0522.ebuild 1166
-SHA256 09f7c11b3eba7382ad08ffa76562b5270c72695164d0fec8c2b5ab5097af9854 novell-groupwise-gwclient-6.5.7_p0522.ebuild 1166
-EBUILD novell-groupwise-gwclient-7.0.2_p20070524.ebuild 1717 RMD160 f1306e3525244fedc3f905e7fe592c1979ad9ad4 SHA1 e365b3aa6efb8e6679f2eb923ac07ee17ee0ad50 SHA256 0e35db0d6b274e304e111362679dab0598a4357d31beea7c4f0cb514c049402c
-MD5 488275e095c1bb47e38d68e0d2b0ecc1 novell-groupwise-gwclient-7.0.2_p20070524.ebuild 1717
-RMD160 f1306e3525244fedc3f905e7fe592c1979ad9ad4 novell-groupwise-gwclient-7.0.2_p20070524.ebuild 1717
-SHA256 0e35db0d6b274e304e111362679dab0598a4357d31beea7c4f0cb514c049402c novell-groupwise-gwclient-7.0.2_p20070524.ebuild 1717
-EBUILD novell-groupwise-gwclient-7.0.2_p20070606.ebuild 1723 RMD160 f1381d698e3fb757e11ed0b39c0b24840fe76ac5 SHA1 b0603562530a74b2445621572df9f5fcf5f1fe9d SHA256 51f755fcd0bacabc6fac585d82248e8365a416f6db0dc7a2f6d638b10621de43
-MD5 c9765b01174cbd98bf17c224ce9a26b9 novell-groupwise-gwclient-7.0.2_p20070606.ebuild 1723
-RMD160 f1381d698e3fb757e11ed0b39c0b24840fe76ac5 novell-groupwise-gwclient-7.0.2_p20070606.ebuild 1723
-SHA256 51f755fcd0bacabc6fac585d82248e8365a416f6db0dc7a2f6d638b10621de43 novell-groupwise-gwclient-7.0.2_p20070606.ebuild 1723
+EBUILD novell-groupwise-gwclient-6.5.7_p0522.ebuild 1168 RMD160 886843b87c7f449feb7c888b0fcd211bfc6b0b0c SHA1 6f545ac4baa5283810f6b78051e8ac5c35428aaf SHA256 bfcdb8a4f0d518c7fc9aefab816049e22da4f44ea4064a311bef19cafce0d836
+MD5 34935f090a9726185f6d28593bf85126 novell-groupwise-gwclient-6.5.7_p0522.ebuild 1168
+RMD160 886843b87c7f449feb7c888b0fcd211bfc6b0b0c novell-groupwise-gwclient-6.5.7_p0522.ebuild 1168
+SHA256 bfcdb8a4f0d518c7fc9aefab816049e22da4f44ea4064a311bef19cafce0d836 novell-groupwise-gwclient-6.5.7_p0522.ebuild 1168
+EBUILD novell-groupwise-gwclient-7.0.2_p20070524.ebuild 1718 RMD160 d7623cc949fa2481ad6b9e074f3676c1706d122b SHA1 0e309aed206ff88bc6882098c803cf6a753df7bc SHA256 38a0b408d3fd5f35575c5baaa32dfcfba6a76dcf42504e1dc14f451c2dac5190
+MD5 2f958d8ff6aa74f9ef98190dd2aa2e2d novell-groupwise-gwclient-7.0.2_p20070524.ebuild 1718
+RMD160 d7623cc949fa2481ad6b9e074f3676c1706d122b novell-groupwise-gwclient-7.0.2_p20070524.ebuild 1718
+SHA256 38a0b408d3fd5f35575c5baaa32dfcfba6a76dcf42504e1dc14f451c2dac5190 novell-groupwise-gwclient-7.0.2_p20070524.ebuild 1718
+EBUILD novell-groupwise-gwclient-7.0.2_p20070606.ebuild 1719 RMD160 bd30fc3b947d99c5d6201316d1afc3ae8afc27a5 SHA1 ab5f1726283606550a2c42184d2a0bc8126aa327 SHA256 220f539ca1f2556842cecee1231c1b93895e39a42a59c88ca80e183f341b9482
+MD5 92b6d741052f5f45808e36daab3107cb novell-groupwise-gwclient-7.0.2_p20070606.ebuild 1719
+RMD160 bd30fc3b947d99c5d6201316d1afc3ae8afc27a5 novell-groupwise-gwclient-7.0.2_p20070606.ebuild 1719
+SHA256 220f539ca1f2556842cecee1231c1b93895e39a42a59c88ca80e183f341b9482 novell-groupwise-gwclient-7.0.2_p20070606.ebuild 1719
 MISC ChangeLog 2208 RMD160 f012175a8dc7c3606c0993a846d8c855fcc88d5a SHA1 f67805ff2a809d24474001638d8c7ac903873abd SHA256 93ca8a32e8e197e132f780a3df7e4ed9e0d6c473dcd14b9ada3e4091c5fe5d5b
 MD5 4a6810495623ab90fa01ff41bfd76211 ChangeLog 2208
 RMD160 f012175a8dc7c3606c0993a846d8c855fcc88d5a ChangeLog 2208
diff --git a/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-6.5.7_p0522.ebuild b/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-6.5.7_p0522.ebuild
index 4108dd7e..2db642b0 100644
--- a/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-6.5.7_p0522.ebuild
+++ b/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-6.5.7_p0522.ebuild
@@ -17,13 +17,13 @@ RDEPEND="sys-libs/glibc
 		 sys-libs/libstdc++-v3
 		 sys-devel/gcc
 		 system-jre? (
-		 	|| (virtual/jdk
-				virtual/jre)
-		 	amd64? (app-emulation/emul-linux-x86-java)
+		 	|| ( virtual/jdk
+				virtual/jre )
+		 	amd64? ( app-emulation/emul-linux-x86-java )
 		 )
-		 amd64? (app-emulation/emul-linux-x86-compat)"
+		 amd64? ( app-emulation/emul-linux-x86-compat )"
 
-RESTRICT="nostrip nomirror"
+RESTRICT="strip mirror"
 
 src_unpack() {
 	unpack ${A}
diff --git a/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-7.0.2_p20070524.ebuild b/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-7.0.2_p20070524.ebuild
index 113f678d..711f1996 100644
--- a/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-7.0.2_p20070524.ebuild
+++ b/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-7.0.2_p20070524.ebuild
@@ -17,13 +17,13 @@ RDEPEND="sys-libs/glibc
 		 sys-libs/libstdc++-v3
 		 sys-devel/gcc
 		 system-jre? (
-		 	|| (virtual/jdk
-				virtual/jre)
-		 	amd64? (app-emulation/emul-linux-x86-java)
+		 	|| ( virtual/jdk
+				virtual/jre )
+		 	amd64? ( app-emulation/emul-linux-x86-java )
 		 )
-		 amd64? (app-emulation/emul-linux-x86-compat)"
+		 amd64? ( app-emulation/emul-linux-x86-compat )"
 
-RESTRICT="nostrip nomirror"
+RESTRICT="strip mirror"
 
 src_unpack() {
 	unpack ${A}
@@ -42,7 +42,7 @@ src_install() {
 		for i in $JRE_DIR/lib/*.pack; do
 			i_b=`echo $i | sed 's/\.pack$//'`;
 			einfo "Unpacking `basename $i` -> `basename $i_b.jar`";
-			$JRE_DIR/bin/unpack200 $i $i_b.jar || die "Unpack failed";	
+			$JRE_DIR/bin/unpack200 $i $i_b.jar || die "Unpack failed";
 		done;
 	else
 		rm 	-rf "${WORKDIR}"/${MY_P}/opt/novell/groupwise/client/jre
diff --git a/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-7.0.2_p20070606.ebuild b/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-7.0.2_p20070606.ebuild
index 3e668576..f96904ef 100644
--- a/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-7.0.2_p20070606.ebuild
+++ b/trunk/novell4gentoo/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-7.0.2_p20070606.ebuild
@@ -13,15 +13,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="java system-jre"
 DEPEND="!net-misc/novell-groupwise-gwclient"
-RDEPEND="sys-libs/glibc 
-		 sys-libs/libstdc++-v3 
-		 sys-devel/gcc 
-		 system-jre? ( 
-		 	|| (virtual/jdk 
-				virtual/jre) 
-		 	amd64? (app-emulation/emul-linux-x86-java) 
-		 ) 
-		 amd64? (app-emulation/emul-linux-x86-compat)" 
+RDEPEND="sys-libs/glibc
+		 sys-libs/libstdc++-v3
+		 sys-devel/gcc
+		 system-jre? (
+		 	|| ( virtual/jdk
+				virtual/jre )
+		 	amd64? ( app-emulation/emul-linux-x86-java )
+		 )
+		 amd64? ( app-emulation/emul-linux-x86-compat )"
 
 RESTRICT="strip mirror"
 
@@ -42,7 +42,7 @@ src_install() {
 		for i in $JRE_DIR/lib/*.pack; do
 			i_b=`echo $i | sed 's/\.pack$//'`;
 			einfo "Unpacking `basename $i` -> `basename $i_b.jar`";
-			$JRE_DIR/bin/unpack200 $i $i_b.jar || die "Unpack failed";	
+			$JRE_DIR/bin/unpack200 $i $i_b.jar || die "Unpack failed";
 		done;
 	else
 		rm 	-rf "${WORKDIR}"/${MY_P}/opt/novell/groupwise/client/jre