diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/ChangeLog b/trunk/novell4gentoo/net-nds/novell-xtier-base/ChangeLog
index 9f1b2af2..a3e749e7 100644
--- a/trunk/novell4gentoo/net-nds/novell-xtier-base/ChangeLog
+++ b/trunk/novell4gentoo/net-nds/novell-xtier-base/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for net-nds/novell-xtier-base
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Aug 2008; Mario Fetka <mario.fetka@gmail.com>
+  -files/3.1.4_p4/novell-xregd, -files/novell-xregd12.initd,
+  -novell-xtier-base-3.1.4_p4-r4.ebuild, novell-xtier-base-3.1.5_p46.ebuild:
+  Repoman cleanup
+
   01 Nov 2007; Mario Fetka <mario-fetka@gmx.at> +files/80novell-xtier64,
   +files/novell-xregd20.initd, +novell-xtier-base-3.1.5_p46.ebuild:
   initial import novell client 2.0
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/Manifest b/trunk/novell4gentoo/net-nds/novell-xtier-base/Manifest
index 409b295c..878b3bbf 100644
--- a/trunk/novell4gentoo/net-nds/novell-xtier-base/Manifest
+++ b/trunk/novell4gentoo/net-nds/novell-xtier-base/Manifest
@@ -1,47 +1,10 @@
-AUX 3.1.4_p4/novell-xregd 650 RMD160 a68a152abd479ac2e4292dcb633b085b0683585d SHA1 ced9d00bb48bdc770b0e2c4ed6da0ac018794bbe SHA256 c708d5e30c1340dedea93a56294efbc66bb419d324c4b3a7ec8586c0d0e75d52
-MD5 a88889973c9ca37bc4e72f2eb5642faa files/3.1.4_p4/novell-xregd 650
-RMD160 a68a152abd479ac2e4292dcb633b085b0683585d files/3.1.4_p4/novell-xregd 650
-SHA256 c708d5e30c1340dedea93a56294efbc66bb419d324c4b3a7ec8586c0d0e75d52 files/3.1.4_p4/novell-xregd 650
 AUX 80novell-xtier 183 RMD160 c342ca807d858c64adf5e2808ab13abcc1524764 SHA1 01987259189cca71e36d1e4ee2f7c507b9ac1b9d SHA256 201cf6aeb826faf7ddd8ba99ff4847a686b23ca9821c0fde9e15c1b20bfb72d3
-MD5 f52d3a51b0482348825586842d5943b9 files/80novell-xtier 183
-RMD160 c342ca807d858c64adf5e2808ab13abcc1524764 files/80novell-xtier 183
-SHA256 201cf6aeb826faf7ddd8ba99ff4847a686b23ca9821c0fde9e15c1b20bfb72d3 files/80novell-xtier 183
 AUX 80novell-xtier64 235 RMD160 071cc960a1640aa0eabfeada645bd71ca0ab7d3f SHA1 c64833bb3595325b434f8fd42b13a09ba50af3af SHA256 fbcd1066d8419e61386b90583ebe08bee8370e97daa22761f8376cda81827281
-MD5 3359211ecf45c9dc5c18abb4be62c6b8 files/80novell-xtier64 235
-RMD160 071cc960a1640aa0eabfeada645bd71ca0ab7d3f files/80novell-xtier64 235
-SHA256 fbcd1066d8419e61386b90583ebe08bee8370e97daa22761f8376cda81827281 files/80novell-xtier64 235
-AUX novell-xregd12.initd 650 RMD160 a68a152abd479ac2e4292dcb633b085b0683585d SHA1 ced9d00bb48bdc770b0e2c4ed6da0ac018794bbe SHA256 c708d5e30c1340dedea93a56294efbc66bb419d324c4b3a7ec8586c0d0e75d52
-MD5 a88889973c9ca37bc4e72f2eb5642faa files/novell-xregd12.initd 650
-RMD160 a68a152abd479ac2e4292dcb633b085b0683585d files/novell-xregd12.initd 650
-SHA256 c708d5e30c1340dedea93a56294efbc66bb419d324c4b3a7ec8586c0d0e75d52 files/novell-xregd12.initd 650
 AUX novell-xregd20.initd 650 RMD160 a68a152abd479ac2e4292dcb633b085b0683585d SHA1 ced9d00bb48bdc770b0e2c4ed6da0ac018794bbe SHA256 c708d5e30c1340dedea93a56294efbc66bb419d324c4b3a7ec8586c0d0e75d52
