Patch 0.19 to bring up to version in RedHat (includes "-D" option in btrfsctl (bug #331121))

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 107 insertions, 2 deletions

diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index 91a480156476..66f0ae0342ee 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.29 2010/08/11 14:04:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.30 2010/08/17 16:19:05 lavajoe Exp $
+
+*btrfs-progs-0.19-r1 (17 Aug 2010)
+
+  17 Aug 2010; Joe Peterson <lavajoe@gentoo.org>
+  +btrfs-progs-0.19-r1.ebuild:
+  Patch 0.19 to bring up to version in RedHat (includes "-D" option in
+  btrfsctl (bug #331121))
 
   11 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
   btrfs-progs-0.19.ebuild, +files/btrfs-progs-0.19-glibc212.patch:
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 67841de29648..3c894ca838c6 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -3,11 +3,13 @@ AUX btrfs-progs-0.19-glibc212.patch 535 RMD160 c7d444ec10ac7e30a8eb5645ffae1be53
 DIST btrfs-progs-0.16.tar.bz2 97344 RMD160 c2d3e1ec0eccafd381336841d5129f1c380c88df SHA1 506a0290553099a0b8694d69d41e63fbe0394835 SHA256 a0b7b2827db66f91be15afa497038fa13df55774ad77d6ab793d3c97d2c5dc4c
 DIST btrfs-progs-0.17.tar.bz2 110438 RMD160 7c1737e7315cdf1180080f52ed70a7739b7f9940 SHA1 cd247f4c09a17e97039aa69978921c848b08d621 SHA256 f5bc36fe394571721a3470eeef7ee462cfbea6b83ed2ecaa1da0e58d9f537a2a
 DIST btrfs-progs-0.18.tar.bz2 110410 RMD160 d86484c4a86f57189dbf77cadd694d2bfcb763a8 SHA1 c049943d7a31f63432b19c1eb5fbde119f4bf0bb SHA256 e81f483560eb93b99f33e20aa035e968d7e5b0894543b448cff6da983d4d4f0c
+DIST btrfs-progs-0.19-redhat.patch.bz2 21699 RMD160 9e554223fcc2f820f4bb44580f97519ee243d3b7 SHA1 09c1957dcc784733970c32b705d9034799053892 SHA256 36e581ce32aad7119195a0f5c47d3007d38b3520b92ba3c825baf22f35f17723
 DIST btrfs-progs-0.19.tar.bz2 118119 RMD160 28e7955fd1f9e0ac68c465cf3bbeec3c889b0513 SHA1 483b44e844c3a97ccb830add21ca9327545dbc69 SHA256 f8a3dd03e87a33506d16ccc1e5a77c4c38ff1fa84b9502ed4b88c0b39fab70fc
 EBUILD btrfs-progs-0.16-r1.ebuild 1642 RMD160 bf0049169e363af8290b26a6a59cff8a179f802e SHA1 23fb5ba116c70fdcd35406eb1fa7029ad4aa2ea7 SHA256 f51ad6e3873277f6381f8d76776d6a94f7f22b26fef9115f6b730867e924eb96
 EBUILD btrfs-progs-0.17.ebuild 1678 RMD160 4ab6fbe77a92c37de9ff5694f769712841036eb6 SHA1 ddd4613a4b198d20b35313dbea344dda405ea1f4 SHA256 d4fb9c479809410086c22ab65ea47333c33e2a7a120105c597cff8df55f699b1
 EBUILD btrfs-progs-0.18-r1.ebuild 2164 RMD160 c81024daf29fe8d5d51827caf37d7d49acd61dd7 SHA1 a28063966f6b46b8a3434246985b1172f6dd8678 SHA256 a26122b1291e6fe5c78348c8480d07cc61f3d3f4fbe0fd02513d1f027325fa53
+EBUILD btrfs-progs-0.19-r1.ebuild 2607 RMD160 36a08a8b633019275c9ad8a9961c30f4be0a2608 SHA1 6bea12b46eb080a48194840aa45beb15725c1ab8 SHA256 ec7720b78672e85e1f8400c62bc187f98bec627725a72cae3825074d3cb304f3
 EBUILD btrfs-progs-0.19.ebuild 2484 RMD160 a02e9798f474e0745afbbf0708cb2e4c989b996a SHA1 cf7cf21f8f6edb9eb0b6a5077c384e20f29b4524 SHA256 feb8194703f575c7a7cd2c1b5532b2abb5fa9fdce8dd9267e2568d009c5a4224
 EBUILD btrfs-progs-9999.ebuild 2153 RMD160 585350c8c755b977eccefb77a01f673a320c3454 SHA1 c81099ee5e230e1433848a709c5cba2c06df460a SHA256 133c723f9c3e5435a01f9ffcb6a2312d05c1624106337c7d9cacc44fa14f976a
-MISC ChangeLog 4813 RMD160 89de7f4e4593b2abca266109d12e5f976994ec5d SHA1 893d813f861572031da43a60e7615d3737de1d84 SHA256 2aff6d4c9508e0be2153e9208e756cb488cdd0a584d183c2a981eff9587e8275
+MISC ChangeLog 5025 RMD160 9363a159a34283543ab0e408271e988fba932438 SHA1 cfbffb4651713523906f1e1914d3b6a50f3988cf SHA256 fb8c3354c6c6481f1de4df7963cd24a685eb68b925d08a508f1f2e76d1ca1613
 MISC metadata.xml 321 RMD160 52634dbd80c8f5b68acf4c2587ffc9525885038b SHA1 50409407adeeacc078c93a4dfd9ae90033506209 SHA256 c2a766f3953ae00375ef6960f803cf2bb661e56afb2c99dda89a92cb6418d012
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.19-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.19-r1.ebuild
new file mode 100644
index 000000000000..07e319b17708
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.19-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2010 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.19-r1.ebuild,v 1.1 2010/08/17 16:19:05 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
+	mirror://gentoo/${P}-redhat.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="acl debug-utils"
+
+DEPEND="debug-utils? ( dev-python/matplotlib )
+	acl? (
+			sys-apps/acl
+			sys-fs/e2fsprogs
+	)"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Apply patch from Josef Bacik (btrfs developer at RedHat)
+	# that brings version 0.19 up to the version used in RedHat/Fedora.
+	# Includes the previous convert-remove-used-space-update patch.
+	# Also includes the "-D" option in btrfsctl (bug #331121).
+	epatch "${WORKDIR}"/${P}-redhat.patch
+
+	epatch "${FILESDIR}"/${P}-glibc212.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
+	fi
+}
+
+src_install() {
+	into /
+	dosbin btrfs-show
+	dosbin btrfs-vol
+	dosbin btrfsctl
+	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 mkfs.btrfs mkbtrfs
+	dosym mkbtrfs /sbin/mkfs.btrfs
+	if use acl; then
+		dosbin btrfs-convert
+	else
+		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
+
+	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.31 and above)."
+	ewarn ""
+	ewarn "         This version should NOT be used with earlier versions"
+	ewarn "         of the standalone btrfs module!"
+}