public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-fs/btrfs-progs: btrfs-progs-9999.ebuild ChangeLog btrfs-progs-0.18-r1.ebuild metadata.xml
@ 2009-06-14 15:46 Joe Peterson (lavajoe)
  0 siblings, 0 replies; only message in thread
From: Joe Peterson (lavajoe) @ 2009-06-14 15:46 UTC (permalink / raw
  To: gentoo-commits

lavajoe     09/06/14 15:46:16

  Modified:             btrfs-progs-9999.ebuild ChangeLog metadata.xml
  Added:                btrfs-progs-0.18-r1.ebuild
  Log:
  Add debug-utils USE flag to allow not building show-blocks, which requires matplotlib and therefore pulls in many packages (bug #259786)
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.10                 sys-fs/btrfs-progs/btrfs-progs-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild?r1=1.9&r2=1.10

Index: btrfs-progs-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- btrfs-progs-9999.ebuild	1 Apr 2009 12:26:44 -0000	1.9
+++ btrfs-progs-9999.ebuild	14 Jun 2009 15:46:16 -0000	1.10
@@ -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-9999.ebuild,v 1.9 2009/04/01 12:26:44 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild,v 1.10 2009/06/14 15:46:16 lavajoe Exp $
 
 inherit eutils git
 
@@ -11,13 +11,13 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="acl"
+IUSE="acl debug-utils"
 
-DEPEND="dev-python/matplotlib
+DEPEND="debug-utils? ( dev-python/matplotlib )
 	acl? (
 			sys-apps/acl
 			sys-fs/e2fsprogs
-		)"
+	)"
 RDEPEND="${DEPEND}"
 
 EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git"
@@ -42,7 +42,6 @@
 	dosbin btrfs-image
 	# 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
@@ -51,9 +50,26 @@
 		ewarn "Note: btrfs-convert not built/installed (requires acl USE flag)"
 	fi
 
+	if use debug-utils; then
+		newsbin debug-tree btrfs-debug-tree
+	else
+		ewarn "Note: btrfs-debug-tree not installed (requires debug-utils USE flag)"
+	fi
+
 	into /usr
 	newbin bcp btrfs-bcp
-	newbin show-blocks btrfs-show-blocks
+
+	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
 }
+
+pkg_postinst() {
+	ewarn "WARNING: This version of btrfs-progs uses the latest unstable code,"
+	ewarn "         and care should be taken that it is compatible with the"
+	ewarn "         version of btrfs in your kernel!"
+}



1.21                 sys-fs/btrfs-progs/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/ChangeLog?r1=1.20&r2=1.21

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog	6 Jun 2009 05:13:09 -0000	1.20
+++ ChangeLog	14 Jun 2009 15:46:16 -0000	1.21
@@ -1,6 +1,13 @@
 # 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.20 2009/06/06 05:13:09 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.21 2009/06/14 15:46:16 lavajoe Exp $
+
+*btrfs-progs-0.18-r1 (14 Jun 2009)
+
+  14 Jun 2009; Joe Peterson <lavajoe@gentoo.org>
+  +btrfs-progs-0.18-r1.ebuild, btrfs-progs-9999.ebuild, metadata.xml:
+  Add debug-utils USE flag to allow not building show-blocks, which requires
+  matplotlib and therefore pulls in many packages (bug #259786)
 
   06 Jun 2009; Joe Peterson <lavajoe@gentoo.org> btrfs-progs-0.16-r1.ebuild,
   btrfs-progs-0.17.ebuild, btrfs-progs-0.18.ebuild:



1.2                  sys-fs/btrfs-progs/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	24 May 2008 19:50:05 -0000	1.1
+++ metadata.xml	14 Jun 2009 15:46:16 -0000	1.2
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>lavajoe@gentoo.org</email>
-</maintainer>
+  <herd>no-herd</herd>
+  <maintainer>
+    <email>lavajoe@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name='debug-utils'>Build additional utils for debugging</flag>
+  </use>
 </pkgmetadata>



1.1                  sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-0.18-r1.ebuild?rev=1.1&content-type=text/plain

Index: btrfs-progs-0.18-r1.ebuild
===================================================================
# 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.1 2009/06/14 15:46:16 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 debug-utils"

DEPEND="debug-utils? ( dev-python/matplotlib )
	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 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
		newsbin debug-tree 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
}

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.29-rc2 and above)."
	ewarn ""
	ewarn "         This version should NOT be used with earlier versions"
	ewarn "         of the standaline btrfs module!"
}






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-06-14 15:46 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-14 15:46 [gentoo-commits] gentoo-x86 commit in sys-fs/btrfs-progs: btrfs-progs-9999.ebuild ChangeLog btrfs-progs-0.18-r1.ebuild metadata.xml Joe Peterson (lavajoe)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox