[gentoo-commits] gentoo-x86 commit in sys-fs/btrfs-progs: btrfs-progs-0.19-r2.ebuild ChangeLog btrfs-progs-0.19-r1.ebuild

[gentoo-commits] gentoo-x86 commit in sys-fs/btrfs-progs: btrfs-progs-0.19-r2.ebuild ChangeLog btrfs-progs-0.19-r1.ebuild

[Joe Peterson (lavajoe)]

lavajoe     10/11/07 22:49:51

  Modified:             ChangeLog
  Added:                btrfs-progs-0.19-r2.ebuild
  Removed:              btrfs-progs-0.19-r1.ebuild
  Log:
  Add btrfs command to set of installed files (bug #344549)
  
  (Portage version: 2.1.9.23/cvs/Linux x86_64)

Revision  Changes    Path
1.32                 sys-fs/btrfs-progs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/btrfs-progs/ChangeLog?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/btrfs-progs/ChangeLog?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/btrfs-progs/ChangeLog?r1=1.31&r2=1.32

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ChangeLog	23 Oct 2010 09:19:06 -0000	1.31
+++ ChangeLog	7 Nov 2010 22:49:51 -0000	1.32
@@ -1,6 +1,12 @@
 # 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.31 2010/10/23 09:19:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.32 2010/11/07 22:49:51 lavajoe Exp $
+
+*btrfs-progs-0.19-r2 (07 Nov 2010)
+
+  07 Nov 2010; Joe Peterson <lavajoe@gentoo.org>
+  -btrfs-progs-0.19-r1.ebuild, +btrfs-progs-0.19-r2.ebuild:
+  Add btrfs command to set of installed files (bug #344549)
 
   23 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
   btrfs-progs-0.19-r1.ebuild:



1.1                  sys-fs/btrfs-progs/btrfs-progs-0.19-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.19-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.19-r2.ebuild?rev=1.1&content-type=text/plain

Index: btrfs-progs-0.19-r2.ebuild
===================================================================
# 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-r2.ebuild,v 1.1 2010/11/07 22:49:51 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 ~ppc64 ~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
	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!"
}