Add new version 0.18 (goes with btrfs included in 2.6.29-rc2 kernel)

(Portage version: 2.1.6.7/cvs/Linux i686)

3 files changed, 95 insertions, 2 deletions

diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index 13d94801d917..67cd73632a53 100644
--- a/sys-fs/btrfs-progs/ChangeLog
+++ b/sys-fs/btrfs-progs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2009/01/14 22:12:04 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.18 2009/01/26 19:31:53 lavajoe Exp $
+
+*btrfs-progs-0.18 (26 Jan 2009)
+
+  26 Jan 2009; Joe Peterson <lavajoe@gentoo.org> btrfs-progs-0.17.ebuild,
+  +btrfs-progs-0.18.ebuild:
+  Add new version 0.18 (goes with btrfs included in 2.6.29-rc2 kernel)
 
 *btrfs-progs-0.17 (14 Jan 2009)
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild
index 3d8a5808b558..e7dfc460b593 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.1 2009/01/14 22:12:04 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild,v 1.2 2009/01/26 19:31:53 lavajoe Exp $
 
 inherit eutils
 
@@ -61,3 +61,15 @@ src_install() {
 
 	dodoc INSTALL
 }
+
+pkg_postinst() {
+	ewarn "NOTE:    This version of btrfs-progs corresponds to and should only"
+	ewarn "         be used with the version of btrfs included in the"
+	ewarn "         Linux 2.6.29-rc1 kernel."
+	ewarn ""
+	ewarn "WARNING: This version should NOT be used with earlier versions"
+	ewarn "         of the standaline btrfs module package!"
+	ewarn ""
+	ewarn "         If you are using standalone btrfs-0.16 or earlier,"
+	ewarn "         use a matching version of btrfs-progs."
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.18.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.18.ebuild
new file mode 100644
index 000000000000..0e97319bd1e3
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.18.ebuild
@@ -0,0 +1,75 @@
+# 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.1 2009/01/26 19:31:53 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="acl"
+
+DEPEND="acl? (
+			sys-apps/acl
+			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
+	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 btrfs-image
+	dosbin btrfsctl
+	dosbin btrfstune
+	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
+	if use acl; then
+		dosbin btrfs-convert
+	else
+		ewarn "Note: btrfs-convert not built/installed (requires acl USE flag)"
+	fi
+
+	into /usr
+	newbin bcp btrfs-bcp
+	newbin show-blocks btrfs-show-blocks
+
+	dodoc INSTALL
+}
+
+pkg_postinst() {
+	ewarn "NOTE:    This version of btrfs-progs corresponds to and should only"
+	ewarn "         be used with the version of btrfs included in the"
+	ewarn "         Linux 2.6.29-rc2 kernel."
+	ewarn ""
+	ewarn "WARNING: This version should NOT be used with earlier versions"
+	ewarn "         of the standaline btrfs module package!"
+	ewarn ""
+	ewarn "         If you are using standalone btrfs-0.16 or earlier,"
+	ewarn "         use a matching version of btrfs-progs."
+}