diff --git a/branches/experimental/net-mail/novell-groupwise-gwclient/ChangeLog b/branches/experimental/net-mail/novell-groupwise-gwclient/ChangeLog
index 5e82a4c..edb3e5f 100644
--- a/branches/experimental/net-mail/novell-groupwise-gwclient/ChangeLog
+++ b/branches/experimental/net-mail/novell-groupwise-gwclient/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for net-mail/novell-groupwise-gwclient
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Mar 2008; Mario Fetka <mario-fetka@gmx.at>
+  +novell-groupwise-gwclient-7.0.3_p20080129.ebuild:
+  Bump to beta
+
   29 Aug 2007; Mario Fetka <mario-fetka@gmx.at>
   novell-groupwise-gwclient-7.0.2_p20070228.ebuild,
   novell-groupwise-gwclient-7.0.2_p20070606-r2.ebuild:
diff --git a/branches/experimental/net-mail/novell-groupwise-gwclient/Manifest b/branches/experimental/net-mail/novell-groupwise-gwclient/Manifest
index 122a68e..052f4aa 100644
--- a/branches/experimental/net-mail/novell-groupwise-gwclient/Manifest
+++ b/branches/experimental/net-mail/novell-groupwise-gwclient/Manifest
@@ -1,39 +1,11 @@
 DIST gw702HP1aclnxmulti.tar.gz 136232170 RMD160 4d9665e7507b628a919d8a779490dff5e2d2cc10 SHA1 667156526406a45622fb897877ae597dd7e52738 SHA256 4fb44d16a5dbbe47037fc46a8124a35175324cebb7f1c6c6cc11de375d15b5c9
 DIST gw702HP1clnxmulti.tar.gz 68138753 RMD160 42acc93e9d9b791e83027806df3c449b4502b09a SHA1 5edb8bff146f24587818bc17ab651ebededd24c0 SHA256 dd7cdbc57e65fb296791125fc83ddd3fd75b85f4acf17a2bd885c0c08930edbf
 DIST gw702betaclnxm.tar.gz 57107850 RMD160 a5988e3d22c3303ebfa2e7081d3d106763071351 SHA1 047bbf6ca0e4d4b0518a942a1b2822bc2457f730 SHA256 cff3171de8a37e85e01174cb959112a55ae648415af9d0779f31a398a50139f1
+DIST gw703clnxmulti.tar.gz 205669691 RMD160 92192077b37dc9251c1d29f4c53a8f9ea4da77e7 SHA1 a79d28e991d08c304183736f063641f3992a0952 SHA256 dbf03aa8b10af4435cc981945b2b96d38efeee1759facad35479a1c92dd5d346
 EBUILD novell-groupwise-gwclient-7.0.2_p20070228.ebuild 1715 RMD160 c1bc6ab8aca703fb14b3b91a879540ddafe2d2a0 SHA1 5abec5ac7359922859785e3d046abce65eabb3f7 SHA256 29ca5c14d18c103df18638262a3eb4bc8ee8c0ce2b634b4c673d19de53489f7d
-MD5 67ed76a91ec4b60274f47061ba49ca27 novell-groupwise-gwclient-7.0.2_p20070228.ebuild 1715
-RMD160 c1bc6ab8aca703fb14b3b91a879540ddafe2d2a0 novell-groupwise-gwclient-7.0.2_p20070228.ebuild 1715
-SHA256 29ca5c14d18c103df18638262a3eb4bc8ee8c0ce2b634b4c673d19de53489f7d novell-groupwise-gwclient-7.0.2_p20070228.ebuild 1715
 EBUILD novell-groupwise-gwclient-7.0.2_p20070524-r1.ebuild 4448 RMD160 fe4a28c6d41c44f549934210378dccc6df964a94 SHA1 8808513eafa23c90dc087eda1a38b6e3777c53c9 SHA256 af8e66875b2413214f6afee5f9c797e512bccbd678b5b5ff10f2d84bde3762b0
