diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/ChangeLog b/trunk/novell4gentoo/net-nds/novell-xtier-base/ChangeLog
index e4e4b344..93201023 100644
--- a/trunk/novell4gentoo/net-nds/novell-xtier-base/ChangeLog
+++ b/trunk/novell4gentoo/net-nds/novell-xtier-base/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for net-nds/novell-xtier-base
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Jan 2009; Mario Fetka <mario.fetka@gmail.com>
+  +novell-xtier-base-3.1.6.10.ebuild:
+  Bump and use my rpm5 eclass
+
   10 Dec 2008; Mario Fetka <mario.fetka@gmail.com>
   novell-xtier-base-3.1.6.8-r2.ebuild:
   correct typo
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/Manifest b/trunk/novell4gentoo/net-nds/novell-xtier-base/Manifest
index 5e81d3a8..bd641f2d 100644
--- a/trunk/novell4gentoo/net-nds/novell-xtier-base/Manifest
+++ b/trunk/novell4gentoo/net-nds/novell-xtier-base/Manifest
@@ -15,9 +15,9 @@ DIST novell-client-2.0-sle10sp1-i386.iso 10866688 RMD160 b478e97de576987b0a3b801
 DIST novell-client-2.0-sle10sp1-x86_64.iso 11649024 RMD160 4f3a08e9cfea2b78072ba9114ecf03b44d8da17a SHA1 f1f5c78851a66c963fef02c69d89e86a3ba12d00 SHA256 3b70e2c81ded3916771a22a5c284c0d5ac7b32b8a47207d01350f9f952fd216f
 EBUILD novell-xtier-base-3.1.5_p46.ebuild 7574 RMD160 1bcb33ddee3a12fc84e74947bbfbeb80265713f4 SHA1 05b63e4bb82acebeb185426c0ab1c3d8bb296288 SHA256 289f05b14c587d110675ba34a228f6a3839db6c65b3391e400b1a969051a5365
 EBUILD novell-xtier-base-3.1.6.0.8.ebuild 7640 RMD160 822529a90d48cbe36055b01ab3470497cd4078bb SHA1 0a6ad7b0be0d85559bc3ac71cb15a62132920acc SHA256 46bc360afa53e3d1696c47bb71229e0947d355cff90eb5592dcf98a167071191
-EBUILD novell-xtier-base-3.1.6.10.ebuild 12195 RMD160 8b068fa1151c607324d2a8432c82263c6d027b18 SHA1 21e2b98632a67a33f785bed77fc62efae820f6fd SHA256 5e484c575f32cfcbd637d142b9285f1941f18dd3dfffc7058cddabfc24656331
+EBUILD novell-xtier-base-3.1.6.10.ebuild 12195 RMD160 87eb4a9a2030bf7f6e9485d9e7db5cc4767d3daa SHA1 055538601cce818e4d566b2a627bcb940b2e8566 SHA256 5ecba2ee8d8e9640338ede9e93c73b8fb94feb97170bfac6e42a8eea72de369a
 EBUILD novell-xtier-base-3.1.6.8-r1.ebuild 12131 RMD160 909d3e3b181cfea4a9c5d25fbac1b622a614b6e6 SHA1 7d18db6cf904b43058a0f75332996b08c6e5df77 SHA256 eae19b84f31748706fe836d1726a4c301f3da058fe0c01e98dfec864bca9412f
 EBUILD novell-xtier-base-3.1.6.8-r2.ebuild 12198 RMD160 19c1b5f5cc04d6124a42280ff71cb77cce0154ca SHA1 c33542049c5d1c8fa7b2ca460600fa1a23d85336 SHA256 8532c0a8ba372e8f3c5c5438c5be51f193bfefe08f3346d62d4a3e9f49dc22e6
 EBUILD novell-xtier-base-3.1.6.8.ebuild 7666 RMD160 cc1b7516c3dc1acf69062b6c044c18742383f8a9 SHA1 e07459c18ca4b1714b5687aa51a7d6843ba85097 SHA256 a9eb238c359b089fae50a88be2918c9e706f441821c813d6b869db87e155e5e7
