New version 0.19 (bug #278066); fix hard-coded "gcc" and "make"

(Portage version: 2.1.6.13/cvs/Linux x86_64)

7 files changed, 100 insertions, 18 deletions

diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index 0b9a7866ddec..9588423ade95 100644
--- a/sys-fs/btrfs-progs/ChangeLog
+++ b/sys-fs/btrfs-progs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/btrfs-progs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.21 2009/06/14 15:46:16 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.22 2009/09/21 15:57:42 lavajoe Exp $
+
+*btrfs-progs-0.19 (21 Sep 2009)
+
+  21 Sep 2009; Joe Peterson <lavajoe@gentoo.org> btrfs-progs-0.16-r1.ebuild,
+  btrfs-progs-0.17.ebuild, -btrfs-progs-0.18.ebuild,
+  btrfs-progs-0.18-r1.ebuild, +btrfs-progs-0.19.ebuild,
+  +files/btrfs-progs-0.19-convert-remove-used-space-update.patch,
+  btrfs-progs-9999.ebuild:
+  New version 0.19 (bug #278066); fix hard-coded "gcc" and "make"
 
 *btrfs-progs-0.18-r1 (14 Jun 2009)
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild
index 1f8b0b8229b9..b4fd8a33e7ca 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild
@@ -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.16-r1.ebuild,v 1.3 2009/06/06 05:13:09 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild,v 1.4 2009/09/21 15:57:42 lavajoe Exp $
 
 inherit eutils
 
@@ -25,6 +25,10 @@ src_unpack() {
 
 	# Apply hot fixes
 	#epatch "${FILESDIR}/${P}-hotfix.patch"
+
+	# Fix hardcoded "gcc" and "make"
+	sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile
+	sed -i -e 's:make:$(MAKE):' Makefile
 }
 
 src_compile() {
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild
index a5a47e14c07a..61f42edc905f 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild
@@ -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.17.ebuild,v 1.3 2009/06/06 05:13:09 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild,v 1.4 2009/09/21 15:57:42 lavajoe Exp $
 
 inherit eutils
 
@@ -25,6 +25,10 @@ src_unpack() {
 
 	# Apply hot fixes
 	#epatch "${FILESDIR}/${P}-hotfix.patch"
+
+	# Fix hardcoded "gcc" and "make"
+	sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile
+	sed -i -e 's:make:$(MAKE):' Makefile
 }
 
 src_compile() {
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild
index b7fbc175f716..fece48606789 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild
@@ -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: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild,v 1.2 2009/09/21 15:57:42 lavajoe Exp $
 
 inherit eutils
 
@@ -26,6 +26,10 @@ src_unpack() {
 
 	# Apply hot fixes
 	#epatch "${FILESDIR}/${P}-hotfix.patch"
+
+	# Fix hardcoded "gcc" and "make"
+	sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile
+	sed -i -e 's:make:$(MAKE):' Makefile
 }
 
 src_compile() {
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.18.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild
index ae6ae1344676..2ac41f6c6e55 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-0.18.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild
@@ -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.ebuild,v 1.3 2009/06/06 05:13:09 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild,v 1.1 2009/09/21 15:57:42 lavajoe Exp $
 
 inherit eutils
 
@@ -11,26 +11,34 @@ SRC_URI="http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="acl"
+IUSE="acl debug-utils"
 
-DEPEND="dev-python/matplotlib
+DEPEND="debug-utils? ( dev-python/matplotlib )
 	acl? (
 			sys-apps/acl
 			sys-fs/e2fsprogs
-		)"
+	)"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# Apply hot fixes
-	#epatch "${FILESDIR}/${P}-hotfix.patch"
+	# Remove code that updates the total used space, since
+	# btrfs_update_block_group does that work now.
+	# (patch that did not make 0.19 release)
+	epatch "${FILESDIR}/${P}-convert-remove-used-space-update.patch"
+
+	# Fix hardcoded "gcc" and "make"
+	sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile
+	sed -i -e 's:make:$(MAKE):' 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
@@ -41,13 +49,12 @@ src_install() {
 	into /
 	dosbin btrfs-show
 	dosbin btrfs-vol
-	dosbin btrfs-image
 	dosbin btrfsctl
-	dosbin btrfstune
 	dosbin btrfsck
+	dosbin btrfstune
+	dosbin btrfs-image
 	# 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
 	if use acl; then
@@ -56,18 +63,30 @@ src_install() {
 		ewarn "Note: btrfs-convert not built/installed (requires acl USE flag)"
 	fi
 
+	if use debug-utils; then
+		dobin btrfs-debug-tree
+	else
+		ewarn "Note: btrfs-debug-tree not installed (requires debug-utils USE flag)"
+	fi
+
 	into /usr
 	newbin bcp btrfs-bcp
-	newbin show-blocks btrfs-show-blocks
+
+	if use debug-utils; then
+		newbin show-blocks btrfs-show-blocks
+	else
+		ewarn "Note: btrfs-show-blocks not installed (requires debug-utils USE flag)"
+	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!"
 }
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 5f37fa9efd41..7695b1f1a534 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-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-9999.ebuild,v 1.10 2009/06/14 15:46:16 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.11 2009/09/21 15:57:41 lavajoe Exp $
 
 inherit eutils git
 
@@ -23,9 +23,20 @@ RDEPEND="${DEPEND}"
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git"
 EGIT_BRANCH="master"
 
+src_unpack() {
+	git_src_unpack
+	cd "${S}"
+
+	# Fix hardcoded "gcc" and "make"
+	sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile
+	sed -i -e 's:make:$(MAKE):' 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
@@ -51,7 +62,7 @@ src_install() {
 	fi
 
 	if use debug-utils; then
-		newsbin debug-tree btrfs-debug-tree
+		dobin btrfs-debug-tree
 	else
 		ewarn "Note: btrfs-debug-tree not installed (requires debug-utils USE flag)"
 	fi
@@ -66,6 +77,7 @@ src_install() {
 	fi
 
 	dodoc INSTALL
+	emake prefix="${D}/usr/share" install-man
 }
 
 pkg_postinst() {
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-0.19-convert-remove-used-space-update.patch b/sys-fs/btrfs-progs/files/btrfs-progs-0.19-convert-remove-used-space-update.patch
new file mode 100644
index 000000000000..e326f34af7e3
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-0.19-convert-remove-used-space-update.patch
@@ -0,0 +1,30 @@
+--- /var/tmp/portage/sys-fs/btrfs-progs-0.19/work/btrfs-progs-0.19/convert.c	2009-06-11 10:56:15.000000000 -0600
++++ btrfs-progs-unstable/convert.c	2009-09-21 08:51:43.773575874 -0600
+@@ -370,7 +370,6 @@
+ 	struct btrfs_extent_item *ei;
+ 	u32 blocksize = root->sectorsize;
+ 	u64 nbytes;
+-	u64 bytes_used;
+ 
+ 	if (disk_bytenr == 0) {
+ 		ret = btrfs_insert_file_extent(trans, root, objectid,
+@@ -432,9 +431,6 @@
+ 	nbytes = btrfs_stack_inode_nbytes(inode) + num_bytes;
+ 	btrfs_set_stack_inode_nbytes(inode, nbytes);
+ 
+-	bytes_used = btrfs_root_used(&root->root_item);
+-	btrfs_set_root_used(&root->root_item, bytes_used + num_bytes);
+-
+ 	btrfs_release_path(root, &path);
+ 
+ 	ins_key.objectid = disk_bytenr;
+@@ -454,9 +450,6 @@
+ 
+ 		btrfs_mark_buffer_dirty(leaf);
+ 
+-		bytes_used = btrfs_super_bytes_used(&info->super_copy);
+-		btrfs_set_super_bytes_used(&info->super_copy, bytes_used +
+-					   num_bytes);
+ 		ret = btrfs_update_block_group(trans, root, disk_bytenr,
+ 					       num_bytes, 1, 0);
+ 		if (ret)