Rewrite live ebuild to take advantage of improved upstream Makefiles (bug #411209) and fix bug #410765 - thanks go to floppym@gentoo.org for new ebuild

(Portage version: 2.1.10.47/cvs/Linux x86_64)

8 files changed, 25 insertions, 257 deletions

diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index 6f67f9ca7dce..99e6f8d9092d 100644
--- a/sys-fs/btrfs-progs/ChangeLog
+++ b/sys-fs/btrfs-progs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/btrfs-progs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.40 2012/02/25 00:17:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.41 2012/04/09 02:20:07 lavajoe Exp $
+
+  09 Apr 2012; Joe Peterson <lavajoe@gentoo.org> btrfs-progs-9999.ebuild:
+  Rewrite live ebuild to take advantage of improved upstream Makefiles (bug
+  #411209) and fix bug #410765 - thanks go to floppym@gentoo.org for new ebuild
 
   25 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
   btrfs-progs-0.19-r3.ebuild:
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 b4fd8a33e7ca..b348d2168c3d 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild
@@ -1,12 +1,12 @@
 # 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.4 2009/09/21 15:57:42 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.16-r1.ebuild,v 1.5 2012/04/09 02:20:07 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"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild
index 61f42edc905f..06cb1dfd28bd 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild
@@ -1,12 +1,12 @@
 # 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.4 2009/09/21 15:57:42 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.17.ebuild,v 1.5 2012/04/09 02:20:07 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"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
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 fece48606789..a9c5013b1bea 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild
@@ -1,12 +1,12 @@
 # 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.2 2009/09/21 15:57:42 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild,v 1.3 2012/04/09 02:20:07 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"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.19-r2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.19-r2.ebuild
deleted file mode 100644
index 6d50e185947e..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-0.19-r2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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!"
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.19-r3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.19-r3.ebuild
index 6867ecdf6008..ec5cb56dd9a7 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-0.19-r3.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-0.19-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 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-r3.ebuild,v 1.6 2012/02/25 00:17:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.19-r3.ebuild,v 1.7 2012/04/09 02:20:07 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
+SRC_URI="mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${P}-redhat.patch.bz2"
 
 LICENSE="GPL-2"
diff --git a/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild
deleted file mode 100644
index eedc17256233..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-0.19.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.ebuild,v 1.5 2010/08/11 14:04:23 ssuominen 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 ~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}"
-
-	# 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
-
-	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!"
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index c9cc70c40ee2..edd3849fc8d3 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2012 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.16 2012/02/10 21:45:37 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.17 2012/04/09 02:20:07 lavajoe Exp $
 
-inherit eutils git-2
+EAPI=4
+
+inherit eutils git-2 toolchain-funcs
 
 DESCRIPTION="Btrfs filesystem utilities"
 HOMEPAGE="http://btrfs.wiki.kernel.org/"
@@ -11,74 +13,27 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="acl debug-utils"
+IUSE=""
 
 DEPEND="sys-libs/zlib
-	debug-utils? ( dev-python/matplotlib )
-	acl? (
-			sys-apps/acl
-			sys-fs/e2fsprogs
-	)"
+	sys-apps/acl
+	sys-fs/e2fsprogs"
 RDEPEND="${DEPEND}"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"
 
-src_unpack() {
-	git-2_src_unpack
-	cd "${S}"
-
+src_prepare() {
 	# Fix hardcoded "gcc" and "make"
-	sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile
-	sed -i -e 's:make:$(MAKE):' Makefile
+	sed -i -e 's:gcc $(CFLAGS):$(CC) $(CFLAGS):' Makefile || die
+	sed -i -e 's:make:$(MAKE):' Makefile || die
 }
 
 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
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	into /
-	dosbin btrfs-show
-	dosbin btrfs-vol
-	dosbin btrfsctl
-	dosbin btrfsck
-	dosbin btrfstune
-	dosbin btrfs-image
-	dosbin btrfs
-	# 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
+	emake DESTDIR="${D}" prefix=/usr bindir=/sbin mandir=/usr/share/man install
 }
 
 pkg_postinst() {