-MISC ChangeLog 2589 RMD160 e5f6307230f46f93b9fbe156894af60f6c5a05b3 SHA1 c32cd52c325a60996b46e86e07579bd1315bc27b SHA256 a22f6a03d03815cad4ba2b20f2a3256c7d3841791bad95250f6180832e49f4d6
+MISC ChangeLog 2709 RMD160 4743f9a9534fb3ce232c1c3554bcd071f1b32a40 SHA1 be78113d7b5cb2e3dc3a5cc034f42947869fba2a SHA256 bc9eadf09d0eb6c8c600a53a9b3828e221d2965961a7fad283cf0bf5b06cea8b
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.6.10.ebuild b/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.6.10.ebuild
new file mode 100644
index 00000000..f2d815dd
--- /dev/null
+++ b/trunk/novell4gentoo/net-nds/novell-xtier-base/novell-xtier-base-3.1.6.10.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+NOVELL_BUILDID="CuRXfXSzq7M~"
+NOVELL_FILE32="Novell_Client_SLE11-i586-20081218-CD1.iso"
+NOVELL_FILE64="Novell_Client_SLE11-x86_64-20081218-CD1.iso"
+SUSE_FILE32="http://download.opensuse.org/distribution/11.1/repo/oss/suse/i586/binutils-2.19-7.9.i586.rpm"
+SUSE_FILE64="http://download.opensuse.org/distribution/11.1/repo/oss/suse/x86_64/binutils-2.19-7.14.x86_64.rpm"
+RESTRICT="mirror strip"
+USE_RPMOFFSET_ONLY="1"
+
+inherit novell eutils rpm5 versionator
+
+MY_PVV=$(replace_version_separator 3 '-')
+MY_PV="${MY_PVV/_p/-}"
+
+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}
+	${SUSE_FILE32} )
+	amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/${NOVELL_BUILDID}/${NOVELL_FILE64}
+	${SUSE_FILE64} )"
+
+LICENSE="Novell-NCL"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=">=app-arch/p7zip-4.15"
+
+RDEPEND="virtual/libc
+	net-nds/novell-xtier-env
+	>=dev-libs/expat-2.0.0
+	>=net-nds/novell-xtier-core-${PV}
+	>=sys-libs/ncurses-5.5
+	>=sys-devel/gcc-4.1"
+
+src_unpack() {
+	cd "${WORKDIR}"
+	if use x86
+	then
+	    narch=i586
+	    nlib=lib
+	    brel=7.9
+	    7z x "${DISTDIR}"/${NOVELL_FILE32}
+	elif use amd64
+	then
+	    narch=x86_64
+	    nlib=lib64
+	    brel=7.14
+	    7z x "${DISTDIR}"/${NOVELL_FILE64}
+	fi
+	rpm_unpack "${DISTDIR}"/binutils-2.19-${brel}.${narch}.rpm
+	mkdir -p "${WORKDIR}"/${PN}-${MY_PV}
+	cd ${PN}-${MY_PV}
+	rpm_unpack "${WORKDIR}"/suse/${narch}/${PN}-${MY_PV}.${narch}.rpm
+}
+
+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}/*
+	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/*
+
+	newinitd "${FILESDIR}"/novell-xregd20.initd novell-xregd
+}
+
+
+
+
+
+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 get the following files from SuSE"
+	if use x86
+	then
+	    einfo " - ${SUSE_FILE32}"
+	elif use amd64
+	then
+	    einfo " - ${SUSE_FILE64}"
+	fi
+	einfo "and place them 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"
+}
+
+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 test "$1" != 1; then
+#        echo "   doing rpm upgrade processing"
+#        if [ "$YAST_IS_RUNNING" != "instsys" ]; 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
+                LD_LIBRARY_PATH=/opt/novell/xtier/lib /opt/novell/xtier/bin/regutil -e /var/opt/novell/xtier/xregd/xtier_registry.xml.export
+                einfo "   done exporting XTier Xml Registry"
+        else
+                einfo "   Saving Pre-XFlaim registry file for upgrade..."
+                cp /etc/opt/novell/xtier/xtier_registry.xml /etc/opt/novell/xtier/xtier_registry.xml.upgrade
+        fi
+        einfo "done running Novell XTier Base pre script!"
+#        exit 0
+#fi
+#echo "   doing rpm install processing"
+# Do necessary user and group administration
+#group_present=`getent group | grep ^novlxtier`
+#if [ -z "$group_present" ] ; then
+#        /usr/sbin/groupadd -r -g 81 novlxtier
+#fi
+#user_present=`getent passwd | grep ^novlxregd`
+#if [ -z "$user_present" ] ; then
+#        /usr/sbin/useradd -c "Novell XRegD System User" -s /bin/false -r -d /var/opt/novell/xtier/xregd -g novlxtier -u 81 novlxregd 2> /dev/null || :
+#fi
+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 **********
+# ***************************************
+einfo "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.
+        if [ -e "/etc/opt/novell/xtier/xtier_registry.xml.upgrade" ]; then
+                einfo "      Using Pre-XFlaim registry file"
+                LD_LIBRARY_PATH=/opt/novell/xtier/lib /opt/novell/xtier/bin/regutil -i /etc/opt/novell/xtier/xtier_registry.xml.upgrade
+                rm -f /etc/opt/novell/xtier/xtier_registry.xml.upgrade
+                # Make registry changes necessary to bring the base registry up to date
+                LD_LIBRARY_PATH=/opt/novell/xtier/lib /opt/novell/xtier/bin/regutil -v "XTier\Configuration\XSrv\Authentication Domains" "Default Authentication Provider" REG_SZ "{6AC0492F-3EEF-11d3-BBF3-00A0C9EA53EF}"
+                LD_LIBRARY_PATH=/opt/novell/xtier/lib /opt/novell/xtier/bin/regutil -d "Client\Policies\Network\IP\Address Resolution Providers\Available" "5"
+                LD_LIBRARY_PATH=/opt/novell/xtier/lib /opt/novell/xtier/bin/regutil -d "Client\Policies\Network\IP\Address Resolution Providers\Configured" "5"
+        else
+                einfo "      Using newly installed registry file"
+                LD_LIBRARY_PATH=/opt/novell/xtier/lib /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"
+else
+        # The XTier registry exists, check its integrity.
+        LD_LIBRARY_PATH=/opt/novell/xtier/lib /opt/novell/xtier/bin/regutil -c
+#        if [ "$?" != "0" ]; then
+#                echo "   Existing XTier Registry Db Unsupported or Corrupted"
+#                echo "   Re-installing XTier Registry Db"
+                # Delete the XFlaim DB files
+#                rm -f /var/opt/novell/xtier/xregd/db/xtier_registry.rfl/*
+#                rmdir /var/opt/novell/xtier/xregd/db/xtier_registry.rfl
+#                rm -f /var/opt/novell/xtier/xregd/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 "/var/opt/novell/xtier/xregd/xtier_registry.xml.export" ]; then
+                        LD_LIBRARY_PATH=/opt/novell/xtier/lib /opt/novell/xtier/bin/regutil -i /var/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"
+                        LD_LIBRARY_PATH=/opt/novell/xtier/lib /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 /var/opt/novell/xtier/xregd/xtier_registry.xml.export
+# Do not run the rest of the script if this is an upgrade
+#if test "$1" != 1; then
+#        echo "   doing rpm upgrade processing"
+#        echo "done running Novell XTier Base post script!"
+#        exit 0
+#fi
+#echo "   doing rpm install processing"
+# Install XRegD init script
+#
+#	if test -n "$YAST_IS_RUNNING" ; then 
+#            INSSERV_FORCE="-f" 
+#	else 
+#	    INSSERV_FORCE="" 
+#	fi 
+#	sbin/insserv $INSSERV_FORCE etc/init.d/novell-xregd
+#/usr/lib/lsb/install_initd /etc/init.d/novell-xregd
+# Create link to init.d script in /usr/sbin
+#if [ -f /usr/sbin/rcnovell-xregd ] || [ -L /usr/sbin/rcnovell-xregd ]; then
+#        rm -f /usr/sbin/rcnovell-xregd
+#fi
+#ln -s /etc/init.d/novell-xregd /usr/sbin/rcnovell-xregd
+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 ..."
+# Do not run script if this is an install
+#if test "$1" == 1; then
+#        echo "done running Novell XTier Base preun script!"
+#        exit 0
+#fi
+#echo "   doing rpm removal processing"
+# Stop novell-xregd
+/etc/init.d/novell-xregd stop
+# Remove XRegD init script
+#/usr/lib/lsb/remove_initd /etc/init.d/novell-xregd
+# 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
+        LD_LIBRARY_PATH=/opt/novell/xtier/lib /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 ..."
+# We just want to start the novell-xregd service if this is an upgrade
+#if test "$1" == 1; then
+#    if [ "$YAST_IS_RUNNING" != "instsys" ]; then
+#        echo "   doing rpm upgrade processing"
+        #echo "Novell XTier Base postun script starting novell-xregd for upgrade"
+        /etc/init.d/novell-xregd start
+#    fi
+    einfo "done running Novell XTier Base postun script!"
+#    exit 0
+#fi
+#echo "   doing rpm removal processing"
+# Remove symbolic link to init.d script
+#if [ -f /usr/sbin/rcnovell-xregd ] || [ -L /usr/sbin/rcnovell-xregd ]; then
+#        rm -f /usr/sbin/rcnovell-xregd
+#fi
+# Delete the novlxregd user
+#userdel novlxregd
+# Delete the var files
+#rm -rf /var/opt/novell/xtier
+#einfo "done running Novell XTier Base postun script!"
+# ***************************************
+# ******* End of postun script **********
+# ***************************************
+}