-MD5 a88889973c9ca37bc4e72f2eb5642faa files/novell-xregd20.initd 650
-RMD160 a68a152abd479ac2e4292dcb633b085b0683585d files/novell-xregd20.initd 650
-SHA256 c708d5e30c1340dedea93a56294efbc66bb419d324c4b3a7ec8586c0d0e75d52 files/novell-xregd20.initd 650
 DIST binutils-2.16.91.0.5-18.i586.rpm 4265211 RMD160 aa5d41e1cd94e2cdcffa655db49647794066d42d SHA1 b9a2ae1479543d887cb7caa9035759afa2796a8a SHA256 616f3acba1d84e59d243a8d1b1e3fb4814e5cd0f72d121e5beaf1221f4f54e2f
 DIST binutils-2.16.91.0.5-18.x86_64.rpm 4370737 RMD160 f56f6d9ec337f1a125e2e92bab1351b3666931e9 SHA1 f92b793d2ea11ff5a0e2b6994fa22132497eb5b7 SHA256 c8d33d41b99378e0cb17b1d484395499fb2f6ca5f3062a5d5e80c73d69962d2e
-DIST novell-client-1.2-SLE10.tar.gz 13963983 RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 SHA1 14278f74c8226afabc0c602bdc31d4e20acff6b9 SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241
 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-xtier-base-3.1.4_p4-r4.ebuild 6724 RMD160 5f6b76b6ceb2b2b1caf6e96f340a49ba6d074ff1 SHA1 f7350c50624fe14fcb8e39f44eb5f1c827e79ee9 SHA256 cfa58c1b020e4b8e5fca03ffa42bbdde51e364eafb19bad2a576edeab443e4bf
-MD5 945004a2d42412ced36dd30e0cfede8f novell-xtier-base-3.1.4_p4-r4.ebuild 6724
-RMD160 5f6b76b6ceb2b2b1caf6e96f340a49ba6d074ff1 novell-xtier-base-3.1.4_p4-r4.ebuild 6724
-SHA256 cfa58c1b020e4b8e5fca03ffa42bbdde51e364eafb19bad2a576edeab443e4bf novell-xtier-base-3.1.4_p4-r4.ebuild 6724
-EBUILD novell-xtier-base-3.1.5_p46.ebuild 8291 RMD160 f38b8c99c9692b532ccb684682fc307ca0f1efec SHA1 98cdc8430decfdf6518676f3ca8d44e1340a20ae SHA256 bf663b41d97e53162b44dbf421935df1ec5cb07129d4501745898d58fa21affd
-MD5 3ce4c20a1c557ea96626c19fd747476e novell-xtier-base-3.1.5_p46.ebuild 8291
-RMD160 f38b8c99c9692b532ccb684682fc307ca0f1efec novell-xtier-base-3.1.5_p46.ebuild 8291
-SHA256 bf663b41d97e53162b44dbf421935df1ec5cb07129d4501745898d58fa21affd novell-xtier-base-3.1.5_p46.ebuild 8291
-MISC ChangeLog 1109 RMD160 db1142b8a76457992b10a21b82cda99d055bfcd6 SHA1 51d57edaf3268e97769b5a18da3fd847d66540af SHA256 c44d05306afed80b4ae9a22d1a93462882b0a19ad1c3808ea350e92b65a13479
-MD5 d2fb88697f4cb6a2aee96dc29be53117 ChangeLog 1109
-RMD160 db1142b8a76457992b10a21b82cda99d055bfcd6 ChangeLog 1109
-SHA256 c44d05306afed80b4ae9a22d1a93462882b0a19ad1c3808ea350e92b65a13479 ChangeLog 1109
+EBUILD novell-xtier-base-3.1.5_p46.ebuild 7677 RMD160 317745c805a8aa6239f048f8d65ce2487714399a SHA1 4bba8aed869d52d461e44323d3f54e265b337d24 SHA256 b2fbbf9d557bd99175718bd4994a2ef41156bc0e7488dc2e43e4ccc132ee2565
+MISC ChangeLog 1317 RMD160 a4297fca9d130ea10e882c2421508d0e019bda14 SHA1 f04240eda1293d494dfa0cbb03869cc6e8d6669c SHA256 e52b25d22996a8353b21d84d64a6298ccd04878450ac18424fe173ce1112b046
 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 a5cd406a9ef68f48c0d518a17223e53e files/digest-novell-xtier-base-3.1.4_p4-r4 557