-MD5 ee7aac2b3aa43fb364ea4ae5a7ab9caa novell-groupwise-gwclient-7.0.2_p20070524-r1.ebuild 4448
-RMD160 fe4a28c6d41c44f549934210378dccc6df964a94 novell-groupwise-gwclient-7.0.2_p20070524-r1.ebuild 4448
-SHA256 af8e66875b2413214f6afee5f9c797e512bccbd678b5b5ff10f2d84bde3762b0 novell-groupwise-gwclient-7.0.2_p20070524-r1.ebuild 4448
 EBUILD novell-groupwise-gwclient-7.0.2_p20070606-r1.ebuild 4441 RMD160 dda17aae904ee06994e4569fbaee08c18129a05f SHA1 beba2431f24ae11696031f9a107bdba396b6dec5 SHA256 6a63d9839301b63f67d55e3abf719a1cbbecab524b8b0d14022ee8e6c7cd9965
-MD5 3b1488e7b0506bec40d3b14031d55c13 novell-groupwise-gwclient-7.0.2_p20070606-r1.ebuild 4441
-RMD160 dda17aae904ee06994e4569fbaee08c18129a05f novell-groupwise-gwclient-7.0.2_p20070606-r1.ebuild 4441
-SHA256 6a63d9839301b63f67d55e3abf719a1cbbecab524b8b0d14022ee8e6c7cd9965 novell-groupwise-gwclient-7.0.2_p20070606-r1.ebuild 4441
 EBUILD novell-groupwise-gwclient-7.0.2_p20070606-r2.ebuild 1833 RMD160 476c8610b58ef77d2bed45dd17a441510c8d7633 SHA1 68a2042a8b470c5e4e1469078f668c863d0997a3 SHA256 d6789d4d9dcabed814bec332f46e34825877bc6afb848ed7a097a374ae3e0708
