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

Package-Manager: portage-2.1.6.7/cvs/Linux i686

4 files changed, 99 insertions, 4 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/Manifest b/sys-fs/btrfs-progs/Manifest
index 288a7e9e706f..e4e8f0e7f721 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,7 +1,9 @@
 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
 EBUILD btrfs-progs-0.16-r1.ebuild 1360 RMD160 c324e672c2d42a7cd8c83d49393792484f30d639 SHA1 d62347f4ff8e15a644261307c9a4f3814f2bdaa7 SHA256 b46d28fb32005f13d6570c6e1707ede1cb4bb40995b74d2a8a555f318c655593
-EBUILD btrfs-progs-0.17.ebuild 1396 RMD160 cfcddb0e9be7a760261c78adc8498eebd2e97b83 SHA1 9c7728968e7b3b5f135e06a281174437b7256af6 SHA256 58ef39978988b2db66058b2b91f4d9a27348000523f7885c45bb95f31b498367
+EBUILD btrfs-progs-0.17.ebuild 1880 RMD160 3df95e106c6401b39ad43e88167cff1ee34a1948 SHA1 5d49eb8c6e9788cc904cab7b7e537d75ce729713 SHA256 2ab8e82ba2ee9141097668d61d60df69a6ff8fd1e0d46caa13680aa1953be92f
+EBUILD btrfs-progs-0.18.ebuild 1880 RMD160 3ba33963c371220c1e66f90b9eed6ba660d5956c SHA1 98fd6ede332a501b08e77c8882d76dbd49ec720e SHA256 ec4098ac07f857272edde58b5a341179dada7175e52746ffe05e2210e9b62b79
 EBUILD btrfs-progs-9999.ebuild 1341 RMD160 6e5b0add43d7ba82168ff4a4f06707f8ba530545 SHA1 379ea19d10a5804ec979eeff94eb768e05a9fa3e SHA256 b79ee93b02ed143b1a5a190bbebd8d430f2e1bc96ab51c35f608ed9fa384d727
-MISC ChangeLog 2851 RMD160 4594bde859c4f560791f01ccdcecf7930061a4e0 SHA1 a80497acfee256da47dd219d30ee3b54b150f465 SHA256 8b41d98a109fdd2ae06037bb0c5031c95a7b478ecf10c12c90aa8dd5a19219f5
+MISC ChangeLog 3058 RMD160 28cc8c83a43a12e0f959bb9bd14f4f76a72881bc SHA1 e0e0654c4108d2810b6fa07369f15273e7aaf667 SHA256 6f6a474d6ba856d93b4b21eb918e1304b00c2c56de0f9427772cd958e65e1cda
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
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."
+}