[gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/files/, sys-fs/btrfs-progs/

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     509eea34f1c8c957cb21d34df0588ea0ca13e2eb
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 22:09:28 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 22:09:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=509eea34

sys-fs/btrfs-progs: bump up to 4.8.3

Package-Manager: portage-2.3.2

 sys-fs/btrfs-progs/Manifest                        |  1 +
 sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild        | 96 ++++++++++++++++++++++
 .../files/btrfs-progs-4.8.3-fix-ioctl-again.patch  |  9 ++
 3 files changed, 106 insertions(+)

diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index a26efc7..bfff8dc 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -12,3 +12,4 @@ DIST btrfs-progs-v4.5.3.tar.xz 1207344 SHA256 e6e79608d81ccda62ad877c20e4d0868dc
 DIST btrfs-progs-v4.6.1.tar.xz 1281240 SHA256 4ed15ccd0fa730c13e52fb930141a0d3f300f2bb34cb1366b32d093eaaa18919 SHA512 7bdf350a3051326f495e1694e11b27b830dce219ddbb0a805f1916f5deecdbd5332c3cd8abe36296832e196eee45e4cdc4695e99e186a51b85ec8b9f6ff5381d WHIRLPOOL d7c06549947278002c4de91f47b2b85d93a714bf1e984ce2b4d7321bcb8b0a11dd60cd84e070c382f61e67e919d3cbc88a723aaa5ab42806ecbe65ae01c4ae34
 DIST btrfs-progs-v4.7.3.tar.xz 1341512 SHA256 90cd6f0ce5a8bed5fcd6ea8a70d81de4a038163035d48a9ae0339bbf51df771c SHA512 2609bfa90483a14daf33b77f4f1560ca75de602ad3d4ce705a95f1aebbec016574db91b0287287622e49d199507c90243eb6739bb5719a5f99557f8f3e8e2c1a WHIRLPOOL 819879310484ba70d96f5492aca5463e5ba0c646dbd5e4b4ca797b76c754a352753641ef4d0f4ffe0109d07c72d99be5a2b1c749b1f03225cd582a83c9cf0d5a
 DIST btrfs-progs-v4.8.1.tar.xz 1348472 SHA256 836e6d707abfc155319c072f53d296261cbd17f0e03484a3694b8af48640db83 SHA512 43738c21b7c066fc13af742f61aad54572d5c293acb98915a2aa0ba6ec0e32022bf663155d77435d1179f05fb75b97bd0aba28da2ade04b596ef5348e8b5415c WHIRLPOOL d4b1e4c5ca0c826394b5d95ea92e27f0c625a0f5c940bdd88e310a7328f4ad77b4060f5f61d4b05ef03705fe605591dc7ae6c9368f37aa73b69fedee0ed0d448
+DIST btrfs-progs-v4.8.3.tar.xz 1396920 SHA256 c1a60c317d2fcaf8420779d2d0717ae53882c2bc22bc44e3bdcd5efb7ca68ef2 SHA512 bf6ed0269823bfe385659f652bcc18c76c3cac3ca6f04f76f1ebe1fd5e2212884edeed7f5649979f8d83745256e9555c038eb6713b262759ee424bb9f6f0f4ac WHIRLPOOL 4a4b20308e08ed85f73d70e95f0f971965a7e8abae35e12769a4c697f0f1502cc070240b5319579adf3f8565cf669acdf4b5aa32dfca77148b8f23bd97349f76

diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild
new file mode 100644
index 00000000..821602d
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.8.3.ebuild
@@ -0,0 +1,96 @@
+# 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-8.6.0
+	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
+
+PATCHES=("${FILESDIR}"/${P}-fix-ioctl-again.patch)
+
+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/files/btrfs-progs-4.8.3-fix-ioctl-again.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch
new file mode 100644
index 00000000..9c89490
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-4.8.3-fix-ioctl-again.patch
@@ -0,0 +1,9 @@
+diff --git a/ioctl.h b/ioctl.h
+index cdfb888..ad4372c 100644
+--- a/ioctl.h
++++ b/ioctl.h
+@@ -710,3 +710,3 @@ static inline char *btrfs_err_str(enum btrfs_err_code err_code)
+ 		default:
+-			return NULL;
++			return 0;
+ 	}