Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 94 insertions, 7 deletions

diff --git a/sys-fs/btrfs-progs/ChangeLog b/sys-fs/btrfs-progs/ChangeLog
index 9750f58f2f5f..28c45ad3626e 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.104 2015/05/09 23:08:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/ChangeLog,v 1.105 2015/05/09 23:23:01 floppym Exp $
+
+*btrfs-progs-4.0 (09 May 2015)
+
+  09 May 2015; Mike Gilbert <floppym@gentoo.org> +btrfs-progs-4.0.ebuild,
+  metadata.xml:
+  Version bump.
 
   09 May 2015; Mike Gilbert <floppym@gentoo.org> -btrfs-progs-0.19-r3.ebuild,
   -btrfs-progs-0.19.11.ebuild, -btrfs-progs-0.20_rc1.ebuild,
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 8f6a471778a4..e051289e3355 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -13,18 +13,20 @@ DIST btrfs-progs-v3.16.2.tar.xz 291604 SHA256 d4d62abe0c2b8e86888f96e4bd21ca7e25
 DIST btrfs-progs-v3.17.3.tar.xz 588424 SHA256 e7bd9ff8d95b515973d3a1255c17fd481bcd75e4420f00c6c9c99489d1ddac2c SHA512 faa9b0d5281f72777d4b64b96774dcb1d6f579fd84e3bac3c256e779bf6fd67ee17aaf8f904dd29a8a8592f504e3e8af0caf1ab261689457a30467d3c1fb6a71 WHIRLPOOL 6ce02a7b078a277b882a2249ea4b628ce7b5dd16572d618b8cb999f88115c84ac30c9c9928525754edd458f86a458c9cf5c1753cb293c49e0d000795fae31604
 DIST btrfs-progs-v3.18.2.tar.xz 1029228 SHA256 dd8ddb4d201e5ffd32a15ed0e1f33fbc2c8fb16383f1519a9fae136698c2dfec SHA512 7fd125eeedabd54178f5198ac09c364b6772125124adcdb2620515a51c331307205ae06ff81375a49ebc62650d537c6f9eed2b63bf1f7e97b9ff047cda8a2cc4 WHIRLPOOL e5df056188abc2f57941b92be2774208fd1409f580c9604242f81aeda78f4be6d95f4cacfcf39917db363a033fb3b11f1eb864c15cccf24491fc1b660fce3803
 DIST btrfs-progs-v3.19.1.tar.xz 1101168 SHA256 248862a7e7e06188bb495bbaa05d3e0e34628b61a10ef03234b3b00698ce88db SHA512 c8b1c348afe3e32f54a72fcf361700bd63c12272e34ab34774936a2eca338dbea568d452f494d6ddd3c7be75b37a6d400fec33500548ed9b6df008212613d7f5 WHIRLPOOL 75bb08fe5ab49711f264d6cd35ddac39ea722ef2bcd57c53ad0d483cdf329b1b1b89c0b70280dea161568fd78c44eae30c76fb574ee649200237a13b3df1d8d4
