diff --git a/trunk/novell4gentoo/sys-libs/novell-xplatlib/ChangeLog b/trunk/novell4gentoo/sys-libs/novell-xplatlib/ChangeLog
index 92523f0..8299d59 100644
--- a/trunk/novell4gentoo/sys-libs/novell-xplatlib/ChangeLog
+++ b/trunk/novell4gentoo/sys-libs/novell-xplatlib/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Aug 2008; Mario Fetka <mario.fetka@gmail.com> -files/80novell,
+  -files/80novell64, novell-xplatlib-1.0.3_p31.ebuild:
+  depend on env package
+
   26 Aug 2008; Mario Fetka <mario.fetka@gmail.com>
   -novell-xplatlib-1.0.2_p5-r4.ebuild, novell-xplatlib-1.0.3_p31.ebuild:
   Repoman cleanup
diff --git a/trunk/novell4gentoo/sys-libs/novell-xplatlib/Manifest b/trunk/novell4gentoo/sys-libs/novell-xplatlib/Manifest
index 069d7fa..e56fff6 100644
--- a/trunk/novell4gentoo/sys-libs/novell-xplatlib/Manifest
+++ b/trunk/novell4gentoo/sys-libs/novell-xplatlib/Manifest
@@ -1,7 +1,5 @@
-AUX 80novell 175 RMD160 6706cbb05c0079b008b1e35a74518b137c1842c4 SHA1 ce625b90ee4b612381334b879468d9f0cc9e2a2b SHA256 1602e6f7016cd33476f398196f1061158d9f8f5e302b83911c92e013d6a7d81c
-AUX 80novell64 215 RMD160 d304cf813f3377e6fbb7b6bc4a8705590bd28afa SHA1 048891321018e5f7beb1bfc97883b9f2fa72ee6b SHA256 3806ba4709b79d940c2271af9607be295e97dd13c3bc889f95dec1a7d577f3d5
 DIST novell-client-2.0-sle10sp1-i386.iso 10866688 RMD160 b478e97de576987b0a3b801965dbddb4fc8d8ce0 SHA1 49d70ed6e7007b7e18468ec0b42bed6ac6b8702f SHA256 a6609aee78e90a5375fd698b571a015b3696d10ff2f11d085e4abf5b404a35d6
 DIST novell-client-2.0-sle10sp1-x86_64.iso 11649024 RMD160 4f3a08e9cfea2b78072ba9114ecf03b44d8da17a SHA1 f1f5c78851a66c963fef02c69d89e86a3ba12d00 SHA256 3b70e2c81ded3916771a22a5c284c0d5ac7b32b8a47207d01350f9f952fd216f
-EBUILD novell-xplatlib-1.0.3_p31.ebuild 2457 RMD160 b1be89f0c30c7b742409b92cd569ce5b2593ae32 SHA1 b46c3a2a89a71f631c59e5512acd18f073bf22c7 SHA256 d05fa4ee36de58d43890e3ffc930c683a15914a51f67e8d4795f938bac193307
-MISC ChangeLog 1297 RMD160 f7bb3d279820b88604f60bbcaafee36bd76d0223 SHA1 b782a13b1b05d2d854488fb47dc91d196241b7a5 SHA256 d7b89dc2bc67f192429f188adea9d6a8ec2c07f7e27d6cb2c6c2c21da15e53fe
+EBUILD novell-xplatlib-1.0.3_p31.ebuild 2360 RMD160 c2a6a61f419a9dbafde7470aad631c9671b2d2ce SHA1 bf34e25953186945e6ffa88a60b09bfd20ed3d70 SHA256 03a0e13094dd5e80539893e676c3bf7cf3c1e6d1fe0fa402a029272cd4b00983
+MISC ChangeLog 1445 RMD160 3e31272d259835e41318cdba01a1c04f7310220b SHA1 708d63b5585d9538aa1d5d7f27e0974a5bd00966 SHA256 8fa8612f2c2c04f10177167f81e61d3d2d72275f20376750f9377a3efce8f753
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/sys-libs/novell-xplatlib/files/80novell b/trunk/novell4gentoo/sys-libs/novell-xplatlib/files/80novell
deleted file mode 100644
index 5eccb25..0000000
--- a/trunk/novell4gentoo/sys-libs/novell-xplatlib/files/80novell
+++ /dev/null
@@ -1,5 +0,0 @@
-NOVELL_DIR=/opt/novell
-PATH=/opt/novell/bin
-ROOTPATH=/opt/novell/bin:/opt/novell/sbin
-LDPATH=/opt/novell/lib
-PRELINK_PATH_MASK=/opt/novell/lib:/opt/novell/bin:/opt/novell/sbin
\ No newline at end of file
diff --git a/trunk/novell4gentoo/sys-libs/novell-xplatlib/files/80novell64 b/trunk/novell4gentoo/sys-libs/novell-xplatlib/files/80novell64
deleted file mode 100644
index 2d8dd9e..0000000
--- a/trunk/novell4gentoo/sys-libs/novell-xplatlib/files/80novell64
+++ /dev/null
@@ -1,5 +0,0 @@
-NOVELL_DIR=/opt/novell
-PATH=/opt/novell/bin
-ROOTPATH=/opt/novell/bin:/opt/novell/sbin
-LDPATH=/opt/novell/lib64:/opt/novell/lib32
-PRELINK_PATH_MASK=/opt/novell/lib64:/opt/novell/lib32:/opt/novell/bin:/opt/novell/sbin
\ No newline at end of file
diff --git a/trunk/novell4gentoo/sys-libs/novell-xplatlib/novell-xplatlib-1.0.3_p31.ebuild b/trunk/novell4gentoo/sys-libs/novell-xplatlib/novell-xplatlib-1.0.3_p31.ebuild
index 5edc828..f380fb8 100644
--- a/trunk/novell4gentoo/sys-libs/novell-xplatlib/novell-xplatlib-1.0.3_p31.ebuild
+++ b/trunk/novell4gentoo/sys-libs/novell-xplatlib/novell-xplatlib-1.0.3_p31.ebuild
@@ -25,6 +25,7 @@ IUSE=""
 DEPEND=">=app-arch/p7zip-4.15"
 
 RDEPEND="virtual/libc
+	net-nds/novell-env
 	>=net-nds/novell-xtier-base-3.1.5_p46
 	>=net-nds/novell-xtier-xplat-3.1.5_p46"
 
@@ -57,14 +58,6 @@ src_install() {
 	    dosym lib${xlib}lnx.so.${MY_P} /opt/novell/${get_libdir}/lib${xlib}lnx.so
 	done
 	dodoc ""${WORKDIR}"/${PN}-${MY_PV}"/usr/share/doc/packages/${PN}/*
-
-	if use x86
-	then
-	    doenvd "${FILESDIR}"/80novell
-	elif use amd64
-	then
-	    doenvd "${FILESDIR}"/80novell64
-	fi
 }
 
 pkg_nofetch() {