-RMD160 579f4fb237e7ba5ff91c6adc7761635d14b40420 files/digest-novell-xtier-base-3.1.4_p4-r4 557
-SHA256 ef7a957c188f73f4252c8f914c68b5e418bc31118114e0c6d9acbf56178116cf files/digest-novell-xtier-base-3.1.4_p4-r4 557
-MD5 c6824c625e5e546a9b10534368be472a files/digest-novell-xtier-base-3.1.5_p46 1156
-RMD160 88681e70c4156c76126b5736900d9a89de3e4d47 files/digest-novell-xtier-base-3.1.5_p46 1156
-SHA256 1198f257f771496371163aca1bc2c93fa601555256db8ea1156068bee0cb2d85 files/digest-novell-xtier-base-3.1.5_p46 1156
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/files/3.1.4_p4/novell-xregd b/trunk/novell4gentoo/net-nds/novell-xtier-base/files/3.1.4_p4/novell-xregd
deleted file mode 100755
index ae31af2c..00000000
--- a/trunk/novell4gentoo/net-nds/novell-xtier-base/files/3.1.4_p4/novell-xregd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-  need net
-  after namcd
-}
-
-checkconfig() {
-  if [ ! -e ${NDSD_CONFIGFILE} ] ; then
-     eerror "Novell eDirectory server has not been configured."
-     return 1
-  fi
-}
-
-start() {
-  # Update the limit parameters
-  ulimit -c unlimited
-  ulimit -f unlimited
-  
-  ebegin "Starting novell-xregd"
-  start-stop-daemon --start --quiet --exec /opt/novell/xtier/bin/novell-xregd -u novlxregd -- -d
-  eend $?
-}
-
-stop() {
-  ebegin "Stopping novell-xregd"
-  start-stop-daemon --stop --quiet --signal INT --retry 30 --name /opt/novell/xtier/bin/novell-xregd
-  eend $?
-}
-
-#restart() {
-#  (Commands necessary to restart the service)
-#}
\ No newline at end of file
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/files/digest-novell-xtier-base-3.1.4_p4-r4 b/trunk/novell4gentoo/net-nds/novell-xtier-base/files/digest-novell-xtier-base-3.1.4_p4-r4
deleted file mode 100644
index b736a160..00000000
--- a/trunk/novell4gentoo/net-nds/novell-xtier-base/files/digest-novell-xtier-base-3.1.4_p4-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 00f1263b1f6e9effffbb691c3a265b71 binutils-2.16.91.0.5-18.i586.rpm 4265211
-RMD160 aa5d41e1cd94e2cdcffa655db49647794066d42d binutils-2.16.91.0.5-18.i586.rpm 4265211
-SHA256 616f3acba1d84e59d243a8d1b1e3fb4814e5cd0f72d121e5beaf1221f4f54e2f binutils-2.16.91.0.5-18.i586.rpm 4265211
-MD5 2aab6c7358a733d1d8d9a4e893500a36 novell-client-1.2-SLE10.tar.gz 13963983
-RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 novell-client-1.2-SLE10.tar.gz 13963983
-SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241 novell-client-1.2-SLE10.tar.gz 13963983
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/files/digest-novell-xtier-base-3.1.5_p46 b/trunk/novell4gentoo/net-nds/novell-xtier-base/files/digest-novell-xtier-base-3.1.5_p46
deleted file mode 100644
index b80788a9..00000000
--- a/trunk/novell4gentoo/net-nds/novell-xtier-base/files/digest-novell-xtier-base-3.1.5_p46
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 00f1263b1f6e9effffbb691c3a265b71 binutils-2.16.91.0.5-18.i586.rpm 4265211
-RMD160 aa5d41e1cd94e2cdcffa655db49647794066d42d binutils-2.16.91.0.5-18.i586.rpm 4265211
-SHA256 616f3acba1d84e59d243a8d1b1e3fb4814e5cd0f72d121e5beaf1221f4f54e2f binutils-2.16.91.0.5-18.i586.rpm 4265211
-MD5 02904f4f431263ffd79e599f7ec98c58 binutils-2.16.91.0.5-18.x86_64.rpm 4370737
-RMD160 f56f6d9ec337f1a125e2e92bab1351b3666931e9 binutils-2.16.91.0.5-18.x86_64.rpm 4370737
-SHA256 c8d33d41b99378e0cb17b1d484395499fb2f6ca5f3062a5d5e80c73d69962d2e binutils-2.16.91.0.5-18.x86_64.rpm 4370737
-MD5 8053ad010f806c412bfcc3dae251050e novell-client-2.0-sle10sp1-i386.iso 10866688
-RMD160 b478e97de576987b0a3b801965dbddb4fc8d8ce0 novell-client-2.0-sle10sp1-i386.iso 10866688
-SHA256 a6609aee78e90a5375fd698b571a015b3696d10ff2f11d085e4abf5b404a35d6 novell-client-2.0-sle10sp1-i386.iso 10866688
-MD5 3203d19a129165a4f504b394c330f897 novell-client-2.0-sle10sp1-x86_64.iso 11649024
-RMD160 4f3a08e9cfea2b78072ba9114ecf03b44d8da17a novell-client-2.0-sle10sp1-x86_64.iso 11649024
-SHA256 3b70e2c81ded3916771a22a5c284c0d5ac7b32b8a47207d01350f9f952fd216f novell-client-2.0-sle10sp1-x86_64.iso 11649024
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/files/novell-xregd12.initd b/trunk/novell4gentoo/net-nds/novell-xtier-base/files/novell-xregd12.initd
deleted file mode 100755
index ae31af2c..00000000
--- a/trunk/novell4gentoo/net-nds/novell-xtier-base/files/novell-xregd12.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-  need net
-  after namcd
-}
-
-checkconfig() {
-  if [ ! -e ${NDSD_CONFIGFILE} ] ; then
-     eerror "Novell eDirectory server has not been configured."
-     return 1
-  fi
-}
-
-start() {
-  # Update the limit parameters
-  ulimit -c unlimited
-  ulimit -f unlimited
-  
-  ebegin "Starting novell-xregd"
-  start-stop-daemon --start --quiet --exec /opt/novell/xtier/bin/novell-xregd -u novlxregd -- -d
-  eend $?
-}
-
-stop() {
-  ebegin "Stopping novell-xregd"
-  start-stop-daemon --stop --quiet --signal INT --retry 30 --name /opt/novell/xtier/bin/novell-xregd
-  eend $?
-}
-
-#restart() {
-#  (Commands necessary to restart the service)
-#}
\ No newline at end of file
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.4_p4-r4.ebuild b/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.4_p4-r4.ebuild
deleted file mode 100644
index d37ec203..00000000
--- a/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.4_p4-r4.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils rpm
-
-MY_PV="${PV/_p/-}"
-
-DESCRIPTION="Novell Xtier Base"
-HOMEPAGE="http://www.novell.com"
-SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/2JyMn7sWP_Q~/novell-client-1.2-SLE10.tar.gz 
-	http://download.opensuse.org/distribution/SL-10.1/inst-source/suse/i586/binutils-2.16.91.0.5-18.i586.rpm"
-
-LICENSE="Novell-NCL"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="gtk"
-
-DEPEND=""
-
-RDEPEND="virtual/libc
-	>=dev-libs/expat-2.0.0
-	>=net-nds/novell-xtier-core-3.1.4
-	>=sys-libs/ncurses-5.5
-	>=sys-devel/gcc-4.1
-	!net-misc/novell-xtier-base"
-
-RESTRICT="nomirror nostrip"
-
-src_unpack() {
-	unpack novell-client-1.2-SLE10.tar.gz
-	rpm_unpack ${DISTDIR}/binutils-2.16.91.0.5-18.i586.rpm
-	mkdir -p ${WORKDIR}/${PN}-${MY_PV}
-	cd ${PN}-${MY_PV}
-	rpm_unpack ${WORKDIR}/ncl_build_711/NCL_disk/novell/i586/${PN}-${MY_PV}.sles10.i586.rpm
-}
-
-src_compile() { :; }
-
-src_install() {
-	into /opt/novell/xtier
-	# still a hack
-	dolib.so "${WORKDIR}"/usr/lib/libbfd-*.so
-	dobin ${WORKDIR}/${PN}-${MY_PV}/opt/novell/xtier/bin/*
-	dolib.so ${WORKDIR}/${PN}-${MY_PV}/opt/novell/xtier/lib/*
-	dodoc ${WORKDIR}/${PN}-${MY_PV}/usr/share/doc/packages/${PN}/*
-	dodir /var/opt/novell/xtier/xregd/db
-	keepdir /var/opt/novell/xtier/xregd/db
-	dodir /etc/opt/novell/xtier/xregd
-	keepdir /etc/opt/novell/xtier/xregd
-	insinto /etc/opt/novell/xtier/
-	doins ${WORKDIR}/${PN}-${MY_PV}/etc/opt/novell/xtier/*
-
-	doenvd "${FILESDIR}"/80novell-xtier
-
-	doinitd "${FILESDIR}/${PV}"/novell-xregd
-}
-
-pkg_preinst(){
-# ***************************************
-# ******* Begin of pre script ***********
-# ***************************************
-einfo "Running Novell XTier Base pre script..."
-# We just want to stop the novell-xregd service and export the XTier registry to a
-# temporary file if this is an upgrade.
-if [ -e "/etc/init.d/novell-xregd" ]; then
-        #echo "Novell XTier Base pre script stoping novell-xregd for upgrade"
-        /etc/init.d/novell-xregd stop
-fi        
-# Check if we need to export the XTier registry
-# Note: We export the registry at this time to avoid losing its settings in case
-# that we have to rebuild the database.
-if [ -e "/var/opt/novell/xtier/xregd/db/xtier_registry.db" ]; then
-        einfo "   Exporting Xtier Registry to temporary file..."
-        rm -f /var/opt/novell/xtier/xregd/xtier_registry.xml.export
-        /opt/novell/xtier/bin/regutil -e /etc/opt/novell/xtier/xtier_registry.xml.export
-        einfo "   done exporting Xtier Xml Registry"
-fi
-
-einfo "done running Novell XTier Base pre script!"
-
-# Do necessary user and group administration
-enewgroup novlxtier
-enewuser novlxregd -1 -1 /var/opt/novell/xtier/xregd novlxtier
-einfo "done running Novell XTier Base pre script!"
-# ***************************************
-# ******* End of pre script *************
-# ***************************************
-}
-
-
-pkg_postinst(){
-# ***************************************
-# ******* Begin of post script **********
-# ***************************************
-echo "Running Novell XTier Base post script..."
-# Check if we need to import the XTier registry
-if [ ! -e "/var/opt/novell/xtier/xregd/db/xtier_registry.db" ]; then
-        einfo "   Importing Xtier Xml Registry..."
-                
-        # Import the registry.
-        # Note: We could be dealing with an upgrade from a Pre-XFlaim registry in which
-        # case we would have saved the previous registry contents to let us upgrade to XFlaim based
-        # registry without loosing configuration settings.
-        einfo "      Using newly installed registry file"
-	mkdir -p /var/opt/novell/xtier/xregd/db/
-        /opt/novell/xtier/bin/regutil -i /etc/opt/novell/xtier/xtier_registry.xml
-        # Make sure that novlxregd has rights to the registry db
-        chown -R novlxregd:novlxtier /var/opt/novell/xtier/xregd/db/
-        einfo "   done importing Xtier Xml Registry"
-else
-        # The XTier registry exists, check its integrity.
-        /opt/novell/xtier/bin/regutil -c
-        if [ "$?" != "0" ]; then
-                einfo "   Existing XTier Registry Db Unsupported or Corrupted"
-                einfo "   Re-installing XTier Registry Db"
-                
-                # Import the registry. Use registry file that was exported earlier if present to
-                # avoid losing configuration settings that may have been made.
-                if [ -e "/etc/opt/novell/xtier/xtier_registry.xml.export" ]; then
-                        /opt/novell/xtier/bin/regutil -i /etc/opt/novell/xtier/xregd/xtier_registry.xml.export
-                else
-                        einfo "   Exported registry file not found"
-                        einfo "   Configuration settings stored in the registry after initial install have been lost"
-                        /opt/novell/xtier/bin/regutil -i /etc/opt/novell/xtier/xtier_registry.xml
-                fi
-                # Make sure that novlxregd has rights to the registry db
-                chown -R novlxregd:novlxtier /var/opt/novell/xtier/xregd/db/
-                einfo "   done importing Xtier Xml Registry"
-        fi
-fi
-# Make sure that we are not leaving the temporary registry xml file around
-rm -f /etc/opt/novell/xtier/xtier_registry.xml.export
-einfo "done running Novell XTier Base post script!"
-# ***************************************
-# ******* End of post script ************
-# ***************************************
-}
-
-pkg_prerm(){
-# ***************************************
-# ******* Begin of pre-remove script ****
-# ***************************************
-einfo "Running Novell XTier Base preun script ..."
-# Stop novell-xregd
-/etc/init.d/novell-xregd stop
-# Check if we need to export the XTier registry
-if [ -e "/var/opt/novell/xtier/xregd/db/xtier_registry.db" ]; then
-        einfo "   Exporting Xtier Xml Registry..."
-        rm -f /etc/opt/novell/xtier/xtier_registry.xml.export
-        /opt/novell/xtier/bin/regutil -e /etc/opt/novell/xtier/xtier_registry.xml.export
-        einfo "   done exporting Xtier Xml Registry"
-fi
-einfo "done running Novell XTier Base preun script!"
-# ***************************************
-# ******* End of pre-remove script ******
-# ***************************************
-}
-
-pkg_postrm(){
-# ***************************************
-# ******* Begin of postun script ********
-# ***************************************
-einfo "Running Novell XTier Base postun script ..."
-# Delete the var files
-rm -rf /var/opt/novell/xtier
-einfo "done running Novell XTier Base postun script!"
-# ***************************************
-# ******* End of postun script **********
-# ***************************************
-}
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.5_p46.ebuild b/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.5_p46.ebuild
index 562cb2ce..56299e57 100644
--- a/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.5_p46.ebuild
+++ b/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.5_p46.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -15,10 +15,10 @@ DESCRIPTION="Novell Xtier Base"
 HOMEPAGE="http://www.novell.com"
 SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE32}
 	http://download.opensuse.org/distribution/SL-10.1/inst-source/suse/i586/binutils-2.16.91.0.5-18.i586.rpm )
-        amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE64} 
+	amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE64}
 	http://download.opensuse.org/distribution/SL-10.1/inst-source/suse/x86_64/binutils-2.16.91.0.5-18.x86_64.rpm )"
 
-LICENSE="Novell-ncl-EULA"
+LICENSE="Novell-NCL"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE=""
@@ -32,22 +32,22 @@ RDEPEND="virtual/libc
 	>=sys-devel/gcc-4.1"
 
 src_unpack() {
-        cd ${WORKDIR}
-        if use x86
-        then
-            narch=i586
-            nlib=lib
-            7z x ${DISTDIR}/${NOVELL_FILE32}
-        elif use amd64
-        then
-            narch=x86_64
-            nlib=lib64
-            7z x ${DISTDIR}/${NOVELL_FILE64}
-        fi
-	rpm_unpack ${DISTDIR}/binutils-2.16.91.0.5-18.${narch}.rpm
-        mkdir -p ${WORKDIR}/${PN}-${MY_PV}
-        cd ${PN}-${MY_PV}
-        rpm_unpack ${WORKDIR}/suse/${narch}/${PN}-${MY_PV}.${narch}.rpm
+	cd "${WORKDIR}"
+	if use x86
+	then
+	    narch=i586
+	    nlib=lib
+	    7z x "${DISTDIR}"/${NOVELL_FILE32}
+	elif use amd64
+	then
+	    narch=x86_64
+	    nlib=lib64
+	    7z x "${DISTDIR}"/${NOVELL_FILE64}
+	fi
+	rpm_unpack "${DISTDIR}"/binutils-2.16.91.0.5-18.${narch}.rpm
+	mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
+	cd ${PN}-${MY_PV}
+	rpm_unpack "${WORKDIR}"/suse/${narch}/${PN}-${MY_PV}.${narch}.rpm
 }
 
 src_compile() { :; }
@@ -55,24 +55,24 @@ src_compile() { :; }
 src_install() {
 	into /opt/novell/xtier
 	# still a hack
-	dolib.so "${WORKDIR}"/usr/${nlib}/libbfd-*.so
-	dobin ${WORKDIR}/${PN}-${MY_PV}/opt/novell/xtier/bin/*
-	dolib.so ${WORKDIR}/${PN}-${MY_PV}/opt/novell/xtier/${nlib}/*
-	dodoc ${WORKDIR}/${PN}-${MY_PV}/usr/share/doc/packages/${PN}/*
+	dolib.so ""${WORKDIR}""/usr/${nlib}/libbfd-*.so
+	dobin "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/xtier/bin/*
+	dolib.so "${WORKDIR}"/${PN}-${MY_PV}/opt/novell/xtier/${nlib}/*
+	dodoc "${WORKDIR}"/${PN}-${MY_PV}/usr/share/doc/packages/${PN}/*
 	dodir /var/opt/novell/xtier/xregd/db
 	keepdir /var/opt/novell/xtier/xregd/db
 	dodir /etc/opt/novell/xtier/xregd
 	keepdir /etc/opt/novell/xtier/xregd
 	insinto /etc/opt/novell/xtier/
-	doins ${WORKDIR}/${PN}-${MY_PV}/etc/opt/novell/xtier/*
+	doins "${WORKDIR}"/${PN}-${MY_PV}/etc/opt/novell/xtier/*
 
-        if use x86
-        then
-            doenvd "${FILESDIR}"/80novell-xtier
-        elif use amd64
-        then
-            doenvd "${FILESDIR}"/80novell-xtier64
-        fi
+	if use x86
+	then
+	    doenvd "${FILESDIR}"/80novell-xtier
+	elif use amd64
+	then
+	    doenvd "${FILESDIR}"/80novell-xtier64
+	fi
 
 	newinitd "${FILESDIR}"/novell-xregd20.initd novell-xregd
 }
@@ -85,17 +85,17 @@ einfo "Running Novell XTier Base pre script..."
 # We just want to stop the novell-xregd service and export the XTier registry to a
 # temporary file if this is an upgrade.
 if [ -e "/etc/init.d/novell-xregd" ]; then
-        #echo "Novell XTier Base pre script stoping novell-xregd for upgrade"
-        /etc/init.d/novell-xregd stop
-fi        
+	#echo "Novell XTier Base pre script stoping novell-xregd for upgrade"
+	/etc/init.d/novell-xregd stop
+fi
 # Check if we need to export the XTier registry
 # Note: We export the registry at this time to avoid losing its settings in case
 # that we have to rebuild the database.
 if [ -e "/var/opt/novell/xtier/xregd/db/xtier_registry.db" ]; then
-        einfo "   Exporting Xtier Registry to temporary file..."
-        rm -f /var/opt/novell/xtier/xregd/xtier_registry.xml.export
-        /opt/novell/xtier/bin/regutil -e /etc/opt/novell/xtier/xtier_registry.xml.export
-        einfo "   done exporting Xtier Xml Registry"
+	einfo "   Exporting Xtier Registry to temporary file..."
+	rm -f /var/opt/novell/xtier/xregd/xtier_registry.xml.export
+	/opt/novell/xtier/bin/regutil -e /etc/opt/novell/xtier/xtier_registry.xml.export
+	einfo "   done exporting Xtier Xml Registry"
 fi
 
 einfo "done running Novell XTier Base pre script!"
@@ -117,38 +117,38 @@ pkg_postinst(){
 echo "Running Novell XTier Base post script..."
 # Check if we need to import the XTier registry
 if [ ! -e "/var/opt/novell/xtier/xregd/db/xtier_registry.db" ]; then
-        einfo "   Importing Xtier Xml Registry..."
-                
-        # Import the registry.
-        # Note: We could be dealing with an upgrade from a Pre-XFlaim registry in which
-        # case we would have saved the previous registry contents to let us upgrade to XFlaim based
-        # registry without loosing configuration settings.
-        einfo "      Using newly installed registry file"
+	einfo "   Importing Xtier Xml Registry..."
+
+	# Import the registry.
+	# Note: We could be dealing with an upgrade from a Pre-XFlaim registry in which
+	# case we would have saved the previous registry contents to let us upgrade to XFlaim based
+	# registry without loosing configuration settings.
+	einfo "      Using newly installed registry file"
 	mkdir -p /var/opt/novell/xtier/xregd/db/
-        /opt/novell/xtier/bin/regutil -i /etc/opt/novell/xtier/xtier_registry.xml
-        # Make sure that novlxregd has rights to the registry db
-        chown -R novlxregd:novlxtier /var/opt/novell/xtier/xregd/db/
-        einfo "   done importing Xtier Xml Registry"
+	/opt/novell/xtier/bin/regutil -i /etc/opt/novell/xtier/xtier_registry.xml
+	# Make sure that novlxregd has rights to the registry db
+	chown -R novlxregd:novlxtier /var/opt/novell/xtier/xregd/db/
+	einfo "   done importing Xtier Xml Registry"
 else
-        # The XTier registry exists, check its integrity.
-        /opt/novell/xtier/bin/regutil -c
-        if [ "$?" != "0" ]; then
-                einfo "   Existing XTier Registry Db Unsupported or Corrupted"
-                einfo "   Re-installing XTier Registry Db"
-                
-                # Import the registry. Use registry file that was exported earlier if present to
-                # avoid losing configuration settings that may have been made.
-                if [ -e "/etc/opt/novell/xtier/xtier_registry.xml.export" ]; then
-                        /opt/novell/xtier/bin/regutil -i /etc/opt/novell/xtier/xregd/xtier_registry.xml.export
-                else
-                        einfo "   Exported registry file not found"
-                        einfo "   Configuration settings stored in the registry after initial install have been lost"
-                        /opt/novell/xtier/bin/regutil -i /etc/opt/novell/xtier/xtier_registry.xml
-                fi
-                # Make sure that novlxregd has rights to the registry db
-                chown -R novlxregd:novlxtier /var/opt/novell/xtier/xregd/db/
-                einfo "   done importing Xtier Xml Registry"
-        fi
+	# The XTier registry exists, check its integrity.
+	/opt/novell/xtier/bin/regutil -c
+	if [ "$?" != "0" ]; then
+	    einfo "   Existing XTier Registry Db Unsupported or Corrupted"
+	    einfo "   Re-installing XTier Registry Db"
+
+	    # Import the registry. Use registry file that was exported earlier if present to
+	    # avoid losing configuration settings that may have been made.
+	    if [ -e "/etc/opt/novell/xtier/xtier_registry.xml.export" ]; then
+		/opt/novell/xtier/bin/regutil -i /etc/opt/novell/xtier/xregd/xtier_registry.xml.export
+	    else
+		einfo "   Exported registry file not found"
+		einfo "   Configuration settings stored in the registry after initial install have been lost"
+		/opt/novell/xtier/bin/regutil -i /etc/opt/novell/xtier/xtier_registry.xml
+	    fi
+	# Make sure that novlxregd has rights to the registry db
+	chown -R novlxregd:novlxtier /var/opt/novell/xtier/xregd/db/
+	einfo "   done importing Xtier Xml Registry"
+	fi
 fi
 # Make sure that we are not leaving the temporary registry xml file around
 rm -f /etc/opt/novell/xtier/xtier_registry.xml.export
@@ -167,10 +167,10 @@ einfo "Running Novell XTier Base preun script ..."
 /etc/init.d/novell-xregd stop
 # Check if we need to export the XTier registry
 if [ -e "/var/opt/novell/xtier/xregd/db/xtier_registry.db" ]; then
-        einfo "   Exporting Xtier Xml Registry..."
-        rm -f /etc/opt/novell/xtier/xtier_registry.xml.export
-        /opt/novell/xtier/bin/regutil -e /etc/opt/novell/xtier/xtier_registry.xml.export
-        einfo "   done exporting Xtier Xml Registry"
+	einfo "   Exporting Xtier Xml Registry..."
+	rm -f /etc/opt/novell/xtier/xtier_registry.xml.export
+	/opt/novell/xtier/bin/regutil -e /etc/opt/novell/xtier/xtier_registry.xml.export
+	einfo "   done exporting Xtier Xml Registry"
 fi
 einfo "done running Novell XTier Base preun script!"
 # ***************************************
@@ -192,21 +192,21 @@ einfo "done running Novell XTier Base postun script!"
 }
 
 pkg_nofetch() {
-    einfo "This files require you to register at ${HOMEPAGE} (free account)"
-    einfo "Please download following file:"
-    if use x86
-    then
-        einfo " - ${NOVELL_FILE32}"
-    elif use amd64
-    then
-        einfo " - ${NOVELL_FILE64}"
-    fi
-    einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID}"
-    einfo "and place it in ${DISTDIR}"
-    einfo ""
-    einfo "To get rid of downloading files from ${HOMEPAGE}"
-    einfo "you can create a file /etc/portage/novell.acc"
-    einfo "containing the novell account infos with following commands"
-    einfo "# echo \"NOVELL_ACCOUNT_USERNAME=\\\"balduin\\\"\" >> /etc/portage/novell.acc"
-    einfo "# echo \"NOVELL_ACCOUNT_PASSWORD=\\\"derfisch\\\"\" >> /etc/portage/novell.acc"
+	einfo "This files require you to register at ${HOMEPAGE} (free account)"
+	einfo "Please download following file:"
+	if use x86
+	then
+	    einfo " - ${NOVELL_FILE32}"
+	elif use amd64
+	then
+	    einfo " - ${NOVELL_FILE64}"
+	fi
+	einfo "from http://download.novell.com/Download?buildid=${NOVELL_BUILDID}"
+	einfo "and place it in ${DISTDIR}"
+	einfo ""
+	einfo "To get rid of downloading files from ${HOMEPAGE}"
+	einfo "you can create a file /etc/portage/novell.acc"
+	einfo "containing the novell account infos with following commands"
+	einfo "# echo \"NOVELL_ACCOUNT_USERNAME=\\\"balduin\\\"\" >> /etc/portage/novell.acc"
+	einfo "# echo \"NOVELL_ACCOUNT_PASSWORD=\\\"derfisch\\\"\" >> /etc/portage/novell.acc"
 }