-MD5 7e98b4381cf53a1d0105cfed521c39e3 novell-groupwise-gwclient-7.0.2_p20070606-r2.ebuild 1833
-RMD160 476c8610b58ef77d2bed45dd17a441510c8d7633 novell-groupwise-gwclient-7.0.2_p20070606-r2.ebuild 1833
-SHA256 d6789d4d9dcabed814bec332f46e34825877bc6afb848ed7a097a374ae3e0708 novell-groupwise-gwclient-7.0.2_p20070606-r2.ebuild 1833
-MISC ChangeLog 2537 RMD160 cfe6faf82cf1d3310884173fc3730d4b3760790a SHA1 0f16120a2b1276cd77b992a992fb69ec2c013090 SHA256 c91472216b573442da432ca8458d731376d32d47b0b1aa5a6b59248260fee7a9
-MD5 bb1a84bf65a81ca7ec1cb10075ddeff7 ChangeLog 2537
-RMD160 cfe6faf82cf1d3310884173fc3730d4b3760790a ChangeLog 2537
-SHA256 c91472216b573442da432ca8458d731376d32d47b0b1aa5a6b59248260fee7a9 ChangeLog 2537
+EBUILD novell-groupwise-gwclient-7.0.3_p20080129.ebuild 1829 RMD160 2a6237a43f569f14e4522b2056dbc03264f2f690 SHA1 ea9175603f9f7ad88dcffa86632ed0be4663ff02 SHA256 e71bddb1cce8486a3383923baef89601ee0b97a2a42678b21906c0e8a1b4404c
+MISC ChangeLog 2654 RMD160 9033b320fd60f79c38cdaceec342e4773b943671 SHA1 0c92f666aba3afe79fabd665f6b1db9252768e3d SHA256 e32f3da1df3b482edc765d910d31b6e9d0335eee70cb6a6112b09480d50b25de
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
-MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
-RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
-SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 72d0995967de4cd991e0a7f0a016996b files/digest-novell-groupwise-gwclient-7.0.2_p20070228 250
-RMD160 6c1d623fa9ce0618d59ec9a8487c6a4b996b7a8f files/digest-novell-groupwise-gwclient-7.0.2_p20070228 250
-SHA256 fe30848fa2b84323c88ffeb324ba24a41451e2cd054c1e07fc11c33d6cecefef files/digest-novell-groupwise-gwclient-7.0.2_p20070228 250
-MD5 9be3a3d19e55a83e4aee449622ebbeeb files/digest-novell-groupwise-gwclient-7.0.2_p20070524-r1 259
-RMD160 b5a9b82aca0d87fe151fe68c1f368df8ceccb3cf files/digest-novell-groupwise-gwclient-7.0.2_p20070524-r1 259
-SHA256 d38bdb9b0f2babcca58fd21ee44b15fcc9344d5a362d3b5e54b0a75885b2816a files/digest-novell-groupwise-gwclient-7.0.2_p20070524-r1 259
-MD5 763e6c662c179e602fefa3064096d5b4 files/digest-novell-groupwise-gwclient-7.0.2_p20070606-r1 265
-RMD160 d5df0f3ebb6c5326c8ca158f668a3aac043dff76 files/digest-novell-groupwise-gwclient-7.0.2_p20070606-r1 265
-SHA256 9d916e6b25b3ea464a4611c16ebe4945f0dbef9fcd5289e16736c261278d1f36 files/digest-novell-groupwise-gwclient-7.0.2_p20070606-r1 265
-MD5 763e6c662c179e602fefa3064096d5b4 files/digest-novell-groupwise-gwclient-7.0.2_p20070606-r2 265
-RMD160 d5df0f3ebb6c5326c8ca158f668a3aac043dff76 files/digest-novell-groupwise-gwclient-7.0.2_p20070606-r2 265
-SHA256 9d916e6b25b3ea464a4611c16ebe4945f0dbef9fcd5289e16736c261278d1f36 files/digest-novell-groupwise-gwclient-7.0.2_p20070606-r2 265
diff --git a/branches/experimental/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-7.0.3_p20080129.ebuild b/branches/experimental/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-7.0.3_p20080129.ebuild
new file mode 100644
index 0000000..9ffbc61
--- /dev/null
+++ b/branches/experimental/net-mail/novell-groupwise-gwclient/novell-groupwise-gwclient-7.0.3_p20080129.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils rpm
+
+MY_P="${P/_p/-}"
+DESCRIPTION="Novell Groupwise 7 Client for Linux"
+HOMEPAGE="http://www.novell.com/en/gropwise/"
+SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/ORs3oDy0mWk~/patchfiles/gw703clnxmulti.tar.gz"
+LICENSE="Novell-GW-7"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="java novell-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 )"
+
+RESTRICT="nostrip nomirror"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p ${WORKDIR}/${MY_P}
+	cd ${MY_P}
+	rpm_unpack ${WORKDIR}/${MY_P}.i386.rpm
+}
+
+src_compile() { :; }
+
+src_install() {
+	JRE_DIR="${WORKDIR}"/${MY_P}/opt/novell/groupwise/client/jre;
+
+	if use novell-jre; then
+# Undo Novell funny-business with packed .jar's
+		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";
+		done;
+	else
+		rm 	-rf "${WORKDIR}"/${MY_P}/opt/novell/groupwise/client/jre
+
+		sed -i 's%/opt/novell/groupwise/client/jre/lib/i386%`java-config --jre-home`/jre/lib/i386/client:`java-config --jre-home`/jre/lib/i386/server:`java-config --jre-home`/jre/lib/i386%' "${WORKDIR}"/${MY_P}/opt/novell/groupwise/client/bin/groupwise
+	fi
+
+	insinto /usr/share/applications
+	doins "${WORKDIR}"/${MY_P}/opt/novell/groupwise/client/gwclient.desktop
+
+	mv "${WORKDIR}"/${MY_P}/opt "${D}"/ || die "mv opt"
+
+	dodir /usr/bin
+	dosym /opt/novell/groupwise/client/bin/groupwise /usr/bin/groupwise
+}