--- btrfs-progs-0.18-r1.ebuild	2009-09-17 15:48:26.000000000 +0200
+++ btrfs-progs-0.19.ebuild	2009-09-17 15:48:33.000000000 +0200
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild,v 1.1 2009/06/14 15:46:16 lavajoe Exp $
+# $Header:$
 
 inherit eutils
 
@@ -26,11 +26,16 @@
 
 	# Apply hot fixes
 	#epatch "${FILESDIR}/${P}-hotfix.patch"
+
+	# Fix hardcoded gcc
+	sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile
 }
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		all || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		btrfstune btrfs-image || die
 	if use acl; then
 		emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 			convert || die
@@ -55,8 +60,9 @@
 		ewarn "Note: btrfs-convert not built/installed (requires acl USE flag)"
 	fi
 
+
 	if use debug-utils; then
-		newsbin debug-tree btrfs-debug-tree
+		newsbin btrfs-debug-tree
 	else
 		ewarn "Note: btrfs-debug-tree not installed (requires debug-utils USE flag)"
 	fi
@@ -71,13 +77,14 @@
 	fi
 
 	dodoc INSTALL
+	emake prefix="${D}/usr/share" install-man
 }
 
 pkg_postinst() {
 	ewarn "WARNING: This version of btrfs-progs corresponds to and should only"
 	ewarn "         be used with the version of btrfs included in the"
-	ewarn "         Linux kernel (2.6.29-rc2 and above)."
+	ewarn "         Linux kernel (2.6.31 and above)."
 	ewarn ""
 	ewarn "         This version should NOT be used with earlier versions"
-	ewarn "         of the standaline btrfs module!"
+	ewarn "         of the standalone btrfs module!"
 }