+DIST btrfs-progs-v4.0.tar.xz 1102500 SHA256 179cf1acc1b0061548b8f1d9cf973a8338bf96f192cecad99ecdace9ae065a1f SHA512 895d6c27bd82c4b320c705c32613b28e601f316c0881080d8c376d0045162eaab6c91431dee73b391fc608e6d7c16f3a744ef6b9c85adb4beaa4376fbbe36d9a WHIRLPOOL cf71cc4ab6c85e8673143bb779c7b252caf1bfabc14fb2d7dd3477bd842b491ac3d7f121c3dcbecec023c5873c4b4400a5f2087e55bbee14217982f9712d5c2f
 EBUILD btrfs-progs-3.14.2.ebuild 1368 SHA256 ac53108dd4ab229c08d82ca3b7c410c6b18c9a76d52d4577c4a11d297f0ca991 SHA512 f0a894838dc6e7a0b564f3ae53ff480335a5f6621a9a6e7b73fa125e9c48d04c6dc30dcc9c13b0c55feb275619ed299339277e79f3559f3dfa2cfea50c3492a9 WHIRLPOOL e5457abc4c5951be6b04eb07138b7281a18a8bf29b0f85ea189226a55ae7e91d95f53f11c06b1f5812c6b82e7c5ad33729377eba1cd85bf8164da535d9f9e236
 EBUILD btrfs-progs-3.16.2.ebuild 1377 SHA256 444b93c67a497a329c149617fff713754b56087e539d8b33d5c49e6a3e8c6e57 SHA512 edaa8c4161e3cb4a59b219f24c7078c34d2e65859c455dd085a08ab9d216ea8a1d27402642714d0037726d84184d6497938e7673ee183f6457010d419839f60a WHIRLPOOL a5863e05d4cf6ca65bc4bf1c3717cc9594fdb93a4bdd40519b5eaa7d907f0f9bf7d9db0216dadcd3c03c9a86c82e3c169db10c21fec31e1ea4c2b1d83eaedbf5
 EBUILD btrfs-progs-3.17.3.ebuild 1377 SHA256 9acc82972b8a89a04dda69bbd699482cedebb1063b959825c415232ce7ae44b6 SHA512 434cfc294951f04367850fb1ad6c034bcbc989671ff66cd20ebf78744f30991c377e8995fd05d49c383e8424338597f3deca9183bf72bb5d261c36061688acce WHIRLPOOL 585a5a21ab5cb058d27376b4cb9c3beda4efc4fef1aad4931c5fdbe5bed55e88da382c08ce3caf1adfd7937ea59d2f9e8b50d582a4e2bf67a9ab920dba8d69d8
 EBUILD btrfs-progs-3.18.2.ebuild 1381 SHA256 b132133a7d6f697097b86db98defb7731a7d2f30e2415b9c6bd2689f280e1b3b SHA512 c3512536e76a005de90beeb6a32673e7a32e6d501bff711263d6e09e614ba7200995abc62cfafec4d28fd47b57db7aca955f2b332b8f1d6c92dc421aef2ab3e1 WHIRLPOOL 520d7482fb4fba789e12364d5b9bcf303b79f4fdb9db829a1733f471abba53423fecf4741c24f06fadf56cec082aebce12c16584fff6857f477db242f9835b87
 EBUILD btrfs-progs-3.19.1.ebuild 1982 SHA256 9f612c2e73976ad53cdb223acc4e671735b65692f68406b656cfe4039cb52cb9 SHA512 2133deabcc0b30dbf4fa87d11a22a5cfd57b1edecb507e7959c7e26e711ff992ca0268f7d320f6c054aaa6f8eafd8a6cd68ad7ab6498180101a2ef9bdf2bab17 WHIRLPOOL 4f0d0ede6e5f9ef0a7eba49aa9cf04ea9fd08f0763eb170ab4c4b50fd8fd1aec211c0df606e392dd5ed709bca0c85360ab2a5ea0dbbac46dadf1503107765c30
+EBUILD btrfs-progs-4.0.ebuild 1979 SHA256 ef1afef852b313f732d2ef5d66b84f1cfdcad670d451320872b73503a5919bc9 SHA512 a328eac28b523c24b33aca20c406f87a39761314e54a48d8d13e62264a800f545a0f9950330fde180569ef5a48f893fe9f10a0ffb743b9b1211322cbf633d8e3 WHIRLPOOL 7866ccd46a60a02647f9dff00df6eaf58a4cc635d577fd8db7ee42dfa1e5ef582a12ee573a21bde086acba966d5b630c5a521eeda8409d8aeaf333d6b5687a1c
 EBUILD btrfs-progs-9999.ebuild 1981 SHA256 3ba38df37e84bd9e36f38a7004a372fbee9967f276ed408c115a8a0e47a7b044 SHA512 f8f64a38ada90b1b9697f354f5d4d3698ffd4df4fa1291fbc693215d3ae5de1f1de4f097845d5db7894b35cc083bdef034d62ffa31db8d838bb31d377ede4c9a WHIRLPOOL 07ee322d28f6506ee39e7650cf4d3e473ddcf9e530c52579e9de561b264ff84bf2da0508639cb7fe9e97ee1710878080ac9198d2564d3591baf93940e0e8f5ee
