--- ocfs2-tools-1.2.1.ebuild    2008-01-08 14:07:40.000000000 +0300
+++ ocfs2-tools-1.2.7.ebuild    2008-01-08 14:32:15.000000000 +0300
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-fs/ocfs2-tools/ocfs2-tools-1.2.1.ebuild,v 1.3 2007/06/26 02:53:50 mr_bones_ Exp $

+inherit eutils
+
 PV_MAJOR="${PV%%.*}"
 PV_MINOR="${PV#*.}"
 PV_MINOR="${PV_MINOR%%.*}"
@@ -41,17 +43,18 @@
                ocfs2cdsl/ocfs2cdsl.8 \
                ocfs2console/ocfs2console.8 \
                ocfs2_hb_ctl/ocfs2_hb_ctl.8 \
-               tunefs.ocfs2/tunefs.ocfs2.8
+               tunefs.ocfs2/tunefs.ocfs2.8 \
+               debugfs.ocfs2/debugfs.ocfs2.8 \
+               fsck.ocfs2/fsck.ocfs2.8 \
+               fsck.ocfs2/fsck.ocfs2.checks.8 \
+               mount.ocfs2/mount.ocfs2.8 \
+               mounted.ocfs2/mounted.ocfs2.8 \
+               o2cb_ctl/o2cb_ctl.8
        dodoc \
                COPYING CREDITS MAINTAINERS README README.O2CB debugfs.ocfs2/README \
                documentation/users_guide.txt documentation/samples/cluster.conf \
-               "${FILESDIR}"/INSTALL.GENTOO
-
-       # Keep o2cb script in case someone needs it
-       insinto /usr/sbin
-       newins "${S}"/vendor/common/o2cb.init o2cb
-       insinto /etc/default
-       newins "${S}"/vendor/common/o2cb.sysconfig o2cb
+               documentation/ocfs2_faq.txt "${FILESDIR}"/INSTALL.GENTOO \
+               vendor/common/o2cb.init vendor/common/o2cb.sysconfig

        # Move programs not needed before /usr is mounted to /usr/sbin/
        mv "${D}"/sbin/ocfs2cdsl "${D}"/usr/sbin/
@@ -69,7 +72,7 @@
        # FIXME - fix the python lib.
        # pythonians wouldn't like this probably, but I couldn't find better
        # solution.
-       mv "${D}"/lib "${D}"/usr
+       mv "${D}"/$(get_libdir) "${D}"/usr
 }

 pkg_postinst() {