Build and install btrfs-convert as well; install other missing programs; honor CFLAGS/LDFLAGS

(Portage version: 2.2_rc6/cvs/Linux 2.6.26-gentoo i686)

3 files changed, 72 insertions, 5 deletions

diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index e82c89662ca1..348370c38485 100644
--- a/sys-fs/btrfs-progs/ChangeLog
+++ b/sys-fs/btrfs-progs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/btrfs-progs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.10 2008/08/06 04:05:53 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.11 2008/08/07 17:29:45 lavajoe Exp $
+
+*btrfs-progs-0.16-r1 (07 Aug 2008)
+
+  07 Aug 2008; Joe Peterson <lavajoe@gentoo.org>
+  +btrfs-progs-0.16-r1.ebuild, btrfs-progs-9999.ebuild:
+  Build and install btrfs-convert as well; install other missing programs;
+  honor CFLAGS/LDFLAGS
 
 *btrfs-progs-0.16 (05 Aug 2008)
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild
new file mode 100644
index 000000000000..31366e4d5072
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2008 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.16-r1.ebuild,v 1.1 2008/08/07 17:29:45 lavajoe Exp $
+
+inherit eutils
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="http://btrfs.wiki.kernel.org/"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-fs/e2fsprogs"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Apply hot fixes
+	#epatch "${FILESDIR}/${P}-hotfix.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		all || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		convert || die
+}
+
+src_install() {
+	into /
+	dosbin btrfs-convert
+	dosbin btrfs-show
+	dosbin btrfs-vol
+	dosbin btrfsctl
+	dosbin btrfsck
+	# fsck will segfault if invoked at boot, so do not make this link
+	#dosym btrfsck /sbin/fsck.btrfs
+	newsbin debug-tree btrfs-debug-tree
+	newsbin mkfs.btrfs mkbtrfs
+	dosym mkbtrfs /sbin/mkfs.btrfs
+
+	into /usr
+	newbin bcp btrfs-bcp
+	newbin show-blocks btrfs-show-blocks
+
+	dodoc INSTALL
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 40dd8fc1f57e..9fcb7b0ae3aa 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.4 2008/07/28 17:07:36 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.5 2008/08/07 17:29:45 lavajoe Exp $
 
 inherit eutils mercurial
 
@@ -23,8 +23,16 @@ src_unpack() {
 	cd "${S}"
 }
 
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		all || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		convert || die
+}
+
 src_install() {
 	into /
+	dosbin btrfs-convert
 	dosbin btrfs-show
 	dosbin btrfs-vol
 	dosbin btrfsctl
@@ -35,9 +43,9 @@ src_install() {
 	newsbin mkfs.btrfs mkbtrfs
 	dosym mkbtrfs /sbin/mkfs.btrfs
 
-	# collides with boost
-	#into /usr
-	#dobin bcp
+	into /usr
+	newbin bcp btrfs-bcp
+	newbin show-blocks btrfs-show-blocks
 
 	dodoc INSTALL
 }