-MISC ChangeLog 16308 SHA256 93bedf0108fc2b1a61ab4bffb60494dc76132fb6bddec50274991d5104f74367 SHA512 ef866346655dfc1693c467cf0b4d023a3e0739e20da032f2c72b00ae923400122ea89da31d762d668c4ebc64b8656b0785990f3987aaa6a8e2d8a016b4684797 WHIRLPOOL dc35267de700beb624948e69fd80cc70f0259aec8eb5b226b842e1f93d90df83b63c66ca3c1aea9c1958aa8b184816de06edb6460bd5a609b078ef9e87e6e985
-MISC metadata.xml 510 SHA256 9ee234e55d228cbf75a49949089b9cb9075bccd89918a73f8b95822f96778fd6 SHA512 ea29beac8f737c269cb51a5e7a6971defbc6c3e76f009e3fd587298c12542930d521f211f3024e965cf0e0bbc8fb59b187bfa8d65bb564d76205917cf3c0f665 WHIRLPOOL 1cadd8850d532c009f3d5cfb6f2615db5e36d72f1c3b1d3f1cc1f44f2c4f68e93f295afdab6a0627b20a71602bf2a8857e01beffdcb43dc82ba2017e964ec744
+MISC ChangeLog 16447 SHA256 f31aeba2d488efd38b47654ed7962ac25f5152b682de922910f606cf3e86b8b8 SHA512 0e30ece3d8f51eead2a413426d2e3fe66a7b2d3bed72a28e13fb19aeba3c3be69080333e14273b22b9fa23c5eadbe371f61f72643a0d05583375908430493f4d WHIRLPOOL f8f888c5a20e8d48eba8f1fae908b45dece09760909efdebb42499ce7738068716515cd614d421a8e92754e0962b0760397a51fa7aeea46748665aef6ac5a7bc
+MISC metadata.xml 437 SHA256 1251b85ad1e170caf3140533de18e9b7a7a1263c07d6a85c7a7c51393d2ad753 SHA512 8779ff4ef65b62d10ff0954d418b9f89f99bc61cc9ff4d0152fb1a07f5ad8b70d4962418323d644c630d654e798b2ab9a6a2e727f83e9b8d8c0b621175fb3175 WHIRLPOOL d35b019cf132b3c7519029fd6f60998d033bb91622e69111081c03e0fcbde268f69e61e7a376f2eff7fefbc4ee243d9c91227afa37502e736370867cf9aa1704
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlVOk2UACgkQC77qH+pIQ6SHqAD+P0roqMR0UGJ3lcQdCLzh8vq9
-DaHxVg4bejPFr1TTQakBALOZeLE1musNWopQyBbZno3JK1LkHDHrGzT6RhgoAXwj
-=4+5g
+iF4EAREIAAYFAlVOltYACgkQC77qH+pIQ6TPMgD+KJyEPvoS74kUo/Kr2zJswvSK
+dMeuDRhtxm4VrLyUJ3AA/iWZHkE2riX4ATLlfGpfBzV5boItMS6zx+6YLrQ4w9VR
+=l35u
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.0.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.0.ebuild
new file mode 100644
index 000000000000..51c8e21cd355
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/btrfs-progs/btrfs-progs-4.0.ebuild,v 1.1 2015/05/09 23:23:01 floppym Exp $
+
+EAPI=5
+
+inherit bash-completion-r1 eutils multilib toolchain-funcs
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV=v${PV}
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+else
+	WANT_LIBTOOL=none
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
+		https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-libs/zlib:0=
+	convert? (
+		sys-fs/e2fsprogs:0=
+		sys-libs/e2fsprogs-libs:0=
+	)
+"
+DEPEND="${RDEPEND}
+	convert? ( sys-apps/acl )
+	app-text/asciidoc
+	app-text/docbook-xml-dtd:4.5
+	app-text/xmlto
+"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" sys-devel/gnuconfig"
+fi
+
+src_prepare() {
+	epatch_user
+	if [[ ${PV} == 9999 ]]; then
+		eautoreconf
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(use_enable convert)
+		$(use_enable elibc_glibc backtrace)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	default
+	newbashcomp btrfs-completion btrfs
+}
diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
index cb356ab9aa4e..99f2c6f7db29 100644
--- a/sys-fs/btrfs-progs/metadata.xml
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -11,6 +11,5 @@
   </maintainer>
   <use>
     <flag name='convert'>Build ext2 conversion utility (btrfs-convert)</flag>
-    <flag name='debug-utils'>Build additional utils for debugging</flag>
   </use>
 </pkgmetadata>