--- ocfs2-tools-1.2.1.ebuild    2008-01-08 14:07:40.000000000 +0300
+++ ocfs2-tools-1.2.7.ebuild    2008-01-09 18:30:35.000000000 +0300
@@ -36,26 +36,18 @@
 src_install() {
        make DESTDIR="${D}" install || die "Failed to install"

-       doman \
-               mkfs.ocfs2/mkfs.ocfs2.8 \
-               ocfs2cdsl/ocfs2cdsl.8 \
-               ocfs2console/ocfs2console.8 \
-               ocfs2_hb_ctl/ocfs2_hb_ctl.8 \
-               tunefs.ocfs2/tunefs.ocfs2.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/
+       mkdir -p "${D}"/usr/sbin
        mv "${D}"/sbin/ocfs2cdsl "${D}"/usr/sbin/
-       mv "${D}"/sbin/ocfs2console "${D}"/usr/sbin/
+       if use X; then
+               mv "${D}"/sbin/ocfs2console "${D}"/usr/sbin/
+       fi

        newinitd "${FILESDIR}"/ocfs2.init ocfs2
        newconfd "${FILESDIR}"/ocfs2.conf ocfs2
@@ -69,7 +61,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() {