sys-fs/btrfs-progs: Bump to 4.5.1

Also convert to EAPI 6.

Package-Manager: portage-2.2.28_p64

3 files changed, 98 insertions, 3 deletions

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index ed47838284fe..95e0c31414aa 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -11,3 +11,4 @@ DIST btrfs-progs-v4.2.2.tar.xz 1143760 SHA256 5d87e4ebb2a3a288c167791e489bfa4840
 DIST btrfs-progs-v4.2.tar.xz 1130488 SHA256 25233c3e94c52bf433e8749c17dad2acd8004c6dbc93e2bff9397c4e9fa58fbe SHA512 ba322478c1ce4df5548a953de581053c9fb9d60d1626639dc543065847a0c92ea6712728479dcb59487e02ab6aaea9f688fe1e3ef5087517e55d346b02d36065 WHIRLPOOL 54cd45554c15bedac3baac6939e6e91965b59c1c6cc0b7ca10d4c910dfe56811a278f9ee6026a9cc61286544370a45f0c0ccccfb08d7958d7a0c4b2964751bd4
 DIST btrfs-progs-v4.3.1.tar.xz 1184416 SHA256 0cb5ff15deed01cdf5a77f3f61b7dc9d2cd6787bcf6b6b7dcef424d16e8afd3a SHA512 661c7c05ee3527cc34f3aa08e88e252e6e836a86752f7e607e3f6dc0a9a861d3bc645a6fa0a5af5f6abfe4f3f2f7e193cffc2bb1c53595e0b7f99c3ff59daeff WHIRLPOOL 503ab00d8362ab2b4b9b91a8de18cca9eba1d76f2331f54cbecc7e89cc491dce3cfbd761d8e6e37773499cea7ef67a66dc7f544d7590d0c82acbef90ebe0c824
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 SHA256 9964e3ae4fb64692e109ddd733de4554e708348ffa18f0fc16a0cbd4bf40a8fc SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a WHIRLPOOL 188c4dec4f699262b023268e4a582312443aeaf0ea798446105d7288f6375cbad92ea2e8514def0b22cc8991c3ca9aefc5220dd8b6922aa4b506572da973ec33
+DIST btrfs-progs-v4.5.1.tar.xz 1183872 SHA256 eef87b2d0e231656afbffab35718c79a7774cc0101d33165abeb9bb2e017cefe SHA512 d97e74a04256f5b7d925a77635465d6b968bedaa8f2d13f30312835c5156c060052335ead9181148d28cb5a19c4f808629bb019c8a89c08ff7caf53cdd91622f WHIRLPOOL 98a6b878ecfe8afa62bbfb7b182747fb33a70d21335f614daf167eb9c108e74abc9843c85daf65be003bae7bb7f0350c71cbb8730eee418b0eb4cef6d71a029d
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.5.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.5.1.ebuild
new file mode 100644
index 000000000000..d7b329150fbb
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.5.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1
+
+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://repo.or.cz/btrfs-progs-unstable/devel.git"
+	EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert static static-libs"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:0=[static-libs(+)?]
+	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
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs:0[static-libs(+)]
+			sys-libs/e2fsprogs-libs:0[static-libs(+)]
+		)
+	)
+"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" sys-devel/gnuconfig"
+fi
+
+src_prepare() {
+	default
+	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 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex static-libs '' 'libs_static=')
+		$(usex static install-static '')
+	)
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+	newbashcomp btrfs-completion btrfs
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index d0c39655d4be..d7b329150fbb 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit bash-completion-r1 eutils multilib toolchain-funcs
+inherit bash-completion-r1
 
 libbtrfs_soname=0
 
@@ -59,7 +59,7 @@ if [[ ${PV} == 9999 ]]; then
 fi
 
 src_prepare() {
-	epatch_user
+	default
 	if [[ ${PV} == 9999 ]]; then
 		eautoreconf
 		mkdir config || die